Browse Source

Cleanup the includes, rename source code files to match the class name exactly

master
Jan Kaluza 7 years ago
parent
commit
78e71f9345
  1. 4
      backends/frotz/main.cpp
  2. 2
      backends/libcommuni/ircnetworkplugin.cpp
  3. 4
      backends/libcommuni/ircnetworkplugin.h
  4. 6
      backends/libcommuni/main.cpp
  5. 2
      backends/libcommuni/session.cpp
  6. 2
      backends/libcommuni/session.h
  7. 2
      backends/libpurple/geventloop.cpp
  8. 7
      backends/libpurple/main.cpp
  9. 24
      backends/skype/main.cpp
  10. 23
      backends/skype/skype.cpp
  11. 23
      backends/skype/skypedb.cpp
  12. 23
      backends/skype/skypeplugin.cpp
  13. 4
      backends/skype/skypeplugin.h
  14. 14
      backends/smstools3/main.cpp
  15. 6
      backends/swiften/main.cpp
  16. 6
      backends/template/main.cpp
  17. 6
      backends/template/plugin.cpp
  18. 4
      backends/template/plugin.h
  19. 2
      backends/twitter/HTTPRequest.h
  20. 4
      backends/twitter/Requests/CreateFriendRequest.h
  21. 4
      backends/twitter/Requests/DestroyFriendRequest.h
  22. 4
      backends/twitter/Requests/DirectMessageRequest.h
  23. 4
      backends/twitter/Requests/FetchFriends.h
  24. 5
      backends/twitter/Requests/HelpMessageRequest.h
  25. 4
      backends/twitter/Requests/OAuthFlow.h
  26. 5
      backends/twitter/Requests/PINExchangeProcess.h
  27. 6
      backends/twitter/Requests/ProfileImageRequest.h
  28. 5
      backends/twitter/Requests/RetweetRequest.h
  29. 5
      backends/twitter/Requests/StatusUpdateRequest.h
  30. 4
      backends/twitter/Requests/TimelineRequest.h
  31. 16
      backends/twitter/TwitterPlugin.h
  32. 2
      backends/twitter/TwitterResponseParser.cpp
  33. 2
      include/Swiften/FileTransfer/CombinedOutgoingFileTransferManager.h
  34. 2
      include/Swiften/TLS/OpenSSL/OpenSSLServerContext.cpp
  35. 0
      include/transport/AdminInterface.h
  36. 1
      include/transport/Buddy.h
  37. 0
      include/transport/Config.h
  38. 3
      include/transport/Conversation.h
  39. 0
      include/transport/ConversationManager.h
  40. 6
      include/transport/Factory.h
  41. 0
      include/transport/FileTransferManager.h
  42. 0
      include/transport/Frontend.h
  43. 3
      include/transport/LocalBuddy.h
  44. 0
      include/transport/Logging.h
  45. 0
      include/transport/MemoryReadBytestream.h
  46. 0
      include/transport/MemoryUsage.h
  47. 4
      include/transport/MySQLBackend.h
  48. 0
      include/transport/NetworkPlugin.h
  49. 11
      include/transport/NetworkPluginServer.h
  50. 4
      include/transport/PQXXBackend.h
  51. 0
      include/transport/PresenceOracle.h
  52. 0
      include/transport/RosterManager.h
  53. 0
      include/transport/RosterStorage.h
  54. 5
      include/transport/SQLite3Backend.h
  55. 0
      include/transport/StorageBackend.h
  56. 1
      include/transport/ThreadPool.h
  57. 0
      include/transport/Transport.h
  58. 9
      include/transport/User.h
  59. 3
      include/transport/UserManager.h
  60. 0
      include/transport/UserRegistration.h
  61. 3
      include/transport/UserRegistry.h
  62. 0
      include/transport/UsersReconnecter.h
  63. 3
      include/transport/Util.h
  64. 8
      plugin/cpp/CMakeLists.txt
  65. 0
      spectrum/src/frontends/xmpp/RosterResponder.h
  66. 12
      spectrum/src/frontends/xmpp/XMPPFrontend.cpp
  67. 3
      spectrum/src/frontends/xmpp/XMPPFrontend.h
  68. 16
      spectrum/src/frontends/xmpp/XMPPRosterManager.cpp
  69. 4
      spectrum/src/frontends/xmpp/XMPPRosterManager.h
  70. 9
      spectrum/src/frontends/xmpp/XMPPUser.cpp
  71. 3
      spectrum/src/frontends/xmpp/XMPPUser.h
  72. 15
      spectrum/src/frontends/xmpp/XMPPUserManager.cpp
  73. 2
      spectrum/src/frontends/xmpp/XMPPUserManager.h
  74. 16
      spectrum/src/frontends/xmpp/XMPPUserRegistration.cpp
  75. 2
      spectrum/src/frontends/xmpp/XMPPUserRegistration.h
  76. 10
      spectrum/src/frontends/xmpp/adhoccommand.cpp
  77. 17
      spectrum/src/frontends/xmpp/adhocmanager.cpp
  78. 10
      spectrum/src/frontends/xmpp/blockresponder.cpp
  79. 4
      spectrum/src/frontends/xmpp/discoinforesponder.cpp
  80. 8
      spectrum/src/frontends/xmpp/discoitemsresponder.cpp
  81. 9
      spectrum/src/frontends/xmpp/gatewayresponder.cpp
  82. 17
      spectrum/src/frontends/xmpp/rosterresponder.cpp
  83. 13
      spectrum/src/frontends/xmpp/settingsadhoccommand.cpp
  84. 22
      spectrum/src/frontends/xmpp/statsresponder.cpp
  85. 7
      spectrum/src/frontends/xmpp/storageresponder.cpp
  86. 12
      spectrum/src/frontends/xmpp/vcardresponder.cpp
  87. 27
      spectrum/src/main.cpp
  88. 2
      spectrum_manager/src/CMakeLists.txt
  89. 2
      spectrum_manager/src/main.cpp
  90. 2
      spectrum_manager/src/methods.h
  91. 26
      src/AdminInterface.cpp
  92. 16
      src/Buddy.cpp
  93. 3
      src/Config.cpp
  94. 16
      src/Conversation.cpp
  95. 14
      src/ConversationManager.cpp
  96. 12
      src/FileTransferManager.cpp
  97. 6
      src/LocalBuddy.cpp
  98. 6
      src/Logging.cpp
  99. 2
      src/MemoryReadByteStream.cpp
  100. 2
      src/MemoryUsage.cpp
  101. Some files were not shown because too many files have changed in this diff Show More

4
backends/frotz/main.cpp

@ -8,8 +8,8 @@ @@ -8,8 +8,8 @@
* program, but you don't have to.
*/
#include "transport/config.h"
#include "transport/networkplugin.h"
#include "transport/Config.h"
#include "transport/NetworkPlugin.h"
#include "Swiften/Swiften.h"
#include <boost/filesystem.hpp>
#include "unistd.h"

2
backends/libcommuni/ircnetworkplugin.cpp

@ -21,7 +21,7 @@ @@ -21,7 +21,7 @@
#include "ircnetworkplugin.h"
#include <IrcCommand>
#include <IrcMessage>
#include "transport/logging.h"
#include "transport/Logging.h"
DEFINE_LOGGER(logger, "IRCNetworkPlugin");

4
backends/libcommuni/ircnetworkplugin.h

@ -20,8 +20,8 @@ @@ -20,8 +20,8 @@
#pragma once
#ifndef Q_MOC_RUN
#include "transport/config.h"
#include "transport/networkplugin.h"
#include "transport/Config.h"
#include "transport/NetworkPlugin.h"
#include "session.h"
#include <QtCore>
#include <QtNetwork>

6
backends/libcommuni/main.cpp

@ -18,9 +18,9 @@ @@ -18,9 +18,9 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
*/
#include "transport/config.h"
#include "transport/networkplugin.h"
#include "transport/logging.h"
#include "transport/Config.h"
#include "transport/NetworkPlugin.h"
#include "transport/Logging.h"
#include "session.h"
#include <QtCore>
#include <QtNetwork>

2
backends/libcommuni/session.cpp

@ -30,7 +30,7 @@ @@ -30,7 +30,7 @@
#define FROM_UTF8(WHAT) QString::fromUtf8((WHAT).c_str(), (WHAT).size())
#define TO_UTF8(WHAT) std::string((WHAT).toUtf8().data(), (WHAT).toUtf8().size())
#include "transport/logging.h"
#include "transport/Logging.h"
DEFINE_LOGGER(logger, "IRCConnection");

2
backends/libcommuni/session.h

@ -23,7 +23,7 @@ @@ -23,7 +23,7 @@
#ifndef Q_MOC_RUN
#include <IrcConnection>
#include <transport/networkplugin.h>
#include <transport/NetworkPlugin.h>
#include "Swiften/Swiften.h"
#include <boost/smart_ptr/make_shared.hpp>
#include <QTimer>

2
backends/libpurple/geventloop.cpp

@ -30,7 +30,7 @@ @@ -30,7 +30,7 @@
#include "purple_defs.h"
#include "transport/logging.h"
#include "transport/Logging.h"
DEFINE_LOGGER(logger, "EventLoop");

7
backends/libpurple/main.cpp

@ -10,10 +10,9 @@ @@ -10,10 +10,9 @@
#include <algorithm>
#include <iostream>
#include "transport/networkplugin.h"
#include "transport/logging.h"
#include "transport/config.h"
#include "transport/logging.h"
#include "transport/NetworkPlugin.h"
#include "transport/Logging.h"
#include "transport/Config.h"
#include "geventloop.h"
// #include "valgrind/memcheck.h"

24
backends/skype/main.cpp

@ -3,18 +3,18 @@ @@ -3,18 +3,18 @@
#include "sqlite3.h"
#include <iostream>
#include "transport/config.h"
#include "transport/logging.h"
#include "transport/transport.h"
#include "transport/usermanager.h"
#include "transport/memoryusage.h"
#include "transport/sqlite3backend.h"
#include "transport/userregistration.h"
#include "transport/user.h"
#include "transport/storagebackend.h"
#include "transport/rostermanager.h"
#include "transport/conversation.h"
#include "transport/networkplugin.h"
#include "transport/Config.h"
#include "transport/Logging.h"
#include "transport/Transport.h"
#include "transport/UserManager.h"
#include "transport/MemoryUsage.h"
#include "transport/SQLite3Backend.h"
#include "transport/UserRegistration.h"
#include "transport/User.h"
#include "transport/StorageBackend.h"
#include "transport/RosterManager.h"
#include "transport/Conversation.h"
#include "transport/NetworkPlugin.h"
#include <boost/filesystem.hpp>
#include "sys/wait.h"
#include "sys/signal.h"

23
backends/skype/skype.cpp

@ -22,18 +22,17 @@ @@ -22,18 +22,17 @@
#include "skypeplugin.h"
#include "skypedb.h"
#include "transport/config.h"
#include "transport/logging.h"
#include "transport/transport.h"
#include "transport/usermanager.h"
#include "transport/memoryusage.h"
#include "transport/sqlite3backend.h"
#include "transport/userregistration.h"
#include "transport/user.h"
#include "transport/storagebackend.h"
#include "transport/rostermanager.h"
#include "transport/conversation.h"
#include "transport/networkplugin.h"
#include "transport/Logging.h"
#include "transport/Transport.h"
#include "transport/UserManager.h"
#include "transport/MemoryUsage.h"
#include "transport/SQLite3Backend.h"
#include "transport/UserRegistration.h"
#include "transport/User.h"
#include "transport/StorageBackend.h"
#include "transport/RosterManager.h"
#include "transport/Conversation.h"
#include "transport/NetworkPlugin.h"
#include <boost/filesystem.hpp>
#include "sys/wait.h"
#include "sys/signal.h"

23
backends/skype/skypedb.cpp

@ -20,18 +20,17 @@ @@ -20,18 +20,17 @@
#include "skypedb.h"
#include "transport/config.h"
#include "transport/logging.h"
#include "transport/transport.h"
#include "transport/usermanager.h"
#include "transport/memoryusage.h"
#include "transport/sqlite3backend.h"
#include "transport/userregistration.h"
#include "transport/user.h"
#include "transport/storagebackend.h"
#include "transport/rostermanager.h"
#include "transport/conversation.h"
#include "transport/networkplugin.h"
#include "transport/Logging.h"
#include "transport/Transport.h"
#include "transport/UserManager.h"
#include "transport/MemoryUsage.h"
#include "transport/SQLite3Backend.h"
#include "transport/UserRegistration.h"
#include "transport/User.h"
#include "transport/StorageBackend.h"
#include "transport/RosterManager.h"
#include "transport/Conversation.h"
#include "transport/NetworkPlugin.h"
#include <boost/filesystem.hpp>
#include "sys/wait.h"
#include "sys/signal.h"

23
backends/skype/skypeplugin.cpp

@ -22,18 +22,17 @@ @@ -22,18 +22,17 @@
#include "skype.h"
#include "skypedb.h"
#include "transport/config.h"
#include "transport/logging.h"
#include "transport/transport.h"
#include "transport/usermanager.h"
#include "transport/memoryusage.h"
#include "transport/sqlite3backend.h"
#include "transport/userregistration.h"
#include "transport/user.h"
#include "transport/storagebackend.h"
#include "transport/rostermanager.h"
#include "transport/conversation.h"
#include "transport/networkplugin.h"
#include "transport/Logging.h"
#include "transport/Transport.h"
#include "transport/UserManager.h"
#include "transport/MemoryUsage.h"
#include "transport/SQLite3Backend.h"
#include "transport/UserRegistration.h"
#include "transport/User.h"
#include "transport/StorageBackend.h"
#include "transport/RosterManager.h"
#include "transport/Conversation.h"
#include "transport/NetworkPlugin.h"
#include <boost/filesystem.hpp>
#include "sys/wait.h"
#include "sys/signal.h"

4
backends/skype/skypeplugin.h

@ -25,8 +25,8 @@ @@ -25,8 +25,8 @@
#include "sqlite3.h"
#include <iostream>
#include <map>
#include "transport/networkplugin.h"
#include "transport/config.h"
#include "transport/NetworkPlugin.h"
#include "transport/Config.h"
class Skype;

14
backends/smstools3/main.cpp

@ -8,13 +8,13 @@ @@ -8,13 +8,13 @@
* program, but you don't have to.
*/
#include "transport/config.h"
#include "transport/logging.h"
#include "transport/networkplugin.h"
#include "transport/sqlite3backend.h"
#include "transport/mysqlbackend.h"
#include "transport/pqxxbackend.h"
#include "transport/storagebackend.h"
#include "transport/Config.h"
#include "transport/Logging.h"
#include "transport/NetworkPlugin.h"
#include "transport/SQLite3Backend.h"
#include "transport/MySQLBackend.h"
#include "transport/PQXXBackend.h"
#include "transport/StorageBackend.h"
#include "Swiften/Swiften.h"
#include <boost/filesystem.hpp>
#include "unistd.h"

6
backends/swiften/main.cpp

@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
// Transport includes
#include "transport/config.h"
#include "transport/networkplugin.h"
#include "transport/logging.h"
#include "transport/Config.h"
#include "transport/NetworkPlugin.h"
#include "transport/Logging.h"
#include "boost/date_time/posix_time/posix_time.hpp"

6
backends/template/main.cpp

@ -1,9 +1,9 @@ @@ -1,9 +1,9 @@
#include "plugin.h"
// Transport includes
#include "transport/config.h"
#include "transport/networkplugin.h"
#include "transport/logging.h"
#include "transport/Config.h"
#include "transport/NetworkPlugin.h"
#include "transport/Logging.h"
// Swiften
#include "Swiften/Swiften.h"

6
backends/template/plugin.cpp

@ -1,8 +1,8 @@ @@ -1,8 +1,8 @@
#include "plugin.h"
// Transport includes
#include "transport/config.h"
#include "transport/networkplugin.h"
#include "transport/logging.h"
#include "transport/Config.h"
#include "transport/NetworkPlugin.h"
#include "transport/Logging.h"
// Swiften
#include "Swiften/Swiften.h"

4
backends/template/plugin.h

@ -2,8 +2,8 @@ @@ -2,8 +2,8 @@
#include "Swiften/Swiften.h"
#include "transport/config.h"
#include "transport/networkplugin.h"
#include "transport/Config.h"
#include "transport/NetworkPlugin.h"
class Plugin : public Transport::NetworkPlugin {
public:

2
backends/twitter/HTTPRequest.h

@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
#define HTTPREQ_H
#include "curl/curl.h"
#include "transport/logging.h"
#include "transport/Logging.h"
#include <iostream>
#include <sstream>
#include <string.h>

4
backends/twitter/Requests/CreateFriendRequest.h

@ -1,10 +1,10 @@ @@ -1,10 +1,10 @@
#ifndef CREATE_FRIEND
#define CREATE_FRIEND
#include "transport/threadpool.h"
#include "transport/ThreadPool.h"
#include "../TwitterResponseParser.h"
#include "../libtwitcurl/twitcurl.h"
#include "transport/logging.h"
#include "transport/Logging.h"
#include <string>
#include <boost/function.hpp>
#include <iostream>

4
backends/twitter/Requests/DestroyFriendRequest.h

@ -1,10 +1,10 @@ @@ -1,10 +1,10 @@
#ifndef DESTROY_FRIEND
#define DESTROY_FRIEND
#include "transport/threadpool.h"
#include "transport/ThreadPool.h"
#include "../TwitterResponseParser.h"
#include "../libtwitcurl/twitcurl.h"
#include "transport/logging.h"
#include "transport/Logging.h"
#include <string>
#include <boost/function.hpp>
#include <iostream>

4
backends/twitter/Requests/DirectMessageRequest.h

@ -1,10 +1,10 @@ @@ -1,10 +1,10 @@
#ifndef DIRECT_MESSAGE
#define DIRECT_MESSAGE
#include "transport/threadpool.h"
#include "transport/ThreadPool.h"
#include "../TwitterResponseParser.h"
#include "../libtwitcurl/twitcurl.h"
#include "transport/logging.h"
#include "transport/Logging.h"
#include <string>
#include <boost/function.hpp>
#include <iostream>

4
backends/twitter/Requests/FetchFriends.h

@ -1,10 +1,10 @@ @@ -1,10 +1,10 @@
#ifndef FRIENDS_H
#define FRIENDS_H
#include "transport/threadpool.h"
#include "transport/ThreadPool.h"
#include "../libtwitcurl/twitcurl.h"
#include "../TwitterResponseParser.h"
#include "transport/logging.h"
#include "transport/Logging.h"
#include <string>
#include <boost/signals.hpp>
#include <boost/function.hpp>

5
backends/twitter/Requests/HelpMessageRequest.h

@ -1,10 +1,9 @@ @@ -1,10 +1,9 @@
#ifndef HELPMESSAGE_H
#define HELPMESSAGE_H
#include "transport/threadpool.h"
#include "transport/ThreadPool.h"
#include "../libtwitcurl/twitcurl.h"
#include "transport/networkplugin.h"
#include "transport/logging.h"
#include "transport/Logging.h"
#include <string>
#include <boost/function.hpp>
#include <iostream>

4
backends/twitter/Requests/OAuthFlow.h

@ -1,10 +1,10 @@ @@ -1,10 +1,10 @@
#ifndef OAUTH_FLOW
#define OAUTH_FLOW
#include "transport/threadpool.h"
#include "transport/ThreadPool.h"
#include "../libtwitcurl/twitcurl.h"
#include "../TwitterPlugin.h"
#include "transport/logging.h"
#include "transport/Logging.h"
#include <string>
#include <iostream>

5
backends/twitter/Requests/PINExchangeProcess.h

@ -1,11 +1,10 @@ @@ -1,11 +1,10 @@
#ifndef PIN_EXCHANGE
#define PIN_EXCHANGE
#include "transport/threadpool.h"
#include "transport/ThreadPool.h"
#include "../libtwitcurl/twitcurl.h"
#include "../TwitterPlugin.h"
#include "transport/networkplugin.h"
#include "transport/logging.h"
#include "transport/Logging.h"
#include <string>
#include <iostream>

6
backends/twitter/Requests/ProfileImageRequest.h

@ -1,10 +1,10 @@ @@ -1,10 +1,10 @@
#ifndef PROFILEIMAGE_H
#define PROFILEIMAGE_H
#include "transport/threadpool.h"
#include "../TwitterResponseParser.h"
#include "transport/logging.h"
#include "transport/config.h"
#include "transport/ThreadPool.h"
#include "transport/Logging.h"
#include "transport/Config.h"
#include <string>
#include <boost/signals.hpp>
#include <boost/function.hpp>

5
backends/twitter/Requests/RetweetRequest.h

@ -1,11 +1,10 @@ @@ -1,11 +1,10 @@
#ifndef RETWEET_H
#define RETWEET_H
#include "transport/threadpool.h"
#include "transport/ThreadPool.h"
#include "../TwitterResponseParser.h"
#include "../libtwitcurl/twitcurl.h"
#include "transport/networkplugin.h"
#include "transport/logging.h"
#include "transport/Logging.h"
#include <boost/function.hpp>
#include <string>
#include <iostream>

5
backends/twitter/Requests/StatusUpdateRequest.h

@ -1,11 +1,10 @@ @@ -1,11 +1,10 @@
#ifndef STATUS_UPDATE
#define STATUS_UPDATE
#include "transport/threadpool.h"
#include "transport/ThreadPool.h"
#include "../libtwitcurl/twitcurl.h"
#include "../TwitterResponseParser.h"
#include "transport/networkplugin.h"
#include "transport/logging.h"
#include "transport/Logging.h"
#include <boost/function.hpp>
#include <string>
#include <iostream>

4
backends/twitter/Requests/TimelineRequest.h

@ -1,10 +1,10 @@ @@ -1,10 +1,10 @@
#ifndef TIMELINE_H
#define TIMELINE_H
#include "transport/threadpool.h"
#include "transport/ThreadPool.h"
#include "../libtwitcurl/twitcurl.h"
#include "../TwitterResponseParser.h"
#include "transport/logging.h"
#include "transport/Logging.h"
#include <string>
#include <iostream>
#include <boost/function.hpp>

16
backends/twitter/TwitterPlugin.h

@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
#ifndef TWITTER_PLUGIN
#define TWITTER_PLUGIN
#include "transport/config.h"
#include "transport/networkplugin.h"
#include "transport/logging.h"
#include "transport/sqlite3backend.h"
#include "transport/mysqlbackend.h"
#include "transport/pqxxbackend.h"
#include "transport/storagebackend.h"
#include "transport/threadpool.h"
#include "transport/Config.h"
#include "transport/NetworkPlugin.h"
#include "transport/Logging.h"
#include "transport/SQLite3Backend.h"
#include "transport/MySQLBackend.h"
#include "transport/PQXXBackend.h"
#include "transport/StorageBackend.h"
#include "transport/ThreadPool.h"
#include "Swiften/Swiften.h"
#ifndef _WIN32

2
backends/twitter/TwitterResponseParser.cpp

@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
#include "TwitterResponseParser.h"
#include "transport/logging.h"
#include "transport/Logging.h"
#include "boost/algorithm/string.hpp"
#include <cctype>
#include "boost/date_time/local_time/local_time.hpp"

2
include/Swiften/FileTransfer/CombinedOutgoingFileTransferManager.h

@ -11,7 +11,7 @@ @@ -11,7 +11,7 @@
#include <Swiften/JID/JID.h>
#include "transport/presenceoracle.h"
#include "transport/PresenceOracle.h"
#include <Swiften/FileTransfer/OutgoingFileTransfer.h>
#include <Swiften/Version.h>
#define HAVE_SWIFTEN_3 (SWIFTEN_VERSION >= 0x030000)

2
include/Swiften/TLS/OpenSSL/OpenSSLServerContext.cpp

@ -14,7 +14,7 @@ @@ -14,7 +14,7 @@
#include <openssl/err.h>
#include <openssl/pkcs12.h>
#include "transport/logging.h"
#include "transport/Logging.h"
DEFINE_LOGGER(logger, "OpenSSLServerContext");

0
include/transport/admininterface.h → include/transport/AdminInterface.h

1
include/transport/buddy.h → include/transport/Buddy.h

@ -22,7 +22,6 @@ @@ -22,7 +22,6 @@
#include <string>
#include <algorithm>
#include "transport/transport.h"
#include "Swiften/Elements/VCard.h"
#include "Swiften/Elements/Presence.h"

0
include/transport/config.h → include/transport/Config.h

3
include/transport/conversation.h → include/transport/Conversation.h

@ -22,8 +22,7 @@ @@ -22,8 +22,7 @@
#include <string>
#include <algorithm>
#include "transport/transport.h"
#include <list>
#include "Swiften/Elements/Message.h"
#include "Swiften/Elements/Presence.h"

0
include/transport/conversationmanager.h → include/transport/ConversationManager.h

6
include/transport/factory.h → include/transport/Factory.h

@ -22,12 +22,7 @@ @@ -22,12 +22,7 @@
#include <string>
#include <algorithm>
#include "transport/transport.h"
#include "Swiften/Elements/Message.h"
#include "transport/conversation.h"
#include "transport/buddy.h"
#include "transport/storagebackend.h"
namespace Transport {
@ -35,6 +30,7 @@ class Conversation; @@ -35,6 +30,7 @@ class Conversation;
class Buddy;
class ConversationManager;
class RosterManager;
struct BuddyInfo;
class Factory {
public:

0
include/transport/filetransfermanager.h → include/transport/FileTransferManager.h

0
include/transport/frontend.h → include/transport/Frontend.h

3
include/transport/localbuddy.h → include/transport/LocalBuddy.h

@ -23,8 +23,7 @@ @@ -23,8 +23,7 @@
#include <string>
#include <algorithm>
#include "transport/buddy.h"
#include "transport/rostermanager.h"
#include "transport/Buddy.h"
namespace Transport {

0
include/transport/logging.h → include/transport/Logging.h

0
include/transport/memoryreadbytestream.h → include/transport/MemoryReadBytestream.h

0
include/transport/memoryusage.h → include/transport/MemoryUsage.h

4
include/transport/mysqlbackend.h → include/transport/MySQLBackend.h

@ -24,8 +24,8 @@ @@ -24,8 +24,8 @@
#include <string>
#include <map>
#include "transport/storagebackend.h"
#include "transport/config.h"
#include "transport/StorageBackend.h"
#include "transport/Config.h"
#include "mysql.h"
namespace Transport {

0
include/transport/networkplugin.h → include/transport/NetworkPlugin.h

11
include/transport/networkpluginserver.h → include/transport/NetworkPluginServer.h

@ -20,6 +20,8 @@ @@ -20,6 +20,8 @@
#pragma once
#include "transport/FileTransferManager.h"
#include <time.h>
#include "Swiften/Presence/PresenceOracle.h"
#include "Swiften/Disco/EntityCapsManager.h"
@ -28,14 +30,17 @@ @@ -28,14 +30,17 @@
#include "Swiften/Elements/ChatState.h"
#include "Swiften/Elements/RosterItemPayload.h"
#include "Swiften/Elements/VCard.h"
#include "Swiften/Elements/Message.h"
#include "Swiften/Elements/Presence.h"
#include "Swiften/Elements/IQ.h"
#include "Swiften/Network/Timer.h"
#include "Swiften/Parser/PayloadParsers/FullPayloadParserFactoryCollection.h"
#include "Swiften/Serializer/PayloadSerializers/FullPayloadSerializerCollection.h"
#include "Swiften/Parser/XMPPParser.h"
#include "Swiften/Parser/XMPPParserClient.h"
#include "Swiften/Serializer/XMPPSerializer.h"
#include "storagebackend.h"
#include "transport/filetransfermanager.h"
#include <Swiften/Version.h>
#include <Swiften/FileTransfer/FileTransfer.h>
#define HAVE_SWIFTEN_3 (SWIFTEN_VERSION >= 0x030000)
namespace Transport {
@ -52,6 +57,8 @@ class RosterResponder; @@ -52,6 +57,8 @@ class RosterResponder;
class BlockResponder;
class DummyReadBytestream;
class AdminInterface;
class FileTransferManager;
class FileTransfer;
class NetworkPluginServer : Swift::XMPPParserClient {
public:

4
include/transport/pqxxbackend.h → include/transport/PQXXBackend.h

@ -24,8 +24,8 @@ @@ -24,8 +24,8 @@
#include <string>
#include <map>
#include "transport/storagebackend.h"
#include "transport/config.h"
#include "transport/StorageBackend.h"
#include "transport/Config.h"
#include <pqxx/pqxx>
namespace Transport {

0
include/transport/presenceoracle.h → include/transport/PresenceOracle.h

0
include/transport/rostermanager.h → include/transport/RosterManager.h

0
include/transport/rosterstorage.h → include/transport/RosterStorage.h

5
include/transport/sqlite3backend.h → include/transport/SQLite3Backend.h

@ -24,12 +24,13 @@ @@ -24,12 +24,13 @@
#include <string>
#include <map>
#include "transport/storagebackend.h"
#include "transport/config.h"
#include "transport/StorageBackend.h"
#include "sqlite3.h"
namespace Transport {
class Config;
/// Used to store transport data into SQLite3 database.
class SQLite3Backend : public StorageBackend
{

0
include/transport/storagebackend.h → include/transport/StorageBackend.h

1
include/transport/threadpool.h → include/transport/ThreadPool.h

@ -6,7 +6,6 @@ @@ -6,7 +6,6 @@
#include <boost/signals2/signal.hpp>
#include <queue>
#include <iostream>
#include "transport/logging.h"
#include "Swiften/EventLoop/EventLoop.h"

0
include/transport/transport.h → include/transport/Transport.h

9
include/transport/user.h → include/transport/User.h

@ -21,11 +21,13 @@ @@ -21,11 +21,13 @@
#pragma once
#include <time.h>
#include "Swiften/Disco/EntityCapsManager.h"
#include "Swiften/Disco/EntityCapsProvider.h"
#include "storagebackend.h"
#include "transport/StorageBackend.h"
#include <Swiften/FileTransfer/OutgoingFileTransfer.h>
#include "Swiften/Elements/SpectrumErrorPayload.h"
#include "Swiften/JID/JID.h"
#include "Swiften/Elements/Presence.h"
#include "Swiften/Elements/Message.h"
#include "Swiften/Elements/DiscoInfo.h"
#include "Swiften/Network/Timer.h"
#include "Swiften/Network/Connection.h"
@ -36,7 +38,6 @@ class RosterManager; @@ -36,7 +38,6 @@ class RosterManager;
class ConversationManager;
class UserManager;
class PresenceOracle;
struct UserInfo;
/// Represents online XMPP user.
class User {

3
include/transport/usermanager.h → include/transport/UserManager.h

@ -22,9 +22,9 @@ @@ -22,9 +22,9 @@
#include <string>
#include <map>
#include "transport/userregistry.h"
#include "Swiften/Elements/Message.h"
#include "Swiften/Elements/Presence.h"
#include "Swiften/JID/JID.h"
#include "Swiften/Disco/EntityCapsProvider.h"
#include "Swiften/Elements/DiscoInfo.h"
#include "Swiften/Elements/VCard.h"
@ -38,6 +38,7 @@ class StorageBackend; @@ -38,6 +38,7 @@ class StorageBackend;
class StorageResponder;
class RosterResponder;
class UserRegistration;
class UserRegistry;
/// Manages online XMPP Users.

0
include/transport/userregistration.h → include/transport/UserRegistration.h

3
include/transport/userregistry.h → include/transport/UserRegistry.h

@ -26,10 +26,11 @@ @@ -26,10 +26,11 @@
#include "Swiften/Network/NetworkFactories.h"
#include "Swiften/Network/Timer.h"
#include "Swiften/Network/TimerFactory.h"
#include "transport/config.h"
namespace Transport {
class Config;
/// Validates passwords in Server mode.
/// Normal login workflow could work like following:

0
include/transport/usersreconnecter.h → include/transport/UsersReconnecter.h

3
include/transport/util.h → include/transport/Util.h

@ -27,10 +27,11 @@ @@ -27,10 +27,11 @@
#include "Swiften/StringCodecs/Base64.h"
#include <boost/filesystem.hpp>
#include "transport/config.h"
namespace Transport {
class Config;
namespace Util {
void createDirectories(Transport::Config *config, const boost::filesystem::path& ph);

8
plugin/cpp/CMakeLists.txt

@ -2,10 +2,10 @@ cmake_minimum_required(VERSION 2.6) @@ -2,10 +2,10 @@ cmake_minimum_required(VERSION 2.6)
FILE(GLOB SRC *.cpp *.h)
FILE(GLOB HEADERS ../include/transport/*.h)
set(EXTRA_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/../../src/memoryusage.cpp)
set(EXTRA_SOURCES ${EXTRA_SOURCES} ${CMAKE_CURRENT_SOURCE_DIR}/../../src/logging.cpp)
set(EXTRA_SOURCES ${EXTRA_SOURCES} ${CMAKE_CURRENT_SOURCE_DIR}/../../src/config.cpp)
set(EXTRA_SOURCES ${EXTRA_SOURCES} ${CMAKE_CURRENT_SOURCE_DIR}/../../src/util.cpp)
set(EXTRA_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/../../src/MemoryUsage.cpp)
set(EXTRA_SOURCES ${EXTRA_SOURCES} ${CMAKE_CURRENT_SOURCE_DIR}/../../src/Logging.cpp)
set(EXTRA_SOURCES ${EXTRA_SOURCES} ${CMAKE_CURRENT_SOURCE_DIR}/../../src/Config.cpp)
set(EXTRA_SOURCES ${EXTRA_SOURCES} ${CMAKE_CURRENT_SOURCE_DIR}/../../src/Util.cpp)
set(EXTRA_SOURCES ${EXTRA_SOURCES} ${CMAKE_CURRENT_SOURCE_DIR}/../../include/transport/protocol.pb.cc)
if (NOT WIN32)

0
include/transport/rosterresponder.h → spectrum/src/frontends/xmpp/RosterResponder.h

12
spectrum/src/frontends/xmpp/XMPPFrontend.cpp

@ -22,15 +22,15 @@ @@ -22,15 +22,15 @@
#include "XMPPRosterManager.h"
#include "XMPPUser.h"
#include "XMPPUserManager.h"
#include "transport/storagebackend.h"
#include <boost/bind.hpp>
#include <boost/smart_ptr/make_shared.hpp>
#include <boost/algorithm/string/predicate.hpp>
#include "transport/storagebackend.h"
#include "transport/factory.h"
#include "transport/userregistry.h"
#include "transport/logging.h"
#include "transport/config.h"
#include "transport/StorageBackend.h"
#include "transport/Factory.h"
#include "transport/UserRegistry.h"
#include "transport/Logging.h"
#include "transport/Config.h"
#include "transport/Transport.h"
#include "discoitemsresponder.h"
#include "storageparser.h"
#ifdef _WIN32

3
spectrum/src/frontends/xmpp/XMPPFrontend.h

@ -20,8 +20,9 @@ @@ -20,8 +20,9 @@
#pragma once
#include "transport/Frontend.h"
#include <vector>
#include "transport/frontend.h"
#include "Swiften/Server/Server.h"
#include "Swiften/Disco/GetDiscoInfoRequest.h"
#include "Swiften/Disco/EntityCapsManager.h"

16
spectrum/src/frontends/xmpp/XMPPRosterManager.cpp

@ -21,16 +21,12 @@ @@ -21,16 +21,12 @@
#include "XMPPRosterManager.h"
#include "XMPPFrontend.h"
#include "XMPPUser.h"
#include "transport/rostermanager.h"
#include "transport/rosterstorage.h"
#include "transport/storagebackend.h"
#include "transport/buddy.h"
#include "transport/usermanager.h"
#include "transport/buddy.h"
#include "transport/user.h"
#include "transport/logging.h"
#include "transport/factory.h"
#include "transport/presenceoracle.h"
#include "transport/Buddy.h"
#include "transport/User.h"
#include "transport/Logging.h"
#include "transport/Factory.h"
#include "transport/PresenceOracle.h"
#include "transport/Transport.h"
#include "Swiften/Roster/SetRosterRequest.h"
#include "Swiften/Elements/RosterPayload.h"
#include "Swiften/Elements/RosterItemPayload.h"

4
spectrum/src/frontends/xmpp/XMPPRosterManager.h

@ -20,17 +20,17 @@ @@ -20,17 +20,17 @@
#pragma once
#include "transport/RosterManager.h"
#include <string>
#include <algorithm>
#include <map>
#include <boost/pool/pool_alloc.hpp>
#include <boost/pool/object_pool.hpp>
// #include "rosterstorage.h"
#include "Swiften/Elements/RosterPayload.h"
#include "Swiften/Queries/GenericRequest.h"
#include "Swiften/Roster/SetRosterRequest.h"
#include "Swiften/Elements/Presence.h"
#include "transport/rostermanager.h"
#include "Swiften/Network/Timer.h"
namespace Transport {

9
spectrum/src/frontends/xmpp/XMPPUser.cpp

@ -20,12 +20,9 @@ @@ -20,12 +20,9 @@
#include "XMPPUser.h"
#include "XMPPFrontend.h"
#include "transport/user.h"
#include "transport/frontend.h"
#include "transport/transport.h"
#include "transport/rostermanager.h"
#include "transport/usermanager.h"
#include "transport/logging.h"
#include "transport/Transport.h"
#include "transport/UserManager.h"
#include "transport/Logging.h"
#include "Swiften/Server/ServerStanzaChannel.h"
#include "Swiften/Elements/StreamError.h"
#include "Swiften/Elements/SpectrumErrorPayload.h"

3
spectrum/src/frontends/xmpp/XMPPUser.h

@ -20,7 +20,8 @@ @@ -20,7 +20,8 @@
#pragma once
#include "transport/user.h"
#include "transport/User.h"
#include <time.h>
#include "Swiften/Disco/EntityCapsManager.h"
#include "Swiften/Disco/EntityCapsProvider.h"

15
spectrum/src/frontends/xmpp/XMPPUserManager.cpp

@ -20,18 +20,13 @@ @@ -20,18 +20,13 @@
#include "XMPPUserManager.h"
#include "XMPPUserRegistration.h"
#include "transport/user.h"
#include "transport/transport.h"
#include "transport/storagebackend.h"
#include "transport/conversationmanager.h"
#include "transport/rostermanager.h"
#include "transport/userregistry.h"
#include "transport/logging.h"
#include "transport/frontend.h"
#include "transport/presenceoracle.h"
#include "transport/User.h"
#include "transport/Transport.h"
#include "transport/StorageBackend.h"
#include "transport/Logging.h"
#include "transport/Frontend.h"
#include "storageresponder.h"
#include "vcardresponder.h"
#include "transport/frontend.h"
#include "XMPPFrontend.h"
#include "gatewayresponder.h"
#include "adhocmanager.h"

2
spectrum/src/frontends/xmpp/XMPPUserManager.h

@ -22,7 +22,7 @@ @@ -22,7 +22,7 @@
#include <string>
#include <map>
#include "transport/usermanager.h"
#include "transport/UserManager.h"
#include "Swiften/Elements/Message.h"
#include "Swiften/Elements/Presence.h"
#include "Swiften/Disco/EntityCapsProvider.h"

16
spectrum/src/frontends/xmpp/XMPPUserRegistration.cpp

@ -20,15 +20,15 @@ @@ -20,15 +20,15 @@
#include "XMPPUserRegistration.h"
#include "XMPPRosterManager.h"
#include "transport/userregistration.h"
#include "transport/usermanager.h"
#include "transport/storagebackend.h"
#include "transport/transport.h"
#include "transport/rostermanager.h"
#include "transport/user.h"
#include "transport/logging.h"
#include "transport/UserManager.h"
#include "transport/StorageBackend.h"
#include "transport/Transport.h"
#include "transport/RosterManager.h"
#include "transport/User.h"
#include "transport/Logging.h"
#include "formutils.h"
#include "transport/buddy.h"
#include "transport/Buddy.h"
#include "transport/Config.h"
#include "Swiften/Elements/ErrorPayload.h"
#include "Swiften/EventLoop/SimpleEventLoop.h"
#include "Swiften/Network/BoostNetworkFactories.h"

2
spectrum/src/frontends/xmpp/XMPPUserRegistration.h

@ -25,7 +25,7 @@ @@ -25,7 +25,7 @@
#include "Swiften/Elements/RosterPayload.h"
#include <boost/signal.hpp>
#include <Swiften/Version.h>
#include "transport/userregistration.h"
#include "transport/UserRegistration.h"
#define HAVE_SWIFTEN_3 (SWIFTEN_VERSION >= 0x030000)
namespace Transport {

10
spectrum/src/frontends/xmpp/adhoccommand.cpp

@ -20,13 +20,9 @@ @@ -20,13 +20,9 @@
#include "adhoccommand.h"
#include "adhoccommandfactory.h"
#include "transport/conversation.h"
#include "transport/usermanager.h"
#include "transport/storagebackend.h"
#include "transport/buddy.h"
#include "transport/factory.h"
#include "transport/user.h"
#include "transport/logging.h"
#include "transport/UserManager.h"
#include "transport/StorageBackend.h"
#include "transport/Logging.h"
namespace Transport {

17
spectrum/src/frontends/xmpp/adhocmanager.cpp

@ -18,18 +18,17 @@ @@ -18,18 +18,17 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
*/
#include "XMPPFrontend.h"
#include "adhocmanager.h"
#include "adhoccommandfactory.h"
#include "discoitemsresponder.h"
#include "transport/conversation.h"
#include "transport/usermanager.h"
#include "transport/buddy.h"
#include "transport/factory.h"
#include "transport/user.h"
#include "transport/logging.h"
#include "transport/storagebackend.h"
#include "transport/UserManager.h"
#include "transport/User.h"
#include "transport/Logging.h"
#include "transport/StorageBackend.h"
#include "transport/Transport.h"
#include "transport/Config.h"
#include "XMPPFrontend.h"
namespace Transport {

10
spectrum/src/frontends/xmpp/blockresponder.cpp

@ -24,11 +24,11 @@ @@ -24,11 +24,11 @@
#include <boost/bind.hpp>
#include "Swiften/Queries/IQRouter.h"
#include "BlockPayload.h"
#include "transport/usermanager.h"
#include "transport/user.h"
#include "transport/buddy.h"
#include "transport/rostermanager.h"
#include "transport/logging.h"
#include "transport/UserManager.h"
#include "transport/User.h"
#include "transport/Buddy.h"
#include "transport/RosterManager.h"
#include "transport/Logging.h"
using namespace Swift;
using namespace boost;

4
spectrum/src/frontends/xmpp/discoinforesponder.cpp

@ -26,8 +26,8 @@ @@ -26,8 +26,8 @@
#include "Swiften/Disco/DiscoInfoResponder.h"
#include "Swiften/Queries/IQRouter.h"
#include "Swiften/Elements/DiscoInfo.h"
#include "transport/config.h"
#include "transport/logging.h"
#include "transport/Config.h"
#include "transport/Logging.h"
#include "Swiften/Disco/CapsInfoGenerator.h"
#include "XMPPFrontend.h"

8
spectrum/src/frontends/xmpp/discoitemsresponder.cpp

@ -23,12 +23,12 @@ @@ -23,12 +23,12 @@
#include <iostream>
#include <boost/bind.hpp>
#include "Swiften/Queries/IQRouter.h"
#include "transport/transport.h"
#include "transport/logging.h"
#include "transport/config.h"
#include "transport/Transport.h"
#include "transport/Logging.h"
#include "transport/Config.h"
#include "discoinforesponder.h"
#include "XMPPFrontend.h"
#include "transport/frontend.h"
#include "transport/Frontend.h"
using namespace Swift;
using namespace boost;

9
spectrum/src/frontends/xmpp/gatewayresponder.cpp

@ -24,10 +24,11 @@ @@ -24,10 +24,11 @@
#include <boost/bind.hpp>
#include "Swiften/Queries/IQRouter.h"
#include "Swiften/Elements/RawXMLPayload.h"
#include "transport/usermanager.h"
#include "transport/user.h"
#include "transport/transport.h"
#include "transport/logging.h"
#include "transport/UserManager.h"
#include "transport/User.h"
#include "transport/Transport.h"
#include "transport/Logging.h"
#include "transport/Config.h"
using namespace Swift;
using namespace boost;

17
spectrum/src/frontends/xmpp/rosterresponder.cpp

@ -18,19 +18,20 @@ @@ -18,19 +18,20 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
*/
#include "transport/rosterresponder.h"
#include "RosterResponder.h"
#include <iostream>
#include <boost/bind.hpp>
#include "Swiften/Queries/IQRouter.h"
#include "transport/user.h"
#include "transport/usermanager.h"
#include "transport/rostermanager.h"
#include "transport/buddy.h"
#include "transport/logging.h"
#include "transport/factory.h"
#include "transport/User.h"
#include "transport/UserManager.h"
#include "transport/RosterManager.h"
#include "transport/Buddy.h"
#include "transport/Logging.h"
#include "transport/Factory.h"
#include "transport/Transport.h"
#include "XMPPFrontend.h"
#include "transport/frontend.h"
#include "transport/Frontend.h"
using namespace Swift;
using namespace boost;

13
spectrum/src/frontends/xmpp/settingsadhoccommand.cpp

@ -19,13 +19,12 @@ @@ -19,13 +19,12 @@
*/
#include "settingsadhoccommand.h"
#include "transport/conversation.h"
#include "transport/usermanager.h"
#include "transport/buddy.h"
#include "transport/factory.h"
#include "transport/user.h"
#include "transport/logging.h"
#include "transport/storagebackend.h"
#include "transport/UserManager.h"
#include "transport/User.h"
#include "transport/Logging.h"
#include "transport/StorageBackend.h"
#include "transport/Transport.h"
#include "transport/Config.h"
#include "formutils.h"

22
spectrum/src/frontends/xmpp/statsresponder.cpp

@ -23,18 +23,18 @@ @@ -23,18 +23,18 @@
#include <iostream>
#include <boost/bind.hpp>
#include "Swiften/Queries/IQRouter.h"
#include "transport/usermanager.h"
#include "transport/user.h"
#include "transport/buddy.h"
#include "transport/rostermanager.h"
#include "transport/memoryusage.h"
#include "transport/conversationmanager.h"
#include "transport/rostermanager.h"
#include "transport/usermanager.h"
#include "transport/networkpluginserver.h"
#include "transport/logging.h"
#include "transport/frontend.h"
#include "transport/UserManager.h"
#include "transport/User.h"
#include "transport/RosterManager.h"
#include "transport/MemoryUsage.h"
#include "transport/NetworkPluginServer.h"
#include "transport/Logging.h"
#include "transport/Frontend.h"
#include "transport/Transport.h"
#include "transport/Buddy.h"
#include "XMPPFrontend.h"
#include <boost/foreach.hpp>
#include <boost/lexical_cast.hpp>
using namespace Swift;
using namespace boost;

7
spectrum/src/frontends/xmpp/storageresponder.cpp

@ -25,11 +25,10 @@ @@ -25,11 +25,10 @@
#include "Swiften/Queries/IQRouter.h"
#include "Swiften/Elements/RawXMLPayload.h"
#include "Swiften/Elements/Storage.h"
#include "Swiften/Elements/Storage.h"
#include "Swiften/Serializer/PayloadSerializers/StorageSerializer.h"
#include "transport/usermanager.h"
#include "transport/user.h"
#include "transport/logging.h"
#include "transport/UserManager.h"
#include "transport/User.h"
#include "transport/Logging.h"
using namespace Swift;
using namespace boost;

12
spectrum/src/frontends/xmpp/vcardresponder.cpp