summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 15:09:15 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 15:09:15 -0600
commit9f3512f9756e14e9c0a71340f6891b4a263611d3 (patch)
tree4f9e97149a32884cca6b0ceafdeab118a38fece2
parentaeb252235dc0e8ee062396fd8a04916dba7ba977 (diff)
downloadkipi-plugins-9f3512f9756e14e9c0a71340f6891b4a263611d3.tar.gz
kipi-plugins-9f3512f9756e14e9c0a71340f6891b4a263611d3.zip
Rename a number of classes to enhance compatibility with KDE4
-rw-r--r--ChangeLog4
-rw-r--r--kipi-plugins/ChangeLog4
-rw-r--r--kipi-plugins/acquireimages/acquireimagedialog.h2
-rw-r--r--kipi-plugins/acquireimages/plugin_acquireimages.cpp6
-rw-r--r--kipi-plugins/acquireimages/plugin_acquireimages.h8
-rw-r--r--kipi-plugins/batchprocessimages/batchprocessimagesitem.cpp8
-rw-r--r--kipi-plugins/batchprocessimages/batchprocessimagesitem.h2
-rw-r--r--kipi-plugins/batchprocessimages/batchprocessimageslist.cpp2
-rw-r--r--kipi-plugins/batchprocessimages/batchprocessimageslist.h2
-rw-r--r--kipi-plugins/batchprocessimages/plugin_batchprocessimages.cpp18
-rw-r--r--kipi-plugins/batchprocessimages/plugin_batchprocessimages.h20
-rw-r--r--kipi-plugins/batchprocessimages/renameimagesbase.ui2
-rw-r--r--kipi-plugins/calendar/plugin_calendar.cpp4
-rw-r--r--kipi-plugins/calendar/plugin_calendar.h6
-rw-r--r--kipi-plugins/cdarchiving/cdarchiving.cpp2
-rw-r--r--kipi-plugins/cdarchiving/cdarchiving.h4
-rw-r--r--kipi-plugins/cdarchiving/cdarchivingdialog.cpp2
-rw-r--r--kipi-plugins/cdarchiving/cdarchivingdialog.h4
-rw-r--r--kipi-plugins/cdarchiving/plugin_cdarchiving.cpp4
-rw-r--r--kipi-plugins/cdarchiving/plugin_cdarchiving.h6
-rw-r--r--kipi-plugins/findimages/displaycompare.cpp4
-rw-r--r--kipi-plugins/findimages/finddupplicatedialog.h2
-rw-r--r--kipi-plugins/findimages/plugin_findimages.cpp4
-rw-r--r--kipi-plugins/findimages/plugin_findimages.h8
-rw-r--r--kipi-plugins/flickrexport/plugin_flickrexport.cpp4
-rw-r--r--kipi-plugins/flickrexport/plugin_flickrexport.h6
-rw-r--r--kipi-plugins/galleryexport/plugin_galleryexport.cpp10
-rw-r--r--kipi-plugins/galleryexport/plugin_galleryexport.h12
-rw-r--r--kipi-plugins/gpssync/gpslistviewitem.cpp12
-rw-r--r--kipi-plugins/gpssync/gpslistviewitem.h4
-rw-r--r--kipi-plugins/gpssync/gpssyncdialog.cpp4
-rw-r--r--kipi-plugins/gpssync/plugin_gpssync.cpp12
-rw-r--r--kipi-plugins/gpssync/plugin_gpssync.h10
-rw-r--r--kipi-plugins/helloworld/plugin_helloworld.cpp4
-rw-r--r--kipi-plugins/helloworld/plugin_helloworld.h6
-rw-r--r--kipi-plugins/htmlexport/plugin.cpp6
-rw-r--r--kipi-plugins/htmlexport/plugin.h4
-rw-r--r--kipi-plugins/htmlexport/themepage.ui2
-rw-r--r--kipi-plugins/htmlexport/wizard.cpp4
-rw-r--r--kipi-plugins/imageviewer/plugin_viewer.cpp4
-rw-r--r--kipi-plugins/imageviewer/plugin_viewer.h6
-rw-r--r--kipi-plugins/ipodexport/imagelist.cpp4
-rw-r--r--kipi-plugins/ipodexport/imagelist.h2
-rw-r--r--kipi-plugins/ipodexport/imagelistitem.h4
-rw-r--r--kipi-plugins/ipodexport/ipodexportdialog.h6
-rw-r--r--kipi-plugins/ipodexport/ipodlistitem.cpp4
-rw-r--r--kipi-plugins/ipodexport/ipodlistitem.h4
-rw-r--r--kipi-plugins/ipodexport/plugin_ipodexport.cpp4
-rw-r--r--kipi-plugins/ipodexport/plugin_ipodexport.h6
-rw-r--r--kipi-plugins/jpeglossless/plugin_jpeglossless.cpp18
-rw-r--r--kipi-plugins/jpeglossless/plugin_jpeglossless.h14
-rw-r--r--kipi-plugins/kameraklient/camerafolderitem.cpp4
-rw-r--r--kipi-plugins/kameraklient/camerafolderitem.h6
-rw-r--r--kipi-plugins/kameraklient/camerafolderview.cpp4
-rw-r--r--kipi-plugins/kameraklient/camerafolderview.h2
-rw-r--r--kipi-plugins/kameraklient/cameraui.cpp2
-rw-r--r--kipi-plugins/kameraklient/cameraui.h8
-rw-r--r--kipi-plugins/kameraklient/kameraklient.cpp6
-rw-r--r--kipi-plugins/kameraklient/kameraklient.h4
-rw-r--r--kipi-plugins/metadataedit/iptccategories.cpp4
-rw-r--r--kipi-plugins/metadataedit/iptckeywords.cpp4
-rw-r--r--kipi-plugins/metadataedit/iptcsubjects.cpp4
-rw-r--r--kipi-plugins/metadataedit/plugin_metadataedit.cpp20
-rw-r--r--kipi-plugins/metadataedit/plugin_metadataedit.h6
-rw-r--r--kipi-plugins/mpegencoder/kimg2mpg.cpp2
-rw-r--r--kipi-plugins/mpegencoder/kimg2mpg.h4
-rw-r--r--kipi-plugins/mpegencoder/plugin_mpegencoder.cpp4
-rw-r--r--kipi-plugins/mpegencoder/plugin_mpegencoder.h6
-rw-r--r--kipi-plugins/picasawebexport/plugin_picasawebexport.cpp4
-rw-r--r--kipi-plugins/picasawebexport/plugin_picasawebexport.h6
-rw-r--r--kipi-plugins/printwizard/frmprintwizardbase.ui4
-rw-r--r--kipi-plugins/printwizard/plugin_printwizard.cpp4
-rw-r--r--kipi-plugins/printwizard/plugin_printwizard.h6
-rw-r--r--kipi-plugins/rawconverter/batchdialog.cpp2
-rw-r--r--kipi-plugins/rawconverter/batchdialog.h4
-rw-r--r--kipi-plugins/rawconverter/clistviewitem.h10
-rw-r--r--kipi-plugins/rawconverter/plugin_rawconverter.cpp6
-rw-r--r--kipi-plugins/rawconverter/plugin_rawconverter.h8
-rw-r--r--kipi-plugins/sendimages/listimageserrordialog.cpp4
-rw-r--r--kipi-plugins/sendimages/listimageserrordialog.h4
-rw-r--r--kipi-plugins/sendimages/plugin_sendimages.cpp4
-rw-r--r--kipi-plugins/sendimages/plugin_sendimages.h6
-rw-r--r--kipi-plugins/sendimages/sendimagesdialog.cpp2
-rw-r--r--kipi-plugins/sendimages/sendimagesdialog.h4
-rw-r--r--kipi-plugins/simpleviewerexport/plugin_simpleviewer.cpp4
-rw-r--r--kipi-plugins/simpleviewerexport/plugin_simpleviewer.h6
-rw-r--r--kipi-plugins/slideshow/listimageitems.cpp2
-rw-r--r--kipi-plugins/slideshow/listimageitems.h2
-rw-r--r--kipi-plugins/slideshow/plugin_slideshow.cpp4
-rw-r--r--kipi-plugins/slideshow/plugin_slideshow.h6
-rw-r--r--kipi-plugins/slideshow/slideshowconfigbase.ui2
-rw-r--r--kipi-plugins/sync/plugin_sync.cpp10
-rw-r--r--kipi-plugins/sync/plugin_sync.h12
-rw-r--r--kipi-plugins/timeadjust/plugin_timeadjust.cpp4
-rw-r--r--kipi-plugins/timeadjust/plugin_timeadjust.h6
-rw-r--r--kipi-plugins/wallpaper/plugin_wallpaper.cpp20
-rw-r--r--kipi-plugins/wallpaper/plugin_wallpaper.h8
97 files changed, 279 insertions, 279 deletions
diff --git a/ChangeLog b/ChangeLog
index b2560f6..b4a6395 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -14815,7 +14815,7 @@ v0.1.0-beta1 2004-09-06
2004-06-15 18:55 cgilles
* rawconverter/: plugin_rawconverter.cpp, plugin_rawconverter.h:
- New plugin category identification method based on KAction
+ New plugin category identification method based on TDEAction
identification required for RawConverter plugin.
CCMAIL: kde-imaging@kde.org
@@ -15304,7 +15304,7 @@ v0.1.0-beta1 2004-09-06
To tell KIPI about actions, then plugins must now call
KIPI::Plugin::addAction() on each action they want to be in the
- topmost menu (thus not actions located in KActionMenu's).
+ topmost menu (thus not actions located in TDEActionMenu's).
Let me summerize the changes - Host application now need to call
actions() rather than actionCollection() to get information
diff --git a/kipi-plugins/ChangeLog b/kipi-plugins/ChangeLog
index 8cda2df..2e1eb0d 100644
--- a/kipi-plugins/ChangeLog
+++ b/kipi-plugins/ChangeLog
@@ -14941,7 +14941,7 @@ v0.1.0-beta1 2004-09-06
2004-06-15 18:55 cgilles
* rawconverter/: plugin_rawconverter.cpp, plugin_rawconverter.h:
- New plugin category identification method based on KAction
+ New plugin category identification method based on TDEAction
identification required for RawConverter plugin.
CCMAIL: kde-imaging@kde.org
@@ -15430,7 +15430,7 @@ v0.1.0-beta1 2004-09-06
To tell KIPI about actions, then plugins must now call
KIPI::Plugin::addAction() on each action they want to be in the
- topmost menu (thus not actions located in KActionMenu's).
+ topmost menu (thus not actions located in TDEActionMenu's).
Let me summerize the changes - Host application now need to call
actions() rather than actionCollection() to get information
diff --git a/kipi-plugins/acquireimages/acquireimagedialog.h b/kipi-plugins/acquireimages/acquireimagedialog.h
index 4f4d6b4..3a5524a 100644
--- a/kipi-plugins/acquireimages/acquireimagedialog.h
+++ b/kipi-plugins/acquireimages/acquireimagedialog.h
@@ -53,7 +53,7 @@ class TQComboBox;
class TQFrame;
class TQPushButton;
-class KListBox;
+class TDEListBox;
class TDEConfig;
class KIntNumInput;
class KSqueezedTextLabel;
diff --git a/kipi-plugins/acquireimages/plugin_acquireimages.cpp b/kipi-plugins/acquireimages/plugin_acquireimages.cpp
index 97e3e4d..9ef00c4 100644
--- a/kipi-plugins/acquireimages/plugin_acquireimages.cpp
+++ b/kipi-plugins/acquireimages/plugin_acquireimages.cpp
@@ -62,7 +62,7 @@ void Plugin_AcquireImages::setup( TQWidget* widget )
{
KIPI::Plugin::setup( widget );
- m_action_scanimages = new KAction (i18n("Scan Images..."), // Menu message.
+ m_action_scanimages = new TDEAction (i18n("Scan Images..."), // Menu message.
"scanner", // Menu icon.
0, // default shortcut.
this,
@@ -70,7 +70,7 @@ void Plugin_AcquireImages::setup( TQWidget* widget )
actionCollection(),
"scan_images");
- m_action_screenshotimages = new KAction (i18n("Screenshot..."), // Menu message.
+ m_action_screenshotimages = new TDEAction (i18n("Screenshot..."), // Menu message.
"ksnapshot", // Menu icon.
0, // default shortcut.
this,
@@ -157,7 +157,7 @@ void Plugin_AcquireImages::slotAcquireImageDone(const TQImage &img)
m_acquireImageDialog->exec();
}
-KIPI::Category Plugin_AcquireImages::category( KAction* action ) const
+KIPI::Category Plugin_AcquireImages::category( TDEAction* action ) const
{
if ( action == m_action_scanimages )
return KIPI::IMPORTPLUGIN;
diff --git a/kipi-plugins/acquireimages/plugin_acquireimages.h b/kipi-plugins/acquireimages/plugin_acquireimages.h
index 3078d0f..358b5c4 100644
--- a/kipi-plugins/acquireimages/plugin_acquireimages.h
+++ b/kipi-plugins/acquireimages/plugin_acquireimages.h
@@ -28,7 +28,7 @@
#include <libkipi/plugin.h>
class KScanDialog;
-class KAction;
+class TDEAction;
class AcquireImageDialog;
class ScreenGrabDialog;
@@ -42,7 +42,7 @@ public:
Plugin_AcquireImages(TQObject *parent, const char* name, const TQStringList &args);
virtual ~Plugin_AcquireImages();
- virtual KIPI::Category category( KAction* action ) const;
+ virtual KIPI::Category category( TDEAction* action ) const;
virtual void setup( TQWidget* widget );
public slots:
@@ -52,8 +52,8 @@ public slots:
private:
- KAction *m_action_scanimages;
- KAction *m_action_screenshotimages;
+ TDEAction *m_action_scanimages;
+ TDEAction *m_action_screenshotimages;
KScanDialog *m_scanDialog;
KIPIAcquireImagesPlugin::AcquireImageDialog *m_acquireImageDialog;
diff --git a/kipi-plugins/batchprocessimages/batchprocessimagesitem.cpp b/kipi-plugins/batchprocessimages/batchprocessimagesitem.cpp
index af5f2b8..f61868a 100644
--- a/kipi-plugins/batchprocessimages/batchprocessimagesitem.cpp
+++ b/kipi-plugins/batchprocessimages/batchprocessimagesitem.cpp
@@ -38,7 +38,7 @@ namespace KIPIBatchProcessImagesPlugin
BatchProcessImagesItem::BatchProcessImagesItem(TQListView * parent, TQString const & pathSrc,
TQString const & nameSrc, TQString const & nameDest, TQString const & result)
- : KListViewItem( parent, "", nameSrc, nameDest, result),
+ : TDEListViewItem( parent, "", nameSrc, nameDest, result),
_pathSrc(pathSrc), _nameSrc(nameSrc), _nameDest(nameDest), _result(result),
_overwrote( false ),
_reverseSort( false )
@@ -69,17 +69,17 @@ void BatchProcessImagesItem::paintCell (TQPainter *p, const TQColorGroup &cg, in
if (text(3) != i18n("OK") && !text(3).isEmpty() )
{
_cg.setColor( TQColorGroup::Text, TQt::red );
- KListViewItem::paintCell( p, _cg, column, width, alignment );
+ TDEListViewItem::paintCell( p, _cg, column, width, alignment );
return;
}
if (text(3) == i18n("OK") )
{
_cg.setColor( TQColorGroup::Text, TQt::darkGreen );
- KListViewItem::paintCell( p, _cg, column, width, alignment );
+ TDEListViewItem::paintCell( p, _cg, column, width, alignment );
return;
}
- KListViewItem::paintCell( p, cg, column, width, alignment );
+ TDEListViewItem::paintCell( p, cg, column, width, alignment );
}
bool BatchProcessImagesItem::overWrote()
diff --git a/kipi-plugins/batchprocessimages/batchprocessimagesitem.h b/kipi-plugins/batchprocessimages/batchprocessimagesitem.h
index d17f9e7..0422578 100644
--- a/kipi-plugins/batchprocessimages/batchprocessimagesitem.h
+++ b/kipi-plugins/batchprocessimages/batchprocessimagesitem.h
@@ -38,7 +38,7 @@ class TQListView;
namespace KIPIBatchProcessImagesPlugin
{
-class BatchProcessImagesItem : public KListViewItem
+class BatchProcessImagesItem : public TDEListViewItem
{
public:
diff --git a/kipi-plugins/batchprocessimages/batchprocessimageslist.cpp b/kipi-plugins/batchprocessimages/batchprocessimageslist.cpp
index c187b45..2984c77 100644
--- a/kipi-plugins/batchprocessimages/batchprocessimageslist.cpp
+++ b/kipi-plugins/batchprocessimages/batchprocessimageslist.cpp
@@ -42,7 +42,7 @@ namespace KIPIBatchProcessImagesPlugin
{
BatchProcessImagesList::BatchProcessImagesList(TQWidget *parent, const char *name)
- : KListView(parent, name)
+ : TDEListView(parent, name)
{
setAcceptDrops(true);
setDropVisualizer(false);
diff --git a/kipi-plugins/batchprocessimages/batchprocessimageslist.h b/kipi-plugins/batchprocessimages/batchprocessimageslist.h
index d44107c..0028193 100644
--- a/kipi-plugins/batchprocessimages/batchprocessimageslist.h
+++ b/kipi-plugins/batchprocessimages/batchprocessimageslist.h
@@ -34,7 +34,7 @@
namespace KIPIBatchProcessImagesPlugin
{
-class BatchProcessImagesList : public KListView
+class BatchProcessImagesList : public TDEListView
{
Q_OBJECT
diff --git a/kipi-plugins/batchprocessimages/plugin_batchprocessimages.cpp b/kipi-plugins/batchprocessimages/plugin_batchprocessimages.cpp
index 92bcb4f..1076f93 100644
--- a/kipi-plugins/batchprocessimages/plugin_batchprocessimages.cpp
+++ b/kipi-plugins/batchprocessimages/plugin_batchprocessimages.cpp
@@ -80,7 +80,7 @@ void Plugin_BatchProcessImages::setup( TQWidget* widget )
{
KIPI::Plugin::setup( widget );
- m_action_borderimages = new KAction (i18n("Border Images..."), // Menu message.
+ m_action_borderimages = new TDEAction (i18n("Border Images..."), // Menu message.
"borderimages", // Menu icon.
0, // default shortcut.
this,
@@ -88,7 +88,7 @@ void Plugin_BatchProcessImages::setup( TQWidget* widget )
actionCollection(),
"batch_border_images");
- m_action_colorimages = new KAction (i18n("Color Images..."), // Menu message.
+ m_action_colorimages = new TDEAction (i18n("Color Images..."), // Menu message.
"colorimages", // Menu icon.
0, // default shortcut.
this,
@@ -96,7 +96,7 @@ void Plugin_BatchProcessImages::setup( TQWidget* widget )
actionCollection(),
"batch_color_images");
- m_action_convertimages = new KAction (i18n("Convert Images..."), // Menu message.
+ m_action_convertimages = new TDEAction (i18n("Convert Images..."), // Menu message.
"convertimages", // Menu icon.
0, // default shortcut.
this,
@@ -104,7 +104,7 @@ void Plugin_BatchProcessImages::setup( TQWidget* widget )
actionCollection(),
"batch_convert_images");
- m_action_effectimages = new KAction (i18n("Image Effects..."), // Menu message.
+ m_action_effectimages = new TDEAction (i18n("Image Effects..."), // Menu message.
"effectimages", // Menu icon.
0, // default shortcut.
this,
@@ -112,7 +112,7 @@ void Plugin_BatchProcessImages::setup( TQWidget* widget )
actionCollection(),
"batch_effect_images");
- m_action_filterimages = new KAction (i18n("Filter Images..."), // Menu message.
+ m_action_filterimages = new TDEAction (i18n("Filter Images..."), // Menu message.
"filterimages", // Menu icon.
0, // default shortcut.
this,
@@ -120,7 +120,7 @@ void Plugin_BatchProcessImages::setup( TQWidget* widget )
actionCollection(),
"batch_filter_images");
- m_action_renameimages = new KAction (i18n("Rename Images..."), // Menu message.
+ m_action_renameimages = new TDEAction (i18n("Rename Images..."), // Menu message.
"renameimages", // Menu icon.
0, // default shortcut.
this,
@@ -128,7 +128,7 @@ void Plugin_BatchProcessImages::setup( TQWidget* widget )
actionCollection(),
"batch_rename_images");
- m_action_recompressimages = new KAction (i18n("Recompress Images..."), // Menu message.
+ m_action_recompressimages = new TDEAction (i18n("Recompress Images..."), // Menu message.
"recompressimages", // Menu icon.
0, // default shortcut.
this,
@@ -136,7 +136,7 @@ void Plugin_BatchProcessImages::setup( TQWidget* widget )
actionCollection(),
"batch_recompress_images");
- m_action_resizeimages = new KAction (i18n("Resize Images..."), // Menu message.
+ m_action_resizeimages = new TDEAction (i18n("Resize Images..."), // Menu message.
"resizeimages", // Menu icon.
0, // default shortcut.
this,
@@ -289,7 +289,7 @@ void Plugin_BatchProcessImages::slotActivate()
}
}
-KIPI::Category Plugin_BatchProcessImages::category( KAction* action ) const
+KIPI::Category Plugin_BatchProcessImages::category( TDEAction* action ) const
{
if ( action == m_action_borderimages )
return KIPI::BATCHPLUGIN;
diff --git a/kipi-plugins/batchprocessimages/plugin_batchprocessimages.h b/kipi-plugins/batchprocessimages/plugin_batchprocessimages.h
index 4341334..a78d85e 100644
--- a/kipi-plugins/batchprocessimages/plugin_batchprocessimages.h
+++ b/kipi-plugins/batchprocessimages/plugin_batchprocessimages.h
@@ -31,7 +31,7 @@
#include <libkipi/plugin.h>
-class KAction;
+class TDEAction;
class KIPIBatchProcessImagesPlugin::BorderImagesDialog;
class KIPIBatchProcessImagesPlugin::ColorImagesDialog;
@@ -50,21 +50,21 @@ Q_OBJECT
public:
Plugin_BatchProcessImages(TQObject *parent, const char* name, const TQStringList &args);
virtual ~Plugin_BatchProcessImages();
- virtual KIPI::Category category( KAction* action ) const;
+ virtual KIPI::Category category( TDEAction* action ) const;
virtual void setup( TQWidget* );
public slots:
void slotActivate();
private:
- KAction *m_action_borderimages;
- KAction *m_action_colorimages;
- KAction *m_action_convertimages;
- KAction *m_action_effectimages;
- KAction *m_action_filterimages;
- KAction *m_action_renameimages;
- KAction *m_action_recompressimages;
- KAction *m_action_resizeimages;
+ TDEAction *m_action_borderimages;
+ TDEAction *m_action_colorimages;
+ TDEAction *m_action_convertimages;
+ TDEAction *m_action_effectimages;
+ TDEAction *m_action_filterimages;
+ TDEAction *m_action_renameimages;
+ TDEAction *m_action_recompressimages;
+ TDEAction *m_action_resizeimages;
KIPIBatchProcessImagesPlugin::BorderImagesDialog *m_BorderImagesDialog;
diff --git a/kipi-plugins/batchprocessimages/renameimagesbase.ui b/kipi-plugins/batchprocessimages/renameimagesbase.ui
index 671a697..993238f 100644
--- a/kipi-plugins/batchprocessimages/renameimagesbase.ui
+++ b/kipi-plugins/batchprocessimages/renameimagesbase.ui
@@ -183,7 +183,7 @@
<string>Remove</string>
</property>
</widget>
- <widget class="KListView" row="0" column="0" rowspan="10" colspan="1">
+ <widget class="TDEListView" row="0" column="0" rowspan="10" colspan="1">
<column>
<property name="text">
<string>Album</string>
diff --git a/kipi-plugins/calendar/plugin_calendar.cpp b/kipi-plugins/calendar/plugin_calendar.cpp
index 434c887..181c20c 100644
--- a/kipi-plugins/calendar/plugin_calendar.cpp
+++ b/kipi-plugins/calendar/plugin_calendar.cpp
@@ -57,7 +57,7 @@ void Plugin_Calendar::setup( TQWidget* widget )
{
KIPI::Plugin::setup( widget );
- m_calendarAction = new KAction(i18n("Create Calendar..."),
+ m_calendarAction = new TDEAction(i18n("Create Calendar..."),
"date",
0,
this,
@@ -86,7 +86,7 @@ void Plugin_Calendar::slotActivate()
w->show();
}
-KIPI::Category Plugin_Calendar::category( KAction* action ) const
+KIPI::Category Plugin_Calendar::category( TDEAction* action ) const
{
if ( action == m_calendarAction )
return KIPI::TOOLSPLUGIN;
diff --git a/kipi-plugins/calendar/plugin_calendar.h b/kipi-plugins/calendar/plugin_calendar.h
index 97ea997..d31c057 100644
--- a/kipi-plugins/calendar/plugin_calendar.h
+++ b/kipi-plugins/calendar/plugin_calendar.h
@@ -29,7 +29,7 @@
class TQProgressDialog;
class TQTimer;
-class KAction;
+class TDEAction;
class Plugin_Calendar : public KIPI::Plugin
{
@@ -42,12 +42,12 @@ public:
const char* name,
const TQStringList &args);
~Plugin_Calendar();
- virtual KIPI::Category category( KAction* action ) const;
+ virtual KIPI::Category category( TDEAction* action ) const;
virtual void setup( TQWidget* widget );
private:
- KAction* m_calendarAction;
+ TDEAction* m_calendarAction;
private slots:
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);
};
diff --git a/kipi-plugins/findimages/displaycompare.cpp b/kipi-plugins/findimages/displaycompare.cpp
index 7d6db4d..8962761 100644
--- a/kipi-plugins/findimages/displaycompare.cpp
+++ b/kipi-plugins/findimages/displaycompare.cpp
@@ -191,7 +191,7 @@ DisplayCompare::DisplayCompare(TQWidget* parent, KIPI::Interface* interface,
originalInfoLabel5 = new KSqueezedTextLabel( GroupBox1, "originalInfoLabel5" );
originalInfoLabel5->setAlignment( int( TQLabel::AlignCenter ) );
- listName = new KListView( GroupBox1, "listName" );
+ listName = new TDEListView( GroupBox1, "listName" );
listName->header()->setLabel( 0, i18n( "Files" ) );
TQWhatsThis::add( listName, i18n( "<p>This list contains all files with many duplicates." ) );
listName->addColumn( i18n( "Files" ) );
@@ -226,7 +226,7 @@ DisplayCompare::DisplayCompare(TQWidget* parent, KIPI::Interface* interface,
similarInfoLabel5 = new KSqueezedTextLabel( GroupBox2, "similarInfoLabel5" );
similarInfoLabel5->setAlignment( int( TQLabel::AlignCenter ) );
- listEq = new KListView( GroupBox2, "listEq" );
+ listEq = new TDEListView( GroupBox2, "listEq" );
listEq->header()->setLabel( 0, i18n( "Files" ) );
TQWhatsThis::add( listEq, i18n( "<p>This list contains all duplicates files." ) );
listEq->addColumn( i18n( "Identical To" ) );
diff --git a/kipi-plugins/findimages/finddupplicatedialog.h b/kipi-plugins/findimages/finddupplicatedialog.h
index a18357e..bdff78d 100644
--- a/kipi-plugins/findimages/finddupplicatedialog.h
+++ b/kipi-plugins/findimages/finddupplicatedialog.h
@@ -47,7 +47,7 @@ class TQPushButton;
class KFileItem;
class KIntNumInput;
class KSqueezedTextLabel;
-class KListView;
+class TDEListView;
namespace KIPI
{
diff --git a/kipi-plugins/findimages/plugin_findimages.cpp b/kipi-plugins/findimages/plugin_findimages.cpp
index d0e5d49..9335425 100644
--- a/kipi-plugins/findimages/plugin_findimages.cpp
+++ b/kipi-plugins/findimages/plugin_findimages.cpp
@@ -66,7 +66,7 @@ void Plugin_FindImages::setup( TQWidget* widget )
{
KIPI::Plugin::setup( widget );
- m_action_findDuplicateImages = new KAction(i18n("&Find Duplicate Images..."),
+ m_action_findDuplicateImages = new TDEAction(i18n("&Find Duplicate Images..."),
"finddupplicateimages",
0,
this,
@@ -298,7 +298,7 @@ void Plugin_FindImages::customEvent(TQCustomEvent *event)
delete d;
}
-KIPI::Category Plugin_FindImages::category( KAction* action ) const
+KIPI::Category Plugin_FindImages::category( TDEAction* action ) const
{
if ( action == m_action_findDuplicateImages )
return KIPI::COLLECTIONSPLUGIN;
diff --git a/kipi-plugins/findimages/plugin_findimages.h b/kipi-plugins/findimages/plugin_findimages.h
index 6a852a3..0f88faa 100644
--- a/kipi-plugins/findimages/plugin_findimages.h
+++ b/kipi-plugins/findimages/plugin_findimages.h
@@ -30,8 +30,8 @@
class TQCustomEvent;
-class KActionMenu;
-class KAction;
+class TDEActionMenu;
+class TDEAction;
namespace KIPI
{
@@ -50,12 +50,12 @@ public:
Plugin_FindImages(TQObject *parent, const char* name, const TQStringList &args);
~Plugin_FindImages();
- virtual KIPI::Category category( KAction* action ) const;
+ virtual KIPI::Category category( TDEAction* action ) const;
virtual void setup( TQWidget* widget );
private:
- KAction *m_action_findDuplicateImages;
+ TDEAction *m_action_findDuplicateImages;
protected:
diff --git a/kipi-plugins/flickrexport/plugin_flickrexport.cpp b/kipi-plugins/flickrexport/plugin_flickrexport.cpp
index 8108aa9..00f3fe7 100644
--- a/kipi-plugins/flickrexport/plugin_flickrexport.cpp
+++ b/kipi-plugins/flickrexport/plugin_flickrexport.cpp
@@ -62,7 +62,7 @@ void Plugin_FlickrExport::setup(TQWidget* widget)
{
KIPI::Plugin::setup(widget);
- m_action = new KAction(i18n("Export to Flickr..."),
+ m_action = new TDEAction(i18n("Export to Flickr..."),
"www",
0,
this,
@@ -104,7 +104,7 @@ void Plugin_FlickrExport::slotActivate()
m_dlg->show();
}
-KIPI::Category Plugin_FlickrExport::category( KAction* action ) const
+KIPI::Category Plugin_FlickrExport::category( TDEAction* action ) const
{
if (action == m_action)
return KIPI::EXPORTPLUGIN;
diff --git a/kipi-plugins/flickrexport/plugin_flickrexport.h b/kipi-plugins/flickrexport/plugin_flickrexport.h
index 61ec37b..426f522 100644
--- a/kipi-plugins/flickrexport/plugin_flickrexport.h
+++ b/kipi-plugins/flickrexport/plugin_flickrexport.h
@@ -27,7 +27,7 @@
#include <libkipi/plugin.h>
-class KAction;
+class TDEAction;
using namespace KIPIFlickrExportPlugin;
@@ -41,7 +41,7 @@ public:
Plugin_FlickrExport(TQObject *parent, const char* name, const TQStringList &args);
~Plugin_FlickrExport();
- virtual KIPI::Category category(KAction* action) const;
+ virtual KIPI::Category category(TDEAction* action) const;
virtual void setup(TQWidget*);
public slots:
@@ -50,7 +50,7 @@ public slots:
private:
- KAction *m_action;
+ TDEAction *m_action;
FlickrWindow *m_dlg;
};
diff --git a/kipi-plugins/galleryexport/plugin_galleryexport.cpp b/kipi-plugins/galleryexport/plugin_galleryexport.cpp
index 917dcc8..d277096 100644
--- a/kipi-plugins/galleryexport/plugin_galleryexport.cpp
+++ b/kipi-plugins/galleryexport/plugin_galleryexport.cpp
@@ -74,7 +74,7 @@ void Plugin_GalleryExport::setup(TQWidget* widget)
// Add our directory in to the icon loader dirs.
TDEGlobal::iconLoader()->addAppDir("kipiplugin_galleryexport");
- m_action_sync = new KAction(i18n("Remote Gallery Sync..."),
+ m_action_sync = new TDEAction(i18n("Remote Gallery Sync..."),
0,
this,
TQT_SLOT(slotSync()),
@@ -83,7 +83,7 @@ void Plugin_GalleryExport::setup(TQWidget* widget)
m_action_sync->setEnabled(true);
addAction(m_action_sync);
- m_action_configure = new KAction(i18n("Remote Galleries..."),
+ m_action_configure = new TDEAction(i18n("Remote Galleries..."),
0,
this,
TQT_SLOT(slotConfigure()),
@@ -92,7 +92,7 @@ void Plugin_GalleryExport::setup(TQWidget* widget)
m_action_configure->setEnabled(true);
addAction(m_action_configure);
/*
- m_action_collection_settings = new KAction(i18n("Remote Gallery Settings..."),
+ m_action_collection_settings = new TDEAction(i18n("Remote Gallery Settings..."),
0,
this,
TQT_SLOT(slotCollectionSettings()),
@@ -101,7 +101,7 @@ void Plugin_GalleryExport::setup(TQWidget* widget)
m_action_collection_settings->setEnabled(true);
addAction(m_action_collection_settings);
- m_action_image_setting = new KAction(i18n("Remote Gallery Settings..."),
+ m_action_image_setting = new TDEAction(i18n("Remote Gallery Settings..."),
0,
this,
TQT_SLOT(slotImageSettings()),
@@ -170,7 +170,7 @@ void Plugin_GalleryExport::slotImageSettings()
KMessageBox::error(TQT_TQWIDGET(kapp->activeWindow()), "Not Implemented Yet!");
}
-KIPI::Category Plugin_GalleryExport::category( KAction* action ) const
+KIPI::Category Plugin_GalleryExport::category( TDEAction* action ) const
{
if (action == m_action_sync)
return KIPI::EXPORTPLUGIN;
diff --git a/kipi-plugins/galleryexport/plugin_galleryexport.h b/kipi-plugins/galleryexport/plugin_galleryexport.h
index a6525b1..cea15bf 100644
--- a/kipi-plugins/galleryexport/plugin_galleryexport.h
+++ b/kipi-plugins/galleryexport/plugin_galleryexport.h
@@ -26,7 +26,7 @@
#include <libkipi/plugin.h>
-class KAction;
+class TDEAction;
namespace KIPIGalleryExportPlugin
{
@@ -45,7 +45,7 @@ public:
const TQStringList &args);
~Plugin_GalleryExport();
- virtual KIPI::Category category( KAction* action ) const;
+ virtual KIPI::Category category( TDEAction* action ) const;
virtual void setup( TQWidget* );
public slots:
@@ -57,10 +57,10 @@ public slots:
private:
- KAction *m_action_sync;
- KAction *m_action_configure;
- KAction *m_action_collection_settings;
- KAction *m_action_image_setting;
+ TDEAction *m_action_sync;
+ TDEAction *m_action_configure;
+ TDEAction *m_action_collection_settings;
+ TDEAction *m_action_image_setting;
KIPIGalleryExportPlugin::Galleries* mpGalleries;
};
diff --git a/kipi-plugins/gpssync/gpslistviewitem.cpp b/kipi-plugins/gpssync/gpslistviewitem.cpp
index 0b186d0..8d495d1 100644
--- a/kipi-plugins/gpssync/gpslistviewitem.cpp
+++ b/kipi-plugins/gpssync/gpslistviewitem.cpp
@@ -65,8 +65,8 @@ public:
GPSDataContainer gpsData;
};
-GPSListViewItem::GPSListViewItem(KListView *view, TQListViewItem *after, const KURL& url)
- : KListViewItem(view, after)
+GPSListViewItem::GPSListViewItem(TDEListView *view, TQListViewItem *after, const KURL& url)
+ : TDEListViewItem(view, after)
{
d = new GPSListViewItemPriv;
d->url = url;
@@ -219,7 +219,7 @@ void GPSListViewItem::paintCell(TQPainter *p, const TQColorGroup &cg, int column
TQColorGroup _cg( cg );
TQColor c = _cg.text();
_cg.setColor( TQColorGroup::Text, TQt::red );
- KListViewItem::paintCell( p, _cg, column, width, alignment );
+ TDEListViewItem::paintCell( p, _cg, column, width, alignment );
_cg.setColor( TQColorGroup::Text, c );
}
else if ( isDirty() && d->erase && column == 6)
@@ -227,18 +227,18 @@ void GPSListViewItem::paintCell(TQPainter *p, const TQColorGroup &cg, int column
TQColorGroup _cg( cg );
TQColor c = _cg.text();
_cg.setColor( TQColorGroup::Text, TQt::red );
- KListViewItem::paintCell( p, _cg, column, width, alignment );
+ TDEListViewItem::paintCell( p, _cg, column, width, alignment );
_cg.setColor( TQColorGroup::Text, c );
}
else
- KListViewItem::paintCell(p, cg, column, width, alignment);
+ TDEListViewItem::paintCell(p, cg, column, width, alignment);
}
else
{
TQColorGroup _cg( cg );
TQColor c = _cg.text();
_cg.setColor( TQColorGroup::Text, TQt::gray );
- KListViewItem::paintCell( p, _cg, column, width, alignment );
+ TDEListViewItem::paintCell( p, _cg, column, width, alignment );
_cg.setColor( TQColorGroup::Text, c );
}
}
diff --git a/kipi-plugins/gpssync/gpslistviewitem.h b/kipi-plugins/gpssync/gpslistviewitem.h
index 738b610..14df8a0 100644
--- a/kipi-plugins/gpssync/gpslistviewitem.h
+++ b/kipi-plugins/gpssync/gpslistviewitem.h
@@ -45,12 +45,12 @@ namespace KIPIGPSSyncPlugin
{
class GPSListViewItemPriv;
-class GPSListViewItem : public KListViewItem
+class GPSListViewItem : public TDEListViewItem
{
public:
- GPSListViewItem(KListView *view, TQListViewItem *after, const KURL& url);
+ GPSListViewItem(TDEListView *view, TQListViewItem *after, const KURL& url);
~GPSListViewItem();
void setGPSInfo(const GPSDataContainer& gpsData, bool dirty=true, bool addedManually=false);
diff --git a/kipi-plugins/gpssync/gpssyncdialog.cpp b/kipi-plugins/gpssync/gpssyncdialog.cpp
index fa9e844..6ea5244 100644
--- a/kipi-plugins/gpssync/gpssyncdialog.cpp
+++ b/kipi-plugins/gpssync/gpssyncdialog.cpp
@@ -89,7 +89,7 @@ public:
TQCheckBox *interpolateBox;
- KListView *listView;
+ TDEListView *listView;
KIntSpinBox *maxGapInput;
KIntSpinBox *maxTimeInput;
@@ -127,7 +127,7 @@ GPSSyncDialog::GPSSyncDialog( KIPI::Interface* interface, TQWidget* parent)
// --------------------------------------------------------------
- d->listView = new KListView(plainPage());
+ d->listView = new TDEListView(plainPage());
d->listView->addColumn( i18n("Thumbnail") );
d->listView->addColumn( i18n("File Name") );
d->listView->addColumn( i18n("Camera time stamp") );
diff --git a/kipi-plugins/gpssync/plugin_gpssync.cpp b/kipi-plugins/gpssync/plugin_gpssync.cpp
index 71b73d7..9fdc9fd 100644
--- a/kipi-plugins/gpssync/plugin_gpssync.cpp
+++ b/kipi-plugins/gpssync/plugin_gpssync.cpp
@@ -70,12 +70,12 @@ void Plugin_GPSSync::setup( TQWidget* widget )
{
KIPI::Plugin::setup( widget );
- m_action_geolocation = new KActionMenu(i18n("Geolocation"),
+ m_action_geolocation = new TDEActionMenu(i18n("Geolocation"),
0,
actionCollection(),
"geolocation");
- m_action_geolocation->insert(new KAction (i18n("Correlator..."),
+ m_action_geolocation->insert(new TDEAction (i18n("Correlator..."),
"gpsimagetag",
0,
this,
@@ -83,7 +83,7 @@ void Plugin_GPSSync::setup( TQWidget* widget )
actionCollection(),
"gpssync"));
- m_action_geolocation->insert(new KAction (i18n("Edit Coordinates..."),
+ m_action_geolocation->insert(new TDEAction (i18n("Edit Coordinates..."),
0,
0,
this,
@@ -91,7 +91,7 @@ void Plugin_GPSSync::setup( TQWidget* widget )
actionCollection(),
"gpsedit"));
- m_action_geolocation->insert(new KAction (i18n("Remove Coordinates..."),
+ m_action_geolocation->insert(new TDEAction (i18n("Remove Coordinates..."),
0,
0,
this,
@@ -102,7 +102,7 @@ void Plugin_GPSSync::setup( TQWidget* widget )
addAction( m_action_geolocation );
// this is our action shown in the menubar/toolbar of the mainwindow
- m_actionKMLExport = new KAction (i18n("KML Export..."),
+ m_actionKMLExport = new TDEAction (i18n("KML Export..."),
"www", // icon
0, // do never set shortcuts from plugins.
this,
@@ -330,7 +330,7 @@ void Plugin_GPSSync::slotKMLGenerate()
myExport.generate();
}
-KIPI::Category Plugin_GPSSync::category( KAction* action ) const
+KIPI::Category Plugin_GPSSync::category( TDEAction* action ) const
{
if ( action == m_action_geolocation )
return KIPI::IMAGESPLUGIN;
diff --git a/kipi-plugins/gpssync/plugin_gpssync.h b/kipi-plugins/gpssync/plugin_gpssync.h
index 206658c..8f4cc7d 100644
--- a/kipi-plugins/gpssync/plugin_gpssync.h
+++ b/kipi-plugins/gpssync/plugin_gpssync.h
@@ -29,8 +29,8 @@
#include <libkipi/plugin.h>
-class KActionMenu;
-class KAction;
+class TDEActionMenu;
+class TDEAction;
class Plugin_GPSSync : public KIPI::Plugin
{
@@ -41,7 +41,7 @@ public:
Plugin_GPSSync(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:
@@ -58,8 +58,8 @@ private:
private:
- KActionMenu *m_action_geolocation;
- KAction *m_actionKMLExport;
+ TDEActionMenu *m_action_geolocation;
+ TDEAction *m_actionKMLExport;
KIPI::Interface *m_interface;
};
diff --git a/kipi-plugins/helloworld/plugin_helloworld.cpp b/kipi-plugins/helloworld/plugin_helloworld.cpp
index 236ad66..4775614 100644
--- a/kipi-plugins/helloworld/plugin_helloworld.cpp
+++ b/kipi-plugins/helloworld/plugin_helloworld.cpp
@@ -58,7 +58,7 @@ void Plugin_HelloWorld::setup( TQWidget* widget )
KIPI::Plugin::setup( widget );
// this is our action shown in the menubar/toolbar of the mainwindow
- m_actionHelloWorld = new KAction (i18n("Hello World..."),
+ m_actionHelloWorld = new TDEAction (i18n("Hello World..."),
"misc",
0, // do never set shortcuts from plugins.
this,
@@ -173,7 +173,7 @@ void Plugin_HelloWorld::slotActivate()
}
}
-KIPI::Category Plugin_HelloWorld::category( KAction* action ) const
+KIPI::Category Plugin_HelloWorld::category( TDEAction* action ) const
{
if ( action == m_actionHelloWorld )
return KIPI::IMAGESPLUGIN;
diff --git a/kipi-plugins/helloworld/plugin_helloworld.h b/kipi-plugins/helloworld/plugin_helloworld.h
index e601b4b..2873767 100644
--- a/kipi-plugins/helloworld/plugin_helloworld.h
+++ b/kipi-plugins/helloworld/plugin_helloworld.h
@@ -26,7 +26,7 @@
#include <libkipi/plugin.h>
-class KAction;
+class TDEAction;
class Plugin_HelloWorld : public KIPI::Plugin
{
@@ -43,7 +43,7 @@ public:
const char* name,
const TQStringList &args);
- virtual KIPI::Category category( KAction* action ) const;
+ virtual KIPI::Category category( TDEAction* action ) const;
virtual void setup( TQWidget* widget );
private slots:
@@ -52,7 +52,7 @@ private slots:
void slotActivate();
private:
- KAction *m_actionHelloWorld;
+ TDEAction *m_actionHelloWorld;
KIPI::Interface *m_interface;
};
diff --git a/kipi-plugins/htmlexport/plugin.cpp b/kipi-plugins/htmlexport/plugin.cpp
index 791c798..214cac2 100644
--- a/kipi-plugins/htmlexport/plugin.cpp
+++ b/kipi-plugins/htmlexport/plugin.cpp
@@ -45,7 +45,7 @@ namespace KIPIHTMLExport {
struct Plugin::Private {
- KAction* mAction;
+ TDEAction* mAction;
};
@@ -64,7 +64,7 @@ Plugin::~Plugin() {
void Plugin::setup( TQWidget* widget ) {
KIPI::Plugin::setup( widget );
- d->mAction = new KAction(i18n("HTML Gallery..."), "www", 0,
+ d->mAction = new TDEAction(i18n("HTML Gallery..."), "www", 0,
this, TQT_SLOT(slotActivate()),
actionCollection(), "htmlexport");
addAction(d->mAction);
@@ -100,7 +100,7 @@ void Plugin::slotActivate() {
}
-KIPI::Category Plugin::category(KAction* action) const {
+KIPI::Category Plugin::category(TDEAction* action) const {
if (action == d->mAction) {
return KIPI::EXPORTPLUGIN;
}
diff --git a/kipi-plugins/htmlexport/plugin.h b/kipi-plugins/htmlexport/plugin.h
index 343437a..8e88242 100644
--- a/kipi-plugins/htmlexport/plugin.h
+++ b/kipi-plugins/htmlexport/plugin.h
@@ -23,7 +23,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Cambridge, MA 02110-1301, USA
#include <libkipi/plugin.h>
-class KAction;
+class TDEAction;
namespace KIPIHTMLExport {
@@ -39,7 +39,7 @@ public:
Plugin(TQObject *parent, const char* name, const TQStringList &args);
virtual ~Plugin();
- KIPI::Category category( KAction* action ) const;
+ KIPI::Category category( TDEAction* action ) const;
virtual void setup( TQWidget* widget );
private slots:
diff --git a/kipi-plugins/htmlexport/themepage.ui b/kipi-plugins/htmlexport/themepage.ui
index ac89e30..e6e4963 100644
--- a/kipi-plugins/htmlexport/themepage.ui
+++ b/kipi-plugins/htmlexport/themepage.ui
@@ -19,7 +19,7 @@
<property name="margin">
<number>0</number>
</property>
- <widget class="KListBox">
+ <widget class="TDEListBox">
<property name="name">
<cstring>mThemeList</cstring>
</property>
diff --git a/kipi-plugins/htmlexport/wizard.cpp b/kipi-plugins/htmlexport/wizard.cpp
index c96cc1c..961714d 100644
--- a/kipi-plugins/htmlexport/wizard.cpp
+++ b/kipi-plugins/htmlexport/wizard.cpp
@@ -87,7 +87,7 @@ struct Wizard::Private {
TQMap<TQCString, TQWidget*> mThemeParameterWidgetFromName;
void initThemePage() {
- KListBox* listBox=mThemePage->mThemeList;
+ TDEListBox* listBox=mThemePage->mThemeList;
Theme::List list=Theme::getList();
Theme::List::Iterator it=list.begin(), end=list.end();
for (; it!=end; ++it) {
@@ -234,7 +234,7 @@ void Wizard::updateFinishButton() {
void Wizard::slotThemeSelectionChanged() {
- KListBox* listBox=d->mThemePage->mThemeList;
+ TDEListBox* listBox=d->mThemePage->mThemeList;
KTextBrowser* browser=d->mThemePage->mThemeInfo;
if (listBox->selectedItem()) {
Theme::Ptr theme=static_cast<ThemeListBoxItem*>(listBox->selectedItem())->mTheme;
diff --git a/kipi-plugins/imageviewer/plugin_viewer.cpp b/kipi-plugins/imageviewer/plugin_viewer.cpp
index 5e9b420..75378a0 100644
--- a/kipi-plugins/imageviewer/plugin_viewer.cpp
+++ b/kipi-plugins/imageviewer/plugin_viewer.cpp
@@ -56,7 +56,7 @@ void Plugin_viewer::setup( TQWidget* widget )
return;
}
- actionViewer = new KAction (i18n("Image Viewer"),
+ actionViewer = new TDEAction (i18n("Image Viewer"),
"ViewerWidget",
0, // do never set shortcuts from plugins.
this,
@@ -67,7 +67,7 @@ void Plugin_viewer::setup( TQWidget* widget )
widget=0;
}
-KIPI::Category Plugin_viewer::category( KAction* action ) const
+KIPI::Category Plugin_viewer::category( TDEAction* action ) const
{
if ( action == actionViewer ) {
return KIPI::TOOLSPLUGIN;
diff --git a/kipi-plugins/imageviewer/plugin_viewer.h b/kipi-plugins/imageviewer/plugin_viewer.h
index 98b296b..2d14fac 100644
--- a/kipi-plugins/imageviewer/plugin_viewer.h
+++ b/kipi-plugins/imageviewer/plugin_viewer.h
@@ -27,7 +27,7 @@
#include "viewerwidget.h"
-class KAction;
+class TDEAction;
/**
* @short integration with KIPI
@@ -42,11 +42,11 @@ class Plugin_viewer :public KIPI::Plugin
public:
Plugin_viewer( TQObject *parent, const char* name, const TQStringList& );
virtual void setup( TQWidget* widget );
- virtual KIPI::Category category( KAction* action ) const;
+ virtual KIPI::Category category( TDEAction* action ) const;
protected:
KIPIviewer::ViewerWidget * widget;
- KAction * actionViewer;
+ TDEAction * actionViewer;
public slots:
void slotActivate();
diff --git a/kipi-plugins/ipodexport/imagelist.cpp b/kipi-plugins/ipodexport/imagelist.cpp
index f0bcfdc..33b0125 100644
--- a/kipi-plugins/ipodexport/imagelist.cpp
+++ b/kipi-plugins/ipodexport/imagelist.cpp
@@ -28,7 +28,7 @@ using namespace IpodExport;
/////////////////////////////////////////////////////////////////////////////////////////////
ImageList::ImageList( ListType type, TQWidget *parent, const char *name )
- : KListView( parent, name )
+ : TDEListView( parent, name )
, m_type( type )
{
if( type == ImageList::UploadType )
@@ -54,7 +54,7 @@ ImageList::ImageList( ListType type, TQWidget *parent, const char *name )
void
ImageList::viewportPaintEvent( TQPaintEvent *e )
{
- if( e ) KListView::viewportPaintEvent( e );
+ if( e ) TDEListView::viewportPaintEvent( e );
if( !childCount() && e )
{
diff --git a/kipi-plugins/ipodexport/imagelist.h b/kipi-plugins/ipodexport/imagelist.h
index 2fad675..6f24750 100644
--- a/kipi-plugins/ipodexport/imagelist.h
+++ b/kipi-plugins/ipodexport/imagelist.h
@@ -29,7 +29,7 @@
namespace IpodExport
{
-class ImageList : public KListView
+class ImageList : public TDEListView
{
Q_OBJECT
diff --git a/kipi-plugins/ipodexport/imagelistitem.h b/kipi-plugins/ipodexport/imagelistitem.h
index 8b9160a..fe57c84 100644
--- a/kipi-plugins/ipodexport/imagelistitem.h
+++ b/kipi-plugins/ipodexport/imagelistitem.h
@@ -25,12 +25,12 @@ extern "C" {
namespace IpodExport
{
- class ImageListItem : public KListViewItem
+ class ImageListItem : public TDEListViewItem
{
public:
ImageListItem( TQListView *parent, TQString const & pathSrc, TQString const & name )
- : KListViewItem( parent, TQString()/*set below*/, name )
+ : TDEListViewItem( parent, TQString()/*set below*/, name )
, m_pathSrc( pathSrc )
{
setText( 0, pathSrc.section('/', -2, -2) );
diff --git a/kipi-plugins/ipodexport/ipodexportdialog.h b/kipi-plugins/ipodexport/ipodexportdialog.h
index 64a9ca8..9e5e3d7 100644
--- a/kipi-plugins/ipodexport/ipodexportdialog.h
+++ b/kipi-plugins/ipodexport/ipodexportdialog.h
@@ -33,8 +33,8 @@ class TQPushButton;
class KComboBox;
class KFileItem;
class KLineEdit;
-class KListView;
-class KListViewItem;
+class TDEListView;
+class TDEListViewItem;
class KURL;
namespace IpodExport
@@ -119,7 +119,7 @@ class UploadDialog : public KDialogBase
TQPushButton *m_remImagesButton;
TQPushButton *m_transferImagesButton;
ImageList *m_uploadList;
- KListView *m_ipodAlbumList;
+ TDEListView *m_ipodAlbumList;
TQLabel *m_imagePreview;
TQLabel *m_ipodPreview;
diff --git a/kipi-plugins/ipodexport/ipodlistitem.cpp b/kipi-plugins/ipodexport/ipodlistitem.cpp
index 3af8422..6f7c062 100644
--- a/kipi-plugins/ipodexport/ipodlistitem.cpp
+++ b/kipi-plugins/ipodexport/ipodlistitem.cpp
@@ -23,7 +23,7 @@ using namespace IpodExport;
////////////////////////////////////////////
IpodAlbumItem::IpodAlbumItem( TQListView *parent, TQListViewItem *after, Itdb_PhotoAlbum *pa )
- : KListViewItem( parent, after )
+ : TDEListViewItem( parent, after )
, m_photoAlbum( pa )
{
// don't use setName, as it writes to the ipod
@@ -57,7 +57,7 @@ void IpodAlbumItem::setName( const TQString & name )
IpodPhotoItem::IpodPhotoItem( IpodAlbumItem *parent, IpodPhotoItem *after,
Itdb_Artwork *art )
- : KListViewItem( parent, after )
+ : TDEListViewItem( parent, after )
, m_artwork( art )
{
}
diff --git a/kipi-plugins/ipodexport/ipodlistitem.h b/kipi-plugins/ipodexport/ipodlistitem.h
index 04dfab1..4111ad5 100644
--- a/kipi-plugins/ipodexport/ipodlistitem.h
+++ b/kipi-plugins/ipodexport/ipodlistitem.h
@@ -23,7 +23,7 @@ extern "C" {
namespace IpodExport
{
- class IpodAlbumItem : public KListViewItem
+ class IpodAlbumItem : public TDEListViewItem
{
public:
IpodAlbumItem( TQListView *parent, TQListViewItem *after, Itdb_PhotoAlbum *pa );
@@ -39,7 +39,7 @@ namespace IpodExport
Itdb_PhotoAlbum *m_photoAlbum;
};
- class IpodPhotoItem : public KListViewItem
+ class IpodPhotoItem : public TDEListViewItem
{
public:
IpodPhotoItem( IpodAlbumItem *parent, IpodPhotoItem *after, Itdb_Artwork *art );
diff --git a/kipi-plugins/ipodexport/plugin_ipodexport.cpp b/kipi-plugins/ipodexport/plugin_ipodexport.cpp
index fcf8df2..0892d19 100644
--- a/kipi-plugins/ipodexport/plugin_ipodexport.cpp
+++ b/kipi-plugins/ipodexport/plugin_ipodexport.cpp
@@ -49,7 +49,7 @@ void Plugin_iPodExport::setup( TQWidget* widget )
KIPI::Plugin::setup( widget );
// this is our action shown in the menubar/toolbar of the mainwindow
- m_actionImageUpload = new KAction( i18n( "Export to iPod..." ), "ipod_unmount", 0, this,
+ m_actionImageUpload = new TDEAction( i18n( "Export to iPod..." ), "ipod_unmount", 0, this,
TQT_SLOT( slotImageUpload() ), actionCollection(), "connectipod");
addAction( m_actionImageUpload );
@@ -57,7 +57,7 @@ void Plugin_iPodExport::setup( TQWidget* widget )
m_interface = dynamic_cast< KIPI::Interface* >( parent() );
}
-KIPI::Category Plugin_iPodExport::category( KAction* action ) const
+KIPI::Category Plugin_iPodExport::category( TDEAction* action ) const
{
if ( action == m_actionImageUpload )
return KIPI::EXPORTPLUGIN;
diff --git a/kipi-plugins/ipodexport/plugin_ipodexport.h b/kipi-plugins/ipodexport/plugin_ipodexport.h
index 098cd99..8456e04 100644
--- a/kipi-plugins/ipodexport/plugin_ipodexport.h
+++ b/kipi-plugins/ipodexport/plugin_ipodexport.h
@@ -17,7 +17,7 @@
#include <libkipi/plugin.h>
-class KAction;
+class TDEAction;
class Plugin_iPodExport : public KIPI::Plugin
{
@@ -28,14 +28,14 @@ public:
Plugin_iPodExport( TQObject *parent, const char* name, const TQStringList &args);
~Plugin_iPodExport() { }
- virtual KIPI::Category category( KAction* action ) const;
+ virtual KIPI::Category category( TDEAction* action ) const;
virtual void setup( TQWidget* widget );
private slots:
void slotImageUpload();
private:
- KAction *m_actionImageUpload;
+ TDEAction *m_actionImageUpload;
KIPI::Interface *m_interface;
};
diff --git a/kipi-plugins/jpeglossless/plugin_jpeglossless.cpp b/kipi-plugins/jpeglossless/plugin_jpeglossless.cpp
index 682e94b..af32080 100644
--- a/kipi-plugins/jpeglossless/plugin_jpeglossless.cpp
+++ b/kipi-plugins/jpeglossless/plugin_jpeglossless.cpp
@@ -79,26 +79,26 @@ void Plugin_JPEGLossless::setup( TQWidget* widget )
{
KIPI::Plugin::setup( widget );
- m_action_AutoExif = new KAction(i18n("Auto Rotate/Flip Using Exif Information"),
+ m_action_AutoExif = new TDEAction(i18n("Auto Rotate/Flip Using Exif Information"),
0, 0,
this,
TQT_SLOT(slotRotate()),
actionCollection(),
"rotate_exif");
- m_action_RotateImage = new KActionMenu(i18n("Rotate"),
+ m_action_RotateImage = new TDEActionMenu(i18n("Rotate"),
"rotate_cw",
actionCollection(),
"jpeglossless_rotate");
- m_action_RotateImage->insert( new KAction(i18n("Left"),
+ m_action_RotateImage->insert( new TDEAction(i18n("Left"),
"rotate_ccw",
SHIFT+CTRL+Key_Left,
this,
TQT_SLOT(slotRotate()),
actionCollection(),
"rotate_ccw") );
- m_action_RotateImage->insert( new KAction(i18n("Right"),
+ m_action_RotateImage->insert( new TDEAction(i18n("Right"),
"rotate_cw",
SHIFT+CTRL+Key_Right,
this,
@@ -106,12 +106,12 @@ void Plugin_JPEGLossless::setup( TQWidget* widget )
actionCollection(),
"rotate_cw") );
- m_action_FlipImage = new KActionMenu(i18n("Flip"),
+ m_action_FlipImage = new TDEActionMenu(i18n("Flip"),
"flip",
actionCollection(),
"jpeglossless_flip");
- m_action_FlipImage->insert( new KAction(i18n("Horizontally"),
+ m_action_FlipImage->insert( new TDEAction(i18n("Horizontally"),
0,
CTRL+Key_Asterisk,
this,
@@ -119,7 +119,7 @@ void Plugin_JPEGLossless::setup( TQWidget* widget )
actionCollection(),
"flip_horizontal") );
- m_action_FlipImage->insert( new KAction(i18n("Vertically"),
+ m_action_FlipImage->insert( new TDEAction(i18n("Vertically"),
0,
CTRL+Key_Slash,
this,
@@ -127,7 +127,7 @@ void Plugin_JPEGLossless::setup( TQWidget* widget )
actionCollection(),
"flip_vertical") );
- m_action_Convert2GrayScale = new KAction(i18n("Convert to Black && White"),
+ m_action_Convert2GrayScale = new TDEAction(i18n("Convert to Black && White"),
"grayscaleconvert",
0,
this,
@@ -467,7 +467,7 @@ void Plugin_JPEGLossless::customEvent(TQCustomEvent *event)
}
}
-KIPI::Category Plugin_JPEGLossless::category( KAction* action ) const
+KIPI::Category Plugin_JPEGLossless::category( TDEAction* action ) const
{
if (action == m_action_AutoExif)
return KIPI::IMAGESPLUGIN;
diff --git a/kipi-plugins/jpeglossless/plugin_jpeglossless.h b/kipi-plugins/jpeglossless/plugin_jpeglossless.h
index 84cb357..217697d 100644
--- a/kipi-plugins/jpeglossless/plugin_jpeglossless.h
+++ b/kipi-plugins/jpeglossless/plugin_jpeglossless.h
@@ -31,8 +31,8 @@
#include <libkipi/imagecollection.h>
class TQCustomEvent;
-class KActionMenu;
-class KAction;
+class TDEActionMenu;
+class TDEAction;
namespace KIPIJPEGLossLessPlugin
{
@@ -50,7 +50,7 @@ public:
Plugin_JPEGLossless(TQObject *parent, const char* name, const TQStringList &args);
~Plugin_JPEGLossless();
- virtual KIPI::Category category( KAction* action ) const;
+ virtual KIPI::Category category( TDEAction* action ) const;
virtual void setup( TQWidget* widget );
protected:
@@ -72,11 +72,11 @@ private:
int m_total;
int m_current;
- KAction *m_action_Convert2GrayScale;
- KAction *m_action_AutoExif;
+ TDEAction *m_action_Convert2GrayScale;
+ TDEAction *m_action_AutoExif;
- KActionMenu *m_action_RotateImage;
- KActionMenu *m_action_FlipImage;
+ TDEActionMenu *m_action_RotateImage;
+ TDEActionMenu *m_action_FlipImage;
KURL::List m_images;
diff --git a/kipi-plugins/kameraklient/camerafolderitem.cpp b/kipi-plugins/kameraklient/camerafolderitem.cpp
index 9f4c66c..2ca9d4b 100644
--- a/kipi-plugins/kameraklient/camerafolderitem.cpp
+++ b/kipi-plugins/kameraklient/camerafolderitem.cpp
@@ -27,14 +27,14 @@
namespace KIPIKameraKlientPlugin
{
-CameraFolderItem::CameraFolderItem(KListView* parent, const TQString& name) : KListViewItem(parent, name) {
+CameraFolderItem::CameraFolderItem(TDEListView* parent, const TQString& name) : TDEListViewItem(parent, name) {
setPixmap(0, SmallIcon("folder"));
virtualFolder_ = true;
count_ = 0;
name_ = name;
}
-CameraFolderItem::CameraFolderItem(KListViewItem* parent, const TQString& folderName, const TQString& folderPath) : KListViewItem(parent, folderName) {
+CameraFolderItem::CameraFolderItem(TDEListViewItem* parent, const TQString& folderName, const TQString& folderPath) : TDEListViewItem(parent, folderName) {
setPixmap(0, SmallIcon("folder"));
folderName_ = folderName;
folderPath_ = folderPath;
diff --git a/kipi-plugins/kameraklient/camerafolderitem.h b/kipi-plugins/kameraklient/camerafolderitem.h
index f3c88da..2c5cedb 100644
--- a/kipi-plugins/kameraklient/camerafolderitem.h
+++ b/kipi-plugins/kameraklient/camerafolderitem.h
@@ -28,10 +28,10 @@
namespace KIPIKameraKlientPlugin
{
-class CameraFolderItem : public KListViewItem {
+class CameraFolderItem : public TDEListViewItem {
public:
- CameraFolderItem(KListView* parent, const TQString& name);
- CameraFolderItem(KListViewItem* parent, const TQString& folderName, const TQString& folderPath);
+ CameraFolderItem(TDEListView* parent, const TQString& name);
+ CameraFolderItem(TDEListViewItem* parent, const TQString& folderName, const TQString& folderPath);
~CameraFolderItem();
TQString folderName();
TQString folderPath();
diff --git a/kipi-plugins/kameraklient/camerafolderview.cpp b/kipi-plugins/kameraklient/camerafolderview.cpp
index 6c8d48e..88d4ae2 100644
--- a/kipi-plugins/kameraklient/camerafolderview.cpp
+++ b/kipi-plugins/kameraklient/camerafolderview.cpp
@@ -29,7 +29,7 @@
namespace KIPIKameraKlientPlugin
{
-CameraFolderView::CameraFolderView(TQWidget* parent) : KListView(parent) {
+CameraFolderView::CameraFolderView(TQWidget* parent) : TDEListView(parent) {
addColumn(i18n("Camera Folders"));
setFullWidth(true);
setDragEnabled(false);
@@ -104,7 +104,7 @@ CameraFolderItem* CameraFolderView::rootFolder() {
}
void CameraFolderView::clear() {
- KListView::clear();
+ TDEListView::clear();
virtualFolder_ = 0;
rootFolder_ = 0;
emit signalCleared();
diff --git a/kipi-plugins/kameraklient/camerafolderview.h b/kipi-plugins/kameraklient/camerafolderview.h
index 5ec5553..2b10c5e 100644
--- a/kipi-plugins/kameraklient/camerafolderview.h
+++ b/kipi-plugins/kameraklient/camerafolderview.h
@@ -32,7 +32,7 @@ namespace KIPIKameraKlientPlugin
class CameraFolderItem;
-class CameraFolderView : public KListView {
+class CameraFolderView : public TDEListView {
Q_OBJECT
diff --git a/kipi-plugins/kameraklient/cameraui.cpp b/kipi-plugins/kameraklient/cameraui.cpp
index 0def156..55f3f5c 100644
--- a/kipi-plugins/kameraklient/cameraui.cpp
+++ b/kipi-plugins/kameraklient/cameraui.cpp
@@ -240,7 +240,7 @@ const CameraType* CameraUI::cameraType() {
}
void CameraUI::setupAccel() {
- mCameraUIAccel = new KAccel(this);
+ mCameraUIAccel = new TDEAccel(this);
mCameraUIAccel->insert("Select All", i18n("Select All"),
i18n("Select all the images from the camera."),
CTRL+Key_A, TQT_TQOBJECT(this), TQT_SLOT(slotSelectAll()));
diff --git a/kipi-plugins/kameraklient/cameraui.h b/kipi-plugins/kameraklient/cameraui.h
index bcfe148..f0d3206 100644
--- a/kipi-plugins/kameraklient/cameraui.h
+++ b/kipi-plugins/kameraklient/cameraui.h
@@ -46,12 +46,12 @@ class TQLineEdit;
class TQPushButton;
class TQSplitter;
-class KAccel;
+class TDEAccel;
class KComboBox;
class KDirLister;
class KProgress;
class KStatusBar;
-class KToggleAction;
+class TDEToggleAction;
@@ -151,9 +151,9 @@ private:
TQPushButton *mChangeDownloadDirectoryBtn;
TQPushButton *mhelpButton;
- KAccel *mCameraUIAccel;
+ TDEAccel *mCameraUIAccel;
- KToggleAction *mCameraConnectAction;
+ TDEToggleAction *mCameraConnectAction;
CameraType *mCameraType;
diff --git a/kipi-plugins/kameraklient/kameraklient.cpp b/kipi-plugins/kameraklient/kameraklient.cpp
index 597d176..645d30f 100644
--- a/kipi-plugins/kameraklient/kameraklient.cpp
+++ b/kipi-plugins/kameraklient/kameraklient.cpp
@@ -49,9 +49,9 @@ Plugin_KameraKlient::~Plugin_KameraKlient() {
void Plugin_KameraKlient::setup(TQWidget* widget) {
KIPI::Plugin::setup(widget);
- mKameraKlientAction = new KAction(i18n("Digital Camera"),
+ mKameraKlientAction = new TDEAction(i18n("Digital Camera"),
"camera_unmount",
- KShortcut(),
+ TDEShortcut(),
this,
TQT_SLOT(slotActivate()),
actionCollection(),
@@ -64,7 +64,7 @@ void Plugin_KameraKlient::slotActivate() {
mCameraUI->show();
}
-KIPI::Category Plugin_KameraKlient::category(KAction* action) const {
+KIPI::Category Plugin_KameraKlient::category(TDEAction* action) const {
if (action==mKameraKlientAction) {
return KIPI::IMPORTPLUGIN;
}
diff --git a/kipi-plugins/kameraklient/kameraklient.h b/kipi-plugins/kameraklient/kameraklient.h
index 2943ce1..f2ee98c 100644
--- a/kipi-plugins/kameraklient/kameraklient.h
+++ b/kipi-plugins/kameraklient/kameraklient.h
@@ -38,11 +38,11 @@ public:
Plugin_KameraKlient(TQObject *parent, const char* name, const TQStringList& args);
~Plugin_KameraKlient();
virtual void setup(TQWidget* widget);
- virtual KIPI::Category category(KAction*) const;
+ virtual KIPI::Category category(TDEAction*) const;
TQString id() const {
return TQString::fromLatin1("kameraklient");
}
- KAction* mKameraKlientAction;
+ TDEAction* mKameraKlientAction;
protected slots:
void slotActivate();
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;
};
diff --git a/kipi-plugins/mpegencoder/kimg2mpg.cpp b/kipi-plugins/mpegencoder/kimg2mpg.cpp
index 9980597..2471bd6 100644
--- a/kipi-plugins/mpegencoder/kimg2mpg.cpp
+++ b/kipi-plugins/mpegencoder/kimg2mpg.cpp
@@ -130,7 +130,7 @@ private:
/////////////////////////////////////////////////////////////////////////////////////////////
ListImageItems::ListImageItems(TQWidget *parent, const char *name)
- : KListBox(parent, name)
+ : TDEListBox(parent, name)
{
setSelectionMode (TQListBox::Extended);
setAcceptDrops(true);
diff --git a/kipi-plugins/mpegencoder/kimg2mpg.h b/kipi-plugins/mpegencoder/kimg2mpg.h
index 9d1f177..c807389 100644
--- a/kipi-plugins/mpegencoder/kimg2mpg.h
+++ b/kipi-plugins/mpegencoder/kimg2mpg.h
@@ -63,7 +63,7 @@ class TDEProcess;
class KLineEdit;
class KIconLoader;
class KColorButton;
-class KListBox;
+class TDEListBox;
class KButtonBox;
class KProgress;
class KURL::List;
@@ -74,7 +74,7 @@ namespace KIPIMPEGEncoderPlugin
class KShowDebuggingOutput;
class OptionsDialog;
-class ListImageItems : public KListBox
+class ListImageItems : public TDEListBox
{
Q_OBJECT
diff --git a/kipi-plugins/mpegencoder/plugin_mpegencoder.cpp b/kipi-plugins/mpegencoder/plugin_mpegencoder.cpp
index fe8732b..c8321c9 100644
--- a/kipi-plugins/mpegencoder/plugin_mpegencoder.cpp
+++ b/kipi-plugins/mpegencoder/plugin_mpegencoder.cpp
@@ -59,7 +59,7 @@ void Plugin_Mpegencoder::setup( TQWidget* widget )
{
KIPI::Plugin::setup( widget );
- m_actionMPEGEncoder = new KAction (i18n("Create MPEG Slide Show..."),
+ m_actionMPEGEncoder = new TDEAction (i18n("Create MPEG Slide Show..."),
"video",
0,
this,
@@ -109,7 +109,7 @@ void Plugin_Mpegencoder::slotActivate()
MPEGconverterDialog->addItems( images.images().toStringList());
}
-KIPI::Category Plugin_Mpegencoder::category( KAction* action ) const
+KIPI::Category Plugin_Mpegencoder::category( TDEAction* action ) const
{
if ( action == m_actionMPEGEncoder )
return KIPI::EXPORTPLUGIN;
diff --git a/kipi-plugins/mpegencoder/plugin_mpegencoder.h b/kipi-plugins/mpegencoder/plugin_mpegencoder.h
index a255702..16b9c58 100644
--- a/kipi-plugins/mpegencoder/plugin_mpegencoder.h
+++ b/kipi-plugins/mpegencoder/plugin_mpegencoder.h
@@ -26,7 +26,7 @@
#include <libkipi/plugin.h>
-class KAction;
+class TDEAction;
class Plugin_Mpegencoder : public KIPI::Plugin
{
@@ -37,7 +37,7 @@ public:
Plugin_Mpegencoder(TQObject *parent, const char* name, const TQStringList &args);
virtual ~Plugin_Mpegencoder();
- virtual KIPI::Category category( KAction* action ) const;
+ virtual KIPI::Category category( TDEAction* action ) const;
virtual void setup( TQWidget* widget );
public slots:
@@ -45,7 +45,7 @@ public slots:
void slotActivate();
private:
- KAction* m_actionMPEGEncoder;
+ TDEAction* m_actionMPEGEncoder;
};
diff --git a/kipi-plugins/picasawebexport/plugin_picasawebexport.cpp b/kipi-plugins/picasawebexport/plugin_picasawebexport.cpp
index 541877a..512a232 100644
--- a/kipi-plugins/picasawebexport/plugin_picasawebexport.cpp
+++ b/kipi-plugins/picasawebexport/plugin_picasawebexport.cpp
@@ -63,7 +63,7 @@ void Plugin_PicasawebExport::setup(TQWidget* widget)
{
KIPI::Plugin::setup(widget);
- m_action = new KAction(i18n("Export to Picasaweb..."),
+ m_action = new TDEAction(i18n("Export to Picasaweb..."),
"www",
0,
this,
@@ -104,7 +104,7 @@ void Plugin_PicasawebExport::slotActivate()
m_dlg->show();
}
-KIPI::Category Plugin_PicasawebExport::category( KAction* action ) const
+KIPI::Category Plugin_PicasawebExport::category( TDEAction* action ) const
{
if (action == m_action)
return KIPI::EXPORTPLUGIN;
diff --git a/kipi-plugins/picasawebexport/plugin_picasawebexport.h b/kipi-plugins/picasawebexport/plugin_picasawebexport.h
index bf78a8c..584e25a 100644
--- a/kipi-plugins/picasawebexport/plugin_picasawebexport.h
+++ b/kipi-plugins/picasawebexport/plugin_picasawebexport.h
@@ -31,7 +31,7 @@
#include "picasawebwindow.h"
-class KAction;
+class TDEAction;
using namespace KIPIPicasawebExportPlugin;
@@ -45,7 +45,7 @@ public:
Plugin_PicasawebExport(TQObject *parent, const char* name, const TQStringList &args);
~Plugin_PicasawebExport();
- virtual KIPI::Category category(KAction* action) const;
+ virtual KIPI::Category category(TDEAction* action) const;
virtual void setup(TQWidget*);
public slots:
@@ -55,7 +55,7 @@ public slots:
private:
PicasawebWindow *m_dlg;
- KAction *m_action;
+ TDEAction *m_action;
};
#endif // PLUGIN_PICASAWEBEXPORT_H
diff --git a/kipi-plugins/printwizard/frmprintwizardbase.ui b/kipi-plugins/printwizard/frmprintwizardbase.ui
index 93a1f13..6b71b62 100644
--- a/kipi-plugins/printwizard/frmprintwizardbase.ui
+++ b/kipi-plugins/printwizard/frmprintwizardbase.ui
@@ -533,7 +533,7 @@ Click the 'Next' button to begin.</string>
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="KFontCombo">
+ <widget class="TDEFontCombo">
<property name="name">
<cstring>m_font_name</cstring>
</property>
@@ -979,7 +979,7 @@ Click the 'Next' button to begin.</string>
<string>Select the photo size to print</string>
</property>
</widget>
- <widget class="KListBox">
+ <widget class="TDEListBox">
<item>
<property name="text">
<string>Photo Sizes</string>
diff --git a/kipi-plugins/printwizard/plugin_printwizard.cpp b/kipi-plugins/printwizard/plugin_printwizard.cpp
index 62658ad..9271d4b 100644
--- a/kipi-plugins/printwizard/plugin_printwizard.cpp
+++ b/kipi-plugins/printwizard/plugin_printwizard.cpp
@@ -64,7 +64,7 @@ void Plugin_PrintWizard::setup( TQWidget* widget )
{
KIPI::Plugin::setup( widget );
- m_printAction = new KAction (i18n("Print Wizard..."),
+ m_printAction = new TDEAction (i18n("Print Wizard..."),
"fileprint",
CTRL+Key_P,
this,
@@ -117,7 +117,7 @@ void Plugin_PrintWizard::slotActivate()
frm.exec();
}
-KIPI::Category Plugin_PrintWizard::category( KAction* action ) const
+KIPI::Category Plugin_PrintWizard::category( TDEAction* action ) const
{
if ( action == m_printAction )
return KIPI::IMAGESPLUGIN;
diff --git a/kipi-plugins/printwizard/plugin_printwizard.h b/kipi-plugins/printwizard/plugin_printwizard.h
index 1254209..d2a9365 100644
--- a/kipi-plugins/printwizard/plugin_printwizard.h
+++ b/kipi-plugins/printwizard/plugin_printwizard.h
@@ -25,7 +25,7 @@
#include <libkipi/plugin.h>
-class KAction;
+class TDEAction;
class Plugin_PrintWizard : public KIPI::Plugin
{
@@ -38,7 +38,7 @@ public:
const char* name,
const TQStringList &args);
~Plugin_PrintWizard();
- virtual KIPI::Category category( KAction* action ) const;
+ virtual KIPI::Category category( TDEAction* action ) const;
virtual void setup( TQWidget* widget );
public slots:
@@ -46,7 +46,7 @@ public slots:
void slotActivate();
private:
- KAction *m_printAction;
+ TDEAction *m_printAction;
KIPI::Interface *m_interface;
};
diff --git a/kipi-plugins/rawconverter/batchdialog.cpp b/kipi-plugins/rawconverter/batchdialog.cpp
index a5e4c68..a5e0c9d 100644
--- a/kipi-plugins/rawconverter/batchdialog.cpp
+++ b/kipi-plugins/rawconverter/batchdialog.cpp
@@ -96,7 +96,7 @@ BatchDialog::BatchDialog(TQWidget* /*parent*/)
//---------------------------------------------
- m_listView = new KListView(m_page);
+ m_listView = new TDEListView(m_page);
m_listView->addColumn( i18n("Thumbnail") );
m_listView->addColumn( i18n("Raw File") );
m_listView->addColumn( i18n("Target File") );
diff --git a/kipi-plugins/rawconverter/batchdialog.h b/kipi-plugins/rawconverter/batchdialog.h
index 63493ea..3f2c6d1 100644
--- a/kipi-plugins/rawconverter/batchdialog.h
+++ b/kipi-plugins/rawconverter/batchdialog.h
@@ -42,7 +42,7 @@ class TQWidget;
class TQCustomEvent;
class TQCloseEvent;
-class KListView;
+class TDEListView;
class KProgress;
namespace KDcrawIface
@@ -113,7 +113,7 @@ private:
KProgress *m_progressBar;
- KListView *m_listView;
+ TDEListView *m_listView;
RawItem *m_currentConvertItem;
diff --git a/kipi-plugins/rawconverter/clistviewitem.h b/kipi-plugins/rawconverter/clistviewitem.h
index 3473a1d..739f105 100644
--- a/kipi-plugins/rawconverter/clistviewitem.h
+++ b/kipi-plugins/rawconverter/clistviewitem.h
@@ -50,7 +50,7 @@ struct RawItem
CListViewItem *viewItem;
};
-class CListViewItem : public KListViewItem
+class CListViewItem : public TDEListViewItem
{
public:
@@ -59,9 +59,9 @@ public:
public:
- CListViewItem(KListView *view, const TQPixmap& pixmap,
+ CListViewItem(TDEListView *view, const TQPixmap& pixmap,
RawItem *item, TQListViewItem *after)
- : KListViewItem(view, after), rawItem(item)
+ : TDEListViewItem(view, after), rawItem(item)
{
rawItem->viewItem = this;
setThumbnail(pixmap);
@@ -94,14 +94,14 @@ protected:
{
if (m_enabled)
{
- KListViewItem::paintCell(p, cg, column, width, alignment);
+ TDEListViewItem::paintCell(p, cg, column, width, alignment);
}
else
{
TQColorGroup _cg( cg );
TQColor c = _cg.text();
_cg.setColor( TQColorGroup::Text, TQt::gray );
- KListViewItem::paintCell( p, _cg, column, width, alignment );
+ TDEListViewItem::paintCell( p, _cg, column, width, alignment );
_cg.setColor( TQColorGroup::Text, c );
}
}
diff --git a/kipi-plugins/rawconverter/plugin_rawconverter.cpp b/kipi-plugins/rawconverter/plugin_rawconverter.cpp
index ee25184..ea6f894 100644
--- a/kipi-plugins/rawconverter/plugin_rawconverter.cpp
+++ b/kipi-plugins/rawconverter/plugin_rawconverter.cpp
@@ -81,7 +81,7 @@ Plugin_RawConverter::Plugin_RawConverter(TQObject *parent, const char*, const TQ
void Plugin_RawConverter::setup( TQWidget* widget )
{
KIPI::Plugin::setup( widget );
- singleAction_ = new KAction (i18n("Raw Image Converter..."),
+ singleAction_ = new TDEAction (i18n("Raw Image Converter..."),
"rawconvertersingle",
0,
this,
@@ -89,7 +89,7 @@ void Plugin_RawConverter::setup( TQWidget* widget )
actionCollection(),
"raw_converter_single");
- batchAction_ = new KAction (i18n("Batch Raw Converter..."),
+ batchAction_ = new TDEAction (i18n("Batch Raw Converter..."),
"rawconverterbatch",
0,
this,
@@ -213,7 +213,7 @@ void Plugin_RawConverter::slotActivateBatch()
converter->show();
}
-KIPI::Category Plugin_RawConverter::category( KAction* action ) const
+KIPI::Category Plugin_RawConverter::category( TDEAction* action ) const
{
if ( action == singleAction_ )
return KIPI::TOOLSPLUGIN;
diff --git a/kipi-plugins/rawconverter/plugin_rawconverter.h b/kipi-plugins/rawconverter/plugin_rawconverter.h
index 2765415..d4b30db 100644
--- a/kipi-plugins/rawconverter/plugin_rawconverter.h
+++ b/kipi-plugins/rawconverter/plugin_rawconverter.h
@@ -29,7 +29,7 @@
#include <libkipi/plugin.h>
-class KAction;
+class TDEAction;
class Plugin_RawConverter : public KIPI::Plugin
{
@@ -43,7 +43,7 @@ public:
const TQStringList &args);
~Plugin_RawConverter();
- KIPI::Category category( KAction* action ) const;
+ KIPI::Category category( TDEAction* action ) const;
virtual void setup( TQWidget* widget );
private:
@@ -58,8 +58,8 @@ private slots:
private:
- KAction *singleAction_;
- KAction *batchAction_;
+ TDEAction *singleAction_;
+ TDEAction *batchAction_;
};
#endif /* PLUGIN_RAWCONVERTER_H */
diff --git a/kipi-plugins/sendimages/listimageserrordialog.cpp b/kipi-plugins/sendimages/listimageserrordialog.cpp
index 47db9af..d89ee69 100644
--- a/kipi-plugins/sendimages/listimageserrordialog.cpp
+++ b/kipi-plugins/sendimages/listimageserrordialog.cpp
@@ -63,7 +63,7 @@ listImagesErrorDialog::listImagesErrorDialog(TQWidget* parent, TQString Caption,
TQGridLayout* g1 = new TQGridLayout( v1, 1, 3 );
TQLabel *labelMess1 = new TQLabel ( Mess1, box);
- m_listFiles = new KListView( box );
+ m_listFiles = new TDEListView( box );
m_listFiles->addColumn(i18n("Image File Name"));
m_listFiles->addColumn(i18n("From Album"));
m_listFiles->setSorting(1);
@@ -77,7 +77,7 @@ listImagesErrorDialog::listImagesErrorDialog(TQWidget* parent, TQString Caption,
for ( KURL::List::Iterator it = ListOfiles.begin() ; it != ListOfiles.end() ; ++it )
{
- new KListViewItem( m_listFiles,
+ new TDEListViewItem( m_listFiles,
(*it).fileName(),
(*it).directory().section('/', -1) );
}
diff --git a/kipi-plugins/sendimages/listimageserrordialog.h b/kipi-plugins/sendimages/listimageserrordialog.h
index 2612963..515ccce 100644
--- a/kipi-plugins/sendimages/listimageserrordialog.h
+++ b/kipi-plugins/sendimages/listimageserrordialog.h
@@ -27,7 +27,7 @@
#include <kdialogbase.h>
-class KListView;
+class TDEListView;
class KURL::List;
namespace KIPISendimagesPlugin
@@ -48,7 +48,7 @@ public:
private:
- KListView *m_listFiles;
+ TDEListView *m_listFiles;
};
} // NameSpace KIPISendimagesPlugin
diff --git a/kipi-plugins/sendimages/plugin_sendimages.cpp b/kipi-plugins/sendimages/plugin_sendimages.cpp
index b92ff06..96d5f85 100644
--- a/kipi-plugins/sendimages/plugin_sendimages.cpp
+++ b/kipi-plugins/sendimages/plugin_sendimages.cpp
@@ -73,7 +73,7 @@ void Plugin_SendImages::setup( TQWidget* widget )
{
KIPI::Plugin::setup( widget );
- m_action_sendimages = new KAction (i18n("Email Images..."), // Menu message.
+ m_action_sendimages = new TDEAction (i18n("Email Images..."), // Menu message.
"mail_new", // Menu icon.
0,
this,
@@ -282,7 +282,7 @@ void Plugin_SendImages::customEvent(TQCustomEvent *event)
delete d;
}
-KIPI::Category Plugin_SendImages::category( KAction* action ) const
+KIPI::Category Plugin_SendImages::category( TDEAction* action ) const
{
if ( action == m_action_sendimages )
return KIPI::IMAGESPLUGIN;
diff --git a/kipi-plugins/sendimages/plugin_sendimages.h b/kipi-plugins/sendimages/plugin_sendimages.h
index b1c6fb8..d56c138 100644
--- a/kipi-plugins/sendimages/plugin_sendimages.h
+++ b/kipi-plugins/sendimages/plugin_sendimages.h
@@ -29,7 +29,7 @@
class TQCustomEvent;
-class KAction;
+class TDEAction;
class KIPISendimagesPlugin::SendImages;
namespace KIPI
@@ -47,7 +47,7 @@ public:
Plugin_SendImages(TQObject *parent, const char* name, const TQStringList &args);
~Plugin_SendImages();
- virtual KIPI::Category category( KAction* action ) const;
+ virtual KIPI::Category category( TDEAction* action ) const;
virtual void setup( TQWidget* );
public slots:
@@ -65,7 +65,7 @@ private:
int m_current;
int m_total;
- KAction *m_action_sendimages;
+ TDEAction *m_action_sendimages;
KIPI::BatchProgressDialog *m_progressDlg;
diff --git a/kipi-plugins/sendimages/sendimagesdialog.cpp b/kipi-plugins/sendimages/sendimagesdialog.cpp
index 9acf5ce..ca54701 100644
--- a/kipi-plugins/sendimages/sendimagesdialog.cpp
+++ b/kipi-plugins/sendimages/sendimagesdialog.cpp
@@ -98,7 +98,7 @@ private:
};
ListImageItems::ListImageItems(TQWidget *parent, const char *name)
- : KListBox(parent, name)
+ : TDEListBox(parent, name)
{
setSelectionMode (TQListBox::Extended);
setAcceptDrops(true);
diff --git a/kipi-plugins/sendimages/sendimagesdialog.h b/kipi-plugins/sendimages/sendimagesdialog.h
index 46cb12b..a3dc148 100644
--- a/kipi-plugins/sendimages/sendimagesdialog.h
+++ b/kipi-plugins/sendimages/sendimagesdialog.h
@@ -55,14 +55,14 @@ class TQFileInfo;
class KFileItem;
class KIntNumInput;
-class KListBox;
+class TDEListBox;
class KSqueezedTextLabel;
class KURLRequester;
namespace KIPISendimagesPlugin
{
-class ListImageItems : public KListBox
+class ListImageItems : public TDEListBox
{
Q_OBJECT
diff --git a/kipi-plugins/simpleviewerexport/plugin_simpleviewer.cpp b/kipi-plugins/simpleviewerexport/plugin_simpleviewer.cpp
index 7fd1423..83c7d84 100644
--- a/kipi-plugins/simpleviewerexport/plugin_simpleviewer.cpp
+++ b/kipi-plugins/simpleviewerexport/plugin_simpleviewer.cpp
@@ -54,7 +54,7 @@ void Plugin_SimpleViewer::setup( TQWidget* widget )
{
KIPI::Plugin::setup( widget );
- m_actionSimpleViewer = new KAction (i18n("Flash Export..."),
+ m_actionSimpleViewer = new TDEAction (i18n("Flash Export..."),
"www",
0,
this,
@@ -72,7 +72,7 @@ void Plugin_SimpleViewer::setup( TQWidget* widget )
}
}
-KIPI::Category Plugin_SimpleViewer::category( KAction* action ) const
+KIPI::Category Plugin_SimpleViewer::category( TDEAction* action ) const
{
if ( action == m_actionSimpleViewer )
return KIPI::EXPORTPLUGIN;
diff --git a/kipi-plugins/simpleviewerexport/plugin_simpleviewer.h b/kipi-plugins/simpleviewerexport/plugin_simpleviewer.h
index 3f79d0d..031c4aa 100644
--- a/kipi-plugins/simpleviewerexport/plugin_simpleviewer.h
+++ b/kipi-plugins/simpleviewerexport/plugin_simpleviewer.h
@@ -28,7 +28,7 @@
#include <libkipi/plugin.h>
-class KAction;
+class TDEAction;
class Plugin_SimpleViewer : public KIPI::Plugin
{
@@ -39,7 +39,7 @@ public:
Plugin_SimpleViewer(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* widget );
private slots:
@@ -48,7 +48,7 @@ private slots:
private:
- KAction *m_actionSimpleViewer;
+ TDEAction *m_actionSimpleViewer;
KIPI::Interface *m_interface;
};
diff --git a/kipi-plugins/slideshow/listimageitems.cpp b/kipi-plugins/slideshow/listimageitems.cpp
index 32575a6..5fd3b7a 100644
--- a/kipi-plugins/slideshow/listimageitems.cpp
+++ b/kipi-plugins/slideshow/listimageitems.cpp
@@ -44,7 +44,7 @@ namespace KIPISlideShowPlugin
{
ListImageItems::ListImageItems(TQWidget *parent, const char *name)
- : KListBox(parent, name)
+ : TDEListBox(parent, name)
{
setSelectionMode (TQListBox::Extended);
setAcceptDrops(true);
diff --git a/kipi-plugins/slideshow/listimageitems.h b/kipi-plugins/slideshow/listimageitems.h
index 2103368..20a6641 100644
--- a/kipi-plugins/slideshow/listimageitems.h
+++ b/kipi-plugins/slideshow/listimageitems.h
@@ -61,7 +61,7 @@ private:
TQString _album;
};
-class ListImageItems : public KListBox
+class ListImageItems : public TDEListBox
{
Q_OBJECT
diff --git a/kipi-plugins/slideshow/plugin_slideshow.cpp b/kipi-plugins/slideshow/plugin_slideshow.cpp
index a823380..398b60a 100644
--- a/kipi-plugins/slideshow/plugin_slideshow.cpp
+++ b/kipi-plugins/slideshow/plugin_slideshow.cpp
@@ -80,7 +80,7 @@ void Plugin_SlideShow::setup( TQWidget* widget )
{
KIPI::Plugin::setup( widget );
- m_actionSlideShow = new KAction (i18n("Advanced SlideShow..."),
+ m_actionSlideShow = new TDEAction (i18n("Advanced SlideShow..."),
"slideshow",
0,
this,
@@ -257,7 +257,7 @@ void Plugin_SlideShow::slotSlideShow()
}
}
-KIPI::Category Plugin_SlideShow::category( KAction* action ) const
+KIPI::Category Plugin_SlideShow::category( TDEAction* action ) const
{
if ( action == m_actionSlideShow )
return KIPI::TOOLSPLUGIN;
diff --git a/kipi-plugins/slideshow/plugin_slideshow.h b/kipi-plugins/slideshow/plugin_slideshow.h
index b578716..e31a0a2 100644
--- a/kipi-plugins/slideshow/plugin_slideshow.h
+++ b/kipi-plugins/slideshow/plugin_slideshow.h
@@ -33,7 +33,7 @@
#include <libkipi/plugin.h>
#include <libkipi/interface.h>
-class KAction;
+class TDEAction;
class Plugin_SlideShow : public KIPI::Plugin
{
@@ -46,7 +46,7 @@ public:
const TQStringList &args);
~Plugin_SlideShow();
- virtual KIPI::Category category( KAction* action ) const;
+ virtual KIPI::Category category( TDEAction* action ) const;
virtual void setup( TQWidget* );
public slots:
@@ -60,7 +60,7 @@ private slots:
private:
- KAction* m_actionSlideShow;
+ TDEAction* m_actionSlideShow;
KIPI::Interface* m_interface;
KURL::List* m_urlList;
diff --git a/kipi-plugins/slideshow/slideshowconfigbase.ui b/kipi-plugins/slideshow/slideshowconfigbase.ui
index 6543def..bde38be 100644
--- a/kipi-plugins/slideshow/slideshowconfigbase.ui
+++ b/kipi-plugins/slideshow/slideshowconfigbase.ui
@@ -882,7 +882,7 @@ If you want to add some images, click on the 'Add' button or use the drag-and-dr
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="KFontChooser">
+ <widget class="TDEFontChooser">
<property name="name">
<cstring>m_commentsFontChooser</cstring>
</property>
diff --git a/kipi-plugins/sync/plugin_sync.cpp b/kipi-plugins/sync/plugin_sync.cpp
index 551a4b8..da687bd 100644
--- a/kipi-plugins/sync/plugin_sync.cpp
+++ b/kipi-plugins/sync/plugin_sync.cpp
@@ -74,7 +74,7 @@ void Plugin_Sync::setup(TQWidget* widget)
// Add our directory in to the icon loader dirs.
TDEGlobal::iconLoader()->addAppDir("kipiplugin_sync");
- mpActionSync = new KAction(i18n("Synchronize..."),
+ mpActionSync = new TDEAction(i18n("Synchronize..."),
0,
this,
TQT_SLOT(slotSync()),
@@ -83,7 +83,7 @@ void Plugin_Sync::setup(TQWidget* widget)
mpActionSync->setEnabled(true);
addAction(mpActionSync);
- mpActionConfigure = new KAction(i18n("Configure Synchronization..."),
+ mpActionConfigure = new TDEAction(i18n("Configure Synchronization..."),
0,
this,
TQT_SLOT(slotConfigure()),
@@ -92,7 +92,7 @@ void Plugin_Sync::setup(TQWidget* widget)
mpActionConfigure->setEnabled(true);
addAction(mpActionConfigure);
- mpActionSettingsCollection = new KAction(i18n("Synchronization Settings..."),
+ mpActionSettingsCollection = new TDEAction(i18n("Synchronization Settings..."),
0,
this,
TQT_SLOT(slotSettingsCollection()),
@@ -101,7 +101,7 @@ void Plugin_Sync::setup(TQWidget* widget)
mpActionSettingsCollection->setEnabled(true);
addAction(mpActionSettingsCollection);
- mpActionSettingsImage = new KAction(i18n("Synchronization Settings..."),
+ mpActionSettingsImage = new TDEAction(i18n("Synchronization Settings..."),
0,
this,
TQT_SLOT(slotSettingsImage()),
@@ -176,7 +176,7 @@ void Plugin_Sync::slotSettingsImage()
}
-KIPI::Category Plugin_Sync::category(KAction* pAction) const
+KIPI::Category Plugin_Sync::category(TDEAction* pAction) const
{
if (pAction == mpActionSync)
return KIPI::EXPORTPLUGIN;
diff --git a/kipi-plugins/sync/plugin_sync.h b/kipi-plugins/sync/plugin_sync.h
index b63e139..16f5809 100644
--- a/kipi-plugins/sync/plugin_sync.h
+++ b/kipi-plugins/sync/plugin_sync.h
@@ -24,7 +24,7 @@
#include <libkipi/plugin.h>
-class KAction;
+class TDEAction;
// Let this header know this exists (no need to load full definition)
namespace KIPISyncPlugin
@@ -44,7 +44,7 @@ public:
const TQStringList &rArgs);
~Plugin_Sync();
- virtual KIPI::Category category(KAction* pAction) const;
+ virtual KIPI::Category category(TDEAction* pAction) const;
virtual void setup(TQWidget* pWidget);
public slots:
@@ -59,11 +59,11 @@ private:
KIPISyncPlugin::Sinks* mpSinks;
- KAction* mpActionSync;
- KAction* mpActionConfigure;
+ TDEAction* mpActionSync;
+ TDEAction* mpActionConfigure;
- KAction* mpActionSettingsCollection;
- KAction* mpActionSettingsImage;
+ TDEAction* mpActionSettingsCollection;
+ TDEAction* mpActionSettingsImage;
};
#endif
diff --git a/kipi-plugins/timeadjust/plugin_timeadjust.cpp b/kipi-plugins/timeadjust/plugin_timeadjust.cpp
index e4c9009..c0a4ea8 100644
--- a/kipi-plugins/timeadjust/plugin_timeadjust.cpp
+++ b/kipi-plugins/timeadjust/plugin_timeadjust.cpp
@@ -58,7 +58,7 @@ void Plugin_TimeAdjust::setup(TQWidget* widget)
// this is our action shown in the menubar/toolbar of the mainwindow
- m_actionTimeAjust = new KAction (i18n("Adjust Time && Date..."),
+ m_actionTimeAjust = new TDEAction (i18n("Adjust Time && Date..."),
"clock",
0,
this,
@@ -96,7 +96,7 @@ void Plugin_TimeAdjust::slotActivate()
dlg.exec();
}
-KIPI::Category Plugin_TimeAdjust::category( KAction* action ) const
+KIPI::Category Plugin_TimeAdjust::category( TDEAction* action ) const
{
if ( action == m_actionTimeAjust )
return KIPI::IMAGESPLUGIN;
diff --git a/kipi-plugins/timeadjust/plugin_timeadjust.h b/kipi-plugins/timeadjust/plugin_timeadjust.h
index 0023bf1..bdea369 100644
--- a/kipi-plugins/timeadjust/plugin_timeadjust.h
+++ b/kipi-plugins/timeadjust/plugin_timeadjust.h
@@ -28,7 +28,7 @@
#include <libkipi/plugin.h>
-class KAction;
+class TDEAction;
class Plugin_TimeAdjust : public KIPI::Plugin
{
@@ -39,7 +39,7 @@ public:
Plugin_TimeAdjust(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:
@@ -48,7 +48,7 @@ protected slots:
private:
- KAction *m_actionTimeAjust;
+ TDEAction *m_actionTimeAjust;
KIPI::Interface *m_interface;
};
diff --git a/kipi-plugins/wallpaper/plugin_wallpaper.cpp b/kipi-plugins/wallpaper/plugin_wallpaper.cpp
index 64ab4d6..0acfdd8 100644
--- a/kipi-plugins/wallpaper/plugin_wallpaper.cpp
+++ b/kipi-plugins/wallpaper/plugin_wallpaper.cpp
@@ -66,53 +66,53 @@ void Plugin_WallPaper::setup( TQWidget* widget )
{
KIPI::Plugin::setup( widget );
- m_action_Background = new KActionMenu(i18n("&Set as Background"),
+ m_action_Background = new TDEActionMenu(i18n("&Set as Background"),
actionCollection(),
"images2desktop");
- m_action_Background->insert(new KAction (i18n("Centered"),
+ m_action_Background->insert(new TDEAction (i18n("Centered"),
0,
this,
TQT_SLOT(slotSetCenter()),
actionCollection(),
"images2desktop_center"));
- m_action_Background->insert(new KAction (i18n("Tiled"),
+ m_action_Background->insert(new TDEAction (i18n("Tiled"),
0,
this,
TQT_SLOT(slotSetTiled()),
actionCollection(),
"images2desktop_tiled"));
- m_action_Background->insert(new KAction (i18n("Centered Tiled"),
+ m_action_Background->insert(new TDEAction (i18n("Centered Tiled"),
0,
this,
TQT_SLOT(slotSetCenterTiled()),
actionCollection(),
"images2desktop_center_tiled"));
- m_action_Background->insert(new KAction (i18n("Centered Max-Aspect"),
+ m_action_Background->insert(new TDEAction (i18n("Centered Max-Aspect"),
0,
this,
TQT_SLOT(slotSetCenteredMaxpect()),
actionCollection(),
"images2desktop_center_maxpect"));
- m_action_Background->insert(new KAction (i18n("Tiled Max-Aspect"),
+ m_action_Background->insert(new TDEAction (i18n("Tiled Max-Aspect"),
0,
this,
TQT_SLOT(slotSetTiledMaxpect()),
actionCollection(),
"images2desktop_tiled_maxpect"));
- m_action_Background->insert(new KAction (i18n("Scaled"),
+ m_action_Background->insert(new TDEAction (i18n("Scaled"),
0,
this,
TQT_SLOT(slotSetScaled()),
actionCollection(),
"images2desktop_scaled"));
- m_action_Background->insert(new KAction (i18n("Centered Auto Fit"),
+ m_action_Background->insert(new TDEAction (i18n("Centered Auto Fit"),
0,
this,
TQT_SLOT(slotSetCenteredAutoFit()),
@@ -121,7 +121,7 @@ void Plugin_WallPaper::setup( TQWidget* widget )
//The Scale & crop code was available from Beta1 on
#if KDE_IS_VERSION(3,3,91)
- m_action_Background->insert(new KAction (i18n("Scale && Crop"),
+ m_action_Background->insert(new TDEAction (i18n("Scale && Crop"),
0,
this,
TQT_SLOT(slotSetScaleAndCrop()),
@@ -262,7 +262,7 @@ void Plugin_WallPaper::setWallpaper(int layout)
/////////////////////////////////////////////////////////////////////////////////////////////////////
-KIPI::Category Plugin_WallPaper::category( KAction* action ) const
+KIPI::Category Plugin_WallPaper::category( TDEAction* action ) const
{
if ( action == m_action_Background )
return KIPI::IMAGESPLUGIN;
diff --git a/kipi-plugins/wallpaper/plugin_wallpaper.h b/kipi-plugins/wallpaper/plugin_wallpaper.h
index 72c72e3..b5c1ad5 100644
--- a/kipi-plugins/wallpaper/plugin_wallpaper.h
+++ b/kipi-plugins/wallpaper/plugin_wallpaper.h
@@ -35,8 +35,8 @@
#include <libkipi/plugin.h>
- class KActionMenu;
- class KAction;
+ class TDEActionMenu;
+ class TDEAction;
class Plugin_WallPaper : public KIPI::Plugin
{
@@ -48,7 +48,7 @@
Plugin_WallPaper(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* );
private slots:
@@ -75,7 +75,7 @@
SCALE_AND_CROP = 8
};
- KActionMenu *m_action_Background;
+ TDEActionMenu *m_action_Background;
void setWallpaper( int layout );
};