summaryrefslogtreecommitdiffstats
path: root/konq-plugins
diff options
context:
space:
mode:
Diffstat (limited to 'konq-plugins')
-rw-r--r--konq-plugins/adblock/adblock.cpp4
-rw-r--r--konq-plugins/adblock/adblock.h2
-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/arkplugin/arkplugin.cpp6
-rw-r--r--konq-plugins/arkplugin/arkplugin.h2
-rw-r--r--konq-plugins/babelfish/plugin_babelfish.cpp10
-rw-r--r--konq-plugins/babelfish/plugin_babelfish.h4
-rw-r--r--konq-plugins/dirfilter/dirfilterplugin.cpp4
-rw-r--r--konq-plugins/dirfilter/dirfilterplugin.h2
-rw-r--r--konq-plugins/domtreeviewer/domtreewindow.cpp6
-rw-r--r--konq-plugins/domtreeviewer/domtreewindow.h12
-rw-r--r--konq-plugins/fsview/fsview.cpp16
-rw-r--r--konq-plugins/fsview/fsview.h8
-rw-r--r--konq-plugins/fsview/fsview_part.cpp4
-rw-r--r--konq-plugins/fsview/fsview_part.h2
-rw-r--r--konq-plugins/fsview/main.cpp2
-rw-r--r--konq-plugins/fsview/scan.cpp2
-rw-r--r--konq-plugins/fsview/scan.h12
-rw-r--r--konq-plugins/fsview/treemap.cpp4
-rw-r--r--konq-plugins/fsview/treemap.h6
-rw-r--r--konq-plugins/khtmlsettingsplugin/settingsplugin.cpp30
-rw-r--r--konq-plugins/khtmlsettingsplugin/settingsplugin.h4
-rw-r--r--konq-plugins/kimgalleryplugin/imgallerydialog.cpp2
-rw-r--r--konq-plugins/kimgalleryplugin/imgallerydialog.h4
-rw-r--r--konq-plugins/kimgalleryplugin/imgalleryplugin.cpp2
-rw-r--r--konq-plugins/kuick/kcmkuick/kcmkuick.cpp14
-rw-r--r--konq-plugins/kuick/kcmkuick/kcmkuick.h2
-rw-r--r--konq-plugins/kuick/kdirmenu.cpp2
-rw-r--r--konq-plugins/kuick/kmetamenu.h4
-rw-r--r--konq-plugins/kuick/kuick_plugin.cpp8
-rw-r--r--konq-plugins/microformat/konqmficon.cpp2
-rw-r--r--konq-plugins/searchbar/searchbar.cpp24
-rw-r--r--konq-plugins/searchbar/searchbar.h4
-rw-r--r--konq-plugins/sidebar/delicious/mainWidget.cpp26
-rw-r--r--konq-plugins/sidebar/delicious/mainWidget.h10
-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/defaultplugin.cpp22
-rw-r--r--konq-plugins/sidebar/metabar/src/defaultplugin.h4
-rw-r--r--konq-plugins/sidebar/metabar/src/metabarfunctions.cpp4
-rw-r--r--konq-plugins/sidebar/metabar/src/metabarwidget.cpp2
-rw-r--r--konq-plugins/sidebar/metabar/src/metabarwidget.h2
-rw-r--r--konq-plugins/sidebar/metabar/src/protocolplugin.cpp4
-rw-r--r--konq-plugins/sidebar/metabar/src/serviceloader.cpp2
-rw-r--r--konq-plugins/sidebar/metabar/src/settingsplugin.cpp30
-rw-r--r--konq-plugins/sidebar/metabar/src/settingsplugin.h6
-rw-r--r--konq-plugins/sidebar/newsticker/norsswidget.cpp6
-rw-r--r--konq-plugins/sidebar/newsticker/norsswidget.h4
-rw-r--r--konq-plugins/sidebar/newsticker/nspanel.h2
-rw-r--r--konq-plugins/sidebar/newsticker/nsstacktabwidget.cpp6
-rw-r--r--konq-plugins/sidebar/newsticker/nsstacktabwidget.h4
-rw-r--r--konq-plugins/uachanger/uachangerplugin.cpp14
-rw-r--r--konq-plugins/uachanger/uachangerplugin.h8
-rw-r--r--konq-plugins/validators/plugin_validators.cpp6
-rw-r--r--konq-plugins/validators/plugin_validators.h2
-rw-r--r--konq-plugins/validators/validatorsdialog.cpp2
-rw-r--r--konq-plugins/validators/validatorsdialog.h2
-rw-r--r--konq-plugins/webarchiver/archivedialog.cpp6
-rw-r--r--konq-plugins/webarchiver/archivedialog.h2
61 files changed, 200 insertions, 200 deletions
diff --git a/konq-plugins/adblock/adblock.cpp b/konq-plugins/adblock/adblock.cpp
index c18c061..c07a2c1 100644
--- a/konq-plugins/adblock/adblock.cpp
+++ b/konq-plugins/adblock/adblock.cpp
@@ -65,7 +65,7 @@ AdBlock::AdBlock(TQObject *parent, const char *name, const TQStringList &) :
m_menu = new KPopupMenu(m_part->widget());
m_menu->insertTitle(i18n("Adblock"));
- m_menu->insertItem(i18n("Configure"), this, TQT_SLOT(showKCModule()));
+ m_menu->insertItem(i18n("Configure"), this, TQT_SLOT(showTDECModule()));
m_menu->insertItem(i18n("Show Elements"), this, TQT_SLOT(showDialogue()));
connect(m_part, TQT_SIGNAL(completed()), this, TQT_SLOT(initLabel()));
@@ -126,7 +126,7 @@ void AdBlock::showDialogue()
dialogue->show();
}
-void AdBlock::showKCModule()
+void AdBlock::showTDECModule()
{
KCMultiDialog* dialogue = new KCMultiDialog(m_part->widget());
dialogue->addModule("khtml_filter");
diff --git a/konq-plugins/adblock/adblock.h b/konq-plugins/adblock/adblock.h
index 336fe23..391934c 100644
--- a/konq-plugins/adblock/adblock.h
+++ b/konq-plugins/adblock/adblock.h
@@ -69,7 +69,7 @@ private slots:
void showDialogue();
void addAdFilter(const TQString &url);
void contextMenu();
- void showKCModule();
+ void showTDECModule();
};
// ----------------------------------------------------------------------------
diff --git a/konq-plugins/akregator/akregatorplugin.cpp b/konq-plugins/akregator/akregatorplugin.cpp
index d5b3e6a..11d6f6c 100644
--- a/konq-plugins/akregator/akregatorplugin.cpp
+++ b/konq-plugins/akregator/akregatorplugin.cpp
@@ -57,7 +57,7 @@ AkregatorMenu::AkregatorMenu( KonqPopupMenu * popupmenu, const char *name, const
// Do nothing if user has turned us off.
// TODO: Not yet implemented in aKregator settings.
- /*m_conf = new KConfig( "akregatorrc" );
+ /*m_conf = new TDEConfig( "akregatorrc" );
m_conf->setGroup( "AkregatorKonqPlugin" );
if ( !m_conf->readBoolEntry( "Enable", true ) )
return;
diff --git a/konq-plugins/akregator/akregatorplugin.h b/konq-plugins/akregator/akregatorplugin.h
index 2406da4..658730c 100644
--- a/konq-plugins/akregator/akregatorplugin.h
+++ b/konq-plugins/akregator/akregatorplugin.h
@@ -50,7 +50,7 @@ protected:
private:
TQStringList m_feedMimeTypes;
- KConfig *m_conf;
+ TDEConfig *m_conf;
KHTMLPart *m_part;
TQString m_feedURL;
};
diff --git a/konq-plugins/akregator/konqfeedicon.cpp b/konq-plugins/akregator/konqfeedicon.cpp
index a81d1a1..dd8a8c5 100644
--- a/konq-plugins/akregator/konqfeedicon.cpp
+++ b/konq-plugins/akregator/konqfeedicon.cpp
@@ -71,7 +71,7 @@ void KonqFeedIcon::waitPartToLoad()
{
connect(m_part, TQT_SIGNAL(completed()), this, TQT_SLOT(addFeedIcon()));
connect(m_part, TQT_SIGNAL(completed(bool)), this, TQT_SLOT(addFeedIcon())); // to make pages with metarefresh to work
- connect(m_part, TQT_SIGNAL(started(KIO::Job *)), this, TQT_SLOT(removeFeedIcon()));
+ connect(m_part, TQT_SIGNAL(started(TDEIO::Job *)), this, TQT_SLOT(removeFeedIcon()));
addFeedIcon();
}
diff --git a/konq-plugins/arkplugin/arkplugin.cpp b/konq-plugins/arkplugin/arkplugin.cpp
index fef5779..acd10f6 100644
--- a/konq-plugins/arkplugin/arkplugin.cpp
+++ b/konq-plugins/arkplugin/arkplugin.cpp
@@ -49,7 +49,7 @@ ArkMenu::ArkMenu( KonqPopupMenu * popupmenu, const char *name, const TQStringLis
|| ( KStandardDirs::findExe( "ark" ).isNull() ) )
return;
- m_conf = new KConfig( "arkrc" );
+ m_conf = new TDEConfig( "arkrc" );
m_conf->setGroup( "ark" );
if ( !m_conf->readBoolEntry( "KonquerorIntegration", true ) )
@@ -471,7 +471,7 @@ void ArkMenu::slotCompressAs( int pos )
{
target = m_dir + i18n("Archive") + m_extensionList[ pos ];
int i=1;
- while ( KIO::NetAccess::exists(target, true, 0 ) )
+ while ( TDEIO::NetAccess::exists(target, true, 0 ) )
{
target = m_dir + i18n("Archive %1").arg(i) + m_extensionList[ pos ];
i++;
@@ -515,7 +515,7 @@ void ArkMenu::slotCompressAsDefault()
{
name = m_dir + i18n("Archive") + m_ext;
int i=1;
- while ( KIO::NetAccess::exists(name, true, 0 ) )
+ while ( TDEIO::NetAccess::exists(name, true, 0 ) )
{
name = m_dir + i18n("Archive %1").arg(i) + m_ext;
i++;
diff --git a/konq-plugins/arkplugin/arkplugin.h b/konq-plugins/arkplugin/arkplugin.h
index 326d298..a1290fa 100644
--- a/konq-plugins/arkplugin/arkplugin.h
+++ b/konq-plugins/arkplugin/arkplugin.h
@@ -65,7 +65,7 @@ private:
KActionMenu * m_addToMenu;
TQSignalMapper * m_compAsMapper;
TQSignalMapper * m_addToMapper;
- KConfig * m_conf;
+ TDEConfig * m_conf;
TQString m_dir; //contains the currect directory
};
diff --git a/konq-plugins/babelfish/plugin_babelfish.cpp b/konq-plugins/babelfish/plugin_babelfish.cpp
index 3848f3b..c4d3f68 100644
--- a/konq-plugins/babelfish/plugin_babelfish.cpp
+++ b/konq-plugins/babelfish/plugin_babelfish.cpp
@@ -2,7 +2,7 @@
Copyright (C) 2001 Kurt Granroth <[email protected]>
Original code: plugin code, connecting to Babelfish and support for selected text
Copyright (C) 2003 Rand2342 <[email protected]>
- Submenus, KConfig file and support for other translation engines
+ Submenus, TDEConfig file and support for other translation engines
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public
@@ -181,8 +181,8 @@ PluginBabelFish::PluginBabelFish( TQObject* parent, const char* name,
if ( parent && parent->inherits( "KHTMLPart" ) )
{
KParts::ReadOnlyPart* part = static_cast<KParts::ReadOnlyPart *>(parent);
- connect( part, TQT_SIGNAL(started(KIO::Job*)), this,
- TQT_SLOT(slotStarted(KIO::Job*)) );
+ connect( part, TQT_SIGNAL(started(TDEIO::Job*)), this,
+ TQT_SLOT(slotStarted(TDEIO::Job*)) );
}
}
@@ -191,7 +191,7 @@ PluginBabelFish::~PluginBabelFish()
delete m_menu;
}
-void PluginBabelFish::slotStarted( KIO::Job* )
+void PluginBabelFish::slotStarted( TDEIO::Job* )
{
if ( parent()->inherits("KHTMLPart") &&
// Babelfish wants http URLs only. No https.
@@ -223,7 +223,7 @@ void PluginBabelFish::translateURL()
}
// Select engine
- KConfig cfg( "translaterc", true );
+ TDEConfig cfg( "translaterc", true );
TQString engine = cfg.readEntry( TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name(), "babelfish" );
// Get URL
diff --git a/konq-plugins/babelfish/plugin_babelfish.h b/konq-plugins/babelfish/plugin_babelfish.h
index 78b1087..8a8bfd8 100644
--- a/konq-plugins/babelfish/plugin_babelfish.h
+++ b/konq-plugins/babelfish/plugin_babelfish.h
@@ -23,7 +23,7 @@
#include <klibloader.h>
class KURL;
-namespace KIO { class Job; }
+namespace TDEIO { class Job; }
class PluginBabelFish : public KParts::Plugin
{
@@ -37,7 +37,7 @@ public:
public slots:
void translateURL();
protected slots:
- void slotStarted( KIO::Job* );
+ void slotStarted( TDEIO::Job* );
private:
KActionMenu* m_menu;
diff --git a/konq-plugins/dirfilter/dirfilterplugin.cpp b/konq-plugins/dirfilter/dirfilterplugin.cpp
index 09a3bfb..9a82666 100644
--- a/konq-plugins/dirfilter/dirfilterplugin.cpp
+++ b/konq-plugins/dirfilter/dirfilterplugin.cpp
@@ -117,7 +117,7 @@ void SessionManager::save (const KURL& url, const TQString& typedFilter)
void SessionManager::saveSettings()
{
- KConfig cfg ("dirfilterrc", false, false);
+ TDEConfig cfg ("dirfilterrc", false, false);
cfg.setGroup ("General");
cfg.writeEntry ("ShowCount", showCount);
@@ -130,7 +130,7 @@ void SessionManager::loadSettings()
if (m_bSettingsLoaded)
return;
- KConfig cfg ("dirfilterrc", false, false);
+ TDEConfig cfg ("dirfilterrc", false, false);
cfg.setGroup ("General");
showCount = cfg.readBoolEntry ("ShowCount", false);
diff --git a/konq-plugins/dirfilter/dirfilterplugin.h b/konq-plugins/dirfilter/dirfilterplugin.h
index f9d7d38..56d6aa5 100644
--- a/konq-plugins/dirfilter/dirfilterplugin.h
+++ b/konq-plugins/dirfilter/dirfilterplugin.h
@@ -39,7 +39,7 @@ namespace KParts
struct URLArgs;
}
-namespace KIO
+namespace TDEIO
{
class Job;
}
diff --git a/konq-plugins/domtreeviewer/domtreewindow.cpp b/konq-plugins/domtreeviewer/domtreewindow.cpp
index a13e288..52b7ba0 100644
--- a/konq-plugins/domtreeviewer/domtreewindow.cpp
+++ b/konq-plugins/domtreeviewer/domtreewindow.cpp
@@ -62,7 +62,7 @@ DOMTreeWindow::DOMTreeWindow(PluginDomtreeviewer *plugin)
part_manager = 0;
// set configuration object
- _config = new KConfig("domtreeviewerrc");
+ _config = new TDEConfig("domtreeviewerrc");
// accept dnd
setAcceptDrops(true);
@@ -189,7 +189,7 @@ TQPopupMenu *DOMTreeWindow::createDOMTreeViewContextMenu()
return static_cast<TQPopupMenu *>(w);
}
-void DOMTreeWindow::saveProperties(KConfig *config)
+void DOMTreeWindow::saveProperties(TDEConfig *config)
{
// the 'config' object points to the session managed
// config file. anything you write here will be available
@@ -206,7 +206,7 @@ void DOMTreeWindow::saveProperties(KConfig *config)
#endif
}
-void DOMTreeWindow::readProperties(KConfig *config)
+void DOMTreeWindow::readProperties(TDEConfig *config)
{
// the 'config' object points to the session managed
// config file. this function is automatically called whenever
diff --git a/konq-plugins/domtreeviewer/domtreewindow.h b/konq-plugins/domtreeviewer/domtreewindow.h
index c138446..2715eb5 100644
--- a/konq-plugins/domtreeviewer/domtreewindow.h
+++ b/konq-plugins/domtreeviewer/domtreewindow.h
@@ -42,7 +42,7 @@ class DOMTreeView;
class PluginDomtreeviewer;
class KAction;
-class KConfig;
+class TDEConfig;
class KPrinter;
class KURL;
class KCommandHistory;
@@ -113,7 +113,7 @@ public:
/**
* Returns the config object for this plugin.
*/
- KConfig *config() const { return _config; }
+ TDEConfig *config() const { return _config; }
/** returns the attribute delete action */
KAction *deleteAttributeAction() const { return del_attr; }
@@ -144,14 +144,14 @@ protected:
* This function is called when it is time for the app to save its
* properties for session management purposes.
*/
- void saveProperties(KConfig *);
+ void saveProperties(TDEConfig *);
/**
- * This function is called when this app is restored. The KConfig
+ * This function is called when this app is restored. The TDEConfig
* object points to the session management config file that was saved
* with @ref saveProperties
*/
- void readProperties(KConfig *);
+ void readProperties(TDEConfig *);
private slots:
@@ -185,7 +185,7 @@ private:
KCommandHistory *m_commandHistory;
TQPopupMenu *infopanel_ctx;
TQPopupMenu *domtree_ctx;
- KConfig *_config;
+ TDEConfig *_config;
KAction *del_tree, *del_attr;
diff --git a/konq-plugins/fsview/fsview.cpp b/konq-plugins/fsview/fsview.cpp
index 49cc4ff..3ad3066 100644
--- a/konq-plugins/fsview/fsview.cpp
+++ b/konq-plugins/fsview/fsview.cpp
@@ -78,17 +78,17 @@ FSView::FSView(Inode* base, TQWidget* parent, const char* name)
_dirsFinished = 0;
_lastDir = 0;
- _config = new KConfig("fsviewrc");
+ _config = new TDEConfig("fsviewrc");
// restore TreeMap visualization options of last execution
- KConfigGroup tmconfig(_config, TQCString("TreeMap"));
+ TDEConfigGroup tmconfig(_config, TQCString("TreeMap"));
restoreOptions(&tmconfig);
TQString str = tmconfig.readEntry("ColorMode");
if (!str.isEmpty()) setColorMode(str);
if (_dirMetric.count() == 0) {
// restore metric cache
- KConfigGroup cconfig(_config, TQCString("MetricCache"));
+ TDEConfigGroup cconfig(_config, TQCString("MetricCache"));
int ccount = cconfig.readNumEntry("Count", 0);
int i, f, d;
double s;
@@ -139,7 +139,7 @@ void FSView::setPath(TQString p)
u.setPath(_path);
if (!kapp->authorizeURLAction("list", KURL(), u))
{
- TQString msg = KIO::buildErrorString(KIO::ERR_ACCESS_DENIED, u.prettyURL());
+ TQString msg = TDEIO::buildErrorString(TDEIO::ERR_ACCESS_DENIED, u.prettyURL());
KMessageBox::queuedMessageBox(this, KMessageBox::Sorry, msg);
}
@@ -326,7 +326,7 @@ void FSView::contextMenu(TreeMapItem* i, const TQPoint& p)
}
}
-void FSView::saveMetric(KConfigGroup* g)
+void FSView::saveMetric(TDEConfigGroup* g)
{
TQMap<TQString, MetricEntry>::iterator it;
int c = 1;
@@ -414,14 +414,14 @@ void FSView::colorActivated(int id)
void FSView::saveFSOptions()
{
- KConfigGroup tmconfig(_config, TQCString("TreeMap"));
+ TDEConfigGroup tmconfig(_config, TQCString("TreeMap"));
saveOptions(&tmconfig);
tmconfig.writeEntry("ColorMode", colorModeString());
- KConfigGroup gconfig(_config, TQCString("General"));
+ TDEConfigGroup gconfig(_config, TQCString("General"));
gconfig.writeEntry("Path", _path);
- KConfigGroup cconfig(_config, TQCString("MetricCache"));
+ TDEConfigGroup cconfig(_config, TQCString("MetricCache"));
saveMetric(&cconfig);
}
diff --git a/konq-plugins/fsview/fsview.h b/konq-plugins/fsview/fsview.h
index 2acde99..bcfd726 100644
--- a/konq-plugins/fsview/fsview.h
+++ b/konq-plugins/fsview/fsview.h
@@ -34,7 +34,7 @@
#include "inode.h"
#include "scan.h"
-class KConfig;
+class TDEConfig;
/* Cached Metric info config */
class MetricEntry
@@ -66,7 +66,7 @@ public:
FSView(Inode*, TQWidget* parent=0, const char* name=0);
~FSView();
- KConfig* config() { return _config; }
+ TDEConfig* config() { return _config; }
void setPath(TQString);
TQString path() { return _path; }
@@ -88,7 +88,7 @@ public:
static bool getDirMetric(const TQString&, double&, unsigned int&, unsigned int&);
static void setDirMetric(const TQString&, double, unsigned int, unsigned int);
- void saveMetric(KConfigGroup*);
+ void saveMetric(TDEConfigGroup*);
void saveFSOptions();
// for color mode
@@ -110,7 +110,7 @@ public slots:
void completed(int dirs);
private:
- KConfig* _config;
+ TDEConfig* _config;
ScanManager _sm;
// when a contextMenu is shown, we don't allow async. refreshs
diff --git a/konq-plugins/fsview/fsview_part.cpp b/konq-plugins/fsview/fsview_part.cpp
index 5bef896..33ad518 100644
--- a/konq-plugins/fsview/fsview_part.cpp
+++ b/konq-plugins/fsview/fsview_part.cpp
@@ -54,7 +54,7 @@ K_EXPORT_COMPONENT_FACTORY( libfsviewpart, FSViewPartFactory )
// FSJob, for progress
FSJob::FSJob(FSView* v)
- : KIO::Job(false)
+ : TDEIO::Job(false)
{
_view = v;
TQObject::connect(v, TQT_SIGNAL(progress(int,int,const TQString&)),
@@ -224,7 +224,7 @@ void FSViewPart::completedSlot(int dirs)
_job = 0;
}
- KConfigGroup cconfig(_view->config(), TQCString("MetricCache"));
+ TDEConfigGroup cconfig(_view->config(), TQCString("MetricCache"));
_view->saveMetric(&cconfig);
emit completed();
diff --git a/konq-plugins/fsview/fsview_part.h b/konq-plugins/fsview/fsview_part.h
index 0919918..891ebfb 100644
--- a/konq-plugins/fsview/fsview_part.h
+++ b/konq-plugins/fsview/fsview_part.h
@@ -62,7 +62,7 @@ private:
FSView* _view;
};
-class FSJob: public KIO::Job
+class FSJob: public TDEIO::Job
{
Q_OBJECT
diff --git a/konq-plugins/fsview/main.cpp b/konq-plugins/fsview/main.cpp
index ec24f6d..2906f74 100644
--- a/konq-plugins/fsview/main.cpp
+++ b/konq-plugins/fsview/main.cpp
@@ -31,7 +31,7 @@ int main(int argc, char* argv[])
TDECmdLineArgs::addCmdLineOptions(options);
TDEApplication a;
- KConfigGroup gconfig(TDEGlobal::config(), TQCString("General"));
+ TDEConfigGroup gconfig(TDEGlobal::config(), TQCString("General"));
TQString path = gconfig.readPathEntry("Path", ".");
TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
diff --git a/konq-plugins/fsview/scan.cpp b/konq-plugins/fsview/scan.cpp
index 1d3d06a..8f4101b 100644
--- a/konq-plugins/fsview/scan.cpp
+++ b/konq-plugins/fsview/scan.cpp
@@ -120,7 +120,7 @@ ScanFile::ScanFile()
_listener = 0;
}
-ScanFile::ScanFile(const TQString& n, KIO::fileoffset_t s)
+ScanFile::ScanFile(const TQString& n, TDEIO::fileoffset_t s)
{
_name = n;
_size = s;
diff --git a/konq-plugins/fsview/scan.h b/konq-plugins/fsview/scan.h
index ca4ce4f..384a6dc 100644
--- a/konq-plugins/fsview/scan.h
+++ b/konq-plugins/fsview/scan.h
@@ -27,7 +27,7 @@
#include <tqvaluevector.h>
#include <tqfile.h>
-/* Use KDE_lstat and KIO::fileoffset_t for 64-bit sizes */
+/* Use KDE_lstat and TDEIO::fileoffset_t for 64-bit sizes */
#include <klargefile.h>
#include <kio/global.h>
@@ -131,11 +131,11 @@ class ScanFile
{
public:
ScanFile();
- ScanFile(const TQString& n, KIO::fileoffset_t s);
+ ScanFile(const TQString& n, TDEIO::fileoffset_t s);
~ScanFile();
const TQString& name() { return _name; }
- KIO::fileoffset_t size() { return _size; }
+ TDEIO::fileoffset_t size() { return _size; }
/* set listener to get callbacks from this ScanDir */
void setListener(ScanListener* l) { _listener = l; }
@@ -143,7 +143,7 @@ class ScanFile
private:
TQString _name;
- KIO::fileoffset_t _size;
+ TDEIO::fileoffset_t _size;
ScanListener* _listener;
};
@@ -189,7 +189,7 @@ class ScanDir
ScanFileVector& files() { return _files; }
ScanDirVector& dirs() { return _dirs; }
const TQString& name() { return _name; }
- KIO::fileoffset_t size() { update(); return _size; }
+ TDEIO::fileoffset_t size() { update(); return _size; }
unsigned int fileCount() { update(); return _fileCount; }
unsigned int dirCount() { update(); return _dirCount; }
ScanDir* parent() { return _parent; }
@@ -219,7 +219,7 @@ class ScanDir
TQString _name;
bool _dirty; /* needs a call to update() */
- KIO::fileoffset_t _size, _fileSize;
+ TDEIO::fileoffset_t _size, _fileSize;
unsigned int _fileCount, _dirCount;
int _dirsFinished, _data;
ScanDir* _parent;
diff --git a/konq-plugins/fsview/treemap.cpp b/konq-plugins/fsview/treemap.cpp
index 32c52f1..466b91a 100644
--- a/konq-plugins/fsview/treemap.cpp
+++ b/konq-plugins/fsview/treemap.cpp
@@ -3117,7 +3117,7 @@ void TreeMapWidget::addDepthStopItems(TQPopupMenu* popup,
* Option saving/restoring
*/
-void TreeMapWidget::saveOptions(KConfigGroup* config, TQString prefix)
+void TreeMapWidget::saveOptions(TDEConfigGroup* config, TQString prefix)
{
config->writeEntry(prefix+"Nesting", splitModeString());
config->writeEntry(prefix+"AllowRotation", allowRotation());
@@ -3142,7 +3142,7 @@ void TreeMapWidget::saveOptions(KConfigGroup* config, TQString prefix)
}
-void TreeMapWidget::restoreOptions(KConfigGroup* config, TQString prefix)
+void TreeMapWidget::restoreOptions(TDEConfigGroup* config, TQString prefix)
{
bool enabled;
int num;
diff --git a/konq-plugins/fsview/treemap.h b/konq-plugins/fsview/treemap.h
index 994368d..0a86702 100644
--- a/konq-plugins/fsview/treemap.h
+++ b/konq-plugins/fsview/treemap.h
@@ -46,7 +46,7 @@ class TreeMapItem;
class TreeMapItemList;
class TQString;
-class KConfigGroup;
+class TDEConfigGroup;
/**
@@ -599,8 +599,8 @@ public:
/**
* Save/restore options.
*/
- void saveOptions(KConfigGroup*, TQString prefix = TQString());
- void restoreOptions(KConfigGroup*, TQString prefix = TQString());
+ void saveOptions(TDEConfigGroup*, TQString prefix = TQString());
+ void restoreOptions(TDEConfigGroup*, TQString prefix = TQString());
/**
* These functions populate given popup menus.
diff --git a/konq-plugins/khtmlsettingsplugin/settingsplugin.cpp b/konq-plugins/khtmlsettingsplugin/settingsplugin.cpp
index af688f1..1d0548c 100644
--- a/konq-plugins/khtmlsettingsplugin/settingsplugin.cpp
+++ b/konq-plugins/khtmlsettingsplugin/settingsplugin.cpp
@@ -122,7 +122,7 @@ void SettingsPlugin::showPopup()
return;
if (!mConfig)
- mConfig = new KConfig("settingspluginrc", false, false);
+ mConfig = new TDEConfig("settingspluginrc", false, false);
KHTMLPart *part = static_cast<KHTMLPart *>( parent() );
@@ -137,20 +137,20 @@ void SettingsPlugin::showPopup()
((KToggleAction*)actionCollection()->action("imageloading"))->setChecked( part->autoloadImages() );
((KToggleAction*)actionCollection()->action("usecache"))->setChecked(KProtocolManager::useCache());
- KIO::CacheControl cc = KProtocolManager::cacheControl();
+ TDEIO::CacheControl cc = KProtocolManager::cacheControl();
switch ( cc )
{
- case KIO::CC_Verify:
+ case TDEIO::CC_Verify:
((KSelectAction*)actionCollection()->action("cachepolicy"))->setCurrentItem( 0 );
break;
- case KIO::CC_CacheOnly:
+ case TDEIO::CC_CacheOnly:
((KSelectAction*)actionCollection()->action("cachepolicy"))->setCurrentItem( 2 );
break;
- case KIO::CC_Cache:
+ case TDEIO::CC_Cache:
((KSelectAction*)actionCollection()->action("cachepolicy"))->setCurrentItem( 1 );
break;
- case KIO::CC_Reload: // nothing for now
- case KIO::CC_Refresh:
+ case TDEIO::CC_Reload: // nothing for now
+ case TDEIO::CC_Refresh:
default:
break;
@@ -237,7 +237,7 @@ bool SettingsPlugin::cookiesEnabled( const TQString& url )
enabled = ( advice == "Accept" );
if ( !enabled && advice == "Dunno" ) {
// TODO, check the global setting via dcop
- KConfig kc( "kcookiejarrc", true, false );
+ TDEConfig kc( "kcookiejarrc", true, false );
kc.setGroup( "Cookie Policy" );
enabled =
(kc.readEntry( "CookieGlobalAdvice", "Reject" ) == "Accept");
@@ -266,7 +266,7 @@ void SettingsPlugin::toggleProxy()
type = KProtocolManager::NoProxy;
}
- KConfig config("kioslaverc", false, false);
+ TDEConfig config("kioslaverc", false, false);
config.setGroup( "Proxy Settings" );
config.writeEntry( "ProxyType", type );
@@ -278,7 +278,7 @@ void SettingsPlugin::toggleProxy()
void SettingsPlugin::toggleCache()
{
bool usesCache = KProtocolManager::useCache();
- KConfig config( "kio_httprc", false, false );
+ TDEConfig config( "kio_httprc", false, false );
config.writeEntry( "UseCache", !usesCache );
((KToggleAction*)actionCollection()->action("usecache"))->setChecked( !usesCache );
@@ -292,18 +292,18 @@ void SettingsPlugin::cachePolicyChanged( int p )
switch ( p ) {
case 0:
- policy = KIO::getCacheControlString( KIO::CC_Verify );
+ policy = TDEIO::getCacheControlString( TDEIO::CC_Verify );
break;
case 1:
- policy = KIO::getCacheControlString( KIO::CC_Cache );
+ policy = TDEIO::getCacheControlString( TDEIO::CC_Cache );
break;
case 2:
- policy = KIO::getCacheControlString( KIO::CC_CacheOnly );
+ policy = TDEIO::getCacheControlString( TDEIO::CC_CacheOnly );
break;
};
if ( !policy.isEmpty() ) {
- KConfig config("kio_httprc", false, false);
+ TDEConfig config("kio_httprc", false, false);
config.writeEntry("cache", policy);
updateIOSlaves();
@@ -321,7 +321,7 @@ void SettingsPlugin::updateIOSlaves()
TQString protocol; // null -> all of them
stream << protocol;
- client->send( "*", "KIO::Scheduler",
+ client->send( "*", "TDEIO::Scheduler",
"reparseSlaveConfiguration(TQString)", data );
}
diff --git a/konq-plugins/khtmlsettingsplugin/settingsplugin.h b/konq-plugins/khtmlsettingsplugin/settingsplugin.h
index 3f29ca1..7f9d8aa 100644
--- a/konq-plugins/khtmlsettingsplugin/settingsplugin.h
+++ b/konq-plugins/khtmlsettingsplugin/settingsplugin.h
@@ -23,7 +23,7 @@
#include <kparts/plugin.h>
#include <klibloader.h>
-class KConfig;
+class TDEConfig;
class SettingsPlugin : public KParts::Plugin
{
@@ -51,7 +51,7 @@ private slots:
void showPopup();
private:
- KConfig* mConfig;
+ TDEConfig* mConfig;
};
#endif // SETTINGS_PLUGIN
diff --git a/konq-plugins/kimgalleryplugin/imgallerydialog.cpp b/konq-plugins/kimgalleryplugin/imgallerydialog.cpp
index 77758b1..047e368 100644
--- a/konq-plugins/kimgalleryplugin/imgallerydialog.cpp
+++ b/konq-plugins/kimgalleryplugin/imgallerydialog.cpp
@@ -52,7 +52,7 @@ KIGPDialog::KIGPDialog(TQWidget *parent, const TQString& path, const char *name
m_path = path;
setCaption(i18n("Create Image Gallery"));
setButtonOK( KGuiItem(i18n("Create"),"imagegallery") );
- m_config = new KConfig("kimgallerypluginrc", false, false);
+ m_config = new TDEConfig("kimgallerypluginrc", false, false);
setupLookPage(path);
setupDirectoryPage(path);
setupThumbnailPage(path);
diff --git a/konq-plugins/kimgalleryplugin/imgallerydialog.h b/konq-plugins/kimgalleryplugin/imgallerydialog.h
index add798d..6c767fe 100644
--- a/konq-plugins/kimgalleryplugin/imgallerydialog.h
+++ b/konq-plugins/kimgalleryplugin/imgallerydialog.h
@@ -32,7 +32,7 @@ class TQLineEdit;
class KURLRequester;
class TQSpinBox;
class KColorButton;
-class KConfig;
+class TDEConfig;
typedef TQMap<TQString,TQString> CommentMap;
@@ -103,7 +103,7 @@ class KIGPDialog : public KDialogBase
KURLRequester *m_commentFileReq;
bool m_dialogOk;
- KConfig *m_config;
+ TDEConfig *m_config;
private:
void setupLookPage(const TQString& path);
diff --git a/konq-plugins/kimgalleryplugin/imgalleryplugin.cpp b/konq-plugins/kimgalleryplugin/imgalleryplugin.cpp
index 68cccfe..ea343da 100644
--- a/konq-plugins/kimgalleryplugin/imgalleryplugin.cpp
+++ b/konq-plugins/kimgalleryplugin/imgalleryplugin.cpp
@@ -431,7 +431,7 @@ bool KImGalleryPlugin::createThumb( const TQString& imgName, const TQString& sou
//kdDebug(90170) << "srcURL: " << srcURL << endl;
KURL destURL = KURL::fromPathOrURL(imgGalleryDir + TQString::fromLatin1("/images/") + imgName);
//kdDebug(90170) << "destURL: " << destURL << endl;
- KIO::NetAccess::copy(srcURL, destURL, static_cast<KParts::Part *>(parent())->widget());
+ TDEIO::NetAccess::copy(srcURL, destURL, static_cast<KParts::Part *>(parent())->widget());
}
const TQString imgNameFormat = imgName + extension(imageFormat);
diff --git a/konq-plugins/kuick/kcmkuick/kcmkuick.cpp b/konq-plugins/kuick/kcmkuick/kcmkuick.cpp
index d8015ce..a2894f9 100644
--- a/konq-plugins/kuick/kcmkuick/kcmkuick.cpp
+++ b/konq-plugins/kuick/kcmkuick/kcmkuick.cpp
@@ -34,7 +34,7 @@ typedef KGenericFactory<KCMKuick, TQWidget> KuickFactory;
K_EXPORT_COMPONENT_FACTORY ( kcm_kuick, KuickFactory( "kcmkuick" ) )
KCMKuick::KCMKuick(TQWidget *parent, const char *name, const TQStringList &)
-:KCModule(parent, name)
+:TDECModule(parent, name)
{
TDEAboutData *ab=new TDEAboutData( "kcmkuick", I18N_NOOP("KCM Kuick"),
"0.2",I18N_NOOP("KControl module for Kuick's configuration"), TDEAboutData::License_GPL,
@@ -66,14 +66,14 @@ void KCMKuick::slotShowToggled()
void KCMKuick::load()
{
- KConfig config( "konquerorrc");
+ TDEConfig config( "konquerorrc");
config.setGroup("kuick-copy");
dialog->m_sbCopy->setValue(config.readNumEntry("ShowRecent",5) );
config.setGroup("kuick-move" );
dialog->m_sbMove->setValue(config.readNumEntry("ShowRecent",5) );
- KConfig cfg("kuick_plugin.desktop", true, false, "services");
+ TDEConfig cfg("kuick_plugin.desktop", true, false, "services");
cfg.setDesktopGroup();
bool hidden=cfg.readBoolEntry("Hidden", false);
dialog->m_chkShow->setChecked(!hidden);
@@ -97,7 +97,7 @@ void KCMKuick::configChanged()
void KCMKuick::save()
{
- KConfig config("konquerorrc" );
+ TDEConfig config("konquerorrc" );
config.setGroup("kuick-copy");
config.writeEntry("ShowRecent", dialog->m_sbCopy->value() );
@@ -112,7 +112,7 @@ void KCMKuick::save()
TQFile::remove(servicespath+"/kuick_plugin.desktop");
}
else {
- KConfig cfg("kuick_plugin.desktop", false, false, "services");
+ TDEConfig cfg("kuick_plugin.desktop", false, false, "services");
cfg.setDesktopGroup();
cfg.writeEntry("Hidden", true);
}
@@ -122,14 +122,14 @@ void KCMKuick::save()
}
void KCMKuick::slotClearCopyCache( ) {
- KConfig config("konquerorrc");
+ TDEConfig config("konquerorrc");
config.setGroup("kuick-copy" );
config.writePathEntry("Paths", TQStringList() );
config.sync(); //is it necessary ?
}
void KCMKuick::slotClearMoveCache() {
- KConfig config("konquerorrc");
+ TDEConfig config("konquerorrc");
config.setGroup("kuick-move" );
config.writePathEntry("Paths", TQStringList() );
config.sync(); //is it necessary ?
diff --git a/konq-plugins/kuick/kcmkuick/kcmkuick.h b/konq-plugins/kuick/kcmkuick/kcmkuick.h
index c56250e..9c77d93 100644
--- a/konq-plugins/kuick/kcmkuick/kcmkuick.h
+++ b/konq-plugins/kuick/kcmkuick/kcmkuick.h
@@ -21,7 +21,7 @@
class KCMKuick
- : public KCModule
+ : public TDECModule
{
Q_OBJECT
diff --git a/konq-plugins/kuick/kdirmenu.cpp b/konq-plugins/kuick/kdirmenu.cpp
index 76dbd95..cfe19f0 100644
--- a/konq-plugins/kuick/kdirmenu.cpp
+++ b/konq-plugins/kuick/kdirmenu.cpp
@@ -133,7 +133,7 @@ void KDirMenu::slotAboutToShow( ) {
if (kapp->authorizeURLAction("list", u, u))
{
insert(new KDirMenu(this, src, (*it)->absFilePath(), name),
- KIO::decodeFileName( fileName ));
+ TDEIO::decodeFileName( fileName ));
}
}
}
diff --git a/konq-plugins/kuick/kmetamenu.h b/konq-plugins/kuick/kmetamenu.h
index a28501e..3d60b86 100644
--- a/konq-plugins/kuick/kmetamenu.h
+++ b/konq-plugins/kuick/kmetamenu.h
@@ -27,7 +27,7 @@
class TQIconSet;
class TQStringList;
-class KConfig;
+class TDEConfig;
class KDirMenu;
class KIMContactMenu;
class KIMProxy;
@@ -59,7 +59,7 @@ private:
KIMProxy *m_proxy;
KAction *m_browse;
TQStringList list;
- KConfig *conf;
+ TDEConfig *conf;
TQString group;
TQPtrList<KAction> actions;
};
diff --git a/konq-plugins/kuick/kuick_plugin.cpp b/konq-plugins/kuick/kuick_plugin.cpp
index 1b45791..16e11fd 100644
--- a/konq-plugins/kuick/kuick_plugin.cpp
+++ b/konq-plugins/kuick/kuick_plugin.cpp
@@ -58,14 +58,14 @@ void KTestMenu::slotPopupMaeh( ){
}
void KTestMenu::slotStartCopyJob( const TQString &path ) {
KURL url = KURL::fromPathOrURL( path );
- KIO::CopyJob *copy;
- copy = KIO::copy( popup->popupURLList(), url);
+ TDEIO::CopyJob *copy;
+ copy = TDEIO::copy( popup->popupURLList(), url);
copy->setAutoErrorHandlingEnabled( true );
}
void KTestMenu::slotStartMoveJob( const TQString &path) {
KURL url = KURL::fromPathOrURL( path );
- KIO::CopyJob *move;
- move = KIO::move( popup->popupURLList(), url );
+ TDEIO::CopyJob *move;
+ move = TDEIO::move( popup->popupURLList(), url );
move->setAutoErrorHandlingEnabled( true );
}
diff --git a/konq-plugins/microformat/konqmficon.cpp b/konq-plugins/microformat/konqmficon.cpp
index 38e5c5d..af2c58b 100644
--- a/konq-plugins/microformat/konqmficon.cpp
+++ b/konq-plugins/microformat/konqmficon.cpp
@@ -57,7 +57,7 @@ KonqMFIcon::KonqMFIcon(TQObject *parent, const char *name, const TQStringList &)
void KonqMFIcon::waitPartToLoad() {
connect(m_part, TQT_SIGNAL(completed()), this, TQT_SLOT(addMFIcon()));
connect(m_part, TQT_SIGNAL(completed(bool)), this, TQT_SLOT(addMFIcon())); // to make pages with metarefresh to work
- connect(m_part, TQT_SIGNAL(started(KIO::Job *)), this, TQT_SLOT(removeMFIcon()));
+ connect(m_part, TQT_SIGNAL(started(TDEIO::Job *)), this, TQT_SLOT(removeMFIcon()));
}
diff --git a/konq-plugins/searchbar/searchbar.cpp b/konq-plugins/searchbar/searchbar.cpp
index 82d35eb..5fd1047 100644
--- a/konq-plugins/searchbar/searchbar.cpp
+++ b/konq-plugins/searchbar/searchbar.cpp
@@ -113,7 +113,7 @@ SearchBarPlugin::SearchBarPlugin(TQObject *parent, const char *name,
SearchBarPlugin::~SearchBarPlugin()
{
- KConfig *config = kapp->config();
+ TDEConfig *config = kapp->config();
config->setGroup("SearchBar");
config->writeEntry("Mode", (int) m_searchMode);
config->writeEntry("CurrentEngine", m_currentEngine);
@@ -125,7 +125,7 @@ SearchBarPlugin::~SearchBarPlugin()
TQChar delimiter()
{
- KConfig config( "kuriikwsfilterrc", true, false );
+ TDEConfig config( "kuriikwsfilterrc", true, false );
config.setGroup( "General" );
return config.readNumEntry( "KeywordDelimiter", ':' );
}
@@ -463,7 +463,7 @@ void SearchBarPlugin::searchEnginesSelected(TDEProcess *process)
{
if(!process || process->exitStatus() == 0)
{
- KConfig *config = kapp->config();
+ TDEConfig *config = kapp->config();
config->setGroup("SearchBar");
config->writeEntry("CurrentEngine", m_currentEngine);
config->sync();
@@ -474,7 +474,7 @@ void SearchBarPlugin::searchEnginesSelected(TDEProcess *process)
void SearchBarPlugin::configurationChanged()
{
- KConfig *config = new KConfig("kuriikwsfilterrc");
+ TDEConfig *config = new TDEConfig("kuriikwsfilterrc");
config->setGroup("General");
TQString engine = config->readEntry("DefaultSearchEngine", "google");
@@ -627,7 +627,7 @@ void SearchBarCombo::show()
void SearchBarPlugin::selectGoogleSuggestMode()
{
m_googleMode = (GoogleMode)m_googleMenu->currentItem();
- KConfig *config = kapp->config();
+ TDEConfig *config = kapp->config();
config->setGroup("SearchBar");
config->writeEntry("GoogleSuggestMode", m_googleMode);
config->sync();
@@ -651,14 +651,14 @@ void SearchBarPlugin::gsMakeCompletionList()
if (!m_searchCombo->currentText().isEmpty())
{
- KIO::TransferJob* tj =
- KIO::get(KURL("http://www.google.com/complete/search?hl=en&js=true&qu=" + m_searchCombo->currentText()), false, false);
- connect(tj, TQT_SIGNAL(data(KIO::Job*, const TQByteArray&)), this, TQT_SLOT(gsDataArrived(KIO::Job*, const TQByteArray&)));
- connect(tj, TQT_SIGNAL(result(KIO::Job*)), this, TQT_SLOT(gsJobFinished(KIO::Job*)));
+ TDEIO::TransferJob* tj =
+ TDEIO::get(KURL("http://www.google.com/complete/search?hl=en&js=true&qu=" + m_searchCombo->currentText()), false, false);
+ connect(tj, TQT_SIGNAL(data(TDEIO::Job*, const TQByteArray&)), this, TQT_SLOT(gsDataArrived(TDEIO::Job*, const TQByteArray&)));
+ connect(tj, TQT_SIGNAL(result(TDEIO::Job*)), this, TQT_SLOT(gsJobFinished(TDEIO::Job*)));
}
}
-void SearchBarPlugin::gsDataArrived(KIO::Job*, const TQByteArray& data)
+void SearchBarPlugin::gsDataArrived(TDEIO::Job*, const TQByteArray& data)
{
m_gsData += TQString::fromUtf8(data.data());
}
@@ -676,9 +676,9 @@ static TQString reformatNumber(const TQString& number)
return s;
}
-void SearchBarPlugin::gsJobFinished(KIO::Job* job)
+void SearchBarPlugin::gsJobFinished(TDEIO::Job* job)
{
- if (((KIO::TransferJob*)job)->error() == 0)
+ if (((TDEIO::TransferJob*)job)->error() == 0)
{
TQString temp;
temp = m_gsData.mid(m_gsData.find('(') + 1, m_gsData.findRev(')') - m_gsData.find('(') - 1);
diff --git a/konq-plugins/searchbar/searchbar.h b/konq-plugins/searchbar/searchbar.h
index fd1f846..bf01e21 100644
--- a/konq-plugins/searchbar/searchbar.h
+++ b/konq-plugins/searchbar/searchbar.h
@@ -159,8 +159,8 @@ class SearchBarPlugin : public KParts::Plugin
void selectGoogleSuggestMode();
void gsStartDelay();
void gsMakeCompletionList();
- void gsDataArrived(KIO::Job*, const TQByteArray& data);
- void gsJobFinished(KIO::Job* job);
+ void gsDataArrived(TDEIO::Job*, const TQByteArray& data);
+ void gsJobFinished(TDEIO::Job* job);
void gsSetCompletedText(const TQString& text);
void gsPutTextInBox(const TQString& text);
diff --git a/konq-plugins/sidebar/delicious/mainWidget.cpp b/konq-plugins/sidebar/delicious/mainWidget.cpp
index 20aaa26..8a591b4 100644
--- a/konq-plugins/sidebar/delicious/mainWidget.cpp
+++ b/konq-plugins/sidebar/delicious/mainWidget.cpp
@@ -42,7 +42,7 @@
#include <kconfig.h>
#include <kinputdialog.h>
-MainWidget::MainWidget( KConfig * config, TQWidget * parent )
+MainWidget::MainWidget( TDEConfig * config, TQWidget * parent )
: MainWidget_base( parent ), m_config( config )
{
loadTags();
@@ -93,12 +93,12 @@ void MainWidget::slotGetTags()
{
kdDebug() << k_funcinfo << endl;
- KIO::StoredTransferJob * job = KIO::storedGet( "http://del.icio.us/api/tags/get" );
- connect( job, TQT_SIGNAL( result( KIO::Job * ) ),
- this, TQT_SLOT( slotFillTags( KIO::Job * ) ) );
+ TDEIO::StoredTransferJob * job = TDEIO::storedGet( "http://del.icio.us/api/tags/get" );
+ connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ),
+ this, TQT_SLOT( slotFillTags( TDEIO::Job * ) ) );
}
-void MainWidget::slotFillTags( KIO::Job * job )
+void MainWidget::slotFillTags( TDEIO::Job * job )
{
kdDebug() << k_funcinfo << endl;
@@ -113,7 +113,7 @@ void MainWidget::slotFillTags( KIO::Job * job )
// fill lvTags with job->data()
TQDomDocument doc;
- doc.setContent( static_cast<KIO::StoredTransferJob *>( job )->data() );
+ doc.setContent( static_cast<TDEIO::StoredTransferJob *>( job )->data() );
TQDomNodeList tags = doc.elementsByTagName( "tag" );
for ( uint i = 0; i < tags.length(); ++i )
{
@@ -134,12 +134,12 @@ void MainWidget::slotGetBookmarks()
kdDebug() << k_funcinfo << url.url() << endl;
- KIO::StoredTransferJob * job = KIO::storedGet( url );
- connect( job, TQT_SIGNAL( result( KIO::Job * ) ),
- this, TQT_SLOT( slotFillBookmarks( KIO::Job * ) ) );
+ TDEIO::StoredTransferJob * job = TDEIO::storedGet( url );
+ connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ),
+ this, TQT_SLOT( slotFillBookmarks( TDEIO::Job * ) ) );
}
-void MainWidget::slotFillBookmarks( KIO::Job * job )
+void MainWidget::slotFillBookmarks( TDEIO::Job * job )
{
kdDebug() << k_funcinfo << endl;
@@ -153,7 +153,7 @@ void MainWidget::slotFillBookmarks( KIO::Job * job )
// fill lvBookmarks with job->data()
TQDomDocument doc;
- doc.setContent( static_cast<KIO::StoredTransferJob *>( job )->data() );
+ doc.setContent( static_cast<TDEIO::StoredTransferJob *>( job )->data() );
TQDomNodeList posts = doc.elementsByTagName( "post" );
for ( uint i = 0; i < posts.length(); ++i )
@@ -308,7 +308,7 @@ void MainWidget::slotRenameTag()
KURL url( "http://del.icio.us/api/tags/rename" );
url.addQueryItem( "old", oldName );
url.addQueryItem( "new", newName );
- KIO::get( url ); // rename the tag
+ TDEIO::get( url ); // rename the tag
tag->setName( newName );
}
@@ -342,7 +342,7 @@ void MainWidget::slotDeleteBookmark()
KURL url( "http://del.icio.us/api/posts/delete" );
url.addQueryItem( "url", bookmark->url().url() );
kdDebug() << k_funcinfo << url << endl;
- KIO::get( url );
+ TDEIO::get( url );
delete bookmark;
diff --git a/konq-plugins/sidebar/delicious/mainWidget.h b/konq-plugins/sidebar/delicious/mainWidget.h
index 62d77bf..2621671 100644
--- a/konq-plugins/sidebar/delicious/mainWidget.h
+++ b/konq-plugins/sidebar/delicious/mainWidget.h
@@ -30,7 +30,7 @@
class TQStringList;
class KURL;
-class KConfig;
+class TDEConfig;
/**
* Main widget of the del.icio.us bookmarks panel
@@ -40,7 +40,7 @@ class MainWidget: public MainWidget_base
Q_OBJECT
public:
- MainWidget( KConfig * config, TQWidget * parent );
+ MainWidget( TDEConfig * config, TQWidget * parent );
~MainWidget();
/**
@@ -76,7 +76,7 @@ private slots:
* Fill the Tags listview with job->data()
* (parses the XML returned by the server)
*/
- void slotFillTags( KIO::Job * job );
+ void slotFillTags( TDEIO::Job * job );
/**
* Start the job to get the list of bookmarks
@@ -88,7 +88,7 @@ private slots:
* Fill the Bookmarks listview with job->data()
* (parses the XML returned by the server)
*/
- void slotFillBookmarks( KIO::Job * job );
+ void slotFillBookmarks( TDEIO::Job * job );
/**
* Handle clicking on a bookmark (KDE mode)
@@ -170,7 +170,7 @@ private:
TQTimer *m_updateTimer;
KURL m_currentURL;
TQStringList m_tags;
- KConfig * m_config;
+ TDEConfig * m_config;
};
#endif
diff --git a/konq-plugins/sidebar/metabar/src/configdialog.cpp b/konq-plugins/sidebar/metabar/src/configdialog.cpp
index d2cd8c0..a6993ae 100644
--- a/konq-plugins/sidebar/metabar/src/configdialog.cpp
+++ b/konq-plugins/sidebar/metabar/src/configdialog.cpp
@@ -59,8 +59,8 @@ ActionListItem::ActionListItem(TQListBox *listbox, const TQString &action, const
ConfigDialog::ConfigDialog(TQWidget *parent, const char *name) : TQDialog(parent, name)
{
topWidgetName = parent->topLevelWidget()->name();
- config = new KConfig("metabarrc");
- iconConfig = new KConfig(locate("data", "metabar/iconsrc"));
+ config = new TDEConfig("metabarrc");
+ iconConfig = new TDEConfig(locate("data", "metabar/iconsrc"));
setCaption(i18n("Configuration - Metabar"));
setIcon(SmallIcon("metabar"));
diff --git a/konq-plugins/sidebar/metabar/src/configdialog.h b/konq-plugins/sidebar/metabar/src/configdialog.h
index 02f3600..3e10757 100644
--- a/konq-plugins/sidebar/metabar/src/configdialog.h
+++ b/konq-plugins/sidebar/metabar/src/configdialog.h
@@ -80,8 +80,8 @@ class ConfigDialog : public TQDialog
TQPtrDict<LinkEntry> linkList;
- KConfig *config;
- KConfig *iconConfig;
+ TDEConfig *config;
+ TDEConfig *iconConfig;
protected slots:
void accept();
diff --git a/konq-plugins/sidebar/metabar/src/defaultplugin.cpp b/konq-plugins/sidebar/metabar/src/defaultplugin.cpp
index b199b58..3bcf924 100644
--- a/konq-plugins/sidebar/metabar/src/defaultplugin.cpp
+++ b/konq-plugins/sidebar/metabar/src/defaultplugin.cpp
@@ -84,10 +84,10 @@ void DefaultPlugin::loadActions(DOM::HTMLElement node)
KFileItem *item = m_items.getFirst();
KURL url = item->url();
- KConfig config("metabarrc", true, false);
+ TDEConfig config("metabarrc", true, false);
config.setGroup("General");
- KConfig iconConfig(locate("data", "metabar/iconsrc"));
+ TDEConfig iconConfig(locate("data", "metabar/iconsrc"));
iconConfig.setGroup("Icons");
DOM::DOMString innerHTML;
@@ -170,7 +170,7 @@ void DefaultPlugin::loadApplications(DOM::HTMLElement node)
offers = KTrader::self()->query(item->mimetype(), "Type == 'Application'");
if(!offers.isEmpty()){
- KConfig config("metabarrc", true, false);
+ TDEConfig config("metabarrc", true, false);
config.setGroup("General");
int id = 0;
@@ -219,7 +219,7 @@ void DefaultPlugin::loadInformation(DOM::HTMLElement node)
innerHTML += "<ul class=\"info\"><b>" + i18n("Type") + ": </b>";
innerHTML += that->determineMimeType()->comment();
innerHTML += "</ul><ul class=\"info\"><b>" + i18n("Size") + ": </b>";
- innerHTML += KIO::convertSize(item->size());
+ innerHTML += TDEIO::convertSize(item->size());
innerHTML += "</ul><ul class=\"info\"><b>" + i18n("User") + ": </b>";
innerHTML += item->user();
innerHTML += "</ul><ul class=\"info\"><b>" + i18n("Group") + ": </b>";
@@ -227,9 +227,9 @@ void DefaultPlugin::loadInformation(DOM::HTMLElement node)
innerHTML += "</ul><ul class=\"info\"><b>" + i18n("Permissions") + ": </b>";
innerHTML += (item->permissionsString());
innerHTML += "</ul><ul class=\"info\"><b>" + i18n("Modified") + ": </b>";
- innerHTML += item->timeString(KIO::UDS_MODIFICATION_TIME);
+ innerHTML += item->timeString(TDEIO::UDS_MODIFICATION_TIME);
innerHTML += "</ul><ul class=\"info\"><b>" + i18n("Accessed") + ": </b>";
- innerHTML += item->timeString(KIO::UDS_ACCESS_TIME);
+ innerHTML += item->timeString(TDEIO::UDS_ACCESS_TIME);
innerHTML += "</ul>";
if(item->isLink()){
@@ -275,7 +275,7 @@ void DefaultPlugin::loadInformation(DOM::HTMLElement node)
node.setInnerHTML(innerHTML);
}
else{
- KIO::filesize_t size = 0;
+ TDEIO::filesize_t size = 0;
int files = 0;
int dirs = 0;
@@ -292,7 +292,7 @@ void DefaultPlugin::loadInformation(DOM::HTMLElement node)
DOM::DOMString innerHTML;
innerHTML += "<ul class=\"info\"><b>" + i18n("Size") + ": </b>";
- innerHTML += KIO::convertSize(size);
+ innerHTML += TDEIO::convertSize(size);
innerHTML += "</ul><ul class=\"info\"><b>" + i18n("Files") + ": </b>";
innerHTML += TQString(TQString().setNum(files));
innerHTML += "</ul><ul class=\"info\"><b>" + i18n("Folders") + ": </b>";
@@ -334,11 +334,11 @@ void DefaultPlugin::loadPreview(DOM::HTMLElement node)
//m_functions->show("preview");
- preview_job = KIO::filePreview(KURL::List(url), m_html->view()->width() - 30);
+ preview_job = TDEIO::filePreview(KURL::List(url), m_html->view()->width() - 30);
connect(preview_job, TQT_SIGNAL(gotPreview(const KFileItem*, const TQPixmap&)), this, TQT_SLOT(slotSetPreview(const KFileItem*, const TQPixmap&)));
connect(preview_job, TQT_SIGNAL(failed(const KFileItem *)), this, TQT_SLOT(slotPreviewFailed(const KFileItem *)));
- connect(preview_job, TQT_SIGNAL(result(KIO::Job *)), this, TQT_SLOT(slotJobFinished(KIO::Job *)));
+ connect(preview_job, TQT_SIGNAL(result(TDEIO::Job *)), this, TQT_SLOT(slotJobFinished(TDEIO::Job *)));
}
m_functions->show("preview");
@@ -404,7 +404,7 @@ void DefaultPlugin::slotPreviewFailed(const KFileItem *item)
m_functions->hide("preview");
}
-void DefaultPlugin::slotJobFinished(KIO::Job *job)
+void DefaultPlugin::slotJobFinished(TDEIO::Job *job)
{
if(preview_job && job == preview_job){
preview_job = 0;
diff --git a/konq-plugins/sidebar/metabar/src/defaultplugin.h b/konq-plugins/sidebar/metabar/src/defaultplugin.h
index 4df0ae0..b86b12e 100644
--- a/konq-plugins/sidebar/metabar/src/defaultplugin.h
+++ b/konq-plugins/sidebar/metabar/src/defaultplugin.h
@@ -52,14 +52,14 @@ class DefaultPlugin : public ProtocolPlugin
private:
TQMap<int,KService::Ptr> runMap;
- KIO::PreviewJob *preview_job;
+ TDEIO::PreviewJob *preview_job;
ServiceLoader *services;
private slots:
void slotSetPreview(const KFileItem*, const TQPixmap&);
void slotPreviewFailed(const KFileItem *item);
- void slotJobFinished(KIO::Job *item);
+ void slotJobFinished(TDEIO::Job *item);
};
#endif
diff --git a/konq-plugins/sidebar/metabar/src/metabarfunctions.cpp b/konq-plugins/sidebar/metabar/src/metabarfunctions.cpp
index 1aaf9e8..adf316c 100644
--- a/konq-plugins/sidebar/metabar/src/metabarfunctions.cpp
+++ b/konq-plugins/sidebar/metabar/src/metabarfunctions.cpp
@@ -95,7 +95,7 @@ void MetabarFunctions::toggle(DOM::DOMString item)
DOM::DOMString att = isExpanded ? "false" : "true";
node.setAttribute("expanded", att);
- KConfig config("metabarrc");
+ TDEConfig config("metabarrc");
config.setGroup("General");
if(config.readBoolEntry("AnimateResize", false)){
@@ -126,7 +126,7 @@ void MetabarFunctions::adjustSize(DOM::DOMString item)
if(isExpanded){
int height = getHeight(node);
- KConfig config("metabarrc");
+ TDEConfig config("metabarrc");
config.setGroup("General");
if(config.readBoolEntry("AnimateResize", false)){
diff --git a/konq-plugins/sidebar/metabar/src/metabarwidget.cpp b/konq-plugins/sidebar/metabar/src/metabarwidget.cpp
index 9fe8c86..50749eb 100644
--- a/konq-plugins/sidebar/metabar/src/metabarwidget.cpp
+++ b/konq-plugins/sidebar/metabar/src/metabarwidget.cpp
@@ -81,7 +81,7 @@ MetabarWidget::MetabarWidget(TQWidget *parent, const char *name) : TQWidget(pare
currentItems = new KFileItemList;
currentItems->setAutoDelete(true);
- config = new KConfig("metabarrc");
+ config = new TDEConfig("metabarrc");
dir_watch = new KDirWatch();
connect(dir_watch, TQT_SIGNAL(dirty(const TQString&)), this, TQT_SLOT(slotUpdateCurrentInfo(const TQString&)));
diff --git a/konq-plugins/sidebar/metabar/src/metabarwidget.h b/konq-plugins/sidebar/metabar/src/metabarwidget.h
index 9874c29..bf9c7ad 100644
--- a/konq-plugins/sidebar/metabar/src/metabarwidget.h
+++ b/konq-plugins/sidebar/metabar/src/metabarwidget.h
@@ -51,7 +51,7 @@ class MetabarWidget : public TQWidget
private:
KFileItemList *currentItems;
- KConfig *config;
+ TDEConfig *config;
KHTMLPart *html;
diff --git a/konq-plugins/sidebar/metabar/src/protocolplugin.cpp b/konq-plugins/sidebar/metabar/src/protocolplugin.cpp
index 8daf5ba..38d0bba 100644
--- a/konq-plugins/sidebar/metabar/src/protocolplugin.cpp
+++ b/konq-plugins/sidebar/metabar/src/protocolplugin.cpp
@@ -112,13 +112,13 @@ void ProtocolPlugin::setFileItems(const KFileItemList &items)
}
if(!size.isNull()){
- KIO::filesize_t s = 0;
+ TDEIO::filesize_t s = 0;
for(KFileItemListIterator it(m_items); it.current(); ++it){
s += (*it)->size();
}
- size.setInnerText(KIO::convertSize(s));
+ size.setInnerText(TDEIO::convertSize(s));
}
if(!actions.isNull()){
diff --git a/konq-plugins/sidebar/metabar/src/serviceloader.cpp b/konq-plugins/sidebar/metabar/src/serviceloader.cpp
index fd8c02b..af04017 100644
--- a/konq-plugins/sidebar/metabar/src/serviceloader.cpp
+++ b/konq-plugins/sidebar/metabar/src/serviceloader.cpp
@@ -58,7 +58,7 @@ void ServiceLoader::loadServices(const KFileItem item, DOM::DOMString &html, int
urlList.append(url);
TQStringList dirs = TDEGlobal::dirs()->findDirs( "data", "konqueror/servicemenus/" );
- KConfig config("metabarrc", true, false);
+ TDEConfig config("metabarrc", true, false);
config.setGroup("General");
int maxActions = config.readNumEntry("MaxActions");
bool matchAll = false; // config.readBoolEntry("MatchAll");
diff --git a/konq-plugins/sidebar/metabar/src/settingsplugin.cpp b/konq-plugins/sidebar/metabar/src/settingsplugin.cpp
index 76853c6..95c5119 100644
--- a/konq-plugins/sidebar/metabar/src/settingsplugin.cpp
+++ b/konq-plugins/sidebar/metabar/src/settingsplugin.cpp
@@ -57,9 +57,9 @@ void SettingsPlugin::loadActions(DOM::HTMLElement node)
KURL url = m_items.getFirst()->url();
if(url.path().endsWith("/")){
- list_job = KIO::listDir(url, true, false);
- connect(list_job, TQT_SIGNAL(entries(KIO::Job *, const KIO::UDSEntryList &)), this, TQT_SLOT(slotGotEntries(KIO::Job *, const KIO::UDSEntryList &)));
- connect(list_job, TQT_SIGNAL(result(KIO::Job *)), this, TQT_SLOT(slotJobFinished(KIO::Job *)));
+ list_job = TDEIO::listDir(url, true, false);
+ connect(list_job, TQT_SIGNAL(entries(TDEIO::Job *, const TDEIO::UDSEntryList &)), this, TQT_SLOT(slotGotEntries(TDEIO::Job *, const TDEIO::UDSEntryList &)));
+ connect(list_job, TQT_SIGNAL(result(TDEIO::Job *)), this, TQT_SLOT(slotJobFinished(TDEIO::Job *)));
m_functions->show("actions");
}
@@ -69,7 +69,7 @@ void SettingsPlugin::loadActions(DOM::HTMLElement node)
KService::Ptr service = KService::serviceByStorageId(name);
if(service && service->isValid()){
- KCModuleInfo kcminfo(service);
+ TDECModuleInfo kcminfo(service);
DOM::DOMString innerHTML;
MetabarWidget::addEntry(innerHTML, i18n("Run"), "kcmshell:/" + name, kcminfo.icon());
@@ -95,7 +95,7 @@ void SettingsPlugin::loadInformation(DOM::HTMLElement node)
KService::Ptr service = KService::serviceByStorageId(name);
if(service && service->isValid()){
- KCModuleInfo kcminfo(service);
+ TDECModuleInfo kcminfo(service);
bool needsRoot = kcminfo.needsRootPrivileges();
@@ -141,7 +141,7 @@ bool SettingsPlugin::handleRequest(const KURL &)
return false;
}
-void SettingsPlugin::slotGotEntries(KIO::Job *job, const KIO::UDSEntryList &list)
+void SettingsPlugin::slotGotEntries(TDEIO::Job *job, const TDEIO::UDSEntryList &list)
{
if(!job){
return;
@@ -151,28 +151,28 @@ void SettingsPlugin::slotGotEntries(KIO::Job *job, const KIO::UDSEntryList &list
DOM::HTMLElement node = doc.getElementById("actions");
DOM::DOMString innerHTML;
- KIO::UDSEntryList::ConstIterator it = list.begin();
- KIO::UDSEntryList::ConstIterator it_end = list.end();
+ TDEIO::UDSEntryList::ConstIterator it = list.begin();
+ TDEIO::UDSEntryList::ConstIterator it_end = list.end();
for(; it != it_end; ++it){
TQString name;
TQString icon;
TQString url;
long type;
- KIO::UDSEntry::ConstIterator atomit = (*it).begin();
- KIO::UDSEntry::ConstIterator atomit_end = (*it).end();
+ TDEIO::UDSEntry::ConstIterator atomit = (*it).begin();
+ TDEIO::UDSEntry::ConstIterator atomit_end = (*it).end();
for(; atomit != atomit_end; ++atomit){
- if((*atomit).m_uds == KIO::UDS_NAME){
+ if((*atomit).m_uds == TDEIO::UDS_NAME){
name = (*atomit).m_str;
}
- else if((*atomit).m_uds == KIO::UDS_ICON_NAME){
+ else if((*atomit).m_uds == TDEIO::UDS_ICON_NAME){
icon = (*atomit).m_str;
}
- else if((*atomit).m_uds == KIO::UDS_URL){
+ else if((*atomit).m_uds == TDEIO::UDS_URL){
url = (*atomit).m_str;
}
- else if((*atomit).m_uds == KIO::UDS_FILE_TYPE){
+ else if((*atomit).m_uds == TDEIO::UDS_FILE_TYPE){
type = (*atomit).m_long;
}
}
@@ -189,7 +189,7 @@ void SettingsPlugin::slotGotEntries(KIO::Job *job, const KIO::UDSEntryList &list
node.setInnerHTML(innerHTML);
}
-void SettingsPlugin::slotJobFinished(KIO::Job *job)
+void SettingsPlugin::slotJobFinished(TDEIO::Job *job)
{
if(list_job && job == list_job){
list_job = 0;
diff --git a/konq-plugins/sidebar/metabar/src/settingsplugin.h b/konq-plugins/sidebar/metabar/src/settingsplugin.h
index 609be74..c8580de 100644
--- a/konq-plugins/sidebar/metabar/src/settingsplugin.h
+++ b/konq-plugins/sidebar/metabar/src/settingsplugin.h
@@ -47,11 +47,11 @@ class SettingsPlugin : public ProtocolPlugin
void loadBookmarks(DOM::HTMLElement node);
private:
- KIO::ListJob *list_job;
+ TDEIO::ListJob *list_job;
private slots:
- void slotGotEntries(KIO::Job *job, const KIO::UDSEntryList &list);
- void slotJobFinished(KIO::Job *job);
+ void slotGotEntries(TDEIO::Job *job, const TDEIO::UDSEntryList &list);
+ void slotJobFinished(TDEIO::Job *job);
};
#endif
diff --git a/konq-plugins/sidebar/newsticker/norsswidget.cpp b/konq-plugins/sidebar/newsticker/norsswidget.cpp
index 9af7e65..8419dff 100644
--- a/konq-plugins/sidebar/newsticker/norsswidget.cpp
+++ b/konq-plugins/sidebar/newsticker/norsswidget.cpp
@@ -57,11 +57,11 @@ namespace KSB_News {
// An instance of your dialog could be already created and could be
// cached, in which case you want to display the cached dialog
// instead of creating another one
- if (KConfigDialog::showDialog("settings"))
+ if (TDEConfigDialog::showDialog("settings"))
return;
- // KConfigDialog didn't find an instance of this dialog, so lets create it
- m_confdlg = new KConfigDialog(this, "settings", SidebarSettings::self(),
+ // TDEConfigDialog didn't find an instance of this dialog, so lets create it
+ m_confdlg = new TDEConfigDialog(this, "settings", SidebarSettings::self(),
KDialogBase::Plain,
KDialogBase::Ok|KDialogBase::Cancel|KDialogBase::Default,
KDialogBase::Ok,
diff --git a/konq-plugins/sidebar/newsticker/norsswidget.h b/konq-plugins/sidebar/newsticker/norsswidget.h
index 62dd437..1bea54c 100644
--- a/konq-plugins/sidebar/newsticker/norsswidget.h
+++ b/konq-plugins/sidebar/newsticker/norsswidget.h
@@ -26,7 +26,7 @@
#define _NORSSWIDGET_H_
-class KConfigDialog;
+class TDEConfigDialog;
namespace KSB_News {
@@ -43,7 +43,7 @@ namespace KSB_News {
void slotConfigure_okClicked();
private:
- KConfigDialog *m_confdlg;
+ TDEConfigDialog *m_confdlg;
};
diff --git a/konq-plugins/sidebar/newsticker/nspanel.h b/konq-plugins/sidebar/newsticker/nspanel.h
index 2f054bd..6a3ee73 100644
--- a/konq-plugins/sidebar/newsticker/nspanel.h
+++ b/konq-plugins/sidebar/newsticker/nspanel.h
@@ -67,7 +67,7 @@ namespace KSB_News {
void setListbox(TTListBox *lb);
void setPixmap(const TQPixmap &pm);
void setPixmapBuffer(TQBuffer *buf);
- void setJob(KIO::Job *kio_job);
+ void setJob(TDEIO::Job *kio_job);
TTListBox *listbox() const;
TQPixmap pixmap();
diff --git a/konq-plugins/sidebar/newsticker/nsstacktabwidget.cpp b/konq-plugins/sidebar/newsticker/nsstacktabwidget.cpp
index 30aedb4..ecbad6c 100644
--- a/konq-plugins/sidebar/newsticker/nsstacktabwidget.cpp
+++ b/konq-plugins/sidebar/newsticker/nsstacktabwidget.cpp
@@ -244,11 +244,11 @@ namespace KSB_News {
// An instance of your dialog could be already created and could be
// cached, in which case you want to display the cached dialog
// instead of creating another one
- if (KConfigDialog::showDialog("settings"))
+ if (TDEConfigDialog::showDialog("settings"))
return;
- // KConfigDialog didn't find an instance of this dialog, so lets create it
- m_confdlg = new KConfigDialog(this, "settings", SidebarSettings::self(),
+ // TDEConfigDialog didn't find an instance of this dialog, so lets create it
+ m_confdlg = new TDEConfigDialog(this, "settings", SidebarSettings::self(),
KDialogBase::Plain,
KDialogBase::Ok|KDialogBase::Cancel| \
KDialogBase::Default| \
diff --git a/konq-plugins/sidebar/newsticker/nsstacktabwidget.h b/konq-plugins/sidebar/newsticker/nsstacktabwidget.h
index 53934f4..2be171f 100644
--- a/konq-plugins/sidebar/newsticker/nsstacktabwidget.h
+++ b/konq-plugins/sidebar/newsticker/nsstacktabwidget.h
@@ -39,7 +39,7 @@ class KPopupMenu;
class TDEAboutData;
class KAboutApplication;
class KBugReport;
-class KConfigDialog;
+class TDEConfigDialog;
namespace KSB_News {
@@ -81,7 +81,7 @@ namespace KSB_News {
KAboutApplication *m_about;
KBugReport *m_bugreport;
TQPushButton *m_last_button_rightclicked;
- KConfigDialog *m_confdlg;
+ TDEConfigDialog *m_confdlg;
TQStringList m_our_rsssources;
};
diff --git a/konq-plugins/uachanger/uachangerplugin.cpp b/konq-plugins/uachanger/uachangerplugin.cpp
index f26e064..8c8e9c3 100644
--- a/konq-plugins/uachanger/uachangerplugin.cpp
+++ b/konq-plugins/uachanger/uachangerplugin.cpp
@@ -68,8 +68,8 @@ UAChangerPlugin::UAChangerPlugin( TQObject* parent, const char* name,
if ( parent && parent->inherits( "KHTMLPart" ) )
{
m_part = static_cast<KHTMLPart*>(parent);
- connect( m_part, TQT_SIGNAL(started(KIO::Job*)), this,
- TQT_SLOT(slotStarted(KIO::Job*)) );
+ connect( m_part, TQT_SIGNAL(started(TDEIO::Job*)), this,
+ TQT_SLOT(slotStarted(TDEIO::Job*)) );
}
}
@@ -179,7 +179,7 @@ void UAChangerPlugin::parseDescFiles()
}
}
-void UAChangerPlugin::slotStarted( KIO::Job* )
+void UAChangerPlugin::slotStarted( TDEIO::Job* )
{
m_currentURL = m_part->url();
@@ -201,7 +201,7 @@ void UAChangerPlugin::slotAboutToShow()
{
if (!m_config)
{
- m_config = new KConfig( "kio_httprc" );
+ m_config = new TDEConfig( "kio_httprc" );
parseDescFiles();
}
@@ -336,7 +336,7 @@ void UAChangerPlugin::slotDefault()
void UAChangerPlugin::updateIOSlaves ()
{
// Inform running http(s) io-slaves about the change...
- if (!DCOPRef("*", "KIO::Scheduler").send("reparseSlaveConfiguration", TQString()))
+ if (!DCOPRef("*", "TDEIO::Scheduler").send("reparseSlaveConfiguration", TQString()))
kdWarning() << "UAChangerPlugin::updateIOSlaves: Unable to update running application!" << endl;
}
@@ -413,7 +413,7 @@ void UAChangerPlugin::saveSettings()
{
if(!m_bSettingsLoaded) return;
- KConfig cfg ("uachangerrc", false, false);
+ TDEConfig cfg ("uachangerrc", false, false);
cfg.setGroup ("General");
cfg.writeEntry ("applyToDomain", m_bApplyToDomain);
@@ -421,7 +421,7 @@ void UAChangerPlugin::saveSettings()
void UAChangerPlugin::loadSettings()
{
- KConfig cfg ("uachangerrc", false, false);
+ TDEConfig cfg ("uachangerrc", false, false);
cfg.setGroup ("General");
m_bApplyToDomain = cfg.readBoolEntry ("applyToDomain", true);
diff --git a/konq-plugins/uachanger/uachangerplugin.h b/konq-plugins/uachanger/uachangerplugin.h
index 77bb73f..9aaff84 100644
--- a/konq-plugins/uachanger/uachangerplugin.h
+++ b/konq-plugins/uachanger/uachangerplugin.h
@@ -31,9 +31,9 @@
class KHTMLPart;
class KActionMenu;
-class KConfig;
+class TDEConfig;
-namespace KIO
+namespace TDEIO
{
class Job;
}
@@ -57,7 +57,7 @@ protected slots:
void slotAboutToShow();
void slotApplyToDomain();
void slotItemSelected(int);
- void slotStarted(KIO::Job*);
+ void slotStarted(TDEIO::Job*);
void slotReloadDescriptions();
protected:
@@ -74,7 +74,7 @@ private:
KHTMLPart* m_part;
KActionMenu* m_pUAMenu;
- KConfig* m_config;
+ TDEConfig* m_config;
KURL m_currentURL;
TQString m_currentUserAgent;
diff --git a/konq-plugins/validators/plugin_validators.cpp b/konq-plugins/validators/plugin_validators.cpp
index 9175402..3d1a6ab 100644
--- a/konq-plugins/validators/plugin_validators.cpp
+++ b/konq-plugins/validators/plugin_validators.cpp
@@ -82,8 +82,8 @@ PluginValidators::PluginValidators( TQObject* parent, const char* name,
m_configDialog = new ValidatorsDialog( m_part->widget() );
setURLs();
- connect( m_part, TQT_SIGNAL(started(KIO::Job*)), this,
- TQT_SLOT(slotStarted(KIO::Job*)) );
+ connect( m_part, TQT_SIGNAL(started(TDEIO::Job*)), this,
+ TQT_SLOT(slotStarted(TDEIO::Job*)) );
}
}
@@ -109,7 +109,7 @@ void PluginValidators::setURLs()
m_linkValidatorUrl = KURL(m_configDialog->getLinkValidatorUrl());
}
-void PluginValidators::slotStarted( KIO::Job* )
+void PluginValidators::slotStarted( TDEIO::Job* )
{
// The w3c validator can only access http URLs, and upload local files.
// No https, probably no webdav either.
diff --git a/konq-plugins/validators/plugin_validators.h b/konq-plugins/validators/plugin_validators.h
index d004a83..7cdf2bc 100644
--- a/konq-plugins/validators/plugin_validators.h
+++ b/konq-plugins/validators/plugin_validators.h
@@ -54,7 +54,7 @@ public slots:
void slotConfigure();
private slots:
- void slotStarted( KIO::Job* );
+ void slotStarted( TDEIO::Job* );
private:
KActionMenu *m_menu;
diff --git a/konq-plugins/validators/validatorsdialog.cpp b/konq-plugins/validators/validatorsdialog.cpp
index 864de55..e23b091 100644
--- a/konq-plugins/validators/validatorsdialog.cpp
+++ b/konq-plugins/validators/validatorsdialog.cpp
@@ -93,7 +93,7 @@ ValidatorsDialog::~ValidatorsDialog()
void ValidatorsDialog::load()
{
- m_config = new KConfig("validatorsrc");
+ m_config = new TDEConfig("validatorsrc");
m_config->setGroup("Addresses");
m_WWWValidatorCB->insertStringList(m_config->readListEntry("WWWValidatorUrl"));
diff --git a/konq-plugins/validators/validatorsdialog.h b/konq-plugins/validators/validatorsdialog.h
index 84c0e1b..4d219e7 100644
--- a/konq-plugins/validators/validatorsdialog.h
+++ b/konq-plugins/validators/validatorsdialog.h
@@ -53,7 +53,7 @@ class ValidatorsDialog : public KDialogBase
TQComboBox *m_CSSValidatorCB;
TQComboBox *m_CSSValidatorUploadCB;
TQComboBox *m_linkValidatorCB;
- KConfig *m_config;
+ TDEConfig *m_config;
};
#endif
diff --git a/konq-plugins/webarchiver/archivedialog.cpp b/konq-plugins/webarchiver/archivedialog.cpp
index 891e0de..0a3e6a6 100644
--- a/konq-plugins/webarchiver/archivedialog.cpp
+++ b/konq-plugins/webarchiver/archivedialog.cpp
@@ -444,9 +444,9 @@ void ArchiveDialog::downloadNext()
kdDebug(90110) << "downloading: " << url.url() << " to: " << m_tmpFile->name() << endl;
KURL dsturl;
dsturl.setPath(m_tmpFile->name());
- KIO::Job *job=KIO::file_copy(url, dsturl, -1, false, false, false);
+ TDEIO::Job *job=TDEIO::file_copy(url, dsturl, -1, false, false, false);
job->addMetaData("cache", "cache"); // Use entry from cache if available.
- connect(job, TQT_SIGNAL(result( KIO::Job *)), this, TQT_SLOT(finishedDownloadingURL( KIO::Job *)) );
+ connect(job, TQT_SIGNAL(result( TDEIO::Job *)), this, TQT_SLOT(finishedDownloadingURL( TDEIO::Job *)) );
m_currentLVI=new TQListViewItem(m_widget->listView, url.prettyURL());
m_widget->listView->insertItem( m_currentLVI );
@@ -457,7 +457,7 @@ void ArchiveDialog::downloadNext()
#endif
}
-void ArchiveDialog::finishedDownloadingURL( KIO::Job *job )
+void ArchiveDialog::finishedDownloadingURL( TDEIO::Job *job )
{
if ( job->error() )
{
diff --git a/konq-plugins/webarchiver/archivedialog.h b/konq-plugins/webarchiver/archivedialog.h
index 1f40339..c882529 100644
--- a/konq-plugins/webarchiver/archivedialog.h
+++ b/konq-plugins/webarchiver/archivedialog.h
@@ -50,7 +50,7 @@ public:
void archive();
public slots:
- void finishedDownloadingURL( KIO::Job *job );
+ void finishedDownloadingURL( TDEIO::Job *job );
void setSavingState();
protected:
void saveFile( const TQString& fileName);