summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-01-25 00:07:07 -0600
committerTimothy Pearson <[email protected]>2013-01-25 00:07:07 -0600
commitbc6bcbf49f41b6b9440f8e5afbee5c4ffea2d578 (patch)
tree69bb45993632aa4366909297ce9511fdb7296fb2
parent38332b217c020960b6aedc1cdfc5f920ebcc49dc (diff)
downloadkcmautostart-bc6bcbf49f41b6b9440f8e5afbee5c4ffea2d578.tar.gz
kcmautostart-bc6bcbf49f41b6b9440f8e5afbee5c4ffea2d578.zip
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
-rw-r--r--src/autostart.cpp8
-rw-r--r--src/autostart.h2
2 files changed, 5 insertions, 5 deletions
diff --git a/src/autostart.cpp b/src/autostart.cpp
index 4895295..89d4181 100644
--- a/src/autostart.cpp
+++ b/src/autostart.cpp
@@ -94,7 +94,7 @@ void setStartOn(int start) {
path = ksd->localtdedir()+"env/";
break;
}
- KIO::file_move(fileName, KURL( path + fileName.fileName() ));
+ TDEIO::file_move(fileName, KURL( path + fileName.fileName() ));
fileName = path + fileName.fileName();
}
@@ -111,7 +111,7 @@ typedef KGenericFactory<autostart, TQWidget> autostartFactory;
K_EXPORT_COMPONENT_FACTORY( kcm_autostart, autostartFactory("kcmautostart"))
autostart::autostart(TQWidget *parent, const char *name, const TQStringList&)
- : KCModule(parent, name), myAboutData(0)
+ : TDECModule(parent, name), myAboutData(0)
{
TQGridLayout * AutostartConfigLayout = new TQGridLayout( this, 1, 1, 11, 6, "AutostartConfigLayout");
@@ -281,7 +281,7 @@ void autostart::removeCMD() {
if (!listCMD->selectedItem())
return;
- KIO::del(((desktop *)listCMD->selectedItem())->fileName);
+ TDEIO::del(((desktop *)listCMD->selectedItem())->fileName);
listCMD->takeItem( listCMD->selectedItem() );
kdDebug() << "Deleting file" << endl;
@@ -339,7 +339,7 @@ void autostart::save()
int autostart::buttons()
{
- return KCModule::Apply|KCModule::Help;
+ return TDECModule::Apply|TDECModule::Help;
}
diff --git a/src/autostart.h b/src/autostart.h
index 34aeec0..a836951 100644
--- a/src/autostart.h
+++ b/src/autostart.h
@@ -33,7 +33,7 @@
#include <tqpushbutton.h>
#include <tqcombobox.h>
-class autostart: public KCModule
+class autostart: public TDECModule
{
Q_OBJECT