summaryrefslogtreecommitdiffstats
path: root/knotes
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-22 20:22:15 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-22 20:22:15 -0600
commit5fc6f26e12b596addd235f87320c31761bd5a84d (patch)
tree0a1ff964c23fce07fc088017df4ad537d57e62e5 /knotes
parent12c8a23fe75817cb4bfcd604c1863266dd75e840 (diff)
downloadtdepim-5fc6f26e12b596addd235f87320c31761bd5a84d.tar.gz
tdepim-5fc6f26e12b596addd235f87320c31761bd5a84d.zip
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'knotes')
-rw-r--r--knotes/ChangeLog2
-rw-r--r--knotes/main.cpp4
2 files changed, 3 insertions, 3 deletions
diff --git a/knotes/ChangeLog b/knotes/ChangeLog
index 3567dceff..b0d0c047c 100644
--- a/knotes/ChangeLog
+++ b/knotes/ChangeLog
@@ -816,7 +816,7 @@ ChangeLog for KNotes
2000/01/30 Charles Samuels <charles@kde.org>
- This is my daily huge commit for KAboutData. There are also patches for
+ This is my daily huge commit for TDEAboutData. There are also patches for
TDECmdLineArgs (so it works). Ktop is really doing bad folks.
2000/01/03 Espen Sand <espen@kde.org>
diff --git a/knotes/main.cpp b/knotes/main.cpp
index f1f78c5b3..13a525cf0 100644
--- a/knotes/main.cpp
+++ b/knotes/main.cpp
@@ -90,12 +90,12 @@ int main( int argc, char* argv[] )
{
TQString version = TQString::number( KNOTES_VERSION );
- KAboutData aboutData(
+ TDEAboutData aboutData(
"knotes",
I18N_NOOP("KNotes"),
version.latin1(),
I18N_NOOP( "TDE Notes" ),
- KAboutData::License_GPL,
+ TDEAboutData::License_GPL,
I18N_NOOP("(c) 1997-2006, The KNotes Developers")
);