Remove KVI_VERSION_BRANCH since the version number is no longer used in the application pathfeat/remove-unnecessary-info

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

2 files changed, 8 insertions, 19 deletions

diff --git a/src/kvilib/config/kvi_settings.h b/src/kvilib/config/kvi_settings.h
index de93871..dddfe3a 100644
--- a/src/kvilib/config/kvi_settings.h
+++ b/src/kvilib/config/kvi_settings.h
@@ -83,7 +83,6 @@
 #endif
 
 #define KVI_VERSION VERSION
-#define KVI_VERSION_BRANCH VERSION_BRANCH
 #define KVI_BUILD_FLAGS BUILD_FLAGS
 
 #define KVI_RELEASE_NAME "Virgo"
diff --git a/src/kvirc/kernel/kvi_app_setup.cpp b/src/kvirc/kernel/kvi_app_setup.cpp
index bb12185..76e727e 100644
--- a/src/kvirc/kernel/kvi_app_setup.cpp
+++ b/src/kvirc/kernel/kvi_app_setup.cpp
@@ -541,7 +541,7 @@ void KviApp::findGlobalKvircDirectory()
 	if(checkGlobalKvircDirectory(m_szGlobalKvircDir))return;
 
 	KviMessageBox::warning("Unable to find the shared Kvirc directory.\n"\
-			"The usual path for this directory is c:\\kvirc\\" KVI_VERSION_BRANCH "\\.\n"\
+			"The usual path for this directory is c:\\kvirc\n"\
 			"I have tried %Q, but it seemed to fail\n" \
 			"Trying to run anyway...\n",&m_szGlobalKvircDir);
 #else // !COMPILE_ON_WINDOWS
@@ -550,9 +550,9 @@ void KviApp::findGlobalKvircDirectory()
 	// because of strange distributions or TDEDIRS
 	// I do it in that way...
 	#ifdef COMPILE_TDE_SUPPORT
-		// KDE compilation ...
-		// The things usually go installed into $TDEDIR/share/apps/kvirc/$KVI_VERSION_BRANCH
-		// Look in the main KDE directory
+		// TDE compilation ...
+		// The things usually go installed into $TDEDIR/share/apps/kvirc
+		// Look in the main TDE directory
 		TDEStandardDirs * d = dirs();
 		if(d)
 		{
@@ -561,20 +561,19 @@ void KviApp::findGlobalKvircDirectory()
 			#ifdef HAVE_GETENV
 				//TDEDIR sanity check...
 				m_szGlobalKvircDir = getenv("TDEDIR");
-				m_szGlobalKvircDir+="/share/apps/kvirc/" KVI_VERSION_BRANCH;
+				m_szGlobalKvircDir+="/share/apps/kvirc/";
 				if(checkGlobalKvircDirectory(m_szGlobalKvircDir))return;
 			#endif
 		}
 		// FAILED ? Check the usual way...
-	#endif //COMPILE_WITH_KDE
+	#endif //COMPILE_TDE_SUPPORT
 
-	// Non KDE compilation , or not found under $TDEDIR/share/apps/kvirc/$KVI_VERSION_BRANCH
+	// Non TDE compilation , or not found under $TDEDIR/share/apps/kvirc
 
 	// Check for MacOS X Bundle compilation
 	#ifdef Q_OS_MACX
 		m_szGlobalKvircDir = applicationDirPath();
-		m_szGlobalKvircDir+= "/../Resources/kvirc/";
-		m_szGlobalKvircDir+= KVI_VERSION_BRANCH;
+		m_szGlobalKvircDir+= "/../Resources/kvirc";
 		if(checkGlobalKvircDirectory(m_szGlobalKvircDir))return;
 	#endif //Q_OS_MACX
 
@@ -583,7 +582,6 @@ void KviApp::findGlobalKvircDirectory()
 		for(int i=0;usualKvircGlobalDir[i] != 0;i++){
 			m_szGlobalKvircDir = usualKvircGlobalPrePath[j];
 			m_szGlobalKvircDir+= usualKvircGlobalDir[i];
-			m_szGlobalKvircDir+= KVI_VERSION_BRANCH;
 			if(checkGlobalKvircDirectory(m_szGlobalKvircDir))return;	
 		}
 	}
@@ -592,7 +590,6 @@ void KviApp::findGlobalKvircDirectory()
 	for(int k=0;usualKvircGlobalDir[k] != 0;k++){
 		m_szGlobalKvircDir = TQDir::homeDirPath();
 		m_szGlobalKvircDir+= usualKvircGlobalDir[k];
-		m_szGlobalKvircDir+= KVI_VERSION_BRANCH;
 		if(checkGlobalKvircDirectory(m_szGlobalKvircDir))return;
 	}
 
@@ -601,7 +598,6 @@ void KviApp::findGlobalKvircDirectory()
 			m_szGlobalKvircDir = TQDir::homeDirPath();
 			m_szGlobalKvircDir+= "/.trinity";
 			m_szGlobalKvircDir+= usualKvircGlobalDir[k];
-			m_szGlobalKvircDir+= KVI_VERSION_BRANCH;
 			if(checkGlobalKvircDirectory(m_szGlobalKvircDir))return;
 		}
 	#endif //COMPILE_TDE_SUPPORT
@@ -813,12 +809,6 @@ void KviApp::setupFinish()
 
 void KviApp::saveKvircDirectory()
 {
-/*
-#ifdef COMPILE_ON_WINDOWS
-	KviStr szKey(KviStr::Format,"LocalKvircDirectory%s",KVI_VERSION_BRANCH);
-	WritePrivateProfileString("kvirc",szKey.ptr(),m_szLocalKvircDir.ptr(),KVI_HOME_CONFIG_FILE_NAME);
-#else //!COMPILE_ON_WINDOWS
-*/
 	// Here we save the local directory path
 #ifdef COMPILE_TDE_SUPPORT
 	// In KDE we use the application config file