Rename NfoTranslator to KNfoTranslator, so that KMetaDataWidget can be moved to kdelibs for KDE SC 4.5 (some interfaces of KMetaDataWidget need to be cleaned up first).

KNfoTranslator is marked as private class, as it is not clear yet whether it should be used by other classes like KFileMetaInfo.

svn path=/trunk/KDE/kdebase/apps/; revision=1098897

5 files changed, 23 insertions, 24 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 37e24da11..3b396e768 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -57,10 +57,10 @@ set(dolphinprivate_LIB_SRCS
 if(Nepomuk_FOUND)
     set(dolphinprivate_LIB_SRCS
         ${dolphinprivate_LIB_SRCS}
-	panels/information/nfotranslator.cpp
         panels/information/kcommentwidget.cpp
         panels/information/kedittagsdialog.cpp
         panels/information/kloadmetadatathread.cpp
+        panels/information/knfotranslator.cpp
         panels/information/nepomukmassupdatejob.cpp
         panels/information/ktaggingwidget.cpp
     )
@@ -169,10 +169,10 @@ kde4_add_kcfg_files(dolphin_SRCS
 if(Nepomuk_FOUND)
     set(dolphin_SRCS
         ${dolphin_SRCS}
-	panels/information/nfotranslator.cpp
         panels/information/kcommentwidget.cpp
         panels/information/kedittagsdialog.cpp
         panels/information/kloadmetadatathread.cpp
+        panels/information/knfotranslator.cpp
         panels/information/nepomukmassupdatejob.cpp
         panels/information/ktaggingwidget.cpp
         search/dolphinsearchoptionsconfigurator.cpp
@@ -257,10 +257,10 @@ set(kcm_dolphingeneral_PART_SRCS
 if (Nepomuk_FOUND)
     set(kcm_dolphingeneral_PART_SRCS
         ${kcm_dolphingeneral_PART_SRCS}
-	panels/information/nfotranslator.cpp
         panels/information/kcommentwidget.cpp
         panels/information/kedittagsdialog.cpp
         panels/information/kloadmetadatathread.cpp
+        panels/information/knfotranslator.cpp
         panels/information/nepomukmassupdatejob.cpp
         panels/information/ktaggingwidget.cpp
     )
diff --git a/src/panels/information/kloadmetadatathread.cpp b/src/panels/information/kloadmetadatathread.cpp
index fc353c493..edd3995e2 100644
--- a/src/panels/information/kloadmetadatathread.cpp
+++ b/src/panels/information/kloadmetadatathread.cpp
@@ -19,14 +19,13 @@
 
 #include "kloadmetadatathread_p.h"
 
-#include "nfotranslator.h"
-
 #include <kconfig.h>
 #include <kconfiggroup.h>
 #include <kfilemetainfo.h>
 #include <kfilemetainfoitem.h>
 #include <kglobal.h>
 #include <klocale.h>
+#include "knfotranslator_p.h"
 #include <kprotocolinfo.h>
 
 #include <nepomuk/resource.h>
@@ -111,7 +110,7 @@ void KLoadMetaDataThread::run()
             m_tags = file.tags();
         }
 
-        const NfoTranslator& nfo = NfoTranslator::instance();
+        const KNfoTranslator& nfo = KNfoTranslator::instance();
         if (first && (m_urls.count() == 1)) {
             // get cached meta data by checking the indexed files
             QHash<QUrl, Nepomuk::Variant> variants = file.properties();
diff --git a/src/panels/information/kmetadataconfigurationdialog.cpp b/src/panels/information/kmetadataconfigurationdialog.cpp
index 4b791af5a..6c1ee21d0 100644
--- a/src/panels/information/kmetadataconfigurationdialog.cpp
+++ b/src/panels/information/kmetadataconfigurationdialog.cpp
@@ -18,11 +18,11 @@
 
 #include "kmetadataconfigurationdialog.h"
 
-#include "nfotranslator.h"
 
 #include <kfilemetainfo.h>
 #include <kfilemetainfoitem.h>
 #include "kmetadatawidget.h"
+#include "knfotranslator_p.h"
 #include <klocale.h>
 
 #include <config-nepomuk.h>
@@ -222,7 +222,7 @@ void KMetaDataConfigurationDialog::Private::addItem(const QUrl& uri)
     KConfig config("kmetainformationrc", KConfig::NoGlobals);
     KConfigGroup settings = config.group("Show");
 
-    const QString label = NfoTranslator::instance().translation(uri);
+    const QString label = KNfoTranslator::instance().translation(uri);
     QListWidgetItem* item = new QListWidgetItem(label, m_metaDataList);
     item->setData(Qt::UserRole, key);
     const bool show = settings.readEntry(key, true);
diff --git a/src/panels/information/nfotranslator.cpp b/src/panels/information/knfotranslator.cpp
index 3910d80f0..b6c7c1f42 100644
--- a/src/panels/information/nfotranslator.cpp
+++ b/src/panels/information/knfotranslator.cpp
@@ -16,7 +16,7 @@
  * Boston, MA 02110-1301, USA.                                               *
  *****************************************************************************/
 
-#include "nfotranslator.h"
+#include "knfotranslator_p.h"
 #include <klocale.h>
 #include <kstandarddirs.h>
 
@@ -72,19 +72,19 @@ static const TranslationTuple g_translations[] = {
     { 0, 0 } // mandatory last entry
 };
 
-class NfoTranslatorSingleton
+class KNfoTranslatorSingleton
 {
 public:
-    NfoTranslator instance;
+    KNfoTranslator instance;
 };
-K_GLOBAL_STATIC(NfoTranslatorSingleton, s_nfoTranslator)
+K_GLOBAL_STATIC(KNfoTranslatorSingleton, s_nfoTranslator)
 
-NfoTranslator& NfoTranslator::instance()
+KNfoTranslator& KNfoTranslator::instance()
 {
     return s_nfoTranslator->instance;
 }
 
-QString NfoTranslator::translation(const QUrl& uri) const
+QString KNfoTranslator::translation(const QUrl& uri) const
 {
     const QString key = uri.toString();
     if (m_hash.contains(key)) {
@@ -100,7 +100,7 @@ QString NfoTranslator::translation(const QUrl& uri) const
     return translation;
 }
 
-NfoTranslator::NfoTranslator() :
+KNfoTranslator::KNfoTranslator() :
     m_hash()
 {
     const TranslationTuple* tuple = &g_translations[0];
@@ -110,6 +110,6 @@ NfoTranslator::NfoTranslator() :
     }
 }
 
-NfoTranslator::~NfoTranslator()
+KNfoTranslator::~KNfoTranslator()
 {
 }
diff --git a/src/panels/information/nfotranslator.h b/src/panels/information/knfotranslator_p.h
index 4a51c60f3..293eda4c6 100644
--- a/src/panels/information/nfotranslator.h
+++ b/src/panels/information/knfotranslator_p.h
@@ -16,8 +16,8 @@
  * Boston, MA 02110-1301, USA.                                               *
  *****************************************************************************/
 
-#ifndef NFOTRANSLATOR_H
-#define NFOTRANSLATOR_H
+#ifndef KNFOTRANSLATOR_H
+#define KNFOTRANSLATOR_H
 
 #include <QHash>
 #include <QString>
@@ -29,19 +29,19 @@ class QUrl;
  *
  * See http://www.semanticdesktop.org/ontologies/nfo/.
  */
-class NfoTranslator
+class KNfoTranslator
 {
 public:
-    static NfoTranslator& instance();
+    static KNfoTranslator& instance();
     QString translation(const QUrl& uri) const;
 
 protected:
-    NfoTranslator();
-    virtual ~NfoTranslator();
-    friend class NfoTranslatorSingleton;
+    KNfoTranslator();
+    virtual ~KNfoTranslator();
+    friend class KNfoTranslatorSingleton;
 
 private:
     QHash<QString, QString> m_hash;
 };
 
-#endif // NFO_TRANSLATOR_H
+#endif // KNFO_TRANSLATOR_H