Rename a number of classes to enhance compatibility with KDE4

5 files changed, 19 insertions, 19 deletions

diff --git a/kipi-plugins/metadataedit/iptccategories.cpp b/kipi-plugins/metadataedit/iptccategories.cpp
index 5aaf09c..5979c75 100644
--- a/kipi-plugins/metadataedit/iptccategories.cpp
+++ b/kipi-plugins/metadataedit/iptccategories.cpp
@@ -76,7 +76,7 @@ public:
     KLineEdit   *categoryEdit;
     KLineEdit   *subCategoryEdit;
 
-    KListBox    *subCategoriesBox;
+    TDEListBox    *subCategoriesBox;
 };
 
 IPTCCategories::IPTCCategories(TQWidget* parent)
@@ -107,7 +107,7 @@ IPTCCategories::IPTCCategories(TQWidget* parent)
     TQWhatsThis::add(d->subCategoryEdit, i18n("<p>Enter here a new supplemental category of content. "
                     "This field is limited to 32 ASCII characters."));
 
-    d->subCategoriesBox = new KListBox(parent);
+    d->subCategoriesBox = new TDEListBox(parent);
     d->subCategoriesBox->setVScrollBarMode(TQScrollView::AlwaysOn);
     
     d->addSubCategoryButton = new TQPushButton( i18n("&Add"), parent);
diff --git a/kipi-plugins/metadataedit/iptckeywords.cpp b/kipi-plugins/metadataedit/iptckeywords.cpp
index 89ae7c1..d22ccc0 100644
--- a/kipi-plugins/metadataedit/iptckeywords.cpp
+++ b/kipi-plugins/metadataedit/iptckeywords.cpp
@@ -72,7 +72,7 @@ public:
 
     KLineEdit   *keywordEdit;
 
-    KListBox    *keywordsBox;
+    TDEListBox    *keywordsBox;
 };
 
 IPTCKeywords::IPTCKeywords(TQWidget* parent)
@@ -96,7 +96,7 @@ IPTCKeywords::IPTCKeywords(TQWidget* parent)
     TQWhatsThis::add(d->keywordEdit, i18n("<p>Enter here a new keyword. "
                     "This field is limited to 64 ASCII characters."));
 
-    d->keywordsBox   = new KListBox(parent);
+    d->keywordsBox   = new TDEListBox(parent);
     d->keywordsBox->setVScrollBarMode(TQScrollView::AlwaysOn);
     
     d->addKeywordButton = new TQPushButton( i18n("&Add"), parent);
diff --git a/kipi-plugins/metadataedit/iptcsubjects.cpp b/kipi-plugins/metadataedit/iptcsubjects.cpp
index b84ae0e..43e8898 100644
--- a/kipi-plugins/metadataedit/iptcsubjects.cpp
+++ b/kipi-plugins/metadataedit/iptcsubjects.cpp
@@ -72,7 +72,7 @@ public:
 
     KLineEdit   *subjectEdit;
 
-    KListBox    *subjectsBox;
+    TDEListBox    *subjectsBox;
 };
 
 IPTCSubjects::IPTCSubjects(TQWidget* parent)
@@ -96,7 +96,7 @@ IPTCSubjects::IPTCSubjects(TQWidget* parent)
     TQWhatsThis::add(d->subjectEdit, i18n("<p>Enter here a new subject. "
                     "This field is limited to 236 ASCII characters."));
 
-    d->subjectsBox   = new KListBox(parent);
+    d->subjectsBox   = new TDEListBox(parent);
     d->subjectsBox->setVScrollBarMode(TQScrollView::AlwaysOn);
     
     d->addSubjectButton = new TQPushButton( i18n("&Add"), parent);
diff --git a/kipi-plugins/metadataedit/plugin_metadataedit.cpp b/kipi-plugins/metadataedit/plugin_metadataedit.cpp
index 0e01554..621e372 100644
--- a/kipi-plugins/metadataedit/plugin_metadataedit.cpp
+++ b/kipi-plugins/metadataedit/plugin_metadataedit.cpp
@@ -65,12 +65,12 @@ void Plugin_MetadataEdit::setup( TQWidget* widget )
 {
     KIPI::Plugin::setup( widget );
 
-    m_actionMetadataEdit = new KActionMenu(i18n("Metadata"),
+    m_actionMetadataEdit = new TDEActionMenu(i18n("Metadata"),
                                0,
                                actionCollection(),
                                "metadataedit");
 
-    m_actionMetadataEdit->insert(new KAction (i18n("Edit EXIF..."),
+    m_actionMetadataEdit->insert(new TDEAction (i18n("Edit EXIF..."),
                                      0,
                                      0,     
                                      this,
@@ -78,7 +78,7 @@ void Plugin_MetadataEdit::setup( TQWidget* widget )
                                      actionCollection(),
                                      "editexif"));
 
-    m_actionMetadataEdit->insert(new KAction (i18n("Remove EXIF..."),
+    m_actionMetadataEdit->insert(new TDEAction (i18n("Remove EXIF..."),
                                      0,
                                      0,     
                                      this,
@@ -86,7 +86,7 @@ void Plugin_MetadataEdit::setup( TQWidget* widget )
                                      actionCollection(),
                                      "removeexif"));
 
-    m_actionMetadataEdit->insert(new KAction (i18n("Import EXIF..."),
+    m_actionMetadataEdit->insert(new TDEAction (i18n("Import EXIF..."),
                                      0,
                                      0,     
                                      this,
@@ -96,7 +96,7 @@ void Plugin_MetadataEdit::setup( TQWidget* widget )
 
     m_actionMetadataEdit->popupMenu()->insertSeparator();
 
-    m_actionMetadataEdit->insert(new KAction (i18n("Edit IPTC..."),
+    m_actionMetadataEdit->insert(new TDEAction (i18n("Edit IPTC..."),
                                      0,
                                      0,     
                                      this,
@@ -104,7 +104,7 @@ void Plugin_MetadataEdit::setup( TQWidget* widget )
                                      actionCollection(),
                                      "editiptc"));
 
-    m_actionMetadataEdit->insert(new KAction (i18n("Remove IPTC..."),
+    m_actionMetadataEdit->insert(new TDEAction (i18n("Remove IPTC..."),
                                      0,
                                      0,     
                                      this,
@@ -112,7 +112,7 @@ void Plugin_MetadataEdit::setup( TQWidget* widget )
                                      actionCollection(),
                                      "removeiptc"));
 
-    m_actionMetadataEdit->insert(new KAction (i18n("Import IPTC..."),
+    m_actionMetadataEdit->insert(new TDEAction (i18n("Import IPTC..."),
                                      0,
                                      0,     
                                      this,
@@ -122,7 +122,7 @@ void Plugin_MetadataEdit::setup( TQWidget* widget )
 
     m_actionMetadataEdit->popupMenu()->insertSeparator();
 
-    m_actionMetadataEdit->insert(new KAction (i18n("Edit Captions..."),
+    m_actionMetadataEdit->insert(new TDEAction (i18n("Edit Captions..."),
                                      0,
                                      0,     
                                      this,
@@ -130,7 +130,7 @@ void Plugin_MetadataEdit::setup( TQWidget* widget )
                                      actionCollection(),
                                      "editcomments"));
 
-    m_actionMetadataEdit->insert(new KAction (i18n("Remove Captions..."),
+    m_actionMetadataEdit->insert(new TDEAction (i18n("Remove Captions..."),
                                      0,
                                      0,     
                                      this,
@@ -578,7 +578,7 @@ void Plugin_MetadataEdit::slotRemoveComments()
     }
 }
 
-KIPI::Category Plugin_MetadataEdit::category( KAction* action ) const
+KIPI::Category Plugin_MetadataEdit::category( TDEAction* action ) const
 {
     if ( action == m_actionMetadataEdit )
        return KIPI::IMAGESPLUGIN;
diff --git a/kipi-plugins/metadataedit/plugin_metadataedit.h b/kipi-plugins/metadataedit/plugin_metadataedit.h
index c2a1aed..fe85cd1 100644
--- a/kipi-plugins/metadataedit/plugin_metadataedit.h
+++ b/kipi-plugins/metadataedit/plugin_metadataedit.h
@@ -27,7 +27,7 @@
 
 #include <libkipi/plugin.h>
 
-class KActionMenu;
+class TDEActionMenu;
 
 class Plugin_MetadataEdit : public KIPI::Plugin
 {
@@ -38,7 +38,7 @@ public:
 
     Plugin_MetadataEdit(TQObject *parent, const char* name, const TQStringList &args);
 
-    virtual KIPI::Category category( KAction* action ) const;
+    virtual KIPI::Category category( TDEAction* action ) const;
     virtual void setup( TQWidget* );
 
 protected slots:
@@ -56,7 +56,7 @@ protected slots:
 
 private:
 
-    KActionMenu     *m_actionMetadataEdit;
+    TDEActionMenu     *m_actionMetadataEdit;
 
     KIPI::Interface *m_interface;
 };