TDE
/
gtk-qt-engine
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/gtk-qt-engine
0
0
Fork 0
Code Issues Releases Wiki Activity

rename the following methods:

Browse Source 
tqfind find
tqreplace replace
tqcontains contains


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/gtk-qt-engine@1246075 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
v3.5.13-sru
tpearson 13 years ago
parent 21de1dcebc
commit d64f4816a5
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File

8
kcm_gtk/kcmgtk.cpp
Unescape View File

@ -131,7 +131,7 @@ TQFont GtkRcParser::parseFont(TQString fontString)
TQFont ret; TQFont ret;
while (true) while (true)
{ {
int lastSpacePos = fontString.tqfindRev(' '); int lastSpacePos = fontString.findRev(' ');
if (lastSpacePos == -1) if (lastSpacePos == -1)
break; break;
@ -215,7 +215,7 @@ void KcmGtk::getInstalledThemes()
{ {
if ((*it2).startsWith(".")) if ((*it2).startsWith("."))
continue; continue;
if (themes.tqfind(*it2) != themes.end()) if (themes.find(*it2) != themes.end())
continue; continue;
if (!TQFile::exists(path + (*it2) + "/gtk-2.0/gtkrc")) if (!TQFile::exists(path + (*it2) + "/gtk-2.0/gtkrc"))
continue; continue;
@ -226,7 +226,7 @@ void KcmGtk::getInstalledThemes()
widget->styleBox->clear(); widget->styleBox->clear();
widget->styleBox->insertStringList(themes.keys()); widget->styleBox->insertStringList(themes.keys());
bool installed = (themes.tqfind("Qt") != themes.end()); bool installed = (themes.find("Qt") != themes.end());
widget->styleKde->setEnabled(installed); widget->styleKde->setEnabled(installed);
widget->warning1->setHidden(installed); widget->warning1->setHidden(installed);
widget->warning2->setHidden(installed); widget->warning2->setHidden(installed);
@ -431,7 +431,7 @@ void KcmGtk::save()
TQString rcLine = "export GTK2_RC_FILES=$HOME/.gtkrc-2.0"; TQString rcLine = "export GTK2_RC_FILES=$HOME/.gtkrc-2.0";
TQString fileDataString(fileData); TQString fileDataString(fileData);
fileDataString.tqreplace("\n" + rcLine, "\n# (This is no longer needed from version 0.8 of the theme engine)\n# " + rcLine); fileDataString.replace("\n" + rcLine, "\n# (This is no longer needed from version 0.8 of the theme engine)\n# " + rcLine);
file.open(IO_WriteOnly); file.open(IO_WriteOnly);
stream.setDevice(TQT_TQIODEVICE(&file)); stream.setDevice(TQT_TQIODEVICE(&file));

18
src/qt_qt_wrapper.cpp
Unescape View File

@ -319,7 +319,7 @@ void createTQApp()
#endif // USE_FREEBSD #endif // USE_FREEBSD
#endif // USE_SOLARIS #endif // USE_SOLARIS
mozillaFix = (cmdLine.tqcontains("mozilla") || cmdLine.tqcontains("firefox")); mozillaFix = (cmdLine.contains("mozilla") || cmdLine.contains("firefox"));
openOfficeFix = (cmdLine.endsWith("soffice.bin")) openOfficeFix = (cmdLine.endsWith("soffice.bin"))
| (cmdLine.endsWith("swriter.bin")) | (cmdLine.endsWith("swriter.bin"))
@ -328,7 +328,7 @@ void createTQApp()
| (cmdLine.endsWith("spadmin.bin")) | (cmdLine.endsWith("spadmin.bin"))
| (cmdLine.endsWith("simpress.bin")); | (cmdLine.endsWith("simpress.bin"));
eclipseFix = cmdLine.tqcontains("eclipse"); eclipseFix = cmdLine.contains("eclipse");
gtkQtDebug = (getenv("GTK_TQT_ENGINE_DEBUG") != NULL) ? 1 : 0; gtkQtDebug = (getenv("GTK_TQT_ENGINE_DEBUG") != NULL) ? 1 : 0;
@ -336,7 +336,7 @@ void createTQApp()
printf("createTQApp()\n"); printf("createTQApp()\n");
char* sessionEnv = getenv("SESSION_MANAGER"); char* sessionEnv = getenv("SESSION_MANAGER");
if (TQString(sessionEnv).endsWith(TQString::number(getpid())) || cmdLine.tqcontains("nspluginviewer") || cmdLine.tqcontains("gnome-wm") || cmdLine.tqcontains("metacity") || cmdLine.tqcontains("xfwm4") || (getenv("GTK_TQT_ENGINE_DISABLE") != NULL)) if (TQString(sessionEnv).endsWith(TQString::number(getpid())) || cmdLine.contains("nspluginviewer") || cmdLine.contains("gnome-wm") || cmdLine.contains("metacity") || cmdLine.contains("xfwm4") || (getenv("GTK_TQT_ENGINE_DISABLE") != NULL))
{ {
printf("Not initializing the Gtk-Qt theme engine\n"); printf("Not initializing the Gtk-Qt theme engine\n");
} }
@ -403,7 +403,7 @@ void createTQApp()
/*setGnomeFonts(); /*setGnomeFonts();
setGnomeIcons();*/ setGnomeIcons();*/
if (!cmdLine.tqcontains("xfce-mcs-manager")) if (!cmdLine.contains("xfce-mcs-manager"))
{ {
// Get KDE related atoms from the X server // Get KDE related atoms from the X server
kipcCommAtom = XInternAtom ( gdk_x11_get_default_xdisplay() , "KIPC_COMM_ATOM" , false ); kipcCommAtom = XInternAtom ( gdk_x11_get_default_xdisplay() , "KIPC_COMM_ATOM" , false );
@ -1274,7 +1274,7 @@ void drawMenuItem(GdkWindow* window, GtkStyle* style, GtkStateType state, int x,
TQPainter painter(&pixmap); TQPainter painter(&pixmap);
TQPopupMenu pm; TQPopupMenu pm;
TQMenuData md; TQMenuData md;
TQMenuItem* mi = md.tqfindItem(md.insertItem("")); TQMenuItem* mi = md.findItem(md.insertItem(""));
TQStyleOption opt(mi, 16, 16); TQStyleOption opt(mi, 16, 16);
TQStyle::SFlags sflags = TQStyle::Style_Active | TQStyle::Style_Enabled; TQStyle::SFlags sflags = TQStyle::Style_Active | TQStyle::Style_Enabled;
@ -2047,8 +2047,8 @@ void setRcProperties(GtkRcStyle* rc_style, int forceRecreate)
stream << doIconMapping("gtk-edit", "actions/gtk-edit.png"); //2.6 stream << doIconMapping("gtk-edit", "actions/gtk-edit.png"); //2.6
stream << doIconMapping("gtk-execute", "actions/exec.png"); stream << doIconMapping("gtk-execute", "actions/exec.png");
stream << doIconMapping("gtk-file", "mimetypes/gtk-file.png"); stream << doIconMapping("gtk-file", "mimetypes/gtk-file.png");
stream << doIconMapping("gtk-tqfind", "actions/find.png"); stream << doIconMapping("gtk-find", "actions/find.png");
stream << doIconMapping("gtk-tqfind-and-tqreplace", "actions/gtk-tqfind-and-tqreplace.png"); stream << doIconMapping("gtk-find-and-replace", "actions/gtk-find-and-replace.png");
stream << doIconMapping("gtk-floppy", "devices/3floppy_unmount.png"); stream << doIconMapping("gtk-floppy", "devices/3floppy_unmount.png");
stream << doIconMapping("gtk-fullscreen", "actions/gtk-fullscreen.png"); stream << doIconMapping("gtk-fullscreen", "actions/gtk-fullscreen.png");
stream << doIconMapping("gtk-goto-bottom", "actions/bottom.png"); stream << doIconMapping("gtk-goto-bottom", "actions/bottom.png");
@ -2131,7 +2131,7 @@ void addIconThemeDir(const TQString& theme)
TQString icondir = kdeFindDir("/share/icons/" + theme + "/", "index.theme", "index.desktop"); TQString icondir = kdeFindDir("/share/icons/" + theme + "/", "index.theme", "index.desktop");
if(icondir.isEmpty()) if(icondir.isEmpty())
return; return;
if (iconThemeDirs.tqcontains(icondir)) if (iconThemeDirs.contains(icondir))
return; return;
// Add this theme to the list // Add this theme to the list
@ -2155,7 +2155,7 @@ void setMenuBackground(GtkStyle* style)
TQPainter painter(menuBackgroundPixmap); TQPainter painter(menuBackgroundPixmap);
TQPopupMenu pm; TQPopupMenu pm;
TQMenuData md; TQMenuData md;
TQMenuItem* mi = md.tqfindItem(md.insertItem("")); TQMenuItem* mi = md.findItem(md.insertItem(""));
tqApp->tqstyle().polish(&pm); tqApp->tqstyle().polish(&pm);

Write Preview
Loading…
Cancel
Save