renamed defines

git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@10204 90c681e8-e032-0410-971d-27865f9a5e38

7 files changed, 13 insertions, 13 deletions

diff --git a/src/plugins/General/rdetect/rdetectfactory.h b/src/plugins/General/rdetect/rdetectfactory.h
index 2b33f6dac..ede77df2a 100644
--- a/src/plugins/General/rdetect/rdetectfactory.h
+++ b/src/plugins/General/rdetect/rdetectfactory.h
@@ -17,8 +17,8 @@
  *   Free Software Foundation, Inc.,                                       *
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
-#ifndef UDISKS2FACTORY_H
-#define UDISKS2FACTORY_H
+#ifndef RDETECTFACTORY_H
+#define RDETECTFACTORY_H
 
 /**
     @author Ilya Kotov <forkotov02@ya.ru>
diff --git a/src/plugins/General/udisks/udisksdevice.h b/src/plugins/General/udisks/udisksdevice.h
index e027cd2be..d43d41d16 100644
--- a/src/plugins/General/udisks/udisksdevice.h
+++ b/src/plugins/General/udisks/udisksdevice.h
@@ -17,8 +17,8 @@
  *   Free Software Foundation, Inc.,                                       *
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
-#ifndef UDISKS2DEVICE_H
-#define UDISKS2DEVICE_H
+#ifndef UDISKSDEVICE_H
+#define UDISKSDEVICE_H
 
 #include <QObject>
 #include <QDBusObjectPath>
diff --git a/src/plugins/General/udisks/udisksfactory.h b/src/plugins/General/udisks/udisksfactory.h
index ceba73de5..d37d15e6d 100644
--- a/src/plugins/General/udisks/udisksfactory.h
+++ b/src/plugins/General/udisks/udisksfactory.h
@@ -17,8 +17,8 @@
  *   Free Software Foundation, Inc.,                                       *
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
-#ifndef UDISKS2FACTORY_H
-#define UDISKS2FACTORY_H
+#ifndef UDISKSFACTORY_H
+#define UDISKSFACTORY_H
 
 /**
     @author Ilya Kotov <forkotov02@ya.ru>
diff --git a/src/plugins/General/udisks/udisksmanager.cpp b/src/plugins/General/udisks/udisksmanager.cpp
index 749f36ab1..fec4e9ece 100644
--- a/src/plugins/General/udisks/udisksmanager.cpp
+++ b/src/plugins/General/udisks/udisksmanager.cpp
@@ -59,7 +59,7 @@ QList<QDBusObjectPath> UDisksManager::findAllDevices()
 
     if (!reply.isValid())
     {
-        qWarning("UDisks2Manager: error: %s", qPrintable(reply.error().name()));
+        qWarning("UDisksManager: error: %s", qPrintable(reply.error().name()));
         return paths;
     }
     QXmlStreamReader xml(reply.value());
diff --git a/src/plugins/General/udisks/udisksmanager.h b/src/plugins/General/udisks/udisksmanager.h
index 9e8fc14d2..360f19943 100644
--- a/src/plugins/General/udisks/udisksmanager.h
+++ b/src/plugins/General/udisks/udisksmanager.h
@@ -17,8 +17,8 @@
  *   Free Software Foundation, Inc.,                                       *
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
-#ifndef UDISKS2MANAGER_H
-#define UDISKS2MANAGER_H
+#ifndef UDISKSMANAGER_H
+#define UDISKSMANAGER_H
 
 #include <QObject>
 #include <QList>
diff --git a/src/plugins/General/udisks/udisksplugin.cpp b/src/plugins/General/udisks/udisksplugin.cpp
index ac1559270..1f13abba4 100644
--- a/src/plugins/General/udisks/udisksplugin.cpp
+++ b/src/plugins/General/udisks/udisksplugin.cpp
@@ -42,7 +42,7 @@ UDisksPlugin::UDisksPlugin(QObject *parent) : QObject(parent)
     connect(m_actions,SIGNAL(triggered (QAction *)), SLOT(processAction(QAction *)));
     //load settings
     QSettings settings(Qmmp::configFile(), QSettings::IniFormat);
-    settings.beginGroup("UDisks2");
+    settings.beginGroup("UDisks");
     m_detectCDA = settings.value("cda", true).toBool();
     m_detectRemovable = settings.value("removable", true).toBool();
     m_addTracks = false; //do not load tracks on startup
diff --git a/src/plugins/General/udisks/udisksplugin.h b/src/plugins/General/udisks/udisksplugin.h
index 66727d941..f1c8c8b1a 100644
--- a/src/plugins/General/udisks/udisksplugin.h
+++ b/src/plugins/General/udisks/udisksplugin.h
@@ -17,8 +17,8 @@
  *   Free Software Foundation, Inc.,                                       *
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
-#ifndef UDISKS2PLUGIN_H
-#define UDISKS2PLUGIN_H
+#ifndef UDISKSPLUGIN_H
+#define UDISKSPLUGIN_H
 
 #include <QDBusObjectPath>
 #include <qmmpui/general.h>
@@ -62,4 +62,4 @@ private:
     bool m_removeFiles;
 };
 
-#endif //UDISKS2PLUGIN_H
+#endif //UDISKSPLUGIN_H