Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline

src/plugins/coreplugin/basefilewizard.cpp

@@ -32,12 +32,13 @@
 ***************************************************************************/
 
 #include "basefilewizard.h"
+
+#include "coreconstants.h"
+#include "icore.h"
+#include "ifilewizardextension.h"
 #include "mimedatabase.h"
+#include "editormanager/editormanager.h"
 
-#include <coreplugin/editormanager/editormanager.h>
-#include <coreplugin/icore.h>
-#include <coreplugin/coreconstants.h>
-#include <coreplugin/ifilewizardextension.h>
 #include <extensionsystem/pluginmanager.h>
 #include <utils/filewizarddialog.h>
 

src/plugins/coreplugin/coreplugin.pro

@@ -167,3 +167,10 @@ RESOURCES += core.qrc \
 contains(QT_CONFIG, webkit) {
     QT += webkit
 }
+
+linux-* {
+    images.files = images/qtcreator_logo_*.png
+    images.path  = /share/pixmaps
+
+    INSTALLS += images
+}

src/plugins/coreplugin/editormanager/editorsplitter.cpp

@@ -33,15 +33,14 @@
 
 #include "editorsplitter.h"
 
+#include "coreconstants.h"
 #include "editormanager.h"
+#include "icore.h"
 #include "minisplitter.h"
 #include "openeditorswindow.h"
 #include "stackededitorgroup.h"
-
-#include <coreplugin/icore.h>
-#include <coreplugin/coreconstants.h>
-#include <coreplugin/uniqueidmanager.h>
-#include <coreplugin/actionmanager/actionmanager.h>
+#include "uniqueidmanager.h"
+#include "actionmanager/actionmanager.h"
 
 #include <utils/qtcassert.h>
 

src/plugins/coreplugin/filemanager.cpp

@@ -33,13 +33,14 @@
 
 #include "filemanager.h"
 
+#include "editormanager.h"
+#include "icore.h"
 #include "ifile.h"
+#include "iversioncontrol.h"
 #include "mainwindow.h"
+#include "mimedatabase.h"
 #include "saveitemsdialog.h"
 #include "vcsmanager.h"
-#include "editormanager.h"
-#include "mimedatabase.h"
-#include "iversioncontrol.h"
 
 #include <utils/qtcassert.h>
 

src/plugins/coreplugin/mainwindow.cpp

@@ -380,7 +380,7 @@ void MainWindow::registerDefaultContainers()
     menubar->appendGroup(Constants::G_WINDOW);
     menubar->appendGroup(Constants::G_HELP);
 
-    //File Menu
+    // File Menu
     ActionContainer *filemenu = am->createMenu(Constants::M_FILE);
     menubar->addMenu(filemenu, Constants::G_FILE);
     filemenu->menu()->setTitle(tr("&File"));
@@ -394,7 +394,7 @@ void MainWindow::registerDefaultContainers()
     connect(filemenu->menu(), SIGNAL(aboutToShow()), this, SLOT(aboutToShowRecentFiles()));
 
 
-    //Edit Menu
+    // Edit Menu
     ActionContainer *medit = am->createMenu(Constants::M_EDIT);
     menubar->addMenu(medit, Constants::G_EDIT);
     medit->menu()->setTitle(tr("&Edit"));
@@ -405,12 +405,12 @@ void MainWindow::registerDefaultContainers()
     medit->appendGroup(Constants::G_EDIT_FIND);
     medit->appendGroup(Constants::G_EDIT_OTHER);
 
-    //Tools Menu
+    // Tools Menu
     ActionContainer *ac = am->createMenu(Constants::M_TOOLS);
     menubar->addMenu(ac, Constants::G_TOOLS);
     ac->menu()->setTitle(tr("&Tools"));
 
-    //Window Menu
+    // Window Menu
     ActionContainer *mwindow = am->createMenu(Constants::M_WINDOW);
     menubar->addMenu(mwindow, Constants::G_WINDOW);
     mwindow->menu()->setTitle(tr("&Window"));
@@ -423,7 +423,7 @@ void MainWindow::registerDefaultContainers()
     mwindow->appendGroup(Constants::G_WINDOW_OTHER);
     mwindow->appendGroup(Constants::G_WINDOW_LIST);
 
-    //Help Menu
+    // Help Menu
     ac = am->createMenu(Constants::M_HELP);
     menubar->addMenu(ac, Constants::G_HELP);
     ac->menu()->setTitle(tr("&Help"));

src/plugins/coreplugin/mainwindow.h

@@ -34,7 +34,7 @@
 #ifndef MAINWINDOW_H
 #define MAINWINDOW_H
 
-#include "icore.h"
+#include "core_global.h"
 
 #include <QtGui/QMainWindow>
 #include <QtCore/QMap>
@@ -61,6 +61,7 @@ class BaseView;
 class EditorManager;
 class FileManager;
 class IContext;
+class IWizard;
 class MessageManager;
 class MimeDatabase;
 class ModeManager;
@@ -103,7 +104,6 @@ public:
 
     void openFiles(const QStringList &fileNames);
 
-    //ICore
     inline ExtensionSystem::PluginManager *pluginManager() { return m_pluginManager; }
     Core::ActionManager *actionManager() const;
     Core::FileManager *fileManager() const;

src/plugins/coreplugin/modemanager.cpp

@@ -35,6 +35,7 @@
 
 #include "fancytabwidget.h"
 #include "fancyactionbar.h"
+#include "icore.h"
 #include "mainwindow.h"
 
 #include <aggregation/aggregate.h>

src/plugins/coreplugin/navigationwidget.cpp

@@ -33,12 +33,13 @@
 
 #include "navigationwidget.h"
 
-#include <coreplugin/icore.h>
-#include <coreplugin/coreconstants.h>
-#include <coreplugin/inavigationwidgetfactory.h>
-#include <coreplugin/modemanager.h>
-#include <coreplugin/uniqueidmanager.h>
-#include <coreplugin/actionmanager/actionmanager.h>
+#include "icore.h"
+#include "coreconstants.h"
+#include "inavigationwidgetfactory.h"
+#include "modemanager.h"
+#include "uniqueidmanager.h"
+#include "actionmanager/actionmanager.h"
+
 #include <extensionsystem/pluginmanager.h>
 
 #include <QtCore/QDebug>

src/plugins/coreplugin/outputpane.cpp

@@ -33,6 +33,7 @@
 
 #include "outputpane.h"
 #include "coreconstants.h"
+#include "icore.h"
 #include "ioutputpane.h"
 #include "mainwindow.h"
 #include "modemanager.h"
@@ -55,7 +56,6 @@
 #include <QtGui/QToolBar>
 #include <QtGui/QToolButton>
 #include <QtGui/QStackedWidget>
-#include <QDebug>
 
 using namespace Core;
 using namespace Core::Internal;

src/plugins/coreplugin/scriptmanager/scriptmanager_p.h

@@ -35,13 +35,15 @@
 #define SCRIPTMANAGER_P_H
 
 #include <coreplugin/scriptmanager/scriptmanager.h>
-#include <coreplugin/icore.h>
 
 #include <QtCore/QObject>
 #include <QtCore/QList>
 #include <QtScript/QScriptEngine>
 
 namespace Core {
+
+class ICore;
+
 namespace Internal {
 
 class ScriptManagerPrivate : public Core::ScriptManager

src/plugins/cppeditor/cppeditor.cpp

@@ -440,9 +440,9 @@ void CPPEditor::switchDeclarationDefinition()
         return;
 
     Function *f = lastSymbol->asFunction();
-    if (! f) {
+    if (!f) {
         Scope *fs = lastSymbol->scope();
-        if (! fs->isFunctionScope())
+        if (!fs->isFunctionScope())
             fs = fs->enclosingFunctionScope();
         if (fs)
             f = fs->owner()->asFunction();

src/plugins/designer/formeditorw.cpp

@@ -40,6 +40,7 @@
 #include "workbenchintegration.h"
 
 #include <coreplugin/coreconstants.h>
+#include <coreplugin/icore.h>
 #include <coreplugin/uniqueidmanager.h>
 #include <coreplugin/actionmanager/actionmanager.h>
 #include <coreplugin/editormanager/editormanager.h>

src/plugins/designer/settingspage.h

@@ -34,7 +34,6 @@
 #ifndef DESIGNER_SETTINGSPAGE_H
 #define DESIGNER_SETTINGSPAGE_H
 
-#include <coreplugin/icore.h>
 #include <coreplugin/dialogs/ioptionspage.h>
 
 QT_BEGIN_NAMESPACE

src/plugins/projectexplorer/buildmanager.cpp

@@ -40,6 +40,7 @@
 #include "projectexplorer.h"
 #include "taskwindow.h"
 
+#include <coreplugin/icore.h>
 #include <coreplugin/progressmanager/progressmanager.h>
 #include <coreplugin/progressmanager/futureprogress.h>
 #include <extensionsystem/pluginmanager.h>

src/plugins/projectexplorer/projectexplorer.cpp

@@ -62,9 +62,10 @@
 
 #include <coreplugin/basemode.h>
 #include <coreplugin/coreconstants.h>
+#include <coreplugin/filemanager.h>
+#include <coreplugin/icore.h>
 #include <coreplugin/mainwindow.h>
 #include <coreplugin/mimedatabase.h>
-#include <coreplugin/filemanager.h>
 #include <coreplugin/modemanager.h>
 #include <coreplugin/uniqueidmanager.h>
 #include <coreplugin/actionmanager/actionmanager.h>

src/plugins/projectexplorer/taskwindow.cpp

@@ -37,6 +37,7 @@
 #include <coreplugin/actionmanager/actionmanager.h>
 #include <coreplugin/editormanager/editormanager.h>
 #include <coreplugin/coreconstants.h>
+#include <coreplugin/icore.h>
 #include <coreplugin/uniqueidmanager.h>
 #include <extensionsystem/pluginmanager.h>
 #include <texteditor/itexteditor.h>

src/plugins/projectexplorer/taskwindow.h

@@ -38,7 +38,6 @@
 
 #include <coreplugin/ioutputpane.h>
 #include <coreplugin/icontext.h>
-#include <coreplugin/icore.h>
 
 #include <QtGui/QTreeWidget>
 #include <QtGui/QStyledItemDelegate>

src/plugins/qt4projectmanager/qt4buildconfigwidget.cpp

@@ -40,6 +40,7 @@
 #include "qt4projectmanager.h"
 #include "ui_qt4buildconfigwidget.h"
 
+#include <coreplugin/icore.h>
 #include <coreplugin/mainwindow.h>
 
 #include <QtGui/QFileDialog>

src/plugins/quickopen/filesystemfilter.h

@@ -37,7 +37,6 @@
 #include "iquickopenfilter.h"
 #include "ui_filesystemfilter.h"
 
-#include <coreplugin/icore.h>
 #include <coreplugin/editormanager/editormanager.h>
 
 #include <QtCore/QString>

src/plugins/quickopen/quickopenplugin.cpp

@@ -47,9 +47,10 @@
 
 #include <coreplugin/baseview.h>
 #include <coreplugin/coreconstants.h>
+#include <coreplugin/icore.h>
 #include <coreplugin/uniqueidmanager.h>
-#include <coreplugin/progressmanager/progressmanager.h>
 #include <coreplugin/actionmanager/actionmanager.h>
+#include <coreplugin/progressmanager/progressmanager.h>
 #include <extensionsystem/pluginmanager.h>
 #include <qtconcurrent/QtConcurrentTools>