summaryrefslogtreecommitdiffstats
path: root/konq-plugins
diff options
context:
space:
mode:
Diffstat (limited to 'konq-plugins')
-rw-r--r--konq-plugins/adblock/adblock.cpp2
-rw-r--r--konq-plugins/adblock/adblock.h4
-rw-r--r--konq-plugins/adblock/adblockdialogue.cpp2
-rw-r--r--konq-plugins/adblock/adblockdialogue.h4
-rw-r--r--konq-plugins/akregator/akregatorplugin.cpp2
-rw-r--r--konq-plugins/akregator/akregatorplugin.h2
-rw-r--r--konq-plugins/akregator/konqfeedicon.cpp2
-rw-r--r--konq-plugins/akregator/konqfeedicon.h2
-rw-r--r--konq-plugins/arkplugin/arkplugin.cpp38
-rw-r--r--konq-plugins/arkplugin/arkplugin.h6
-rw-r--r--konq-plugins/autorefresh/autorefresh.cpp2
-rw-r--r--konq-plugins/autorefresh/autorefresh.h2
-rw-r--r--konq-plugins/babelfish/plugin_babelfish.cpp84
-rw-r--r--konq-plugins/babelfish/plugin_babelfish.h16
-rw-r--r--konq-plugins/crashes/crashesplugin.cpp2
-rw-r--r--konq-plugins/crashes/crashesplugin.h4
-rw-r--r--konq-plugins/dirfilter/dirfilterplugin.cpp18
-rw-r--r--konq-plugins/dirfilter/dirfilterplugin.h4
-rw-r--r--konq-plugins/domtreeviewer/Makefile.am2
-rw-r--r--konq-plugins/domtreeviewer/domtreeview.h2
-rw-r--r--konq-plugins/domtreeviewer/domtreeviewbase.ui4
-rw-r--r--konq-plugins/domtreeviewer/domtreewindow.cpp24
-rw-r--r--konq-plugins/domtreeviewer/domtreewindow.h10
-rw-r--r--konq-plugins/domtreeviewer/plugin_domtreeviewer.cpp2
-rw-r--r--konq-plugins/fsview/fsview_part.cpp14
-rw-r--r--konq-plugins/fsview/fsview_part.h4
-rw-r--r--konq-plugins/kimgalleryplugin/imgallerydialog.cpp2
-rw-r--r--konq-plugins/kimgalleryplugin/imgalleryplugin.cpp2
-rw-r--r--konq-plugins/kuick/kdirmenu.cpp2
-rw-r--r--konq-plugins/kuick/kdirmenu.h4
-rw-r--r--konq-plugins/kuick/kmetamenu.cpp8
-rw-r--r--konq-plugins/kuick/kmetamenu.h4
-rw-r--r--konq-plugins/kuick/kuick_plugin.cpp2
-rw-r--r--konq-plugins/kuick/kuick_plugin.h4
-rw-r--r--konq-plugins/microformat/konqmficon.cpp2
-rw-r--r--konq-plugins/microformat/konqmficon.h2
-rw-r--r--konq-plugins/minitools/minitoolsplugin.cpp2
-rw-r--r--konq-plugins/minitools/minitoolsplugin.h4
-rw-r--r--konq-plugins/rellinks/TODO2
-rw-r--r--konq-plugins/rellinks/plugin_rellinks.cpp48
-rw-r--r--konq-plugins/rellinks/plugin_rellinks.h22
-rw-r--r--konq-plugins/rsync/rsyncplugin.cpp4
-rw-r--r--konq-plugins/rsync/rsyncplugin.h6
-rw-r--r--konq-plugins/searchbar/searchbar.cpp4
-rw-r--r--konq-plugins/searchbar/searchbar.h2
-rw-r--r--konq-plugins/sidebar/delicious/bookmarkListItem.cpp2
-rw-r--r--konq-plugins/sidebar/delicious/bookmarkListItem.h2
-rw-r--r--konq-plugins/sidebar/delicious/widget.ui2
-rw-r--r--konq-plugins/sidebar/mediaplayer/controls.cpp18
-rw-r--r--konq-plugins/sidebar/mediaplayer/controls.h4
-rw-r--r--konq-plugins/sidebar/metabar/src/configdialog.cpp4
-rw-r--r--konq-plugins/sidebar/metabar/src/configdialog.h4
-rw-r--r--konq-plugins/sidebar/metabar/src/metabarwidget.cpp6
-rw-r--r--konq-plugins/sidebar/metabar/src/metabarwidget.h2
-rw-r--r--konq-plugins/sidebar/metabar/src/serviceloader.cpp8
-rw-r--r--konq-plugins/sidebar/metabar/src/serviceloader.h2
-rw-r--r--konq-plugins/sidebar/newsticker/nspanel.cpp4
-rw-r--r--konq-plugins/sidebar/newsticker/nspanel.h2
-rw-r--r--konq-plugins/sidebar/newsticker/nsstacktabwidget.cpp4
-rw-r--r--konq-plugins/sidebar/newsticker/nsstacktabwidget.h4
-rw-r--r--konq-plugins/tdehtmlsettingsplugin/settingsplugin.cpp58
-rw-r--r--konq-plugins/uachanger/uachangerplugin.cpp4
-rw-r--r--konq-plugins/uachanger/uachangerplugin.h4
-rw-r--r--konq-plugins/validators/plugin_validators.cpp12
-rw-r--r--konq-plugins/validators/plugin_validators.h4
-rw-r--r--konq-plugins/webarchiver/archiveviewbase.ui2
-rw-r--r--konq-plugins/webarchiver/plugin_webarchiver.cpp2
67 files changed, 269 insertions, 269 deletions
diff --git a/konq-plugins/adblock/adblock.cpp b/konq-plugins/adblock/adblock.cpp
index 07dbede..f52fbc0 100644
--- a/konq-plugins/adblock/adblock.cpp
+++ b/konq-plugins/adblock/adblock.cpp
@@ -63,7 +63,7 @@ AdBlock::AdBlock(TQObject *parent, const char *name, const TQStringList &) :
m_part = dynamic_cast<TDEHTMLPart *>(parent);
if(!m_part) { kdDebug() << "couldn't get TDEHTMLPart" << endl; return; }
- m_menu = new KPopupMenu(m_part->widget());
+ m_menu = new TDEPopupMenu(m_part->widget());
m_menu->insertTitle(i18n("Adblock"));
m_menu->insertItem(i18n("Configure"), this, TQT_SLOT(showTDECModule()));
m_menu->insertItem(i18n("Show Elements"), this, TQT_SLOT(showDialogue()));
diff --git a/konq-plugins/adblock/adblock.h b/konq-plugins/adblock/adblock.h
index dbb4549..b6c2657 100644
--- a/konq-plugins/adblock/adblock.h
+++ b/konq-plugins/adblock/adblock.h
@@ -29,7 +29,7 @@ class TDEHTMLPart;
class KURLLabel;
class TDEHTMLSettings;
class AdElement;
-class KPopupMenu;
+class TDEPopupMenu;
namespace KParts
{
@@ -55,7 +55,7 @@ public:
private:
TQGuardedPtr<TDEHTMLPart> m_part;
KURLLabel *m_label;
- KPopupMenu *m_menu;
+ TDEPopupMenu *m_menu;
void fillBlockableElements(AdElementList &elements);
void fillWithImages(AdElementList &elements);
diff --git a/konq-plugins/adblock/adblockdialogue.cpp b/konq-plugins/adblock/adblockdialogue.cpp
index 1aff0f6..48c7090 100644
--- a/konq-plugins/adblock/adblockdialogue.cpp
+++ b/konq-plugins/adblock/adblockdialogue.cpp
@@ -71,7 +71,7 @@ AdBlockDlg::AdBlockDlg(TQWidget *parent, AdElementList &elements) :
connect(this, TQT_SIGNAL( okClicked() ), this, TQT_SLOT( validateFilter() ));
connect(m_list, TQT_SIGNAL( doubleClicked(TQListViewItem *, const TQPoint &, int) ), this, TQT_SLOT(updateFilter(TQListViewItem *)) );
- m_menu = new KPopupMenu(this);
+ m_menu = new TDEPopupMenu(this);
m_menu->insertItem(i18n("Filter this item"), this, TQT_SLOT(filterItem()));
m_menu->insertItem(i18n("Filter all items at same path"), this, TQT_SLOT(filterPath()));
diff --git a/konq-plugins/adblock/adblockdialogue.h b/konq-plugins/adblock/adblockdialogue.h
index 793b7c5..38ffca3 100644
--- a/konq-plugins/adblock/adblockdialogue.h
+++ b/konq-plugins/adblock/adblockdialogue.h
@@ -25,7 +25,7 @@
class TQLabel;
class TQLineEdit;
-class KPopupMenu;
+class TDEPopupMenu;
class AdBlockDlg : public KDialogBase
{
@@ -37,7 +37,7 @@ private:
TQListView *m_list;
TQLabel *m_label1;
TQLabel *m_label2;
- KPopupMenu *m_menu;
+ TDEPopupMenu *m_menu;
public:
AdBlockDlg(TQWidget *parent, AdElementList &elements);
diff --git a/konq-plugins/akregator/akregatorplugin.cpp b/konq-plugins/akregator/akregatorplugin.cpp
index f798a27..72a73d1 100644
--- a/konq-plugins/akregator/akregatorplugin.cpp
+++ b/konq-plugins/akregator/akregatorplugin.cpp
@@ -84,7 +84,7 @@ AkregatorMenu::AkregatorMenu( KonqPopupMenu * popupmenu, const char *name, const
if (isFeedUrl(it))
{
kdDebug() << "AkregatorMenu: found feed URL " << it->url().prettyURL() << endl;
- KAction *action = new KAction( i18n( "Add Feed to Akregator" ), "akregator", 0, this, TQT_SLOT( slotAddFeed() ), actionCollection(), "akregatorkonqplugin_mnu" );
+ TDEAction *action = new TDEAction( i18n( "Add Feed to Akregator" ), "akregator", 0, this, TQT_SLOT( slotAddFeed() ), actionCollection(), "akregatorkonqplugin_mnu" );
addAction( action );
addSeparator();
m_feedURL = it->url().url();
diff --git a/konq-plugins/akregator/akregatorplugin.h b/konq-plugins/akregator/akregatorplugin.h
index fd4267d..7f94cec 100644
--- a/konq-plugins/akregator/akregatorplugin.h
+++ b/konq-plugins/akregator/akregatorplugin.h
@@ -27,7 +27,7 @@
#include "pluginbase.h"
-class KAction;
+class TDEAction;
class TDEHTMLPart;
namespace Akregator
diff --git a/konq-plugins/akregator/konqfeedicon.cpp b/konq-plugins/akregator/konqfeedicon.cpp
index a888c6e..80e4224 100644
--- a/konq-plugins/akregator/konqfeedicon.cpp
+++ b/konq-plugins/akregator/konqfeedicon.cpp
@@ -123,7 +123,7 @@ bool KonqFeedIcon::feedFound()
void KonqFeedIcon::contextMenu()
{
delete m_menu;
- m_menu = new KPopupMenu(m_part->widget());
+ m_menu = new TDEPopupMenu(m_part->widget());
if(m_feedList.count() == 1) {
m_menu->insertTitle(m_feedList.first().title());
m_menu->insertItem(SmallIcon("bookmark_add"), i18n("Add Feed to Akregator"), this, TQT_SLOT(addFeeds()) );
diff --git a/konq-plugins/akregator/konqfeedicon.h b/konq-plugins/akregator/konqfeedicon.h
index d186e08..3b6b470 100644
--- a/konq-plugins/akregator/konqfeedicon.h
+++ b/konq-plugins/akregator/konqfeedicon.h
@@ -63,7 +63,7 @@ private:
KURLLabel *m_feedIcon;
KParts::StatusBarExtension *m_statusBarEx;
FeedDetectorEntryList m_feedList;
- TQGuardedPtr<KPopupMenu> m_menu;
+ TQGuardedPtr<TDEPopupMenu> m_menu;
private slots:
void waitPartToLoad();
diff --git a/konq-plugins/arkplugin/arkplugin.cpp b/konq-plugins/arkplugin/arkplugin.cpp
index 4bfc14b..9e812c3 100644
--- a/konq-plugins/arkplugin/arkplugin.cpp
+++ b/konq-plugins/arkplugin/arkplugin.cpp
@@ -87,33 +87,33 @@ ArkMenu::ArkMenu( KonqPopupMenu * popupmenu, const char *name, const TQStringLis
}
TQString ext;
- KActionMenu * actionMenu;
- KAction * action;
+ TDEActionMenu * actionMenu;
+ TDEAction * action;
if ( hasOther && itemList.first()->name()!="." && popupmenu->protocolInfo().supportsWriting() ) // don't try to compress if we right click on a folder without files selected
{
compMimeTypes();
- actionMenu = new KActionMenu( i18n( "Compress" ), "ark", actionCollection(), "ark_compress_menu" );
+ actionMenu = new TDEActionMenu( i18n( "Compress" ), "ark", actionCollection(), "ark_compress_menu" );
m_ext = m_conf->readEntry( "LastExtension", ".tar.gz" );
if ( itemCount == 1 )
{
item = itemList.first();
m_name = itemList.first()->name();
- action = new KAction( i18n( "Compress as %1" ).arg( m_name + m_ext ), 0, this,
+ action = new TDEAction( i18n( "Compress as %1" ).arg( m_name + m_ext ), 0, this,
TQT_SLOT( slotCompressAsDefault() ), actionCollection() );
}
else
{
- action = new KAction( KMimeType::mimeType( m_conf->readEntry(
+ action = new TDEAction( KMimeType::mimeType( m_conf->readEntry(
"LastMimeType", "application/x-tgz" ) )->comment(),
0, this, TQT_SLOT( slotCompressAsDefault() ), actionCollection() );
}
actionMenu->insert( action );
- m_compAsMenu = new KActionMenu( i18n( "Compress As" ), actionCollection(), "arkcmpasmnu" );
+ m_compAsMenu = new TDEActionMenu( i18n( "Compress As" ), actionCollection(), "arkcmpasmnu" );
actionMenu->insert( m_compAsMenu );
- m_addToMenu = new KActionMenu( i18n( "Add To" ), actionCollection(), "arkaddtomnu" );
+ m_addToMenu = new TDEActionMenu( i18n( "Add To" ), actionCollection(), "arkaddtomnu" );
if ( itemList.first()->url().isLocalFile() )
actionMenu->insert( m_addToMenu );
@@ -123,7 +123,7 @@ ArkMenu::ArkMenu( KonqPopupMenu * popupmenu, const char *name, const TQStringLis
this, TQT_SLOT( slotPrepareAddToMenu() ) );
- action = new KAction( i18n( "Add to Archive..." ), 0, this,
+ action = new TDEAction( i18n( "Add to Archive..." ), 0, this,
TQT_SLOT( slotAdd() ), actionCollection() );
actionMenu->insert( action );
addAction( actionMenu );
@@ -133,9 +133,9 @@ ArkMenu::ArkMenu( KonqPopupMenu * popupmenu, const char *name, const TQStringLis
{
if ( popupmenu->protocolInfo().supportsWriting() )
{
- actionMenu = new KActionMenu( i18n( "Extract" ), "ark", actionCollection(), "ark_extract_menu" );
+ actionMenu = new TDEActionMenu( i18n( "Extract" ), "ark", actionCollection(), "ark_extract_menu" );
- action = new KAction( i18n( "Extract Here" ), 0, this,
+ action = new TDEAction( i18n( "Extract Here" ), 0, this,
TQT_SLOT( slotExtractHere() ), actionCollection() );
actionMenu->insert( action );
// stolen from arkwidget.cpp
@@ -143,23 +143,23 @@ ArkMenu::ArkMenu( KonqPopupMenu * popupmenu, const char *name, const TQStringLis
{
TQString targetName = itemList.first()->name();
stripExtension( targetName );
- action = new KAction( i18n( "Extract to %1" ).arg( targetName ), 0, this,
+ action = new TDEAction( i18n( "Extract to %1" ).arg( targetName ), 0, this,
TQT_SLOT( slotExtractToSubfolders() ), actionCollection() );
}
else
{
- action = new KAction( i18n( "Extract to Subfolders" ), 0, this,
+ action = new TDEAction( i18n( "Extract to Subfolders" ), 0, this,
TQT_SLOT( slotExtractToSubfolders() ), actionCollection() );
}
actionMenu->insert( action );
- action = new KAction( i18n( "Extract To..." ), 0 , this,
+ action = new TDEAction( i18n( "Extract To..." ), 0 , this,
TQT_SLOT( slotExtractTo() ), actionCollection() );
actionMenu->insert( action );
addAction( actionMenu );
}
else
{
- action = new KAction( i18n( "Extract To..." ), "ark", 0, this, TQT_SLOT( slotExtractTo() ), actionCollection(), "ark_extract_menu" );
+ action = new TDEAction( i18n( "Extract To..." ), "ark", 0, this, TQT_SLOT( slotExtractTo() ), actionCollection(), "ark_extract_menu" );
addAction( action );
}
}
@@ -176,7 +176,7 @@ void ArkMenu::slotPrepareCompAsMenu()
disconnect( m_compAsMenu->popupMenu(), TQT_SIGNAL( aboutToShow() ),
this, TQT_SLOT( slotPrepareCompAsMenu() ) );
- KAction * action;
+ TDEAction * action;
m_compAsMapper = new TQSignalMapper( this, "compAsMapper" );
TQString ext;
TQStringList newExt;
@@ -194,13 +194,13 @@ void ArkMenu::slotPrepareCompAsMenu()
*eit = ".tar.bz2";
if ( m_urlList.count() == 1 )
{
- action = new KAction( m_name + (*eit), 0, m_compAsMapper,
+ action = new TDEAction( m_name + (*eit), 0, m_compAsMapper,
TQT_SLOT( map() ), actionCollection() );
}
else
{
ext = KMimeType::mimeType(*mit)->comment();
- action = new KAction( ext, 0, m_compAsMapper,
+ action = new TDEAction( ext, 0, m_compAsMapper,
TQT_SLOT( map() ), actionCollection() );
}
@@ -231,7 +231,7 @@ void ArkMenu::slotPrepareAddToMenu()
slotPrepareCompAsMenu();
unsigned int counter = 0;
- KAction * action;
+ TDEAction * action;
m_addToMapper = new TQSignalMapper( this, "addToMapper" );
TQCString actionName;
TQStringList::Iterator mit;
@@ -244,7 +244,7 @@ void ArkMenu::slotPrepareAddToMenu()
for ( mit = m_extensionList.begin(); mit != m_extensionList.end(); ++mit )
if ( (*uit).endsWith(*mit) )
{
- action = new KAction( *uit, 0, m_addToMapper,
+ action = new TDEAction( *uit, 0, m_addToMapper,
TQT_SLOT( map() ), actionCollection() );
m_addToMenu->insert( action );
m_addToMapper->setMapping( action, counter );
diff --git a/konq-plugins/arkplugin/arkplugin.h b/konq-plugins/arkplugin/arkplugin.h
index 0d13158..b59697c 100644
--- a/konq-plugins/arkplugin/arkplugin.h
+++ b/konq-plugins/arkplugin/arkplugin.h
@@ -25,7 +25,7 @@
#include <tdefileitem.h>
#include <tdeconfig.h>
-class KAction;
+class TDEAction;
class TQSignalMapper;
class ArkMenu : public KonqPopupMenuPlugin {
@@ -61,8 +61,8 @@ private:
TQStringList m_archiveMimeTypes;
TQStringList m_extractMimeTypes;
TQStringList m_extensionList;
- KActionMenu * m_compAsMenu;
- KActionMenu * m_addToMenu;
+ TDEActionMenu * m_compAsMenu;
+ TDEActionMenu * m_addToMenu;
TQSignalMapper * m_compAsMapper;
TQSignalMapper * m_addToMapper;
TDEConfig * m_conf;
diff --git a/konq-plugins/autorefresh/autorefresh.cpp b/konq-plugins/autorefresh/autorefresh.cpp
index bce4995..9393aba 100644
--- a/konq-plugins/autorefresh/autorefresh.cpp
+++ b/konq-plugins/autorefresh/autorefresh.cpp
@@ -22,7 +22,7 @@ AutoRefresh::AutoRefresh( TQObject* parent, const char* name, const TQStringList
timer = new TQTimer( this );
connect( timer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotRefresh() ) );
- refresher = new KSelectAction( i18n("&Auto Refresh"),
+ refresher = new TDESelectAction( i18n("&Auto Refresh"),
"reload", 0,
this, TQT_SLOT(slotIntervalChanged()),
actionCollection(), "autorefresh" );
diff --git a/konq-plugins/autorefresh/autorefresh.h b/konq-plugins/autorefresh/autorefresh.h
index ca03bb1..251ab8b 100644
--- a/konq-plugins/autorefresh/autorefresh.h
+++ b/konq-plugins/autorefresh/autorefresh.h
@@ -49,7 +49,7 @@ public slots:
void slotIntervalChanged();
private:
- KSelectAction *refresher;
+ TDESelectAction *refresher;
TQTimer *timer;
};
diff --git a/konq-plugins/babelfish/plugin_babelfish.cpp b/konq-plugins/babelfish/plugin_babelfish.cpp
index a575396..98c37c6 100644
--- a/konq-plugins/babelfish/plugin_babelfish.cpp
+++ b/konq-plugins/babelfish/plugin_babelfish.cpp
@@ -40,123 +40,123 @@ PluginBabelFish::PluginBabelFish( TQObject* parent, const char* name,
{
setInstance(BabelFishFactory::instance());
- m_menu = new KActionMenu( i18n("Translate Web &Page"), "babelfish",
+ m_menu = new TDEActionMenu( i18n("Translate Web &Page"), "babelfish",
actionCollection(), "translatewebpage" );
m_menu->setDelayed( false );
- m_en = new KActionMenu( i18n("&English To"), "babelfish",
+ m_en = new TDEActionMenu( i18n("&English To"), "babelfish",
actionCollection(), "translatewebpage_en" );
- m_fr = new KActionMenu( i18n("&French To"), "babelfish",
+ m_fr = new TDEActionMenu( i18n("&French To"), "babelfish",
actionCollection(), "translatewebpage_fr" );
- m_de = new KActionMenu( i18n("&German To"), "babelfish",
+ m_de = new TDEActionMenu( i18n("&German To"), "babelfish",
actionCollection(), "translatewebpage_de" );
- m_es = new KActionMenu( i18n("&Spanish To"), "babelfish",
+ m_es = new TDEActionMenu( i18n("&Spanish To"), "babelfish",
actionCollection(), "translatewebpage_es" );
- m_pt = new KActionMenu( i18n("&Portuguese To"), "babelfish",
+ m_pt = new TDEActionMenu( i18n("&Portuguese To"), "babelfish",
actionCollection(), "translatewebpage_pt" );
- m_it = new KActionMenu( i18n("&Italian To"), "babelfish",
+ m_it = new TDEActionMenu( i18n("&Italian To"), "babelfish",
actionCollection(), "translatewebpage_it" );
- m_nl = new KActionMenu( i18n("&Dutch To"), "babelfish",
+ m_nl = new TDEActionMenu( i18n("&Dutch To"), "babelfish",
actionCollection(), "translatewebpage_nl" );
- m_en->insert( new KAction( i18n("&Chinese (Simplified)"), 0,
+ m_en->insert( new TDEAction( i18n("&Chinese (Simplified)"), 0,
this, TQT_SLOT(translateURL()),
actionCollection(), "en_zh") );
- m_en->insert( new KAction( i18n("Chinese (&Traditional)"), 0,
+ m_en->insert( new TDEAction( i18n("Chinese (&Traditional)"), 0,
this, TQT_SLOT(translateURL()),
actionCollection(), "en_zhTW") );
- m_en->insert( new KAction( i18n("&Dutch"), 0,
+ m_en->insert( new TDEAction( i18n("&Dutch"), 0,
this, TQT_SLOT(translateURL()),
actionCollection(), "en_nl") );
- m_en->insert( new KAction( i18n("&French"), 0,
+ m_en->insert( new TDEAction( i18n("&French"), 0,
this, TQT_SLOT(translateURL()),
actionCollection(), "en_fr") );
- m_en->insert( new KAction( i18n("&German"), 0,
+ m_en->insert( new TDEAction( i18n("&German"), 0,
this, TQT_SLOT(translateURL()),
actionCollection(), "en_de") );
- m_en->insert( new KAction( i18n("&Italian"), 0,
+ m_en->insert( new TDEAction( i18n("&Italian"), 0,
this, TQT_SLOT(translateURL()),
actionCollection(), "en_it") );
- m_en->insert( new KAction( i18n("&Japanese"), 0,
+ m_en->insert( new TDEAction( i18n("&Japanese"), 0,
this, TQT_SLOT(translateURL()),
actionCollection(), "en_ja") );
- m_en->insert( new KAction( i18n("&Korean"), 0,
+ m_en->insert( new TDEAction( i18n("&Korean"), 0,
this, TQT_SLOT(translateURL()),
actionCollection(), "en_ko") );
- m_en->insert( new KAction( i18n("&Norwegian"), 0,
+ m_en->insert( new TDEAction( i18n("&Norwegian"), 0,
this, TQT_SLOT(translateURL()),
actionCollection(), "en_no") );
- m_en->insert( new KAction( i18n("&Portuguese"), 0,
+ m_en->insert( new TDEAction( i18n("&Portuguese"), 0,
this, TQT_SLOT(translateURL()),
actionCollection(), "en_pt") );
- m_en->insert( new KAction( i18n("&Russian"), 0,
+ m_en->insert( new TDEAction( i18n("&Russian"), 0,
this, TQT_SLOT(translateURL()),
actionCollection(), "en_ru") );
- m_en->insert( new KAction( i18n("&Spanish"), 0,
+ m_en->insert( new TDEAction( i18n("&Spanish"), 0,
this, TQT_SLOT(translateURL()),
actionCollection(), "en_es") );
- m_en->insert( new KAction( i18n("T&hai"), 0,
+ m_en->insert( new TDEAction( i18n("T&hai"), 0,
this, TQT_SLOT(translateURL()),
actionCollection(), "en_th") );
- m_fr->insert( new KAction( i18n("&Dutch"), 0,
+ m_fr->insert( new TDEAction( i18n("&Dutch"), 0,
this, TQT_SLOT(translateURL()),
actionCollection(), "fr_nl") );
- m_fr->insert( new KAction( i18n("&English"), 0,
+ m_fr->insert( new TDEAction( i18n("&English"), 0,
this, TQT_SLOT(translateURL()),
actionCollection(), "fr_en") );
- m_fr->insert( new KAction( i18n("&German"), 0,
+ m_fr->insert( new TDEAction( i18n("&German"), 0,
this, TQT_SLOT(translateURL()),
actionCollection(), "fr_de") );
- m_fr->insert( new KAction( i18n("&Italian"), 0,
+ m_fr->insert( new TDEAction( i18n("&Italian"), 0,
this, TQT_SLOT(translateURL()),
actionCollection(), "fr_it") );
- m_fr->insert( new KAction( i18n("&Portuguese"), 0,
+ m_fr->insert( new TDEAction( i18n("&Portuguese"), 0,
this, TQT_SLOT(translateURL()),
actionCollection(), "fr_pt") );
- m_fr->insert( new KAction( i18n("&Spanish"), 0,
+ m_fr->insert( new TDEAction( i18n("&Spanish"), 0,
this, TQT_SLOT(translateURL()),
actionCollection(), "fr_es") );
- m_de->insert( new KAction( i18n("&English"), 0,
+ m_de->insert( new TDEAction( i18n("&English"), 0,
this, TQT_SLOT(translateURL()),
actionCollection(), "de_en") );
- m_de->insert( new KAction( i18n("&French"), 0,
+ m_de->insert( new TDEAction( i18n("&French"), 0,
this, TQT_SLOT(translateURL()),
actionCollection(), "de_fr") );
- m_es->insert( new KAction( i18n("&English"), 0,
+ m_es->insert( new TDEAction( i18n("&English"), 0,
this, TQT_SLOT(translateURL()),
actionCollection(), "es_en") );
- m_es->insert( new KAction( i18n("&French"), 0,
+ m_es->insert( new TDEAction( i18n("&French"), 0,
this, TQT_SLOT(translateURL()),
actionCollection(), "es_fr") );
- m_pt->insert( new KAction( i18n("&English"), 0,
+ m_pt->insert( new TDEAction( i18n("&English"), 0,
this, TQT_SLOT(translateURL()),
actionCollection(), "pt_en") );
- m_pt->insert( new KAction( i18n("&French"), 0,
+ m_pt->insert( new TDEAction( i18n("&French"), 0,
this, TQT_SLOT(translateURL()),
actionCollection(), "pt_fr") );
- m_it->insert( new KAction( i18n("&English"), 0,
+ m_it->insert( new TDEAction( i18n("&English"), 0,
this, TQT_SLOT(translateURL()),
actionCollection(), "it_en") );
- m_it->insert( new KAction( i18n("&French"), 0,
+ m_it->insert( new TDEAction( i18n("&French"), 0,
this, TQT_SLOT(translateURL()),
actionCollection(), "it_fr") );
- m_nl->insert( new KAction( i18n("&English"), 0,
+ m_nl->insert( new TDEAction( i18n("&English"), 0,
this, TQT_SLOT(translateURL()),
actionCollection(), "nl_en") );
- m_nl->insert( new KAction( i18n("&French"), 0,
+ m_nl->insert( new TDEAction( i18n("&French"), 0,
this, TQT_SLOT(translateURL()),
actionCollection(), "nl_fr") );
- m_menu->insert( new KAction( i18n("&Chinese (Simplified) to English"), 0,
+ m_menu->insert( new TDEAction( i18n("&Chinese (Simplified) to English"), 0,
this, TQT_SLOT(translateURL()),
actionCollection(), "zh_en") );
- m_menu->insert( new KAction( i18n("Chinese (&Traditional) to English"), 0,
+ m_menu->insert( new TDEAction( i18n("Chinese (&Traditional) to English"), 0,
this, TQT_SLOT(translateURL()),
actionCollection(), "zhTW_en") );
m_menu->insert( m_nl );
@@ -164,14 +164,14 @@ PluginBabelFish::PluginBabelFish( TQObject* parent, const char* name,
m_menu->insert( m_fr );
m_menu->insert( m_de );
m_menu->insert( m_it );
- m_menu->insert( new KAction( i18n("&Japanese to English"), 0,
+ m_menu->insert( new TDEAction( i18n("&Japanese to English"), 0,
this, TQT_SLOT(translateURL()),
actionCollection(), "ja_en") );
- m_menu->insert( new KAction( i18n("&Korean to English"), 0,
+ m_menu->insert( new TDEAction( i18n("&Korean to English"), 0,
this, TQT_SLOT(translateURL()),
actionCollection(), "ko_en") );
m_menu->insert( m_pt );
- m_menu->insert( new KAction( i18n("&Russian to English"), 0,
+ m_menu->insert( new TDEAction( i18n("&Russian to English"), 0,
this, TQT_SLOT(translateURL()),
actionCollection(), "ru_en") );
m_menu->insert( m_es );
diff --git a/konq-plugins/babelfish/plugin_babelfish.h b/konq-plugins/babelfish/plugin_babelfish.h
index 26463e0..dd25087 100644
--- a/konq-plugins/babelfish/plugin_babelfish.h
+++ b/konq-plugins/babelfish/plugin_babelfish.h
@@ -40,14 +40,14 @@ protected slots:
void slotStarted( TDEIO::Job* );
private:
- KActionMenu* m_menu;
- KActionMenu* m_de;
- KActionMenu* m_en;
- KActionMenu* m_es;
- KActionMenu* m_fr;
- KActionMenu* m_it;
- KActionMenu* m_nl;
- KActionMenu* m_pt;
+ TDEActionMenu* m_menu;
+ TDEActionMenu* m_de;
+ TDEActionMenu* m_en;
+ TDEActionMenu* m_es;
+ TDEActionMenu* m_fr;
+ TDEActionMenu* m_it;
+ TDEActionMenu* m_nl;
+ TDEActionMenu* m_pt;
};
#endif
diff --git a/konq-plugins/crashes/crashesplugin.cpp b/konq-plugins/crashes/crashesplugin.cpp
index dda25ce..6aec893 100644
--- a/konq-plugins/crashes/crashesplugin.cpp
+++ b/konq-plugins/crashes/crashesplugin.cpp
@@ -42,7 +42,7 @@ CrashesPlugin::CrashesPlugin( TQObject* parent, const char* name, const TQString
{
m_part = (parent && parent->inherits( "TDEHTMLPart" )) ? static_cast<TDEHTMLPart*>(parent) : 0L;
- m_pCrashesMenu = new KActionMenu( i18n("&Crashes"), "core",
+ m_pCrashesMenu = new TDEActionMenu( i18n("&Crashes"), "core",
actionCollection(), "crashes" );
m_pCrashesMenu->setDelayed( false );
diff --git a/konq-plugins/crashes/crashesplugin.h b/konq-plugins/crashes/crashesplugin.h
index f3ef55a..65a8e37 100644
--- a/konq-plugins/crashes/crashesplugin.h
+++ b/konq-plugins/crashes/crashesplugin.h
@@ -30,7 +30,7 @@
#include <tdeparts/plugin.h>
class TDEHTMLPart;
-class KActionMenu;
+class TDEActionMenu;
class CrashesPlugin : public KParts::Plugin
{
@@ -54,7 +54,7 @@ private:
int m_selectedItem;
TDEHTMLPart* m_part;
- KActionMenu* m_pCrashesMenu;
+ TDEActionMenu* m_pCrashesMenu;
typedef TQPair<TQString,TQCString> Crash;
typedef TQValueList<Crash> CrashesList;
diff --git a/konq-plugins/dirfilter/dirfilterplugin.cpp b/konq-plugins/dirfilter/dirfilterplugin.cpp
index a0a0980..d92ce52 100644
--- a/konq-plugins/dirfilter/dirfilterplugin.cpp
+++ b/konq-plugins/dirfilter/dirfilterplugin.cpp
@@ -153,7 +153,7 @@ DirFilterPlugin::DirFilterPlugin (TQObject* parent, const char* name,
if ( !m_part || !m_part->scrollWidget() )
return;
- m_pFilterMenu = new KActionMenu (i18n("View F&ilter"), "filter",
+ m_pFilterMenu = new TDEActionMenu (i18n("View F&ilter"), "filter",
actionCollection(), "filterdir");
m_pFilterMenu->setDelayed (false);
m_pFilterMenu->setWhatsThis(i18n("Allow to filter the currently displayed items by filetype."));
@@ -173,16 +173,16 @@ DirFilterPlugin::DirFilterPlugin (TQObject* parent, const char* name,
TQHBox *hbox = new TQHBox(m_part->widget());
hbox->hide();
- KAction *clear = new KAction(i18n("Clear Filter Field"),
+ TDEAction *clear = new TDEAction(i18n("Clear Filter Field"),
TQApplication::reverseLayout() ? "clear_left" : "locationbar_erase",
0, 0, 0, actionCollection(), "clear_filter");
clear->setWhatsThis(i18n("Clear filter field<p>Clears the content of the filter field."));
- if ( ::tqqt_cast<KListView*>(m_part->scrollWidget()) )
+ if ( ::tqqt_cast<TDEListView*>(m_part->scrollWidget()) )
{
- m_searchWidget = new KListViewSearchLine(hbox);
- static_cast<KListViewSearchLine*>(m_searchWidget)->setListView(static_cast<KListView*>(m_part->scrollWidget()));
+ m_searchWidget = new TDEListViewSearchLine(hbox);
+ static_cast<TDEListViewSearchLine*>(m_searchWidget)->setListView(static_cast<TDEListView*>(m_part->scrollWidget()));
}
else if ( ::tqqt_cast<TQIconView*>(m_part->scrollWidget()) )
{
@@ -416,9 +416,9 @@ void DirFilterPlugin::slotItemsAdded (const KFileItemList& list)
m_pFilterMenu->setEnabled (m_part->nameFilter().isEmpty());
return;
}
- if ( ::tqqt_cast<KListView*>(m_part->scrollWidget()) )
+ if ( ::tqqt_cast<TDEListView*>(m_part->scrollWidget()) )
{
- static_cast<KListViewSearchLine*>(m_searchWidget)->updateSearch();
+ static_cast<TDEListViewSearchLine*>(m_searchWidget)->updateSearch();
}
else if ( ::tqqt_cast<TQIconView*>(m_part->scrollWidget()) )
{
@@ -506,8 +506,8 @@ void DirFilterPlugin::activateSearch()
m_oldFilterString = m_searchWidget->text();
- if ( ::tqqt_cast<KListView*>(m_part->scrollWidget()) ) {
- static_cast<KListViewSearchLine*>(m_searchWidget)->updateSearch();
+ if ( ::tqqt_cast<TDEListView*>(m_part->scrollWidget()) ) {
+ static_cast<TDEListViewSearchLine*>(m_searchWidget)->updateSearch();
}
else if ( ::tqqt_cast<TQIconView*>(m_part->scrollWidget()) ) {
static_cast<KIconViewSearchLine*>(m_searchWidget)->updateSearch();
diff --git a/konq-plugins/dirfilter/dirfilterplugin.h b/konq-plugins/dirfilter/dirfilterplugin.h
index c9a3a27..1bf914e 100644
--- a/konq-plugins/dirfilter/dirfilterplugin.h
+++ b/konq-plugins/dirfilter/dirfilterplugin.h
@@ -29,7 +29,7 @@
#include <klibloader.h>
#include <tdeparts/plugin.h>
-class KActionMenu;
+class TDEActionMenu;
class KonqDirPart;
class KLineEdit;
@@ -130,7 +130,7 @@ private:
KonqDirPart* m_part;
TQTimer *m_refreshTimer;
TQTimer *m_reactivateRefreshTimer;
- KActionMenu* m_pFilterMenu;
+ TDEActionMenu* m_pFilterMenu;
TQString m_oldFilterString;
KLineEdit *m_searchWidget;
diff --git a/konq-plugins/domtreeviewer/Makefile.am b/konq-plugins/domtreeviewer/Makefile.am
index ce5cbb4..e6d19e3 100644
--- a/konq-plugins/domtreeviewer/Makefile.am
+++ b/konq-plugins/domtreeviewer/Makefile.am
@@ -2,7 +2,7 @@ INCLUDES = $(all_includes)
# Needed to catch DOM exceptions
KDE_CXXFLAGS = $(USE_EXCEPTIONS)
-# -DKListView=DOMListView
+# -DTDEListView=DOMListView
# Install this plugin in the KDE modules directory
kde_module_LTLIBRARIES = libdomtreeviewerplugin.la
diff --git a/konq-plugins/domtreeviewer/domtreeview.h b/konq-plugins/domtreeviewer/domtreeview.h
index 250bc77..b8636c9 100644
--- a/konq-plugins/domtreeviewer/domtreeview.h
+++ b/konq-plugins/domtreeviewer/domtreeview.h
@@ -154,7 +154,7 @@ class DOMTreeView : public DOMTreeViewBase
TDEHTMLPart *part;
TQTextStream* m_textStream;
- const KListView* m_rootListView;
+ const TDEListView* m_rootListView;
KPushButton* m_saveButton;
TQObject *focused_child;
diff --git a/konq-plugins/domtreeviewer/domtreeviewbase.ui b/konq-plugins/domtreeviewer/domtreeviewbase.ui
index 4b79c2d..fb0a39e 100644
--- a/konq-plugins/domtreeviewer/domtreeviewbase.ui
+++ b/konq-plugins/domtreeviewer/domtreeviewbase.ui
@@ -141,7 +141,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="KListView">
+ <widget class="TDEListView">
<column>
<property name="text">
<string>DOM Tree</string>
@@ -326,7 +326,7 @@
<property name="margin">
<number>0</number>
</property>
- <widget class="KListView">
+ <widget class="TDEListView">
<column>
<property name="text">
<string>Name</string>
diff --git a/konq-plugins/domtreeviewer/domtreewindow.cpp b/konq-plugins/domtreeviewer/domtreewindow.cpp
index 03e3581..4eb5dce 100644
--- a/konq-plugins/domtreeviewer/domtreewindow.cpp
+++ b/konq-plugins/domtreeviewer/domtreewindow.cpp
@@ -56,7 +56,7 @@
using domtreeviewer::ManipulationCommand;
DOMTreeWindow::DOMTreeWindow(PluginDomtreeviewer *plugin)
- : KMainWindow( 0, "DOMTreeWindow" ),
+ : TDEMainWindow( 0, "DOMTreeWindow" ),
m_plugin(plugin), m_view(new DOMTreeView(this, "DOMTreeView", false))
{
part_manager = 0;
@@ -67,7 +67,7 @@ DOMTreeWindow::DOMTreeWindow(PluginDomtreeviewer *plugin)
// accept dnd
setAcceptDrops(true);
- // tell the KMainWindow that this is indeed the main widget
+ // tell the TDEMainWindow that this is indeed the main widget
setCentralWidget(m_view);
// message window dialog
@@ -132,22 +132,22 @@ void DOMTreeWindow::setupActions()
KStdAction::redisplay(TQT_TQOBJECT(m_view), TQT_SLOT(refresh()), actionCollection());
// toggle manipulation dialog
- KAction *showMsgDlg = new KAction(i18n("Show Message Log"),
+ TDEAction *showMsgDlg = new TDEAction(i18n("Show Message Log"),
CTRL+Key_E, actionCollection(), "show_msg_dlg");
connect(showMsgDlg, TQT_SIGNAL(activated()), TQT_SLOT(showMessageLog()));
-// KAction *custom = new KAction(i18n("Cus&tom Menuitem"), 0,
+// TDEAction *custom = new TDEAction(i18n("Cus&tom Menuitem"), 0,
// this, TQT_SLOT(optionsPreferences()),
// actionCollection(), "custom_action");
// actions for the dom tree list view toolbar
KStdAction::up(TQT_TQOBJECT(view()), TQT_SLOT(moveToParent()), actionCollection(), "tree_up");
- KAction *tree_inc_level = new KAction(i18n("Expand"),
+ TDEAction *tree_inc_level = new TDEAction(i18n("Expand"),
"1rightarrow", CTRL+Key_Greater, TQT_TQOBJECT(view()),
TQT_SLOT(increaseExpansionDepth()), actionCollection(),
"tree_inc_level");
tree_inc_level->setToolTip(i18n("Increase expansion level"));
- KAction *tree_dec_level = new KAction(i18n("Collapse"),
+ TDEAction *tree_dec_level = new TDEAction(i18n("Collapse"),
"1leftarrow", CTRL+Key_Less, TQT_TQOBJECT(view()),
TQT_SLOT(decreaseExpansionDepth()), actionCollection(),
"tree_dec_level");
@@ -155,20 +155,20 @@ void DOMTreeWindow::setupActions()
// actions for the dom tree list view context menu
- del_tree = new KAction(i18n("&Delete"), "editdelete",
+ del_tree = new TDEAction(i18n("&Delete"), "editdelete",
Key_Delete, TQT_TQOBJECT(view()), TQT_SLOT(deleteNodes()),
actionCollection(), "tree_delete");
del_tree->setToolTip(i18n("Delete nodes"));
- /*KAction *new_elem = */new KAction(i18n("New &Element ..."),
- "bookmark", KShortcut(), TQT_TQOBJECT(view()),
+ /*TDEAction *new_elem = */new TDEAction(i18n("New &Element ..."),
+ "bookmark", TDEShortcut(), TQT_TQOBJECT(view()),
TQT_SLOT(slotAddElementDlg()), actionCollection(),
"tree_add_element");
- /*KAction *new_text = */new KAction(i18n("New &Text Node ..."),
- "text", KShortcut(), TQT_TQOBJECT(view()), TQT_SLOT(slotAddTextDlg()),
+ /*TDEAction *new_text = */new TDEAction(i18n("New &Text Node ..."),
+ "text", TDEShortcut(), TQT_TQOBJECT(view()), TQT_SLOT(slotAddTextDlg()),
actionCollection(), "tree_add_text");
// actions for the info panel attribute list context menu
- del_attr = new KAction(i18n("&Delete"), "editdelete",
+ del_attr = new TDEAction(i18n("&Delete"), "editdelete",
Key_Delete, TQT_TQOBJECT(view()), TQT_SLOT(deleteAttributes()),
actionCollection(), "attr_delete");
del_attr->setToolTip(i18n("Delete attributes"));
diff --git a/konq-plugins/domtreeviewer/domtreewindow.h b/konq-plugins/domtreeviewer/domtreewindow.h
index 9681df2..b2b0042 100644
--- a/konq-plugins/domtreeviewer/domtreewindow.h
+++ b/konq-plugins/domtreeviewer/domtreewindow.h
@@ -41,7 +41,7 @@ namespace KParts {
class DOMTreeView;
class PluginDomtreeviewer;
-class KAction;
+class TDEAction;
class TDEConfig;
class KPrinter;
class KURL;
@@ -58,7 +58,7 @@ class TQPopupMenu;
* @short Main window class
* @author Leo Savernik
*/
-class DOMTreeWindow : public KMainWindow
+class DOMTreeWindow : public TDEMainWindow
{
Q_OBJECT
@@ -116,9 +116,9 @@ public:
TDEConfig *config() const { return _config; }
/** returns the attribute delete action */
- KAction *deleteAttributeAction() const { return del_attr; }
+ TDEAction *deleteAttributeAction() const { return del_attr; }
/** returns the node delete action */
- KAction *deleteNodeAction() const { return del_tree; }
+ TDEAction *deleteNodeAction() const { return del_tree; }
public slots:
/**
@@ -187,7 +187,7 @@ private:
TQPopupMenu *domtree_ctx;
TDEConfig *_config;
- KAction *del_tree, *del_attr;
+ TDEAction *del_tree, *del_attr;
TQGuardedPtr<KParts::PartManager> part_manager;
};
diff --git a/konq-plugins/domtreeviewer/plugin_domtreeviewer.cpp b/konq-plugins/domtreeviewer/plugin_domtreeviewer.cpp
index 1993526..a83bd1d 100644
--- a/konq-plugins/domtreeviewer/plugin_domtreeviewer.cpp
+++ b/konq-plugins/domtreeviewer/plugin_domtreeviewer.cpp
@@ -19,7 +19,7 @@ PluginDomtreeviewer::PluginDomtreeviewer( TQObject* parent, const char* name,
const TQStringList & )
: Plugin( parent, name ), m_dialog( 0 )
{
- (void) new KAction( i18n("Show &DOM Tree"),
+ (void) new TDEAction( i18n("Show &DOM Tree"),
"domtreeviewer", 0,
this, TQT_SLOT(slotShowDOMTree()),
actionCollection(), "viewdomtree" );
diff --git a/konq-plugins/fsview/fsview_part.cpp b/konq-plugins/fsview/fsview_part.cpp
index b2b40ce..cff68f1 100644
--- a/konq-plugins/fsview/fsview_part.cpp
+++ b/konq-plugins/fsview/fsview_part.cpp
@@ -118,18 +118,18 @@ FSViewPart::FSViewPart(TQWidget *parentWidget, const char *widgetName,
_ext = new FSViewBrowserExtension(this);
_job = 0;
- _areaMenu = new KActionMenu (i18n("Stop at Area"),
+ _areaMenu = new TDEActionMenu (i18n("Stop at Area"),
actionCollection(), "treemap_areadir");
- _depthMenu = new KActionMenu (i18n("Stop at Depth"),
+ _depthMenu = new TDEActionMenu (i18n("Stop at Depth"),
actionCollection(), "treemap_depthdir");
- _visMenu = new KActionMenu (i18n("Visualization"),
+ _visMenu = new TDEActionMenu (i18n("Visualization"),
actionCollection(), "treemap_visdir");
- _colorMenu = new KActionMenu (i18n("Color Mode"),
+ _colorMenu = new TDEActionMenu (i18n("Color Mode"),
actionCollection(), "treemap_colordir");
- KAction* action;
- action = new KAction( i18n( "&FSView Manual" ), "fsview",
- KShortcut(), this, TQT_SLOT(showHelp()),
+ TDEAction* action;
+ action = new TDEAction( i18n( "&FSView Manual" ), "fsview",
+ TDEShortcut(), this, TQT_SLOT(showHelp()),
actionCollection(), "help_fsview" );
action->setToolTip(i18n("Show FSView manual"));
action->setWhatsThis(i18n("Opens the help browser with the "
diff --git a/konq-plugins/fsview/fsview_part.h b/konq-plugins/fsview/fsview_part.h
index 3cd4f97..0af12d5 100644
--- a/konq-plugins/fsview/fsview_part.h
+++ b/konq-plugins/fsview/fsview_part.h
@@ -30,7 +30,7 @@
#include "fsview.h"
class TDEAboutData;
-class KActionMenu;
+class TDEActionMenu;
class FSViewPart;
@@ -119,7 +119,7 @@ private:
FSView* _view;
FSJob* _job;
FSViewBrowserExtension* _ext;
- KActionMenu *_visMenu, *_areaMenu, *_depthMenu, *_colorMenu;
+ TDEActionMenu *_visMenu, *_areaMenu, *_depthMenu, *_colorMenu;
};
#endif // FSVIEW_PART_H
diff --git a/konq-plugins/kimgalleryplugin/imgallerydialog.cpp b/konq-plugins/kimgalleryplugin/imgallerydialog.cpp
index 016f58a..183ff13 100644
--- a/konq-plugins/kimgalleryplugin/imgallerydialog.cpp
+++ b/konq-plugins/kimgalleryplugin/imgallerydialog.cpp
@@ -125,7 +125,7 @@ void KIGPDialog::setupLookPage(const TQString& path) {
m_fontName = new TQComboBox( false,page );
TQStringList standardFonts;
- KFontChooser::getFontList(standardFonts, 0);
+ TDEFontChooser::getFontList(standardFonts, 0);
m_fontName->insertStringList( standardFonts );
m_fontName->setCurrentText( m_config->readEntry("FontName", TDEGlobalSettings::generalFont().family() ) );
diff --git a/konq-plugins/kimgalleryplugin/imgalleryplugin.cpp b/konq-plugins/kimgalleryplugin/imgalleryplugin.cpp
index eee6d9d..71b3dce 100644
--- a/konq-plugins/kimgalleryplugin/imgalleryplugin.cpp
+++ b/konq-plugins/kimgalleryplugin/imgalleryplugin.cpp
@@ -51,7 +51,7 @@ K_EXPORT_COMPONENT_FACTORY( libkimgallery, KImGalleryPluginFactory( "imgallerypl
KImGalleryPlugin::KImGalleryPlugin( TQObject* parent, const char* name, const TQStringList & )
: KParts::Plugin( parent, name ), m_commentMap(0)
{
- new KAction( i18n( "&Create Image Gallery..." ), "imagegallery", CTRL+Key_I, this,
+ new TDEAction( i18n( "&Create Image Gallery..." ), "imagegallery", CTRL+Key_I, this,
TQT_SLOT( slotExecute() ), actionCollection(), "create_img_gallery" );
}
diff --git a/konq-plugins/kuick/kdirmenu.cpp b/konq-plugins/kuick/kdirmenu.cpp
index 754de2b..20c2033 100644
--- a/konq-plugins/kuick/kdirmenu.cpp
+++ b/konq-plugins/kuick/kdirmenu.cpp
@@ -50,7 +50,7 @@ KDirMenu::KDirMenu ( TQWidget *parent, const KURL &_src,
TQFileInfo fileInfo(path);
if (( src.path() != path || !src.isLocalFile()) && fileInfo.isWritable())
- action = new KAction(name, 0, TQT_TQOBJECT(this), TQT_SLOT(new_slot( ) ), TQT_TQOBJECT(this));
+ action = new TDEAction(name, 0, TQT_TQOBJECT(this), TQT_SLOT(new_slot( ) ), TQT_TQOBJECT(this));
}
KDirMenu::~KDirMenu( ) {
delete action;
diff --git a/konq-plugins/kuick/kdirmenu.h b/konq-plugins/kuick/kdirmenu.h
index 8906dc7..b01b902 100644
--- a/konq-plugins/kuick/kdirmenu.h
+++ b/konq-plugins/kuick/kdirmenu.h
@@ -25,7 +25,7 @@
#include <tqptrlist.h>
#include <tqmap.h>
-class KAction;
+class TDEAction;
class KURL;
class KDirMenu : public TQPopupMenu {
@@ -47,7 +47,7 @@ private:
TQString path;
TQString name;
KURL src;
- KAction *action;
+ TDEAction *action;
TQPtrList<KDirMenu> children;
void initIconMap( );
public slots:
diff --git a/konq-plugins/kuick/kmetamenu.cpp b/konq-plugins/kuick/kmetamenu.cpp
index 7ba7a87..9309a74 100644
--- a/konq-plugins/kuick/kmetamenu.cpp
+++ b/konq-plugins/kuick/kmetamenu.cpp
@@ -111,7 +111,7 @@ KMetaMenu::KMetaMenu( TQWidget *parent, const KURL &url,
}
- m_browse = new KAction(i18n("&Browse..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotBrowse()), TQT_TQOBJECT(this) );
+ m_browse = new TDEAction(i18n("&Browse..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotBrowse()), TQT_TQOBJECT(this) );
m_browse->plug(this);
// read the last chosen dirs
// first set the group according to our parameter
@@ -133,7 +133,7 @@ KMetaMenu::KMetaMenu( TQWidget *parent, const KURL &url,
continue;
}
TQString escapedDir = *it;
- KAction *action = new KAction(escapedDir.replace("&", "&&"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotFastPath()), TQT_TQOBJECT(this));
+ TDEAction *action = new TDEAction(escapedDir.replace("&", "&&"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotFastPath()), TQT_TQOBJECT(this));
action->plug(this );
actions.append( action );
++it;
@@ -158,8 +158,8 @@ void KMetaMenu::slotFileChosen(const TQString &path ){
}
void KMetaMenu::slotFastPath( ) {
- KAction *action;
- action = (KAction*) sender();
+ TDEAction *action;
+ action = (TDEAction*) sender();
TQString text = action->plainText( );
slotFileChosen( text );
}
diff --git a/konq-plugins/kuick/kmetamenu.h b/konq-plugins/kuick/kmetamenu.h
index 3d60b86..e22ff19 100644
--- a/konq-plugins/kuick/kmetamenu.h
+++ b/konq-plugins/kuick/kmetamenu.h
@@ -57,11 +57,11 @@ private:
KDirMenu *m_current;
KIMContactMenu *m_contacts;
KIMProxy *m_proxy;
- KAction *m_browse;
+ TDEAction *m_browse;
TQStringList list;
TDEConfig *conf;
TQString group;
- TQPtrList<KAction> actions;
+ TQPtrList<TDEAction> actions;
};
#endif
diff --git a/konq-plugins/kuick/kuick_plugin.cpp b/konq-plugins/kuick/kuick_plugin.cpp
index b0ccaef..cb8730a 100644
--- a/konq-plugins/kuick/kuick_plugin.cpp
+++ b/konq-plugins/kuick/kuick_plugin.cpp
@@ -42,7 +42,7 @@ KTestMenu::KTestMenu( KonqPopupMenu *popupmenu, const char *name, const TQString
popup= popupmenu ;
meta_copy_mmu = 0L;
meta_move_mmu = 0L;
- my_action = new KAction( "kuick_plugin", 0, this, TQT_SLOT( slotPopupMaeh( ) ), actionCollection( ), "Do some funky stuff" );
+ my_action = new TDEAction( "kuick_plugin", 0, this, TQT_SLOT( slotPopupMaeh( ) ), actionCollection( ), "Do some funky stuff" );
addAction( my_action );
addSeparator();
//popupmenu->addMerge();
diff --git a/konq-plugins/kuick/kuick_plugin.h b/konq-plugins/kuick/kuick_plugin.h
index caaba8d..d39fad2 100644
--- a/konq-plugins/kuick/kuick_plugin.h
+++ b/konq-plugins/kuick/kuick_plugin.h
@@ -24,7 +24,7 @@
#include "kmetamenu.h"
-class KAction;
+class TDEAction;
class KURL;
class KTestMenu : public KonqPopupMenuPlugin {
Q_OBJECT
@@ -37,7 +37,7 @@ public:
KonqPopupMenu *popup;
private:
- KAction *my_action;
+ TDEAction *my_action;
KIMProxy *m_imProxy;
public slots:
diff --git a/konq-plugins/microformat/konqmficon.cpp b/konq-plugins/microformat/konqmficon.cpp
index d3f5239..062a28c 100644
--- a/konq-plugins/microformat/konqmficon.cpp
+++ b/konq-plugins/microformat/konqmficon.cpp
@@ -245,7 +245,7 @@ bool KonqMFIcon::mfFound() {
void KonqMFIcon::contextMenu() {
delete m_menu;
- m_menu = new KPopupMenu(m_part->widget());
+ m_menu = new TDEPopupMenu(m_part->widget());
m_menu->insertTitle(i18n("Microformats"));
connect(m_menu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(addMF(int)));
int id = 0;
diff --git a/konq-plugins/microformat/konqmficon.h b/konq-plugins/microformat/konqmficon.h
index 33dac4c..d29a750 100644
--- a/konq-plugins/microformat/konqmficon.h
+++ b/konq-plugins/microformat/konqmficon.h
@@ -56,7 +56,7 @@ class KonqMFIcon : public KParts::Plugin, PluginBase {
TQGuardedPtr<TDEHTMLPart> m_part;
KURLLabel *m_mfIcon;
KParts::StatusBarExtension *m_statusBarEx;
- TQGuardedPtr<KPopupMenu> m_menu;
+ TQGuardedPtr<TDEPopupMenu> m_menu;
TQValueList<TQPair<TQString, TQString> > _events, _cards;
private slots:
diff --git a/konq-plugins/minitools/minitoolsplugin.cpp b/konq-plugins/minitools/minitoolsplugin.cpp
index a6837ba..3059584 100644
--- a/konq-plugins/minitools/minitoolsplugin.cpp
+++ b/konq-plugins/minitools/minitoolsplugin.cpp
@@ -46,7 +46,7 @@ MinitoolsPlugin::MinitoolsPlugin(TQObject* parent, const char* name, const TQStr
: KParts::Plugin(parent, name) {
m_part = (parent && parent->inherits( "TDEHTMLPart" )) ? static_cast<TDEHTMLPart*>(parent) : 0L;
- m_pMinitoolsMenu = new KActionMenu(i18n("&Minitools"), "minitools", actionCollection(), "minitools");
+ m_pMinitoolsMenu = new TDEActionMenu(i18n("&Minitools"), "minitools", actionCollection(), "minitools");
m_pMinitoolsMenu->setDelayed(false);
m_pMinitoolsMenu->setEnabled(true);
diff --git a/konq-plugins/minitools/minitoolsplugin.h b/konq-plugins/minitools/minitoolsplugin.h
index f30c7b2..c4a1b63 100644
--- a/konq-plugins/minitools/minitoolsplugin.h
+++ b/konq-plugins/minitools/minitoolsplugin.h
@@ -30,7 +30,7 @@
#include <tdeparts/plugin.h>
class TDEHTMLPart;
-class KActionMenu;
+class TDEActionMenu;
class MinitoolsPlugin : public KParts::Plugin {
Q_OBJECT
@@ -56,7 +56,7 @@ private:
int m_selectedItem;
TDEHTMLPart* m_part;
- KActionMenu* m_pMinitoolsMenu;
+ TDEActionMenu* m_pMinitoolsMenu;
typedef TQPair<TQString,TQCString> Minitool;
typedef TQValueList<Minitool> MinitoolsList;
diff --git a/konq-plugins/rellinks/TODO b/konq-plugins/rellinks/TODO
index 28f206b..47f6f54 100644
--- a/konq-plugins/rellinks/TODO
+++ b/konq-plugins/rellinks/TODO
@@ -3,7 +3,7 @@ Rellinks :
* Support multiple same relations for all relations in a beautiful way
(as FireFox Link Toolbar Extension do) :
- by transfoming buttons (KAction) in menus (KActionMenu) if more than one item is found for a relation ?
+ by transfoming buttons (TDEAction) in menus (TDEActionMenu) if more than one item is found for a relation ?
* Possibility to configure keyboard shortcuts
* Manage "rel" and "rev" differently
* Manage "media"
diff --git a/konq-plugins/rellinks/plugin_rellinks.cpp b/konq-plugins/rellinks/plugin_rellinks.cpp
index 6bb3cbd..880a448 100644
--- a/konq-plugins/rellinks/plugin_rellinks.cpp
+++ b/konq-plugins/rellinks/plugin_rellinks.cpp
@@ -70,102 +70,102 @@ RelLinksPlugin::RelLinksPlugin(TQObject *parent, const char *name, const TQStrin
setInstance(RelLinksFactory::instance());
// ------------- Navigation links --------------
- kaction_map["home"] = new KAction( i18n("&Top"), "2uparrow", KShortcut("Ctrl+Alt+T"), this, TQT_SLOT(goHome()), actionCollection(), "rellinks_top" );
+ kaction_map["home"] = new TDEAction( i18n("&Top"), "2uparrow", TDEShortcut("Ctrl+Alt+T"), this, TQT_SLOT(goHome()), actionCollection(), "rellinks_top" );
kaction_map["home"]->setWhatsThis( i18n("<p>This link references a home page or the top of some hierarchy.</p>") );
- kaction_map["up"] = new KAction( i18n("&Up"), "1uparrow", KShortcut("Ctrl+Alt+U"), this, TQT_SLOT(goUp()), actionCollection(), "rellinks_up" );
+ kaction_map["up"] = new TDEAction( i18n("&Up"), "1uparrow", TDEShortcut("Ctrl+Alt+U"), this, TQT_SLOT(goUp()), actionCollection(), "rellinks_up" );
kaction_map["up"]->setWhatsThis( i18n("<p>This link references the immediate parent of the current document.</p>") );
bool isRTL = TQApplication::reverseLayout();
- kaction_map["begin"] = new KAction( i18n("&First"), isRTL ? "2rightarrow" : "2leftarrow", KShortcut("Ctrl+Alt+F"), this, TQT_SLOT(goFirst()), actionCollection(), "rellinks_first" );
+ kaction_map["begin"] = new TDEAction( i18n("&First"), isRTL ? "2rightarrow" : "2leftarrow", TDEShortcut("Ctrl+Alt+F"), this, TQT_SLOT(goFirst()), actionCollection(), "rellinks_first" );
kaction_map["begin"]->setWhatsThis( i18n("<p>This link type tells search engines which document is considered by the author to be the starting point of the collection.</p>") );
- kaction_map["prev"] = new KAction( i18n("&Previous"), isRTL ? "1rightarrow" : "1leftarrow", KShortcut("Ctrl+Alt+P"), this, TQT_SLOT(goPrevious()), actionCollection(), "rellinks_previous" );
+ kaction_map["prev"] = new TDEAction( i18n("&Previous"), isRTL ? "1rightarrow" : "1leftarrow", TDEShortcut("Ctrl+Alt+P"), this, TQT_SLOT(goPrevious()), actionCollection(), "rellinks_previous" );
kaction_map["prev"]->setWhatsThis( i18n("<p>This link references the previous document in an ordered series of documents.</p>") );
- kaction_map["next"] = new KAction( i18n("&Next"), isRTL ? "1leftarrow" : "1rightarrow", KShortcut("Ctrl+Alt+N"), this, TQT_SLOT(goNext()), actionCollection(), "rellinks_next" );
+ kaction_map["next"] = new TDEAction( i18n("&Next"), isRTL ? "1leftarrow" : "1rightarrow", TDEShortcut("Ctrl+Alt+N"), this, TQT_SLOT(goNext()), actionCollection(), "rellinks_next" );
kaction_map["next"]->setWhatsThis( i18n("<p>This link references the next document in an ordered series of documents.</p>") );
- kaction_map["last"] = new KAction( i18n("&Last"), isRTL ? "2leftarrow" : "2rightarrow", KShortcut("Ctrl+Alt+L"), this, TQT_SLOT(goLast()), actionCollection(), "rellinks_last" );
+ kaction_map["last"] = new TDEAction( i18n("&Last"), isRTL ? "2leftarrow" : "2rightarrow", TDEShortcut("Ctrl+Alt+L"), this, TQT_SLOT(goLast()), actionCollection(), "rellinks_last" );
kaction_map["last"]->setWhatsThis( i18n("<p>This link references the end of a sequence of documents.</p>") );
// ------------ special items --------------------------
- kaction_map["search"] = new KAction( i18n("&Search"), "filefind", KShortcut("Ctrl+Alt+S"), this, TQT_SLOT(goSearch()), actionCollection(), "rellinks_search" );
+ kaction_map["search"] = new TDEAction( i18n("&Search"), "filefind", TDEShortcut("Ctrl+Alt+S"), this, TQT_SLOT(goSearch()), actionCollection(), "rellinks_search" );
kaction_map["search"]->setWhatsThis( i18n("<p>This link references the search.</p>") );
// ------------ Document structure links ---------------
- m_document = new KActionMenu( i18n("Document"), "contents", actionCollection(), "rellinks_document" );
+ m_document = new TDEActionMenu( i18n("Document"), "contents", actionCollection(), "rellinks_document" );
m_document->setWhatsThis( i18n("<p>This menu contains the links referring the document information.</p>") );
m_document->setDelayed(false);
- kaction_map["contents"] = new KAction( i18n("Table of &Contents"), "contents", KShortcut("Ctrl+Alt+C"), this, TQT_SLOT(goContents()), actionCollection(), "rellinks_toc" );
+ kaction_map["contents"] = new TDEAction( i18n("Table of &Contents"), "contents", TDEShortcut("Ctrl+Alt+C"), this, TQT_SLOT(goContents()), actionCollection(), "rellinks_toc" );
m_document->insert(kaction_map["contents"]);
kaction_map["contents"]->setWhatsThis( i18n("<p>This link references the table of contents.</p>") );
- kactionmenu_map["chapter"] = new KActionMenu( i18n("Chapters"), "fileopen", actionCollection(), "rellinks_chapters" );
+ kactionmenu_map["chapter"] = new TDEActionMenu( i18n("Chapters"), "fileopen", actionCollection(), "rellinks_chapters" );
m_document->insert(kactionmenu_map["chapter"]);
connect( kactionmenu_map["chapter"]->popupMenu(), TQT_SIGNAL( activated( int ) ), this, TQT_SLOT(goChapter(int)));
kactionmenu_map["chapter"]->setWhatsThis( i18n("<p>This menu references the chapters of the document.</p>") );
kactionmenu_map["chapter"]->setDelayed(false);
- kactionmenu_map["section"] = new KActionMenu( i18n("Sections"), "fileopen", actionCollection(), "rellinks_sections" );
+ kactionmenu_map["section"] = new TDEActionMenu( i18n("Sections"), "fileopen", actionCollection(), "rellinks_sections" );
m_document->insert(kactionmenu_map["section"]);
connect( kactionmenu_map["section"]->popupMenu(), TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( goSection( int ) ) );
kactionmenu_map["section"]->setWhatsThis( i18n("<p>This menu references the sections of the document.</p>") );
kactionmenu_map["section"]->setDelayed(false);
- kactionmenu_map["subsection"] = new KActionMenu( i18n("Subsections"), "fileopen", actionCollection(), "rellinks_subsections" );
+ kactionmenu_map["subsection"] = new TDEActionMenu( i18n("Subsections"), "fileopen", actionCollection(), "rellinks_subsections" );
m_document->insert(kactionmenu_map["subsection"]);
connect( kactionmenu_map["subsection"]->popupMenu(), TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( goSubsection( int ) ) );
kactionmenu_map["subsection"]->setWhatsThis( i18n("<p>This menu references the subsections of the document.</p>") );
kactionmenu_map["subsection"]->setDelayed(false);
- kactionmenu_map["appendix"] = new KActionMenu( i18n("Appendix"), "edit", actionCollection(), "rellinks_appendix" );
+ kactionmenu_map["appendix"] = new TDEActionMenu( i18n("Appendix"), "edit", actionCollection(), "rellinks_appendix" );
m_document->insert(kactionmenu_map["appendix"]);
connect( kactionmenu_map["appendix"]->popupMenu(), TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( goAppendix( int ) ) );
kactionmenu_map["appendix"]->setWhatsThis( i18n("<p>This link references the appendix.</p>") );
kactionmenu_map["appendix"]->setDelayed(false);
- kaction_map["glossary"] = new KAction( i18n("&Glossary"), "flag", KShortcut("Ctrl+Alt+G"), this, TQT_SLOT(goGlossary()), actionCollection(), "rellinks_glossary" );
+ kaction_map["glossary"] = new TDEAction( i18n("&Glossary"), "flag", TDEShortcut("Ctrl+Alt+G"), this, TQT_SLOT(goGlossary()), actionCollection(), "rellinks_glossary" );
m_document->insert(kaction_map["glossary"]);
kaction_map["glossary"]->setWhatsThis( i18n("<p>This link references the glossary.</p>") );
- kaction_map["index"] = new KAction( i18n("&Index"), "info", KShortcut("Ctrl+Alt+I"), this, TQT_SLOT(goIndex()), actionCollection(), "rellinks_index" );
+ kaction_map["index"] = new TDEAction( i18n("&Index"), "info", TDEShortcut("Ctrl+Alt+I"), this, TQT_SLOT(goIndex()), actionCollection(), "rellinks_index" );
m_document->insert(kaction_map["index"]);
kaction_map["index"]->setWhatsThis( i18n("<p>This link references the index.</p>") );
// Other links
- m_more = new KActionMenu( i18n("More"), "misc", actionCollection(), "rellinks_more" );
+ m_more = new TDEActionMenu( i18n("More"), "misc", actionCollection(), "rellinks_more" );
m_more->setWhatsThis( i18n("<p>This menu contains other important links.</p>") );
m_more->setDelayed(false);
- kaction_map["help"] = new KAction( i18n("&Help"), "help", KShortcut("Ctrl+Alt+H"), this, TQT_SLOT(goHelp()), actionCollection(), "rellinks_help" );
+ kaction_map["help"] = new TDEAction( i18n("&Help"), "help", TDEShortcut("Ctrl+Alt+H"), this, TQT_SLOT(goHelp()), actionCollection(), "rellinks_help" );
m_more->insert(kaction_map["help"]);
kaction_map["help"]->setWhatsThis( i18n("<p>This link references the help.</p>") );
- kaction_map["author"] = new KAction( i18n("&Authors"), "mail_new", KShortcut("Ctrl+Alt+A"), this, TQT_SLOT(goAuthor()), actionCollection(), "rellinks_authors" );
+ kaction_map["author"] = new TDEAction( i18n("&Authors"), "mail_new", TDEShortcut("Ctrl+Alt+A"), this, TQT_SLOT(goAuthor()), actionCollection(), "rellinks_authors" );
m_more->insert(kaction_map["author"]);
kaction_map["author"]->setWhatsThis( i18n("<p>This link references the author.</p>") );
- kaction_map["copyright"] = new KAction( i18n("Copy&right"), "signature", KShortcut("Ctrl+Alt+R"), this, TQT_SLOT(goCopyright()), actionCollection(), "rellinks_copyright" );
+ kaction_map["copyright"] = new TDEAction( i18n("Copy&right"), "signature", TDEShortcut("Ctrl+Alt+R"), this, TQT_SLOT(goCopyright()), actionCollection(), "rellinks_copyright" );
m_more->insert(kaction_map["copyright"]);
kaction_map["copyright"]->setWhatsThis( i18n("<p>This link references the copyright.</p>") );
- kactionmenu_map["bookmark"] = new KActionMenu( i18n("Bookmarks"), "bookmark_folder", actionCollection(), "rellinks_bookmarks" );
+ kactionmenu_map["bookmark"] = new TDEActionMenu( i18n("Bookmarks"), "bookmark_folder", actionCollection(), "rellinks_bookmarks" );
m_more->insert(kactionmenu_map["bookmark"]);
kactionmenu_map["bookmark"]->setWhatsThis( i18n("<p>This menu references the bookmarks.</p>") );
connect( kactionmenu_map["bookmark"]->popupMenu(), TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( goBookmark( int ) ) );
kactionmenu_map["bookmark"]->setDelayed(false);
- kactionmenu_map["alternate"] = new KActionMenu( i18n("Other Versions"), "attach", actionCollection(), "rellinks_other_versions" );
+ kactionmenu_map["alternate"] = new TDEActionMenu( i18n("Other Versions"), "attach", actionCollection(), "rellinks_other_versions" );
m_more->insert(kactionmenu_map["alternate"]);
kactionmenu_map["alternate"]->setWhatsThis( i18n("<p>This link references the alternate versions of this document.</p>") );
connect( kactionmenu_map["alternate"]->popupMenu(), TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( goAlternate( int ) ) );
kactionmenu_map["alternate"]->setDelayed(false);
// Unclassified menu
- m_links = new KActionMenu( i18n("Miscellaneous"), "rellinks", actionCollection(), "rellinks_links" );
+ m_links = new TDEActionMenu( i18n("Miscellaneous"), "rellinks", actionCollection(), "rellinks_links" );
kactionmenu_map["unclassified"] = m_links;
kactionmenu_map["unclassified"]->setWhatsThis( i18n("<p>Miscellaneous links.</p>") );
connect( kactionmenu_map["unclassified"]->popupMenu(), TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( goAllElements( int ) ) );
@@ -532,7 +532,7 @@ void RelLinksPlugin::disableAll() {
element_map.clear();
// Clear actions
- KActionMap::Iterator it;
+ TDEActionMap::Iterator it;
for ( it = kaction_map.begin(); it != kaction_map.end(); ++it ) {
// If I don't test it crash :(
if (it.data()) {
@@ -542,7 +542,7 @@ void RelLinksPlugin::disableAll() {
}
// Clear actions
- KActionMenuMap::Iterator itmenu;
+ TDEActionMenuMap::Iterator itmenu;
for ( itmenu = kactionmenu_map.begin(); itmenu != kactionmenu_map.end(); ++itmenu ) {
// If I don't test it crash :(
if (itmenu.data()) {
diff --git a/konq-plugins/rellinks/plugin_rellinks.h b/konq-plugins/rellinks/plugin_rellinks.h
index e8e5adb..d82402e 100644
--- a/konq-plugins/rellinks/plugin_rellinks.h
+++ b/konq-plugins/rellinks/plugin_rellinks.h
@@ -39,14 +39,14 @@
// type definitions
typedef TQMap<int,DOM::Element> DOMElementMap;
-typedef TQMap<TQString, KAction*> KActionMap;
-typedef TQMap<TQString, KActionMenu*> KActionMenuMap;
+typedef TQMap<TQString, TDEAction*> TDEActionMap;
+typedef TQMap<TQString, TDEActionMenu*> TDEActionMenuMap;
// forward declarations
-class KActionMenu;
+class TDEActionMenu;
class TDEHTMLPart;
class TDEHTMLView;
-class KToolBar;
+class TDEToolBar;
class KURL;
class TQTimer;
@@ -153,14 +153,14 @@ private:
TDEHTMLView* m_view;
bool m_viewVisible;
- KActionMenu *m_document;
- KActionMenu *m_more;
- KActionMenu *m_links;
+ TDEActionMenu *m_document;
+ TDEActionMenu *m_more;
+ TDEActionMenu *m_links;
- /** Map of KAction */
- KActionMap kaction_map;
- /** Map of KActionMenu */
- KActionMenuMap kactionmenu_map;
+ /** Map of TDEAction */
+ TDEActionMap kaction_map;
+ /** Map of TDEActionMenu */
+ TDEActionMenuMap kactionmenu_map;
/** Map of all the link element which can be managed by rellinks */
TQMap<TQString,DOMElementMap> element_map;
diff --git a/konq-plugins/rsync/rsyncplugin.cpp b/konq-plugins/rsync/rsyncplugin.cpp
index d337287..390f8a7 100644
--- a/konq-plugins/rsync/rsyncplugin.cpp
+++ b/konq-plugins/rsync/rsyncplugin.cpp
@@ -118,9 +118,9 @@ RsyncPlugin::RsyncPlugin (TQObject* parent, const char* name,
if ( !m_part || !m_part->scrollWidget() )
return;
- m_pSyncNow = new KAction(i18n("Synchronize F&older"), "syncnow",
+ m_pSyncNow = new TDEAction(i18n("Synchronize F&older"), "syncnow",
actionCollection(), "syncnow");
- m_pSyncSetup = new KAction (i18n("Setup Syn&chronization"), "setupsync",
+ m_pSyncSetup = new TDEAction (i18n("Setup Syn&chronization"), "setupsync",
actionCollection(), "setupsync");
m_pSyncNow->setIcon("remotesync");
m_pSyncSetup->setIcon("remotesyncconfig");
diff --git a/konq-plugins/rsync/rsyncplugin.h b/konq-plugins/rsync/rsyncplugin.h
index af28935..cd4f20f 100644
--- a/konq-plugins/rsync/rsyncplugin.h
+++ b/konq-plugins/rsync/rsyncplugin.h
@@ -36,7 +36,7 @@
// and in a manner identical to these declarations, the plugin will
// mysteriously fail when launched with kshell but work fine under BASH
-class KActionMenu;
+class TDEActionMenu;
class KonqDirPart;
class KLineEdit;
@@ -65,8 +65,8 @@ private slots:
private:
KURL m_pURL;
KonqDirPart* m_part;
- KAction* m_pSyncNow;
- KAction* m_pSyncSetup;
+ TDEAction* m_pSyncNow;
+ TDEAction* m_pSyncSetup;
KRsync* m_rSync;
};
#endif
diff --git a/konq-plugins/searchbar/searchbar.cpp b/konq-plugins/searchbar/searchbar.cpp
index 7e2ed07..dfdc27c 100644
--- a/konq-plugins/searchbar/searchbar.cpp
+++ b/konq-plugins/searchbar/searchbar.cpp
@@ -88,7 +88,7 @@ SearchBarPlugin::SearchBarPlugin(TQObject *parent, const char *name,
TQWhatsThis::add(m_searchCombo, i18n("Search Bar<p>"
"Enter a search term. Click on the icon to change search mode or provider."));
- new KAction( i18n( "Focus Searchbar" ), CTRL+Key_S,
+ new TDEAction( i18n( "Focus Searchbar" ), CTRL+Key_S,
this, TQT_SLOT(focusSearchbar()),
actionCollection(), "focus_search_bar");
@@ -413,7 +413,7 @@ void SearchBarPlugin::showSelectionMenu()
}
m_popupMenu->insertSeparator();
- m_googleMenu = new KSelectAction(i18n("Use Google Suggest"), SmallIconSet("ktip"), 0, TQT_TQOBJECT(this), TQT_SLOT(selectGoogleSuggestMode()), TQT_TQOBJECT(m_popupMenu));
+ m_googleMenu = new TDESelectAction(i18n("Use Google Suggest"), SmallIconSet("ktip"), 0, TQT_TQOBJECT(this), TQT_SLOT(selectGoogleSuggestMode()), TQT_TQOBJECT(m_popupMenu));
TQStringList google_modes;
google_modes << i18n("For Google Only") << i18n("For All Searches") << i18n("Never");
m_googleMenu->setItems(google_modes);
diff --git a/konq-plugins/searchbar/searchbar.h b/konq-plugins/searchbar/searchbar.h
index a1423f8..6baf33f 100644
--- a/konq-plugins/searchbar/searchbar.h
+++ b/konq-plugins/searchbar/searchbar.h
@@ -178,7 +178,7 @@ class SearchBarPlugin : public KParts::Plugin
SearchBarCombo *m_searchCombo;
KWidgetAction *m_searchComboAction;
TQPopupMenu *m_popupMenu;
- KSelectAction *m_googleMenu;
+ TDESelectAction *m_googleMenu;
TQPixmap m_searchIcon;
SearchModes m_searchMode;
TQString m_providerName;
diff --git a/konq-plugins/sidebar/delicious/bookmarkListItem.cpp b/konq-plugins/sidebar/delicious/bookmarkListItem.cpp
index d4066c8..0229031 100644
--- a/konq-plugins/sidebar/delicious/bookmarkListItem.cpp
+++ b/konq-plugins/sidebar/delicious/bookmarkListItem.cpp
@@ -25,7 +25,7 @@
#include <klocale.h>
BookmarkListItem::BookmarkListItem( TQListView *parent, const TQString & url, const TQString & desc, time_t time )
- : KListViewItem( parent ), m_desc( desc )
+ : TDEListViewItem( parent ), m_desc( desc )
{
m_url = KURL::fromPathOrURL( url );
m_dateTime.setTime_t( time );
diff --git a/konq-plugins/sidebar/delicious/bookmarkListItem.h b/konq-plugins/sidebar/delicious/bookmarkListItem.h
index 5b4c8c7..40316c1 100644
--- a/konq-plugins/sidebar/delicious/bookmarkListItem.h
+++ b/konq-plugins/sidebar/delicious/bookmarkListItem.h
@@ -31,7 +31,7 @@
class TQString;
-class BookmarkListItem: public KListViewItem
+class BookmarkListItem: public TDEListViewItem
{
public:
BookmarkListItem( TQListView *parent, const TQString & url, const TQString & desc, time_t time );
diff --git a/konq-plugins/sidebar/delicious/widget.ui b/konq-plugins/sidebar/delicious/widget.ui
index c85760a..7bf7c0b 100644
--- a/konq-plugins/sidebar/delicious/widget.ui
+++ b/konq-plugins/sidebar/delicious/widget.ui
@@ -114,7 +114,7 @@
<string>Post a new bookmark</string>
</property>
</widget>
- <widget class="KListView" row="0" column="0" rowspan="1" colspan="2">
+ <widget class="TDEListView" row="0" column="0" rowspan="1" colspan="2">
<column>
<property name="text">
<string>Description</string>
diff --git a/konq-plugins/sidebar/mediaplayer/controls.cpp b/konq-plugins/sidebar/mediaplayer/controls.cpp
index 5b110a0..49c6d1f 100644
--- a/konq-plugins/sidebar/mediaplayer/controls.cpp
+++ b/konq-plugins/sidebar/mediaplayer/controls.cpp
@@ -77,7 +77,7 @@ void L33tSlider::wheelEvent(TQWheelEvent *e)
SliderAction::SliderAction(const TQString& text, int accel, const TQObject *receiver,
const char *member, TQObject* parent, const char* name )
- : KAction( text, accel, parent, name )
+ : TDEAction( text, accel, parent, name )
{
m_receiver = receiver;
m_member = member;
@@ -85,10 +85,10 @@ SliderAction::SliderAction(const TQString& text, int accel, const TQObject *rece
int SliderAction::plug( TQWidget *w, int index )
{
- if (!w->inherits("KToolBar")) return -1;
+ if (!w->inherits("TDEToolBar")) return -1;
- KToolBar *toolBar = (KToolBar *)w;
- int id = KAction::getToolButtonID();
+ TDEToolBar *toolBar = (TDEToolBar *)w;
+ int id = TDEAction::getToolButtonID();
//Create it.
m_slider=new L33tSlider(0, 1000, 100, 0,Qt::Horizontal, toolBar);
@@ -100,20 +100,20 @@ int SliderAction::plug( TQWidget *w, int index )
connect( toolBar, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotDestroyed() ) );
toolBar->setItemAutoSized( id, true );
- if (w->inherits( "KToolBar" ))
- connect(toolBar, TQT_SIGNAL(moved(KToolBar::BarPosition)), this, TQT_SLOT(toolbarMoved(KToolBar::BarPosition)));
+ if (w->inherits( "TDEToolBar" ))
+ connect(toolBar, TQT_SIGNAL(moved(TDEToolBar::BarPosition)), this, TQT_SLOT(toolbarMoved(TDEToolBar::BarPosition)));
emit plugged();
return containerCount() - 1;
}
-void SliderAction::toolbarMoved(KToolBar::BarPosition)
+void SliderAction::toolbarMoved(TDEToolBar::BarPosition)
{
// I wish this worked :)
return;
/*
- if (pos == KToolBar::Left || pos == KToolBar::Right)
+ if (pos == TDEToolBar::Left || pos == TDEToolBar::Right)
{
m_slider->setOrientationQt::Vertical);
m_slider->setFixedWidth(m_slider->height());
@@ -128,7 +128,7 @@ return;
void SliderAction::unplug( TQWidget *w )
{
- KToolBar *toolBar = (KToolBar *)w;
+ TDEToolBar *toolBar = (TDEToolBar *)w;
int idx = findContainer( w );
toolBar->removeItem( itemId( idx ) );
diff --git a/konq-plugins/sidebar/mediaplayer/controls.h b/konq-plugins/sidebar/mediaplayer/controls.h
index 3ecd9af..0c19d23 100644
--- a/konq-plugins/sidebar/mediaplayer/controls.h
+++ b/konq-plugins/sidebar/mediaplayer/controls.h
@@ -69,7 +69,7 @@ private:
/**
* A slider for your toolbar
**/
-class SliderAction : public KAction
+class SliderAction : public TDEAction
{
Q_OBJECT
@@ -84,7 +84,7 @@ signals:
void plugged();
public slots:
- void toolbarMoved(KToolBar::BarPosition pos);
+ void toolbarMoved(TDEToolBar::BarPosition pos);
private:
TQGuardedPtr<TQSlider> m_slider;
TQStringList m_items;
diff --git a/konq-plugins/sidebar/metabar/src/configdialog.cpp b/konq-plugins/sidebar/metabar/src/configdialog.cpp
index ba2b129..45938a9 100644
--- a/konq-plugins/sidebar/metabar/src/configdialog.cpp
+++ b/konq-plugins/sidebar/metabar/src/configdialog.cpp
@@ -143,7 +143,7 @@ ConfigDialog::ConfigDialog(TQWidget *parent, const char *name) : TQDialog(parent
link_down->setEnabled(false);
connect(link_down, TQT_SIGNAL(clicked()), this, TQT_SLOT(moveLinkDown()));
- link_list = new KListView(links);
+ link_list = new TDEListView(links);
link_list->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
link_list->setSorting(-1);
link_list->setItemsMovable(TRUE);
@@ -154,7 +154,7 @@ ConfigDialog::ConfigDialog(TQWidget *parent, const char *name) : TQDialog(parent
TQWidget *actionPage = new TQWidget;
- actionSelector = new KActionSelector(actionPage);
+ actionSelector = new TDEActionSelector(actionPage);
loadAvailableActions();
tab->addTab(general, i18n("General"));
diff --git a/konq-plugins/sidebar/metabar/src/configdialog.h b/konq-plugins/sidebar/metabar/src/configdialog.h
index 190c982..b37469a 100644
--- a/konq-plugins/sidebar/metabar/src/configdialog.h
+++ b/konq-plugins/sidebar/metabar/src/configdialog.h
@@ -70,13 +70,13 @@ class ConfigDialog : public TQDialog
TQCheckBox *servicemenus;
TQCheckBox *showframe;
- KListView *link_list;
+ TDEListView *link_list;
KComboBox *themes;
TQCString topWidgetName;
- KActionSelector *actionSelector;
+ TDEActionSelector *actionSelector;
TQPtrDict<LinkEntry> linkList;
diff --git a/konq-plugins/sidebar/metabar/src/metabarwidget.cpp b/konq-plugins/sidebar/metabar/src/metabarwidget.cpp
index af141cc..2548c3f 100644
--- a/konq-plugins/sidebar/metabar/src/metabarwidget.cpp
+++ b/konq-plugins/sidebar/metabar/src/metabarwidget.cpp
@@ -117,11 +117,11 @@ MetabarWidget::MetabarWidget(TQWidget *parent, const char *name) : TQWidget(pare
TQVBoxLayout *layout = new TQVBoxLayout(this);
layout->addWidget(html->view());
- popup = new KPopupMenu(0);
- KAction *configAction = new KAction(i18n("Configure %1...").arg("Metabar"), "configure", KShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotShowConfig()), html->actionCollection(), "configure");
+ popup = new TDEPopupMenu(0);
+ TDEAction *configAction = new TDEAction(i18n("Configure %1...").arg("Metabar"), "configure", TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotShowConfig()), html->actionCollection(), "configure");
configAction->plug(popup);
- KAction *reloadAction = new KAction(i18n("Reload Theme"), "reload", KShortcut(), TQT_TQOBJECT(this), TQT_SLOT(setTheme()), html->actionCollection(), "reload");
+ TDEAction *reloadAction = new TDEAction(i18n("Reload Theme"), "reload", TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(setTheme()), html->actionCollection(), "reload");
reloadAction->plug(popup);
setTheme();
diff --git a/konq-plugins/sidebar/metabar/src/metabarwidget.h b/konq-plugins/sidebar/metabar/src/metabarwidget.h
index 667b461..b832bc5 100644
--- a/konq-plugins/sidebar/metabar/src/metabarwidget.h
+++ b/konq-plugins/sidebar/metabar/src/metabarwidget.h
@@ -61,7 +61,7 @@ class MetabarWidget : public TQWidget
MetabarFunctions *functions;
KDirWatch *dir_watch;
- KPopupMenu *popup;
+ TDEPopupMenu *popup;
TQDict<ProtocolPlugin> plugins;
diff --git a/konq-plugins/sidebar/metabar/src/serviceloader.cpp b/konq-plugins/sidebar/metabar/src/serviceloader.cpp
index af04017..bbffb01 100644
--- a/konq-plugins/sidebar/metabar/src/serviceloader.cpp
+++ b/konq-plugins/sidebar/metabar/src/serviceloader.cpp
@@ -145,7 +145,7 @@ void ServiceLoader::loadServices(const KFileItem item, DOM::DOMString &html, int
const TQString priority = cfg.readEntry("X-TDE-Priority");
const TQString submenuName = cfg.readEntry( "X-TDE-Submenu" );
bool usePopup = false;
- KPopupMenu *popup;
+ TDEPopupMenu *popup;
if(!submenuName.isEmpty()){
usePopup = true;
@@ -156,7 +156,7 @@ void ServiceLoader::loadServices(const KFileItem item, DOM::DOMString &html, int
else{
MetabarWidget::addEntry(html, submenuName, "servicepopup://" + idString, "1rightarrow", "popup" + idString, count < maxActions ? TQString() : TQString("hiddenaction"), count >= maxActions);
- popup = new KPopupMenu();
+ popup = new TDEPopupMenu();
popups.insert(idString, popup);
count++;
@@ -168,7 +168,7 @@ void ServiceLoader::loadServices(const KFileItem item, DOM::DOMString &html, int
for (TQValueList<KDEDesktopMimeType::Service>::iterator it = list.begin(); it != list.end(); ++it){
if(usePopup){
- KAction *action = new KAction((*it).m_strName, (*it).m_strIcon, KShortcut(), TQT_TQOBJECT(this), TQT_SLOT(runAction()), TQT_TQOBJECT(popup), idString.utf8());
+ TDEAction *action = new TDEAction((*it).m_strName, (*it).m_strIcon, TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(runAction()), TQT_TQOBJECT(popup), idString.utf8());
action->plug(popup);
}
else{
@@ -204,7 +204,7 @@ void ServiceLoader::runAction(const TQString& name)
void ServiceLoader::showPopup(const TQString &popup, const TQPoint &point)
{
- KPopupMenu *p = popups[popup];
+ TDEPopupMenu *p = popups[popup];
if(p){
p->exec(point);
}
diff --git a/konq-plugins/sidebar/metabar/src/serviceloader.h b/konq-plugins/sidebar/metabar/src/serviceloader.h
index 99d85ed..42268de 100644
--- a/konq-plugins/sidebar/metabar/src/serviceloader.h
+++ b/konq-plugins/sidebar/metabar/src/serviceloader.h
@@ -49,7 +49,7 @@ class ServiceLoader : public TQObject
void showPopup(const TQString &popup, const TQPoint &point);
private:
- TQDict<KPopupMenu> popups;
+ TQDict<TDEPopupMenu> popups;
TQMap<TQString,KDEDesktopMimeType::Service> services;
KURL::List urlList;
diff --git a/konq-plugins/sidebar/newsticker/nspanel.cpp b/konq-plugins/sidebar/newsticker/nspanel.cpp
index a5c1261..22bb3a7 100644
--- a/konq-plugins/sidebar/newsticker/nspanel.cpp
+++ b/konq-plugins/sidebar/newsticker/nspanel.cpp
@@ -36,12 +36,12 @@ namespace KSB_News {
// ListBox including ToolTip for item
////////////////////////////////////////////////////////////////
TTListBox::TTListBox(TQWidget *parent, const char *name, WFlags f)
- : KListBox(parent, name, f),
+ : TDEListBox(parent, name, f),
TQToolTip(this) {
}
void TTListBox::clear() {
- KListBox::clear();
+ TDEListBox::clear();
}
void TTListBox::maybeTip(const TQPoint &point) {
diff --git a/konq-plugins/sidebar/newsticker/nspanel.h b/konq-plugins/sidebar/newsticker/nspanel.h
index b09ab33..36b503e 100644
--- a/konq-plugins/sidebar/newsticker/nspanel.h
+++ b/konq-plugins/sidebar/newsticker/nspanel.h
@@ -42,7 +42,7 @@ namespace KSB_News {
////////////////////////////////////////////////////////////////
// ListBox including ToolTip for item
////////////////////////////////////////////////////////////////
- class TTListBox : public KListBox, TQToolTip {
+ class TTListBox : public TDEListBox, TQToolTip {
public:
TTListBox (TQWidget *parent = 0, const char *name = 0, WFlags f = 0);
void clear();
diff --git a/konq-plugins/sidebar/newsticker/nsstacktabwidget.cpp b/konq-plugins/sidebar/newsticker/nsstacktabwidget.cpp
index f6b3b7d..12be5c7 100644
--- a/konq-plugins/sidebar/newsticker/nsstacktabwidget.cpp
+++ b/konq-plugins/sidebar/newsticker/nsstacktabwidget.cpp
@@ -83,7 +83,7 @@ namespace KSB_News {
// popup menu
- popup = new KPopupMenu(this);
+ popup = new TDEPopupMenu(this);
popup->insertItem(KStdGuiItem::configure().iconSet(),
i18n("&Configure Newsticker..."), this,
TQT_SLOT(slotConfigure()));
@@ -94,7 +94,7 @@ namespace KSB_News {
popup->insertSeparator();
// help menu
- helpmenu = new KPopupMenu(this);
+ helpmenu = new TDEPopupMenu(this);
helpmenu->insertItem(appIcon, i18n("&About Newsticker"), this,
TQT_SLOT(slotShowAbout()));
helpmenu->insertItem(i18n("&Report Bug..."), this,
diff --git a/konq-plugins/sidebar/newsticker/nsstacktabwidget.h b/konq-plugins/sidebar/newsticker/nsstacktabwidget.h
index 2be171f..a1d6783 100644
--- a/konq-plugins/sidebar/newsticker/nsstacktabwidget.h
+++ b/konq-plugins/sidebar/newsticker/nsstacktabwidget.h
@@ -35,7 +35,7 @@
class TQVBoxLayout;
class TQPushButton;
class TQStringList;
-class KPopupMenu;
+class TDEPopupMenu;
class TDEAboutData;
class KAboutApplication;
class KBugReport;
@@ -76,7 +76,7 @@ namespace KSB_News {
TQPtrDict<TQWidget> pagesheader;
TQVBoxLayout *layout;
TQWidget *currentPage;
- KPopupMenu *popup, *helpmenu;
+ TDEPopupMenu *popup, *helpmenu;
TDEAboutData *m_aboutdata;
KAboutApplication *m_about;
KBugReport *m_bugreport;
diff --git a/konq-plugins/tdehtmlsettingsplugin/settingsplugin.cpp b/konq-plugins/tdehtmlsettingsplugin/settingsplugin.cpp
index f81dacc..a12d714 100644
--- a/konq-plugins/tdehtmlsettingsplugin/settingsplugin.cpp
+++ b/konq-plugins/tdehtmlsettingsplugin/settingsplugin.cpp
@@ -49,54 +49,54 @@ SettingsPlugin::SettingsPlugin( TQObject* parent, const char* name,
if ( !kapp->dcopClient()->isAttached() )
kapp->dcopClient()->attach();
- KActionMenu *menu = new KActionMenu( i18n("HTML Settings"), "configure",
+ TDEActionMenu *menu = new TDEActionMenu( i18n("HTML Settings"), "configure",
actionCollection(), "action menu" );
menu->setDelayed( false );
- KToggleAction *action;
+ TDEToggleAction *action;
- action = new KToggleAction( i18n("Java&Script"), 0,
+ action = new TDEToggleAction( i18n("Java&Script"), 0,
this, TQT_SLOT(toggleJavascript()),
actionCollection(), "javascript" );
menu->insert( action );
- action = new KToggleAction( i18n("&Java"), 0,
+ action = new TDEToggleAction( i18n("&Java"), 0,
this, TQT_SLOT(toggleJava()),
actionCollection(), "java" );
menu->insert( action );
- action = new KToggleAction( i18n("&Cookies"), 0,
+ action = new TDEToggleAction( i18n("&Cookies"), 0,
this, TQT_SLOT(toggleCookies()),
actionCollection(), "cookies" );
menu->insert( action );
- action = new KToggleAction( i18n("&Plugins"), 0,
+ action = new TDEToggleAction( i18n("&Plugins"), 0,
this, TQT_SLOT(togglePlugins()),
actionCollection(), "plugins" );
menu->insert( action );
- action = new KToggleAction( i18n("Autoload &Images"), 0,
+ action = new TDEToggleAction( i18n("Autoload &Images"), 0,
this, TQT_SLOT(toggleImageLoading()),
actionCollection(), "imageloading" );
menu->insert( action );
- menu->insert( new KActionSeparator(actionCollection()) );
+ menu->insert( new TDEActionSeparator(actionCollection()) );
- action = new KToggleAction( i18n("Enable Pro&xy"), 0,
+ action = new TDEToggleAction( i18n("Enable Pro&xy"), 0,
this, TQT_SLOT(toggleProxy()),
actionCollection(), "useproxy" );
action->setCheckedState(i18n("Disable Pro&xy"));
menu->insert( action );
- action = new KToggleAction( i18n("Enable Cac&he"), 0,
+ action = new TDEToggleAction( i18n("Enable Cac&he"), 0,
this, TQT_SLOT(toggleCache()),
actionCollection(), "usecache" );
action->setCheckedState(i18n("Disable Cac&he"));
menu->insert( action );
- KSelectAction *sAction = new KSelectAction( i18n("Cache Po&licy"), 0,
+ TDESelectAction *sAction = new TDESelectAction( i18n("Cache Po&licy"), 0,
0, 0, actionCollection(),
"cachepolicy" );
TQStringList policies;
@@ -129,25 +129,25 @@ void SettingsPlugin::showPopup()
KProtocolManager::reparseConfiguration();
bool cookies = cookiesEnabled( part->url().url() );
- ((KToggleAction*)actionCollection()->action("useproxy"))->setChecked(KProtocolManager::useProxy());
- ((KToggleAction*)actionCollection()->action("java"))->setChecked( part->javaEnabled() );
- ((KToggleAction*)actionCollection()->action("javascript"))->setChecked( part->jScriptEnabled() );
- ((KToggleAction*)actionCollection()->action("cookies"))->setChecked( cookies );
- ((KToggleAction*)actionCollection()->action("plugins"))->setChecked( part->pluginsEnabled() );
- ((KToggleAction*)actionCollection()->action("imageloading"))->setChecked( part->autoloadImages() );
- ((KToggleAction*)actionCollection()->action("usecache"))->setChecked(KProtocolManager::useCache());
+ ((TDEToggleAction*)actionCollection()->action("useproxy"))->setChecked(KProtocolManager::useProxy());
+ ((TDEToggleAction*)actionCollection()->action("java"))->setChecked( part->javaEnabled() );
+ ((TDEToggleAction*)actionCollection()->action("javascript"))->setChecked( part->jScriptEnabled() );
+ ((TDEToggleAction*)actionCollection()->action("cookies"))->setChecked( cookies );
+ ((TDEToggleAction*)actionCollection()->action("plugins"))->setChecked( part->pluginsEnabled() );
+ ((TDEToggleAction*)actionCollection()->action("imageloading"))->setChecked( part->autoloadImages() );
+ ((TDEToggleAction*)actionCollection()->action("usecache"))->setChecked(KProtocolManager::useCache());
TDEIO::CacheControl cc = KProtocolManager::cacheControl();
switch ( cc )
{
case TDEIO::CC_Verify:
- ((KSelectAction*)actionCollection()->action("cachepolicy"))->setCurrentItem( 0 );
+ ((TDESelectAction*)actionCollection()->action("cachepolicy"))->setCurrentItem( 0 );
break;
case TDEIO::CC_CacheOnly:
- ((KSelectAction*)actionCollection()->action("cachepolicy"))->setCurrentItem( 2 );
+ ((TDESelectAction*)actionCollection()->action("cachepolicy"))->setCurrentItem( 2 );
break;
case TDEIO::CC_Cache:
- ((KSelectAction*)actionCollection()->action("cachepolicy"))->setCurrentItem( 1 );
+ ((TDESelectAction*)actionCollection()->action("cachepolicy"))->setCurrentItem( 1 );
break;
case TDEIO::CC_Reload: // nothing for now
case TDEIO::CC_Refresh:
@@ -162,7 +162,7 @@ void SettingsPlugin::toggleJava()
if( parent() && parent()->inherits("TDEHTMLPart"))
{
TDEHTMLPart *part = static_cast<TDEHTMLPart *>(parent());
- part->setJavaEnabled( ((KToggleAction*)actionCollection()->action("java"))->isChecked() );
+ part->setJavaEnabled( ((TDEToggleAction*)actionCollection()->action("java"))->isChecked() );
}
}
@@ -171,7 +171,7 @@ void SettingsPlugin::toggleJavascript()
if( parent() && parent()->inherits("TDEHTMLPart"))
{
TDEHTMLPart *part = static_cast<TDEHTMLPart *>(parent());
- part->setJScriptEnabled( ((KToggleAction*)actionCollection()->action("javascript"))->isChecked() );
+ part->setJScriptEnabled( ((TDEToggleAction*)actionCollection()->action("javascript"))->isChecked() );
}
}
@@ -183,7 +183,7 @@ void SettingsPlugin::toggleCookies()
TDEHTMLPart *part = static_cast<TDEHTMLPart *>( parent() );
TQString advice;
- bool enable = ((KToggleAction*)actionCollection()->action("cookies"))->isChecked();
+ bool enable = ((TDEToggleAction*)actionCollection()->action("cookies"))->isChecked();
advice = enable ? "Accept" : "Reject";
TQCString replyType;
@@ -206,7 +206,7 @@ void SettingsPlugin::togglePlugins()
if( parent() && parent()->inherits("TDEHTMLPart"))
{
TDEHTMLPart *part = static_cast<TDEHTMLPart *>(parent());
- part->setPluginsEnabled( ((KToggleAction*)actionCollection()->action("plugins"))->isChecked() );
+ part->setPluginsEnabled( ((TDEToggleAction*)actionCollection()->action("plugins"))->isChecked() );
}
}
@@ -215,7 +215,7 @@ void SettingsPlugin::toggleImageLoading()
if( parent() && parent()->inherits("TDEHTMLPart"))
{
TDEHTMLPart *part = static_cast<TDEHTMLPart *>(parent());
- part->setAutoloadImages( ((KToggleAction*)actionCollection()->action("imageloading"))->isChecked() );
+ part->setAutoloadImages( ((TDEToggleAction*)actionCollection()->action("imageloading"))->isChecked() );
}
}
@@ -254,7 +254,7 @@ bool SettingsPlugin::cookiesEnabled( const TQString& url )
void SettingsPlugin::toggleProxy()
{
- bool enable = ((KToggleAction*)actionCollection()->action("useproxy"))->isChecked();
+ bool enable = ((TDEToggleAction*)actionCollection()->action("useproxy"))->isChecked();
int type;
@@ -270,7 +270,7 @@ void SettingsPlugin::toggleProxy()
config.setGroup( "Proxy Settings" );
config.writeEntry( "ProxyType", type );
- ((KToggleAction*)actionCollection()->action("useproxy"))->setChecked(enable);
+ ((TDEToggleAction*)actionCollection()->action("useproxy"))->setChecked(enable);
updateIOSlaves();
}
@@ -281,7 +281,7 @@ void SettingsPlugin::toggleCache()
TDEConfig config( "tdeio_httprc", false, false );
config.writeEntry( "UseCache", !usesCache );
- ((KToggleAction*)actionCollection()->action("usecache"))->setChecked( !usesCache );
+ ((TDEToggleAction*)actionCollection()->action("usecache"))->setChecked( !usesCache );
updateIOSlaves();
}
diff --git a/konq-plugins/uachanger/uachangerplugin.cpp b/konq-plugins/uachanger/uachangerplugin.cpp
index fe671a9..1c9187f 100644
--- a/konq-plugins/uachanger/uachangerplugin.cpp
+++ b/konq-plugins/uachanger/uachangerplugin.cpp
@@ -57,7 +57,7 @@ UAChangerPlugin::UAChangerPlugin( TQObject* parent, const char* name,
{
setInstance(UAChangerPlugin::instance());
- m_pUAMenu = new KActionMenu( i18n("Change Browser &Identification"), "agent",
+ m_pUAMenu = new TDEActionMenu( i18n("Change Browser &Identification"), "agent",
actionCollection(), "changeuseragent" );
m_pUAMenu->setDelayed( false );
connect( m_pUAMenu->popupMenu(), TQT_SIGNAL( aboutToShow() ),
@@ -226,7 +226,7 @@ void UAChangerPlugin::slotAboutToShow()
AliasConstIterator map = m_mapAlias.begin();
for( ; map != m_mapAlias.end(); ++map )
{
- KPopupMenu *browserMenu = new KPopupMenu;
+ TDEPopupMenu *browserMenu = new TDEPopupMenu;
BrowserGroup::ConstIterator e = map.data().begin();
for( ; e != map.data().end(); ++e )
{
diff --git a/konq-plugins/uachanger/uachangerplugin.h b/konq-plugins/uachanger/uachangerplugin.h
index d90ac76..67936b3 100644
--- a/konq-plugins/uachanger/uachangerplugin.h
+++ b/konq-plugins/uachanger/uachangerplugin.h
@@ -30,7 +30,7 @@
#include <tdeparts/plugin.h>
class TDEHTMLPart;
-class KActionMenu;
+class TDEActionMenu;
class TDEConfig;
namespace TDEIO
@@ -73,7 +73,7 @@ private:
bool m_bSettingsLoaded;
TDEHTMLPart* m_part;
- KActionMenu* m_pUAMenu;
+ TDEActionMenu* m_pUAMenu;
TDEConfig* m_config;
KURL m_currentURL;
diff --git a/konq-plugins/validators/plugin_validators.cpp b/konq-plugins/validators/plugin_validators.cpp
index c411038..8e2ff26 100644
--- a/konq-plugins/validators/plugin_validators.cpp
+++ b/konq-plugins/validators/plugin_validators.cpp
@@ -50,21 +50,21 @@ PluginValidators::PluginValidators( TQObject* parent, const char* name,
{
setInstance(PluginValidatorsFactory::instance());
- m_menu = new KActionMenu ( i18n( "&Validate Web Page" ), "validators",
+ m_menu = new TDEActionMenu ( i18n( "&Validate Web Page" ), "validators",
actionCollection(), "validateWebpage" );
m_menu->setDelayed( false );
- m_menu->insert( new KAction( i18n( "Validate &HTML" ),
+ m_menu->insert( new TDEAction( i18n( "Validate &HTML" ),
"htmlvalidator", 0,
this, TQT_SLOT(slotValidateHTML()),
actionCollection(), "validateHTML") );
- m_menu->insert( new KAction( i18n( "Validate &CSS" ),
+ m_menu->insert( new TDEAction( i18n( "Validate &CSS" ),
"cssvalidator", 0,
this, TQT_SLOT(slotValidateCSS()),
actionCollection(), "validateCSS") );
- m_menu->insert( new KAction( i18n( "Validate &Links" ),
+ m_menu->insert( new TDEAction( i18n( "Validate &Links" ),
0,
this, TQT_SLOT(slotValidateLinks()),
actionCollection(), "validateLinks") );
@@ -73,7 +73,7 @@ PluginValidators::PluginValidators( TQObject* parent, const char* name,
if ( parent && parent->inherits( "TDEHTMLPart" ))
{
- m_menu->insert( new KAction( i18n( "C&onfigure Validator..." ),
+ m_menu->insert( new TDEAction( i18n( "C&onfigure Validator..." ),
"configure", 0,
this, TQT_SLOT(slotConfigure()),
actionCollection(), "configure") );
@@ -90,7 +90,7 @@ PluginValidators::PluginValidators( TQObject* parent, const char* name,
PluginValidators::~PluginValidators()
{
delete m_configDialog;
-// Dont' delete the action. KActionCollection as parent does the job already
+// Dont' delete the action. TDEActionCollection as parent does the job already
// and not deleting it at this point also ensures that in case we are not unplugged
// from the GUI yet and the ~KXMLGUIClient destructor will do so it won't hit a
// dead pointer. The kxmlgui factory keeps references to the actions, but it does not
diff --git a/konq-plugins/validators/plugin_validators.h b/konq-plugins/validators/plugin_validators.h
index 97e528e..1be1337 100644
--- a/konq-plugins/validators/plugin_validators.h
+++ b/konq-plugins/validators/plugin_validators.h
@@ -35,7 +35,7 @@
#include "validatorsdialog.h"
#include <tqguardedptr.h>
-class KAction;
+class TDEAction;
class KURL;
class PluginValidators : public KParts::Plugin
@@ -57,7 +57,7 @@ private slots:
void slotStarted( TDEIO::Job* );
private:
- KActionMenu *m_menu;
+ TDEActionMenu *m_menu;
TQGuardedPtr<ValidatorsDialog> m_configDialog; // |
// +-> Order dependency.
TDEHTMLPart* m_part; // |
diff --git a/konq-plugins/webarchiver/archiveviewbase.ui b/konq-plugins/webarchiver/archiveviewbase.ui
index 743c591..b989c51 100644
--- a/konq-plugins/webarchiver/archiveviewbase.ui
+++ b/konq-plugins/webarchiver/archiveviewbase.ui
@@ -82,7 +82,7 @@
<cstring>progressBar</cstring>
</property>
</widget>
- <widget class="KListView">
+ <widget class="TDEListView">
<column>
<property name="text">
<string>URL</string>
diff --git a/konq-plugins/webarchiver/plugin_webarchiver.cpp b/konq-plugins/webarchiver/plugin_webarchiver.cpp
index abb72c9..6c79f72 100644
--- a/konq-plugins/webarchiver/plugin_webarchiver.cpp
+++ b/konq-plugins/webarchiver/plugin_webarchiver.cpp
@@ -54,7 +54,7 @@ PluginWebArchiver::PluginWebArchiver( TQObject* parent, const char* name,
const TQStringList & )
: Plugin( parent, name )
{
- (void) new KAction( i18n("Archive &Web Page..."),
+ (void) new TDEAction( i18n("Archive &Web Page..."),
"webarchiver", 0,
this, TQT_SLOT(slotSaveToArchive()),
actionCollection(), "archivepage" );