summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-01-22 19:52:13 -0600
committerTimothy Pearson <[email protected]>2013-01-22 19:52:13 -0600
commitc75373bc1123255e62724f2bc6fef0a37adc5654 (patch)
tree53a5eef211a754d264dc69ecf3796db9ef5dc536
parent5e957ac8818b7dc0097823d943464e20a218be53 (diff)
downloadkcmautostart-c75373bc1123255e62724f2bc6fef0a37adc5654.tar.gz
kcmautostart-c75373bc1123255e62724f2bc6fef0a37adc5654.zip
Rename KInstance and KAboutData to avoid conflicts with KDE4
-rw-r--r--src/autostart.cpp4
-rw-r--r--src/autostart.h4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/autostart.cpp b/src/autostart.cpp
index 5c07d5f..508bc60 100644
--- a/src/autostart.cpp
+++ b/src/autostart.cpp
@@ -165,9 +165,9 @@ autostart::autostart(TQWidget *parent, const char *name, const TQStringList&)
load();
- KAboutData* about = new KAboutData("autostart", I18N_NOOP("TDE Autostart Manager"), "0.5",
+ TDEAboutData* about = new TDEAboutData("autostart", I18N_NOOP("TDE Autostart Manager"), "0.5",
I18N_NOOP("TDE Autostart Manager Control Panel Module"),
- KAboutData::License_GPL,
+ TDEAboutData::License_GPL,
I18N_NOOP("(c) 2006 Stephen Leaf"), 0, 0);
about->addAuthor("Stephen Leaf", 0, "[email protected]");
diff --git a/src/autostart.h b/src/autostart.h
index 6877e4e..3b6389e 100644
--- a/src/autostart.h
+++ b/src/autostart.h
@@ -46,7 +46,7 @@ public:
virtual void defaults();
virtual int buttons();
virtual TQString quickHelp() const;
- virtual const KAboutData *aboutData() const
+ virtual const TDEAboutData *aboutData() const
{ return myAboutData; };
public slots:
@@ -59,7 +59,7 @@ public slots:
void selectionChanged(TQListViewItem*);
private:
- KAboutData *myAboutData;
+ TDEAboutData *myAboutData;
KGlobalSettings *kgs;
KPushButton* btnAdd;
KListView* listCMD;