summaryrefslogtreecommitdiffstats
path: root/superkaramba/src
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:38:13 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:38:13 -0600
commit4bb787f41f7cdefac2aac33ef59317b7157302c1 (patch)
treec9726401d4eeb6fff8e78c4e35facb644c417e77 /superkaramba/src
parentaef5eada7f51ee48f3d21448db290bd8f06953a8 (diff)
downloadtdeutils-4bb787f41f7cdefac2aac33ef59317b7157302c1.tar.gz
tdeutils-4bb787f41f7cdefac2aac33ef59317b7157302c1.zip
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'superkaramba/src')
-rw-r--r--superkaramba/src/imagelabel.cpp26
-rw-r--r--superkaramba/src/imagelabel.h4
-rw-r--r--superkaramba/src/karamba.cpp8
-rw-r--r--superkaramba/src/karamba.h6
-rw-r--r--superkaramba/src/karambaapp.cpp2
-rw-r--r--superkaramba/src/karambasessionmanaged.cpp2
-rw-r--r--superkaramba/src/rsssensor.cpp6
-rw-r--r--superkaramba/src/sknewstuff.cpp4
-rw-r--r--superkaramba/src/taskbartest.cpp2
-rw-r--r--superkaramba/src/taskmanager.cpp2
-rw-r--r--superkaramba/src/themefile.cpp2
-rw-r--r--superkaramba/src/themelocale.cpp2
-rw-r--r--superkaramba/src/themesdlg.cpp16
13 files changed, 41 insertions, 41 deletions
diff --git a/superkaramba/src/imagelabel.cpp b/superkaramba/src/imagelabel.cpp
index 9df0834..64c523f 100644
--- a/superkaramba/src/imagelabel.cpp
+++ b/superkaramba/src/imagelabel.cpp
@@ -255,13 +255,13 @@ void ImageLabel::applyTransformations(bool useSmoothScale)
setHeight(pixmap.height());
}
-void ImageLabel::slotCopyResult(KIO::Job* job)
+void ImageLabel::slotCopyResult(TDEIO::Job* job)
{
- TQString tempFile = ((KIO::FileCopyJob*)job)->destURL().path();
+ TQString tempFile = ((TDEIO::FileCopyJob*)job)->destURL().path();
if(job->error() == 0)
{
setValue(tempFile);
- imagePath = ((KIO::FileCopyJob*)job)->srcURL().path();
+ imagePath = ((TDEIO::FileCopyJob*)job)->srcURL().path();
emit pixmapLoaded();
}
else
@@ -269,7 +269,7 @@ void ImageLabel::slotCopyResult(KIO::Job* job)
tqWarning("Error downloading (%s): %s", job->errorText().ascii(),
tempFile.ascii());
}
- KIO::NetAccess::removeTempFile(tempFile);
+ TDEIO::NetAccess::removeTempFile(tempFile);
}
void ImageLabel::setValue(TQString fn)
@@ -285,10 +285,10 @@ void ImageLabel::setValue(TQString fn)
if(protocol && url.isLocalFile() == false)
{
KTempFile tmpFile;
- KIO::FileCopyJob* copy = KIO::file_copy(fileName, tmpFile.name(), 0600,
+ TDEIO::FileCopyJob* copy = TDEIO::file_copy(fileName, tmpFile.name(), 0600,
true, false, false);
- connect(copy, TQT_SIGNAL(result(KIO::Job*)),
- this, TQT_SLOT(slotCopyResult(KIO::Job*)));
+ connect(copy, TQT_SIGNAL(result(TDEIO::Job*)),
+ this, TQT_SLOT(slotCopyResult(TDEIO::Job*)));
return;
}
else
@@ -446,13 +446,13 @@ void ImageLabel::parseImages(TQString fn, TQString fn_roll, int _xoff,
{
TQString tmpFile;
#if defined(KDE_3_2)
- if(KIO::NetAccess::download(KURL(path), tmpFile, karambaApp->parentWindow()))
+ if(TDEIO::NetAccess::download(KURL(path), tmpFile, karambaApp->parentWindow()))
#else
- if(KIO::NetAccess::download(KURL(path), tmpFile))
+ if(TDEIO::NetAccess::download(KURL(path), tmpFile))
#endif
{
pixmap_off = KPixmap(tmpFile);
- KIO::NetAccess::removeTempFile(tmpFile);
+ TDEIO::NetAccess::removeTempFile(tmpFile);
tqDebug( "Downloaded: %s to %s", path.ascii(), tmpFile.ascii() );
}
else
@@ -494,13 +494,13 @@ void ImageLabel::parseImages(TQString fn, TQString fn_roll, int _xoff,
{
TQString tmpFile;
#if defined(KDE_3_2)
- if(KIO::NetAccess::download(KURL(path), tmpFile, karambaApp->parentWindow()))
+ if(TDEIO::NetAccess::download(KURL(path), tmpFile, karambaApp->parentWindow()))
#else
- if(KIO::NetAccess::download(KURL(path), tmpFile))
+ if(TDEIO::NetAccess::download(KURL(path), tmpFile))
#endif
{
pixmap_on = KPixmap(tmpFile);
- KIO::NetAccess::removeTempFile(tmpFile);
+ TDEIO::NetAccess::removeTempFile(tmpFile);
tqDebug( "Downloaded: %s to %s", path.ascii(), tmpFile.ascii());
}
else
diff --git a/superkaramba/src/imagelabel.h b/superkaramba/src/imagelabel.h
index 820c214..bf4189c 100644
--- a/superkaramba/src/imagelabel.h
+++ b/superkaramba/src/imagelabel.h
@@ -38,7 +38,7 @@
#include "karamba.h"
class ImageLabel;
-class KIO::CopyJob;
+class TDEIO::CopyJob;
// Abstract Effects Baseclass
class Effect : public TQObject
@@ -144,7 +144,7 @@ private slots:
// gets called if a timed effects needs to bee removed
void slotEffectExpired();
- void slotCopyResult(KIO::Job* job);
+ void slotCopyResult(TDEIO::Job* job);
signals:
void pixmapLoaded();
diff --git a/superkaramba/src/karamba.cpp b/superkaramba/src/karamba.cpp
index da9eec7..c61f6f8 100644
--- a/superkaramba/src/karamba.cpp
+++ b/superkaramba/src/karamba.cpp
@@ -108,7 +108,7 @@ karamba::karamba(TQString fn, TQString name, bool reloading, int instance,
widgetUpdate = true;
- // Creates KConfig Object
+ // Creates TDEConfig Object
TQString instanceString;
if(m_instance > 1)
instanceString = TQString("-%1").arg(m_instance);
@@ -124,7 +124,7 @@ karamba::karamba(TQString fn, TQString name, bool reloading, int instance,
themeConfigFile.close();
}
- config = new KConfig(cfg, false, false);
+ config = new TDEConfig(cfg, false, false);
config -> sync();
config -> setGroup("internal");
@@ -1916,7 +1916,7 @@ void karamba::receivedStdout (TDEProcess *proc, char *buffer, int)
}
//For KDE session management
-void karamba::saveProperties(KConfig* config)
+void karamba::saveProperties(TDEConfig* config)
{
//tqDebug("karamba::saveProperties");
config->setGroup("session");
@@ -1925,7 +1925,7 @@ void karamba::saveProperties(KConfig* config)
}
//For KDE session management
-void karamba::readProperties(KConfig* config)
+void karamba::readProperties(TDEConfig* config)
{
//tqDebug("karamba::readProperties");
config->setGroup("session");
diff --git a/superkaramba/src/karamba.h b/superkaramba/src/karamba.h
index 35c16e8..572451d 100644
--- a/superkaramba/src/karamba.h
+++ b/superkaramba/src/karamba.h
@@ -155,7 +155,7 @@ public:
void keyPressed(const TQString& s, const Meter* meter);
int numberOfConfMenuItems;
- KConfig* config;
+ TDEConfig* config;
TQString prettyName;
bool m_sub_theme;
bool isSubTheme() { return m_sub_theme; }
@@ -190,8 +190,8 @@ protected:
void keyPressEvent ( TQKeyEvent * e );
void closeEvent ( TQCloseEvent *);
void paintEvent ( TQPaintEvent *);
- void saveProperties(KConfig *);
- void readProperties(KConfig *);
+ void saveProperties(TDEConfig *);
+ void readProperties(TDEConfig *);
void dragEnterEvent(TQDragEnterEvent* event);
void dropEvent(TQDropEvent* event);
diff --git a/superkaramba/src/karambaapp.cpp b/superkaramba/src/karambaapp.cpp
index cd2e77c..3e69df6 100644
--- a/superkaramba/src/karambaapp.cpp
+++ b/superkaramba/src/karambaapp.cpp
@@ -243,7 +243,7 @@ void KarambaApplication::checkPreviousSession(TDEApplication &app,
*/
if (app.isSessionRestored())
{
- KConfig* config = app.sessionConfig();
+ TDEConfig* config = app.sessionConfig();
config->setGroup("General Options");
TQString restartThemes = config->readEntry("OpenThemes");
diff --git a/superkaramba/src/karambasessionmanaged.cpp b/superkaramba/src/karambasessionmanaged.cpp
index 8997561..ca41515 100644
--- a/superkaramba/src/karambasessionmanaged.cpp
+++ b/superkaramba/src/karambasessionmanaged.cpp
@@ -28,7 +28,7 @@
bool KarambaSessionManaged::saveState(TQSessionManager&)
{
- KConfig* config = kapp->sessionConfig();
+ TDEConfig* config = kapp->sessionConfig();
config->setGroup("General Options");
diff --git a/superkaramba/src/rsssensor.cpp b/superkaramba/src/rsssensor.cpp
index 7754a9c..30ccf61 100644
--- a/superkaramba/src/rsssensor.cpp
+++ b/superkaramba/src/rsssensor.cpp
@@ -48,9 +48,9 @@ void RssSensor::update()
bool OK = false;
#if defined(KDE_3_3)
- if(KIO::NetAccess::download(KURL(source), tmpFile, karambaApp->parentWindow()))
+ if(TDEIO::NetAccess::download(KURL(source), tmpFile, karambaApp->parentWindow()))
#else
- if(KIO::NetAccess::download(KURL(source), tmpFile))
+ if(TDEIO::NetAccess::download(KURL(source), tmpFile))
#endif
{
file.setName(tmpFile);
@@ -130,7 +130,7 @@ void RssSensor::update()
}
// Cleanup
file.close();
- KIO::NetAccess::removeTempFile( tmpFile );
+ TDEIO::NetAccess::removeTempFile( tmpFile );
}
#include "rsssensor.moc"
diff --git a/superkaramba/src/sknewstuff.cpp b/superkaramba/src/sknewstuff.cpp
index 683219e..814cf05 100644
--- a/superkaramba/src/sknewstuff.cpp
+++ b/superkaramba/src/sknewstuff.cpp
@@ -88,11 +88,11 @@ bool SKNewStuff::install( const TQString &fileName )
//as a .zip instead of .bz2 or .tar.gz
KURL sourceFile(fileName);
KURL destFile( destDir + sourceFile.fileName() );
- if(!KIO::NetAccess::file_copy( sourceFile, destFile ))
+ if(!TDEIO::NetAccess::file_copy( sourceFile, destFile ))
{
return false;
}
- KIO::NetAccess::removeTempFile( sourceFile.url() );
+ TDEIO::NetAccess::removeTempFile( sourceFile.url() );
//Add the skz theme to the Theme Dialog
mDlg->addSkzThemeToDialog(destFile.path());
}
diff --git a/superkaramba/src/taskbartest.cpp b/superkaramba/src/taskbartest.cpp
index c733d67..f7d742b 100644
--- a/superkaramba/src/taskbartest.cpp
+++ b/superkaramba/src/taskbartest.cpp
@@ -66,7 +66,7 @@ int main(int argc, char **argv)
// // KSGRD::SensorMgr foo ;// p->engage( "" );
-// //KConfig *kconfig = TDEGlobal::config();
+// //TDEConfig *kconfig = TDEGlobal::config();
// //kconfig->setGroup("karamba");
// //kconfig->writeEntry("test", "/home/hk/foofoo");
// //kconfig->sync();
diff --git a/superkaramba/src/taskmanager.cpp b/superkaramba/src/taskmanager.cpp
index 27e3a74..7e977d4 100644
--- a/superkaramba/src/taskmanager.cpp
+++ b/superkaramba/src/taskmanager.cpp
@@ -80,7 +80,7 @@ TaskManager::~TaskManager()
void TaskManager::configure_startup()
{
- KConfig c("klaunchrc", true);
+ TDEConfig c("klaunchrc", true);
c.setGroup("FeedbackStyle");
if (!c.readBoolEntry("TaskbarButton", true))
return;
diff --git a/superkaramba/src/themefile.cpp b/superkaramba/src/themefile.cpp
index a75cc14..c1392c6 100644
--- a/superkaramba/src/themefile.cpp
+++ b/superkaramba/src/themefile.cpp
@@ -232,7 +232,7 @@ bool ThemeFile::set(const KURL &url)
return false;
}
}
- if(!KIO::NetAccess::file_copy(url, localFile.filePath(), -1, true,
+ if(!TDEIO::NetAccess::file_copy(url, localFile.filePath(), -1, true,
false, kapp->mainWidget()))
{
return false;
diff --git a/superkaramba/src/themelocale.cpp b/superkaramba/src/themelocale.cpp
index 8d8891f..1b7314c 100644
--- a/superkaramba/src/themelocale.cpp
+++ b/superkaramba/src/themelocale.cpp
@@ -171,7 +171,7 @@ void ThemeLocale::setLanguage(const TQStringList &languages)
TQStringList ThemeLocale::languageList()
{
- KConfig* config = TDEGlobal::instance()->config();
+ TDEConfig* config = TDEGlobal::instance()->config();
// Reset the list and add the new languages
TQStringList languageList;
languageList +=
diff --git a/superkaramba/src/themesdlg.cpp b/superkaramba/src/themesdlg.cpp
index a726238..4b13c6b 100644
--- a/superkaramba/src/themesdlg.cpp
+++ b/superkaramba/src/themesdlg.cpp
@@ -217,7 +217,7 @@ void ThemesDlg::openLocalTheme()
void ThemesDlg::getNewStuff()
{
#ifdef HAVE_KNEWSTUFF
- KConfig* config = TDEGlobal::config();
+ TDEConfig* config = TDEGlobal::config();
config->setGroup("KNewStuff");
config->writePathEntry("ProvidersUrl",
TQString::fromLatin1("http://download.kde.org/khotnewstuff/karamba-providers.xml"));
@@ -301,7 +301,7 @@ void ThemesDlg::addThemeToDialog(const KArchiveDirectory *archiveDir,
void ThemesDlg::writeNewStuffConfig(const TQString &file)
{
#ifdef HAVE_KNEWSTUFF
- KConfig* config = TDEGlobal::config();
+ TDEConfig* config = TDEGlobal::config();
TQStringList keys = config->entryMap("KNewStuffStatus").keys();
for(TQStringList::Iterator it = m_newStuffStatus.begin();
@@ -321,7 +321,7 @@ void ThemesDlg::writeNewStuffConfig(const TQString &file)
void ThemesDlg::configSanityCheck()
{
#ifdef HAVE_KNEWSTUFF
- KConfig* config = TDEGlobal::config();
+ TDEConfig* config = TDEGlobal::config();
TQStringList statusKeys = config->entryMap("KNewStuffStatus").keys();
TQStringList nameKeys = config->entryMap("KNewStuffNames").keys();
TQStringList removeList;
@@ -427,7 +427,7 @@ bool ThemesDlg::filter(int index, TQWidget* widget, void* data)
bool ThemesDlg::isDownloaded( const TQString& path )
{
kdDebug() << "isDownloaded path: " << path << endl;
- KConfig* config = TDEGlobal::config();
+ TDEConfig* config = TDEGlobal::config();
config->setGroup("KNewStuffNames");
return !config->readEntry(path).isEmpty();
}
@@ -454,7 +454,7 @@ void ThemesDlg::uninstall()
TQDir remDir(remPath.dir());
remDir.cdUp();
kdDebug() << "moving " << remDir.path() << " to the trash" << endl;
- KIO::move(remDir.path(), trash);
+ TDEIO::move(remDir.path(), trash);
}
tableThemes->removeItem(w);
@@ -478,7 +478,7 @@ void ThemesDlg::uninstall()
}
#ifdef HAVE_KNEWSTUFF
// Remove theme from KNewStuffStatus
- KConfig* config = TDEGlobal::config();
+ TDEConfig* config = TDEGlobal::config();
config->setGroup("KNewStuffNames");
TQString name = config->readEntry(tempPath);
if(!name.isEmpty())
@@ -503,12 +503,12 @@ void ThemesDlg::uninstall()
TQFileInfo remPath(theme.path());
TQDir remDir(remPath.dir());
kdDebug() << "moving " << remDir.path() << " to the trash" << endl;
- KIO::move(remDir.path(), trash);
+ TDEIO::move(remDir.path(), trash);
}
tableThemes->removeItem(w);
#ifdef HAVE_KNEWSTUFF
// Remove theme from KNewStuffStatus
- KConfig* config = TDEGlobal::config();
+ TDEConfig* config = TDEGlobal::config();
config->setGroup("KNewStuffNames");
TQString name = config->readEntry(theme.path());
if(!name.isEmpty())