diff options
Diffstat (limited to 'src/plugins/remotelinux')
71 files changed, 195 insertions, 195 deletions
diff --git a/src/plugins/remotelinux/abstractpackagingstep.cpp b/src/plugins/remotelinux/abstractpackagingstep.cpp index b860ac5433..b71c675578 100644 --- a/src/plugins/remotelinux/abstractpackagingstep.cpp +++ b/src/plugins/remotelinux/abstractpackagingstep.cpp @@ -40,8 +40,8 @@ #include <projectexplorer/task.h> #include <utils/fileutils.h> -#include <QtCore/QDateTime> -#include <QtCore/QFileInfo> +#include <QDateTime> +#include <QFileInfo> using namespace ProjectExplorer; diff --git a/src/plugins/remotelinux/abstractremotelinuxdeployservice.cpp b/src/plugins/remotelinux/abstractremotelinuxdeployservice.cpp index 3c3b9cd914..80be33ea36 100644 --- a/src/plugins/remotelinux/abstractremotelinuxdeployservice.cpp +++ b/src/plugins/remotelinux/abstractremotelinuxdeployservice.cpp @@ -39,10 +39,10 @@ #include <utils/ssh/sshconnection.h> #include <utils/ssh/sshconnectionmanager.h> -#include <QtCore/QDateTime> -#include <QtCore/QFileInfo> -#include <QtCore/QPointer> -#include <QtCore/QString> +#include <QDateTime> +#include <QFileInfo> +#include <QPointer> +#include <QString> using namespace Qt4ProjectManager; using namespace Utils; diff --git a/src/plugins/remotelinux/abstractremotelinuxdeployservice.h b/src/plugins/remotelinux/abstractremotelinuxdeployservice.h index 2413fca1c1..e0f4fb5d3f 100644 --- a/src/plugins/remotelinux/abstractremotelinuxdeployservice.h +++ b/src/plugins/remotelinux/abstractremotelinuxdeployservice.h @@ -34,9 +34,9 @@ #include "remotelinux_export.h" -#include <QtCore/QObject> -#include <QtCore/QSharedPointer> -#include <QtCore/QVariantMap> +#include <QObject> +#include <QSharedPointer> +#include <QVariantMap> QT_FORWARD_DECLARE_CLASS(QString) namespace Utils { class SshConnection; } diff --git a/src/plugins/remotelinux/abstractremotelinuxdeploystep.h b/src/plugins/remotelinux/abstractremotelinuxdeploystep.h index d96108a12d..0c68d56546 100644 --- a/src/plugins/remotelinux/abstractremotelinuxdeploystep.h +++ b/src/plugins/remotelinux/abstractremotelinuxdeploystep.h @@ -36,7 +36,7 @@ #include <projectexplorer/buildstep.h> -#include <QtCore/QVariantMap> +#include <QVariantMap> namespace RemoteLinux { class AbstractRemoteLinuxDeployService; diff --git a/src/plugins/remotelinux/abstractuploadandinstallpackageservice.cpp b/src/plugins/remotelinux/abstractuploadandinstallpackageservice.cpp index 8ffa4def9a..cc70ffb79b 100644 --- a/src/plugins/remotelinux/abstractuploadandinstallpackageservice.cpp +++ b/src/plugins/remotelinux/abstractuploadandinstallpackageservice.cpp @@ -39,8 +39,8 @@ #include <utils/qtcassert.h> #include <utils/ssh/sshconnection.h> -#include <QtCore/QFileInfo> -#include <QtCore/QString> +#include <QFileInfo> +#include <QString> namespace RemoteLinux { namespace Internal { diff --git a/src/plugins/remotelinux/deployablefile.h b/src/plugins/remotelinux/deployablefile.h index 7e89cf4ce9..61dc6287b7 100644 --- a/src/plugins/remotelinux/deployablefile.h +++ b/src/plugins/remotelinux/deployablefile.h @@ -35,9 +35,9 @@ #include "remotelinux_export.h" -#include <QtCore/QFileInfo> -#include <QtCore/QHash> -#include <QtCore/QString> +#include <QFileInfo> +#include <QHash> +#include <QString> namespace RemoteLinux { diff --git a/src/plugins/remotelinux/deployablefilesperprofile.cpp b/src/plugins/remotelinux/deployablefilesperprofile.cpp index 712ecae72a..8cfb982aa5 100644 --- a/src/plugins/remotelinux/deployablefilesperprofile.cpp +++ b/src/plugins/remotelinux/deployablefilesperprofile.cpp @@ -35,9 +35,9 @@ #include <utils/qtcassert.h> -#include <QtCore/QFileInfo> -#include <QtCore/QDir> -#include <QtGui/QBrush> +#include <QFileInfo> +#include <QDir> +#include <QBrush> using namespace Qt4ProjectManager; diff --git a/src/plugins/remotelinux/deployablefilesperprofile.h b/src/plugins/remotelinux/deployablefilesperprofile.h index a962baebfc..5fd9695995 100644 --- a/src/plugins/remotelinux/deployablefilesperprofile.h +++ b/src/plugins/remotelinux/deployablefilesperprofile.h @@ -37,9 +37,9 @@ #include <qt4projectmanager/qt4nodes.h> -#include <QtCore/QAbstractTableModel> -#include <QtCore/QList> -#include <QtCore/QString> +#include <QAbstractTableModel> +#include <QList> +#include <QString> namespace RemoteLinux { class DeployableFile; diff --git a/src/plugins/remotelinux/deploymentinfo.cpp b/src/plugins/remotelinux/deploymentinfo.cpp index f5cfea8d29..42c31dff6d 100644 --- a/src/plugins/remotelinux/deploymentinfo.cpp +++ b/src/plugins/remotelinux/deploymentinfo.cpp @@ -39,8 +39,8 @@ #include <qt4projectmanager/qt4buildconfiguration.h> #include <qt4projectmanager/qt4project.h> -#include <QtCore/QList> -#include <QtCore/QTimer> +#include <QList> +#include <QTimer> using namespace Qt4ProjectManager; diff --git a/src/plugins/remotelinux/deploymentinfo.h b/src/plugins/remotelinux/deploymentinfo.h index 2b02cc2136..5690b3f7c2 100644 --- a/src/plugins/remotelinux/deploymentinfo.h +++ b/src/plugins/remotelinux/deploymentinfo.h @@ -34,7 +34,7 @@ #include "remotelinux_export.h" -#include <QtCore/QAbstractListModel> +#include <QAbstractListModel> namespace Qt4ProjectManager { class Qt4ProFileNode; } diff --git a/src/plugins/remotelinux/deploymentsettingsassistant.cpp b/src/plugins/remotelinux/deploymentsettingsassistant.cpp index 05d77dd53d..330e9e3e70 100644 --- a/src/plugins/remotelinux/deploymentsettingsassistant.cpp +++ b/src/plugins/remotelinux/deploymentsettingsassistant.cpp @@ -41,10 +41,10 @@ #include <utils/fileutils.h> #include <utils/qtcassert.h> -#include <QtCore/QDir> -#include <QtCore/QHash> -#include <QtCore/QString> -#include <QtGui/QMainWindow> +#include <QDir> +#include <QHash> +#include <QString> +#include <QMainWindow> using namespace Qt4ProjectManager; diff --git a/src/plugins/remotelinux/deploymentsettingsassistant.h b/src/plugins/remotelinux/deploymentsettingsassistant.h index 7dae9683dd..d2912845bb 100644 --- a/src/plugins/remotelinux/deploymentsettingsassistant.h +++ b/src/plugins/remotelinux/deploymentsettingsassistant.h @@ -33,8 +33,8 @@ #include "remotelinux_export.h" -#include <QtCore/QObject> -#include <QtCore/QStringList> +#include <QObject> +#include <QStringList> namespace RemoteLinux { class DeployableFile; diff --git a/src/plugins/remotelinux/embeddedlinuxqtversion.cpp b/src/plugins/remotelinux/embeddedlinuxqtversion.cpp index e6e61907a8..024938c441 100644 --- a/src/plugins/remotelinux/embeddedlinuxqtversion.cpp +++ b/src/plugins/remotelinux/embeddedlinuxqtversion.cpp @@ -36,7 +36,7 @@ #include <qtsupport/qtsupportconstants.h> -#include <QtCore/QCoreApplication> +#include <QCoreApplication> namespace RemoteLinux { namespace Internal { diff --git a/src/plugins/remotelinux/embeddedlinuxqtversionfactory.cpp b/src/plugins/remotelinux/embeddedlinuxqtversionfactory.cpp index ca1706db69..7ae2b9399e 100644 --- a/src/plugins/remotelinux/embeddedlinuxqtversionfactory.cpp +++ b/src/plugins/remotelinux/embeddedlinuxqtversionfactory.cpp @@ -35,7 +35,7 @@ #include "embeddedlinuxqtversion.h" #include "remotelinux_constants.h" -#include <QtCore/QFileInfo> +#include <QFileInfo> namespace RemoteLinux { namespace Internal { diff --git a/src/plugins/remotelinux/embeddedlinuxtargetfactory.cpp b/src/plugins/remotelinux/embeddedlinuxtargetfactory.cpp index b5a1b328b0..4d7488689c 100644 --- a/src/plugins/remotelinux/embeddedlinuxtargetfactory.cpp +++ b/src/plugins/remotelinux/embeddedlinuxtargetfactory.cpp @@ -45,7 +45,7 @@ #include <qtsupport/qtversionmanager.h> -#include <QtGui/QIcon> +#include <QIcon> namespace RemoteLinux { namespace Internal { diff --git a/src/plugins/remotelinux/genericdirectuploadservice.cpp b/src/plugins/remotelinux/genericdirectuploadservice.cpp index eb6579cb15..acd43b91d9 100644 --- a/src/plugins/remotelinux/genericdirectuploadservice.cpp +++ b/src/plugins/remotelinux/genericdirectuploadservice.cpp @@ -38,10 +38,10 @@ #include <utils/ssh/sshconnection.h> #include <utils/ssh/sshremoteprocess.h> -#include <QtCore/QDir> -#include <QtCore/QFileInfo> -#include <QtCore/QList> -#include <QtCore/QString> +#include <QDir> +#include <QFileInfo> +#include <QList> +#include <QString> using namespace Utils; diff --git a/src/plugins/remotelinux/genericdirectuploadservice.h b/src/plugins/remotelinux/genericdirectuploadservice.h index 33cb51cb69..320afb6a45 100644 --- a/src/plugins/remotelinux/genericdirectuploadservice.h +++ b/src/plugins/remotelinux/genericdirectuploadservice.h @@ -37,7 +37,7 @@ #include <utils/ssh/sftpdefs.h> -#include <QtCore/QList> +#include <QList> QT_FORWARD_DECLARE_CLASS(QString) diff --git a/src/plugins/remotelinux/genericdirectuploadstep.cpp b/src/plugins/remotelinux/genericdirectuploadstep.cpp index 2bed32616e..fe15607c92 100644 --- a/src/plugins/remotelinux/genericdirectuploadstep.cpp +++ b/src/plugins/remotelinux/genericdirectuploadstep.cpp @@ -36,10 +36,10 @@ #include "genericdirectuploadservice.h" #include "remotelinuxdeployconfiguration.h" -#include <QtGui/QCheckBox> -#include <QtGui/QVBoxLayout> -#include <QtCore/QList> -#include <QtCore/QSharedPointer> +#include <QCheckBox> +#include <QVBoxLayout> +#include <QList> +#include <QSharedPointer> using namespace ProjectExplorer; diff --git a/src/plugins/remotelinux/genericembeddedlinuxtarget.cpp b/src/plugins/remotelinux/genericembeddedlinuxtarget.cpp index 7597f6d2ef..a20ed770fc 100644 --- a/src/plugins/remotelinux/genericembeddedlinuxtarget.cpp +++ b/src/plugins/remotelinux/genericembeddedlinuxtarget.cpp @@ -41,7 +41,7 @@ #include <qt4projectmanager/qt4project.h> #include <qtsupport/baseqtversion.h> -#include <QtCore/QCoreApplication> +#include <QCoreApplication> namespace RemoteLinux { namespace Internal { diff --git a/src/plugins/remotelinux/genericlinuxdeviceconfigurationwizardpages.h b/src/plugins/remotelinux/genericlinuxdeviceconfigurationwizardpages.h index 9372985ee7..e5b22c5feb 100644 --- a/src/plugins/remotelinux/genericlinuxdeviceconfigurationwizardpages.h +++ b/src/plugins/remotelinux/genericlinuxdeviceconfigurationwizardpages.h @@ -35,7 +35,7 @@ #include <utils/ssh/sshconnection.h> -#include <QtGui/QWizardPage> +#include <QWizardPage> namespace RemoteLinux { namespace Internal { diff --git a/src/plugins/remotelinux/linuxdeviceconfiguration.cpp b/src/plugins/remotelinux/linuxdeviceconfiguration.cpp index 6b8918a268..1fcd6b1e3a 100644 --- a/src/plugins/remotelinux/linuxdeviceconfiguration.cpp +++ b/src/plugins/remotelinux/linuxdeviceconfiguration.cpp @@ -36,8 +36,8 @@ #include <utils/ssh/sshconnection.h> -#include <QtCore/QSettings> -#include <QtGui/QDesktopServices> +#include <QSettings> +#include <QDesktopServices> using namespace Utils; typedef SshConnectionParameters::AuthenticationType AuthType; diff --git a/src/plugins/remotelinux/linuxdeviceconfiguration.h b/src/plugins/remotelinux/linuxdeviceconfiguration.h index 14943b9a4d..c98ce2eb51 100644 --- a/src/plugins/remotelinux/linuxdeviceconfiguration.h +++ b/src/plugins/remotelinux/linuxdeviceconfiguration.h @@ -34,11 +34,11 @@ #include "remotelinux_export.h" -#include <QtCore/QSharedPointer> -#include <QtCore/QString> -#include <QtCore/QStringList> -#include <QtCore/QVariantHash> -#include <QtGui/QWizard> +#include <QSharedPointer> +#include <QString> +#include <QStringList> +#include <QVariantHash> +#include <QWizard> QT_BEGIN_NAMESPACE class QDialog; diff --git a/src/plugins/remotelinux/linuxdeviceconfigurations.cpp b/src/plugins/remotelinux/linuxdeviceconfigurations.cpp index cd0e5d373d..47842bf568 100644 --- a/src/plugins/remotelinux/linuxdeviceconfigurations.cpp +++ b/src/plugins/remotelinux/linuxdeviceconfigurations.cpp @@ -36,10 +36,10 @@ #include <coreplugin/icore.h> #include <utils/qtcassert.h> -#include <QtCore/QHash> -#include <QtCore/QList> -#include <QtCore/QSettings> -#include <QtCore/QString> +#include <QHash> +#include <QList> +#include <QSettings> +#include <QString> #include <algorithm> diff --git a/src/plugins/remotelinux/linuxdeviceconfigurations.h b/src/plugins/remotelinux/linuxdeviceconfigurations.h index fac3034887..3a48697bc2 100644 --- a/src/plugins/remotelinux/linuxdeviceconfigurations.h +++ b/src/plugins/remotelinux/linuxdeviceconfigurations.h @@ -35,7 +35,7 @@ #include "linuxdeviceconfiguration.h" #include "remotelinux_export.h" -#include <QtCore/QAbstractListModel> +#include <QAbstractListModel> QT_FORWARD_DECLARE_CLASS(QString) diff --git a/src/plugins/remotelinux/linuxdeviceconfigurationssettingswidget.cpp b/src/plugins/remotelinux/linuxdeviceconfigurationssettingswidget.cpp index 33e124d2b0..c510e5413d 100644 --- a/src/plugins/remotelinux/linuxdeviceconfigurationssettingswidget.cpp +++ b/src/plugins/remotelinux/linuxdeviceconfigurationssettingswidget.cpp @@ -42,15 +42,15 @@ #include <extensionsystem/pluginmanager.h> #include <utils/ssh/sshremoteprocessrunner.h> -#include <QtCore/QFileInfo> -#include <QtCore/QRegExp> -#include <QtCore/QSettings> -#include <QtCore/QSignalMapper> -#include <QtCore/QTextStream> - -#include <QtGui/QFileDialog> -#include <QtGui/QMessageBox> -#include <QtGui/QIntValidator> +#include <QFileInfo> +#include <QRegExp> +#include <QSettings> +#include <QSignalMapper> +#include <QTextStream> + +#include <QFileDialog> +#include <QMessageBox> +#include <QIntValidator> #include <algorithm> diff --git a/src/plugins/remotelinux/linuxdeviceconfigurationssettingswidget.h b/src/plugins/remotelinux/linuxdeviceconfigurationssettingswidget.h index a284787d76..fd441fb19a 100644 --- a/src/plugins/remotelinux/linuxdeviceconfigurationssettingswidget.h +++ b/src/plugins/remotelinux/linuxdeviceconfigurationssettingswidget.h @@ -32,11 +32,11 @@ #ifndef LINUXDEVICECONFIGURATIONSSETTINGSWIDGET_H #define LINUXDEVICECONFIGURATIONSSETTINGSWIDGET_H -#include <QtCore/QList> -#include <QtCore/QScopedPointer> -#include <QtCore/QString> -#include <QtGui/QPushButton> -#include <QtGui/QWidget> +#include <QList> +#include <QScopedPointer> +#include <QString> +#include <QPushButton> +#include <QWidget> QT_BEGIN_NAMESPACE class QLineEdit; diff --git a/src/plugins/remotelinux/linuxdevicefactoryselectiondialog.cpp b/src/plugins/remotelinux/linuxdevicefactoryselectiondialog.cpp index 611c162c57..5a3f495960 100644 --- a/src/plugins/remotelinux/linuxdevicefactoryselectiondialog.cpp +++ b/src/plugins/remotelinux/linuxdevicefactoryselectiondialog.cpp @@ -37,7 +37,7 @@ #include <extensionsystem/pluginmanager.h> #include <utils/qtcassert.h> -#include <QtGui/QPushButton> +#include <QPushButton> namespace RemoteLinux { namespace Internal { diff --git a/src/plugins/remotelinux/linuxdevicefactoryselectiondialog.h b/src/plugins/remotelinux/linuxdevicefactoryselectiondialog.h index f2d1b53edf..3d6fd0ce72 100644 --- a/src/plugins/remotelinux/linuxdevicefactoryselectiondialog.h +++ b/src/plugins/remotelinux/linuxdevicefactoryselectiondialog.h @@ -33,8 +33,8 @@ #ifndef LINUXDEVICEFACTORYSELECTIONDIALOG_H #define LINUXDEVICEFACTORYSELECTIONDIALOG_H -#include <QtCore/QList> -#include <QtGui/QDialog> +#include <QList> +#include <QDialog> namespace RemoteLinux { class ILinuxDeviceConfigurationFactory; diff --git a/src/plugins/remotelinux/linuxdevicetestdialog.cpp b/src/plugins/remotelinux/linuxdevicetestdialog.cpp index 3d09e830af..b5daf66806 100644 --- a/src/plugins/remotelinux/linuxdevicetestdialog.cpp +++ b/src/plugins/remotelinux/linuxdevicetestdialog.cpp @@ -32,11 +32,11 @@ #include "linuxdevicetestdialog.h" #include "ui_linuxdevicetestdialog.h" -#include <QtGui/QBrush> -#include <QtGui/QColor> -#include <QtGui/QFont> -#include <QtGui/QPushButton> -#include <QtGui/QTextCharFormat> +#include <QBrush> +#include <QColor> +#include <QFont> +#include <QPushButton> +#include <QTextCharFormat> namespace RemoteLinux { namespace Internal { diff --git a/src/plugins/remotelinux/linuxdevicetestdialog.h b/src/plugins/remotelinux/linuxdevicetestdialog.h index 45b7bc7c87..001a11b75b 100644 --- a/src/plugins/remotelinux/linuxdevicetestdialog.h +++ b/src/plugins/remotelinux/linuxdevicetestdialog.h @@ -35,7 +35,7 @@ #include "linuxdevicetester.h" #include "remotelinux_export.h" -#include <QtGui/QDialog> +#include <QDialog> namespace RemoteLinux { namespace Internal { diff --git a/src/plugins/remotelinux/linuxdevicetester.h b/src/plugins/remotelinux/linuxdevicetester.h index 47508d8cc0..7e2ef787ab 100644 --- a/src/plugins/remotelinux/linuxdevicetester.h +++ b/src/plugins/remotelinux/linuxdevicetester.h @@ -34,8 +34,8 @@ #include "remotelinux_export.h" -#include <QtCore/QObject> -#include <QtCore/QSharedPointer> +#include <QObject> +#include <QSharedPointer> QT_FORWARD_DECLARE_CLASS(QString) diff --git a/src/plugins/remotelinux/packageuploader.h b/src/plugins/remotelinux/packageuploader.h index 05e5806e4d..3c671257bd 100644 --- a/src/plugins/remotelinux/packageuploader.h +++ b/src/plugins/remotelinux/packageuploader.h @@ -33,9 +33,9 @@ #ifndef PACKAGEUPLOADER_H #define PACKAGEUPLOADER_H -#include <QtCore/QObject> -#include <QtCore/QSharedPointer> -#include <QtCore/QString> +#include <QObject> +#include <QSharedPointer> +#include <QString> #include <utils/ssh/sftpdefs.h> diff --git a/src/plugins/remotelinux/portlist.cpp b/src/plugins/remotelinux/portlist.cpp index 894dd3e93a..679f139220 100644 --- a/src/plugins/remotelinux/portlist.cpp +++ b/src/plugins/remotelinux/portlist.cpp @@ -31,9 +31,9 @@ **************************************************************************/ #include "portlist.h" -#include <QtCore/QList> -#include <QtCore/QPair> -#include <QtCore/QString> +#include <QList> +#include <QPair> +#include <QString> #include <cctype> diff --git a/src/plugins/remotelinux/profilesupdatedialog.cpp b/src/plugins/remotelinux/profilesupdatedialog.cpp index 6fb6dfdd39..eae1df7098 100644 --- a/src/plugins/remotelinux/profilesupdatedialog.cpp +++ b/src/plugins/remotelinux/profilesupdatedialog.cpp @@ -36,8 +36,8 @@ #include <qt4projectmanager/qt4nodes.h> -#include <QtCore/QDir> -#include <QtGui/QTableWidgetItem> +#include <QDir> +#include <QTableWidgetItem> namespace RemoteLinux { namespace Internal { diff --git a/src/plugins/remotelinux/profilesupdatedialog.h b/src/plugins/remotelinux/profilesupdatedialog.h index 2ab03af6cb..05c4b28702 100644 --- a/src/plugins/remotelinux/profilesupdatedialog.h +++ b/src/plugins/remotelinux/profilesupdatedialog.h @@ -33,10 +33,10 @@ #ifndef PROFILESUPDATEDIALOG_H #define PROFILESUPDATEDIALOG_H -#include <QtCore/QList> -#include <QtCore/QPair> -#include <QtCore/QString> -#include <QtGui/QDialog> +#include <QList> +#include <QPair> +#include <QString> +#include <QDialog> namespace RemoteLinux { class DeployableFilesPerProFile; diff --git a/src/plugins/remotelinux/publickeydeploymentdialog.cpp b/src/plugins/remotelinux/publickeydeploymentdialog.cpp index 38a7825142..605e6a49a4 100644 --- a/src/plugins/remotelinux/publickeydeploymentdialog.cpp +++ b/src/plugins/remotelinux/publickeydeploymentdialog.cpp @@ -36,9 +36,9 @@ #include <coreplugin/icore.h> #include <utils/ssh/sshconnection.h> -#include <QtCore/QTimer> -#include <QtGui/QFileDialog> -#include <QtGui/QMainWindow> +#include <QTimer> +#include <QFileDialog> +#include <QMainWindow> namespace RemoteLinux { namespace Internal { diff --git a/src/plugins/remotelinux/publickeydeploymentdialog.h b/src/plugins/remotelinux/publickeydeploymentdialog.h index 6735f57df7..93eab8939f 100644 --- a/src/plugins/remotelinux/publickeydeploymentdialog.h +++ b/src/plugins/remotelinux/publickeydeploymentdialog.h @@ -33,8 +33,8 @@ #include "remotelinux_export.h" -#include <QtCore/QSharedPointer> -#include <QtGui/QProgressDialog> +#include <QSharedPointer> +#include <QProgressDialog> QT_BEGIN_NAMESPACE class QString; diff --git a/src/plugins/remotelinux/remotelinux_export.h b/src/plugins/remotelinux/remotelinux_export.h index dc7238b9c5..253ba7252e 100644 --- a/src/plugins/remotelinux/remotelinux_export.h +++ b/src/plugins/remotelinux/remotelinux_export.h @@ -33,7 +33,7 @@ #ifndef REMOTE_LINUX_EXPORT_H #define REMOTE_LINUX_EXPORT_H -#include <QtCore/qglobal.h> +#include <qglobal.h> #if defined(REMOTELINUX_LIBRARY) # define REMOTELINUX_EXPORT Q_DECL_EXPORT diff --git a/src/plugins/remotelinux/remotelinuxapplicationrunner.h b/src/plugins/remotelinux/remotelinuxapplicationrunner.h index e4adc6d434..86cd9cb66a 100644 --- a/src/plugins/remotelinux/remotelinuxapplicationrunner.h +++ b/src/plugins/remotelinux/remotelinuxapplicationrunner.h @@ -33,8 +33,8 @@ #include "remotelinux_export.h" -#include <QtCore/QObject> -#include <QtCore/QSharedPointer> +#include <QObject> +#include <QSharedPointer> namespace Utils { class SshConnection; diff --git a/src/plugins/remotelinux/remotelinuxcustomcommanddeploymentstep.cpp b/src/plugins/remotelinux/remotelinuxcustomcommanddeploymentstep.cpp index 8c46354768..7fa49dbb9d 100644 --- a/src/plugins/remotelinux/remotelinuxcustomcommanddeploymentstep.cpp +++ b/src/plugins/remotelinux/remotelinuxcustomcommanddeploymentstep.cpp @@ -31,11 +31,11 @@ **************************************************************************/ #include "remotelinuxcustomcommanddeploymentstep.h" -#include <QtCore/QString> -#include <QtGui/QHBoxLayout> -#include <QtGui/QLabel> -#include <QtGui/QLineEdit> -#include <QtGui/QVBoxLayout> +#include <QString> +#include <QHBoxLayout> +#include <QLabel> +#include <QLineEdit> +#include <QVBoxLayout> using namespace ProjectExplorer; diff --git a/src/plugins/remotelinux/remotelinuxcustomcommanddeployservice.cpp b/src/plugins/remotelinux/remotelinuxcustomcommanddeployservice.cpp index a7f2a8e336..29653c84bd 100644 --- a/src/plugins/remotelinux/remotelinuxcustomcommanddeployservice.cpp +++ b/src/plugins/remotelinux/remotelinuxcustomcommanddeployservice.cpp @@ -36,7 +36,7 @@ #include <utils/qtcassert.h> #include <utils/ssh/sshremoteprocessrunner.h> -#include <QtCore/QString> +#include <QString> using namespace Utils; diff --git a/src/plugins/remotelinux/remotelinuxdebugsupport.cpp b/src/plugins/remotelinux/remotelinuxdebugsupport.cpp index 43e94f7441..73b7cef754 100644 --- a/src/plugins/remotelinux/remotelinuxdebugsupport.cpp +++ b/src/plugins/remotelinux/remotelinuxdebugsupport.cpp @@ -44,8 +44,8 @@ #include <qt4projectmanager/qt4buildconfiguration.h> #include <utils/qtcassert.h> -#include <QtCore/QPointer> -#include <QtCore/QSharedPointer> +#include <QPointer> +#include <QSharedPointer> using namespace Utils; using namespace Debugger; diff --git a/src/plugins/remotelinux/remotelinuxdebugsupport.h b/src/plugins/remotelinux/remotelinuxdebugsupport.h index 57377e03c0..7236248e3c 100644 --- a/src/plugins/remotelinux/remotelinuxdebugsupport.h +++ b/src/plugins/remotelinux/remotelinuxdebugsupport.h @@ -34,7 +34,7 @@ #include "remotelinux_export.h" -#include <QtCore/QObject> +#include <QObject> namespace Debugger { class DebuggerEngine; diff --git a/src/plugins/remotelinux/remotelinuxdeployconfiguration.h b/src/plugins/remotelinux/remotelinuxdeployconfiguration.h index 6ad89dbfe0..d59af482f9 100644 --- a/src/plugins/remotelinux/remotelinuxdeployconfiguration.h +++ b/src/plugins/remotelinux/remotelinuxdeployconfiguration.h @@ -39,7 +39,7 @@ #include <projectexplorer/buildsteplist.h> #include <projectexplorer/deployconfiguration.h> -#include <QtCore/QSharedPointer> +#include <QSharedPointer> namespace RemoteLinux { class AbstractEmbeddedLinuxTarget; diff --git a/src/plugins/remotelinux/remotelinuxdeployconfigurationfactory.cpp b/src/plugins/remotelinux/remotelinuxdeployconfigurationfactory.cpp index 061de54ec3..7402794d6c 100644 --- a/src/plugins/remotelinux/remotelinuxdeployconfigurationfactory.cpp +++ b/src/plugins/remotelinux/remotelinuxdeployconfigurationfactory.cpp @@ -35,7 +35,7 @@ #include "genericdirectuploadstep.h" #include "remotelinuxdeployconfiguration.h" -#include <QtCore/QCoreApplication> +#include <QCoreApplication> using namespace ProjectExplorer; diff --git a/src/plugins/remotelinux/remotelinuxdeployconfigurationwidget.cpp b/src/plugins/remotelinux/remotelinuxdeployconfigurationwidget.cpp index 4511d7bab3..30f71dfc52 100644 --- a/src/plugins/remotelinux/remotelinuxdeployconfigurationwidget.cpp +++ b/src/plugins/remotelinux/remotelinuxdeployconfigurationwidget.cpp @@ -43,7 +43,7 @@ #include <coreplugin/icore.h> #include <utils/qtcassert.h> -#include <QtGui/QTreeView> +#include <QTreeView> using namespace ProjectExplorer; diff --git a/src/plugins/remotelinux/remotelinuxenvironmentreader.h b/src/plugins/remotelinux/remotelinuxenvironmentreader.h index 6d7cbb378d..5e80faf697 100644 --- a/src/plugins/remotelinux/remotelinuxenvironmentreader.h +++ b/src/plugins/remotelinux/remotelinuxenvironmentreader.h @@ -34,8 +34,8 @@ #include <utils/environment.h> -#include <QtCore/QObject> -#include <QtCore/QSharedPointer> +#include <QObject> +#include <QSharedPointer> namespace Utils { class SshRemoteProcessRunner; diff --git a/src/plugins/remotelinux/remotelinuxpackageinstaller.cpp b/src/plugins/remotelinux/remotelinuxpackageinstaller.cpp index b037685753..b2c7d20c3a 100644 --- a/src/plugins/remotelinux/remotelinuxpackageinstaller.cpp +++ b/src/plugins/remotelinux/remotelinuxpackageinstaller.cpp @@ -36,7 +36,7 @@ #include <utils/qtcassert.h> #include <utils/ssh/sshremoteprocessrunner.h> -#include <QtCore/QByteArray> +#include <QByteArray> using namespace Utils; diff --git a/src/plugins/remotelinux/remotelinuxpackageinstaller.h b/src/plugins/remotelinux/remotelinuxpackageinstaller.h index 6c3c795be0..ebdd0bf20d 100644 --- a/src/plugins/remotelinux/remotelinuxpackageinstaller.h +++ b/src/plugins/remotelinux/remotelinuxpackageinstaller.h @@ -34,9 +34,9 @@ #include "remotelinux_export.h" -#include <QtCore/QObject> -#include <QtCore/QSharedPointer> -#include <QtCore/QString> +#include <QObject> +#include <QSharedPointer> +#include <QString> namespace RemoteLinux { class LinuxDeviceConfiguration; diff --git a/src/plugins/remotelinux/remotelinuxplugin.cpp b/src/plugins/remotelinux/remotelinuxplugin.cpp index c637cd1892..8305e306f0 100644 --- a/src/plugins/remotelinux/remotelinuxplugin.cpp +++ b/src/plugins/remotelinux/remotelinuxplugin.cpp @@ -54,8 +54,8 @@ #include <projectexplorer/projectexplorerconstants.h> -#include <QtCore/QtPlugin> -#include <QtGui/QAction> +#include <QtPlugin> +#include <QAction> namespace RemoteLinux { namespace Internal { diff --git a/src/plugins/remotelinux/remotelinuxprocessesdialog.cpp b/src/plugins/remotelinux/remotelinuxprocessesdialog.cpp index 645ba3bf2d..1bab0ec631 100644 --- a/src/plugins/remotelinux/remotelinuxprocessesdialog.cpp +++ b/src/plugins/remotelinux/remotelinuxprocessesdialog.cpp @@ -34,8 +34,8 @@ #include "remotelinuxprocesslist.h" -#include <QtGui/QMessageBox> -#include <QtGui/QSortFilterProxyModel> +#include <QMessageBox> +#include <QSortFilterProxyModel> namespace RemoteLinux { namespace Internal { diff --git a/src/plugins/remotelinux/remotelinuxprocessesdialog.h b/src/plugins/remotelinux/remotelinuxprocessesdialog.h index 09503d6717..062b3834a5 100644 --- a/src/plugins/remotelinux/remotelinuxprocessesdialog.h +++ b/src/plugins/remotelinux/remotelinuxprocessesdialog.h @@ -33,7 +33,7 @@ #include "remotelinux_export.h" -#include <QtGui/QDialog> +#include <QDialog> namespace RemoteLinux { class AbstractRemoteLinuxProcessList; diff --git a/src/plugins/remotelinux/remotelinuxprocesslist.cpp b/src/plugins/remotelinux/remotelinuxprocesslist.cpp index a20f287b24..6e85a4e848 100644 --- a/src/plugins/remotelinux/remotelinuxprocesslist.cpp +++ b/src/plugins/remotelinux/remotelinuxprocesslist.cpp @@ -35,8 +35,8 @@ #include <utils/qtcassert.h> #include <utils/ssh/sshremoteprocessrunner.h> -#include <QtCore/QByteArray> -#include <QtCore/QString> +#include <QByteArray> +#include <QString> using namespace Utils; diff --git a/src/plugins/remotelinux/remotelinuxprocesslist.h b/src/plugins/remotelinux/remotelinuxprocesslist.h index dcb305aca5..d0bcca22c9 100644 --- a/src/plugins/remotelinux/remotelinuxprocesslist.h +++ b/src/plugins/remotelinux/remotelinuxprocesslist.h @@ -33,9 +33,9 @@ #include "remotelinux_export.h" -#include <QtCore/QAbstractTableModel> -#include <QtCore/QList> -#include <QtCore/QSharedPointer> +#include <QAbstractTableModel> +#include <QList> +#include <QSharedPointer> namespace RemoteLinux { class LinuxDeviceConfiguration; diff --git a/src/plugins/remotelinux/remotelinuxrunconfigurationfactory.cpp b/src/plugins/remotelinux/remotelinuxrunconfigurationfactory.cpp index 4eda7d4113..ebc07a51a3 100644 --- a/src/plugins/remotelinux/remotelinuxrunconfigurationfactory.cpp +++ b/src/plugins/remotelinux/remotelinuxrunconfigurationfactory.cpp @@ -39,9 +39,9 @@ #include <qt4projectmanager/qt4target.h> #include <utils/qtcassert.h> -#include <QtCore/QFileInfo> -#include <QtCore/QString> -#include <QtCore/QStringList> +#include <QFileInfo> +#include <QString> +#include <QStringList> using namespace ProjectExplorer; using namespace Qt4ProjectManager; diff --git a/src/plugins/remotelinux/remotelinuxrunconfigurationwidget.cpp b/src/plugins/remotelinux/remotelinuxrunconfigurationwidget.cpp index 9d81a735d3..721e2c720f 100644 --- a/src/plugins/remotelinux/remotelinuxrunconfigurationwidget.cpp +++ b/src/plugins/remotelinux/remotelinuxrunconfigurationwidget.cpp @@ -44,17 +44,17 @@ #include <qt4projectmanager/qt4target.h> #include <utils/detailswidget.h> -#include <QtCore/QCoreApplication> -#include <QtCore/QDir> -#include <QtGui/QCheckBox> -#include <QtGui/QComboBox> -#include <QtGui/QFormLayout> -#include <QtGui/QGroupBox> -#include <QtGui/QHBoxLayout> -#include <QtGui/QLabel> -#include <QtGui/QLineEdit> -#include <QtGui/QMessageBox> -#include <QtGui/QPushButton> +#include <QCoreApplication> +#include <QDir> +#include <QCheckBox> +#include <QComboBox> +#include <QFormLayout> +#include <QGroupBox> +#include <QHBoxLayout> +#include <QLabel> +#include <QLineEdit> +#include <QMessageBox> +#include <QPushButton> using namespace Qt4ProjectManager; diff --git a/src/plugins/remotelinux/remotelinuxrunconfigurationwidget.h b/src/plugins/remotelinux/remotelinuxrunconfigurationwidget.h index 8ec18e2a8d..553987c8a5 100644 --- a/src/plugins/remotelinux/remotelinuxrunconfigurationwidget.h +++ b/src/plugins/remotelinux/remotelinuxrunconfigurationwidget.h @@ -34,7 +34,7 @@ #include "remotelinux_export.h" -#include <QtGui/QWidget> +#include <QWidget> QT_BEGIN_NAMESPACE class QVBoxLayout; diff --git a/src/plugins/remotelinux/remotelinuxruncontrol.cpp b/src/plugins/remotelinux/remotelinuxruncontrol.cpp index 8a22d8df71..c296eab903 100644 --- a/src/plugins/remotelinux/remotelinuxruncontrol.cpp +++ b/src/plugins/remotelinux/remotelinuxruncontrol.cpp @@ -37,8 +37,8 @@ #include <projectexplorer/projectexplorerconstants.h> #include <utils/qtcassert.h> -#include <QtCore/QString> -#include <QtGui/QIcon> +#include <QString> +#include <QIcon> using namespace ProjectExplorer; diff --git a/src/plugins/remotelinux/remotelinuxsettingspages.cpp b/src/plugins/remotelinux/remotelinuxsettingspages.cpp index d69d39c375..8f3c0b9b51 100644 --- a/src/plugins/remotelinux/remotelinuxsettingspages.cpp +++ b/src/plugins/remotelinux/remotelinuxsettingspages.cpp @@ -33,9 +33,9 @@ #include "linuxdeviceconfigurationssettingswidget.h" #include "remotelinux_constants.h" -#include <QtCore/QCoreApplication> -#include <QtCore/QString> -#include <QtGui/QIcon> +#include <QCoreApplication> +#include <QString> +#include <QIcon> namespace RemoteLinux { namespace Internal { diff --git a/src/plugins/remotelinux/remotelinuxusedportsgatherer.cpp b/src/plugins/remotelinux/remotelinuxusedportsgatherer.cpp index 2b7dd0b80b..ade18dfcbb 100644 --- a/src/plugins/remotelinux/remotelinuxusedportsgatherer.cpp +++ b/src/plugins/remotelinux/remotelinuxusedportsgatherer.cpp @@ -35,7 +35,7 @@ #include <utils/ssh/sshremoteprocessrunner.h> -#include <QtCore/QString> +#include <QString> using namespace Utils; diff --git a/src/plugins/remotelinux/remotelinuxusedportsgatherer.h b/src/plugins/remotelinux/remotelinuxusedportsgatherer.h index 6cfef9e795..16e40f9965 100644 --- a/src/plugins/remotelinux/remotelinuxusedportsgatherer.h +++ b/src/plugins/remotelinux/remotelinuxusedportsgatherer.h @@ -33,9 +33,9 @@ #include "remotelinux_export.h" -#include <QtCore/QList> -#include <QtCore/QObject> -#include <QtCore/QSharedPointer> +#include <QList> +#include <QObject> +#include <QSharedPointer> QT_FORWARD_DECLARE_CLASS(QString) diff --git a/src/plugins/remotelinux/remotelinuxutils.cpp b/src/plugins/remotelinux/remotelinuxutils.cpp index e8605fcd55..327af7a2e4 100644 --- a/src/plugins/remotelinux/remotelinuxutils.cpp +++ b/src/plugins/remotelinux/remotelinuxutils.cpp @@ -39,9 +39,9 @@ #include <qt4projectmanager/qt4target.h> #include <qtsupport/baseqtversion.h> -#include <QtCore/QCoreApplication> -#include <QtCore/QList> -#include <QtCore/QString> +#include <QCoreApplication> +#include <QList> +#include <QString> using namespace ExtensionSystem; using namespace ProjectExplorer; diff --git a/src/plugins/remotelinux/remotelinuxutils.h b/src/plugins/remotelinux/remotelinuxutils.h index c1ecd79bc3..cec48c67c6 100644 --- a/src/plugins/remotelinux/remotelinuxutils.h +++ b/src/plugins/remotelinux/remotelinuxutils.h @@ -34,7 +34,7 @@ #include "remotelinux_export.h" -#include <QtCore/QSharedPointer> +#include <QSharedPointer> namespace ProjectExplorer { class Target; diff --git a/src/plugins/remotelinux/sshkeycreationdialog.cpp b/src/plugins/remotelinux/sshkeycreationdialog.cpp index 8b83cdb526..f0f3f4bb5a 100644 --- a/src/plugins/remotelinux/sshkeycreationdialog.cpp +++ b/src/plugins/remotelinux/sshkeycreationdialog.cpp @@ -36,12 +36,12 @@ #include <utils/ssh/sshkeygenerator.h> #include <utils/fileutils.h> -#include <QtCore/QDir> -#include <QtCore/QFile> -#include <QtCore/QFileInfo> -#include <QtGui/QApplication> -#include <QtGui/QDesktopServices> -#include <QtGui/QMessageBox> +#include <QDir> +#include <QFile> +#include <QFileInfo> +#include <QApplication> +#include <QDesktopServices> +#include <QMessageBox> using namespace Utils; using namespace RemoteLinux::Internal; diff --git a/src/plugins/remotelinux/sshkeycreationdialog.h b/src/plugins/remotelinux/sshkeycreationdialog.h index e83ba52036..2acb22480e 100644 --- a/src/plugins/remotelinux/sshkeycreationdialog.h +++ b/src/plugins/remotelinux/sshkeycreationdialog.h @@ -32,7 +32,7 @@ #ifndef SSHKEYCREATIONDIALOG_H #define SSHKEYCREATIONDIALOG_H -#include <QtGui/QDialog> +#include <QDialog> namespace Utils { class SshKeyGenerator; diff --git a/src/plugins/remotelinux/sshkeydeployer.cpp b/src/plugins/remotelinux/sshkeydeployer.cpp index 8d1b7f5d85..955373c266 100644 --- a/src/plugins/remotelinux/sshkeydeployer.cpp +++ b/src/plugins/remotelinux/sshkeydeployer.cpp @@ -33,8 +33,8 @@ #include <utils/ssh/sshremoteprocessrunner.h> #include <utils/fileutils.h> -#include <QtCore/QFile> -#include <QtCore/QSharedPointer> +#include <QFile> +#include <QSharedPointer> using namespace Utils; diff --git a/src/plugins/remotelinux/sshkeydeployer.h b/src/plugins/remotelinux/sshkeydeployer.h index a28e1e8c87..5debd0e194 100644 --- a/src/plugins/remotelinux/sshkeydeployer.h +++ b/src/plugins/remotelinux/sshkeydeployer.h @@ -33,7 +33,7 @@ #include "remotelinux_export.h" -#include <QtCore/QObject> +#include <QObject> namespace Utils { class SshConnectionParameters; diff --git a/src/plugins/remotelinux/startgdbserverdialog.cpp b/src/plugins/remotelinux/startgdbserverdialog.cpp index 43c990ce4b..bbd0619c7d 100644 --- a/src/plugins/remotelinux/startgdbserverdialog.cpp +++ b/src/plugins/remotelinux/startgdbserverdialog.cpp @@ -47,27 +47,27 @@ #include <utils/ssh/sshconnection.h> #include <utils/ssh/sshremoteprocessrunner.h> -#include <QtCore/QVariant> -#include <QtCore/QSettings> - -#include <QtGui/QAction> -#include <QtGui/QApplication> -#include <QtGui/QComboBox> -#include <QtGui/QDialog> -#include <QtGui/QDialogButtonBox> -#include <QtGui/QFormLayout> -#include <QtGui/QGridLayout> -#include <QtGui/QHBoxLayout> -#include <QtGui/QHeaderView> -#include <QtGui/QLabel> -#include <QtGui/QLineEdit> -#include <QtGui/QMessageBox> -#include <QtGui/QPushButton> -#include <QtGui/QSortFilterProxyModel> -#include <QtGui/QSpacerItem> -#include <QtGui/QTableView> -#include <QtGui/QTextBrowser> -#include <QtGui/QVBoxLayout> +#include <QVariant> +#include <QSettings> + +#include <QAction> +#include <QApplication> +#include <QComboBox> +#include <QDialog> +#include <QDialogButtonBox> +#include <QFormLayout> +#include <QGridLayout> +#include <QHBoxLayout> +#include <QHeaderView> +#include <QLabel> +#include <QLineEdit> +#include <QMessageBox> +#include <QPushButton> +#include <QSortFilterProxyModel> +#include <QSpacerItem> +#include <QTableView> +#include <QTextBrowser> +#include <QVBoxLayout> using namespace Core; using namespace Utils; diff --git a/src/plugins/remotelinux/startgdbserverdialog.h b/src/plugins/remotelinux/startgdbserverdialog.h index e78e706113..e22f207c31 100644 --- a/src/plugins/remotelinux/startgdbserverdialog.h +++ b/src/plugins/remotelinux/startgdbserverdialog.h @@ -35,7 +35,7 @@ #include "remotelinux_export.h" -#include <QtGui/QDialog> +#include <QDialog> namespace RemoteLinux { diff --git a/src/plugins/remotelinux/tarpackagecreationstep.cpp b/src/plugins/remotelinux/tarpackagecreationstep.cpp index efd4cfc293..c3f9b37fc2 100644 --- a/src/plugins/remotelinux/tarpackagecreationstep.cpp +++ b/src/plugins/remotelinux/tarpackagecreationstep.cpp @@ -37,10 +37,10 @@ #include <projectexplorer/project.h> #include <projectexplorer/target.h> -#include <QtCore/QDateTime> -#include <QtCore/QDir> -#include <QtCore/QFile> -#include <QtCore/QFileInfo> +#include <QDateTime> +#include <QDir> +#include <QFile> +#include <QFileInfo> using namespace ProjectExplorer; diff --git a/src/plugins/remotelinux/typespecificdeviceconfigurationlistmodel.h b/src/plugins/remotelinux/typespecificdeviceconfigurationlistmodel.h index 166fdc9efa..6de2cc6611 100644 --- a/src/plugins/remotelinux/typespecificdeviceconfigurationlistmodel.h +++ b/src/plugins/remotelinux/typespecificdeviceconfigurationlistmodel.h @@ -34,8 +34,8 @@ #include "linuxdeviceconfiguration.h" -#include <QtCore/QAbstractListModel> -#include <QtCore/QSharedPointer> +#include <QAbstractListModel> +#include <QSharedPointer> namespace RemoteLinux { namespace Internal { |