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

Coding style fixes

Browse Source 
Change-Id: I524be1971d812c865f10922dc402b7c98b7a16e8
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
This commit is contained in:
Yuchen Deng
2011-10-22 22:19:46 +08:00
committed by Eike Ziller
parent 6af1f373a9
commit d136b011e1
1 changed files with 24 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
src/app/main.cpp
View File

@@ -33,22 +33,22 @@
#include "qtsingleapplication.h" #include "qtsingleapplication.h"
#include <app/app_version.h> #include <app/app_version.h>
#include <extensionsystem/pluginmanager.h>
#include <extensionsystem/pluginspec.h>
#include <extensionsystem/iplugin.h> #include <extensionsystem/iplugin.h>
#include <extensionsystem/pluginerroroverview.h> #include <extensionsystem/pluginerroroverview.h>
#include <extensionsystem/pluginmanager.h>
#include <extensionsystem/pluginspec.h>
#include <QtCore/QDir>
#include <QtCore/QUrl>
#include <QtCore/QTextStream>
#include <QtCore/QFileInfo>
#include <QtCore/QDebug> #include <QtCore/QDebug>
#include <QtCore/QTimer> #include <QtCore/QDir>
#include <QtCore/QFileInfo>
#include <QtCore/QLibraryInfo> #include <QtCore/QLibraryInfo>
#include <QtCore/QTranslator>
#include <QtCore/QSettings> #include <QtCore/QSettings>
#include <QtCore/QVariant> #include <QtCore/QTextStream>
#include <QtCore/QThreadPool> #include <QtCore/QThreadPool>
#include <QtCore/QTimer>
#include <QtCore/QTranslator>
#include <QtCore/QUrl>
#include <QtCore/QVariant>
#include <QtNetwork/QNetworkProxyFactory> #include <QtNetwork/QNetworkProxyFactory>
@@ -135,9 +135,9 @@ static void printHelp(const QString &a0, const ExtensionSystem::PluginManager &p
{ {
QString help; QString help;
QTextStream str(&help); QTextStream str(&help);
str << "Usage: " << a0 << fixedOptionsC; str << "Usage: " << a0 << fixedOptionsC;
ExtensionSystem::PluginManager::formatOptions(str, OptionIndent, DescriptionIndent); ExtensionSystem::PluginManager::formatOptions(str, OptionIndent, DescriptionIndent);
pm.formatPluginOptions(str, OptionIndent, DescriptionIndent); pm.formatPluginOptions(str, OptionIndent, DescriptionIndent);
displayHelpText(help); displayHelpText(help);
} }
@@ -232,7 +232,7 @@ int main(int argc, char **argv)
// We can't use the regular way of the plugin manager, because that needs to parse pluginspecs // We can't use the regular way of the plugin manager, because that needs to parse pluginspecs
// but the settings path can influence which plugins are enabled // but the settings path can influence which plugins are enabled
QString settingsPath; QString settingsPath;
QStringList arguments = app.arguments(); /* adapted arguments list is passed to plugin manager later */ QStringList arguments = app.arguments(); // adapted arguments list is passed to plugin manager later
QMutableStringListIterator it(arguments); QMutableStringListIterator it(arguments);
while (it.hasNext()) { while (it.hasNext()) {
const QString &arg = it.next(); const QString &arg = it.next();
@@ -249,10 +249,10 @@ int main(int argc, char **argv)
// Must be done before any QSettings class is created // Must be done before any QSettings class is created
QSettings::setPath(QSettings::IniFormat, QSettings::SystemScope, QSettings::setPath(QSettings::IniFormat, QSettings::SystemScope,
QCoreApplication::applicationDirPath()+QLatin1String(SHARE_PATH)); QCoreApplication::applicationDirPath() + QLatin1String(SHARE_PATH));
// plugin manager takes control of this settings object // plugin manager takes control of this settings object
QSettings *settings = new QSettings(QSettings::IniFormat, QSettings::UserScope, QSettings *settings = new QSettings(QSettings::IniFormat, QSettings::UserScope,
QLatin1String("Nokia"), QLatin1String("QtCreator")); QLatin1String("Nokia"), QLatin1String("QtCreator"));
ExtensionSystem::PluginManager pluginManager; ExtensionSystem::PluginManager pluginManager;
pluginManager.setFileExtension(QLatin1String("pluginspec")); pluginManager.setFileExtension(QLatin1String("pluginspec"));
@@ -260,7 +260,7 @@ int main(int argc, char **argv)
locale = settings->value("General/OverrideLanguage", locale).toString(); locale = settings->value("General/OverrideLanguage", locale).toString();
const QString &creatorTrPath = QCoreApplication::applicationDirPath() const QString &creatorTrPath = QCoreApplication::applicationDirPath()
+ QLatin1String(SHARE_PATH "/translations"); + QLatin1String(SHARE_PATH "/translations");
if (translator.load(QLatin1String("qtcreator_") + locale, creatorTrPath)) { if (translator.load(QLatin1String("qtcreator_") + locale, creatorTrPath)) {
const QString &qtTrPath = QLibraryInfo::location(QLibraryInfo::TranslationsPath); const QString &qtTrPath = QLibraryInfo::location(QLibraryInfo::TranslationsPath);
const QString &qtTrFile = QLatin1String("qt_") + locale; const QString &qtTrFile = QLatin1String("qt_") + locale;
@@ -302,10 +302,7 @@ int main(int argc, char **argv)
appOptions.insert(QLatin1String(VERSION_OPTION), false); appOptions.insert(QLatin1String(VERSION_OPTION), false);
appOptions.insert(QLatin1String(CLIENT_OPTION), false); appOptions.insert(QLatin1String(CLIENT_OPTION), false);
QString errorMessage; QString errorMessage;
if (!pluginManager.parseOptions(arguments, if (!pluginManager.parseOptions(arguments, appOptions, &foundAppOptions, &errorMessage)) {
appOptions,
&foundAppOptions,
&errorMessage)) {
displayError(errorMessage); displayError(errorMessage);
printHelp(QFileInfo(app.applicationFilePath()).baseName(), pluginManager); printHelp(QFileInfo(app.applicationFilePath()).baseName(), pluginManager);
return -1; return -1;
@@ -369,29 +366,28 @@ int main(int argc, char **argv)
displayError(msgCoreLoadFailure(coreplugin->errorString())); displayError(msgCoreLoadFailure(coreplugin->errorString()));
return 1; return 1;
} }
{ if (pluginManager.hasError()) {
if (pluginManager.hasError()) { ExtensionSystem::PluginErrorOverview errorOverview(&pluginManager);
ExtensionSystem::PluginErrorOverview errorOverview(&pluginManager); errorOverview.exec();
errorOverview.exec();
}
} }
if (isFirstInstance) { if (isFirstInstance) {
// Set up lock and remote arguments for the first instance only. // Set up lock and remote arguments for the first instance only.
// Silently fallback to unconnected instances for any subsequent // Silently fallback to unconnected instances for any subsequent instances.
// instances.
app.initialize(); app.initialize();
QObject::connect(&app, SIGNAL(messageReceived(QString)), QObject::connect(&app, SIGNAL(messageReceived(QString)),
&pluginManager, SLOT(remoteArguments(QString))); &pluginManager, SLOT(remoteArguments(QString)));
} }
QObject::connect(&app, SIGNAL(fileOpenRequest(QString)), coreplugin->plugin(), SLOT(fileOpenRequest(QString)));
QObject::connect(&app, SIGNAL(fileOpenRequest(QString)), coreplugin->plugin(),
SLOT(fileOpenRequest(QString)));
// shutdown plugin manager on the exit // shutdown plugin manager on the exit
QObject::connect(&app, SIGNAL(aboutToQuit()), &pluginManager, SLOT(shutdown())); QObject::connect(&app, SIGNAL(aboutToQuit()), &pluginManager, SLOT(shutdown()));
#ifdef WITH_TESTS #ifdef WITH_TESTS
// Do this after the event loop has started // Do this after the event loop has started
if(pluginManager.runningTests()) if (pluginManager.runningTests())
QTimer::singleShot(100, &pluginManager, SLOT(startTests())); QTimer::singleShot(100, &pluginManager, SLOT(startTests()));
#endif #endif