Revert "Rename a number of old tq methods that are no longer tq specific"

This reverts commit f97c8a56e217f04e08776ccf8021721b7d919b7d.

1 files changed, 8 insertions, 8 deletions

diff --git a/src/kmplayerprocess.cpp b/src/kmplayerprocess.cpp
index 79250fc..f36a410 100644
--- a/src/kmplayerprocess.cpp
+++ b/src/kmplayerprocess.cpp
@@ -23,7 +23,7 @@
 #include <tqfile.h>
 #include <tqfileinfo.h>
 #include <tqtimer.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqtable.h>
 #include <tqlineedit.h>
 #include <tqslider.h>
@@ -101,7 +101,7 @@ void Process::initProcess (Viewer * viewer) {
     delete m_process;
     m_process = new KProcess;
     m_process->setUseShell (true);
-    m_process->setEnvironment (TQString::fromLatin1 ("SESSION_MANAGER"), TQString::fromLatin1 (""));
+    m_process->setEnvironment (TQString::tqfromLatin1 ("SESSION_MANAGER"), TQString::tqfromLatin1 (""));
     if (m_source) m_source->setPosition (0);
 }
 
@@ -548,7 +548,7 @@ bool MPlayer::run (const char * args, const char * pipe) {
         fprintf (stderr, " -vo %s", strVideoDriver.lower().ascii());
         *m_process << " -vo " << strVideoDriver.lower();
         if (viewer ()->view ()->keepSizeRatio () &&
-                strVideoDriver.lower() == TQString::fromLatin1 ("x11")) {
+                strVideoDriver.lower() == TQString::tqfromLatin1 ("x11")) {
             fprintf (stderr, " -zoom");
             *m_process << " -zoom";
         }
@@ -894,7 +894,7 @@ public:
 
 KDE_NO_CDTOR_EXPORT MPlayerPreferencesFrame::MPlayerPreferencesFrame (TQWidget * parent)
  : TQFrame (parent) {
-    TQVBoxLayout * layout = new TQVBoxLayout (this);
+    TQVBoxLayout * tqlayout = new TQVBoxLayout (this);
     table = new TQTable (int (MPlayerPreferencesPage::pat_last)+non_patterns, 2, this);
     table->verticalHeader ()->hide ();
     table->setLeftMargin (0);
@@ -919,7 +919,7 @@ KDE_NO_CDTOR_EXPORT MPlayerPreferencesFrame::MPlayerPreferencesFrame (TQWidget *
     }
     table->setColumnWidth (0, first_column_width);
     table->setColumnStretchable (1, true);
-    layout->addWidget (table);
+    tqlayout->addWidget (table);
 }
 
 KDE_NO_CDTOR_EXPORT MPlayerPreferencesPage::MPlayerPreferencesPage (MPlayer * p)
@@ -1572,9 +1572,9 @@ private:
 KDE_NO_CDTOR_EXPORT XMLPreferencesFrame::XMLPreferencesFrame
 (TQWidget * parent, CallbackProcess * p)
  : TQFrame (parent), m_process (p){
-    TQVBoxLayout * layout = new TQVBoxLayout (this);
+    TQVBoxLayout * tqlayout = new TQVBoxLayout (this);
     table = new TQTable (this);
-    layout->addWidget (table);
+    tqlayout->addWidget (table);
 }
 
 KDE_NO_CDTOR_EXPORT XMLPreferencesPage::XMLPreferencesPage (CallbackProcess * p)
@@ -2488,7 +2488,7 @@ KDE_NO_EXPORT void NpPlayer::processStreams () {
             char *mt = strdup (stream->mimetype.isEmpty ()
                     ? ""
                     : stream->mimetype.utf8 ().data ());
-            TQString objpath=TQString("/plugin/stream_%1").arg(stream->stream_id);
+            TQString objpath=TQString("/plugin/stream_%1").tqarg(stream->stream_id);
             DBusMessage *msg = dbus_message_new_method_call (
                     remote_service.ascii(),
                     objpath.ascii (),