diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-07 10:57:45 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-07 10:57:45 -0600 |
| commit | ba4ffdeb84af9eb4f07b17452289cd655019778d (patch) | |
| tree | 638c35d70a23d0af6ddb90a720e700a274a1c9f9 | |
| parent | b542273c9fe92c6be8897175c6d977d6f4b29d50 (diff) | |
| download | kpilot-ba4ffdeb.tar.gz kpilot-ba4ffdeb.zip | |
Rename KAbout to avoid conflicts with KDE4
| -rw-r--r-- | conduits/docconduit/kpalmdoc_dlg.cc | 2 | ||||
| -rw-r--r-- | kpilot/pilotDaemon.cc | 2 | ||||
| -rw-r--r-- | kpilot/pilotDaemon.h | 4 | ||||
| -rw-r--r-- | lib/plugin.cc | 4 | ||||
| -rw-r--r-- | lib/plugin.h | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/conduits/docconduit/kpalmdoc_dlg.cc b/conduits/docconduit/kpalmdoc_dlg.cc index f4a480c..61bef6c 100644 --- a/conduits/docconduit/kpalmdoc_dlg.cc +++ b/conduits/docconduit/kpalmdoc_dlg.cc @@ -420,7 +420,7 @@ void ConverterDlg::slotToPDB() void ConverterDlg::slotUser1() { - KAboutApplication ab(TDEGlobal::instance()->aboutData(), this); + TDEAboutApplication ab(TDEGlobal::instance()->aboutData(), this); ab.show(); ab.exec(); return; diff --git a/kpilot/pilotDaemon.cc b/kpilot/pilotDaemon.cc index 1661ebd..975311c 100644 --- a/kpilot/pilotDaemon.cc +++ b/kpilot/pilotDaemon.cc @@ -202,7 +202,7 @@ void PilotDaemonTray::slotShowAbout() if (!kap) { - kap = new KAboutApplication(0, "kpdab", false); + kap = new TDEAboutApplication(0, "kpdab", false); } kap->show(); diff --git a/kpilot/pilotDaemon.h b/kpilot/pilotDaemon.h index 3768a3f..5e36d7b 100644 --- a/kpilot/pilotDaemon.h +++ b/kpilot/pilotDaemon.h @@ -38,7 +38,7 @@ class TQPixmap; class TQTimer; -class KAboutApplication; +class TDEAboutApplication; class TQPopupMenu; class PilotDaemon; @@ -116,7 +116,7 @@ private: /** * Window for the "About KPilot" information. */ - KAboutApplication *kap; + TDEAboutApplication *kap; /** * Timer for blinking. diff --git a/lib/plugin.cc b/lib/plugin.cc index c2d00b2..7c0f2f1 100644 --- a/lib/plugin.cc +++ b/lib/plugin.cc @@ -207,8 +207,8 @@ TQWidget *ConduitConfigBase::aboutPage(TQWidget *parent, TDEAboutData *ad) - TQValueList<KAboutPerson> pl = p->authors(); - TQValueList<KAboutPerson>::ConstIterator i; + TQValueList<TDEAboutPerson> pl = p->authors(); + TQValueList<TDEAboutPerson>::ConstIterator i; s = i18n("<b>Authors:</b> "); diff --git a/lib/plugin.h b/lib/plugin.h index 6966a0b..0432fe5 100644 --- a/lib/plugin.h +++ b/lib/plugin.h @@ -150,7 +150,7 @@ public: * An about widget is created that shows the contributors to * the application, along with copyright information and the * application's icon. This widget can be used pretty much - * anywhere. Copied from KAboutDialog, mostly. + * anywhere. Copied from TDEAboutDialog, mostly. * * @param parent The widget that holds the about widget. * @param data The TDEAboutData that is used to populate the widget. |