diff options
| -rw-r--r-- | tubes/source/approver.c | 2 | ||||
| -rw-r--r-- | tubes/source/collaboration.cxx | 3 | ||||
| -rw-r--r-- | tubes/source/conference.cxx | 8 | ||||
| -rw-r--r-- | tubes/source/conference.hxx (renamed from include/tubes/conference.hxx) | 0 | ||||
| -rw-r--r-- | tubes/source/constants.h (renamed from include/tubes/constants.h) | 0 | ||||
| -rw-r--r-- | tubes/source/contacts.cxx | 2 | ||||
| -rw-r--r-- | tubes/source/file-transfer-helper.c | 2 | ||||
| -rw-r--r-- | tubes/source/file-transfer-helper.h (renamed from include/tubes/file-transfer-helper.h) | 0 | ||||
| -rw-r--r-- | tubes/source/manager.cxx | 8 |
9 files changed, 12 insertions, 13 deletions
diff --git a/tubes/source/approver.c b/tubes/source/approver.c index d8d8901e4a26..6d6e28050d71 100644 --- a/tubes/source/approver.c +++ b/tubes/source/approver.c @@ -16,7 +16,7 @@ #include <telepathy-glib/debug.h> #include <telepathy-glib/simple-approver.h> -#include <tubes/constants.h> +#include <constants.h> GMainLoop *mainloop = NULL; diff --git a/tubes/source/collaboration.cxx b/tubes/source/collaboration.cxx index ce097b2c38b6..fe397f8381fd 100644 --- a/tubes/source/collaboration.cxx +++ b/tubes/source/collaboration.cxx @@ -8,10 +8,9 @@ */ #include <tubes/collaboration.hxx> - -#include <tubes/conference.hxx> #include <tubes/manager.hxx> +#include <conference.hxx> #include <contacts.hxx> Collaboration::Collaboration() : diff --git a/tubes/source/conference.cxx b/tubes/source/conference.cxx index 57d0e9d01cc1..373a564692b0 100644 --- a/tubes/source/conference.cxx +++ b/tubes/source/conference.cxx @@ -7,13 +7,13 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include <tubes/conference.hxx> - #include <tubes/collaboration.hxx> -#include <tubes/constants.h> -#include <tubes/file-transfer-helper.h> #include <tubes/manager.hxx> +#include <conference.hxx> +#include <constants.h> +#include <file-transfer-helper.h> + #include <gtk/gtk.h> #include <telepathy-glib/telepathy-glib.h> diff --git a/include/tubes/conference.hxx b/tubes/source/conference.hxx index 3b80eb13eb33..3b80eb13eb33 100644 --- a/include/tubes/conference.hxx +++ b/tubes/source/conference.hxx diff --git a/include/tubes/constants.h b/tubes/source/constants.h index 5f861e5ea738..5f861e5ea738 100644 --- a/include/tubes/constants.h +++ b/tubes/source/constants.h diff --git a/tubes/source/contacts.cxx b/tubes/source/contacts.cxx index fd7855407146..96a1b25b9d45 100644 --- a/tubes/source/contacts.cxx +++ b/tubes/source/contacts.cxx @@ -10,11 +10,11 @@ #include <sal/config.h> #include <vcl/graphicfilter.hxx> -#include <tubes/conference.hxx> #include <tubes/collaboration.hxx> #include <telepathy-glib/telepathy-glib.h> +#include <conference.hxx> #include <contacts.hxx> void tubes::TubeContacts::Invite() diff --git a/tubes/source/file-transfer-helper.c b/tubes/source/file-transfer-helper.c index d2dc4fd3d505..043d464df820 100644 --- a/tubes/source/file-transfer-helper.c +++ b/tubes/source/file-transfer-helper.c @@ -29,7 +29,7 @@ #include <telepathy-glib/dbus.h> #include <telepathy-glib/interfaces.h> -#include <tubes/file-transfer-helper.h> +#include <file-transfer-helper.h> #define DEBUG(...) diff --git a/include/tubes/file-transfer-helper.h b/tubes/source/file-transfer-helper.h index ffcbc4b19837..ffcbc4b19837 100644 --- a/include/tubes/file-transfer-helper.h +++ b/tubes/source/file-transfer-helper.h diff --git a/tubes/source/manager.cxx b/tubes/source/manager.cxx index 909904e2f7b6..aa550058d6f5 100644 --- a/tubes/source/manager.cxx +++ b/tubes/source/manager.cxx @@ -7,12 +7,12 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ +#include <tubes/collaboration.hxx> #include <tubes/manager.hxx> -#include <tubes/collaboration.hxx> -#include <tubes/conference.hxx> -#include <tubes/constants.h> -#include <tubes/file-transfer-helper.h> +#include <conference.hxx> +#include <constants.h> +#include <file-transfer-helper.h> #include <com/sun/star/uno/Sequence.hxx> #include <com/sun/star/frame/Desktop.hpp> |