Rename KInstance and KAboutData to avoid conflicts with KDE4

pull/1/head
Timothy Pearson 12 years ago
parent 5e957ac881
commit c75373bc11

@ -165,9 +165,9 @@ autostart::autostart(TQWidget *parent, const char *name, const TQStringList&)
load(); 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"), I18N_NOOP("TDE Autostart Manager Control Panel Module"),
KAboutData::License_GPL, TDEAboutData::License_GPL,
I18N_NOOP("(c) 2006 Stephen Leaf"), 0, 0); I18N_NOOP("(c) 2006 Stephen Leaf"), 0, 0);
about->addAuthor("Stephen Leaf", 0, "smileaf@smileaf.org"); about->addAuthor("Stephen Leaf", 0, "smileaf@smileaf.org");

@ -46,7 +46,7 @@ public:
virtual void defaults(); virtual void defaults();
virtual int buttons(); virtual int buttons();
virtual TQString quickHelp() const; virtual TQString quickHelp() const;
virtual const KAboutData *aboutData() const virtual const TDEAboutData *aboutData() const
{ return myAboutData; }; { return myAboutData; };
public slots: public slots:
@ -59,7 +59,7 @@ public slots:
void selectionChanged(TQListViewItem*); void selectionChanged(TQListViewItem*);
private: private:
KAboutData *myAboutData; TDEAboutData *myAboutData;
KGlobalSettings *kgs; KGlobalSettings *kgs;
KPushButton* btnAdd; KPushButton* btnAdd;
KListView* listCMD; KListView* listCMD;

Loading…
Cancel
Save