summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Kühl <chrisk@openismus.com>2011-12-01 15:49:18 +0100
committerPatrick Ohly <patrick.ohly@intel.com>2011-12-05 12:39:14 +0100
commitc4e69e2e5857bd5d586e7f2c7762ad766138e359 (patch)
treec0a3ee455c2f95d87f07335cc86c94bb47d2775b
parent313dc298a02f43b634ae7be7f2da7574b5c51189 (diff)
dbus-server: Make dbus-server notification file names conformant
The Notification* files in src/dbus/server were the only files using camel case. The commit fixes that. Now files are of the form notification-*.
-rw-r--r--po/POTFILES.in2
-rw-r--r--src/dbus/server/auto-sync-manager.h2
-rw-r--r--src/dbus/server/notification-backend-base.h (renamed from src/dbus/server/NotificationBackendBase.h)0
-rw-r--r--src/dbus/server/notification-backend-libnotify.cpp (renamed from src/dbus/server/NotificationBackendLibnotify.cpp)2
-rw-r--r--src/dbus/server/notification-backend-libnotify.h (renamed from src/dbus/server/NotificationBackendLibnotify.h)2
-rw-r--r--src/dbus/server/notification-backend-mlite.cpp (renamed from src/dbus/server/NotificationBackendMLite.cpp)2
-rw-r--r--src/dbus/server/notification-backend-mlite.h (renamed from src/dbus/server/NotificationBackendMLite.h)2
-rw-r--r--src/dbus/server/notification-backend-noop.cpp (renamed from src/dbus/server/NotificationBackendNoop.cpp)2
-rw-r--r--src/dbus/server/notification-backend-noop.h (renamed from src/dbus/server/NotificationBackendNoop.h)2
-rw-r--r--src/dbus/server/notification-manager-base.h (renamed from src/dbus/server/NotificationManagerBase.h)0
-rw-r--r--src/dbus/server/notification-manager-factory.cpp (renamed from src/dbus/server/NotificationManagerFactory.cpp)10
-rw-r--r--src/dbus/server/notification-manager-factory.h (renamed from src/dbus/server/NotificationManagerFactory.h)2
-rw-r--r--src/dbus/server/notification-manager.cpp (renamed from src/dbus/server/NotificationManager.cpp)2
-rw-r--r--src/dbus/server/notification-manager.h (renamed from src/dbus/server/NotificationManager.h)2
-rw-r--r--src/dbus/server/server.am14
15 files changed, 23 insertions, 23 deletions
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 73a8f64c..582c3ee2 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -6,5 +6,5 @@ src/gtk-ui/sync.desktop.in
src/gtk-ui/sync-gtk.desktop.in
src/gtk-ui/sync-config-widget.c
src/gnome-bluetooth/syncevolution.c
-src/dbus/server/NotificationBackendLibnotify.cpp
+src/dbus/server/notification-backend-libnotify.cpp
src/dbus/server/auto-sync-manager.cpp
diff --git a/src/dbus/server/auto-sync-manager.h b/src/dbus/server/auto-sync-manager.h
index 3ac5373a..e110a13b 100644
--- a/src/dbus/server/auto-sync-manager.h
+++ b/src/dbus/server/auto-sync-manager.h
@@ -25,7 +25,7 @@
#include <syncevo/SyncML.h>
#include <syncevo/SmartPtr.h>
-#include "NotificationManagerFactory.h"
+#include "notification-manager-factory.h"
#include "session-listener.h"
diff --git a/src/dbus/server/NotificationBackendBase.h b/src/dbus/server/notification-backend-base.h
index 0c1d9c4c..0c1d9c4c 100644
--- a/src/dbus/server/NotificationBackendBase.h
+++ b/src/dbus/server/notification-backend-base.h
diff --git a/src/dbus/server/NotificationBackendLibnotify.cpp b/src/dbus/server/notification-backend-libnotify.cpp
index e628485f..2359083b 100644
--- a/src/dbus/server/NotificationBackendLibnotify.cpp
+++ b/src/dbus/server/notification-backend-libnotify.cpp
@@ -23,7 +23,7 @@
#if HAS_NOTIFY
-#include "NotificationBackendLibnotify.h"
+#include "notification-backend-libnotify.h"
#include "syncevo/util.h"
#include "syncevo/GLibSupport.h"
diff --git a/src/dbus/server/NotificationBackendLibnotify.h b/src/dbus/server/notification-backend-libnotify.h
index e14db6f4..8c85da6e 100644
--- a/src/dbus/server/NotificationBackendLibnotify.h
+++ b/src/dbus/server/notification-backend-libnotify.h
@@ -27,7 +27,7 @@
#if HAS_NOTIFY
#include "syncevo/declarations.h"
-#include "NotificationBackendBase.h"
+#include "notification-backend-base.h"
#include <libnotify/notify.h>
diff --git a/src/dbus/server/NotificationBackendMLite.cpp b/src/dbus/server/notification-backend-mlite.cpp
index 723016c1..e567d901 100644
--- a/src/dbus/server/NotificationBackendMLite.cpp
+++ b/src/dbus/server/notification-backend-mlite.cpp
@@ -21,7 +21,7 @@
#ifdef HAS_MLITE
-#include "NotificationBackendMLite.h"
+#include "notification-backend-mlite.h"
#include <mlite/MNotification>
#include <QString>
diff --git a/src/dbus/server/NotificationBackendMLite.h b/src/dbus/server/notification-backend-mlite.h
index 7c05c23d..cda317d3 100644
--- a/src/dbus/server/NotificationBackendMLite.h
+++ b/src/dbus/server/notification-backend-mlite.h
@@ -21,7 +21,7 @@
#define __NOTIFICATION_BACKEND_MLITE_H
#include "syncevo/declarations.h"
-#include "NotificationBackendBase.h"
+#include "notification-backend-base.h"
SE_BEGIN_CXX
diff --git a/src/dbus/server/NotificationBackendNoop.cpp b/src/dbus/server/notification-backend-noop.cpp
index 8532106e..20c8d168 100644
--- a/src/dbus/server/NotificationBackendNoop.cpp
+++ b/src/dbus/server/notification-backend-noop.cpp
@@ -17,7 +17,7 @@
* 02110-1301 USA
*/
-#include "NotificationBackendNoop.h"
+#include "notification-backend-noop.h"
SE_BEGIN_CXX
diff --git a/src/dbus/server/NotificationBackendNoop.h b/src/dbus/server/notification-backend-noop.h
index dc6efce4..995cf762 100644
--- a/src/dbus/server/NotificationBackendNoop.h
+++ b/src/dbus/server/notification-backend-noop.h
@@ -21,7 +21,7 @@
#define __NOTIFICATION_BACKEND_NOOP_H
#include "syncevo/declarations.h"
-#include "NotificationBackendBase.h"
+#include "notification-backend-base.h"
SE_BEGIN_CXX
diff --git a/src/dbus/server/NotificationManagerBase.h b/src/dbus/server/notification-manager-base.h
index f6692e2e..f6692e2e 100644
--- a/src/dbus/server/NotificationManagerBase.h
+++ b/src/dbus/server/notification-manager-base.h
diff --git a/src/dbus/server/NotificationManagerFactory.cpp b/src/dbus/server/notification-manager-factory.cpp
index 019d6726..4b0ddeb0 100644
--- a/src/dbus/server/NotificationManagerFactory.cpp
+++ b/src/dbus/server/notification-manager-factory.cpp
@@ -17,12 +17,12 @@
* 02110-1301 USA
*/
-#include "NotificationManagerFactory.h"
+#include "notification-manager-factory.h"
-#include "NotificationBackendNoop.h"
-#include "NotificationBackendMLite.h"
-#include "NotificationBackendLibnotify.h"
-#include "NotificationManager.h"
+#include "notification-backend-noop.h"
+#include "notification-backend-mlite.h"
+#include "notification-backend-libnotify.h"
+#include "notification-manager.h"
#include <unistd.h>
diff --git a/src/dbus/server/NotificationManagerFactory.h b/src/dbus/server/notification-manager-factory.h
index e0a660b7..493486b9 100644
--- a/src/dbus/server/NotificationManagerFactory.h
+++ b/src/dbus/server/notification-manager-factory.h
@@ -21,7 +21,7 @@
#define __NOTIFICATION_MANAGER_FACTORY_H
#include "syncevo/declarations.h"
-#include "NotificationManager.h"
+#include "notification-manager.h"
#include <boost/shared_ptr.hpp>
diff --git a/src/dbus/server/NotificationManager.cpp b/src/dbus/server/notification-manager.cpp
index 921dc6b9..f273e624 100644
--- a/src/dbus/server/NotificationManager.cpp
+++ b/src/dbus/server/notification-manager.cpp
@@ -17,7 +17,7 @@
* 02110-1301 USA
*/
-#include "NotificationManager.h"
+#include "notification-manager.h"
#include "syncevo/declarations.h"
#include <string>
diff --git a/src/dbus/server/NotificationManager.h b/src/dbus/server/notification-manager.h
index 54d2f0ed..35deb697 100644
--- a/src/dbus/server/NotificationManager.h
+++ b/src/dbus/server/notification-manager.h
@@ -20,7 +20,7 @@
#ifndef __NOTIFICATION_MANAGER_H
#define __NOTIFICATION_MANAGER_H
-#include "NotificationManagerBase.h"
+#include "notification-manager-base.h"
#include "syncevo/declarations.h"
diff --git a/src/dbus/server/server.am b/src/dbus/server/server.am
index 02a31ee2..fe8d3b86 100644
--- a/src/dbus/server/server.am
+++ b/src/dbus/server/server.am
@@ -3,10 +3,10 @@ if COND_DBUS
noinst_LTLIBRARIES += src/dbus/server/libsyncevodbusserver.la
src_dbus_server_server_cpp_files = \
- src/dbus/server/NotificationBackendNoop.cpp \
- src/dbus/server/NotificationBackendLibnotify.cpp \
- src/dbus/server/NotificationBackendMLite.cpp \
- src/dbus/server/NotificationManagerFactory.cpp \
+ src/dbus/server/notification-backend-noop.cpp \
+ src/dbus/server/notification-backend-libnotify.cpp \
+ src/dbus/server/notification-backend-mlite.cpp \
+ src/dbus/server/notification-manager-factory.cpp \
src/dbus/server/auto-sync-manager.cpp \
src/dbus/server/bluez-manager.cpp \
src/dbus/server/client.cpp \
@@ -26,9 +26,9 @@ src_dbus_server_server_cpp_files = \
src_dbus_server_server_h_files = \
$(src_dbus_server_server_cpp_files:.cpp=.h) \
- src/dbus/server/NotificationBackendBase.h \
- src/dbus/server/NotificationManager.h \
- src/dbus/server/NotificationManagerBase.h \
+ src/dbus/server/notification-backend-base.h \
+ src/dbus/server/notification-manager.h \
+ src/dbus/server/notification-manager-base.h \
src/dbus/server/auto-term.h \
src/dbus/server/cmdline-wrapper.h \
src/dbus/server/resource.h \