Rename KInstance and KAboutData to avoid conflicts with KDE4

pull/4/head
Timothy Pearson 12 years ago
parent 6fcb4b861d
commit c01fc2c482

@ -83,7 +83,7 @@ int KerryApplication::newInstance()
return KUniqueApplication::newInstance();
}
void KerryApplication::init(const KAboutData* /*about*/)
void KerryApplication::init(const TDEAboutData* /*about*/)
{
if (hitListWindow)
return;

@ -31,7 +31,7 @@ class kerry;
class TDECmdLineArgs;
class SearchDlg;
class KHelpMenu;
class KAboutData;
class TDEAboutData;
class KProcess;
class KerryApplication : public KUniqueApplication
@ -42,7 +42,7 @@ class KerryApplication : public KUniqueApplication
public:
KerryApplication();
~KerryApplication();
void init(const KAboutData* about);
void init(const TDEAboutData* about);
int newInstance();
void search(const TQString&);

@ -85,9 +85,9 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv)
}
}
KAboutData about("kerry", I18N_NOOP("Kerry Beagle Search"),
TDEAboutData about("kerry", I18N_NOOP("Kerry Beagle Search"),
version, description,
KAboutData::License_GPL,
TDEAboutData::License_GPL,
"(c) 2005,2006 Novell, Inc.",
0, "http://opensuse.org/kerry");
about.addAuthor("Stephan Binner", 0, "binner@kde.org");

Loading…
Cancel
Save