Renamed libresource-overridesqt => libmediaoverridesqt

Renamed resourceoverrider => mediaoverrider

11 files changed, 32 insertions, 32 deletions

diff --git a/common.pri b/common.pri
index fadd3bb..eefcd81 100644
--- a/common.pri
+++ b/common.pri
@@ -1,6 +1,6 @@
 LIBDBUSQEVENTLOOP = $${PWD}/libdbus-qeventloop
 LIBRESOURCEQT = $${PWD}/libresourceqt
-LIBRESOURCEOVERRIDESQT = $${PWD}/libresource-overridesqt
+LIBMEDIAOVERRIDESQT = $${PWD}/libmediaoverridesqt
 
 LIBRESOURCEINC = $${LIBRESOURCEQT}/include/qt4
 POLICY = $${LIBRESOURCEINC}/policy
diff --git a/libresource-overridesqt/libresource-overridesqt.pro b/libmediaoverridesqt/libmediaoverridesqt.pro
index c306266..20296c4 100644
--- a/libresource-overridesqt/libresource-overridesqt.pro
+++ b/libmediaoverridesqt/libmediaoverridesqt.pro
@@ -1,6 +1,6 @@
 include(../common.pri)
 TEMPLATE = lib
-TARGET = resource-overridesqt
+TARGET = mediaoverridesqt
 DESTDIR = build
 DEPENDPATH += .
 INCLUDEPATH += .
@@ -29,7 +29,7 @@ headers.files  = $${PUBLIC_HEADERS}
 INSTALLBASE    = /usr
 target.path    = $${INSTALLBASE}/lib
 headers.path   = $${INSTALLBASE}/include/resource/qt4/policy
-pc.files       = libresource-overridesqt1.pc
+pc.files       = libmediaoverridesqt1.pc
 pc.path        = $${INSTALLBASE}/lib/pkgconfig
 
 INSTALLS       = target headers pc
diff --git a/libresource-overridesqt/libresource-overridesqt1.pc b/libmediaoverridesqt/libmediaoverridesqt1.pc
index a6cf64e..7666624 100644
--- a/libresource-overridesqt/libresource-overridesqt1.pc
+++ b/libmediaoverridesqt/libmediaoverridesqt1.pc
@@ -3,8 +3,8 @@ exec_prefix=${prefix}
 libdir=${prefix}/lib
 includedir=${prefix}/include/resource/qt4
 
-Name: libresource-overridesqt1
-Description: Maemo resource management Qt API
+Name: libmediaoverridesqt1
+Description: Maemo overrides Qt API
 Version: 1.11
 Libs: -L${libdir}
 Cflags: -I${includedir}
diff --git a/libresource-overridesqt/override.cpp b/libmediaoverridesqt/override.cpp
index 71102df..71102df 100644
--- a/libresource-overridesqt/override.cpp
+++ b/libmediaoverridesqt/override.cpp
diff --git a/libresource-overridesqt/override.h b/libmediaoverridesqt/override.h
index c906a55..c906a55 100644
--- a/libresource-overridesqt/override.h
+++ b/libmediaoverridesqt/override.h
diff --git a/libresourceqt.pro b/libresourceqt.pro
index ed89bee..cb5523a 100644
--- a/libresourceqt.pro
+++ b/libresourceqt.pro
@@ -5,10 +5,10 @@
 CONFIG += ordered
 TEMPLATE = subdirs
 
-SUBDIRS = libdbus-qeventloop	  \
-          libresourceqt			  \
-          libresource-overridesqt \
-          resourceqt-client		  \
-          resourceoverrider       \
+SUBDIRS = libdbus-qeventloop  \
+          libresourceqt	      \
+          libmediaoverridesqt \
+          resourceqt-client   \
+          mediaoverrider      \
           tests
 
diff --git a/resourceoverrider/main.cpp b/mediaoverrider/main.cpp
index 13634d5..db13d33 100644
--- a/resourceoverrider/main.cpp
+++ b/mediaoverrider/main.cpp
@@ -1,8 +1,8 @@
-#include "resourceoverrider.h"
+#include "mediaoverrider.h"
 
 int main(int argc, char **argv)
 {
-    ResourceOverrider app(argc, argv);
+    MediaOverrider app(argc, argv);
 //    MApplication app(argc, argv);
     
     return app.run();
diff --git a/resourceoverrider/resourceoverrider.cpp b/mediaoverrider/mediaoverrider.cpp
index 606d419..24d9afc 100644
--- a/resourceoverrider/resourceoverrider.cpp
+++ b/mediaoverrider/mediaoverrider.cpp
@@ -1,9 +1,9 @@
-#include "resourceoverrider.h"
+#include "mediaoverrider.h"
 
-ResourceOverrider::ResourceOverrider(int argc, char **argv, QObject *parent):
+MediaOverrider::MediaOverrider(int argc, char **argv, QObject *parent):
     QObject(parent), app(argc, argv)
 {
-//    MTheme::loadCSS("resourceoverrider.css");
+//    MTheme::loadCSS("MediaOverrider.css");
     window = new MApplicationWindow;
     page = new MApplicationPage;
 
@@ -21,7 +21,7 @@ ResourceOverrider::ResourceOverrider(int argc, char **argv, QObject *parent):
     muteButton->setText("Mute");
     muteButton->setViewType(MButton::toggleType);
     muteButton->setCheckable(true);
-    policy->addItem(muteButton, 1,0);
+    policy->addItem(muteButton, 1, 0);
     muteButton->setObjectName("button");
 
     privacyButton = new MButton(page->centralWidget());
@@ -55,10 +55,10 @@ ResourceOverrider::ResourceOverrider(int argc, char **argv, QObject *parent):
 
 }
 
-ResourceOverrider::~ResourceOverrider()
+MediaOverrider::~MediaOverrider()
 {}
 
-int ResourceOverrider::run()
+int MediaOverrider::run()
 {
     page->appear();
     window->show();
@@ -66,17 +66,17 @@ int ResourceOverrider::run()
     return app.exec();
 }
 
-void ResourceOverrider::handleMuteChange(bool newState)
+void MediaOverrider::handleMuteChange(bool newState)
 {
     muteButton->setChecked(newState);
 }
 
-void ResourceOverrider::handlePrivacyChange(bool newState)
+void MediaOverrider::handlePrivacyChange(bool newState)
 {
     privacyButton->setChecked(newState);
 }
 
-void ResourceOverrider::handleBtChange(bool newState)
+void MediaOverrider::handleBtChange(bool newState)
 {
     btButton->setChecked(newState);
 }
diff --git a/resourceoverrider/resourceoverrider.desktop b/mediaoverrider/mediaoverrider.desktop
index 4200658..b257a5e 100644
--- a/resourceoverrider/resourceoverrider.desktop
+++ b/mediaoverrider/mediaoverrider.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Application
-Name=Policy Resource Overrider
+Name=Policy Media Overrider
 Icon=icon-l-music
-Exec=/usr/bin/resourceoverrider
+Exec=/usr/bin/mediaoverrider
 OnlyShowIn=X-MeeGo;
 
diff --git a/resourceoverrider/resourceoverrider.h b/mediaoverrider/mediaoverrider.h
index 755d426..052a7e0 100644
--- a/resourceoverrider/resourceoverrider.h
+++ b/mediaoverrider/mediaoverrider.h
@@ -9,12 +9,12 @@
 
 #include <override.h>
 
-class ResourceOverrider: public QObject
+class MediaOverrider: public QObject
 {
     Q_OBJECT
 public:
-    ResourceOverrider(int argc, char **argv, QObject *parent=NULL);
-    ~ResourceOverrider();
+    MediaOverrider(int argc, char **argv, QObject *parent=NULL);
+    ~MediaOverrider();
     int run();
 private slots:
     void handleMuteChange(bool newState);
diff --git a/resourceoverrider/resourceoverrider.pro b/mediaoverrider/mediaoverrider.pro
index 6bbbdcb..e74679a 100644
--- a/resourceoverrider/resourceoverrider.pro
+++ b/mediaoverrider/mediaoverrider.pro
@@ -1,19 +1,19 @@
 include(../common.pri)
 
 TEMPLATE = app
-TARGET = resourceoverrider
+TARGET = mediaoverrider
 MOC_DIR = moc
 OBJECTS_DIR = build
 DEPENDPATH += .
-INCLUDEPATH += $${LIBRESOURCEOVERRIDESQT}
+INCLUDEPATH += $${LIBMEDIAOVERRIDESQT}
 CONFIG += qt meegotouch
 QT += dbus
 
-LIBS += -L$${LIBRESOURCEOVERRIDESQT}/build -lresource-overridesqt
+LIBS += -L$${LIBMEDIAOVERRIDESQT}/build -lmediaoverridesqt
 
 # Input
-HEADERS += resourceoverrider.h
-SOURCES += main.cpp resourceoverrider.cpp
+HEADERS += mediaoverrider.h
+SOURCES += main.cpp mediaoverrider.cpp
 
 QMAKE_DISTCLEAN += -r moc build
 
@@ -22,7 +22,7 @@ QMAKE_DISTCLEAN += -r moc build
 target.path = /usr/bin/
 
 desktop.path  = /usr/share/applications/
-desktop.files = resourceoverrider.desktop
+desktop.files = mediaoverrider.desktop
 
 INSTALLS    = target desktop