diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-01-07 03:45:53 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-01-07 03:45:53 +0000 |
commit | 10308be19ef7fa44699562cc75946e7ea1fdf6b9 (patch) | |
tree | 4bc444c00a79e88105f2cfce5b6209994c413ca0 /kdecore/kde-config.cpp.cmake | |
parent | 307136d8eef0ba133b78ceee8e901138d4c996a1 (diff) | |
download | tdelibs-10308be19ef7fa44699562cc75946e7ea1fdf6b9.tar.gz tdelibs-10308be19ef7fa44699562cc75946e7ea1fdf6b9.zip |
Revert automated changes
Sorry guys, they are just not ready for prime time
Work will continue as always
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1212479 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kdecore/kde-config.cpp.cmake')
-rw-r--r-- | kdecore/kde-config.cpp.cmake | 52 |
1 files changed, 26 insertions, 26 deletions
diff --git a/kdecore/kde-config.cpp.cmake b/kdecore/kde-config.cpp.cmake index 291329398..f7be1e2be 100644 --- a/kdecore/kde-config.cpp.cmake +++ b/kdecore/kde-config.cpp.cmake @@ -32,69 +32,69 @@ bool _expandvars = false; TQString expandvars(const char *_input) { - TQString result = TQString::tqfromLatin1(_input); + TQString result = TQString::fromLatin1(_input); if (!_expandvars) return result; bool changed = false; - int index = result.tqfind("${prefix}"); + int index = result.find("${prefix}"); if (index >= 0) { - result = result.tqreplace(index, 9, "@CMAKE_INSTALL_PREFIX@"); + result = result.replace(index, 9, "@CMAKE_INSTALL_PREFIX@"); changed = true; } - index = result.tqfind("$(prefix)"); + index = result.find("$(prefix)"); if (index >= 0) { - result = result.tqreplace(index, 9, "@CMAKE_INSTALL_PREFIX@"); + result = result.replace(index, 9, "@CMAKE_INSTALL_PREFIX@"); changed = true; } - index = result.tqfind("${datadir}"); + index = result.find("${datadir}"); if (index >= 0) { - result = result.tqreplace(index, 10, "@SHARE_INSTALL_PREFIX@"); + result = result.replace(index, 10, "@SHARE_INSTALL_PREFIX@"); changed = true; } - index = result.tqfind("$(datadir)"); + index = result.find("$(datadir)"); if (index >= 0) { - result = result.tqreplace(index, 10, "@SHARE_INSTALL_PREFIX@"); + result = result.replace(index, 10, "@SHARE_INSTALL_PREFIX@"); changed = true; } - index = result.tqfind("${exec_prefix}"); + index = result.find("${exec_prefix}"); if (index >= 0) { - result = result.tqreplace(index, 14, "@EXEC_INSTALL_PREFIX@"); + result = result.replace(index, 14, "@EXEC_INSTALL_PREFIX@"); changed = true; } - index = result.tqfind("$(exec_prefix)"); + index = result.find("$(exec_prefix)"); if (index >= 0) { - result = result.tqreplace(index, 14, "@EXEC_INSTALL_PREFIX@"); + result = result.replace(index, 14, "@EXEC_INSTALL_PREFIX@"); changed = true; } - index = result.tqfind("${libdir}"); + index = result.find("${libdir}"); if (index >= 0) { - result = result.tqreplace(index, 9, "@LIB_INSTALL_DIR@"); + result = result.replace(index, 9, "@LIB_INSTALL_DIR@"); changed = true; } - index = result.tqfind("$(libdir)"); + index = result.find("$(libdir)"); if (index >= 0) { - result = result.tqreplace(index, 9, "@LIB_INSTALL_DIR@"); + result = result.replace(index, 9, "@LIB_INSTALL_DIR@"); changed = true; } - index = result.tqfind("${includedir}"); + index = result.find("${includedir}"); if (index >= 0) { - result = result.tqreplace(index, 20, "@INCLUDE_INSTALL_DIR@"); + result = result.replace(index, 20, "@INCLUDE_INSTALL_DIR@"); changed = true; } - index = result.tqfind("$(includedir)"); + index = result.find("$(includedir)"); if (index >= 0) { - result = result.tqreplace(index, 20, "@INCLUDE_INSTALL_DIR@"); + result = result.replace(index, 20, "@INCLUDE_INSTALL_DIR@"); changed = true; } - index = result.tqfind("${sysconfdir}"); + index = result.find("${sysconfdir}"); if (index >= 0) { - result = result.tqreplace(index, 13, "@SYSCONF_INSTALL_DIR@"); + result = result.replace(index, 13, "@SYSCONF_INSTALL_DIR@"); changed = true; } - index = result.tqfind("$(sysconfdir)"); + index = result.find("$(sysconfdir)"); if (index >= 0) { - result = result.tqreplace(index, 13, "@SYSCONF_INSTALL_DIR@"); + result = result.replace(index, 13, "@SYSCONF_INSTALL_DIR@"); changed = true; } if (changed) @@ -186,7 +186,7 @@ int main(int argc, char **argv) "wallpaper", I18N_NOOP("Wallpapers"), "xdgdata-apps", I18N_NOOP("XDG Application menu (.desktop files)"), "xdgdata-dirs", I18N_NOOP("XDG Menu descriptions (.directory files)"), - "xdgconf-menu", I18N_NOOP("XDG Menu tqlayout (.menu files)"), + "xdgconf-menu", I18N_NOOP("XDG Menu layout (.menu files)"), "cmake", I18N_NOOP("CMake import modules (.cmake files)"), "tmp", I18N_NOOP("Temporary files (specific for both current host and current user)"), "socket", I18N_NOOP("UNIX Sockets (specific for both current host and current user)"), |