Rename NfoTranslator to KNfoTranslator, so that KMetaDataWidget can be moved to kdeli...

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

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 37e24da11b50b4ae08d069789e9ff3906b123318..3b396e768603bf744b5cff12a5edde4e52b1acf8 100644 (file)
--- 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}
 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/kcommentwidget.cpp
         panels/information/kedittagsdialog.cpp
         panels/information/kloadmetadatathread.cpp

+        panels/information/knfotranslator.cpp

         panels/information/nepomukmassupdatejob.cpp
         panels/information/ktaggingwidget.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}
 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/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
         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}
 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/kcommentwidget.cpp
         panels/information/kedittagsdialog.cpp
         panels/information/kloadmetadatathread.cpp

+        panels/information/knfotranslator.cpp

         panels/information/nepomukmassupdatejob.cpp
         panels/information/ktaggingwidget.cpp
     )
         panels/information/nepomukmassupdatejob.cpp
         panels/information/ktaggingwidget.cpp
     )

diff --git a/src/panels/information/kloadmetadatathread.cpp b/src/panels/information/kloadmetadatathread.cpp
index fc353c4935a10318b9141948aa6a1b2207f3d706..edd3995e20897ca1ffe9856a801e6ad766aebec8 100644 (file)
--- a/src/panels/information/kloadmetadatathread.cpp
+++ b/src/panels/information/kloadmetadatathread.cpp
@@ -19,14 +19,13 @@
 
 #include "kloadmetadatathread_p.h"
 
 
 #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 <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>
 #include <kprotocolinfo.h>
 
 #include <nepomuk/resource.h>


@@ -111,7 +110,7 @@ void KLoadMetaDataThread::run()
             m_tags = file.tags();
         }
 
             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();
         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 4b791af5a884f6c5438ff6fc889cec6d012248d8..6c1ee21d0670042a8149729614390f9d1a480bbd 100644 (file)
--- a/src/panels/information/kmetadataconfigurationdialog.cpp
+++ b/src/panels/information/kmetadataconfigurationdialog.cpp
@@ -18,11 +18,11 @@
 
 #include "kmetadataconfigurationdialog.h"
 
 
 #include "kmetadataconfigurationdialog.h"
 

-#include "nfotranslator.h"

 
 #include <kfilemetainfo.h>
 #include <kfilemetainfoitem.h>
 #include "kmetadatawidget.h"
 
 #include <kfilemetainfo.h>
 #include <kfilemetainfoitem.h>
 #include "kmetadatawidget.h"

+#include "knfotranslator_p.h"

 #include <klocale.h>
 
 #include <config-nepomuk.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");
 
     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);
     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
similarity index 95%
rename from src/panels/information/nfotranslator.cpp
rename to src/panels/information/knfotranslator.cpp
index 3910d80f050cfaf9065070eddfbfe6156fbabcf4..b6c7c1f42880068881693647bc01ce0fa50c777c 100644 (file)
--- a/src/panels/information/nfotranslator.cpp
+++ b/src/panels/information/knfotranslator.cpp
@@ -16,7 +16,7 @@
  * Boston, MA 02110-1301, USA.                                               *
  *****************************************************************************/
 
  * Boston, MA 02110-1301, USA.                                               *
  *****************************************************************************/
 

-#include "nfotranslator.h"
+#include "knfotranslator_p.h"

 #include <klocale.h>
 #include <kstandarddirs.h>
 
 #include <klocale.h>
 #include <kstandarddirs.h>
 


@@ -72,19 +72,19 @@ static const TranslationTuple g_translations[] = {
     { 0, 0 } // mandatory last entry
 };
 
     { 0, 0 } // mandatory last entry
 };
 

-class NfoTranslatorSingleton
+class KNfoTranslatorSingleton

 {
 public:
 {
 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;
 }
 
 {
     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)) {
 {
     const QString key = uri.toString();
     if (m_hash.contains(key)) {


@@ -100,7 +100,7 @@ QString NfoTranslator::translation(const QUrl& uri) const
     return translation;
 }
 
     return translation;
 }
 

-NfoTranslator::NfoTranslator() :
+KNfoTranslator::KNfoTranslator() :

     m_hash()
 {
     const TranslationTuple* tuple = &g_translations[0];
     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
similarity index 87%
rename from src/panels/information/nfotranslator.h
rename to src/panels/information/knfotranslator_p.h
index 4a51c60f3f31482953e997bcf46f2eb9d18a0703..293eda4c6687deaf410e4085190b43d4224d5f28 100644 (file)
--- a/src/panels/information/nfotranslator.h
+++ b/src/panels/information/knfotranslator_p.h
@@ -16,8 +16,8 @@
  * Boston, MA 02110-1301, USA.                                               *
  *****************************************************************************/
 
  * Boston, MA 02110-1301, USA.                                               *
  *****************************************************************************/
 

-#ifndef NFOTRANSLATOR_H
-#define NFOTRANSLATOR_H
+#ifndef KNFOTRANSLATOR_H
+#define KNFOTRANSLATOR_H

 
 #include <QHash>
 #include <QString>
 
 #include <QHash>
 #include <QString>


@@ -29,19 +29,19 @@ class QUrl;
  *
  * See http://www.semanticdesktop.org/ontologies/nfo/.
  */
  *
  * See http://www.semanticdesktop.org/ontologies/nfo/.
  */

-class NfoTranslator
+class KNfoTranslator

 {
 public:
 {
 public:

-    static NfoTranslator& instance();
+    static KNfoTranslator& instance();

     QString translation(const QUrl& uri) const;
 
 protected:
     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;
 };
 
 
 private:
     QHash<QString, QString> m_hash;
 };
 

-#endif // NFO_TRANSLATOR_H
+#endif // KNFO_TRANSLATOR_H