Rename KAbout to avoid conflicts with KDE4

pull/2/head
Timothy Pearson 12 years ago
parent b542273c9f
commit ba4ffdeb84

@ -420,7 +420,7 @@ void ConverterDlg::slotToPDB()
void ConverterDlg::slotUser1() void ConverterDlg::slotUser1()
{ {
KAboutApplication ab(TDEGlobal::instance()->aboutData(), this); TDEAboutApplication ab(TDEGlobal::instance()->aboutData(), this);
ab.show(); ab.show();
ab.exec(); ab.exec();
return; return;

@ -202,7 +202,7 @@ void PilotDaemonTray::slotShowAbout()
if (!kap) if (!kap)
{ {
kap = new KAboutApplication(0, "kpdab", false); kap = new TDEAboutApplication(0, "kpdab", false);
} }
kap->show(); kap->show();

@ -38,7 +38,7 @@
class TQPixmap; class TQPixmap;
class TQTimer; class TQTimer;
class KAboutApplication; class TDEAboutApplication;
class TQPopupMenu; class TQPopupMenu;
class PilotDaemon; class PilotDaemon;
@ -116,7 +116,7 @@ private:
/** /**
* Window for the "About KPilot" information. * Window for the "About KPilot" information.
*/ */
KAboutApplication *kap; TDEAboutApplication *kap;
/** /**
* Timer for blinking. * Timer for blinking.

@ -207,8 +207,8 @@ TQWidget *ConduitConfigBase::aboutPage(TQWidget *parent, TDEAboutData *ad)
TQValueList<KAboutPerson> pl = p->authors(); TQValueList<TDEAboutPerson> pl = p->authors();
TQValueList<KAboutPerson>::ConstIterator i; TQValueList<TDEAboutPerson>::ConstIterator i;
s = i18n("<b>Authors:</b> "); s = i18n("<b>Authors:</b> ");

@ -150,7 +150,7 @@ public:
* An about widget is created that shows the contributors to * An about widget is created that shows the contributors to
* the application, along with copyright information and the * the application, along with copyright information and the
* application's icon. This widget can be used pretty much * 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 parent The widget that holds the about widget.
* @param data The TDEAboutData that is used to populate the widget. * @param data The TDEAboutData that is used to populate the widget.

Loading…
Cancel
Save