Fix kate and kwrite versions to better match new R14 version scheme.

pull/2/head
Darrell Anderson 12 years ago
parent 03e19305ec
commit 98048a717f

@ -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 ()

@ -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"),

Loading…
Cancel
Save