TDE
/
tdelibs
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tdelibs
0
0
Fork 0
Code Issues Releases Wiki Activity

Fix other Qt4 kdelibs FTBFS

Browse Source 
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1225622 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
v3.5.13-sru
tpearson 15 years ago
parent 5c9fdee3d6
commit fa1ddc9724
1 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File

52
kdecore/kde-config.cpp.cmake
Unescape Escape View File

@ -37,64 +37,64 @@ TQString expandvars(const char *_input)
return result; return result;
bool changed = false; bool changed = false;
int index = result.find("${prefix}"); int index = result.tqfind("${prefix}");
if (index >= 0) { if (index >= 0) {
result = result.replace(index, 9, "@CMAKE_INSTALL_PREFIX@"); result = result.tqreplace(index, 9, "@CMAKE_INSTALL_PREFIX@");
changed = true; changed = true;
} }
index = result.find("$(prefix)"); index = result.tqfind("$(prefix)");
if (index >= 0) { if (index >= 0) {
result = result.replace(index, 9, "@CMAKE_INSTALL_PREFIX@"); result = result.tqreplace(index, 9, "@CMAKE_INSTALL_PREFIX@");
changed = true; changed = true;
} }
index = result.find("${datadir}"); index = result.tqfind("${datadir}");
if (index >= 0) { if (index >= 0) {
result = result.replace(index, 10, "@SHARE_INSTALL_PREFIX@"); result = result.tqreplace(index, 10, "@SHARE_INSTALL_PREFIX@");
changed = true; changed = true;
} }
index = result.find("$(datadir)"); index = result.tqfind("$(datadir)");
if (index >= 0) { if (index >= 0) {
result = result.replace(index, 10, "@SHARE_INSTALL_PREFIX@"); result = result.tqreplace(index, 10, "@SHARE_INSTALL_PREFIX@");
changed = true; changed = true;
} }
index = result.find("${exec_prefix}"); index = result.tqfind("${exec_prefix}");
if (index >= 0) { if (index >= 0) {
result = result.replace(index, 14, "@EXEC_INSTALL_PREFIX@"); result = result.tqreplace(index, 14, "@EXEC_INSTALL_PREFIX@");
changed = true; changed = true;
} }
index = result.find("$(exec_prefix)"); index = result.tqfind("$(exec_prefix)");
if (index >= 0) { if (index >= 0) {
result = result.replace(index, 14, "@EXEC_INSTALL_PREFIX@"); result = result.tqreplace(index, 14, "@EXEC_INSTALL_PREFIX@");
changed = true; changed = true;
} }
index = result.find("${libdir}"); index = result.tqfind("${libdir}");
if (index >= 0) { if (index >= 0) {
result = result.replace(index, 9, "@LIB_INSTALL_DIR@"); result = result.tqreplace(index, 9, "@LIB_INSTALL_DIR@");
changed = true; changed = true;
} }
index = result.find("$(libdir)"); index = result.tqfind("$(libdir)");
if (index >= 0) { if (index >= 0) {
result = result.replace(index, 9, "@LIB_INSTALL_DIR@"); result = result.tqreplace(index, 9, "@LIB_INSTALL_DIR@");
changed = true; changed = true;
} }
index = result.find("${includedir}"); index = result.tqfind("${includedir}");
if (index >= 0) { if (index >= 0) {
result = result.replace(index, 20, "@INCLUDE_INSTALL_DIR@"); result = result.tqreplace(index, 20, "@INCLUDE_INSTALL_DIR@");
changed = true; changed = true;
} }
index = result.find("$(includedir)"); index = result.tqfind("$(includedir)");
if (index >= 0) { if (index >= 0) {
result = result.replace(index, 20, "@INCLUDE_INSTALL_DIR@"); result = result.tqreplace(index, 20, "@INCLUDE_INSTALL_DIR@");
changed = true; changed = true;
} }
index = result.find("${sysconfdir}"); index = result.tqfind("${sysconfdir}");
if (index >= 0) { if (index >= 0) {
result = result.replace(index, 13, "@SYSCONF_INSTALL_DIR@"); result = result.tqreplace(index, 13, "@SYSCONF_INSTALL_DIR@");
changed = true; changed = true;
} }
index = result.find("$(sysconfdir)"); index = result.tqfind("$(sysconfdir)");
if (index >= 0) { if (index >= 0) {
result = result.replace(index, 13, "@SYSCONF_INSTALL_DIR@"); result = result.tqreplace(index, 13, "@SYSCONF_INSTALL_DIR@");
changed = true; changed = true;
} }
if (changed) if (changed)
@ -201,7 +201,7 @@ int main(int argc, char **argv)
if (helptexts[index]) { if (helptexts[index]) {
printf("%s - %s\n", helptexts[index], i18n(helptexts[index+1]).local8Bit().data()); printf("%s - %s\n", helptexts[index], i18n(helptexts[index+1]).local8Bit().data());
} else { } else {
printf("%s", i18n("%1 - unknown type\n").arg(*it).local8Bit().data()); printf("%s", i18n("%1 - unknown type\n").tqarg(*it).local8Bit().data());
} }
} }
return 0; return 0;
@ -226,7 +226,7 @@ int main(int argc, char **argv)
else if ( type == "document" ) else if ( type == "document" )
printResult(KGlobalSettings::documentPath()); printResult(KGlobalSettings::documentPath());
else else
fprintf(stderr, "%s", i18n("%1 - unknown type of userpath\n").arg(type).local8Bit().data() ); fprintf(stderr, "%s", i18n("%1 - unknown type of userpath\n").tqarg(type).local8Bit().data() );
return 0; return 0;
} }

Write Preview
Loading…
Cancel
Save