feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Coding style modifications

Browse Source 
Change-Id: I098cbde76e844229f189eb05d0e0b5013af8c5fd
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
Petar Perisin
2013-04-05 23:38:30 +02:00
parent a167286b3f
commit 9dce1fe429
3 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/plugins/git/changeselectiondialog.h
View File

@@ -75,18 +75,18 @@ private slots:
private: private:
void enableButtons(bool b); void enableButtons(bool b);
QProcess* m_process; QProcess *m_process;
QString m_gitBinaryPath; QString m_gitBinaryPath;
QProcessEnvironment m_gitEnvironment; QProcessEnvironment m_gitEnvironment;
QLabel* m_workingDirectoryLabel; QLabel *m_workingDirectoryLabel;
QLineEdit* m_changeNumberEdit; QLineEdit *m_changeNumberEdit;
QPlainTextEdit* m_detailsText; QPlainTextEdit *m_detailsText;
QPushButton* m_showButton; QPushButton *m_showButton;
QPushButton* m_cherryPickButton; QPushButton *m_cherryPickButton;
QPushButton* m_revertButton; QPushButton *m_revertButton;
QPushButton* m_checkoutButton; QPushButton *m_checkoutButton;
QPushButton* m_cancelButton; QPushButton *m_cancelButton;
ChangeCommand m_command; ChangeCommand m_command;
}; };

3
src/plugins/git/gerrit/gerritplugin.cpp
View File

@@ -473,6 +473,7 @@ void GerritPlugin::fetch(const QSharedPointer<Gerrit::Internal::GerritChange> &c
&& QFile::exists(m_dialog->repositoryPath())) { && QFile::exists(m_dialog->repositoryPath())) {
repository = gitClient->findRepositoryForDirectory(m_dialog->repositoryPath()); repository = gitClient->findRepositoryForDirectory(m_dialog->repositoryPath());
} }
if (!repository.isEmpty()) { if (!repository.isEmpty()) {
// Check if remote from a working dir is the same as remote from patch // Check if remote from a working dir is the same as remote from patch
QMap<QString, QString> remotesList = gitClient->synchronousRemotesList(repository); QMap<QString, QString> remotesList = gitClient->synchronousRemotesList(repository);
@@ -505,7 +506,7 @@ void GerritPlugin::fetch(const QSharedPointer<Gerrit::Internal::GerritChange> &c
} }
} }
if (!verifiedRepository){ if (!verifiedRepository) {
QMessageBox::StandardButton answer = QMessageBox::question( QMessageBox::StandardButton answer = QMessageBox::question(
Core::ICore::mainWindow(), tr("Remote not Verified"), Core::ICore::mainWindow(), tr("Remote not Verified"),
tr("Change host: %1\nand project: %2\n\nwere not verified among remotes" tr("Change host: %1\nand project: %2\n\nwere not verified among remotes"

6
src/plugins/git/gerrit/gerritplugin.h
View File

@@ -44,9 +44,7 @@ class ActionContainer;
class Command; class Command;
} }
namespace Locator { namespace Locator { class CommandLocator; }
class CommandLocator;
}
namespace Gerrit { namespace Gerrit {
namespace Internal { namespace Internal {
@@ -55,7 +53,7 @@ class GerritChange;
class GerritParameters; class GerritParameters;
class GerritDialog; class GerritDialog;
typedef QPair<QAction *, Core::Command* > ActionCommandPair; typedef QPair<QAction *, Core::Command *> ActionCommandPair;
class GerritPlugin : public QObject class GerritPlugin : public QObject
{ {