summaryrefslogtreecommitdiffstats
path: root/superkaramba/src
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:50:20 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:50:20 -0600
commitaef5eada7f51ee48f3d21448db290bd8f06953a8 (patch)
tree9d6e7572ebcc27e402501d6966f9b46361a1702c /superkaramba/src
parent95d05392f9bc01594738a1e06ebf23123b3d3e6e (diff)
downloadtdeutils-aef5eada7f51ee48f3d21448db290bd8f06953a8.tar.gz
tdeutils-aef5eada7f51ee48f3d21448db290bd8f06953a8.zip
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'superkaramba/src')
-rw-r--r--superkaramba/src/disksensor.cpp12
-rw-r--r--superkaramba/src/disksensor.h4
-rw-r--r--superkaramba/src/karamba.cpp4
-rw-r--r--superkaramba/src/karamba.h6
-rw-r--r--superkaramba/src/kwidgetlistbox.cpp12
-rw-r--r--superkaramba/src/memsensor.cpp16
-rw-r--r--superkaramba/src/memsensor.h4
-rw-r--r--superkaramba/src/misc_python.cpp18
-rw-r--r--superkaramba/src/programsensor.cpp12
-rw-r--r--superkaramba/src/programsensor.h4
-rw-r--r--superkaramba/src/sensorsensor.cpp14
-rw-r--r--superkaramba/src/sensorsensor.h4
-rw-r--r--superkaramba/src/sknewstuff.cpp2
-rw-r--r--superkaramba/src/taskbartest.cpp2
-rw-r--r--superkaramba/src/taskmanager.cpp14
-rw-r--r--superkaramba/src/themelocale.cpp2
-rw-r--r--superkaramba/src/themesdlg.cpp18
17 files changed, 74 insertions, 74 deletions
diff --git a/superkaramba/src/disksensor.cpp b/superkaramba/src/disksensor.cpp
index b53c6e3..e16d415 100644
--- a/superkaramba/src/disksensor.cpp
+++ b/superkaramba/src/disksensor.cpp
@@ -18,10 +18,10 @@
DiskSensor::DiskSensor( int msec ) : Sensor( msec )
{
- connect(&ksp, TQT_SIGNAL(receivedStdout(KProcess *, char *, int )),
- this,TQT_SLOT(receivedStdout(KProcess *, char *, int )));
- connect(&ksp, TQT_SIGNAL(processExited(KProcess *)),
- this,TQT_SLOT(processExited( KProcess * )));
+ connect(&ksp, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int )),
+ this,TQT_SLOT(receivedStdout(TDEProcess *, char *, int )));
+ connect(&ksp, TQT_SIGNAL(processExited(TDEProcess *)),
+ this,TQT_SLOT(processExited( TDEProcess * )));
// update values on startup
ksp.clearArguments();
@@ -68,7 +68,7 @@ int DiskSensor::getPercentFree(TQString mntPt) const
return ( 100 - getPercentUsed( mntPt ) );
}
-void DiskSensor::receivedStdout(KProcess *, char *buffer, int len )
+void DiskSensor::receivedStdout(TDEProcess *, char *buffer, int len )
{
buffer[len] = 0;
@@ -76,7 +76,7 @@ void DiskSensor::receivedStdout(KProcess *, char *buffer, int len )
}
-void DiskSensor::processExited(KProcess *)
+void DiskSensor::processExited(TDEProcess *)
{
TQStringList stringList = TQStringList::split('\n',sensorResult);
sensorResult = "";
diff --git a/superkaramba/src/disksensor.h b/superkaramba/src/disksensor.h
index d28174f..7207dd2 100644
--- a/superkaramba/src/disksensor.h
+++ b/superkaramba/src/disksensor.h
@@ -42,8 +42,8 @@ private:
int init;
private slots:
- void receivedStdout(KProcess *, char *buffer, int);
- void processExited(KProcess *);
+ void receivedStdout(TDEProcess *, char *buffer, int);
+ void processExited(TDEProcess *);
signals:
void initComplete();
diff --git a/superkaramba/src/karamba.cpp b/superkaramba/src/karamba.cpp
index d6e270a..da9eec7 100644
--- a/superkaramba/src/karamba.cpp
+++ b/superkaramba/src/karamba.cpp
@@ -1900,14 +1900,14 @@ void karamba::startupRemoved(Startup* t)
pythonIface->startupRemoved(this, t);
}
-void karamba::processExited (KProcess* proc)
+void karamba::processExited (TDEProcess* proc)
{
//tqDebug("karamba::processExited");
if (pythonIface && pythonIface->isExtensionLoaded())
pythonIface->commandFinished(this, (int)proc->pid());
}
-void karamba::receivedStdout (KProcess *proc, char *buffer, int)
+void karamba::receivedStdout (TDEProcess *proc, char *buffer, int)
{
//tqDebug("karamba::receivedStdout");
//Everything below is to call the python callback function
diff --git a/superkaramba/src/karamba.h b/superkaramba/src/karamba.h
index 416bc5b..35c16e8 100644
--- a/superkaramba/src/karamba.h
+++ b/superkaramba/src/karamba.h
@@ -136,7 +136,7 @@ public:
KarambaRootPixmap *kroot;
TaskManager taskManager;
Systemtray* systray;
- KProcess* currProcess;
+ TDEProcess* currProcess;
bool useSmoothTransforms();
void changeInterval(int interval);
@@ -267,8 +267,8 @@ public slots:
void updateBackground(KSharedPixmap*);
void passMenuOptionChanged(TQString key, bool);
void passMenuItemClicked(int);
- void processExited (KProcess *proc);
- void receivedStdout (KProcess *proc, char *buffer, int buflen);
+ void processExited (TDEProcess *proc);
+ void receivedStdout (TDEProcess *proc, char *buffer, int buflen);
void toDesktop(int desktopid, int menuid);
const char *getPrettyName() { return prettyName.ascii(); }
diff --git a/superkaramba/src/kwidgetlistbox.cpp b/superkaramba/src/kwidgetlistbox.cpp
index d22d3c8..0193926 100644
--- a/superkaramba/src/kwidgetlistbox.cpp
+++ b/superkaramba/src/kwidgetlistbox.cpp
@@ -152,19 +152,19 @@ void KWidgetListbox::setItemColors(int index, bool even)
if(index == selected())
{
- itm->setPaletteBackgroundColor(KGlobalSettings::highlightColor());
- itm->setPaletteForegroundColor(KGlobalSettings::highlightedTextColor());
+ itm->setPaletteBackgroundColor(TDEGlobalSettings::highlightColor());
+ itm->setPaletteForegroundColor(TDEGlobalSettings::highlightedTextColor());
}
else if(even)
{
- itm->setPaletteBackgroundColor(KGlobalSettings::baseColor());
- itm->setPaletteForegroundColor(KGlobalSettings::textColor());
+ itm->setPaletteBackgroundColor(TDEGlobalSettings::baseColor());
+ itm->setPaletteForegroundColor(TDEGlobalSettings::textColor());
}
else
{
itm->setPaletteBackgroundColor(
- KGlobalSettings::alternateBackgroundColor());
- itm->setPaletteForegroundColor(KGlobalSettings::textColor());
+ TDEGlobalSettings::alternateBackgroundColor());
+ itm->setPaletteForegroundColor(TDEGlobalSettings::textColor());
}
}
diff --git a/superkaramba/src/memsensor.cpp b/superkaramba/src/memsensor.cpp
index dda7983..4cc2e7d 100644
--- a/superkaramba/src/memsensor.cpp
+++ b/superkaramba/src/memsensor.cpp
@@ -56,10 +56,10 @@ MemSensor::MemSensor(int msec) : Sensor(msec)
# if defined(Q_OS_FREEBSD) && defined(__FreeBSD_version) && __FreeBSD_version >= 500018
kd = kvm_open("/dev/null", "/dev/null", "/dev/null", O_RDONLY, "kvm_open");
# elif defined Q_OS_FREEBSD
- connect(&ksp, TQT_SIGNAL(receivedStdout(KProcess *, char *, int )),
- this,TQT_SLOT(receivedStdout(KProcess *, char *, int )));
- connect(&ksp, TQT_SIGNAL(processExited(KProcess *)),
- this,TQT_SLOT(processExited( KProcess * )));
+ connect(&ksp, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int )),
+ this,TQT_SLOT(receivedStdout(TDEProcess *, char *, int )));
+ connect(&ksp, TQT_SIGNAL(processExited(TDEProcess *)),
+ this,TQT_SLOT(processExited( TDEProcess * )));
swapTotal = swapUsed = 0;
@@ -76,18 +76,18 @@ MemSensor::~MemSensor()
{}
#ifdef Q_OS_FREEBSD
-void MemSensor::receivedStdout(KProcess *, char *buffer, int len )
+void MemSensor::receivedStdout(TDEProcess *, char *buffer, int len )
{
buffer[len] = 0;
sensorResult += TQString( TQCString(buffer) );
}
#else
-void MemSensor::receivedStdout(KProcess *, char *, int)
+void MemSensor::receivedStdout(TDEProcess *, char *, int)
{
}
#endif
-void MemSensor::processExited(KProcess *)
+void MemSensor::processExited(TDEProcess *)
{
#ifdef Q_OS_FREEBSD
TQStringList stringList = TQStringList::split('\n',sensorResult);
@@ -272,7 +272,7 @@ void MemSensor::readValues()
# if defined(Q_OS_FREEBSD) && !(defined(__FreeBSD_version) && __FreeBSD_version >= 500018)
ksp.clearArguments();
ksp << "swapinfo";
- ksp.start( KProcess::NotifyOnExit,KProcIO::Stdout);
+ ksp.start( TDEProcess::NotifyOnExit,KProcIO::Stdout);
# endif
#else
TQFile file("/proc/meminfo");
diff --git a/superkaramba/src/memsensor.h b/superkaramba/src/memsensor.h
index bf2af69..56a91a5 100644
--- a/superkaramba/src/memsensor.h
+++ b/superkaramba/src/memsensor.h
@@ -60,8 +60,8 @@ private:
#endif
private slots:
- void receivedStdout(KProcess *, char *buffer, int);
- void processExited(KProcess *);
+ void receivedStdout(TDEProcess *, char *buffer, int);
+ void processExited(TDEProcess *);
};
diff --git a/superkaramba/src/misc_python.cpp b/superkaramba/src/misc_python.cpp
index 449fe44..3dc5213 100644
--- a/superkaramba/src/misc_python.cpp
+++ b/superkaramba/src/misc_python.cpp
@@ -126,7 +126,7 @@ PyObject* py_execute_command_interactive(PyObject *, PyObject* args)
karamba* currTheme = (karamba*)widget;
- currTheme->currProcess = new KProcess;
+ currTheme->currProcess = new TDEProcess;
/* get the number of lines passed to us */
numLines = PyList_Size(listObj);
@@ -149,14 +149,14 @@ PyObject* py_execute_command_interactive(PyObject *, PyObject* args)
}
TQApplication::connect(currTheme->currProcess,
- TQT_SIGNAL(processExited(KProcess *)),
+ TQT_SIGNAL(processExited(TDEProcess *)),
currTheme,
- TQT_SLOT(processExited(KProcess *)));
+ TQT_SLOT(processExited(TDEProcess *)));
TQApplication::connect(currTheme->currProcess,
- TQT_SIGNAL(receivedStdout(KProcess *, char *, int)),
+ TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)),
currTheme,
- TQT_SLOT(receivedStdout(KProcess *, char *, int)));
- currTheme->currProcess->start(KProcess::NotifyOnExit, KProcess::Stdout);
+ TQT_SLOT(receivedStdout(TDEProcess *, char *, int)));
+ currTheme->currProcess->start(TDEProcess::NotifyOnExit, TDEProcess::Stdout);
return Py_BuildValue((char*)"l", (int)(currTheme->currProcess->pid()));
}
@@ -308,7 +308,7 @@ PyObject* py_userLanguage(PyObject *, PyObject *args)
return NULL;
if (!checkKaramba(widget))
return NULL;
- return Py_BuildValue((char*)"s", KGlobal::locale()->language().ascii());
+ return Py_BuildValue((char*)"s", TDEGlobal::locale()->language().ascii());
}
PyObject* py_userLanguages(PyObject *, PyObject *args)
@@ -319,14 +319,14 @@ PyObject* py_userLanguages(PyObject *, PyObject *args)
if (!checkKaramba(widget))
return NULL;
- unsigned int noOfLangs = KGlobal::locale()->languageList().count();
+ unsigned int noOfLangs = TDEGlobal::locale()->languageList().count();
PyObject *list, *item;
list = PyList_New(noOfLangs);
for(unsigned int i = 0; i < noOfLangs; i++)
{
- item = Py_BuildValue((char*)"s", KGlobal::locale()->languageList()[i].ascii());
+ item = Py_BuildValue((char*)"s", TDEGlobal::locale()->languageList()[i].ascii());
PyList_SetItem(list, i, item);
}
diff --git a/superkaramba/src/programsensor.cpp b/superkaramba/src/programsensor.cpp
index 1118d2d..0c2f3e2 100644
--- a/superkaramba/src/programsensor.cpp
+++ b/superkaramba/src/programsensor.cpp
@@ -25,22 +25,22 @@ ProgramSensor::ProgramSensor(const TQString &progName, int interval, TQString en
programName = progName;
//update();
- connect(&ksp, TQT_SIGNAL(receivedStdout(KProcess *, char *, int )),
- this,TQT_SLOT(receivedStdout(KProcess *, char *, int )));
- connect(&ksp, TQT_SIGNAL(processExited(KProcess *)),
- this,TQT_SLOT(processExited( KProcess * )));
+ connect(&ksp, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int )),
+ this,TQT_SLOT(receivedStdout(TDEProcess *, char *, int )));
+ connect(&ksp, TQT_SIGNAL(processExited(TDEProcess *)),
+ this,TQT_SLOT(processExited( TDEProcess * )));
}
ProgramSensor::~ProgramSensor()
{}
-void ProgramSensor::receivedStdout(KProcess *, char *buffer, int len)
+void ProgramSensor::receivedStdout(TDEProcess *, char *buffer, int len)
{
buffer[len] = 0;
sensorResult += codec->toUnicode( TQCString(buffer) );
}
-void ProgramSensor::processExited(KProcess *)
+void ProgramSensor::processExited(TDEProcess *)
{
int lineNbr;
SensorParams *sp;
diff --git a/superkaramba/src/programsensor.h b/superkaramba/src/programsensor.h
index d3f2b39..672d0e7 100644
--- a/superkaramba/src/programsensor.h
+++ b/superkaramba/src/programsensor.h
@@ -32,8 +32,8 @@ private:
TQString sensorResult;
public slots:
- void receivedStdout(KProcess *proc, char *buffer, int buflen);
- void processExited(KProcess *proc);
+ void receivedStdout(TDEProcess *proc, char *buffer, int buflen);
+ void processExited(TDEProcess *proc);
};
#endif // PROGRAMSENSOR_H
diff --git a/superkaramba/src/sensorsensor.cpp b/superkaramba/src/sensorsensor.cpp
index ed6934e..baea31d 100644
--- a/superkaramba/src/sensorsensor.cpp
+++ b/superkaramba/src/sensorsensor.cpp
@@ -29,10 +29,10 @@ SensorSensor::SensorSensor(int interval, char tempUnit) : Sensor( interval )
#endif
if(tempUnit == 'F')
extraParams = " -f";
- connect(&ksp, TQT_SIGNAL(receivedStdout(KProcess *, char *, int )),
- this,TQT_SLOT(receivedStdout(KProcess *, char *, int )));
- connect(&ksp, TQT_SIGNAL(processExited(KProcess *)),
- this,TQT_SLOT(processExited( KProcess * )));
+ connect(&ksp, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int )),
+ this,TQT_SLOT(receivedStdout(TDEProcess *, char *, int )));
+ connect(&ksp, TQT_SIGNAL(processExited(TDEProcess *)),
+ this,TQT_SLOT(processExited( TDEProcess * )));
// readValues();
}
@@ -42,13 +42,13 @@ SensorSensor::~SensorSensor()
{
}
-void SensorSensor::receivedStdout(KProcess *, char *buffer, int len )
+void SensorSensor::receivedStdout(TDEProcess *, char *buffer, int len )
{
buffer[len] = 0;
sensorResult += TQString( TQCString(buffer) );
}
-void SensorSensor::processExited(KProcess *)
+void SensorSensor::processExited(TDEProcess *)
{
TQStringList stringList = TQStringList::split('\n',sensorResult);
sensorResult = "";
@@ -108,7 +108,7 @@ void SensorSensor::update()
#else
ksp << "sensors" << extraParams;
#endif
- ksp.start( KProcess::NotifyOnExit,KProcIO::Stdout);
+ ksp.start( TDEProcess::NotifyOnExit,KProcIO::Stdout);
}
diff --git a/superkaramba/src/sensorsensor.h b/superkaramba/src/sensorsensor.h
index f4ff004..fccf5bf 100644
--- a/superkaramba/src/sensorsensor.h
+++ b/superkaramba/src/sensorsensor.h
@@ -40,8 +40,8 @@ private:
TQString sensorResult;
private slots:
- void receivedStdout(KProcess *, char *buffer, int);
- void processExited(KProcess *);
+ void receivedStdout(TDEProcess *, char *buffer, int);
+ void processExited(TDEProcess *);
diff --git a/superkaramba/src/sknewstuff.cpp b/superkaramba/src/sknewstuff.cpp
index 3dd32f6..683219e 100644
--- a/superkaramba/src/sknewstuff.cpp
+++ b/superkaramba/src/sknewstuff.cpp
@@ -135,6 +135,6 @@ TQString SKNewStuff::downloadDestination( KNS::Entry *entry )
KRun::runURL( source, "text/html");
return file;
}
- return KGlobal::dirs()->saveLocation( "tmp" ) + source.fileName();
+ return TDEGlobal::dirs()->saveLocation( "tmp" ) + source.fileName();
}
#endif //HAVE_KNEWSTUFF
diff --git a/superkaramba/src/taskbartest.cpp b/superkaramba/src/taskbartest.cpp
index 2c65e2a..c733d67 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 = KGlobal::config();
+// //KConfig *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 1092342..27e3a74 100644
--- a/superkaramba/src/taskmanager.cpp
+++ b/superkaramba/src/taskmanager.cpp
@@ -54,7 +54,7 @@ TaskManager::TaskManager(TQObject *parent, const char *name)
twin_module = new KWinModule();
-// KGlobal::locale()->insertCatalogue("libtaskmanager");
+// TDEGlobal::locale()->insertCatalogue("libtaskmanager");
connect(twin_module, TQT_SIGNAL(windowAdded(WId)), TQT_SLOT(windowAdded(WId)));
connect(twin_module, TQT_SIGNAL(windowRemoved(WId)), TQT_SLOT(windowRemoved(WId)));
connect(twin_module, TQT_SIGNAL(activeWindowChanged(WId)), TQT_SLOT(activeWindowChanged(WId)));
@@ -344,7 +344,7 @@ Task::Task(WId win, TaskManager * parent, const char *name) :
// try to guess the icon from the classhint
if(_pixmap.isNull())
- KGlobal::instance()->iconLoader()->loadIcon(className().lower(),
+ TDEGlobal::instance()->iconLoader()->loadIcon(className().lower(),
KIcon::Small,KIcon::Small,
KIcon::DefaultState, 0, true);
@@ -372,7 +372,7 @@ void Task::refresh(bool icon)
// try to guess the icon from the classhint
if(_pixmap.isNull())
{
- KGlobal::instance()->iconLoader()->loadIcon(className().lower(),
+ TDEGlobal::instance()->iconLoader()->loadIcon(className().lower(),
KIcon::Small, KIcon::Small, KIcon::DefaultState, 0, true);
}
@@ -538,7 +538,7 @@ TQPixmap Task::bestIcon( int size, bool &isStaticIcon )
// Icon of last resort
if( pixmap.isNull() ) {
- pixmap = KGlobal::iconLoader()->loadIcon( "go",
+ pixmap = TDEGlobal::iconLoader()->loadIcon( "go",
KIcon::NoGroup,
KIcon::SizeSmall );
isStaticIcon = true;
@@ -561,7 +561,7 @@ TQPixmap Task::bestIcon( int size, bool &isStaticIcon )
// Icon of last resort
if( pixmap.isNull() ) {
- pixmap = KGlobal::iconLoader()->loadIcon( "go",
+ pixmap = TDEGlobal::iconLoader()->loadIcon( "go",
KIcon::NoGroup,
KIcon::SizeMedium );
isStaticIcon = true;
@@ -575,7 +575,7 @@ TQPixmap Task::bestIcon( int size, bool &isStaticIcon )
// If not, try to get one from the classname
if ( pixmap.isNull() || pixmap.width() != size || pixmap.height() != size ) {
- pixmap = KGlobal::iconLoader()->loadIcon( className(),
+ pixmap = TDEGlobal::iconLoader()->loadIcon( className(),
KIcon::NoGroup,
size,
KIcon::DefaultState,
@@ -592,7 +592,7 @@ TQPixmap Task::bestIcon( int size, bool &isStaticIcon )
// Icon of last resort
if( pixmap.isNull() ) {
- pixmap = KGlobal::iconLoader()->loadIcon( "go",
+ pixmap = TDEGlobal::iconLoader()->loadIcon( "go",
KIcon::NoGroup,
size );
isStaticIcon = true;
diff --git a/superkaramba/src/themelocale.cpp b/superkaramba/src/themelocale.cpp
index bd3c661..8d8891f 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 = KGlobal::instance()->config();
+ KConfig* 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 f483a04..a726238 100644
--- a/superkaramba/src/themesdlg.cpp
+++ b/superkaramba/src/themesdlg.cpp
@@ -126,7 +126,7 @@ void ThemesDlg::populateListbox()
tableThemes->clear();
item = new ThemeWidget;
- item->icon->setPixmap(KGlobal::iconLoader()->loadIcon("knewstuff",
+ item->icon->setPixmap(TDEGlobal::iconLoader()->loadIcon("knewstuff",
KIcon::NoGroup, KIcon::SizeHuge));
item->setHeaderText(i18n("Get New Stuff"));
item->setDescriptionText(i18n("Download new themes."));
@@ -142,7 +142,7 @@ void ThemesDlg::populateListbox()
tableThemes->insertItem(item);
item = new ThemeWidget;
- item->icon->setPixmap(KGlobal::iconLoader()->loadIcon("ksysguard",
+ item->icon->setPixmap(TDEGlobal::iconLoader()->loadIcon("ksysguard",
KIcon::NoGroup, KIcon::SizeHuge));
item->setHeaderText(i18n("Open Local Theme"));
item->setDescriptionText(i18n("Add local theme to the list."));
@@ -217,7 +217,7 @@ void ThemesDlg::openLocalTheme()
void ThemesDlg::getNewStuff()
{
#ifdef HAVE_KNEWSTUFF
- KConfig* config = KGlobal::config();
+ KConfig* 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 = KGlobal::config();
+ KConfig* 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 = KGlobal::config();
+ KConfig* 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 = KGlobal::config();
+ KConfig* config = TDEGlobal::config();
config->setGroup("KNewStuffNames");
return !config->readEntry(path).isEmpty();
}
@@ -442,7 +442,7 @@ void ThemesDlg::uninstall()
karambaApp->dcopIface()->closeTheme(tf->name());
if(!KProtocolInfo::isKnownProtocol(trash))
- trash = KGlobalSettings::trashPath();
+ trash = TDEGlobalSettings::trashPath();
if(!tf->isZipTheme())
{
@@ -478,7 +478,7 @@ void ThemesDlg::uninstall()
}
#ifdef HAVE_KNEWSTUFF
// Remove theme from KNewStuffStatus
- KConfig* config = KGlobal::config();
+ KConfig* config = TDEGlobal::config();
config->setGroup("KNewStuffNames");
TQString name = config->readEntry(tempPath);
if(!name.isEmpty())
@@ -508,7 +508,7 @@ void ThemesDlg::uninstall()
tableThemes->removeItem(w);
#ifdef HAVE_KNEWSTUFF
// Remove theme from KNewStuffStatus
- KConfig* config = KGlobal::config();
+ KConfig* config = TDEGlobal::config();
config->setGroup("KNewStuffNames");
TQString name = config->readEntry(theme.path());
if(!name.isEmpty())