Merge remote-tracking branch 'origin/2.6'

src/plugins/coreplugin/actionmanager/commandmappings.cpp

@@ -45,7 +45,7 @@
 #include <QTreeWidgetItem>
 #include <QFileDialog>
 #include <QCoreApplication>
-#include <QtDebug>
+#include <QDebug>
 
 Q_DECLARE_METATYPE(Core::Internal::ShortcutItem*)
 

src/plugins/coreplugin/dialogs/saveitemsdialog.cpp

@@ -41,7 +41,7 @@
 #include <QTreeWidget>
 #include <QHeaderView>
 #include <QCheckBox>
-#include <QtDebug>
+#include <QDebug>
 
 Q_DECLARE_METATYPE(Core::IDocument*)
 

src/plugins/coreplugin/dialogs/shortcutsettings.cpp

@@ -49,7 +49,7 @@
 #include <QKeyEvent>
 #include <QTreeWidgetItem>
 #include <QCoreApplication>
-#include <QtDebug>
+#include <QDebug>
 
 Q_DECLARE_METATYPE(Core::Internal::ShortcutItem*)
 

src/plugins/coreplugin/externaltool.cpp

@@ -56,7 +56,7 @@
 #include <QMenu>
 #include <QAction>
 
-#include <QtDebug>
+#include <QDebug>
 
 using namespace Core;
 using namespace Core::Internal;

src/plugins/coreplugin/id.cpp

@@ -129,7 +129,12 @@ QByteArray Id::name() const
 
 QString Id::toString() const
 {
-    return QString::fromUtf8(stringFromId[m_id]);
+    return QString::fromUtf8(stringFromId.at(m_id));
+}
+
+bool Id::operator==(const char *name) const
+{
+    return strcmp(stringFromId.at(m_id).constData(), name) == 0;
 }
 
 // For debugging purposes

src/plugins/coreplugin/id.h

@@ -50,7 +50,9 @@ public:
     QString toString() const;
     bool isValid() const { return m_id; }
     bool operator==(Id id) const { return m_id == id.m_id; }
+    bool operator==(const char *name) const;
     bool operator!=(Id id) const { return m_id != id.m_id; }
+    bool operator!=(const char *name) const { return !operator==(name); }
     bool operator<(Id id) const { return m_id < id.m_id; }
     bool operator>(Id id) const { return m_id > id.m_id; }
     int uniqueIdentifier() const { return m_id; }

src/plugins/coreplugin/plugindialog.cpp

@@ -42,7 +42,7 @@
 #include <QDialogButtonBox>
 #include <QPushButton>
 #include <QLabel>
-#include <QtDebug>
+#include <QDebug>
 
 using namespace Core::Internal;
 

src/plugins/coreplugin/toolsettings.cpp

@@ -43,7 +43,7 @@
 #include <QTime>
 #include <QIcon>
 
-#include <QtDebug>
+#include <QDebug>
 
 using namespace Core;
 using namespace Core::Internal;