summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-11-15 18:54:15 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-11-15 18:54:15 -0600
commit9fad243fd6c7e0d838d518cf283a0ec1ccbda1a6 (patch)
treef9f6928c1ed18429c6990b0819287be526ec00a5
parent62b854c2081285a562ab548f0fc47ba35fc10e0c (diff)
downloadtdebase-9fad243fd6c7e0d838d518cf283a0ec1ccbda1a6.tar.gz
tdebase-9fad243fd6c7e0d838d518cf283a0ec1ccbda1a6.zip
Rename KDE_VERSION to TDE_VERSION
-rw-r--r--kcontrol/kcontrol/version.h2
-rw-r--r--kdesktop/init.cc12
-rw-r--r--khelpcenter/version.h2
-rw-r--r--kicker/extensions/kasbar/kasaboutdlg.cpp2
-rw-r--r--kioslave/man/kmanpart.cpp2
-rw-r--r--kioslave/man/man2html.cpp20
-rw-r--r--kioslave/trash/ktrash.cpp2
-rw-r--r--kpersonalizer/kcountrypage.cpp2
8 files changed, 22 insertions, 22 deletions
diff --git a/kcontrol/kcontrol/version.h b/kcontrol/kcontrol/version.h
index f3519273..1718a69e 100644
--- a/kcontrol/kcontrol/version.h
+++ b/kcontrol/kcontrol/version.h
@@ -1,2 +1,2 @@
#include <kapplication.h>
-#define KCONTROL_VERSION KDE_VERSION_STRING
+#define KCONTROL_VERSION TDE_VERSION_STRING
diff --git a/kdesktop/init.cc b/kdesktop/init.cc
index 27441b17..884531b9 100644
--- a/kdesktop/init.cc
+++ b/kdesktop/init.cc
@@ -165,17 +165,17 @@ static bool isNewRelease()
int versionMinor = KDesktopSettings::kDEVersionMinor();
int versionRelease = KDesktopSettings::kDEVersionRelease();
- if( versionMajor < KDE_VERSION_MAJOR )
+ if( versionMajor < TDE_VERSION_MAJOR )
bNewRelease = true;
- else if( versionMinor < KDE_VERSION_MINOR )
+ else if( versionMinor < TDE_VERSION_MINOR )
bNewRelease = true;
- else if( versionRelease < KDE_VERSION_RELEASE )
+ else if( versionRelease < TDE_VERSION_RELEASE )
bNewRelease = true;
if( bNewRelease ) {
- KDesktopSettings::setKDEVersionMajor( KDE_VERSION_MAJOR );
- KDesktopSettings::setKDEVersionMinor( KDE_VERSION_MINOR );
- KDesktopSettings::setKDEVersionRelease( KDE_VERSION_RELEASE );
+ KDesktopSettings::setKDEVersionMajor( TDE_VERSION_MAJOR );
+ KDesktopSettings::setKDEVersionMinor( TDE_VERSION_MINOR );
+ KDesktopSettings::setKDEVersionRelease( TDE_VERSION_RELEASE );
KDesktopSettings::writeConfig();
}
diff --git a/khelpcenter/version.h b/khelpcenter/version.h
index 80243a92..b8623dbf 100644
--- a/khelpcenter/version.h
+++ b/khelpcenter/version.h
@@ -1,7 +1,7 @@
#ifndef __version_h__
#define __version_h__
-#define HELPCENTER_VERSION KDE_VERSION_STRING
+#define HELPCENTER_VERSION TDE_VERSION_STRING
#endif
// vim:ts=2:sw=2:et
diff --git a/kicker/extensions/kasbar/kasaboutdlg.cpp b/kicker/extensions/kasbar/kasaboutdlg.cpp
index d0fb3ef5..b76a7038 100644
--- a/kicker/extensions/kasbar/kasaboutdlg.cpp
+++ b/kicker/extensions/kasbar/kasaboutdlg.cpp
@@ -157,7 +157,7 @@ void KasAboutDialog::addInfoPage()
"<h2>Kasbar Version: %1</h2>"
"<b>KDE Version:</b> %2"
"</body></qt>" )
- .arg( VERSION_STRING ).arg( KDE_VERSION_STRING ),
+ .arg( VERSION_STRING ).arg( TDE_VERSION_STRING ),
aboutPage );
KTextBrowser *text5 = new KTextBrowser( aboutPage );
diff --git a/kioslave/man/kmanpart.cpp b/kioslave/man/kmanpart.cpp
index b5208559..b624657a 100644
--- a/kioslave/man/kmanpart.cpp
+++ b/kioslave/man/kmanpart.cpp
@@ -62,7 +62,7 @@ KInstance* KManPartFactory::instance()
if( !s_instance )
{
s_about = new KAboutData( "kmanpart",
- I18N_NOOP( "KMan" ), KDE_VERSION_STRING );
+ I18N_NOOP( "KMan" ), TDE_VERSION_STRING );
s_instance = new KInstance( s_about );
}
return s_instance;
diff --git a/kioslave/man/man2html.cpp b/kioslave/man/man2html.cpp
index ed0b39dd..20e126e4 100644
--- a/kioslave/man/man2html.cpp
+++ b/kioslave/man/man2html.cpp
@@ -319,8 +319,8 @@ static void InitStringDefinitions( void )
// \*S "Change to default font size"
#ifndef SIMPLE_MAN2HTML
// Special KDE KIO man:
- const TQCString kdeversion(KDE_VERSION_STRING);
- s_stringDefinitionMap.insert( ".KDE_VERSION_STRING", StringDefinition( kdeversion.length(), kdeversion ) );
+ const TQCString kdeversion(TDE_VERSION_STRING);
+ s_stringDefinitionMap.insert( ".TDE_VERSION_STRING", StringDefinition( kdeversion.length(), kdeversion ) );
#endif
}
@@ -1429,14 +1429,14 @@ static int read_only_number_register( const TQCString& name )
return s_nroff;
#ifndef SIMPLE_MAN2HTML
// Special KDE KIO man:
- else if ( name == ".KDE_VERSION_MAJOR" )
- return KDE_VERSION_MAJOR;
- else if ( name == ".KDE_VERSION_MINOR" )
- return KDE_VERSION_MINOR;
- else if ( name == ".KDE_VERSION_RELEASE" )
- return KDE_VERSION_RELEASE;
- else if ( name == ".KDE_VERSION" )
- return KDE_VERSION;
+ else if ( name == ".TDE_VERSION_MAJOR" )
+ return TDE_VERSION_MAJOR;
+ else if ( name == ".TDE_VERSION_MINOR" )
+ return TDE_VERSION_MINOR;
+ else if ( name == ".TDE_VERSION_RELEASE" )
+ return TDE_VERSION_RELEASE;
+ else if ( name == ".TDE_VERSION" )
+ return TDE_VERSION;
#endif
// ### TODO: should .T be set to "html"? But we are not the HTML post-processor. :-(
diff --git a/kioslave/trash/ktrash.cpp b/kioslave/trash/ktrash.cpp
index 0c971036..157a4215 100644
--- a/kioslave/trash/ktrash.cpp
+++ b/kioslave/trash/ktrash.cpp
@@ -42,7 +42,7 @@ int main(int argc, char *argv[])
I18N_NOOP( "ktrash" ),
I18N_NOOP( "Helper program to handle the KDE trash can\n"
"Note: to move files to the trash, do not use ktrash, but \"kfmclient move 'url' trash:/\"" ),
- KDE_VERSION_STRING );
+ TDE_VERSION_STRING );
KCmdLineArgs::addCmdLineOptions( options );
KApplication app;
diff --git a/kpersonalizer/kcountrypage.cpp b/kpersonalizer/kcountrypage.cpp
index bce43a15..113928a8 100644
--- a/kpersonalizer/kcountrypage.cpp
+++ b/kpersonalizer/kcountrypage.cpp
@@ -45,7 +45,7 @@ KCountryPage::KCountryPage(TQWidget *parent, const char *name ) : KCountryPageDl
b_startedLanguageChanged = false;
// set appropriate Trinity version (kapplication.h)
- txt_welcome->setText(i18n("<h3>Welcome to Trinity %1</h3>").arg(KDE_VERSION_STRING));
+ txt_welcome->setText(i18n("<h3>Welcome to Trinity %1</h3>").arg(TDE_VERSION_STRING));
flang = new KFindLanguage();