diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-16 09:59:13 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-16 09:59:13 -0600 |
| commit | 56160bf4dfe503631ef6373367b281f081bab2b4 (patch) | |
| tree | 7fcea2ffd9c3420af999c3dcad0ed032eef93956 /krandr | |
| parent | 13281e2856a2ef43bbab78c5528470309c23aa77 (diff) | |
| download | tdelibs-56160bf4dfe503631ef6373367b281f081bab2b4.tar.gz tdelibs-56160bf4dfe503631ef6373367b281f081bab2b4.zip | |
Revert "Rename a number of old tq methods that are no longer tq specific"
This reverts commit 13281e2856a2ef43bbab78c5528470309c23aa77.
Diffstat (limited to 'krandr')
| -rw-r--r-- | krandr/ktimerdialog.cpp | 2 | ||||
| -rw-r--r-- | krandr/libkrandr.cc | 12 | ||||
| -rw-r--r-- | krandr/randr.cpp | 4 |
3 files changed, 9 insertions, 9 deletions
diff --git a/krandr/ktimerdialog.cpp b/krandr/ktimerdialog.cpp index 760715300..0be416be7 100644 --- a/krandr/ktimerdialog.cpp +++ b/krandr/ktimerdialog.cpp @@ -20,7 +20,7 @@ */ #include <tqhbox.h> -#include <layout.h> +#include <tqlayout.h> #include <tqvbox.h> #include <tqtimer.h> #include <tqprogressbar.h> diff --git a/krandr/libkrandr.cc b/krandr/libkrandr.cc index b4f21e5fe..86f8e6bd0 100644 --- a/krandr/libkrandr.cc +++ b/krandr/libkrandr.cc @@ -55,7 +55,7 @@ unsigned int reverse_bits(register unsigned int x) TQString exec(const char * cmd) { TQString bashcommand = cmd; bashcommand = bashcommand.replace("\"", "\\\""); - bashcommand = TQString("/bin/bash -c \"%1\" 2>&1").arg(bashcommand); + bashcommand = TQString("/bin/bash -c \"%1\" 2>&1").tqarg(bashcommand); FILE* pipe = popen(bashcommand.ascii(), "r"); if (!pipe) return "ERROR"; char buffer[128]; @@ -82,7 +82,7 @@ TQString KRandrSimpleAPI::getIccFileName(TQString profileName, TQString screenNa TQString retval; if (profileName != NULL) { - t_config = new KSimpleConfig( TQString::fromLatin1( "kiccconfigrc" )); + t_config = new KSimpleConfig( TQString::tqfromLatin1( "kiccconfigrc" )); } else { t_systemconfig = new KSimpleConfig( kde_confdir + TQString("/kicc/kiccconfigrc") ); @@ -268,7 +268,7 @@ TQString KRandrSimpleAPI::applyIccConfiguration(TQString profileName, TQString k int screenNumber = 0; TQString errorstr = ""; - t_config = new KSimpleConfig( TQString::fromLatin1( "kiccconfigrc" )); + t_config = new KSimpleConfig( TQString::tqfromLatin1( "kiccconfigrc" )); // Find all screens if (isValid() == true) { @@ -372,7 +372,7 @@ TQString KRandrSimpleAPI::getCurrentProfile () { TQString profileName; KSimpleConfig *t_config; - t_config = new KSimpleConfig( TQString::fromLatin1( "kiccconfigrc" )); + t_config = new KSimpleConfig( TQString::tqfromLatin1( "kiccconfigrc" )); profileName = t_config->readEntry("CurrentProfile"); delete t_config; return profileName; @@ -1071,11 +1071,11 @@ TQPtrList<SingleScreenData> KRandrSimpleAPI::readCurrentDisplayConfiguration() { if (cur_screen) { screendata->screen_connected = true; for (int j = 0; j < cur_screen->numSizes(); j++) { - screendata->resolutions.append(i18n("%1 x %2").arg(cur_screen->pixelSize(j).width()).arg(cur_screen->pixelSize(j).height())); + screendata->resolutions.append(i18n("%1 x %2").tqarg(cur_screen->pixelSize(j).width()).tqarg(cur_screen->pixelSize(j).height())); } screendata->current_resolution_index = 0; if (current_crtc) { - screendata->current_resolution_index = screendata->resolutions.findIndex(i18n("%1 x %2").arg(current_crtc->info->width).arg(current_crtc->info->height)); + screendata->current_resolution_index = screendata->resolutions.findIndex(i18n("%1 x %2").tqarg(current_crtc->info->width).tqarg(current_crtc->info->height)); } if (screendata->current_resolution_index < 0) { screendata->current_resolution_index = cur_screen->proposedSize(); diff --git a/krandr/randr.cpp b/krandr/randr.cpp index bd57fdc9f..85f360f52 100644 --- a/krandr/randr.cpp +++ b/krandr/randr.cpp @@ -691,7 +691,7 @@ const TQString& RandRDisplay::version() const void RandRDisplay::setCurrentScreen(int index) { m_currentScreenIndex = index; - m_currentScreen = m_screens.at(m_currentScreenIndex); + m_currentScreen = m_screens.tqat(m_currentScreenIndex); Q_ASSERT(m_currentScreen); } @@ -719,7 +719,7 @@ int RandRDisplay::numScreens() const RandRScreen* RandRDisplay::screen(int index) { - return m_screens.at(index); + return m_screens.tqat(index); } RandRScreen* RandRDisplay::currentScreen() |