summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-08-21 01:43:11 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-08-21 01:43:11 +0000
commit5fd1e9ef91a48ae9019eb3777e823f7399f6c77b (patch)
tree32afa7c2f09871b780e172ce08f9884ed07f46d8
parenta16843922c37313f009c2341b86c791d968fe82c (diff)
downloadkvirc-5fd1e9ef91a48ae9019eb3777e823f7399f6c77b.tar.gz
kvirc-5fd1e9ef91a48ae9019eb3777e823f7399f6c77b.zip
Convert remaining references to kde3 (e.g. in paths) to trinity
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kvirc@1248408 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
-rw-r--r--acinclude.m42
-rw-r--r--admin/acinclude.m4.in2
-rw-r--r--src/kvirc/kernel/kvi_app_fs.cpp2
-rw-r--r--src/kvirc/kernel/kvi_app_setup.cpp6
4 files changed, 6 insertions, 6 deletions
diff --git a/acinclude.m4 b/acinclude.m4
index 2404c5da..207d3d28 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -2149,7 +2149,7 @@ AC_DEFUN([AC_SS_FIND_KDE_GENERAL_DIR],
if test -n "$KDEDIR"; then
ss_kde_general_test_dirs="$KDEDIR $ss_kde_general_test_dirs"
fi
- ss_kde_general_test_path_suffix="kde kde3.0 kde3 KDE Kde KDE3 kde3 ."
+ ss_kde_general_test_path_suffix="kde trinity.0 trinity KDE Kde KDE3 trinity ."
AC_SS_FIND_FILE_PATH_EXT($SS_KDE_GENERAL_FILE_TO_SEARCH,$ss_kde_general_test_dirs,$ss_kde_general_test_path_suffix,SS_KDE_GENERAL_DIR)
diff --git a/admin/acinclude.m4.in b/admin/acinclude.m4.in
index 3cb36389..57e5ad04 100644
--- a/admin/acinclude.m4.in
+++ b/admin/acinclude.m4.in
@@ -2149,7 +2149,7 @@ AC_DEFUN([AC_SS_FIND_KDE_GENERAL_DIR],
if test -n "$KDEDIR"; then
ss_kde_general_test_dirs="$KDEDIR $ss_kde_general_test_dirs"
fi
- ss_kde_general_test_path_suffix="kde kde3.0 kde3 KDE Kde KDE3 kde3 ."
+ ss_kde_general_test_path_suffix="kde trinity.0 trinity KDE Kde KDE3 trinity ."
AC_SS_FIND_FILE_PATH_EXT($SS_KDE_GENERAL_FILE_TO_SEARCH,$ss_kde_general_test_dirs,$ss_kde_general_test_path_suffix,SS_KDE_GENERAL_DIR)
diff --git a/src/kvirc/kernel/kvi_app_fs.cpp b/src/kvirc/kernel/kvi_app_fs.cpp
index 6a9ad8ab..51e6383c 100644
--- a/src/kvirc/kernel/kvi_app_fs.cpp
+++ b/src/kvirc/kernel/kvi_app_fs.cpp
@@ -55,7 +55,7 @@ void KviApp::getGlobalKvircDirectory(TQString &szData,KvircSubdir dir,const TQSt
// Local hack for Debian
case Modules :
- case Plugins : szData = "/opt/kde3/lib/kvirc/" KVI_VERSION_BRANCH "/modules"; break;
+ case Plugins : szData = "/opt/trinity/lib/kvirc/" KVI_VERSION_BRANCH "/modules"; break;
case EasyPlugins : szData.append("easyplugins"); break;
case ConfigPlugins : KviTQString::appendFormatted(szData,"config%smodules",KVI_PATH_SEPARATOR); break;
diff --git a/src/kvirc/kernel/kvi_app_setup.cpp b/src/kvirc/kernel/kvi_app_setup.cpp
index 27555f0b..212ee569 100644
--- a/src/kvirc/kernel/kvi_app_setup.cpp
+++ b/src/kvirc/kernel/kvi_app_setup.cpp
@@ -501,11 +501,11 @@ void KviApp::setupFileAssociations()
const char * usualKvircGlobalPrePath[]=
{
"/usr/local", "/opt/kde", "/usr",
- "/usr/local/lib", "/opt/kde3", "/usr/lib",
+ "/usr/local/lib", "/opt/trinity", "/usr/lib",
"/usr/local/kde", "/opt", "/usr/etc",
- "/usr/local/kde3", "/usr/lib/X11R6", "/usr/X11R6",
+ "/usr/local/trinity", "/usr/lib/X11R6", "/usr/X11R6",
"/usr/local/X11R6", "/lib/X11", "/usr/kde",
- "/usr/local/X11", "/etc", "/usr/kde3",
+ "/usr/local/X11", "/etc", "/usr/trinity",
"/usr/local/etc", "/lib", "/usr/X11",
"/etc/X11", "/home", "/home/kvirc",
0