summaryrefslogtreecommitdiffstats
path: root/ksirc
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-22 20:21:16 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-22 20:21:16 -0600
commitef71f46965855308db367f74956513eccc71bc46 (patch)
tree71f1aca189b7beda22f9e95b19608dccfa4f3050 /ksirc
parentbdf47e8ffbf1c94f4852d9aa2eb535a9ec176658 (diff)
downloadtdenetwork-ef71f46965855308db367f74956513eccc71bc46.tar.gz
tdenetwork-ef71f46965855308db367f74956513eccc71bc46.zip
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'ksirc')
-rw-r--r--ksirc/KSTicker/ksttest.cpp4
-rw-r--r--ksirc/ksirc.cpp4
2 files changed, 4 insertions, 4 deletions
diff --git a/ksirc/KSTicker/ksttest.cpp b/ksirc/KSTicker/ksttest.cpp
index 2c633295..880626b4 100644
--- a/ksirc/KSTicker/ksttest.cpp
+++ b/ksirc/KSTicker/ksttest.cpp
@@ -64,8 +64,8 @@ void StdInTicker::closeEvent ( TQCloseEvent *e )
int main(int argc, char **argv){
- KAboutData aboutData( "ksirc", I18N_NOOP("KSirc"),
- "2.0.0", "", KAboutData::License_Artistic,
+ TDEAboutData aboutData( "ksirc", I18N_NOOP("KSirc"),
+ "2.0.0", "", TDEAboutData::License_Artistic,
I18N_NOOP("(c) 1997-2002, Andrew Stanley-Jones"));
aboutData.addAuthor("Andrew Stanley-Jones",I18N_NOOP("Original Author"), "asj-ksirc@cban.com");
TDECmdLineArgs::init( argc, argv, &aboutData );
diff --git a/ksirc/ksirc.cpp b/ksirc/ksirc.cpp
index c8b72bcd..cd6018bb 100644
--- a/ksirc/ksirc.cpp
+++ b/ksirc/ksirc.cpp
@@ -68,8 +68,8 @@ public:
extern "C" KDE_EXPORT int kdemain( int argc, char ** argv )
{
- KAboutData aboutData( "ksirc", I18N_NOOP("KSirc"),
- KSIRC_VERSION, description, KAboutData::License_Artistic,
+ TDEAboutData aboutData( "ksirc", I18N_NOOP("KSirc"),
+ KSIRC_VERSION, description, TDEAboutData::License_Artistic,
I18N_NOOP("(c) 1997-2002, The KSirc Developers"));
aboutData.addAuthor("Andrew Stanley-Jones",I18N_NOOP("Original Author"), "asj-ksirc@cban.com");
aboutData.addAuthor("Waldo Bastian",0, "bastian@kde.org");