Rename a number of classes to enhance compatibility with KDE4

6 files changed, 11 insertions, 11 deletions

diff --git a/kipi-plugins/cdarchiving/cdarchiving.cpp b/kipi-plugins/cdarchiving/cdarchiving.cpp
index 3b71214..a07c2d8 100644
--- a/kipi-plugins/cdarchiving/cdarchiving.cpp
+++ b/kipi-plugins/cdarchiving/cdarchiving.cpp
@@ -69,7 +69,7 @@ extern "C"
 namespace KIPICDArchivingPlugin
 {
 
-CDArchiving::CDArchiving( KIPI::Interface* interface, TQObject *parent, KAction *action_cdarchiving )
+CDArchiving::CDArchiving( KIPI::Interface* interface, TQObject *parent, TDEAction *action_cdarchiving )
         : TQObject(parent)
 {
     KImageIO::registerFormats();
diff --git a/kipi-plugins/cdarchiving/cdarchiving.h b/kipi-plugins/cdarchiving/cdarchiving.h
index bf25f91..5a18ac4 100644
--- a/kipi-plugins/cdarchiving/cdarchiving.h
+++ b/kipi-plugins/cdarchiving/cdarchiving.h
@@ -71,7 +71,7 @@ class CDArchiving : public TQObject
 public:
 
     CDArchiving( KIPI::Interface* interface, TQObject *parent=0,
-                 KAction *action_cdarchiving=0 );
+                 TDEAction *action_cdarchiving=0 );
     ~CDArchiving();
 
     bool prepare(void);
@@ -93,7 +93,7 @@ private:
 
     CDArchivingDialog  *m_configDlg;
 
-    KAction            *m_actionCDArchiving;
+    TDEAction            *m_actionCDArchiving;
 
     KIPI::Interface    *m_interface;
 
diff --git a/kipi-plugins/cdarchiving/cdarchivingdialog.cpp b/kipi-plugins/cdarchiving/cdarchivingdialog.cpp
index ea61e87..4cfb5f3 100644
--- a/kipi-plugins/cdarchiving/cdarchivingdialog.cpp
+++ b/kipi-plugins/cdarchiving/cdarchivingdialog.cpp
@@ -263,7 +263,7 @@ void CDArchivingDialog::setupLookPage(void)
 
     m_fontName = new TQComboBox( false, page_setupLook );
     TQStringList standardFonts;
-    KFontChooser::getFontList(standardFonts, 0);
+    TDEFontChooser::getFontList(standardFonts, 0);
     m_fontName->insertStringList( standardFonts );
     m_fontName->setCurrentText( TDEGlobalSettings::generalFont().family());
     TQWhatsThis::add( m_fontName, i18n("<p>Select here the font name used for the pages.") );
diff --git a/kipi-plugins/cdarchiving/cdarchivingdialog.h b/kipi-plugins/cdarchiving/cdarchivingdialog.h
index 9b5a60e..1c377c0 100644
--- a/kipi-plugins/cdarchiving/cdarchivingdialog.h
+++ b/kipi-plugins/cdarchiving/cdarchivingdialog.h
@@ -46,7 +46,7 @@ class KColorButton;
 class KFileItem;
 class KFilePreview;
 class KIntNumInput;
-class KListView;
+class TDEListView;
 class KSqueezedTextLabel;
 class KURL;
 class KURLRequester;
@@ -181,7 +181,7 @@ private:
     KIntNumInput                        *m_imagesPerRow;
     KIntNumInput                        *m_thumbnailsSize;
 
-    KListView                           *m_AlbumsList;
+    TDEListView                           *m_AlbumsList;
 
     KSqueezedTextLabel                  *m_AlbumCollection;
     KSqueezedTextLabel                  *m_AlbumComments;
diff --git a/kipi-plugins/cdarchiving/plugin_cdarchiving.cpp b/kipi-plugins/cdarchiving/plugin_cdarchiving.cpp
index b15e35a..e5d789a 100644
--- a/kipi-plugins/cdarchiving/plugin_cdarchiving.cpp
+++ b/kipi-plugins/cdarchiving/plugin_cdarchiving.cpp
@@ -58,7 +58,7 @@ void Plugin_CDArchiving::setup( TQWidget* widget )
 {
     KIPI::Plugin::setup( widget );
 
-    m_action_cdarchiving = new KAction (i18n("Archive to CD/DVD..."),     // Menu message.
+    m_action_cdarchiving = new TDEAction (i18n("Archive to CD/DVD..."),     // Menu message.
                                         "cd",                             // Menu icon.
                                         0,
                                         this,
@@ -337,7 +337,7 @@ void Plugin_CDArchiving::customEvent(TQCustomEvent *event)
 
 /////////////////////////////////////////////////////////////////////////////////////////////////////
 
-KIPI::Category Plugin_CDArchiving::category( KAction* action ) const
+KIPI::Category Plugin_CDArchiving::category( TDEAction* action ) const
 {
     if ( action == m_action_cdarchiving )
         return KIPI::EXPORTPLUGIN;
diff --git a/kipi-plugins/cdarchiving/plugin_cdarchiving.h b/kipi-plugins/cdarchiving/plugin_cdarchiving.h
index c879ffc..702376a 100644
--- a/kipi-plugins/cdarchiving/plugin_cdarchiving.h
+++ b/kipi-plugins/cdarchiving/plugin_cdarchiving.h
@@ -29,7 +29,7 @@
 
 class TQCustomEvent;
 
-class KAction;
+class TDEAction;
 
 namespace KIPI
 {
@@ -50,7 +50,7 @@ class Plugin_CDArchiving : public KIPI::Plugin
 public:
     Plugin_CDArchiving(TQObject *parent, const char* name, const TQStringList &args);
     virtual ~Plugin_CDArchiving();
-    virtual KIPI::Category category( KAction* action ) const;
+    virtual KIPI::Category category( TDEAction* action ) const;
     virtual void setup( TQWidget* widget );
 
 public slots:
@@ -64,7 +64,7 @@ private:
     KIPI::BatchProgressDialog                  *m_progressDlg;
 
     KIPICDArchivingPlugin::CDArchiving         *m_cdarchiving;
-    KAction                                    *m_action_cdarchiving;
+    TDEAction                                    *m_action_cdarchiving;
 
     void customEvent(TQCustomEvent *event);
 };