I vote we patch both to eliminate the silly " - 1 " and
" + 1 " method. Then both editors will have version numbers the same as the system release. That would look more sensible.
Agreed,
This is a small issue, but I can't see any reason not to get the version numbers the same if we can do it (by hook or crook)
Here is my proposed patch, which I have tested:
=========================================================== diff -urN tdebase/kate/app/kateapp.cpp tdebase.new/kate/app/kateapp.cpp --- tdebase/kate/app/kateapp.cpp 2012-05-27 18:05:02.000000000 -0500 +++ tdebase.new/kate/app/kateapp.cpp 2012-06-05 11:44:35.000000000 -0500 @@ -131,7 +131,7 @@ */ TQString KateApp::kateVersion (bool fullVersion) { - return fullVersion ? TQString ("%1.%2.%3").arg(KDE::versionMajor() - 1).arg(KDE::versionMinor()).arg(KDE::versionRelease()) + return fullVersion ? TQString ("%1.%2.%3").arg(KDE::versionMajor()).arg(KDE::versionMinor()).arg(KDE::versionRelease()) : TQString ("%1.%2").arg(KDE::versionMajor() - 1).arg(KDE::versionMinor()); }
diff -urN tdebase/kate/app/kwritemain.cpp tdebase.new/kate/app/kwritemain.cpp --- tdebase/kate/app/kwritemain.cpp 2012-05-27 18:05:02.000000000 -0500 +++ tdebase.new/kate/app/kwritemain.cpp 2012-06-05 11:44:03.000000000 -0500 @@ -543,7 +543,7 @@ KLocale::setMainCatalogue("kate"); //lukas: set this to have the kwritepart translated using kate message catalog
// here we go, construct the KWrite version - TQString kWriteVersion = TQString ("%1.%2.%3").arg(KDE::versionMajor() + 1).arg(KDE::versionMinor()).arg(KDE::versionRelease()); + TQString kWriteVersion = TQString ("%1.%2.%3").arg(KDE::versionMajor()).arg(KDE::versionMinor()).arg(KDE::versionRelease());
KAboutData aboutData ( "kwrite", I18N_NOOP("KWrite"), ===========================================================
With the patch both kate and kwrite display a version number of 14.0.0.
Any objections to pushing?
Darrell