diff options
Diffstat (limited to 'src/plugins/cppeditor')
29 files changed, 112 insertions, 112 deletions
diff --git a/src/plugins/cppeditor/cppautocompleter.cpp b/src/plugins/cppeditor/cppautocompleter.cpp index 6df2dbef60..442108a67a 100644 --- a/src/plugins/cppeditor/cppautocompleter.cpp +++ b/src/plugins/cppeditor/cppautocompleter.cpp @@ -38,8 +38,8 @@ #include <cplusplus/MatchingText.h> #include <cplusplus/BackwardsScanner.h> -#include <QtCore/QLatin1Char> -#include <QtGui/QTextCursor> +#include <QLatin1Char> +#include <QTextCursor> using namespace CppEditor; using namespace Internal; diff --git a/src/plugins/cppeditor/cppclasswizard.cpp b/src/plugins/cppeditor/cppclasswizard.cpp index 3388af7aac..d41a7c204b 100644 --- a/src/plugins/cppeditor/cppclasswizard.cpp +++ b/src/plugins/cppeditor/cppclasswizard.cpp @@ -42,17 +42,17 @@ #include <utils/newclasswidget.h> #include <utils/qtcassert.h> -#include <QtCore/QDebug> -#include <QtCore/QDir> -#include <QtCore/QTextStream> -#include <QtCore/QSettings> - -#include <QtGui/QVBoxLayout> -#include <QtGui/QHBoxLayout> -#include <QtGui/QPushButton> -#include <QtGui/QToolButton> -#include <QtGui/QSpacerItem> -#include <QtGui/QWizard> +#include <QDebug> +#include <QDir> +#include <QTextStream> +#include <QSettings> + +#include <QVBoxLayout> +#include <QHBoxLayout> +#include <QPushButton> +#include <QToolButton> +#include <QSpacerItem> +#include <QWizard> using namespace CppEditor; using namespace CppEditor::Internal; diff --git a/src/plugins/cppeditor/cppclasswizard.h b/src/plugins/cppeditor/cppclasswizard.h index 4608520acb..118dd589a3 100644 --- a/src/plugins/cppeditor/cppclasswizard.h +++ b/src/plugins/cppeditor/cppclasswizard.h @@ -36,8 +36,8 @@ #include <coreplugin/basefilewizard.h> #include <utils/wizard.h> -#include <QtCore/QStringList> -#include <QtGui/QWizardPage> +#include <QStringList> +#include <QWizardPage> namespace Utils { diff --git a/src/plugins/cppeditor/cppcompleteswitch.cpp b/src/plugins/cppeditor/cppcompleteswitch.cpp index 836201a277..c0deb7a5e2 100644 --- a/src/plugins/cppeditor/cppcompleteswitch.cpp +++ b/src/plugins/cppeditor/cppcompleteswitch.cpp @@ -43,7 +43,7 @@ #include <CoreTypes.h> #include <Symbols.h> -#include <QtGui/QApplication> +#include <QApplication> using namespace CPlusPlus; using namespace CppEditor; diff --git a/src/plugins/cppeditor/cppeditor.cpp b/src/plugins/cppeditor/cppeditor.cpp index 48b2ec3832..e4e0b712d5 100644 --- a/src/plugins/cppeditor/cppeditor.cpp +++ b/src/plugins/cppeditor/cppeditor.cpp @@ -97,24 +97,24 @@ #include <texteditor/codeassist/basicproposalitem.h> #include <texteditor/codeassist/genericproposal.h> -#include <QtCore/QDebug> -#include <QtCore/QTime> -#include <QtCore/QTimer> -#include <QtCore/QStack> -#include <QtCore/QSettings> -#include <QtCore/QSignalMapper> -#include <QtGui/QAction> -#include <QtGui/QApplication> -#include <QtGui/QHeaderView> -#include <QtGui/QLayout> -#include <QtGui/QMenu> -#include <QtGui/QShortcut> -#include <QtGui/QTextEdit> -#include <QtGui/QComboBox> -#include <QtGui/QToolBar> -#include <QtGui/QTreeView> -#include <QtGui/QSortFilterProxyModel> -#include <QtGui/QMainWindow> +#include <QDebug> +#include <QTime> +#include <QTimer> +#include <QStack> +#include <QSettings> +#include <QSignalMapper> +#include <QAction> +#include <QApplication> +#include <QHeaderView> +#include <QLayout> +#include <QMenu> +#include <QShortcut> +#include <QTextEdit> +#include <QComboBox> +#include <QToolBar> +#include <QTreeView> +#include <QSortFilterProxyModel> +#include <QMainWindow> #include <sstream> diff --git a/src/plugins/cppeditor/cppeditor.h b/src/plugins/cppeditor/cppeditor.h index 2f9b235e92..82cba02a94 100644 --- a/src/plugins/cppeditor/cppeditor.h +++ b/src/plugins/cppeditor/cppeditor.h @@ -44,12 +44,12 @@ #include <cpptools/commentssettings.h> #include <cpptools/cppsemanticinfo.h> -#include <QtCore/QThread> -#include <QtCore/QMutex> -#include <QtCore/QWaitCondition> -#include <QtCore/QFutureWatcher> -#include <QtCore/QModelIndex> -#include <QtCore/QVector> +#include <QThread> +#include <QMutex> +#include <QWaitCondition> +#include <QFutureWatcher> +#include <QModelIndex> +#include <QVector> QT_BEGIN_NAMESPACE class QComboBox; diff --git a/src/plugins/cppeditor/cppeditor_global.h b/src/plugins/cppeditor/cppeditor_global.h index 78b49dfd92..ee856d081d 100644 --- a/src/plugins/cppeditor/cppeditor_global.h +++ b/src/plugins/cppeditor/cppeditor_global.h @@ -33,7 +33,7 @@ #ifndef CPPEDITOR_GLOBAL_H #define CPPEDITOR_GLOBAL_H -#include <QtCore/qglobal.h> +#include <qglobal.h> #if defined(CPPEDITOR_LIBRARY) # define CPPEDITOR_EXPORT Q_DECL_EXPORT diff --git a/src/plugins/cppeditor/cppelementevaluator.cpp b/src/plugins/cppeditor/cppelementevaluator.cpp index fa063aea6e..980768e593 100644 --- a/src/plugins/cppeditor/cppelementevaluator.cpp +++ b/src/plugins/cppeditor/cppelementevaluator.cpp @@ -51,10 +51,10 @@ #include <cplusplus/LookupItem.h> #include <cplusplus/Icons.h> -#include <QtCore/QDir> -#include <QtCore/QFileInfo> -#include <QtCore/QSet> -#include <QtCore/QQueue> +#include <QDir> +#include <QFileInfo> +#include <QSet> +#include <QQueue> using namespace CppEditor; using namespace Internal; diff --git a/src/plugins/cppeditor/cppelementevaluator.h b/src/plugins/cppeditor/cppelementevaluator.h index fce6551537..bb8ba134da 100644 --- a/src/plugins/cppeditor/cppelementevaluator.h +++ b/src/plugins/cppeditor/cppelementevaluator.h @@ -40,11 +40,11 @@ #include <cplusplus/CppDocument.h> #include <cplusplus/Overview.h> -#include <QtCore/QString> -#include <QtCore/QStringList> -#include <QtCore/QSharedPointer> -#include <QtGui/QTextCursor> -#include <QtGui/QIcon> +#include <QString> +#include <QStringList> +#include <QSharedPointer> +#include <QTextCursor> +#include <QIcon> namespace CPlusPlus { class LookupItem; diff --git a/src/plugins/cppeditor/cppfilewizard.cpp b/src/plugins/cppeditor/cppfilewizard.cpp index 9c04ca762f..54790a5714 100644 --- a/src/plugins/cppeditor/cppfilewizard.cpp +++ b/src/plugins/cppeditor/cppfilewizard.cpp @@ -37,9 +37,9 @@ #include <cpptools/abstracteditorsupport.h> #include <utils/codegeneration.h> -#include <QtCore/QTextStream> -#include <QtCore/QFileInfo> -#include <QtCore/QDebug> +#include <QTextStream> +#include <QFileInfo> +#include <QDebug> using namespace CppEditor; using namespace CppEditor::Internal; diff --git a/src/plugins/cppeditor/cppfunctiondecldeflink.cpp b/src/plugins/cppeditor/cppfunctiondecldeflink.cpp index 3c79791d36..b7af611ae2 100644 --- a/src/plugins/cppeditor/cppfunctiondecldeflink.cpp +++ b/src/plugins/cppeditor/cppfunctiondecldeflink.cpp @@ -55,8 +55,8 @@ #include <coreplugin/icore.h> #include <texteditor/texteditorconstants.h> -#include <QtCore/QtConcurrentRun> -#include <QtCore/QVarLengthArray> +#include <QtConcurrentRun> +#include <QVarLengthArray> using namespace CPlusPlus; using namespace CppEditor; diff --git a/src/plugins/cppeditor/cppfunctiondecldeflink.h b/src/plugins/cppeditor/cppfunctiondecldeflink.h index 2b2b4ae897..b7090de6e9 100644 --- a/src/plugins/cppeditor/cppfunctiondecldeflink.h +++ b/src/plugins/cppeditor/cppfunctiondecldeflink.h @@ -41,11 +41,11 @@ #include <cpptools/cpprefactoringchanges.h> #include <utils/changeset.h> -#include <QtCore/QString> -#include <QtCore/QCoreApplication> -#include <QtCore/QSharedPointer> -#include <QtCore/QFutureWatcher> -#include <QtGui/QTextCursor> +#include <QString> +#include <QCoreApplication> +#include <QSharedPointer> +#include <QFutureWatcher> +#include <QTextCursor> namespace CppEditor { namespace Internal { diff --git a/src/plugins/cppeditor/cpphighlighter.cpp b/src/plugins/cppeditor/cpphighlighter.cpp index 347d8546de..406d9b9467 100644 --- a/src/plugins/cppeditor/cpphighlighter.cpp +++ b/src/plugins/cppeditor/cpphighlighter.cpp @@ -37,8 +37,8 @@ #include <cplusplus/SimpleLexer.h> #include <texteditor/basetextdocumentlayout.h> -#include <QtGui/QTextDocument> -#include <QtCore/QDebug> +#include <QTextDocument> +#include <QDebug> using namespace CppEditor::Internal; using namespace TextEditor; diff --git a/src/plugins/cppeditor/cpphighlighter.h b/src/plugins/cppeditor/cpphighlighter.h index 9019153948..ac79df8114 100644 --- a/src/plugins/cppeditor/cpphighlighter.h +++ b/src/plugins/cppeditor/cpphighlighter.h @@ -35,8 +35,8 @@ #include "cppeditorenums.h" #include <texteditor/syntaxhighlighter.h> -#include <QtGui/QTextCharFormat> -#include <QtCore/QtAlgorithms> +#include <QTextCharFormat> +#include <QtAlgorithms> namespace CppEditor { diff --git a/src/plugins/cppeditor/cpphoverhandler.cpp b/src/plugins/cppeditor/cpphoverhandler.cpp index a8aab85d83..6e6d3e30ee 100644 --- a/src/plugins/cppeditor/cpphoverhandler.cpp +++ b/src/plugins/cppeditor/cpphoverhandler.cpp @@ -43,8 +43,8 @@ #include <texteditor/basetexteditor.h> #include <texteditor/helpitem.h> -#include <QtGui/QTextCursor> -#include <QtCore/QUrl> +#include <QTextCursor> +#include <QUrl> using namespace CppEditor::Internal; using namespace Core; diff --git a/src/plugins/cppeditor/cpphoverhandler.h b/src/plugins/cppeditor/cpphoverhandler.h index 9a6480f23c..ee7411ae9a 100644 --- a/src/plugins/cppeditor/cpphoverhandler.h +++ b/src/plugins/cppeditor/cpphoverhandler.h @@ -35,7 +35,7 @@ #include <texteditor/basehoverhandler.h> -#include <QtCore/QObject> +#include <QObject> namespace Core { class IEditor; diff --git a/src/plugins/cppeditor/cppinsertdecldef.cpp b/src/plugins/cppeditor/cppinsertdecldef.cpp index 2da7055c1e..827e8ad5ee 100644 --- a/src/plugins/cppeditor/cppinsertdecldef.cpp +++ b/src/plugins/cppeditor/cppinsertdecldef.cpp @@ -45,14 +45,14 @@ #include <utils/qtcassert.h> -#include <QtCore/QCoreApplication> -#include <QtCore/QDir> -#include <QtCore/QHash> -#include <QtCore/QStringBuilder> -#include <QtGui/QTextDocument> -#include <QtGui/QTextBlock> -#include <QtGui/QInputDialog> -#include <QtGui/QMessageBox> +#include <QCoreApplication> +#include <QDir> +#include <QHash> +#include <QStringBuilder> +#include <QTextDocument> +#include <QTextBlock> +#include <QInputDialog> +#include <QMessageBox> using namespace CPlusPlus; using namespace CppEditor; diff --git a/src/plugins/cppeditor/cppinsertqtpropertymembers.cpp b/src/plugins/cppeditor/cppinsertqtpropertymembers.cpp index e34e516ce7..7a5e34ec54 100644 --- a/src/plugins/cppeditor/cppinsertqtpropertymembers.cpp +++ b/src/plugins/cppeditor/cppinsertqtpropertymembers.cpp @@ -44,7 +44,7 @@ #include <utils/qtcassert.h> -#include <QtCore/QTextStream> +#include <QTextStream> using namespace CPlusPlus; using namespace CppTools; diff --git a/src/plugins/cppeditor/cppinsertqtpropertymembers.h b/src/plugins/cppeditor/cppinsertqtpropertymembers.h index 78479f06c2..a87f6f3565 100644 --- a/src/plugins/cppeditor/cppinsertqtpropertymembers.h +++ b/src/plugins/cppeditor/cppinsertqtpropertymembers.h @@ -35,7 +35,7 @@ #include <cppeditor/cppquickfix.h> -#include <QtCore/QString> +#include <QString> namespace CPlusPlus { class QtPropertyDeclarationAST; diff --git a/src/plugins/cppeditor/cppoutline.cpp b/src/plugins/cppeditor/cppoutline.cpp index 7553d092d5..727f0c5fa5 100644 --- a/src/plugins/cppeditor/cppoutline.cpp +++ b/src/plugins/cppeditor/cppoutline.cpp @@ -40,10 +40,10 @@ #include <cplusplus/OverviewModel.h> #include <utils/qtcassert.h> -#include <QtCore/QDebug> -#include <QtCore/QTimer> -#include <QtGui/QVBoxLayout> -#include <QtGui/QMenu> +#include <QDebug> +#include <QTimer> +#include <QVBoxLayout> +#include <QMenu> using namespace CppEditor::Internal; diff --git a/src/plugins/cppeditor/cppoutline.h b/src/plugins/cppeditor/cppoutline.h index 2ada826692..923fcf6819 100644 --- a/src/plugins/cppeditor/cppoutline.h +++ b/src/plugins/cppeditor/cppoutline.h @@ -38,8 +38,8 @@ #include <utils/navigationtreeview.h> #include <texteditor/ioutlinewidget.h> -#include <QtGui/QSortFilterProxyModel> -#include <QtGui/QTreeView> +#include <QSortFilterProxyModel> +#include <QTreeView> namespace CppEditor { namespace Internal { diff --git a/src/plugins/cppeditor/cppplugin.cpp b/src/plugins/cppeditor/cppplugin.cpp index 69bee4b568..072cce9806 100644 --- a/src/plugins/cppeditor/cppplugin.cpp +++ b/src/plugins/cppeditor/cppplugin.cpp @@ -61,13 +61,13 @@ #include <cpptools/cpptoolsconstants.h> #include <cpptools/cpptoolssettings.h> -#include <QtCore/QFileInfo> -#include <QtCore/QSettings> -#include <QtCore/QTimer> -#include <QtCore/QCoreApplication> -#include <QtCore/QStringList> +#include <QFileInfo> +#include <QSettings> +#include <QTimer> +#include <QCoreApplication> +#include <QStringList> -#include <QtGui/QMenu> +#include <QMenu> using namespace CppEditor; using namespace CppEditor::Internal; diff --git a/src/plugins/cppeditor/cppplugin.h b/src/plugins/cppeditor/cppplugin.h index 386a18f6bf..f082fdcdc2 100644 --- a/src/plugins/cppeditor/cppplugin.h +++ b/src/plugins/cppeditor/cppplugin.h @@ -36,9 +36,9 @@ #include <extensionsystem/iplugin.h> #include <coreplugin/editormanager/ieditorfactory.h> -#include <QtCore/QtPlugin> -#include <QtCore/QStringList> -#include <QtGui/QAction> +#include <QtPlugin> +#include <QStringList> +#include <QAction> namespace TextEditor { class TextEditorActionHandler; diff --git a/src/plugins/cppeditor/cppquickfix.cpp b/src/plugins/cppeditor/cppquickfix.cpp index 500d757ab2..247d4ab3c9 100644 --- a/src/plugins/cppeditor/cppquickfix.cpp +++ b/src/plugins/cppeditor/cppquickfix.cpp @@ -48,8 +48,8 @@ #include <cpptools/cpprefactoringchanges.h> -#include <QtGui/QTextBlock> -#include <QtCore/QFileInfo> +#include <QTextBlock> +#include <QFileInfo> using namespace CppEditor; using namespace CppEditor::Internal; diff --git a/src/plugins/cppeditor/cppquickfixassistant.cpp b/src/plugins/cppeditor/cppquickfixassistant.cpp index 78ed85367c..23ed9bfa0c 100644 --- a/src/plugins/cppeditor/cppquickfixassistant.cpp +++ b/src/plugins/cppeditor/cppquickfixassistant.cpp @@ -53,8 +53,8 @@ #include <extensionsystem/pluginmanager.h> -#include <QtCore/QFileInfo> -#include <QtGui/QTextBlock> +#include <QFileInfo> +#include <QTextBlock> using namespace CppEditor; using namespace CppEditor::Internal; diff --git a/src/plugins/cppeditor/cppquickfixes.cpp b/src/plugins/cppeditor/cppquickfixes.cpp index 7bfd97b7e3..6505989da9 100644 --- a/src/plugins/cppeditor/cppquickfixes.cpp +++ b/src/plugins/cppeditor/cppquickfixes.cpp @@ -70,10 +70,10 @@ #include <utils/qtcassert.h> -#include <QtCore/QFileInfo> -#include <QtGui/QApplication> -#include <QtGui/QTextBlock> -#include <QtGui/QTextCursor> +#include <QFileInfo> +#include <QApplication> +#include <QTextBlock> +#include <QTextCursor> #include <cctype> using namespace CppEditor; diff --git a/src/plugins/cppeditor/cppsnippetprovider.cpp b/src/plugins/cppeditor/cppsnippetprovider.cpp index ec12ac0036..93f085804d 100644 --- a/src/plugins/cppeditor/cppsnippetprovider.cpp +++ b/src/plugins/cppeditor/cppsnippetprovider.cpp @@ -43,8 +43,8 @@ #include <texteditor/texteditorconstants.h> #include <texteditor/snippets/snippeteditor.h> -#include <QtCore/QLatin1String> -#include <QtCore/QCoreApplication> +#include <QLatin1String> +#include <QCoreApplication> using namespace CppEditor; using namespace Internal; diff --git a/src/plugins/cppeditor/cpptypehierarchy.cpp b/src/plugins/cppeditor/cpptypehierarchy.cpp index 738e21c86f..886c369856 100644 --- a/src/plugins/cppeditor/cpptypehierarchy.cpp +++ b/src/plugins/cppeditor/cpptypehierarchy.cpp @@ -41,13 +41,13 @@ #include <utils/navigationtreeview.h> #include <utils/annotateditemdelegate.h> -#include <QtCore/QLatin1Char> -#include <QtCore/QLatin1String> -#include <QtCore/QModelIndex> -#include <QtCore/QVector> -#include <QtGui/QVBoxLayout> -#include <QtGui/QStandardItemModel> -#include <QtGui/QLabel> +#include <QLatin1Char> +#include <QLatin1String> +#include <QModelIndex> +#include <QVector> +#include <QVBoxLayout> +#include <QStandardItemModel> +#include <QLabel> using namespace CppEditor; using namespace Internal; diff --git a/src/plugins/cppeditor/cpptypehierarchy.h b/src/plugins/cppeditor/cpptypehierarchy.h index 4e172ede85..ed8510f936 100644 --- a/src/plugins/cppeditor/cpptypehierarchy.h +++ b/src/plugins/cppeditor/cpptypehierarchy.h @@ -35,9 +35,9 @@ #include <coreplugin/inavigationwidgetfactory.h> -#include <QtCore/QString> -#include <QtGui/QWidget> -#include <QtGui/QStackedWidget> +#include <QString> +#include <QWidget> +#include <QStackedWidget> QT_BEGIN_NAMESPACE class QStandardItemModel; |