summaryrefslogtreecommitdiffstats
path: root/kdesktop
diff options
context:
space:
mode:
Diffstat (limited to 'kdesktop')
-rw-r--r--kdesktop/bgmanager.h4
-rw-r--r--kdesktop/desktop.cc12
-rw-r--r--kdesktop/init.cc6
-rw-r--r--kdesktop/kcustommenu.cc2
-rw-r--r--kdesktop/kdesktopshadowsettings.cpp4
-rw-r--r--kdesktop/kdesktopshadowsettings.h6
-rw-r--r--kdesktop/kdiconview.cc18
-rw-r--r--kdesktop/kdiconview.h4
-rw-r--r--kdesktop/klaunch.kcfg2
-rw-r--r--kdesktop/krootwm.cc4
-rw-r--r--kdesktop/kwebdesktop/kwebdesktop.cpp18
-rw-r--r--kdesktop/kwebdesktop/kwebdesktop.h6
-rw-r--r--kdesktop/kwebdesktop/kwebdesktop.kcfg2
-rw-r--r--kdesktop/kxdglauncher.cpp2
14 files changed, 45 insertions, 45 deletions
diff --git a/kdesktop/bgmanager.h b/kdesktop/bgmanager.h
index 17a3209f2..e73337db4 100644
--- a/kdesktop/bgmanager.h
+++ b/kdesktop/bgmanager.h
@@ -19,7 +19,7 @@
#define COMPOSITE
#endif
-class KConfig;
+class TDEConfig;
class TQTimer;
class TQPixmap;
class KPopupMenu;
@@ -118,7 +118,7 @@ private:
int m_CacheLimit;
int m_Serial, m_Hash, m_Current;
- KConfig *m_pConfig;
+ TDEConfig *m_pConfig;
TQWidget *m_pDesktop;
TQTimer *m_pTimer;
diff --git a/kdesktop/desktop.cc b/kdesktop/desktop.cc
index ebd031624..6c5c97eaf 100644
--- a/kdesktop/desktop.cc
+++ b/kdesktop/desktop.cc
@@ -696,7 +696,7 @@ void KDesktop::slotWindowAdded(WId w)
if ((windowType == NET::Normal || windowType == NET::Unknown) &&
inf.mappingState() == NET::Visible)
{
- KConfig twincfg( "twinrc", true ); // see in twin
+ TDEConfig twincfg( "twinrc", true ); // see in twin
twincfg.setGroup( "Windows" );
if( twincfg.readBoolEntry( "ShowDesktopIsMinimizeAll", false ))
{
@@ -983,7 +983,7 @@ void KDesktop::handleImageDropEvent(TQDropEvent * e)
src.setPath( tmpFile.name() );
KURL dest( KDIconView::desktopURL() );
dest.addPath( filename );
- KIO::NetAccess::copy( src, dest, 0 );
+ TDEIO::NetAccess::copy( src, dest, 0 );
tmpFile.unlink();
}
else if (result == 2)
@@ -1013,7 +1013,7 @@ void KDesktop::slotNewWallpaper(const KURL &url)
KTempFile tmpFile( TDEGlobal::dirs()->saveLocation("wallpaper"), "." + ext );
KURL localURL; localURL.setPath( tmpFile.name() );
// We pass 0 as parent window because passing the desktop is not a good idea
- KIO::NetAccess::file_copy( url, localURL, -1, true /*overwrite*/ );
+ TDEIO::NetAccess::file_copy( url, localURL, -1, true /*overwrite*/ );
bgMgr->setWallpaper( localURL.path() );
}
}
@@ -1162,14 +1162,14 @@ void KDesktop::addIcon(const TQString & _url, const TQString & _dest, int x, int
{
TQString filename = _url.mid(_url.findRev('/') + 1);
- TQValueList<KIO::CopyInfo> files;
- KIO::CopyInfo i;
+ TQValueList<TDEIO::CopyInfo> files;
+ TDEIO::CopyInfo i;
i.uSource = KURL::fromPathOrURL( _url );
i.uDest = KURL::fromPathOrURL( _dest );
i.uDest.addPath( filename );
files.append(i);
if (!TQFile::exists(i.uDest.prettyURL().replace("file://",TQString()))) { m_pIconView->slotAboutToCreate( TQPoint( x, y ), files );
- KIO::copy( i.uSource, i.uDest, false ); }
+ TDEIO::copy( i.uSource, i.uDest, false ); }
// m_pIconView->addFuturePosition(filename, x, y);
// tqDebug("addIcon %s %s %d %d", _url.latin1(), _dest.latin1(), x, y);
diff --git a/kdesktop/init.cc b/kdesktop/init.cc
index 27990245c..cf45c71d4 100644
--- a/kdesktop/init.cc
+++ b/kdesktop/init.cc
@@ -134,7 +134,7 @@ static TQString realDesktopPath()
*/
static void copyDesktopLinks()
{
- KConfig *config = kapp->config();
+ TDEConfig *config = kapp->config();
config->setGroup("General");
if (!config->readBoolEntry("CopyDesktopLinks", true))
return;
@@ -230,8 +230,8 @@ void testLocalInstallation()
TQByteArray packedArgs;
TQDataStream stream( packedArgs, IO_WriteOnly );
stream << (int)2;
- KIO::Job* job = KIO::special( "trash:/", packedArgs );
- (void)KIO::NetAccess::synchronousRun( job, 0 );
+ TDEIO::Job* job = TDEIO::special( "trash:/", packedArgs );
+ (void)TDEIO::NetAccess::synchronousRun( job, 0 );
// OK the only thing missing is to convert the icon position...
KSimpleConfig cfg( locateLocal("appdata", "IconPositions") );
diff --git a/kdesktop/kcustommenu.cc b/kdesktop/kcustommenu.cc
index 4a51cefdb..b32c77096 100644
--- a/kdesktop/kcustommenu.cc
+++ b/kdesktop/kcustommenu.cc
@@ -37,7 +37,7 @@ KCustomMenu::KCustomMenu(const TQString &configfile, TQWidget *parent)
{
d = new KCustomMenuPrivate;
- KConfig cfg(configfile, true, false);
+ TDEConfig cfg(configfile, true, false);
int count = cfg.readNumEntry("NrOfItems");
for(int i = 0; i < count; i++)
{
diff --git a/kdesktop/kdesktopshadowsettings.cpp b/kdesktop/kdesktopshadowsettings.cpp
index 0453a91e4..2d483840c 100644
--- a/kdesktop/kdesktopshadowsettings.cpp
+++ b/kdesktop/kdesktopshadowsettings.cpp
@@ -28,7 +28,7 @@
//#define DEBUG
-KDesktopShadowSettings::KDesktopShadowSettings(KConfig *cfg) :
+KDesktopShadowSettings::KDesktopShadowSettings(TDEConfig *cfg) :
KShadowSettings(),
m_textColor(TQColor("#FFFFFF")),
_UID(0L)
@@ -59,7 +59,7 @@ unsigned long KDesktopShadowSettings::UID()
/**
* Loads a new configuration
*/
-void KDesktopShadowSettings::setConfig(KConfig *val)
+void KDesktopShadowSettings::setConfig(TDEConfig *val)
{
config = val;
diff --git a/kdesktop/kdesktopshadowsettings.h b/kdesktop/kdesktopshadowsettings.h
index f97e703ca..7e421c6d6 100644
--- a/kdesktop/kdesktopshadowsettings.h
+++ b/kdesktop/kdesktopshadowsettings.h
@@ -63,7 +63,7 @@ class KDesktopShadowSettings : public KShadowSettings
* Constructor
* @param cfg the configuration file
*/
- KDesktopShadowSettings(KConfig *cfg = NULL);
+ KDesktopShadowSettings(TDEConfig *cfg = NULL);
virtual ~KDesktopShadowSettings();
@@ -71,7 +71,7 @@ class KDesktopShadowSettings : public KShadowSettings
* Sets a specific configuration file after the object's creation
* @param config new configuration object
*/
- void setConfig(KConfig *);
+ void setConfig(TDEConfig *);
/**
* Returns the text color as definied in the configuraiton
@@ -104,7 +104,7 @@ class KDesktopShadowSettings : public KShadowSettings
void setUID(unsigned long val = 0L);
private:
- KConfig *config;
+ TDEConfig *config;
TQColor m_textColor;
TQColor m_bgColor;
bool m_isEnabled;
diff --git a/kdesktop/kdiconview.cc b/kdesktop/kdiconview.cc
index d461a6ecb..ad049256d 100644
--- a/kdesktop/kdiconview.cc
+++ b/kdesktop/kdiconview.cc
@@ -278,7 +278,7 @@ void KDIconView::initConfig( bool init )
KDesktopSettings::self()->readConfig();
}
- KConfig * config = TDEGlobal::config();
+ TDEConfig * config = TDEGlobal::config();
if ( !init ) {
KDesktopShadowSettings *shadowSettings = static_cast<KDesktopShadowSettings *>(m_shadowEngine->shadowSettings());
@@ -444,7 +444,7 @@ void KDIconView::createActions()
connect( trash, TQT_SIGNAL( activated( KAction::ActivationReason, TQt::ButtonState ) ),
this, TQT_SLOT( slotTrashActivated( KAction::ActivationReason, TQt::ButtonState ) ) );
- KConfig config("kdeglobals", true, false);
+ TDEConfig config("kdeglobals", true, false);
config.setGroup( "KDE" );
(void) new KAction( i18n( "&Delete" ), "editdelete", SHIFT+Key_Delete, TQT_TQOBJECT(this), TQT_SLOT( slotDelete() ), &m_actionCollection, "del" );
@@ -748,7 +748,7 @@ private:
void KDIconView::fillMediaListView()
{
- g_pConfig = new KConfig("kdesktoprc");
+ g_pConfig = new TDEConfig("kdesktoprc");
mMediaListView->hide();
mMediaListView->clear();
KMimeType::List mimetypes = KMimeType::allMimeTypes();
@@ -767,7 +767,7 @@ void KDIconView::fillMediaListView()
void KDIconView::saveMediaListView()
{
- g_pConfig = new KConfig("kdesktoprc");
+ g_pConfig = new TDEConfig("kdesktoprc");
g_pConfig->setGroup( "Media" );
TQStringList exclude;
for (DesktopBehaviorMediaItem *it=static_cast<DesktopBehaviorMediaItem *>(mMediaListView->firstChild());
@@ -1406,7 +1406,7 @@ void KDIconView::slotClipboardDataChanged()
disableIcons( lst );
- TQString actionText = KIO::pasteActionText();
+ TQString actionText = TDEIO::pasteActionText();
bool paste = !actionText.isEmpty();
if ( paste ) {
KAction* pasteAction = m_actionCollection.action( "paste" );
@@ -1480,7 +1480,7 @@ void KDIconView::slotItemRenamed(TQIconViewItem* _item, const TQString &name)
KonqIconViewWidget::slotItemRenamed(_item, newName);
}
-void KDIconView::slotAboutToCreate(const TQPoint &pos, const TQValueList<KIO::CopyInfo> &files)
+void KDIconView::slotAboutToCreate(const TQPoint &pos, const TQValueList<TDEIO::CopyInfo> &files)
{
if (pos.isNull())
return;
@@ -1493,7 +1493,7 @@ void KDIconView::slotAboutToCreate(const TQPoint &pos, const TQValueList<KIO::Co
TQString dir = url().path(-1); // Strip trailing /
- TQValueList<KIO::CopyInfo>::ConstIterator it = files.begin();
+ TQValueList<TDEIO::CopyInfo>::ConstIterator it = files.begin();
int gridX = gridXValue();
int gridY = 120; // 120 pixels should be enough for everyone (tm)
@@ -1704,7 +1704,7 @@ void KDIconView::setupSortKeys()
strKey = it->text().lower();
break;
case Size:
- strKey = KIO::number(static_cast<KFileIVI *>( it )->item()->size()).rightJustify(20, '0');
+ strKey = TDEIO::number(static_cast<KFileIVI *>( it )->item()->size()).rightJustify(20, '0');
break;
case Type:
// Sort by Type + Name (#17014)
@@ -1713,7 +1713,7 @@ void KDIconView::setupSortKeys()
case Date:
TQDateTime dayt;
dayt.setTime_t( static_cast<KFileIVI *>( it )->
- item()->time( KIO::UDS_MODIFICATION_TIME ) );
+ item()->time( TDEIO::UDS_MODIFICATION_TIME ) );
strKey = dayt.toString( "yyyyMMddhhmmss" );
break;
}
diff --git a/kdesktop/kdiconview.h b/kdesktop/kdiconview.h
index 34028d84c..f951765ba 100644
--- a/kdesktop/kdiconview.h
+++ b/kdesktop/kdiconview.h
@@ -124,7 +124,7 @@ protected slots:
void slotContextMenuRequested(TQIconViewItem* _item, const TQPoint& _global);
void slotEnableAction( const char * name, bool enabled );
public slots:
- void slotAboutToCreate(const TQPoint &pos, const TQValueList<KIO::CopyInfo> &files);
+ void slotAboutToCreate(const TQPoint &pos, const TQValueList<TDEIO::CopyInfo> &files);
protected slots:
void slotItemRenamed(TQIconViewItem*, const TQString &name);
@@ -270,7 +270,7 @@ private:
bool m_needDesktopAlign;
TQListView *mMediaListView;
- KConfig *g_pConfig;
+ TDEConfig *g_pConfig;
};
#endif
diff --git a/kdesktop/klaunch.kcfg b/kdesktop/klaunch.kcfg
index 8f7800e92..f43592e70 100644
--- a/kdesktop/klaunch.kcfg
+++ b/kdesktop/klaunch.kcfg
@@ -4,7 +4,7 @@
xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0
http://www.kde.org/standards/kcfg/1.0/kcfg.xsd" >
<kcfgfile name="klaunchrc" />
- <!-- generated by KConfig XTraKtor -->
+ <!-- generated by TDEConfig XTraKtor -->
<group name="BusyCursorSettings">
<entry key="Timeout" type="Int">
diff --git a/kdesktop/krootwm.cc b/kdesktop/krootwm.cc
index 403c89f13..08db2eb95 100644
--- a/kdesktop/krootwm.cc
+++ b/kdesktop/krootwm.cc
@@ -530,7 +530,7 @@ void KRootWm::slotToggleAutoAlign( bool b )
else
cfilename.sprintf("kdesktop-screen-%drc", desktop);
- KConfig *kdg_config = new KConfig(cfilename, false, false);
+ TDEConfig *kdg_config = new TDEConfig(cfilename, false, false);
kdg_config->setGroup( "General" );
kdg_config->writeEntry( "AutoLineUpIcons", b );
kdg_config->sync();
@@ -757,7 +757,7 @@ void KRootWm::slotOpenTerminal()
TDEProcess* p = new TDEProcess;
TQ_CHECK_PTR(p);
- KConfigGroupSaver gs(TDEGlobal::config(), "General");
+ TDEConfigGroupSaver gs(TDEGlobal::config(), "General");
TQString terminal = TDEGlobal::config()->readPathEntry("TerminalApplication", "konsole");
*p << terminal << "--workdir=" + TDEGlobalSettings::desktopPath() + "/";
diff --git a/kdesktop/kwebdesktop/kwebdesktop.cpp b/kdesktop/kwebdesktop/kwebdesktop.cpp
index e845750a1..58fd0b7b8 100644
--- a/kdesktop/kwebdesktop/kwebdesktop.cpp
+++ b/kdesktop/kwebdesktop/kwebdesktop.cpp
@@ -51,16 +51,16 @@ KWebDesktopRun::KWebDesktopRun( KWebDesktop* webDesktop, const KURL & url )
: m_webDesktop(webDesktop), m_url(url)
{
kdDebug() << "KWebDesktopRun::KWebDesktopRun starting get" << endl;
- KIO::Job * job = KIO::get(m_url, false, false);
- 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 &)));
+ TDEIO::Job * job = TDEIO::get(m_url, false, false);
+ 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 KWebDesktopRun::slotMimetype( KIO::Job *job, const TQString &_type )
+void KWebDesktopRun::slotMimetype( TDEIO::Job *job, const TQString &_type )
{
- KIO::SimpleJob *sjob = static_cast<KIO::SimpleJob *>(job);
+ TDEIO::SimpleJob *sjob = static_cast<TDEIO::SimpleJob *>(job);
// Update our URL in case of a redirection
m_url = sjob->url();
TQString type = _type; // necessary copy if we plan to use it
@@ -73,7 +73,7 @@ void KWebDesktopRun::slotMimetype( KIO::Job *job, const TQString &_type )
part->openURL( m_url );
}
-void KWebDesktopRun::slotFinished( KIO::Job * job )
+void KWebDesktopRun::slotFinished( TDEIO::Job * job )
{
// The whole point of all this is to abort silently on error
if (job->error())
@@ -126,7 +126,7 @@ int main( int argc, char **argv )
int ret = app.exec();
- KIO::SimpleJob::removeOnHold(); // Kill any slave that was put on hold.
+ TDEIO::SimpleJob::removeOnHold(); // Kill any slave that was put on hold.
delete webDesktop;
delete run;
//khtml::Cache::clear();
diff --git a/kdesktop/kwebdesktop/kwebdesktop.h b/kdesktop/kwebdesktop/kwebdesktop.h
index b4b5cc0fc..089a25673 100644
--- a/kdesktop/kwebdesktop/kwebdesktop.h
+++ b/kdesktop/kwebdesktop/kwebdesktop.h
@@ -24,7 +24,7 @@
#include <kparts/browserextension.h>
#include <khtml_part.h>
-namespace KIO { class Job; }
+namespace TDEIO { class Job; }
class KWebDesktop : public TQObject
{
@@ -59,8 +59,8 @@ public:
~KWebDesktopRun() {}
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:
KWebDesktop* m_webDesktop;
diff --git a/kdesktop/kwebdesktop/kwebdesktop.kcfg b/kdesktop/kwebdesktop/kwebdesktop.kcfg
index fad395a19..b0920f410 100644
--- a/kdesktop/kwebdesktop/kwebdesktop.kcfg
+++ b/kdesktop/kwebdesktop/kwebdesktop.kcfg
@@ -4,7 +4,7 @@
xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0
http://www.kde.org/standards/kcfg/1.0/kcfg.xsd" >
<kcfgfile name="kwebdesktoprc" />
- <!-- generated by KConfig XTraKtor -->
+ <!-- generated by TDEConfig XTraKtor -->
<group name="Settings">
<entry key="URL" type="String">
diff --git a/kdesktop/kxdglauncher.cpp b/kdesktop/kxdglauncher.cpp
index 61f3cfd4f..05c5f4ef2 100644
--- a/kdesktop/kxdglauncher.cpp
+++ b/kdesktop/kxdglauncher.cpp
@@ -136,7 +136,7 @@ int main( int argc, char **argv)
while (xdgModifiedDirectory.endsWith("/")) {
xdgModifiedDirectory.truncate(xdgModifiedDirectory.length()-1);
}
- KConfig config(TQDir::homeDirPath() + "/.config/user-dirs.dirs", false, false);
+ TDEConfig config(TQDir::homeDirPath() + "/.config/user-dirs.dirs", false, false);
config.writeEntry("XDG_DOCUMENTS_DIR", TQString("\"") + xdgModifiedDirectory + TQString("\""), true);
config.sync();
if (args->isSet( "getpath" ) == true) {
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-17 13:32:15 +0000