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

This reverts commit f97c8a56e217f04e08776ccf8021721b7d919b7d.

1 files changed, 13 insertions, 13 deletions

diff --git a/src/kmplayerview.cpp b/src/kmplayerview.cpp
index 5e1ede7..dd1e1f4 100644
--- a/src/kmplayerview.cpp
+++ b/src/kmplayerview.cpp
@@ -25,9 +25,9 @@
 #include <tqtimer.h>
 #include <tqpainter.h>
 #include <tqmetaobject.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqpixmap.h>
-#include <textedit.h>
+#include <tqtextedit.h>
 #include <tqtooltip.h>
 #include <tqapplication.h>
 #include <tqiconset.h>
@@ -38,7 +38,7 @@
 #include <tqdatastream.h>
 #include <tqwidgetstack.h>
 #include <tqcursor.h>
-#include <clipboard.h>
+#include <tqclipboard.h>
 
 #include <kiconloader.h>
 #include <kstatusbar.h>
@@ -68,7 +68,7 @@ static const int XKeyPress = KeyPress;
 #undef KeyPress
 #undef Always
 #undef Never
-#undef Status
+#undef tqStatus
 #undef Unsorted
 #undef Bool
 
@@ -190,10 +190,10 @@ KDE_NO_EXPORT void View::init (KActionCollection * action_collection) {
     viewbox->addWidget (m_dockarea);
     m_widgetstack = new TQWidgetStack (m_view_area);
     m_control_panel = new ControlPanel (m_view_area, this);
-    m_control_panel->setMaximumSize (2500, controlPanel ()->maximumSize ().height ());
+    m_control_panel->setMaximumSize (2500, controlPanel ()->tqmaximumSize ().height ());
     m_status_bar = new StatusBar (m_view_area);
     m_status_bar->insertItem (TQString (""), 0);
-    TQSize sbsize = m_status_bar->sizeHint ();
+    TQSize sbsize = m_status_bar->tqsizeHint ();
     m_status_bar->hide ();
     m_status_bar->setMaximumSize (2500, sbsize.height ());
     m_viewer = new Viewer (m_widgetstack, this);
@@ -267,9 +267,9 @@ void View::toggleShowPlaylist () {
         else {
             bool horz = true;
             TQStyle & style = m_playlist->tqstyle ();
-            int h = style.pixelMetric (TQStyle::PM_ScrollBarExtent, m_playlist);
-            h += style.pixelMetric(TQStyle::PM_DockWindowFrameWidth, m_playlist);
-            h +=style.pixelMetric(TQStyle::PM_DockWindowHandleExtent,m_playlist);
+            int h = style.tqpixelMetric (TQStyle::PM_ScrollBarExtent, m_playlist);
+            h += style.tqpixelMetric(TQStyle::PM_DockWindowFrameWidth, m_playlist);
+            h +=style.tqpixelMetric(TQStyle::PM_DockWindowHandleExtent,m_playlist);
             for (TQListViewItem *i=m_playlist->firstChild();i;i=i->itemBelow()) {
                 h += i->height ();
                 if (h > int (0.25 * height ())) {
@@ -482,7 +482,7 @@ KDE_NO_EXPORT void View::timerEvent (TQTimerEvent * e) {
                 m_widgetstack->visibleWidget () == m_widgettypes[WT_Picture]) {
             int vert_buttons_pos = m_view_area->height()-statusBarHeight ();
             TQPoint mouse_pos = m_view_area->mapFromGlobal (TQCursor::pos ());
-            int cp_height = m_control_panel->maximumSize ().height ();
+            int cp_height = m_control_panel->tqmaximumSize ().height ();
             bool mouse_on_buttons = (//m_view_area->hasMouse () && 
                     mouse_pos.y () >= vert_buttons_pos-cp_height &&
                     mouse_pos.y ()<= vert_buttons_pos &&
@@ -632,7 +632,7 @@ KDE_NO_EXPORT int View::statusBarHeight () const {
         if (statusBarMode () == SB_Only)
             return height ();
         else 
-            return statusBar()->maximumSize ().height ();
+            return statusBar()->tqmaximumSize ().height ();
     }
     return 0;
 }
@@ -665,7 +665,7 @@ bool View::x11Event (XEvent * e) {
             if (e->xmotion.window == m_viewer->embeddedWinId ())
                 delayedShowButtons (e->xmotion.y > m_view_area->height () -
                         statusBarHeight () -
-                        m_control_panel->maximumSize ().height ());
+                        m_control_panel->tqmaximumSize ().height ());
             m_view_area->mouseMoved ();
             break;
         case MapNotify:
@@ -749,7 +749,7 @@ KDE_NO_EXPORT void Viewer::windowChanged (WId w) {
 
 KDE_NO_EXPORT void Viewer::mouseMoveEvent (TQMouseEvent * e) {
     if (e->state () == Qt::NoButton) {
-        int cp_height = m_view->controlPanel ()->maximumSize ().height ();
+        int cp_height = m_view->controlPanel ()->tqmaximumSize ().height ();
         m_view->delayedShowButtons (e->y () > height () - cp_height);
     }
     m_view->viewArea ()->mouseMoved ();