move files common to client/server into "base"

80 files changed, 1 insertions, 86 deletions

diff --git a/src/QXmppArchiveIq.cpp b/src/base/QXmppArchiveIq.cpp
index e8bef8fc..e8bef8fc 100644
--- a/src/QXmppArchiveIq.cpp
+++ b/src/base/QXmppArchiveIq.cpp
diff --git a/src/QXmppArchiveIq.h b/src/base/QXmppArchiveIq.h
index c0784891..c0784891 100644
--- a/src/QXmppArchiveIq.h
+++ b/src/base/QXmppArchiveIq.h
diff --git a/src/QXmppBindIq.cpp b/src/base/QXmppBindIq.cpp
index f818e002..f818e002 100644
--- a/src/QXmppBindIq.cpp
+++ b/src/base/QXmppBindIq.cpp
diff --git a/src/QXmppBindIq.h b/src/base/QXmppBindIq.h
index 0131510c..0131510c 100644
--- a/src/QXmppBindIq.h
+++ b/src/base/QXmppBindIq.h
diff --git a/src/QXmppBookmarkSet.cpp b/src/base/QXmppBookmarkSet.cpp
index b418d498..b418d498 100644
--- a/src/QXmppBookmarkSet.cpp
+++ b/src/base/QXmppBookmarkSet.cpp
diff --git a/src/QXmppBookmarkSet.h b/src/base/QXmppBookmarkSet.h
index aa90f2cf..aa90f2cf 100644
--- a/src/QXmppBookmarkSet.h
+++ b/src/base/QXmppBookmarkSet.h
diff --git a/src/QXmppByteStreamIq.cpp b/src/base/QXmppByteStreamIq.cpp
index e1628e72..e1628e72 100644
--- a/src/QXmppByteStreamIq.cpp
+++ b/src/base/QXmppByteStreamIq.cpp
diff --git a/src/QXmppByteStreamIq.h b/src/base/QXmppByteStreamIq.h
index 604c12e5..604c12e5 100644
--- a/src/QXmppByteStreamIq.h
+++ b/src/base/QXmppByteStreamIq.h
diff --git a/src/QXmppCodec.cpp b/src/base/QXmppCodec.cpp
index a614ce01..a614ce01 100644
--- a/src/QXmppCodec.cpp
+++ b/src/base/QXmppCodec.cpp
diff --git a/src/QXmppCodec.h b/src/base/QXmppCodec.h
index 61dd45a2..61dd45a2 100644
--- a/src/QXmppCodec.h
+++ b/src/base/QXmppCodec.h
diff --git a/src/QXmppConstants.cpp b/src/base/QXmppConstants.cpp
index c77859b6..c77859b6 100644
--- a/src/QXmppConstants.cpp
+++ b/src/base/QXmppConstants.cpp
diff --git a/src/QXmppConstants.h b/src/base/QXmppConstants.h
index 909bddd9..909bddd9 100644
--- a/src/QXmppConstants.h
+++ b/src/base/QXmppConstants.h
diff --git a/src/QXmppDataForm.cpp b/src/base/QXmppDataForm.cpp
index aab3857d..aab3857d 100644
--- a/src/QXmppDataForm.cpp
+++ b/src/base/QXmppDataForm.cpp
diff --git a/src/QXmppDataForm.h b/src/base/QXmppDataForm.h
index 4f38a932..4f38a932 100644
--- a/src/QXmppDataForm.h
+++ b/src/base/QXmppDataForm.h
diff --git a/src/QXmppDiscoveryIq.cpp b/src/base/QXmppDiscoveryIq.cpp
index 6e0d33d5..6e0d33d5 100644
--- a/src/QXmppDiscoveryIq.cpp
+++ b/src/base/QXmppDiscoveryIq.cpp
diff --git a/src/QXmppDiscoveryIq.h b/src/base/QXmppDiscoveryIq.h
index 40aa1a3b..40aa1a3b 100644
--- a/src/QXmppDiscoveryIq.h
+++ b/src/base/QXmppDiscoveryIq.h
diff --git a/src/QXmppElement.cpp b/src/base/QXmppElement.cpp
index 904ab473..904ab473 100644
--- a/src/QXmppElement.cpp
+++ b/src/base/QXmppElement.cpp
diff --git a/src/QXmppElement.h b/src/base/QXmppElement.h
index 7fa75494..7fa75494 100644
--- a/src/QXmppElement.h
+++ b/src/base/QXmppElement.h
diff --git a/src/QXmppEntityTimeIq.cpp b/src/base/QXmppEntityTimeIq.cpp
index 5e41e39f..5e41e39f 100644
--- a/src/QXmppEntityTimeIq.cpp
+++ b/src/base/QXmppEntityTimeIq.cpp
diff --git a/src/QXmppEntityTimeIq.h b/src/base/QXmppEntityTimeIq.h
index fa3d5f12..fa3d5f12 100644
--- a/src/QXmppEntityTimeIq.h
+++ b/src/base/QXmppEntityTimeIq.h
diff --git a/src/QXmppGlobal.cpp b/src/base/QXmppGlobal.cpp
index 2735788a..2735788a 100644
--- a/src/QXmppGlobal.cpp
+++ b/src/base/QXmppGlobal.cpp
diff --git a/src/QXmppGlobal.h b/src/base/QXmppGlobal.h
index 36122d1a..36122d1a 100644
--- a/src/QXmppGlobal.h
+++ b/src/base/QXmppGlobal.h
diff --git a/src/QXmppIbbIq.cpp b/src/base/QXmppIbbIq.cpp
index 85aba54a..85aba54a 100644
--- a/src/QXmppIbbIq.cpp
+++ b/src/base/QXmppIbbIq.cpp
diff --git a/src/QXmppIbbIq.h b/src/base/QXmppIbbIq.h
index 592b12f4..592b12f4 100644
--- a/src/QXmppIbbIq.h
+++ b/src/base/QXmppIbbIq.h
diff --git a/src/QXmppIq.cpp b/src/base/QXmppIq.cpp
index d0ee0a7a..d0ee0a7a 100644
--- a/src/QXmppIq.cpp
+++ b/src/base/QXmppIq.cpp
diff --git a/src/QXmppIq.h b/src/base/QXmppIq.h
index bbde3d06..bbde3d06 100644
--- a/src/QXmppIq.h
+++ b/src/base/QXmppIq.h
diff --git a/src/QXmppJingleIq.cpp b/src/base/QXmppJingleIq.cpp
index 5eb11322..5eb11322 100644
--- a/src/QXmppJingleIq.cpp
+++ b/src/base/QXmppJingleIq.cpp
diff --git a/src/QXmppJingleIq.h b/src/base/QXmppJingleIq.h
index ef5b66ec..ef5b66ec 100644
--- a/src/QXmppJingleIq.h
+++ b/src/base/QXmppJingleIq.h
diff --git a/src/QXmppLogger.cpp b/src/base/QXmppLogger.cpp
index 107f72d9..107f72d9 100644
--- a/src/QXmppLogger.cpp
+++ b/src/base/QXmppLogger.cpp
diff --git a/src/QXmppLogger.h b/src/base/QXmppLogger.h
index 93de33f7..93de33f7 100644
--- a/src/QXmppLogger.h
+++ b/src/base/QXmppLogger.h
diff --git a/src/QXmppMessage.cpp b/src/base/QXmppMessage.cpp
index 109c0d84..109c0d84 100644
--- a/src/QXmppMessage.cpp
+++ b/src/base/QXmppMessage.cpp
diff --git a/src/QXmppMessage.h b/src/base/QXmppMessage.h
index a981f1db..a981f1db 100644
--- a/src/QXmppMessage.h
+++ b/src/base/QXmppMessage.h
diff --git a/src/QXmppMucIq.cpp b/src/base/QXmppMucIq.cpp
index 97328a2f..97328a2f 100644
--- a/src/QXmppMucIq.cpp
+++ b/src/base/QXmppMucIq.cpp
diff --git a/src/QXmppMucIq.h b/src/base/QXmppMucIq.h
index 5e73fc9b..5e73fc9b 100644
--- a/src/QXmppMucIq.h
+++ b/src/base/QXmppMucIq.h
diff --git a/src/QXmppNonSASLAuth.cpp b/src/base/QXmppNonSASLAuth.cpp
index 0dea6184..0dea6184 100644
--- a/src/QXmppNonSASLAuth.cpp
+++ b/src/base/QXmppNonSASLAuth.cpp
diff --git a/src/QXmppNonSASLAuth.h b/src/base/QXmppNonSASLAuth.h
index a17436e7..a17436e7 100644
--- a/src/QXmppNonSASLAuth.h
+++ b/src/base/QXmppNonSASLAuth.h
diff --git a/src/QXmppPacket.cpp b/src/base/QXmppPacket.cpp
index 1d284325..1d284325 100644
--- a/src/QXmppPacket.cpp
+++ b/src/base/QXmppPacket.cpp
diff --git a/src/QXmppPacket.h b/src/base/QXmppPacket.h
index 427217c7..427217c7 100644
--- a/src/QXmppPacket.h
+++ b/src/base/QXmppPacket.h
diff --git a/src/QXmppPingIq.cpp b/src/base/QXmppPingIq.cpp
index 7058c6d0..7058c6d0 100644
--- a/src/QXmppPingIq.cpp
+++ b/src/base/QXmppPingIq.cpp
diff --git a/src/QXmppPingIq.h b/src/base/QXmppPingIq.h
index 527eeb68..527eeb68 100644
--- a/src/QXmppPingIq.h
+++ b/src/base/QXmppPingIq.h
diff --git a/src/QXmppPresence.cpp b/src/base/QXmppPresence.cpp
index b967c8e5..b967c8e5 100644
--- a/src/QXmppPresence.cpp
+++ b/src/base/QXmppPresence.cpp
diff --git a/src/QXmppPresence.h b/src/base/QXmppPresence.h
index 8b85e01b..8b85e01b 100644
--- a/src/QXmppPresence.h
+++ b/src/base/QXmppPresence.h
diff --git a/src/QXmppPubSubIq.cpp b/src/base/QXmppPubSubIq.cpp
index 1ad1c39d..1ad1c39d 100644
--- a/src/QXmppPubSubIq.cpp
+++ b/src/base/QXmppPubSubIq.cpp
diff --git a/src/QXmppPubSubIq.h b/src/base/QXmppPubSubIq.h
index 01dc3a92..01dc3a92 100644
--- a/src/QXmppPubSubIq.h
+++ b/src/base/QXmppPubSubIq.h
diff --git a/src/QXmppRosterIq.cpp b/src/base/QXmppRosterIq.cpp
index 0b2e1716..0b2e1716 100644
--- a/src/QXmppRosterIq.cpp
+++ b/src/base/QXmppRosterIq.cpp
diff --git a/src/QXmppRosterIq.h b/src/base/QXmppRosterIq.h
index 9680a176..9680a176 100644
--- a/src/QXmppRosterIq.h
+++ b/src/base/QXmppRosterIq.h
diff --git a/src/QXmppRpcIq.cpp b/src/base/QXmppRpcIq.cpp
index a2647077..a2647077 100644
--- a/src/QXmppRpcIq.cpp
+++ b/src/base/QXmppRpcIq.cpp
diff --git a/src/QXmppRpcIq.h b/src/base/QXmppRpcIq.h
index f557686a..f557686a 100644
--- a/src/QXmppRpcIq.h
+++ b/src/base/QXmppRpcIq.h
diff --git a/src/QXmppRtpChannel.cpp b/src/base/QXmppRtpChannel.cpp
index df26bc30..df26bc30 100644
--- a/src/QXmppRtpChannel.cpp
+++ b/src/base/QXmppRtpChannel.cpp
diff --git a/src/QXmppRtpChannel.h b/src/base/QXmppRtpChannel.h
index 0af6596c..0af6596c 100644
--- a/src/QXmppRtpChannel.h
+++ b/src/base/QXmppRtpChannel.h
diff --git a/src/QXmppSaslAuth.cpp b/src/base/QXmppSaslAuth.cpp
index a528cd6d..a528cd6d 100644
--- a/src/QXmppSaslAuth.cpp
+++ b/src/base/QXmppSaslAuth.cpp
diff --git a/src/QXmppSaslAuth.h b/src/base/QXmppSaslAuth.h
index 409636cb..409636cb 100644
--- a/src/QXmppSaslAuth.h
+++ b/src/base/QXmppSaslAuth.h
diff --git a/src/QXmppSessionIq.cpp b/src/base/QXmppSessionIq.cpp
index 6672cc0e..6672cc0e 100644
--- a/src/QXmppSessionIq.cpp
+++ b/src/base/QXmppSessionIq.cpp
diff --git a/src/QXmppSessionIq.h b/src/base/QXmppSessionIq.h
index 2cbcd58c..2cbcd58c 100644
--- a/src/QXmppSessionIq.h
+++ b/src/base/QXmppSessionIq.h
diff --git a/src/QXmppSocks.cpp b/src/base/QXmppSocks.cpp
index 1c6f162c..1c6f162c 100644
--- a/src/QXmppSocks.cpp
+++ b/src/base/QXmppSocks.cpp
diff --git a/src/QXmppSocks.h b/src/base/QXmppSocks.h
index 111055fe..111055fe 100644
--- a/src/QXmppSocks.h
+++ b/src/base/QXmppSocks.h
diff --git a/src/QXmppStanza.cpp b/src/base/QXmppStanza.cpp
index e8937b6f..e8937b6f 100644
--- a/src/QXmppStanza.cpp
+++ b/src/base/QXmppStanza.cpp
diff --git a/src/QXmppStanza.h b/src/base/QXmppStanza.h
index dc1c1346..dc1c1346 100644
--- a/src/QXmppStanza.h
+++ b/src/base/QXmppStanza.h
diff --git a/src/QXmppStream.cpp b/src/base/QXmppStream.cpp
index d9f7ff88..d9f7ff88 100644
--- a/src/QXmppStream.cpp
+++ b/src/base/QXmppStream.cpp
diff --git a/src/QXmppStream.h b/src/base/QXmppStream.h
index bcbb7616..bcbb7616 100644
--- a/src/QXmppStream.h
+++ b/src/base/QXmppStream.h
diff --git a/src/QXmppStreamFeatures.cpp b/src/base/QXmppStreamFeatures.cpp
index 241f676f..241f676f 100644
--- a/src/QXmppStreamFeatures.cpp
+++ b/src/base/QXmppStreamFeatures.cpp
diff --git a/src/QXmppStreamFeatures.h b/src/base/QXmppStreamFeatures.h
index bfc42c64..bfc42c64 100644
--- a/src/QXmppStreamFeatures.h
+++ b/src/base/QXmppStreamFeatures.h
diff --git a/src/QXmppStreamInitiationIq.cpp b/src/base/QXmppStreamInitiationIq.cpp
index 32dd0c78..32dd0c78 100644
--- a/src/QXmppStreamInitiationIq.cpp
+++ b/src/base/QXmppStreamInitiationIq.cpp
diff --git a/src/QXmppStreamInitiationIq.h b/src/base/QXmppStreamInitiationIq.h
index 27739b46..27739b46 100644
--- a/src/QXmppStreamInitiationIq.h
+++ b/src/base/QXmppStreamInitiationIq.h
diff --git a/src/QXmppStun.cpp b/src/base/QXmppStun.cpp
index 16cef928..16cef928 100644
--- a/src/QXmppStun.cpp
+++ b/src/base/QXmppStun.cpp
diff --git a/src/QXmppStun.h b/src/base/QXmppStun.h
index 1792d3cb..1792d3cb 100644
--- a/src/QXmppStun.h
+++ b/src/base/QXmppStun.h
diff --git a/src/QXmppUtils.cpp b/src/base/QXmppUtils.cpp
index 1698582f..1698582f 100644
--- a/src/QXmppUtils.cpp
+++ b/src/base/QXmppUtils.cpp
diff --git a/src/QXmppUtils.h b/src/base/QXmppUtils.h
index 80d84240..80d84240 100644
--- a/src/QXmppUtils.h
+++ b/src/base/QXmppUtils.h
diff --git a/src/QXmppVCardIq.cpp b/src/base/QXmppVCardIq.cpp
index aaaf4554..aaaf4554 100644
--- a/src/QXmppVCardIq.cpp
+++ b/src/base/QXmppVCardIq.cpp
diff --git a/src/QXmppVCardIq.h b/src/base/QXmppVCardIq.h
index 348c00fc..348c00fc 100644
--- a/src/QXmppVCardIq.h
+++ b/src/base/QXmppVCardIq.h
diff --git a/src/QXmppVersionIq.cpp b/src/base/QXmppVersionIq.cpp
index 358596b6..358596b6 100644
--- a/src/QXmppVersionIq.cpp
+++ b/src/base/QXmppVersionIq.cpp
diff --git a/src/QXmppVersionIq.h b/src/base/QXmppVersionIq.h
index 57a800e0..57a800e0 100644
--- a/src/QXmppVersionIq.h
+++ b/src/base/QXmppVersionIq.h
diff --git a/src/qdnslookup.cpp b/src/base/qdnslookup.cpp
index 7b1e7c8f..7b1e7c8f 100644
--- a/src/qdnslookup.cpp
+++ b/src/base/qdnslookup.cpp
diff --git a/src/qdnslookup.h b/src/base/qdnslookup.h
index 6f913896..6f913896 100644
--- a/src/qdnslookup.h
+++ b/src/base/qdnslookup.h
diff --git a/src/qdnslookup_p.h b/src/base/qdnslookup_p.h
index 4797f345..4797f345 100644
--- a/src/qdnslookup_p.h
+++ b/src/base/qdnslookup_p.h
diff --git a/src/qdnslookup_stub.cpp b/src/base/qdnslookup_stub.cpp
index df9ed349..df9ed349 100644
--- a/src/qdnslookup_stub.cpp
+++ b/src/base/qdnslookup_stub.cpp
diff --git a/src/qdnslookup_symbian.cpp b/src/base/qdnslookup_symbian.cpp
index bed5278e..bed5278e 100644
--- a/src/qdnslookup_symbian.cpp
+++ b/src/base/qdnslookup_symbian.cpp
diff --git a/src/qdnslookup_unix.cpp b/src/base/qdnslookup_unix.cpp
index f4d1c64c..f4d1c64c 100644
--- a/src/qdnslookup_unix.cpp
+++ b/src/base/qdnslookup_unix.cpp
diff --git a/src/qdnslookup_win.cpp b/src/base/qdnslookup_win.cpp
index 87d6955a..87d6955a 100644
--- a/src/qdnslookup_win.cpp
+++ b/src/base/qdnslookup_win.cpp
diff --git a/src/src.pro b/src/src.pro
index b5ed68f3..db929dcb 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -27,92 +27,7 @@ TARGET = $$QXMPP_LIBRARY_NAME
 VERSION = $$QXMPP_VERSION
 DESTDIR = $$QXMPP_LIBRARY_DIR
 
-# Header files
-INSTALL_HEADERS = \
-    QXmppArchiveIq.h \
-    QXmppBindIq.h \
-    QXmppBookmarkSet.h \
-    QXmppByteStreamIq.h \
-    QXmppCodec.h \
-    QXmppConstants.h \
-    QXmppDataForm.h \
-    QXmppDiscoveryIq.h \
-    QXmppElement.h \
-    QXmppEntityTimeIq.h \
-    QXmppGlobal.h \
-    QXmppIbbIq.h \
-    QXmppIq.h \
-    QXmppJingleIq.h \
-    QXmppLogger.h \
-    QXmppMessage.h \
-    QXmppMucIq.h \
-    QXmppNonSASLAuth.h \
-    QXmppPacket.h \
-    QXmppPingIq.h \
-    QXmppPresence.h \
-    QXmppPubSubIq.h \
-    QXmppRosterIq.h \
-    QXmppRpcIq.h \
-    QXmppRtpChannel.h \
-    QXmppSaslAuth.h \
-    QXmppSessionIq.h \
-    QXmppSocks.h \
-    QXmppStanza.h \
-    QXmppStream.h \
-    QXmppStreamFeatures.h \
-    QXmppStreamInitiationIq.h \
-    QXmppStun.h \
-    QXmppUtils.h \
-    QXmppVCardIq.h \
-    QXmppVersionIq.h
-
-# Source files
-SOURCES += \
-    QXmppArchiveIq.cpp \
-    QXmppBindIq.cpp \
-    QXmppBookmarkSet.cpp \
-    QXmppByteStreamIq.cpp \
-    QXmppCodec.cpp \
-    QXmppConstants.cpp \
-    QXmppDataForm.cpp \
-    QXmppDiscoveryIq.cpp \
-    QXmppElement.cpp \
-    QXmppEntityTimeIq.cpp \
-    QXmppGlobal.cpp \
-    QXmppIbbIq.cpp \
-    QXmppIq.cpp \
-    QXmppJingleIq.cpp \
-    QXmppLogger.cpp \
-    QXmppMessage.cpp \
-    QXmppMucIq.cpp \
-    QXmppNonSASLAuth.cpp \
-    QXmppPacket.cpp \
-    QXmppPingIq.cpp \
-    QXmppPresence.cpp \
-    QXmppPubSubIq.cpp \
-    QXmppRosterIq.cpp \
-    QXmppRpcIq.cpp \
-    QXmppRtpChannel.cpp \
-    QXmppSaslAuth.cpp \
-    QXmppSessionIq.cpp \
-    QXmppSocks.cpp \
-    QXmppStanza.cpp \
-    QXmppStream.cpp \
-    QXmppStreamFeatures.cpp \
-    QXmppStreamInitiationIq.cpp \
-    QXmppStun.cpp \
-    QXmppUtils.cpp \
-    QXmppVCardIq.cpp \
-    QXmppVersionIq.cpp
-
-# DNS
-HEADERS += qdnslookup.h qdnslookup_p.h
-SOURCES += qdnslookup.cpp
-android:SOURCES += qdnslookup_stub.cpp
-else:symbian:SOURCES += qdnslookup_symbian.cpp
-else:unix:SOURCES += qdnslookup_unix.cpp
-else:win32:SOURCES += qdnslookup_win.cpp
-
+include(base/base.pri)
 include(client/client.pri)
 include(server/server.pri)