summaryrefslogtreecommitdiffstats
path: root/konqueror
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:30:47 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:30:47 -0600
commitcc74f360bb40da3d79f58048f8e8611804980aa6 (patch)
treec4385d2c16b904757b1c8bb998a4aec6993373f7 /konqueror
parent79b21d47bce1ee428affc97534cd8b257232a871 (diff)
downloadtdebase-cc74f360bb40da3d79f58048f8e8611804980aa6.tar.gz
tdebase-cc74f360bb40da3d79f58048f8e8611804980aa6.zip
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'konqueror')
-rw-r--r--konqueror/about/konq_aboutpage.cc2
-rw-r--r--konqueror/client/kfmclient.cc24
-rw-r--r--konqueror/client/kfmclient.h2
-rw-r--r--konqueror/iconview/konq_iconview.cc6
-rw-r--r--konqueror/keditbookmarks/testlink.cpp18
-rw-r--r--konqueror/keditbookmarks/testlink.h6
-rw-r--r--konqueror/keditbookmarks/updater.cpp18
-rw-r--r--konqueror/keditbookmarks/updater.h4
-rw-r--r--konqueror/konq_combo.cc6
-rw-r--r--konqueror/konq_combo.h6
-rw-r--r--konqueror/konq_extensionmanager.cc2
-rw-r--r--konqueror/konq_frame.cc6
-rw-r--r--konqueror/konq_frame.h8
-rw-r--r--konqueror/konq_mainwindow.cc36
-rw-r--r--konqueror/konq_mainwindow.h8
-rw-r--r--konqueror/konq_misc.cc2
-rw-r--r--konqueror/konq_profiledlg.cc4
-rw-r--r--konqueror/konq_run.cc22
-rw-r--r--konqueror/konq_run.h4
-rw-r--r--konqueror/konq_tabs.cc2
-rw-r--r--konqueror/konq_tabs.h4
-rw-r--r--konqueror/konq_view.cc18
-rw-r--r--konqueror/konq_view.h12
-rw-r--r--konqueror/konq_viewmgr.cc14
-rw-r--r--konqueror/konq_viewmgr.h10
-rw-r--r--konqueror/listview/konq_infolistviewitem.cc28
-rw-r--r--konqueror/listview/konq_infolistviewwidget.cc12
-rw-r--r--konqueror/listview/konq_infolistviewwidget.h4
-rw-r--r--konqueror/listview/konq_listview.cc22
-rw-r--r--konqueror/listview/konq_listviewitems.cc52
-rw-r--r--konqueror/listview/konq_listviewwidget.cc30
-rw-r--r--konqueror/listview/konq_listviewwidget.h2
-rw-r--r--konqueror/listview/konq_textviewitem.cc38
-rw-r--r--konqueror/remoteencodingplugin/kremoteencodingplugin.cpp8
-rw-r--r--konqueror/remoteencodingplugin/kremoteencodingplugin.h2
-rw-r--r--konqueror/shellcmdplugin/kshellcmdplugin.cpp2
-rw-r--r--konqueror/sidebar/konqsidebar.cpp4
-rw-r--r--konqueror/sidebar/konqsidebarplugin.h2
-rw-r--r--konqueror/sidebar/sidebar_widget.cpp10
-rw-r--r--konqueror/sidebar/sidebar_widget.h4
-rw-r--r--konqueror/sidebar/trees/dirtree_module/dirtree_item.cpp2
-rw-r--r--konqueror/sidebar/trees/dirtree_module/dirtree_module.cpp12
-rw-r--r--konqueror/sidebar/trees/history_module/history_module.cpp16
-rw-r--r--konqueror/sidebar/trees/history_module/history_settings.cpp6
-rw-r--r--konqueror/sidebar/trees/history_module/kcmhistory.cpp6
-rw-r--r--konqueror/sidebar/trees/history_module/kcmhistory.h2
-rw-r--r--konqueror/sidebar/trees/konq_sidebartree.cpp4
-rw-r--r--konqueror/sidebar/trees/konq_sidebartreetoplevelitem.cpp2
48 files changed, 257 insertions, 257 deletions
diff --git a/konqueror/about/konq_aboutpage.cc b/konqueror/about/konq_aboutpage.cc
index 0f026a1ed..c87b5dbfd 100644
--- a/konqueror/about/konq_aboutpage.cc
+++ b/konqueror/about/konq_aboutpage.cc
@@ -119,7 +119,7 @@ TQString KonqAboutPageFactory::launch()
// Try to split page in three. If it succeeds, insert the default search into the middle part.
TQStringList parts = TQStringList::split( "<!--search bar splitter-->", res );
if ( parts.count() == 3 ) {
- KConfig config( "kuriikwsfilterrc", true /*read-only*/, false /*no KDE globals*/ );
+ TDEConfig config( "kuriikwsfilterrc", true /*read-only*/, false /*no KDE globals*/ );
config.setGroup( "General" );
TQString name = config.readEntry("DefaultSearchEngine");
KService::Ptr service =
diff --git a/konqueror/client/kfmclient.cc b/konqueror/client/kfmclient.cc
index 2fc8b336a..649115d5c 100644
--- a/konqueror/client/kfmclient.cc
+++ b/konqueror/client/kfmclient.cc
@@ -178,7 +178,7 @@ extern "C" KDE_EXPORT int kdemain( int argc, char **argv )
*/
static bool startNewKonqueror( TQString url, TQString mimetype, const TQString& profile )
{
- KConfig cfg( TQString::fromLatin1( "konquerorrc" ), true );
+ TDEConfig cfg( TQString::fromLatin1( "konquerorrc" ), true );
cfg.setGroup( "Reusing" );
TQStringList allowed_parts;
// is duplicated in ../KonquerorIface.cc
@@ -200,7 +200,7 @@ static bool startNewKonqueror( TQString url, TQString mimetype, const TQString&
TQString profilepath = locate( "data", TQString::fromLatin1("konqueror/profiles/") + profile );
if( profilepath.isEmpty())
return true;
- KConfig cfg( profilepath, true );
+ TDEConfig cfg( profilepath, true );
cfg.setDollarExpansion( true );
cfg.setGroup( "Profile" );
TQMap< TQString, TQString > entries = cfg.entryMap( TQString::fromLatin1( "Profile" ));
@@ -248,7 +248,7 @@ static int currentScreen()
// when reusing a preloaded konqy, make sure your always use a DCOP call which opens a profile !
static TQCString getPreloadedKonqy()
{
- KConfig cfg( TQString::fromLatin1( "konquerorrc" ), true );
+ TDEConfig cfg( TQString::fromLatin1( "konquerorrc" ), true );
cfg.setGroup( "Reusing" );
if( cfg.readNumEntry( "MaxPreloadCount", 1 ) == 0 )
return "";
@@ -301,7 +301,7 @@ bool clientApp::createNewWindow(const KURL & url, bool newTab, bool tempFile, co
// check if user wants to use external browser
// ###### this option seems to have no GUI and to be redundant with BrowserApplication now.
// ###### KDE4: remove
- KConfig config( TQString::fromLatin1("kfmclientrc"));
+ TDEConfig config( TQString::fromLatin1("kfmclientrc"));
config.setGroup( TQString::fromLatin1("Settings"));
TQString strBrowser = config.readPathEntry("ExternalBrowser");
if (!strBrowser.isEmpty())
@@ -330,7 +330,7 @@ bool clientApp::createNewWindow(const KURL & url, bool newTab, bool tempFile, co
}
}
- KConfig cfg( TQString::fromLatin1( "konquerorrc" ), true );
+ TDEConfig cfg( TQString::fromLatin1( "konquerorrc" ), true );
cfg.setGroup( "FMSettings" );
if ( newTab || cfg.readBoolEntry( "KonquerorTabforExternalURL", false ) )
{
@@ -550,10 +550,10 @@ bool clientApp::doIt()
for ( int i = 1; i <= argc - 2; i++ )
srcLst.append( args->url(i) );
- KIO::Job * job = KIO::move( srcLst, args->url(argc - 1) );
+ TDEIO::Job * job = TDEIO::move( srcLst, args->url(argc - 1) );
if ( !s_interactive )
job->setInteractive( false );
- connect( job, TQT_SIGNAL( result( KIO::Job * ) ), &app, TQT_SLOT( slotResult( KIO::Job * ) ) );
+ connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), &app, TQT_SLOT( slotResult( TDEIO::Job * ) ) );
app.exec();
return m_ok;
}
@@ -585,10 +585,10 @@ bool clientApp::doIt()
return m_ok; // AK - really okay?
KURL dsturl;
dsturl.setPath( dst );
- KIO::Job * job = KIO::copy( srcLst, dsturl );
+ TDEIO::Job * job = TDEIO::copy( srcLst, dsturl );
if ( !s_interactive )
job->setInteractive( false );
- connect( job, TQT_SIGNAL( result( KIO::Job * ) ), &app, TQT_SLOT( slotResult( KIO::Job * ) ) );
+ connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), &app, TQT_SLOT( slotResult( TDEIO::Job * ) ) );
app.exec();
return m_ok;
}
@@ -599,10 +599,10 @@ bool clientApp::doIt()
for ( int i = 1; i <= argc - 2; i++ )
srcLst.append( args->url(i) );
- KIO::Job * job = KIO::copy( srcLst, args->url(argc - 1) );
+ TDEIO::Job * job = TDEIO::copy( srcLst, args->url(argc - 1) );
if ( !s_interactive )
job->setInteractive( false );
- connect( job, TQT_SIGNAL( result( KIO::Job * ) ), &app, TQT_SLOT( slotResult( KIO::Job * ) ) );
+ connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), &app, TQT_SLOT( slotResult( TDEIO::Job * ) ) );
app.exec();
return m_ok;
}
@@ -636,7 +636,7 @@ bool clientApp::doIt()
return true;
}
-void clientApp::slotResult( KIO::Job * job )
+void clientApp::slotResult( TDEIO::Job * job )
{
if (job->error() && s_interactive)
job->showErrorDialog();
diff --git a/konqueror/client/kfmclient.h b/konqueror/client/kfmclient.h
index 01f5f16b4..54ffcfb53 100644
--- a/konqueror/client/kfmclient.h
+++ b/konqueror/client/kfmclient.h
@@ -37,7 +37,7 @@ public:
static bool openProfile(const TQString & profile, const TQString & url, const TQString & mimetype = TQString::null);
protected slots:
- void slotResult( KIO::Job * );
+ void slotResult( TDEIO::Job * );
void delayedQuit();
void slotDialogCanceled();
diff --git a/konqueror/iconview/konq_iconview.cc b/konqueror/iconview/konq_iconview.cc
index 5157ed360..78f6472c6 100644
--- a/konqueror/iconview/konq_iconview.cc
+++ b/konqueror/iconview/konq_iconview.cc
@@ -990,7 +990,7 @@ void KonqKfmIconView::slotNewItems( const KFileItemList& entries )
case Date:
{
TQDateTime dayt;
- dayt.setTime_t(item->item()->time(KIO::UDS_MODIFICATION_TIME ));
+ dayt.setTime_t(item->item()->time(TDEIO::UDS_MODIFICATION_TIME ));
key = dayt.toString("yyyyMMddhhmmss");
break;
}
@@ -1403,7 +1403,7 @@ void KonqKfmIconView::setupSortKeys()
TQDateTime dayt;
for ( TQIconViewItem *it = m_pIconView->firstItem(); it; it = it->nextItem() )
{
- dayt.setTime_t(static_cast<KFileIVI *>( it )->item()->time(KIO::UDS_MODIFICATION_TIME));
+ dayt.setTime_t(static_cast<KFileIVI *>( it )->item()->time(TDEIO::UDS_MODIFICATION_TIME));
it->setKey(dayt.toString("yyyyMMddhhmmss"));
}
break;
@@ -1413,7 +1413,7 @@ void KonqKfmIconView::setupSortKeys()
TQString KonqKfmIconView::makeSizeKey( KFileIVI *item )
{
- return KIO::number( item->item()->size() ).rightJustify( 20, '0' );
+ return TDEIO::number( item->item()->size() ).rightJustify( 20, '0' );
}
void KonqKfmIconView::disableIcons( const KURL::List & lst )
diff --git a/konqueror/keditbookmarks/testlink.cpp b/konqueror/keditbookmarks/testlink.cpp
index 0d7d0ddf8..97386a3e7 100644
--- a/konqueror/keditbookmarks/testlink.cpp
+++ b/konqueror/keditbookmarks/testlink.cpp
@@ -86,14 +86,14 @@ bool TestLinkItr::isApplicable(const KBookmark &bk) const {
void TestLinkItr::doAction() {
m_errSet = false;
- m_job = KIO::get(curBk().url(), true, false);
+ m_job = TDEIO::get(curBk().url(), true, false);
m_job->addMetaData("errorPage", "true");
m_job->addMetaData( TQString("cookies"), TQString("none") );
- connect(m_job, TQT_SIGNAL( result( KIO::Job *)),
- this, TQT_SLOT( slotJobResult(KIO::Job *)));
- connect(m_job, TQT_SIGNAL( data( KIO::Job *, const TQByteArray &)),
- this, TQT_SLOT( slotJobData(KIO::Job *, const TQByteArray &)));
+ connect(m_job, TQT_SIGNAL( result( TDEIO::Job *)),
+ this, TQT_SLOT( slotJobResult(TDEIO::Job *)));
+ connect(m_job, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray &)),
+ this, TQT_SLOT( slotJobData(TDEIO::Job *, const TQByteArray &)));
curItem()->setTmpStatus(i18n("Checking..."));
TQString oldModDate = TestLinkItrHolder::self()->getMod(curBk().url().url());
@@ -101,8 +101,8 @@ void TestLinkItr::doAction() {
TestLinkItrHolder::self()->setMod(curBk().url().url(), i18n("Checking..."));
}
-void TestLinkItr::slotJobData(KIO::Job *job, const TQByteArray &data) {
- KIO::TransferJob *transfer = (KIO::TransferJob *)job;
+void TestLinkItr::slotJobData(TDEIO::Job *job, const TQByteArray &data) {
+ TDEIO::TransferJob *transfer = (TDEIO::TransferJob *)job;
if (transfer->isErrorPage()) {
TQStringList lines = TQStringList::split('\n', data);
@@ -132,11 +132,11 @@ void TestLinkItr::slotJobData(KIO::Job *job, const TQByteArray &data) {
transfer->kill(false);
}
-void TestLinkItr::slotJobResult(KIO::Job *job) {
+void TestLinkItr::slotJobResult(TDEIO::Job *job) {
m_job = 0;
if ( !curItem() ) return;
- KIO::TransferJob *transfer = (KIO::TransferJob *)job;
+ TDEIO::TransferJob *transfer = (TDEIO::TransferJob *)job;
TQString modDate = transfer->queryMetaData("modified");
bool chkErr = true;
diff --git a/konqueror/keditbookmarks/testlink.h b/konqueror/keditbookmarks/testlink.h
index 7ee84f90b..a808202e1 100644
--- a/konqueror/keditbookmarks/testlink.h
+++ b/konqueror/keditbookmarks/testlink.h
@@ -61,14 +61,14 @@ public:
virtual TestLinkItrHolder* holder() const { return TestLinkItrHolder::self(); }
public slots:
- void slotJobResult(KIO::Job *job);
- void slotJobData(KIO::Job *job, const TQByteArray &data);
+ void slotJobResult(TDEIO::Job *job);
+ void slotJobData(TDEIO::Job *job, const TQByteArray &data);
private:
virtual void doAction();
virtual bool isApplicable(const KBookmark &bk) const;
- KIO::TransferJob *m_job;
+ TDEIO::TransferJob *m_job;
bool m_errSet;
};
diff --git a/konqueror/keditbookmarks/updater.cpp b/konqueror/keditbookmarks/updater.cpp
index 0d9a4cd11..ee2b6d3b6 100644
--- a/konqueror/keditbookmarks/updater.cpp
+++ b/konqueror/keditbookmarks/updater.cpp
@@ -145,20 +145,20 @@ void FavIconUpdater::notifyChange(bool isHost, TQString hostOrURL, TQString icon
FavIconWebGrabber::FavIconWebGrabber(KParts::ReadOnlyPart *part, const KURL &url)
: m_part(part), m_url(url) {
- // kdDebug() << "FavIconWebGrabber::FavIconWebGrabber starting KIO::get() " << url << endl;
+ // kdDebug() << "FavIconWebGrabber::FavIconWebGrabber starting TDEIO::get() " << url << endl;
// the use of KIO rather than directly using KHTML is to allow silently abort on error
- KIO::Job *job = KIO::get(m_url, false, false);
+ TDEIO::Job *job = TDEIO::get(m_url, false, false);
job->addMetaData( TQString("cookies"), TQString("none") );
- connect(job, TQT_SIGNAL( result( KIO::Job *)),
- this, TQT_SLOT( slotFinished(KIO::Job *) ));
- connect(job, TQT_SIGNAL( mimetype( KIO::Job *, const TQString &) ),
- this, TQT_SLOT( slotMimetype(KIO::Job *, const TQString &) ));
+ connect(job, TQT_SIGNAL( result( TDEIO::Job *)),
+ this, TQT_SLOT( slotFinished(TDEIO::Job *) ));
+ connect(job, TQT_SIGNAL( mimetype( TDEIO::Job *, const TQString &) ),
+ this, TQT_SLOT( slotMimetype(TDEIO::Job *, const TQString &) ));
}
-void FavIconWebGrabber::slotMimetype(KIO::Job *job, const TQString & /*type*/) {
- KIO::SimpleJob *sjob = static_cast<KIO::SimpleJob *>(job);
+void FavIconWebGrabber::slotMimetype(TDEIO::Job *job, const TQString & /*type*/) {
+ TDEIO::SimpleJob *sjob = static_cast<TDEIO::SimpleJob *>(job);
m_url = sjob->url(); // allow for redirection
sjob->putOnHold();
@@ -171,7 +171,7 @@ void FavIconWebGrabber::slotMimetype(KIO::Job *job, const TQString & /*type*/) {
m_part->openURL(m_url);
}
-void FavIconWebGrabber::slotFinished(KIO::Job *job) {
+void FavIconWebGrabber::slotFinished(TDEIO::Job *job) {
if (job->error()) {
// kdDebug() << "FavIconWebGrabber::slotFinished() " << job->errorString() << endl;
}
diff --git a/konqueror/keditbookmarks/updater.h b/konqueror/keditbookmarks/updater.h
index 62e034744..454b51672 100644
--- a/konqueror/keditbookmarks/updater.h
+++ b/konqueror/keditbookmarks/updater.h
@@ -35,8 +35,8 @@ public:
~FavIconWebGrabber() {}
protected slots:
- void slotMimetype(KIO::Job *job, const TQString &_type);
- void slotFinished(KIO::Job *job);
+ void slotMimetype(TDEIO::Job *job, const TQString &_type);
+ void slotFinished(TDEIO::Job *job);
private:
KParts::ReadOnlyPart *m_part;
diff --git a/konqueror/konq_combo.cc b/konqueror/konq_combo.cc
index 4edce07ad..c252cd0dc 100644
--- a/konqueror/konq_combo.cc
+++ b/konqueror/konq_combo.cc
@@ -36,7 +36,7 @@
#include "konq_combo.h"
-KConfig * KonqCombo::s_config = 0L;
+TDEConfig * KonqCombo::s_config = 0L;
const int KonqCombo::temporary = 0;
static TQString titleOfURL( const TQString& urlStr )
@@ -103,7 +103,7 @@ KonqCombo::KonqCombo( TQWidget *parent, const char *name )
Q_ASSERT( s_config );
- KConfigGroupSaver cs( s_config, "Location Bar" );
+ TDEConfigGroupSaver cs( s_config, "Location Bar" );
setMaxCount( s_config->readNumEntry("Maximum of URLs in combo", 20 ));
// We should also connect the completionBox' highlighted signal to
@@ -594,7 +594,7 @@ void KonqCombo::slotActivated( const TQString& text )
m_modifier = Qt::NoButton;
}
-void KonqCombo::setConfig( KConfig *kc )
+void KonqCombo::setConfig( TDEConfig *kc )
{
s_config = kc;
}
diff --git a/konqueror/konq_combo.h b/konqueror/konq_combo.h
index 3650eb9a4..d3bdd436e 100644
--- a/konqueror/konq_combo.h
+++ b/konqueror/konq_combo.h
@@ -26,7 +26,7 @@
#include <konq_historymgr.h>
class KCompletion;
-class KConfig;
+class TDEConfig;
// we use KHistoryCombo _only_ for the up/down keyboard handling, otherwise
// KComboBox would do fine.
@@ -56,7 +56,7 @@ public:
void loadItems();
void saveItems();
- static void setConfig( KConfig * );
+ static void setConfig( TDEConfig * );
virtual void popup();
@@ -109,7 +109,7 @@ private:
TQPoint m_dragStart;
int m_pageSecurity;
- static KConfig *s_config;
+ static TDEConfig *s_config;
static const int temporary; // the index of our temporary item
};
diff --git a/konqueror/konq_extensionmanager.cc b/konqueror/konq_extensionmanager.cc
index 34efa99e5..ef53fd684 100644
--- a/konqueror/konq_extensionmanager.cc
+++ b/konqueror/konq_extensionmanager.cc
@@ -60,7 +60,7 @@ KonqExtensionManager::KonqExtensionManager(TQWidget *parent, KonqMainWindow *mai
d->activePart = activePart;
// There's a limitation of KPluginSelector here... It assumes that all plugins in a given widget (as created by addPlugins)
- // have their config in the same KConfig[Group]. So we can't show konqueror extensions and khtml extensions in the same tab.
+ // have their config in the same TDEConfig[Group]. So we can't show konqueror extensions and khtml extensions in the same tab.
d->pluginSelector->addPlugins("konqueror", i18n("Extensions"), "Extensions", TDEGlobal::config());
if ( activePart ) {
TDEInstance* instance = activePart->instance();
diff --git a/konqueror/konq_frame.cc b/konqueror/konq_frame.cc
index d53c9154c..0764cf0b1 100644
--- a/konqueror/konq_frame.cc
+++ b/konqueror/konq_frame.cc
@@ -232,7 +232,7 @@ void KonqFrameStatusBar::slotSpeedProgress( int bytesPerSecond )
TQString sizeStr;
if ( bytesPerSecond > 0 )
- sizeStr = i18n( "%1/s" ).arg( KIO::convertSize( bytesPerSecond ) );
+ sizeStr = i18n( "%1/s" ).arg( TDEIO::convertSize( bytesPerSecond ) );
else
sizeStr = i18n( "Stalled" );
@@ -324,7 +324,7 @@ void KonqFrame::listViews( ChildViewList *viewList )
viewList->append( childView() );
}
-void KonqFrame::saveConfig( KConfig* config, const TQString &prefix, bool saveURLs, KonqFrameBase* docContainer, int /*id*/, int /*depth*/ )
+void KonqFrame::saveConfig( TDEConfig* config, const TQString &prefix, bool saveURLs, KonqFrameBase* docContainer, int /*id*/, int /*depth*/ )
{
if (saveURLs)
config->writePathEntry( TQString::fromLatin1( "URL" ).prepend( prefix ),
@@ -516,7 +516,7 @@ void KonqFrameContainer::listViews( ChildViewList *viewList )
m_pSecondChild->listViews( viewList );
}
-void KonqFrameContainer::saveConfig( KConfig* config, const TQString &prefix, bool saveURLs, KonqFrameBase* docContainer, int id, int depth )
+void KonqFrameContainer::saveConfig( TDEConfig* config, const TQString &prefix, bool saveURLs, KonqFrameBase* docContainer, int id, int depth )
{
int idSecond = id + (int)pow( 2.0, depth );
diff --git a/konqueror/konq_frame.h b/konqueror/konq_frame.h
index 7f3226faf..0b5ea4771 100644
--- a/konqueror/konq_frame.h
+++ b/konqueror/konq_frame.h
@@ -46,7 +46,7 @@ class KonqFrame;
class KonqFrameContainerBase;
class KonqFrameContainer;
class KonqFrameTabs;
-class KConfig;
+class TDEConfig;
class KSeparator;
class KProgress;
class KAction;
@@ -154,7 +154,7 @@ class KonqFrameBase
public:
virtual ~KonqFrameBase() {}
- virtual void saveConfig( KConfig* config, const TQString &prefix, bool saveURLs, KonqFrameBase* docContainer, int id = 0, int depth = 0) = 0;
+ virtual void saveConfig( TDEConfig* config, const TQString &prefix, bool saveURLs, KonqFrameBase* docContainer, int id = 0, int depth = 0) = 0;
virtual void copyHistory( KonqFrameBase *other ) = 0;
@@ -242,7 +242,7 @@ public:
void setView( KonqView* child );
virtual void listViews( ChildViewList *viewList );
- virtual void saveConfig( KConfig* config, const TQString &prefix, bool saveURLs, KonqFrameBase* docContainer, int id = 0, int depth = 0 );
+ virtual void saveConfig( TDEConfig* config, const TQString &prefix, bool saveURLs, KonqFrameBase* docContainer, int id = 0, int depth = 0 );
virtual void copyHistory( KonqFrameBase *other );
virtual void printFrameInfo( const TQString& spaces );
@@ -357,7 +357,7 @@ public:
virtual void listViews( ChildViewList *viewList );
- virtual void saveConfig( KConfig* config, const TQString &prefix, bool saveURLs, KonqFrameBase* docContainer, int id = 0, int depth = 0 );
+ virtual void saveConfig( TDEConfig* config, const TQString &prefix, bool saveURLs, KonqFrameBase* docContainer, int id = 0, int depth = 0 );
virtual void copyHistory( KonqFrameBase *other );
KonqFrameBase* firstChild() { return m_pFirstChild; }
diff --git a/konqueror/konq_mainwindow.cc b/konqueror/konq_mainwindow.cc
index 30a6b7bec..f6451155b 100644
--- a/konqueror/konq_mainwindow.cc
+++ b/konqueror/konq_mainwindow.cc
@@ -122,7 +122,7 @@ template class TQPtrList<TQPixmap>;
template class TQPtrList<KToggleAction>;
TQPtrList<KonqMainWindow> *KonqMainWindow::s_lstViews = 0;
-KConfig * KonqMainWindow::s_comboConfig = 0;
+TDEConfig * KonqMainWindow::s_comboConfig = 0;
KCompletion * KonqMainWindow::s_pCompletion = 0;
TQFile * KonqMainWindow::s_crashlog_file = 0;
bool KonqMainWindow::s_preloaded = false;
@@ -208,7 +208,7 @@ KonqMainWindow::KonqMainWindow( const KURL &initialURL, bool openInitialURL, con
KonqPixmapProvider *prov = KonqPixmapProvider::self();
if ( !s_comboConfig ) {
- s_comboConfig = new KConfig( "konq_history", false, false );
+ s_comboConfig = new TDEConfig( "konq_history", false, false );
KonqCombo::setConfig( s_comboConfig );
s_comboConfig->setGroup( "Location Bar" );
prov->load( s_comboConfig, "ComboIconCache" );
@@ -429,7 +429,7 @@ static TQString detectNameFilter( KURL & url )
if ( fileName.find( '*' ) != -1 || fileName.find( '[' ) != -1 || fileName.find( '?' ) != -1 )
{
// Check that a file or dir with all the special chars in the filename doesn't exist
- if ( url.isLocalFile() ? !TQFile::exists( path ) : !KIO::NetAccess::exists( url, false, 0 ) )
+ if ( url.isLocalFile() ? !TQFile::exists( path ) : !TDEIO::NetAccess::exists( url, false, 0 ) )
{
nameFilter = fileName;
url.setFileName( TQString::null );
@@ -711,7 +711,7 @@ bool KonqMainWindow::openView( TQString serviceType, const KURL &_url, KonqView
// Second argument is referring URL
if ( !kapp->authorizeURLAction("open", childView ? childView->url() : KURL(), _url) )
{
- TQString msg = KIO::buildErrorString(KIO::ERR_ACCESS_DENIED, _url.prettyURL());
+ TQString msg = TDEIO::buildErrorString(TDEIO::ERR_ACCESS_DENIED, _url.prettyURL());
KMessageBox::queuedMessageBox( this, KMessageBox::Error, msg );
return true; // Nothing else to do.
}
@@ -1349,7 +1349,7 @@ void KonqMainWindow::slotDuplicateWindow()
{
KTempFile tempFile;
tempFile.setAutoDelete( true );
- KConfig config( tempFile.name() );
+ TDEConfig config( tempFile.name() );
config.setGroup( "View Profile" );
m_pViewManager->saveViewProfile( config, true, true );
@@ -1442,7 +1442,7 @@ void KonqMainWindow::slotOpenTerminal()
// If the given directory is not local, it can still be the URL of an
// ioslave using UDS_LOCAL_PATH which to be converted first.
- u = KIO::NetAccess::mostLocalURL(u, this);
+ u = TDEIO::NetAccess::mostLocalURL(u, this);
//If the URL is local after the above conversion, set the directory.
if ( u.isLocalFile() )
@@ -2728,8 +2728,8 @@ void KonqMainWindow::slotPopupThisWindow()
void KonqMainWindow::slotPopupNewTabAtFront()
{
- KConfig *config = TDEGlobal::config();
- KConfigGroupSaver cs( config, TQString::fromLatin1("FMSettings") );
+ TDEConfig *config = TDEGlobal::config();
+ TDEConfigGroupSaver cs( config, TQString::fromLatin1("FMSettings") );
bool openAfterCurrentPage = config->readBoolEntry( "OpenAfterCurrentPage", false );
popupNewTab(true, openAfterCurrentPage);
}
@@ -4981,14 +4981,14 @@ void KonqMainWindow::reparseConfiguration()
(*it)->reparseConfiguration();
}
-void KonqMainWindow::saveProperties( KConfig *config )
+void KonqMainWindow::saveProperties( TDEConfig *config )
{
m_pViewManager->saveViewProfile( *config, true /* save URLs */, false );
}
-void KonqMainWindow::readProperties( KConfig *config )
+void KonqMainWindow::readProperties( TDEConfig *config )
{
- kdDebug(1202) << "KonqMainWindow::readProperties( KConfig *config )" << endl;
+ kdDebug(1202) << "KonqMainWindow::readProperties( TDEConfig *config )" << endl;
m_pViewManager->loadViewProfile( *config, TQString::null /*no profile name*/ );
}
@@ -5107,7 +5107,7 @@ void KonqMainWindow::updateViewModeActions()
// Another temporary map, the preferred service for each library (2 entries in our example)
TQMap<TQString,TQString> preferredServiceMap;
- KConfig * config = TDEGlobal::config();
+ TDEConfig * config = TDEGlobal::config();
config->setGroup( "ModeToolBarServices" );
KTrader::OfferList::ConstIterator it = services.begin();
@@ -5225,7 +5225,7 @@ void KonqMainWindow::updateViewModeActions()
#ifndef NDEBUG
// Note that this can happen (map not empty) when a inode/directory view is removed,
- // and remains in the KConfig file.
+ // and remains in the TDEConfig file.
Q_ASSERT( preferredServiceMap.isEmpty() );
TQMap<TQString,TQString>::Iterator debugIt = preferredServiceMap.begin();
TQMap<TQString,TQString>::Iterator debugEnd = preferredServiceMap.end();
@@ -5243,7 +5243,7 @@ void KonqMainWindow::saveToolBarServicesMap()
{
TQMap<TQString,KService::Ptr>::ConstIterator serviceIt = m_viewModeToolBarServices.begin();
TQMap<TQString,KService::Ptr>::ConstIterator serviceEnd = m_viewModeToolBarServices.end();
- KConfig * config = TDEGlobal::config();
+ TDEConfig * config = TDEGlobal::config();
config->setGroup( "ModeToolBarServices" );
for ( ; serviceIt != serviceEnd ; ++serviceIt )
config->writeEntry( serviceIt.key(), serviceIt.data()->desktopEntryName() );
@@ -5295,8 +5295,8 @@ void KonqMainWindow::closeEvent( TQCloseEvent *e )
KonqFrameTabs* tabContainer = static_cast<KonqFrameTabs*>(viewManager()->docContainer());
if ( tabContainer->count() > 1 )
{
- KConfig *config = TDEGlobal::config();
- KConfigGroupSaver cs( config, TQString::fromLatin1("Notification Messages") );
+ TDEConfig *config = TDEGlobal::config();
+ TDEConfigGroupSaver cs( config, TQString::fromLatin1("Notification Messages") );
if ( !config->hasKey( "MultipleTabConfirm" ) )
{
@@ -5742,7 +5742,7 @@ void KonqMainWindow::removeChildFrame( KonqFrameBase * /*frame*/ )
m_pActiveChild = 0L;
}
-void KonqMainWindow::saveConfig( KConfig* config, const TQString &prefix, bool saveURLs, KonqFrameBase* docContainer, int id, int depth ) { if( m_pChildFrame ) m_pChildFrame->saveConfig( config, prefix, saveURLs, docContainer, id, depth); }
+void KonqMainWindow::saveConfig( TDEConfig* config, const TQString &prefix, bool saveURLs, KonqFrameBase* docContainer, int id, int depth ) { if( m_pChildFrame ) m_pChildFrame->saveConfig( config, prefix, saveURLs, docContainer, id, depth); }
void KonqMainWindow::copyHistory( KonqFrameBase *other ) { if( m_pChildFrame ) m_pChildFrame->copyHistory( other ); }
@@ -5807,7 +5807,7 @@ void KonqMainWindow::setPreloadedWindow( KonqMainWindow* window )
if( window == NULL )
return;
window->viewManager()->clear();
- KIO::Scheduler::unregisterWindow( TQT_TQOBJECT(window) );
+ TDEIO::Scheduler::unregisterWindow( TQT_TQOBJECT(window) );
}
// used by preloading - this KonqMainWindow will be reused, reset everything
diff --git a/konqueror/konq_mainwindow.h b/konqueror/konq_mainwindow.h
index c0dd75692..fe016b18c 100644
--- a/konqueror/konq_mainwindow.h
+++ b/konqueror/konq_mainwindow.h
@@ -142,8 +142,8 @@ public:
virtual TQWidget *createContainer( TQWidget *parent, int index, const TQDomElement &element, int &id );
virtual void removeContainer( TQWidget *container, TQWidget *parent, TQDomElement &element, int id );
- virtual void saveProperties( KConfig *config );
- virtual void readProperties( KConfig *config );
+ virtual void saveProperties( TDEConfig *config );
+ virtual void readProperties( TDEConfig *config );
void setInitialFrameName( const TQString &name );
@@ -275,7 +275,7 @@ public:
*/
void removeChildFrame( KonqFrameBase * frame );
- void saveConfig( KConfig* config, const TQString &prefix, bool saveURLs, KonqFrameBase* docContainer, int id = 0, int depth = 0 );
+ void saveConfig( TDEConfig* config, const TQString &prefix, bool saveURLs, KonqFrameBase* docContainer, int id = 0, int depth = 0 );
void copyHistory( KonqFrameBase *other );
@@ -727,7 +727,7 @@ private:
TQLabel* m_locationLabel;
TQGuardedPtr<KonqCombo> m_combo;
- static KConfig *s_comboConfig;
+ static TDEConfig *s_comboConfig;
KURLCompletion *m_pURLCompletion;
// just a reference to KonqHistoryManager's completionObject
static KCompletion *s_pCompletion;
diff --git a/konqueror/konq_misc.cc b/konqueror/konq_misc.cc
index 5802d47c9..cee752015 100644
--- a/konqueror/konq_misc.cc
+++ b/konqueror/konq_misc.cc
@@ -144,7 +144,7 @@ KonqMainWindow * KonqMisc::createBrowserWindowFromProfile( const TQString &path,
}
else
{
- KConfig cfg( path, true );
+ TDEConfig cfg( path, true );
cfg.setDollarExpansion( true );
cfg.setGroup( "Profile" );
TQString xmluiFile=cfg.readEntry("XMLUIFile","konqueror.rc");
diff --git a/konqueror/konq_profiledlg.cc b/konqueror/konq_profiledlg.cc
index 4c5fa868b..07d0b5b77 100644
--- a/konqueror/konq_profiledlg.cc
+++ b/konqueror/konq_profiledlg.cc
@@ -48,7 +48,7 @@ KonqProfileMap KonqProfileDlg::readAllProfiles()
for (; pIt != pEnd; ++pIt )
{
TQFileInfo info( *pIt );
- TQString profileName = KIO::decodeFileName( info.baseName() );
+ TQString profileName = TDEIO::decodeFileName( info.baseName() );
KSimpleConfig cfg( *pIt, true );
if ( cfg.hasGroup( "Profile" ) )
{
@@ -156,7 +156,7 @@ void KonqProfileDlg::loadAllProfiles(const TQString & preselectProfile)
void KonqProfileDlg::slotUser3() // Save button
{
- TQString name = KIO::encodeFileName( m_pProfileNameLineEdit->text() ); // in case of '/'
+ TQString name = TDEIO::encodeFileName( m_pProfileNameLineEdit->text() ); // in case of '/'
// Reuse filename of existing item, if any
if ( m_pListView->selectedItem() )
diff --git a/konqueror/konq_run.cc b/konqueror/konq_run.cc
index a23513bd0..f5e10897c 100644
--- a/konqueror/konq_run.cc
+++ b/konqueror/konq_run.cc
@@ -130,7 +130,7 @@ void KonqRun::foundMimeType( const TQString & _type )
KRun::foundMimeType( mimeType );
}
-void KonqRun::handleError( KIO::Job *job )
+void KonqRun::handleError( TDEIO::Job *job )
{
kdDebug(1202) << "KonqRun::handleError error:" << job->errorString() << endl;
if (!m_mailto.isEmpty())
@@ -148,10 +148,10 @@ void KonqRun::init()
KParts::BrowserRun::init();
// Maybe init went to the "let's try stat'ing" part. Then connect to info messages.
// (in case it goes to scanFile, this will be done below)
- KIO::StatJob *job = tqt_dynamic_cast<KIO::StatJob*>( m_job );
+ TDEIO::StatJob *job = tqt_dynamic_cast<TDEIO::StatJob*>( m_job );
if ( job && !job->error() && m_pView ) {
- connect( job, TQT_SIGNAL( infoMessage( KIO::Job*, const TQString& ) ),
- m_pView, TQT_SLOT( slotInfoMessage(KIO::Job*, const TQString& ) ) );
+ connect( job, TQT_SIGNAL( infoMessage( TDEIO::Job*, const TQString& ) ),
+ m_pView, TQT_SLOT( slotInfoMessage(TDEIO::Job*, const TQString& ) ) );
}
}
@@ -160,20 +160,20 @@ void KonqRun::scanFile()
KParts::BrowserRun::scanFile();
// could be a static cast as of now, but who would notify when
// BrowserRun changes
- KIO::TransferJob *job = tqt_dynamic_cast<KIO::TransferJob*>( m_job );
+ TDEIO::TransferJob *job = tqt_dynamic_cast<TDEIO::TransferJob*>( m_job );
if ( job && !job->error() ) {
- connect( job, TQT_SIGNAL( redirection( KIO::Job *, const KURL& )),
- TQT_SLOT( slotRedirection( KIO::Job *, const KURL& ) ));
+ connect( job, TQT_SIGNAL( redirection( TDEIO::Job *, const KURL& )),
+ TQT_SLOT( slotRedirection( TDEIO::Job *, const KURL& ) ));
if ( m_pView && m_pView->service()->desktopEntryName() != "konq_sidebartng") {
- connect( job, TQT_SIGNAL( infoMessage( KIO::Job*, const TQString& ) ),
- m_pView, TQT_SLOT( slotInfoMessage(KIO::Job*, const TQString& ) ) );
+ connect( job, TQT_SIGNAL( infoMessage( TDEIO::Job*, const TQString& ) ),
+ m_pView, TQT_SLOT( slotInfoMessage(TDEIO::Job*, const TQString& ) ) );
}
}
}
-void KonqRun::slotRedirection( KIO::Job *job, const KURL& redirectedToURL )
+void KonqRun::slotRedirection( TDEIO::Job *job, const KURL& redirectedToURL )
{
- KURL redirectFromURL = static_cast<KIO::TransferJob *>(job)->url();
+ KURL redirectFromURL = static_cast<TDEIO::TransferJob *>(job)->url();
kdDebug(1202) << "KonqRun::slotRedirection from " <<
redirectFromURL.prettyURL() << " to " << redirectedToURL.prettyURL() << endl;
KonqHistoryManager::kself()->confirmPending( redirectFromURL );
diff --git a/konqueror/konq_run.h b/konqueror/konq_run.h
index 4084584a7..0fb97a1cf 100644
--- a/konqueror/konq_run.h
+++ b/konqueror/konq_run.h
@@ -55,12 +55,12 @@ public:
protected:
virtual void foundMimeType( const TQString & _type );
- virtual void handleError( KIO::Job * job );
+ virtual void handleError( TDEIO::Job * job );
virtual void init();
virtual void scanFile();
protected slots:
- void slotRedirection( KIO::Job *, const KURL& );
+ void slotRedirection( TDEIO::Job *, const KURL& );
protected:
TQGuardedPtr<KonqMainWindow> m_pMainWindow;
diff --git a/konqueror/konq_tabs.cc b/konqueror/konq_tabs.cc
index 8a5ff3e87..eca93d7c6 100644
--- a/konqueror/konq_tabs.cc
+++ b/konqueror/konq_tabs.cc
@@ -187,7 +187,7 @@ void KonqFrameTabs::listViews( ChildViewList *viewList ) {
it.current()->listViews(viewList);
}
-void KonqFrameTabs::saveConfig( KConfig* config, const TQString &prefix, bool saveURLs,
+void KonqFrameTabs::saveConfig( TDEConfig* config, const TQString &prefix, bool saveURLs,
KonqFrameBase* docContainer, int id, int depth )
{
//write children
diff --git a/konqueror/konq_tabs.h b/konqueror/konq_tabs.h
index b4aa6e873..d07948149 100644
--- a/konqueror/konq_tabs.h
+++ b/konqueror/konq_tabs.h
@@ -36,7 +36,7 @@ class KonqFrameBase;
class KonqFrame;
class KonqFrameContainerBase;
class KonqFrameContainer;
-class KConfig;
+class TDEConfig;
class KSeparator;
class KProgress;
class KAction;
@@ -53,7 +53,7 @@ public:
virtual void listViews( ChildViewList *viewList );
- virtual void saveConfig( KConfig* config, const TQString &prefix, bool saveURLs,
+ virtual void saveConfig( TDEConfig* config, const TQString &prefix, bool saveURLs,
KonqFrameBase* docContainer, int id = 0, int depth = 0 );
virtual void copyHistory( KonqFrameBase *other );
diff --git a/konqueror/konq_view.cc b/konqueror/konq_view.cc
index 6a7234c60..ffa12321c 100644
--- a/konqueror/konq_view.cc
+++ b/konqueror/konq_view.cc
@@ -372,8 +372,8 @@ bool KonqView::changeViewMode( const TQString &serviceType,
void KonqView::connectPart( )
{
//kdDebug(1202) << "KonqView::connectPart" << endl;
- connect( m_pPart, TQT_SIGNAL( started( KIO::Job * ) ),
- this, TQT_SLOT( slotStarted( KIO::Job * ) ) );
+ connect( m_pPart, TQT_SIGNAL( started( TDEIO::Job * ) ),
+ this, TQT_SLOT( slotStarted( TDEIO::Job * ) ) );
connect( m_pPart, TQT_SIGNAL( completed() ),
this, TQT_SLOT( slotCompleted() ) );
connect( m_pPart, TQT_SIGNAL( completed(bool) ),
@@ -518,7 +518,7 @@ void KonqView::slotResizeTopLevelWidget( int w, int h )
m_pMainWindow->resize( w, h );
}
-void KonqView::slotStarted( KIO::Job * job )
+void KonqView::slotStarted( TDEIO::Job * job )
{
//kdDebug(1202) << "KonqView::slotStarted" << job << endl;
setLoading( true );
@@ -532,9 +532,9 @@ void KonqView::slotStarted( KIO::Job * job )
job->setWindow (m_pMainWindow->topLevelWidget ());
}
- connect( job, TQT_SIGNAL( percent( KIO::Job *, unsigned long ) ), this, TQT_SLOT( slotPercent( KIO::Job *, unsigned long ) ) );
- connect( job, TQT_SIGNAL( speed( KIO::Job *, unsigned long ) ), this, TQT_SLOT( slotSpeed( KIO::Job *, unsigned long ) ) );
- connect( job, TQT_SIGNAL( infoMessage( KIO::Job *, const TQString & ) ), this, TQT_SLOT( slotInfoMessage( KIO::Job *, const TQString & ) ) );
+ connect( job, TQT_SIGNAL( percent( TDEIO::Job *, unsigned long ) ), this, TQT_SLOT( slotPercent( TDEIO::Job *, unsigned long ) ) );
+ connect( job, TQT_SIGNAL( speed( TDEIO::Job *, unsigned long ) ), this, TQT_SLOT( slotSpeed( TDEIO::Job *, unsigned long ) ) );
+ connect( job, TQT_SIGNAL( infoMessage( TDEIO::Job *, const TQString & ) ), this, TQT_SLOT( slotInfoMessage( TDEIO::Job *, const TQString & ) ) );
}
}
@@ -554,17 +554,17 @@ void KonqView::setLoading( bool loading, bool hasPending /*= false*/)
m_pMainWindow->viewManager()->setLoading( this, loading || hasPending );
}
-void KonqView::slotPercent( KIO::Job *, unsigned long percent )
+void KonqView::slotPercent( TDEIO::Job *, unsigned long percent )
{
m_pKonqFrame->statusbar()->slotLoadingProgress( percent );
}
-void KonqView::slotSpeed( KIO::Job *, unsigned long bytesPerSecond )
+void KonqView::slotSpeed( TDEIO::Job *, unsigned long bytesPerSecond )
{
m_pKonqFrame->statusbar()->slotSpeedProgress( bytesPerSecond );
}
-void KonqView::slotInfoMessage( KIO::Job *, const TQString &msg )
+void KonqView::slotInfoMessage( TDEIO::Job *, const TQString &msg )
{
m_pKonqFrame->statusbar()->message( msg );
}
diff --git a/konqueror/konq_view.h b/konqueror/konq_view.h
index 2af897dd3..6a63bff9f 100644
--- a/konqueror/konq_view.h
+++ b/konqueror/konq_view.h
@@ -358,18 +358,18 @@ public slots:
void setPageSecurity( int );
- // connected to the KROP's KIO::Job
+ // connected to the KROP's TDEIO::Job
// but also to KonqRun's job
- void slotInfoMessage( KIO::Job *, const TQString &msg );
+ void slotInfoMessage( TDEIO::Job *, const TQString &msg );
protected slots:
- // connected to the KROP's KIO::Job
- void slotStarted( KIO::Job * job );
+ // connected to the KROP's TDEIO::Job
+ void slotStarted( TDEIO::Job * job );
void slotCompleted();
void slotCompleted( bool );
void slotCanceled( const TQString & errMsg );
- void slotPercent( KIO::Job *, unsigned long percent );
- void slotSpeed( KIO::Job *, unsigned long bytesPerSecond );
+ void slotPercent( TDEIO::Job *, unsigned long percent );
+ void slotSpeed( TDEIO::Job *, unsigned long bytesPerSecond );
/**
* Connected to the BrowserExtension
diff --git a/konqueror/konq_viewmgr.cc b/konqueror/konq_viewmgr.cc
index 4413416fb..f765006b5 100644
--- a/konqueror/konq_viewmgr.cc
+++ b/konqueror/konq_viewmgr.cc
@@ -420,7 +420,7 @@ void KonqViewManager::duplicateTab( KonqFrameBase* tab, bool openAfterCurrentPag
KTempFile tempFile;
tempFile.setAutoDelete( true );
- KConfig config( tempFile.name() );
+ TDEConfig config( tempFile.name() );
config.setGroup( "View Profile" );
TQString prefix = TQString::fromLatin1( currentFrame->frameType() ) + TQString::number(0);
@@ -490,7 +490,7 @@ void KonqViewManager::breakOffTab( KonqFrameBase* tab )
KTempFile tempFile;
tempFile.setAutoDelete( true );
- KConfig config( tempFile.name() );
+ TDEConfig config( tempFile.name() );
config.setGroup( "View Profile" );
TQString prefix = TQString::fromLatin1( currentFrame->frameType() ) + TQString::number(0);
@@ -1092,7 +1092,7 @@ void KonqViewManager::saveViewProfile( const TQString & fileName, const TQString
}
-void KonqViewManager::saveViewProfile( KConfig & cfg, bool saveURLs, bool saveWindowSize )
+void KonqViewManager::saveViewProfile( TDEConfig & cfg, bool saveURLs, bool saveWindowSize )
{
//kdDebug(1202) << "KonqViewManager::saveViewProfile" << endl;
if( m_pMainWindow->childFrame() != 0L ) {
@@ -1126,13 +1126,13 @@ void KonqViewManager::loadViewProfile( const TQString & path, const TQString & f
const KURL & forcedURL, const KonqOpenURLRequest &req,
bool resetWindow, bool openURL )
{
- KConfig cfg( path, true );
+ TDEConfig cfg( path, true );
cfg.setDollarExpansion( true );
cfg.setGroup( "Profile" );
loadViewProfile( cfg, filename, forcedURL, req, resetWindow, openURL );
}
-void KonqViewManager::loadViewProfile( KConfig &cfg, const TQString & filename,
+void KonqViewManager::loadViewProfile( TDEConfig &cfg, const TQString & filename,
const KURL & forcedURL, const KonqOpenURLRequest &req,
bool resetWindow, bool openURL )
{
@@ -1401,7 +1401,7 @@ void KonqViewManager::emitActivePartChanged()
}
-TQSize KonqViewManager::readConfigSize( KConfig &cfg, TQWidget *widget )
+TQSize KonqViewManager::readConfigSize( TDEConfig &cfg, TQWidget *widget )
{
bool ok;
@@ -1446,7 +1446,7 @@ TQSize KonqViewManager::readConfigSize( KConfig &cfg, TQWidget *widget )
return TQSize( width, height );
}
-void KonqViewManager::loadItem( KConfig &cfg, KonqFrameContainerBase *parent,
+void KonqViewManager::loadItem( TDEConfig &cfg, KonqFrameContainerBase *parent,
const TQString &name, const KURL & defaultURL, bool openURL, bool openAfterCurrentPage )
{
TQString prefix;
diff --git a/konqueror/konq_viewmgr.h b/konqueror/konq_viewmgr.h
index 9b5c4e5b3..0323bd504 100644
--- a/konqueror/konq_viewmgr.h
+++ b/konqueror/konq_viewmgr.h
@@ -35,7 +35,7 @@
class TQString;
class TQStringList;
class TQTimer;
-class KConfig;
+class TDEConfig;
class KonqMainWindow;
class KonqFrameBase;
class KonqFrameContainer;
@@ -178,7 +178,7 @@ public:
* @param saveURLs whether to save the URLs in the profile
* @param saveWindowSize whether to save the size of the window in the profile
*/
- void saveViewProfile( KConfig & cfg, bool saveURLs, bool saveWindowSize );
+ void saveViewProfile( TDEConfig & cfg, bool saveURLs, bool saveWindowSize );
/**
* Saves the current view layout to a config file.
@@ -201,7 +201,7 @@ public:
* @param resetWindow if the profile doesn't have attributes like size or toolbar
* settings, they will be reset to the defaults
*/
- void loadViewProfile( KConfig &cfg, const TQString & filename,
+ void loadViewProfile( TDEConfig &cfg, const TQString & filename,
const KURL & forcedURL = KURL(),
const KonqOpenURLRequest &req = KonqOpenURLRequest(),
bool resetWindow = false, bool openURL = true );
@@ -274,7 +274,7 @@ public:
/**
* The widget is the one which you are referring to.
*/
- static TQSize readConfigSize( KConfig &cfg, TQWidget *widget = NULL);
+ static TQSize readConfigSize( TDEConfig &cfg, TQWidget *widget = NULL);
#ifndef NDEBUG
void printFullHierarchy( KonqFrameContainerBase * container );
@@ -309,7 +309,7 @@ protected:
* @param openURL whether to open urls at all (from the profile or using @p defaultURL).
* (this is set to false when we have a forcedURL to open)
*/
- void loadItem( KConfig &cfg, KonqFrameContainerBase *parent,
+ void loadItem( TDEConfig &cfg, KonqFrameContainerBase *parent,
const TQString &name, const KURL & defaultURL, bool openURL, bool openAfterCurrentPage = false );
// Disabled - we do it ourselves
diff --git a/konqueror/listview/konq_infolistviewitem.cc b/konqueror/listview/konq_infolistviewitem.cc
index 188c3c394..2082821a8 100644
--- a/konqueror/listview/konq_infolistviewitem.cc
+++ b/konqueror/listview/konq_infolistviewitem.cc
@@ -67,36 +67,36 @@ void KonqInfoListViewItem::updateContents()
{
switch (tmpColumn->udsId)
{
- case KIO::UDS_USER:
+ case TDEIO::UDS_USER:
setText(tmpColumn->displayInColumn,m_fileitem->user());
break;
- case KIO::UDS_GROUP:
+ case TDEIO::UDS_GROUP:
setText(tmpColumn->displayInColumn,m_fileitem->group());
break;
- case KIO::UDS_FILE_TYPE:
+ case TDEIO::UDS_FILE_TYPE:
setText(tmpColumn->displayInColumn,m_fileitem->mimeComment());
break;
- case KIO::UDS_MIME_TYPE:
+ case TDEIO::UDS_MIME_TYPE:
setText(tmpColumn->displayInColumn,m_fileitem->mimetype());
break;
- case KIO::UDS_URL:
+ case TDEIO::UDS_URL:
setText(tmpColumn->displayInColumn,m_fileitem->url().prettyURL());
break;
- case KIO::UDS_LINK_DEST:
+ case TDEIO::UDS_LINK_DEST:
setText(tmpColumn->displayInColumn,m_fileitem->linkDest());
break;
- case KIO::UDS_SIZE:
+ case TDEIO::UDS_SIZE:
if ( static_cast<KonqBaseListViewWidget *>(listView())->m_pSettings->fileSizeInBytes() )
setText(tmpColumn->displayInColumn,TDEGlobal::locale()->formatNumber( m_fileitem->size(),0)+" ");
else
- setText(tmpColumn->displayInColumn,KIO::convertSize(m_fileitem->size())+" ");
+ setText(tmpColumn->displayInColumn,TDEIO::convertSize(m_fileitem->size())+" ");
break;
- case KIO::UDS_ACCESS:
+ case TDEIO::UDS_ACCESS:
setText(tmpColumn->displayInColumn,m_fileitem->permissionsString());
break;
- case KIO::UDS_MODIFICATION_TIME:
- case KIO::UDS_ACCESS_TIME:
- case KIO::UDS_CREATION_TIME:
+ case TDEIO::UDS_MODIFICATION_TIME:
+ case TDEIO::UDS_ACCESS_TIME:
+ case TDEIO::UDS_CREATION_TIME:
{
TQDateTime dt;
time_t _time = m_fileitem->time( tmpColumn->udsId );
@@ -265,12 +265,12 @@ void KonqBaseListViewItem::mimetypeFound()
for (unsigned int i=0; i<KonqBaseListViewWidget::NumberOfAtoms && done < 2; i++)
{
ColumnInfo *tmpColumn=&lv->columnConfigInfo()[i];
- if (lv->columnConfigInfo()[i].udsId==KIO::UDS_FILE_TYPE && tmpColumn->displayThisOne)
+ if (lv->columnConfigInfo()[i].udsId==TDEIO::UDS_FILE_TYPE && tmpColumn->displayThisOne)
{
setText(tmpColumn->displayInColumn, m_fileitem->mimeComment());
done++;
}
- if (lv->columnConfigInfo()[i].udsId==KIO::UDS_MIME_TYPE && tmpColumn->displayThisOne)
+ if (lv->columnConfigInfo()[i].udsId==TDEIO::UDS_MIME_TYPE && tmpColumn->displayThisOne)
{
setText(tmpColumn->displayInColumn, m_fileitem->mimetype());
done++;
diff --git a/konqueror/listview/konq_infolistviewwidget.cc b/konqueror/listview/konq_infolistviewwidget.cc
index ff829c4c0..cb942dfe8 100644
--- a/konqueror/listview/konq_infolistviewwidget.cc
+++ b/konqueror/listview/konq_infolistviewwidget.cc
@@ -235,10 +235,10 @@ void KonqInfoListViewWidget::slotNewItems( const KFileItemList& list)
}
else
{
- m_metaInfoJob = KIO::fileMetaInfo(list);
+ m_metaInfoJob = TDEIO::fileMetaInfo(list);
connect( m_metaInfoJob, TQT_SIGNAL( gotMetaInfo( const KFileItem*)),
this, TQT_SLOT( slotMetaInfo( const KFileItem*)));
- connect( m_metaInfoJob, TQT_SIGNAL( result( KIO::Job*)),
+ connect( m_metaInfoJob, TQT_SIGNAL( result( TDEIO::Job*)),
this, TQT_SLOT( slotMetaInfoResult()));
}
}
@@ -255,10 +255,10 @@ void KonqInfoListViewWidget::slotRefreshItems( const KFileItemList& list)
}
else
{
- m_metaInfoJob = KIO::fileMetaInfo(list);
+ m_metaInfoJob = TDEIO::fileMetaInfo(list);
connect( m_metaInfoJob, TQT_SIGNAL( gotMetaInfo( const KFileItem*)),
this, TQT_SLOT( slotMetaInfo( const KFileItem*)));
- connect( m_metaInfoJob, TQT_SIGNAL( result( KIO::Job*)),
+ connect( m_metaInfoJob, TQT_SIGNAL( result( TDEIO::Job*)),
this, TQT_SLOT( slotMetaInfoResult()));
}
KonqBaseListViewWidget::slotRefreshItems(list);
@@ -311,10 +311,10 @@ void KonqInfoListViewWidget::slotMetaInfoResult()
}
else
{
- m_metaInfoJob = KIO::fileMetaInfo(m_metaInfoTodo);
+ m_metaInfoJob = TDEIO::fileMetaInfo(m_metaInfoTodo);
connect( m_metaInfoJob, TQT_SIGNAL( gotMetaInfo( const KFileItem*)),
this, TQT_SLOT( slotMetaInfo( const KFileItem*)));
- connect( m_metaInfoJob, TQT_SIGNAL( result( KIO::Job*)),
+ connect( m_metaInfoJob, TQT_SIGNAL( result( TDEIO::Job*)),
this, TQT_SLOT( slotMetaInfoResult()));
m_metaInfoTodo.clear();
}
diff --git a/konqueror/listview/konq_infolistviewwidget.h b/konqueror/listview/konq_infolistviewwidget.h
index 5ae497ac2..c4dcf5076 100644
--- a/konqueror/listview/konq_infolistviewwidget.h
+++ b/konqueror/listview/konq_infolistviewwidget.h
@@ -25,7 +25,7 @@
#include <tqmap.h>
#include <tqpair.h>
-namespace KIO {class MetaInfoJob;}
+namespace TDEIO {class MetaInfoJob;}
class KonqListView;
class KSelectAction;
@@ -82,7 +82,7 @@ class KonqInfoListViewWidget : public KonqBaseListViewWidget
KonqILVMimeType m_favorite;
KSelectAction* m_mtSelector;
- KIO::MetaInfoJob* m_metaInfoJob;
+ TDEIO::MetaInfoJob* m_metaInfoJob;
KFileItemList m_metaInfoTodo;
};
diff --git a/konqueror/listview/konq_listview.cc b/konqueror/listview/konq_listview.cc
index 94f9211ac..a1f522bf6 100644
--- a/konqueror/listview/konq_listview.cc
+++ b/konqueror/listview/konq_listview.cc
@@ -264,18 +264,18 @@ KonqListView::KonqListView( TQWidget *parentWidget, TQObject *parent, const char
setupActions();
m_pListView->confColumns.resize( 11 );
- m_pListView->confColumns[0].setData(I18N_NOOP("MimeType"),"Type",KIO::UDS_MIME_TYPE,m_paShowMimeType);
- m_pListView->confColumns[1].setData(I18N_NOOP("Size"),"Size",KIO::UDS_SIZE,m_paShowSize);
- m_pListView->confColumns[2].setData(I18N_NOOP("Modified"),"Date",KIO::UDS_MODIFICATION_TIME,m_paShowTime);
- m_pListView->confColumns[3].setData(I18N_NOOP("Accessed"),"AccessDate",KIO::UDS_ACCESS_TIME,m_paShowAccessTime);
- m_pListView->confColumns[4].setData(I18N_NOOP("Created"),"CreationDate",KIO::UDS_CREATION_TIME,m_paShowCreateTime);
- m_pListView->confColumns[5].setData(I18N_NOOP("Permissions"),"Access",KIO::UDS_ACCESS,m_paShowPermissions);
- m_pListView->confColumns[6].setData(I18N_NOOP("Owner"),"Owner",KIO::UDS_USER,m_paShowOwner);
- m_pListView->confColumns[7].setData(I18N_NOOP("Group"),"Group",KIO::UDS_GROUP,m_paShowGroup);
- m_pListView->confColumns[8].setData(I18N_NOOP("Link"),"Link",KIO::UDS_LINK_DEST,m_paShowLinkDest);
- m_pListView->confColumns[9].setData(I18N_NOOP("URL"),"URL",KIO::UDS_URL,m_paShowURL);
+ m_pListView->confColumns[0].setData(I18N_NOOP("MimeType"),"Type",TDEIO::UDS_MIME_TYPE,m_paShowMimeType);
+ m_pListView->confColumns[1].setData(I18N_NOOP("Size"),"Size",TDEIO::UDS_SIZE,m_paShowSize);
+ m_pListView->confColumns[2].setData(I18N_NOOP("Modified"),"Date",TDEIO::UDS_MODIFICATION_TIME,m_paShowTime);
+ m_pListView->confColumns[3].setData(I18N_NOOP("Accessed"),"AccessDate",TDEIO::UDS_ACCESS_TIME,m_paShowAccessTime);
+ m_pListView->confColumns[4].setData(I18N_NOOP("Created"),"CreationDate",TDEIO::UDS_CREATION_TIME,m_paShowCreateTime);
+ m_pListView->confColumns[5].setData(I18N_NOOP("Permissions"),"Access",TDEIO::UDS_ACCESS,m_paShowPermissions);
+ m_pListView->confColumns[6].setData(I18N_NOOP("Owner"),"Owner",TDEIO::UDS_USER,m_paShowOwner);
+ m_pListView->confColumns[7].setData(I18N_NOOP("Group"),"Group",TDEIO::UDS_GROUP,m_paShowGroup);
+ m_pListView->confColumns[8].setData(I18N_NOOP("Link"),"Link",TDEIO::UDS_LINK_DEST,m_paShowLinkDest);
+ m_pListView->confColumns[9].setData(I18N_NOOP("URL"),"URL",TDEIO::UDS_URL,m_paShowURL);
// Note: File Type is in fact the mimetype comment. We use UDS_FILE_TYPE but that's not what we show in fact :/
- m_pListView->confColumns[10].setData(I18N_NOOP("File Type"),"Type",KIO::UDS_FILE_TYPE,m_paShowType);
+ m_pListView->confColumns[10].setData(I18N_NOOP("File Type"),"Type",TDEIO::UDS_FILE_TYPE,m_paShowType);
connect( m_pListView, TQT_SIGNAL( selectionChanged() ),
diff --git a/konqueror/listview/konq_listviewitems.cc b/konqueror/listview/konq_listviewitems.cc
index 616559bad..925f33f8f 100644
--- a/konqueror/listview/konq_listviewitems.cc
+++ b/konqueror/listview/konq_listviewitems.cc
@@ -30,12 +30,12 @@
static TQString retrieveExtraEntry( KFileItem* fileitem, int numExtra )
{
/// ######## SLOOOOW
- KIO::UDSEntry::ConstIterator it = fileitem->entry().begin();
- const KIO::UDSEntry::ConstIterator end = fileitem->entry().end();
+ TDEIO::UDSEntry::ConstIterator it = fileitem->entry().begin();
+ const TDEIO::UDSEntry::ConstIterator end = fileitem->entry().end();
int n = 0;
for( ; it != end; ++it )
{
- if ((*it).m_uds == KIO::UDS_EXTRA)
+ if ((*it).m_uds == TDEIO::UDS_EXTRA)
{
++n;
if ( n == numExtra )
@@ -99,36 +99,36 @@ void KonqListViewItem::updateContents()
{
switch (tmpColumn->udsId)
{
- case KIO::UDS_USER:
+ case TDEIO::UDS_USER:
setText(tmpColumn->displayInColumn,m_fileitem->user());
break;
- case KIO::UDS_GROUP:
+ case TDEIO::UDS_GROUP:
setText(tmpColumn->displayInColumn,m_fileitem->group());
break;
- case KIO::UDS_FILE_TYPE:
+ case TDEIO::UDS_FILE_TYPE:
setText(tmpColumn->displayInColumn,m_fileitem->mimeComment());
break;
- case KIO::UDS_MIME_TYPE:
+ case TDEIO::UDS_MIME_TYPE:
setText(tmpColumn->displayInColumn,m_fileitem->mimetype());
break;
- case KIO::UDS_URL:
+ case TDEIO::UDS_URL:
setText(tmpColumn->displayInColumn,m_fileitem->url().prettyURL());
break;
- case KIO::UDS_LINK_DEST:
+ case TDEIO::UDS_LINK_DEST:
setText(tmpColumn->displayInColumn,m_fileitem->linkDest());
break;
- case KIO::UDS_SIZE:
+ case TDEIO::UDS_SIZE:
if ( m_pListViewWidget->m_pSettings->fileSizeInBytes() )
setText(tmpColumn->displayInColumn,TDEGlobal::locale()->formatNumber( m_fileitem->size(),0)+" ");
else
- setText(tmpColumn->displayInColumn,KIO::convertSize(m_fileitem->size())+" ");
+ setText(tmpColumn->displayInColumn,TDEIO::convertSize(m_fileitem->size())+" ");
break;
- case KIO::UDS_ACCESS:
+ case TDEIO::UDS_ACCESS:
setText(tmpColumn->displayInColumn,m_fileitem->permissionsString());
break;
- case KIO::UDS_MODIFICATION_TIME:
- case KIO::UDS_ACCESS_TIME:
- case KIO::UDS_CREATION_TIME:
+ case TDEIO::UDS_MODIFICATION_TIME:
+ case TDEIO::UDS_ACCESS_TIME:
+ case TDEIO::UDS_CREATION_TIME:
{
TQDateTime dt;
time_t _time = m_fileitem->time( tmpColumn->udsId );
@@ -139,7 +139,7 @@ void KonqListViewItem::updateContents()
}
}
break;
- case KIO::UDS_EXTRA:
+ case TDEIO::UDS_EXTRA:
{
const TQString entryStr = retrieveExtraEntry( m_fileitem, numExtra );
if ( tmpColumn->type == TQVariant::DateTime )
@@ -251,27 +251,27 @@ int KonqBaseListViewItem::compare( TQListViewItem* item, int col, bool ascending
for ( unsigned int i=0; i<m_pListViewWidget->NumberOfAtoms; i++ )
{
ColumnInfo *cInfo = &m_pListViewWidget->columnConfigInfo()[i];
- if ( cInfo->udsId == KIO::UDS_EXTRA )
+ if ( cInfo->udsId == TDEIO::UDS_EXTRA )
++numExtra;
if ( col == cInfo->displayInColumn )
{
switch ( cInfo->udsId )
{
- case KIO::UDS_MODIFICATION_TIME:
- case KIO::UDS_ACCESS_TIME:
- case KIO::UDS_CREATION_TIME:
+ case TDEIO::UDS_MODIFICATION_TIME:
+ case TDEIO::UDS_ACCESS_TIME:
+ case TDEIO::UDS_CREATION_TIME:
{
time_t t1 = m_fileitem->time( cInfo->udsId );
time_t t2 = k->m_fileitem->time( cInfo->udsId );
return ( t1 > t2 ) ? 1 : ( t1 < t2 ) ? -1 : 0;
}
- case KIO::UDS_SIZE:
+ case TDEIO::UDS_SIZE:
{
- KIO::filesize_t s1 = m_fileitem->size();
- KIO::filesize_t s2 = k->m_fileitem->size();
+ TDEIO::filesize_t s1 = m_fileitem->size();
+ TDEIO::filesize_t s2 = k->m_fileitem->size();
return ( s1 > s2 ) ? 1 : ( s1 < s2 ) ? -1 : 0;
}
- case KIO::UDS_EXTRA:
+ case TDEIO::UDS_EXTRA:
{
if ( cInfo->type & TQVariant::DateTime ) {
const TQString entryStr1 = retrieveExtraEntry( m_fileitem, numExtra );
@@ -434,12 +434,12 @@ void KonqBaseListViewItem::mimetypeFound()
for (unsigned int i=0; i<m_pListViewWidget->NumberOfAtoms && done < 2; i++)
{
ColumnInfo *tmpColumn=&lv->columnConfigInfo()[i];
- if (lv->columnConfigInfo()[i].udsId==KIO::UDS_FILE_TYPE && tmpColumn->displayThisOne)
+ if (lv->columnConfigInfo()[i].udsId==TDEIO::UDS_FILE_TYPE && tmpColumn->displayThisOne)
{
setText(tmpColumn->displayInColumn, m_fileitem->mimeComment());
done++;
}
- if (lv->columnConfigInfo()[i].udsId==KIO::UDS_MIME_TYPE && tmpColumn->displayThisOne)
+ if (lv->columnConfigInfo()[i].udsId==TDEIO::UDS_MIME_TYPE && tmpColumn->displayThisOne)
{
setText(tmpColumn->displayInColumn, m_fileitem->mimetype());
done++;
diff --git a/konqueror/listview/konq_listviewwidget.cc b/konqueror/listview/konq_listviewwidget.cc
index 8c4b17319..1dd7a25ad 100644
--- a/konqueror/listview/konq_listviewwidget.cc
+++ b/konqueror/listview/konq_listviewwidget.cc
@@ -238,7 +238,7 @@ void KonqBaseListViewWidget::readProtocolConfig( const KURL & url )
t = TQVariant::DateTime;
else
kdWarning() << "Unsupported ExtraType '" << type << "'" << endl;
- confColumns[extraIndex++].setData( column, TQString("Extra%1").arg(num), KIO::UDS_EXTRA, t, 0);
+ confColumns[extraIndex++].setData( column, TQString("Extra%1").arg(num), TDEIO::UDS_EXTRA, t, 0);
}
//disable everything
@@ -275,24 +275,24 @@ void KonqBaseListViewWidget::readProtocolConfig( const KURL & url )
ColumnInfo *tmpColumn = &confColumns[j];
TQString str;
- if ( tmpColumn->udsId == KIO::UDS_SIZE )
+ if ( tmpColumn->udsId == TDEIO::UDS_SIZE )
str = TDEGlobal::locale()->formatNumber( 888888888, 0 ) + " ";
- else if ( tmpColumn->udsId == KIO::UDS_ACCESS )
+ else if ( tmpColumn->udsId == TDEIO::UDS_ACCESS )
str = "--Permissions--";
- else if ( tmpColumn->udsId == KIO::UDS_USER )
+ else if ( tmpColumn->udsId == TDEIO::UDS_USER )
str = "a_long_username";
- else if ( tmpColumn->udsId == KIO::UDS_GROUP )
+ else if ( tmpColumn->udsId == TDEIO::UDS_GROUP )
str = "a_groupname";
- else if ( tmpColumn->udsId == KIO::UDS_LINK_DEST )
+ else if ( tmpColumn->udsId == TDEIO::UDS_LINK_DEST )
str = "a_quite_long_filename_for_link_dest";
- else if ( tmpColumn->udsId == KIO::UDS_FILE_TYPE )
+ else if ( tmpColumn->udsId == TDEIO::UDS_FILE_TYPE )
str = "a_long_comment_for_mimetype";
- else if ( tmpColumn->udsId == KIO::UDS_MIME_TYPE )
+ else if ( tmpColumn->udsId == TDEIO::UDS_MIME_TYPE )
str = "_a_long_/_mimetype_";
- else if ( tmpColumn->udsId == KIO::UDS_URL )
+ else if ( tmpColumn->udsId == TDEIO::UDS_URL )
str = "a_long_lonq_long_very_long_url";
- else if ( (tmpColumn->udsId & KIO::UDS_TIME)
- || (tmpColumn->udsId == KIO::UDS_EXTRA &&
+ else if ( (tmpColumn->udsId & TDEIO::UDS_TIME)
+ || (tmpColumn->udsId == TDEIO::UDS_EXTRA &&
(tmpColumn->type & TQVariant::DateTime)) )
{
TQDateTime dt( TQDate( 2000, 10, 10 ), TQTime( 20, 20, 20 ) );
@@ -318,8 +318,8 @@ void KonqBaseListViewWidget::readProtocolConfig( const KURL & url )
listingList.append( "MimeType" );
for ( unsigned int i = 0; i < NumberOfAtoms; i++ )
{
- if ( confColumns[i].udsId == KIO::UDS_URL ||
- confColumns[i].udsId == KIO::UDS_MIME_TYPE ||
+ if ( confColumns[i].udsId == TDEIO::UDS_URL ||
+ confColumns[i].udsId == TDEIO::UDS_MIME_TYPE ||
!confColumns[i].displayThisOne )
{
continue;
@@ -364,7 +364,7 @@ void KonqBaseListViewWidget::createColumns()
addColumn( i18n(confColumns[i].name.utf8()), confColumns[i].width );
if ( sortedByColumn == confColumns[i].desktopFileName )
setSorting( currentColumn, m_bAscending );
- if ( confColumns[i].udsId == KIO::UDS_SIZE )
+ if ( confColumns[i].udsId == TDEIO::UDS_SIZE )
setColumnAlignment( currentColumn, AlignRight );
i = -1;
currentColumn++;
@@ -870,7 +870,7 @@ void KonqBaseListViewWidget::slotItemRenamed( TQListViewItem *item, const TQStri
if( !name.isEmpty() )
{
// Actually attempt the rename. If it succeeds, KDirLister will update the name.
- KonqOperations::rename( this, renamedItem->item()->url(), KIO::encodeFileName( name ) );
+ KonqOperations::rename( this, renamedItem->item()->url(), TDEIO::encodeFileName( name ) );
}
// When the KListViewLineEdit loses focus, focus tends to go to the location bar...
diff --git a/konqueror/listview/konq_listviewwidget.h b/konqueror/listview/konq_listviewwidget.h
index b1d536df9..5dd6aca11 100644
--- a/konqueror/listview/konq_listviewwidget.h
+++ b/konqueror/listview/konq_listviewwidget.h
@@ -30,7 +30,7 @@
#include <konq_propsview.h>
#include "konq_listviewitems.h"
-namespace KIO { class Job; }
+namespace TDEIO { class Job; }
class TQCursor;
class TQRect;
diff --git a/konqueror/listview/konq_textviewitem.cc b/konqueror/listview/konq_textviewitem.cc
index e594e8a9a..4b989a9e7 100644
--- a/konqueror/listview/konq_textviewitem.cc
+++ b/konqueror/listview/konq_textviewitem.cc
@@ -44,16 +44,16 @@ int KonqTextViewItem::compare( TQListViewItem *item, int col, bool ascending ) c
ColumnInfo *cInfo=&lv->columnConfigInfo()[i];
if (_column==cInfo->displayInColumn)
{
- if ((cInfo->udsId==KIO::UDS_MODIFICATION_TIME)
- || (cInfo->udsId==KIO::UDS_ACCESS_TIME)
- || (cInfo->udsId==KIO::UDS_CREATION_TIME))
+ if ((cInfo->udsId==TDEIO::UDS_MODIFICATION_TIME)
+ || (cInfo->udsId==TDEIO::UDS_ACCESS_TIME)
+ || (cInfo->udsId==TDEIO::UDS_CREATION_TIME))
{
tmp += TQString::number( m_fileitem->time(cInfo->udsId) ).rightJustify( 14, '0' );
return tmp;
}
- else if (cInfo->udsId==KIO::UDS_SIZE)
+ else if (cInfo->udsId==TDEIO::UDS_SIZE)
{
- tmp += KIO::number( m_fileitem->size() ).rightJustify( 20, '0' );
+ tmp += TDEIO::number( m_fileitem->size() ).rightJustify( 20, '0' );
return tmp;
}
else break;
@@ -68,7 +68,7 @@ int KonqTextViewItem::compare( TQListViewItem *item, int col, bool ascending ) c
void KonqTextViewItem::updateContents()
{
TQString tmp;
- KIO::filesize_t size=m_fileitem->size();
+ TDEIO::filesize_t size=m_fileitem->size();
mode_t m=m_fileitem->mode();
// The order is: .dir (0), dir (1), .file (2), file (3)
@@ -151,37 +151,37 @@ void KonqTextViewItem::updateContents()
{
switch (tmpColumn->udsId)
{
- case KIO::UDS_USER:
+ case TDEIO::UDS_USER:
setText(tmpColumn->displayInColumn,m_fileitem->user());
break;
- case KIO::UDS_GROUP:
+ case TDEIO::UDS_GROUP:
setText(tmpColumn->displayInColumn,m_fileitem->group());
break;
- case KIO::UDS_LINK_DEST:
+ case TDEIO::UDS_LINK_DEST:
setText(tmpColumn->displayInColumn,m_fileitem->linkDest());
break;
- case KIO::UDS_FILE_TYPE:
+ case TDEIO::UDS_FILE_TYPE:
setText(tmpColumn->displayInColumn,m_fileitem->mimeComment());
break;
- case KIO::UDS_MIME_TYPE:
+ case TDEIO::UDS_MIME_TYPE:
setText(tmpColumn->displayInColumn,m_fileitem->mimetype());
break;
- case KIO::UDS_URL:
+ case TDEIO::UDS_URL:
setText(tmpColumn->displayInColumn,m_fileitem->url().prettyURL());
break;
- case KIO::UDS_SIZE:
+ case TDEIO::UDS_SIZE:
if ( static_cast<KonqBaseListViewWidget *>(listView())->m_pSettings->fileSizeInBytes() )
setText(tmpColumn->displayInColumn,TDEGlobal::locale()->formatNumber(size, 0)+" ");
else
- setText(tmpColumn->displayInColumn,KIO::convertSize(size)+" ");
+ setText(tmpColumn->displayInColumn,TDEIO::convertSize(size)+" ");
break;
- case KIO::UDS_ACCESS:
+ case TDEIO::UDS_ACCESS:
setText(tmpColumn->displayInColumn,m_fileitem->permissionsString());
break;
- case KIO::UDS_MODIFICATION_TIME:
- case KIO::UDS_ACCESS_TIME:
- case KIO::UDS_CREATION_TIME:
- for( KIO::UDSEntry::ConstIterator it = m_fileitem->entry().begin(); it != m_fileitem->entry().end(); it++ )
+ case TDEIO::UDS_MODIFICATION_TIME:
+ case TDEIO::UDS_ACCESS_TIME:
+ case TDEIO::UDS_CREATION_TIME:
+ for( TDEIO::UDSEntry::ConstIterator it = m_fileitem->entry().begin(); it != m_fileitem->entry().end(); it++ )
{
if ((*it).m_uds==(unsigned int)tmpColumn->udsId)
{
diff --git a/konqueror/remoteencodingplugin/kremoteencodingplugin.cpp b/konqueror/remoteencodingplugin/kremoteencodingplugin.cpp
index a927f37e0..9ae297285 100644
--- a/konqueror/remoteencodingplugin/kremoteencodingplugin.cpp
+++ b/konqueror/remoteencodingplugin/kremoteencodingplugin.cpp
@@ -135,7 +135,7 @@ KRemoteEncodingPlugin::updateMenu()
for (unsigned i = 0; i < m_menu->popupMenu()->count(); i++)
m_menu->popupMenu()->setItemChecked(m_menu->popupMenu()->idAt(i), false);
- TQString charset = KIO::SlaveConfig::self()->configData(m_currentURL.protocol(), m_currentURL.host(),
+ TQString charset = TDEIO::SlaveConfig::self()->configData(m_currentURL.protocol(), m_currentURL.host(),
DATA_KEY);
if (!charset.isEmpty())
{
@@ -167,7 +167,7 @@ KRemoteEncodingPlugin::slotAboutToShow()
void
KRemoteEncodingPlugin::slotItemSelected(int id)
{
- KConfig config(("kio_" + m_currentURL.protocol() + "rc").latin1());
+ TDEConfig config(("kio_" + m_currentURL.protocol() + "rc").latin1());
TQString host = m_currentURL.host();
if (!m_menu->popupMenu()->isItemChecked(id))
@@ -188,7 +188,7 @@ KRemoteEncodingPlugin::slotDefault()
{
// We have no choice but delete all higher domain level
// settings here since it affects what will be matched.
- KConfig config(("kio_" + m_currentURL.protocol() + "rc").latin1());
+ TDEConfig config(("kio_" + m_currentURL.protocol() + "rc").latin1());
TQStringList partList = TQStringList::split('.', m_currentURL.host(), false);
if (!partList.isEmpty())
@@ -248,7 +248,7 @@ KRemoteEncodingPlugin::updateBrowser()
{
TQCString rtype;
TQByteArray rdata;
- client->call( *it, "KIO::Scheduler", "reparseSlaveConfiguration(TQString)",
+ client->call( *it, "TDEIO::Scheduler", "reparseSlaveConfiguration(TQString)",
data, rtype, rdata);
}
delete client;
diff --git a/konqueror/remoteencodingplugin/kremoteencodingplugin.h b/konqueror/remoteencodingplugin/kremoteencodingplugin.h
index b518da326..d663baf6c 100644
--- a/konqueror/remoteencodingplugin/kremoteencodingplugin.h
+++ b/konqueror/remoteencodingplugin/kremoteencodingplugin.h
@@ -27,7 +27,7 @@
#include <kparts/plugin.h>
class KActionMenu;
-class KConfig;
+class TDEConfig;
class KonqDirPart;
class KRemoteEncodingPlugin: public KParts::Plugin
diff --git a/konqueror/shellcmdplugin/kshellcmdplugin.cpp b/konqueror/shellcmdplugin/kshellcmdplugin.cpp
index fefc52de4..16975c405 100644
--- a/konqueror/shellcmdplugin/kshellcmdplugin.cpp
+++ b/konqueror/shellcmdplugin/kshellcmdplugin.cpp
@@ -45,7 +45,7 @@ void KShellCmdPlugin::slotExecuteShellCommand()
KMessageBox::sorry(0L, "KShellCmdPlugin::slotExecuteShellCommand: Program error, please report a bug.");
return;
}
- KURL url = KIO::NetAccess::mostLocalURL(part->url(),NULL);
+ KURL url = TDEIO::NetAccess::mostLocalURL(part->url(),NULL);
if ( !url.isLocalFile() )
{
KMessageBox::sorry(part->widget(),i18n("Executing shell commands works only on local directories."));
diff --git a/konqueror/sidebar/konqsidebar.cpp b/konqueror/sidebar/konqsidebar.cpp
index 61e0f3b82..db0421c52 100644
--- a/konqueror/sidebar/konqsidebar.cpp
+++ b/konqueror/sidebar/konqsidebar.cpp
@@ -32,8 +32,8 @@ KonqSidebar::KonqSidebar( TQWidget *parentWidget, const char *widgetName,
// this should be your custom internal widget
m_widget = new Sidebar_Widget( parentWidget, this, widgetName ,universalMode, parentWidget->topLevelWidget()->property("currentProfile").toString() );
m_extension = new KonqSidebarBrowserExtension( this, m_widget,"KonqSidebar::BrowserExtension" );
- connect(m_widget,TQT_SIGNAL(started(KIO::Job *)),
- this, TQT_SIGNAL(started(KIO::Job*)));
+ connect(m_widget,TQT_SIGNAL(started(TDEIO::Job *)),
+ this, TQT_SIGNAL(started(TDEIO::Job*)));
connect(m_widget,TQT_SIGNAL(completed()),this,TQT_SIGNAL(completed()));
connect(m_extension, TQT_SIGNAL(addWebSideBar(const KURL&, const TQString&)),
m_widget, TQT_SLOT(addWebSideBar(const KURL&, const TQString&)));
diff --git a/konqueror/sidebar/konqsidebarplugin.h b/konqueror/sidebar/konqsidebarplugin.h
index ad859d025..b9225edfa 100644
--- a/konqueror/sidebar/konqsidebarplugin.h
+++ b/konqueror/sidebar/konqsidebarplugin.h
@@ -51,7 +51,7 @@ class KDE_EXPORT KonqSidebarPlugin : public TQObject
signals:
void requestURL(KURL&);
- void started(KIO::Job *);
+ void started(TDEIO::Job *);
void completed();
void setIcon(const TQString& icon);
void setCaption(const TQString& caption);
diff --git a/konqueror/sidebar/sidebar_widget.cpp b/konqueror/sidebar/sidebar_widget.cpp
index f1dd6ad22..6a5ecd22d 100644
--- a/konqueror/sidebar/sidebar_widget.cpp
+++ b/konqueror/sidebar/sidebar_widget.cpp
@@ -130,7 +130,7 @@ void addBackEnd::doRollBack()
dirEntries.remove("..");
for ( TQStringList::Iterator it = dirEntries.begin(); it != dirEntries.end(); ++it ) {
if ((*it)!="add")
- KIO::NetAccess::del(KURL( loc+(*it) ), m_parent);
+ TDEIO::NetAccess::del(KURL( loc+(*it) ), m_parent);
}
emit initialCopyNeeded();
}
@@ -303,11 +303,11 @@ Sidebar_Widget::Sidebar_Widget(TQWidget *parent, KParts::ReadOnlyPart *par, cons
if (universalMode)
{
- m_config = new KConfig("konqsidebartng_kicker.rc");
+ m_config = new TDEConfig("konqsidebartng_kicker.rc");
}
else
{
- m_config = new KConfig("konqsidebartng.rc");
+ m_config = new TDEConfig("konqsidebartng.rc");
m_config->setGroup(currentProfile);
}
readConfig();
@@ -1195,8 +1195,8 @@ void Sidebar_Widget::popupMenu( KXMLGUIClient *client,
void Sidebar_Widget::connectModule(TQObject *mod)
{
- if (mod->metaObject()->findSignal("started(KIO::Job*)") != -1) {
- connect(mod,TQT_SIGNAL(started(KIO::Job *)),this, TQT_SIGNAL(started(KIO::Job*)));
+ if (mod->metaObject()->findSignal("started(TDEIO::Job*)") != -1) {
+ connect(mod,TQT_SIGNAL(started(TDEIO::Job *)),this, TQT_SIGNAL(started(TDEIO::Job*)));
}
if (mod->metaObject()->findSignal("completed()") != -1) {
diff --git a/konqueror/sidebar/sidebar_widget.h b/konqueror/sidebar/sidebar_widget.h
index d258c9c3b..da5b0888b 100644
--- a/konqueror/sidebar/sidebar_widget.h
+++ b/konqueror/sidebar/sidebar_widget.h
@@ -130,7 +130,7 @@ protected slots:
void saveConfig();
signals:
- void started(KIO::Job *);
+ void started(TDEIO::Job *);
void completed();
void fileSelection(const KFileItemList& iems);
void fileMouseOver(const KFileItem& item);
@@ -191,7 +191,7 @@ private:
TQGuardedPtr<ButtonInfo> m_activeModule;
TQGuardedPtr<ButtonInfo> m_currentButton;
- KConfig *m_config;
+ TDEConfig *m_config;
TQTimer m_configTimer;
KURL m_storedUrl;
diff --git a/konqueror/sidebar/trees/dirtree_module/dirtree_item.cpp b/konqueror/sidebar/trees/dirtree_module/dirtree_item.cpp
index 16520d0e0..9c31acdf5 100644
--- a/konqueror/sidebar/trees/dirtree_module/dirtree_item.cpp
+++ b/konqueror/sidebar/trees/dirtree_module/dirtree_item.cpp
@@ -203,7 +203,7 @@ void KonqSidebarDirTreeItem::paste()
kdDebug(1201) << "move (from clipboard data) = " << move << endl;
}
- KIO::pasteClipboard( m_fileItem->url(), move );
+ TDEIO::pasteClipboard( m_fileItem->url(), move );
}
void KonqSidebarDirTreeItem::trash()
diff --git a/konqueror/sidebar/trees/dirtree_module/dirtree_module.cpp b/konqueror/sidebar/trees/dirtree_module/dirtree_module.cpp
index 7d8f7b1fd..40dd324e8 100644
--- a/konqueror/sidebar/trees/dirtree_module/dirtree_module.cpp
+++ b/konqueror/sidebar/trees/dirtree_module/dirtree_module.cpp
@@ -42,7 +42,7 @@ KonqSidebarDirTreeModule::KonqSidebarDirTreeModule( KonqSidebarTree * parentTree
universalMode = ksi ? ksi->universalMode() : false;
} */
- KConfig * config = new KConfig( universalMode ? "konqsidebartng_kicker.rc" : "konqsidebartng.rc" );
+ TDEConfig * config = new TDEConfig( universalMode ? "konqsidebartng_kicker.rc" : "konqsidebartng.rc" );
config->setGroup("");
m_showArchivesAsFolders = config->readBoolEntry("ShowArchivesAsFolders",true);
delete config;
@@ -90,7 +90,7 @@ void KonqSidebarDirTreeModule::addTopLevelItem( KonqSidebarTreeTopLevelItem * it
TQString configured = cfg.readEntry("X-TDE-ConfiguredURL");
if (!configured.isEmpty()) {
TQStringList list = TQStringList::split(':', configured);
- KConfig config(list[0]);
+ TDEConfig config(list[0]);
if (list[1] != "noGroup") config.setGroup(list[1]);
TQString conf_url = config.readEntry(list[2]);
if (!conf_url.isEmpty()) {
@@ -378,7 +378,7 @@ void KonqSidebarDirTreeModule::listDirectory( KonqSidebarTreeItem *item )
KonqSidebarDirTreeItem *dirTreeItem = new KonqSidebarDirTreeItem( parentItem, m_topLevelItem, fileItem );
dirTreeItem->setPixmap( 0, fileItem->pixmap( size ) );
- dirTreeItem->setText( 0, KIO::decodeFileName( fileItem->name() ) );
+ dirTreeItem->setText( 0, TDEIO::decodeFileName( fileItem->name() ) );
oldItem = static_cast<KonqSidebarDirTreeItem *> (oldItem->nextSibling());
}
@@ -447,7 +447,7 @@ void KonqSidebarDirTreeModule::slotNewItems( const KFileItemList& entries )
KonqSidebarDirTreeItem *dirTreeItem = new KonqSidebarDirTreeItem( parentItem, m_topLevelItem, fileItem );
dirTreeItem->setPixmap( 0, fileItem->pixmap( size ) );
- dirTreeItem->setText( 0, KIO::decodeFileName( fileItem->name() ) );
+ dirTreeItem->setText( 0, TDEIO::decodeFileName( fileItem->name() ) );
}
} while ((parentItem = parentItemList ? parentItemList->take(0) : 0));
@@ -494,7 +494,7 @@ void KonqSidebarDirTreeModule::slotRefreshItems( const KFileItemList &entries )
dirTreeItem->reset(); // Reset id
dirTreeItem->setPixmap( 0, fileItem->pixmap( size ) );
- dirTreeItem->setText( 0, KIO::decodeFileName( fileItem->name() ) );
+ dirTreeItem->setText( 0, TDEIO::decodeFileName( fileItem->name() ) );
// Make sure the item doesn't get inserted twice!
// dirTreeItem->id points to the new name
@@ -504,7 +504,7 @@ void KonqSidebarDirTreeModule::slotRefreshItems( const KFileItemList &entries )
else
{
dirTreeItem->setPixmap( 0, fileItem->pixmap( size ) );
- dirTreeItem->setText( 0, KIO::decodeFileName( fileItem->name() ) );
+ dirTreeItem->setText( 0, TDEIO::decodeFileName( fileItem->name() ) );
}
} while ((item = itemList ? itemList->take(0) : 0));
diff --git a/konqueror/sidebar/trees/history_module/history_module.cpp b/konqueror/sidebar/trees/history_module/history_module.cpp
index 71c1b5a44..30d96f060 100644
--- a/konqueror/sidebar/trees/history_module/history_module.cpp
+++ b/konqueror/sidebar/trees/history_module/history_module.cpp
@@ -56,8 +56,8 @@ KonqSidebarHistoryModule::KonqSidebarHistoryModule( KonqSidebarTree * parentTree
m_dict.setAutoDelete( true );
m_currentTime = TQDateTime::currentDateTime();
- KConfig *kc = TDEGlobal::config();
- KConfigGroupSaver cs( kc, "HistorySettings" );
+ TDEConfig *kc = TDEGlobal::config();
+ TDEConfigGroupSaver cs( kc, "HistorySettings" );
m_sortsByName = kc->readEntry( "SortHistory", "byDate" ) == "byName";
@@ -111,8 +111,8 @@ KonqSidebarHistoryModule::~KonqSidebarHistoryModule()
++it;
}
- KConfig *kc = TDEGlobal::config();
- KConfigGroupSaver cs( kc, "HistorySettings" );
+ TDEConfig *kc = TDEGlobal::config();
+ TDEConfigGroupSaver cs( kc, "HistorySettings" );
kc->writeEntry("OpenGroups", openGroups);
kc->sync();
}
@@ -143,8 +143,8 @@ void KonqSidebarHistoryModule::slotCreateItems()
++it;
}
- KConfig *kc = TDEGlobal::config();
- KConfigGroupSaver cs( kc, "HistorySettings" );
+ TDEConfig *kc = TDEGlobal::config();
+ TDEConfigGroupSaver cs( kc, "HistorySettings" );
TQStringList openGroups = kc->readListEntry("OpenGroups");
TQStringList::Iterator it2 = openGroups.begin();
KonqSidebarHistoryGroupItem *group;
@@ -297,8 +297,8 @@ void KonqSidebarHistoryModule::sortingChanged()
{
m_topLevelItem->sort();
- KConfig *kc = TDEGlobal::config();
- KConfigGroupSaver cs( kc, "HistorySettings" );
+ TDEConfig *kc = TDEGlobal::config();
+ TDEConfigGroupSaver cs( kc, "HistorySettings" );
kc->writeEntry( "SortHistory", m_sortsByName ? "byName" : "byDate" );
kc->sync();
}
diff --git a/konqueror/sidebar/trees/history_module/history_settings.cpp b/konqueror/sidebar/trees/history_module/history_settings.cpp
index 3e8c8a5de..701f72776 100644
--- a/konqueror/sidebar/trees/history_module/history_settings.cpp
+++ b/konqueror/sidebar/trees/history_module/history_settings.cpp
@@ -42,7 +42,7 @@ KonqSidebarHistorySettings::~KonqSidebarHistorySettings()
void KonqSidebarHistorySettings::readSettings(bool global)
{
- KConfig *config;
+ TDEConfig *config;
TQString oldgroup;
if (global) {
@@ -50,7 +50,7 @@ void KonqSidebarHistorySettings::readSettings(bool global)
oldgroup= config->group();
}
else
- config = new KConfig("konquerorrc");
+ config = new TDEConfig("konquerorrc");
config->setGroup("HistorySettings");
m_valueYoungerThan = config->readNumEntry("Value youngerThan", 1 );
@@ -77,7 +77,7 @@ void KonqSidebarHistorySettings::readSettings(bool global)
void KonqSidebarHistorySettings::applySettings()
{
- KConfig *config = new KConfig("konquerorrc");
+ TDEConfig *config = new TDEConfig("konquerorrc");
config->setGroup("HistorySettings");
config->writeEntry("Value youngerThan", m_valueYoungerThan );
diff --git a/konqueror/sidebar/trees/history_module/kcmhistory.cpp b/konqueror/sidebar/trees/history_module/kcmhistory.cpp
index a1ef792d6..967616bd5 100644
--- a/konqueror/sidebar/trees/history_module/kcmhistory.cpp
+++ b/konqueror/sidebar/trees/history_module/kcmhistory.cpp
@@ -49,7 +49,7 @@ typedef KGenericFactory<HistorySidebarConfig, TQWidget > KCMHistoryFactory;
K_EXPORT_COMPONENT_FACTORY (kcm_history, KCMHistoryFactory("kcmhistory") )
HistorySidebarConfig::HistorySidebarConfig( TQWidget *parent, const char* name, const TQStringList & )
- : KCModule (KCMHistoryFactory::instance(), parent, name)
+ : TDECModule (KCMHistoryFactory::instance(), parent, name)
{
TDEGlobal::locale()->insertCatalogue("konqueror");
@@ -115,7 +115,7 @@ void HistorySidebarConfig::configChanged()
void HistorySidebarConfig::load()
{
- KConfig config("konquerorrc");
+ TDEConfig config("konquerorrc");
config.setGroup("HistorySettings");
dialog->spinExpire->setValue( config.readNumEntry( "Maximum age of History entries", 90) );
dialog->spinEntries->setValue( config.readNumEntry( "Maximum of History entries", 500 ) );
@@ -147,7 +147,7 @@ void HistorySidebarConfig::save()
TQ_UINT32 age = dialog->cbExpire->isChecked() ? dialog->spinExpire->value() : 0;
TQ_UINT32 count = dialog->spinEntries->value();
- KConfig config("konquerorrc");
+ TDEConfig config("konquerorrc");
config.setGroup("HistorySettings");
config.writeEntry( "Maximum of History entries", count );
config.writeEntry( "Maximum age of History entries", age );
diff --git a/konqueror/sidebar/trees/history_module/kcmhistory.h b/konqueror/sidebar/trees/history_module/kcmhistory.h
index 0e354af65..5731ae267 100644
--- a/konqueror/sidebar/trees/history_module/kcmhistory.h
+++ b/konqueror/sidebar/trees/history_module/kcmhistory.h
@@ -27,7 +27,7 @@ class KonqHistoryManager;
class KonqSidebarHistorySettings;
class KonqSidebarHistoryDlg;
-class HistorySidebarConfig : public KCModule
+class HistorySidebarConfig : public TDECModule
{
Q_OBJECT
diff --git a/konqueror/sidebar/trees/konq_sidebartree.cpp b/konqueror/sidebar/trees/konq_sidebartree.cpp
index 7ba7c3014..b156c071d 100644
--- a/konqueror/sidebar/trees/konq_sidebartree.cpp
+++ b/konqueror/sidebar/trees/konq_sidebartree.cpp
@@ -380,7 +380,7 @@ void KonqSidebarTree::addURL(KonqSidebarTreeTopLevelItem* item, const KURL & url
{
TQString filename = findUniqueFilename(path, url.fileName());
destUrl.setPath(filename);
- KIO::NetAccess::copy(url, destUrl, this);
+ TDEIO::NetAccess::copy(url, destUrl, this);
}
else
{
@@ -760,7 +760,7 @@ void KonqSidebarTree::loadTopLevelItem( KonqSidebarTreeItem *parent, const TQSt
TQFileInfo inf( filename );
TQString path = filename;
- TQString name = KIO::decodeFileName( inf.fileName() );
+ TQString name = TDEIO::decodeFileName( inf.fileName() );
if ( name.length() > 8 && name.right( 8 ) == ".desktop" )
name.truncate( name.length() - 8 );
if ( name.length() > 7 && name.right( 7 ) == ".kdelnk" )
diff --git a/konqueror/sidebar/trees/konq_sidebartreetoplevelitem.cpp b/konqueror/sidebar/trees/konq_sidebartreetoplevelitem.cpp
index 4ce6fe445..8c9b787f8 100644
--- a/konqueror/sidebar/trees/konq_sidebartreetoplevelitem.cpp
+++ b/konqueror/sidebar/trees/konq_sidebartreetoplevelitem.cpp
@@ -169,7 +169,7 @@ void KonqSidebarTreeTopLevelItem::paste()
else
destURL = m_externalURL;
- KIO::pasteClipboard( destURL, move );
+ TDEIO::pasteClipboard( destURL, move );
}
void KonqSidebarTreeTopLevelItem::rename()
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-10 21:03:32 +0000