diff options
| author | Darrell Anderson <[email protected]> | 2012-06-25 20:56:52 -0500 |
|---|---|---|
| committer | Darrell Anderson <[email protected]> | 2012-06-25 20:56:52 -0500 |
| commit | 98048a717ffdd3f641d2829cbc1efc993ef4109b (patch) | |
| tree | 1893068825cbcc4307f9854e229ba5848774d7b7 | |
| parent | 03e19305ec704b8749bb7564e16ed8d78a80d516 (diff) | |
| download | tdebase-98048a717ffdd3f641d2829cbc1efc993ef4109b.tar.gz tdebase-98048a717ffdd3f641d2829cbc1efc993ef4109b.zip | |
Fix kate and kwrite versions to better match new R14 version scheme.
| -rw-r--r-- | kate/app/kateapp.cpp | 8 | ||||
| -rw-r--r-- | kate/app/kwritemain.cpp | 6 |
2 files changed, 11 insertions, 3 deletions
diff --git a/kate/app/kateapp.cpp b/kate/app/kateapp.cpp index c6515dc12..f57bd2254 100644 --- a/kate/app/kateapp.cpp +++ b/kate/app/kateapp.cpp @@ -131,8 +131,12 @@ Kate::Application *KateApp::application () */ TQString KateApp::kateVersion (bool fullVersion) { - return fullVersion ? TQString ("%1.%2.%3").arg(KDE::versionMajor() - 1).arg(KDE::versionMinor()).arg(KDE::versionRelease()) - : TQString ("%1.%2").arg(KDE::versionMajor() - 1).arg(KDE::versionMinor()); +// return fullVersion ? TQString ("%1.%2.%3").arg(KDE::versionMajor() - 1).arg(KDE::versionMinor()).arg(KDE::versionRelease()) +// : TQString ("%1.%2").arg(KDE::versionMajor() - 1).arg(KDE::versionMinor()); + /** The previous version computation scheme (commented out above) worked fine in the 3.5.x days. + With the new Trinity Rx.y.z scheme the version number gets weird. + We now hard-code the first two numbers to match the 3.5.x days and only update the last number. */ + return fullVersion ? TQString ("2.5.%1").arg(KDE::versionMajor()) : TQString ("%1.%2").arg(2.5); } void KateApp::restoreKate () diff --git a/kate/app/kwritemain.cpp b/kate/app/kwritemain.cpp index 60694d2fc..ca54ec29f 100644 --- a/kate/app/kwritemain.cpp +++ b/kate/app/kwritemain.cpp @@ -543,7 +543,11 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv) 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() + 1).arg(KDE::versionMinor()).arg(KDE::versionRelease()); + /** The previous version computation scheme (commented out above) worked fine in the 3.5.x days. + With the new Trinity Rx.y.z scheme the version number gets weird. + We now hard-code the first two numbers to match the 3.5.x days and only update the last number. */ + TQString kWriteVersion = TQString ("4.5.%1").arg(KDE::versionMajor()); KAboutData aboutData ( "kwrite", I18N_NOOP("KWrite"), |