diff options
author | Erik Verbruggen <erik.verbruggen@nokia.com> | 2012-02-15 10:42:41 +0100 |
---|---|---|
committer | Erik Verbruggen <erik.verbruggen@nokia.com> | 2012-02-15 16:24:46 +0100 |
commit | 3fa55b7ab9b1d6ae10fac1c9bcc653e9000157f8 (patch) | |
tree | e31dbd1b4605530e59c9864166f155b4edabc721 /src/libs/utils/ssh | |
parent | 9a9ba12028ab0a6b1a248be612d5c576d39f69d6 (diff) | |
download | qt-creator-3fa55b7ab9b1d6ae10fac1c9bcc653e9000157f8.tar.gz |
Removed module names from #include directives.
Getting the #include directives ready for Qt5. This includes the
new-project wizards.
Change-Id: Ia9261f1e8faec06b9285b694d2b7e9a095978d2b
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Diffstat (limited to 'src/libs/utils/ssh')
35 files changed, 88 insertions, 88 deletions
diff --git a/src/libs/utils/ssh/sftpchannel.cpp b/src/libs/utils/ssh/sftpchannel.cpp index bf532e5b35..d5cf0f6b67 100644 --- a/src/libs/utils/ssh/sftpchannel.cpp +++ b/src/libs/utils/ssh/sftpchannel.cpp @@ -37,8 +37,8 @@ #include "sshincomingpacket_p.h" #include "sshsendfacility_p.h" -#include <QtCore/QDir> -#include <QtCore/QFile> +#include <QDir> +#include <QFile> /*! \class Utils::SftpChannel diff --git a/src/libs/utils/ssh/sftpchannel.h b/src/libs/utils/ssh/sftpchannel.h index bc9911bf23..31e99c3147 100644 --- a/src/libs/utils/ssh/sftpchannel.h +++ b/src/libs/utils/ssh/sftpchannel.h @@ -38,10 +38,10 @@ #include <utils/utils_global.h> -#include <QtCore/QByteArray> -#include <QtCore/QObject> -#include <QtCore/QSharedPointer> -#include <QtCore/QString> +#include <QByteArray> +#include <QObject> +#include <QSharedPointer> +#include <QString> namespace Utils { diff --git a/src/libs/utils/ssh/sftpchannel_p.h b/src/libs/utils/ssh/sftpchannel_p.h index a5fc47de90..c2b2f79b18 100644 --- a/src/libs/utils/ssh/sftpchannel_p.h +++ b/src/libs/utils/ssh/sftpchannel_p.h @@ -39,8 +39,8 @@ #include "sftpoutgoingpacket_p.h" #include "sshchannel_p.h" -#include <QtCore/QByteArray> -#include <QtCore/QMap> +#include <QByteArray> +#include <QMap> namespace Utils { class SftpChannel; diff --git a/src/libs/utils/ssh/sftpoperation.cpp b/src/libs/utils/ssh/sftpoperation.cpp index c32fc46501..733741a9cb 100644 --- a/src/libs/utils/ssh/sftpoperation.cpp +++ b/src/libs/utils/ssh/sftpoperation.cpp @@ -34,7 +34,7 @@ #include "sftpoutgoingpacket_p.h" -#include <QtCore/QFile> +#include <QFile> namespace Utils { namespace Internal { diff --git a/src/libs/utils/ssh/sftpoperation_p.h b/src/libs/utils/ssh/sftpoperation_p.h index 8ea75f4281..eeaa69ac10 100644 --- a/src/libs/utils/ssh/sftpoperation_p.h +++ b/src/libs/utils/ssh/sftpoperation_p.h @@ -35,10 +35,10 @@ #include "sftpdefs.h" -#include <QtCore/QByteArray> -#include <QtCore/QList> -#include <QtCore/QMap> -#include <QtCore/QSharedPointer> +#include <QByteArray> +#include <QList> +#include <QMap> +#include <QSharedPointer> QT_BEGIN_NAMESPACE class QFile; diff --git a/src/libs/utils/ssh/sftpoutgoingpacket.cpp b/src/libs/utils/ssh/sftpoutgoingpacket.cpp index ac9e32f981..38412e6643 100644 --- a/src/libs/utils/ssh/sftpoutgoingpacket.cpp +++ b/src/libs/utils/ssh/sftpoutgoingpacket.cpp @@ -34,7 +34,7 @@ #include "sshpacket_p.h" -#include <QtCore/QtEndian> +#include <QtEndian> #include <limits> diff --git a/src/libs/utils/ssh/sftppacket_p.h b/src/libs/utils/ssh/sftppacket_p.h index 17d157a467..9666ef1e11 100644 --- a/src/libs/utils/ssh/sftppacket_p.h +++ b/src/libs/utils/ssh/sftppacket_p.h @@ -33,9 +33,9 @@ #ifndef SFTPPACKET_P_H #define SFTPPACKET_P_H -#include <QtCore/QByteArray> -#include <QtCore/QList> -#include <QtCore/QString> +#include <QByteArray> +#include <QList> +#include <QString> namespace Utils { namespace Internal { diff --git a/src/libs/utils/ssh/sshcapabilities.cpp b/src/libs/utils/ssh/sshcapabilities.cpp index 76f80919ff..a5aa08ea77 100644 --- a/src/libs/utils/ssh/sshcapabilities.cpp +++ b/src/libs/utils/ssh/sshcapabilities.cpp @@ -34,8 +34,8 @@ #include "sshexception_p.h" -#include <QtCore/QCoreApplication> -#include <QtCore/QString> +#include <QCoreApplication> +#include <QString> namespace Utils { namespace Internal { diff --git a/src/libs/utils/ssh/sshcapabilities_p.h b/src/libs/utils/ssh/sshcapabilities_p.h index eb1e99fe0d..cf322e6711 100644 --- a/src/libs/utils/ssh/sshcapabilities_p.h +++ b/src/libs/utils/ssh/sshcapabilities_p.h @@ -33,8 +33,8 @@ #ifndef CAPABILITIES_P_H #define CAPABILITIES_P_H -#include <QtCore/QByteArray> -#include <QtCore/QList> +#include <QByteArray> +#include <QList> namespace Utils { namespace Internal { diff --git a/src/libs/utils/ssh/sshchannel.cpp b/src/libs/utils/ssh/sshchannel.cpp index ead09d7f09..80e564c5cb 100644 --- a/src/libs/utils/ssh/sshchannel.cpp +++ b/src/libs/utils/ssh/sshchannel.cpp @@ -37,7 +37,7 @@ #include <botan/exceptn.h> -#include <QtCore/QTimer> +#include <QTimer> namespace Utils { namespace Internal { diff --git a/src/libs/utils/ssh/sshchannel_p.h b/src/libs/utils/ssh/sshchannel_p.h index fb626b1b4e..89e43d032b 100644 --- a/src/libs/utils/ssh/sshchannel_p.h +++ b/src/libs/utils/ssh/sshchannel_p.h @@ -33,9 +33,9 @@ #ifndef SSHCHANNEL_P_H #define SSHCHANNEL_P_H -#include <QtCore/QByteArray> -#include <QtCore/QObject> -#include <QtCore/QString> +#include <QByteArray> +#include <QObject> +#include <QString> QT_FORWARD_DECLARE_CLASS(QTimer) diff --git a/src/libs/utils/ssh/sshchannelmanager.cpp b/src/libs/utils/ssh/sshchannelmanager.cpp index c7d5493b3a..3ce488e2bc 100644 --- a/src/libs/utils/ssh/sshchannelmanager.cpp +++ b/src/libs/utils/ssh/sshchannelmanager.cpp @@ -39,7 +39,7 @@ #include "sshremoteprocess_p.h" #include "sshsendfacility_p.h" -#include <QtCore/QList> +#include <QList> namespace Utils { namespace Internal { diff --git a/src/libs/utils/ssh/sshchannelmanager_p.h b/src/libs/utils/ssh/sshchannelmanager_p.h index 71fdfc914b..ab88206a73 100644 --- a/src/libs/utils/ssh/sshchannelmanager_p.h +++ b/src/libs/utils/ssh/sshchannelmanager_p.h @@ -33,9 +33,9 @@ #ifndef SSHCHANNELLAYER_P_H #define SSHCHANNELLAYER_P_H -#include <QtCore/QHash> -#include <QtCore/QObject> -#include <QtCore/QSharedPointer> +#include <QHash> +#include <QObject> +#include <QSharedPointer> namespace Utils { diff --git a/src/libs/utils/ssh/sshconnection.cpp b/src/libs/utils/ssh/sshconnection.cpp index 8dbfead8d2..08b5d8eacc 100644 --- a/src/libs/utils/ssh/sshconnection.cpp +++ b/src/libs/utils/ssh/sshconnection.cpp @@ -46,11 +46,11 @@ #include <botan/exceptn.h> #include <botan/init.h> -#include <QtCore/QFile> -#include <QtCore/QMutex> -#include <QtCore/QMutexLocker> -#include <QtNetwork/QNetworkProxy> -#include <QtNetwork/QTcpSocket> +#include <QFile> +#include <QMutex> +#include <QMutexLocker> +#include <QNetworkProxy> +#include <QTcpSocket> /*! \class Utils::SshConnection diff --git a/src/libs/utils/ssh/sshconnection.h b/src/libs/utils/ssh/sshconnection.h index a9aa532c18..983c6c6890 100644 --- a/src/libs/utils/ssh/sshconnection.h +++ b/src/libs/utils/ssh/sshconnection.h @@ -37,11 +37,11 @@ #include <utils/utils_global.h> -#include <QtCore/QByteArray> -#include <QtCore/QObject> -#include <QtCore/QSharedPointer> -#include <QtCore/QString> -#include <QtNetwork/QHostAddress> +#include <QByteArray> +#include <QObject> +#include <QSharedPointer> +#include <QString> +#include <QHostAddress> namespace Utils { class SftpChannel; diff --git a/src/libs/utils/ssh/sshconnection_p.h b/src/libs/utils/ssh/sshconnection_p.h index 896a5a3492..4756e05202 100644 --- a/src/libs/utils/ssh/sshconnection_p.h +++ b/src/libs/utils/ssh/sshconnection_p.h @@ -39,12 +39,12 @@ #include "sshremoteprocess.h" #include "sshsendfacility_p.h" -#include <QtCore/QHash> -#include <QtCore/QList> -#include <QtCore/QObject> -#include <QtCore/QPair> -#include <QtCore/QScopedPointer> -#include <QtCore/QTimer> +#include <QHash> +#include <QList> +#include <QObject> +#include <QPair> +#include <QScopedPointer> +#include <QTimer> QT_BEGIN_NAMESPACE class QTcpSocket; diff --git a/src/libs/utils/ssh/sshconnectionmanager.cpp b/src/libs/utils/ssh/sshconnectionmanager.cpp index e594f2741f..8c1c8cd03e 100644 --- a/src/libs/utils/ssh/sshconnectionmanager.cpp +++ b/src/libs/utils/ssh/sshconnectionmanager.cpp @@ -34,12 +34,12 @@ #include "sshconnection.h" -#include <QtCore/QCoreApplication> -#include <QtCore/QList> -#include <QtCore/QMutex> -#include <QtCore/QMutexLocker> -#include <QtCore/QObject> -#include <QtCore/QThread> +#include <QCoreApplication> +#include <QList> +#include <QMutex> +#include <QMutexLocker> +#include <QObject> +#include <QThread> namespace Utils { namespace Internal { diff --git a/src/libs/utils/ssh/sshconnectionmanager.h b/src/libs/utils/ssh/sshconnectionmanager.h index a7ecfbb171..3b26d6c83b 100644 --- a/src/libs/utils/ssh/sshconnectionmanager.h +++ b/src/libs/utils/ssh/sshconnectionmanager.h @@ -35,8 +35,8 @@ #include <utils/utils_global.h> -#include <QtCore/QScopedPointer> -#include <QtCore/QSharedPointer> +#include <QScopedPointer> +#include <QSharedPointer> namespace Utils { class SshConnection; diff --git a/src/libs/utils/ssh/sshcryptofacility.cpp b/src/libs/utils/ssh/sshcryptofacility.cpp index cf0f1a579c..d5386d91c6 100644 --- a/src/libs/utils/ssh/sshcryptofacility.cpp +++ b/src/libs/utils/ssh/sshcryptofacility.cpp @@ -51,8 +51,8 @@ #include <botan/pubkey.h> #include <botan/rsa.h> -#include <QtCore/QDebug> -#include <QtCore/QList> +#include <QDebug> +#include <QList> #include <string> diff --git a/src/libs/utils/ssh/sshcryptofacility_p.h b/src/libs/utils/ssh/sshcryptofacility_p.h index c0c5f2a398..b19c18b9f4 100644 --- a/src/libs/utils/ssh/sshcryptofacility_p.h +++ b/src/libs/utils/ssh/sshcryptofacility_p.h @@ -36,8 +36,8 @@ #include <botan/auto_rng.h> #include <botan/symkey.h> -#include <QtCore/QByteArray> -#include <QtCore/QScopedPointer> +#include <QByteArray> +#include <QScopedPointer> namespace Botan { class BigInt; diff --git a/src/libs/utils/ssh/sshexception_p.h b/src/libs/utils/ssh/sshexception_p.h index 8efa4e2987..e21c9d9fc9 100644 --- a/src/libs/utils/ssh/sshexception_p.h +++ b/src/libs/utils/ssh/sshexception_p.h @@ -35,9 +35,9 @@ #include "ssherrors.h" -#include <QtCore/QByteArray> -#include <QtCore/QCoreApplication> -#include <QtCore/QString> +#include <QByteArray> +#include <QCoreApplication> +#include <QString> namespace Utils { namespace Internal { diff --git a/src/libs/utils/ssh/sshincomingpacket_p.h b/src/libs/utils/ssh/sshincomingpacket_p.h index 689f035636..e632881d9b 100644 --- a/src/libs/utils/ssh/sshincomingpacket_p.h +++ b/src/libs/utils/ssh/sshincomingpacket_p.h @@ -38,8 +38,8 @@ #include "sshcryptofacility_p.h" #include "sshpacketparser_p.h" -#include <QtCore/QList> -#include <QtCore/QString> +#include <QList> +#include <QString> namespace Utils { namespace Internal { diff --git a/src/libs/utils/ssh/sshkeyexchange_p.h b/src/libs/utils/ssh/sshkeyexchange_p.h index f07cd7344e..83be2fad86 100644 --- a/src/libs/utils/ssh/sshkeyexchange_p.h +++ b/src/libs/utils/ssh/sshkeyexchange_p.h @@ -35,8 +35,8 @@ #include <botan/dh.h> -#include <QtCore/QByteArray> -#include <QtCore/QScopedPointer> +#include <QByteArray> +#include <QScopedPointer> namespace Botan { class HashFunction; } diff --git a/src/libs/utils/ssh/sshkeygenerator.cpp b/src/libs/utils/ssh/sshkeygenerator.cpp index 4484882e43..3a1752c343 100644 --- a/src/libs/utils/ssh/sshkeygenerator.cpp +++ b/src/libs/utils/ssh/sshkeygenerator.cpp @@ -45,8 +45,8 @@ #include <botan/rsa.h> #include <botan/x509_key.h> -#include <QtCore/QDateTime> -#include <QtGui/QInputDialog> +#include <QDateTime> +#include <QInputDialog> #include <string> diff --git a/src/libs/utils/ssh/sshkeygenerator.h b/src/libs/utils/ssh/sshkeygenerator.h index d615bf5125..506039e3bc 100644 --- a/src/libs/utils/ssh/sshkeygenerator.h +++ b/src/libs/utils/ssh/sshkeygenerator.h @@ -35,8 +35,8 @@ #include <utils/utils_global.h> -#include <QtCore/QCoreApplication> -#include <QtCore/QSharedPointer> +#include <QCoreApplication> +#include <QSharedPointer> namespace Botan { class Private_Key; diff --git a/src/libs/utils/ssh/sshkeypasswordretriever.cpp b/src/libs/utils/ssh/sshkeypasswordretriever.cpp index 4fe24c8129..7c00751ec6 100644 --- a/src/libs/utils/ssh/sshkeypasswordretriever.cpp +++ b/src/libs/utils/ssh/sshkeypasswordretriever.cpp @@ -31,9 +31,9 @@ **************************************************************************/ #include "sshkeypasswordretriever_p.h" -#include <QtCore/QString> -#include <QtGui/QApplication> -#include <QtGui/QInputDialog> +#include <QString> +#include <QApplication> +#include <QInputDialog> #include <iostream> diff --git a/src/libs/utils/ssh/sshoutgoingpacket.cpp b/src/libs/utils/ssh/sshoutgoingpacket.cpp index 16594c9f0d..e79f65a60e 100644 --- a/src/libs/utils/ssh/sshoutgoingpacket.cpp +++ b/src/libs/utils/ssh/sshoutgoingpacket.cpp @@ -35,7 +35,7 @@ #include "sshcapabilities_p.h" #include "sshcryptofacility_p.h" -#include <QtCore/QtEndian> +#include <QtEndian> namespace Utils { namespace Internal { diff --git a/src/libs/utils/ssh/sshpacket.cpp b/src/libs/utils/ssh/sshpacket.cpp index 8cf741adb3..7af1f25078 100644 --- a/src/libs/utils/ssh/sshpacket.cpp +++ b/src/libs/utils/ssh/sshpacket.cpp @@ -37,7 +37,7 @@ #include "sshexception_p.h" #include "sshpacketparser_p.h" -#include <QtCore/QDebug> +#include <QDebug> #include <cctype> diff --git a/src/libs/utils/ssh/sshpacket_p.h b/src/libs/utils/ssh/sshpacket_p.h index 486ec6c39c..594f13c744 100644 --- a/src/libs/utils/ssh/sshpacket_p.h +++ b/src/libs/utils/ssh/sshpacket_p.h @@ -35,9 +35,9 @@ #include "sshexception_p.h" -#include <QtCore/QtEndian> -#include <QtCore/QByteArray> -#include <QtCore/QList> +#include <QtEndian> +#include <QByteArray> +#include <QList> #include <botan/bigint.h> diff --git a/src/libs/utils/ssh/sshpacketparser_p.h b/src/libs/utils/ssh/sshpacketparser_p.h index c811ef4b9d..a1e0e7eab9 100644 --- a/src/libs/utils/ssh/sshpacketparser_p.h +++ b/src/libs/utils/ssh/sshpacketparser_p.h @@ -35,9 +35,9 @@ #include <botan/bigint.h> -#include <QtCore/QByteArray> -#include <QtCore/QList> -#include <QtCore/QString> +#include <QByteArray> +#include <QList> +#include <QString> namespace Utils { namespace Internal { diff --git a/src/libs/utils/ssh/sshpseudoterminal.h b/src/libs/utils/ssh/sshpseudoterminal.h index 679ef6986f..263bcd574d 100644 --- a/src/libs/utils/ssh/sshpseudoterminal.h +++ b/src/libs/utils/ssh/sshpseudoterminal.h @@ -35,8 +35,8 @@ #include <utils/utils_global.h> -#include <QtCore/QByteArray> -#include <QtCore/QHash> +#include <QByteArray> +#include <QHash> namespace Utils { diff --git a/src/libs/utils/ssh/sshremoteprocess.cpp b/src/libs/utils/ssh/sshremoteprocess.cpp index 0368026019..813e1f824c 100644 --- a/src/libs/utils/ssh/sshremoteprocess.cpp +++ b/src/libs/utils/ssh/sshremoteprocess.cpp @@ -40,7 +40,7 @@ #include <utils/qtcassert.h> -#include <QtCore/QTimer> +#include <QTimer> #include <cstring> #include <cstdlib> diff --git a/src/libs/utils/ssh/sshremoteprocess.h b/src/libs/utils/ssh/sshremoteprocess.h index db73596b0a..ed4e96e5d7 100644 --- a/src/libs/utils/ssh/sshremoteprocess.h +++ b/src/libs/utils/ssh/sshremoteprocess.h @@ -35,8 +35,8 @@ #include <utils/utils_global.h> -#include <QtCore/QProcess> -#include <QtCore/QSharedPointer> +#include <QProcess> +#include <QSharedPointer> QT_BEGIN_NAMESPACE class QByteArray; diff --git a/src/libs/utils/ssh/sshremoteprocess_p.h b/src/libs/utils/ssh/sshremoteprocess_p.h index d44d0c70c3..eba60a6ac1 100644 --- a/src/libs/utils/ssh/sshremoteprocess_p.h +++ b/src/libs/utils/ssh/sshremoteprocess_p.h @@ -37,9 +37,9 @@ #include "sshchannel_p.h" -#include <QtCore/QList> -#include <QtCore/QPair> -#include <QtCore/QProcess> +#include <QList> +#include <QPair> +#include <QProcess> namespace Utils { class SshRemoteProcess; diff --git a/src/libs/utils/ssh/sshsendfacility.cpp b/src/libs/utils/ssh/sshsendfacility.cpp index f58cf4e23f..771d145405 100644 --- a/src/libs/utils/ssh/sshsendfacility.cpp +++ b/src/libs/utils/ssh/sshsendfacility.cpp @@ -35,7 +35,7 @@ #include "sshkeyexchange_p.h" #include "sshoutgoingpacket_p.h" -#include <QtNetwork/QTcpSocket> +#include <QTcpSocket> namespace Utils { namespace Internal { |