TQt4 port kmplayer

This enables compilation under both Qt3 and Qt4


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kmplayer@1238840 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 103 insertions, 103 deletions

diff --git a/src/kmplayerview.cpp b/src/kmplayerview.cpp
index d55be16..15cb8fa 100644
--- a/src/kmplayerview.cpp
+++ b/src/kmplayerview.cpp
@@ -20,25 +20,25 @@
 #include <math.h>
 
 #include <config.h>
-// include files for Qt
-#include <qstyle.h>
-#include <qtimer.h>
-#include <qpainter.h>
-#include <qmetaobject.h>
-#include <qlayout.h>
-#include <qpixmap.h>
-#include <qtextedit.h>
-#include <qtooltip.h>
-#include <qapplication.h>
-#include <qiconset.h>
-#include <qcursor.h>
-#include <qkeysequence.h>
-#include <qslider.h>
-#include <qlabel.h>
-#include <qdatastream.h>
-#include <qwidgetstack.h>
-#include <qcursor.h>
-#include <qclipboard.h>
+// include files for TQt
+#include <tqstyle.h>
+#include <tqtimer.h>
+#include <tqpainter.h>
+#include <tqmetaobject.h>
+#include <tqlayout.h>
+#include <tqpixmap.h>
+#include <tqtextedit.h>
+#include <tqtooltip.h>
+#include <tqapplication.h>
+#include <tqiconset.h>
+#include <tqcursor.h>
+#include <tqkeysequence.h>
+#include <tqslider.h>
+#include <tqlabel.h>
+#include <tqdatastream.h>
+#include <tqwidgetstack.h>
+#include <tqcursor.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
 
@@ -85,49 +85,49 @@ using namespace KMPlayer;
 
 namespace KMPlayer {
 
-class KMPlayerPictureWidget : public QWidget {
+class KMPlayerPictureWidget : public TQWidget {
     View * m_view;
 public:
-    KDE_NO_CDTOR_EXPORT KMPlayerPictureWidget (QWidget * parent, View * view)
-        : QWidget (parent), m_view (view) {}
+    KDE_NO_CDTOR_EXPORT KMPlayerPictureWidget (TQWidget * tqparent, View * view)
+        : TQWidget (tqparent), m_view (view) {}
     KDE_NO_CDTOR_EXPORT ~KMPlayerPictureWidget () {}
 protected:
-    void mousePressEvent (QMouseEvent *);
+    void mousePressEvent (TQMouseEvent *);
 };
 
 } // namespace
 
-KDE_NO_EXPORT void KMPlayerPictureWidget::mousePressEvent (QMouseEvent *) {
+KDE_NO_EXPORT void KMPlayerPictureWidget::mousePressEvent (TQMouseEvent *) {
     m_view->emitPictureClicked ();
 }
 
 //-----------------------------------------------------------------------------
 
-KDE_NO_CDTOR_EXPORT TextEdit::TextEdit (QWidget * parent, View * view) : QTextEdit (parent, "kde_kmplayer_console"), m_view (view) {
+KDE_NO_CDTOR_EXPORT TextEdit::TextEdit (TQWidget * tqparent, View * view) : TQTextEdit (tqparent, "kde_kmplayer_console"), m_view (view) {
     setReadOnly (true);
-    setPaper (QBrush (QColor (0, 0, 0)));
-    setColor (QColor (0xB2, 0xB2, 0xB2));
+    setPaper (TQBrush (TQColor (0, 0, 0)));
+    setColor (TQColor (0xB2, 0xB2, 0xB2));
 }
 
-KDE_NO_EXPORT void TextEdit::contextMenuEvent (QContextMenuEvent * e) {
+KDE_NO_EXPORT void TextEdit::contextMenuEvent (TQContextMenuEvent * e) {
     m_view->controlPanel ()->popupMenu ()->exec (e->globalPos ());
 }
 
 //-----------------------------------------------------------------------------
 
-KDE_NO_CDTOR_EXPORT InfoWindow::InfoWindow (QWidget * parent, View * view) : QTextEdit (parent, "kde_kmplayer_console"), m_view (view) {
+KDE_NO_CDTOR_EXPORT InfoWindow::InfoWindow (TQWidget * tqparent, View * view) : TQTextEdit (tqparent, "kde_kmplayer_console"), m_view (view) {
     setReadOnly (true);
     setLinkUnderline (false);
 }
 
-KDE_NO_EXPORT void InfoWindow::contextMenuEvent (QContextMenuEvent * e) {
+KDE_NO_EXPORT void InfoWindow::contextMenuEvent (TQContextMenuEvent * e) {
     m_view->controlPanel ()->popupMenu ()->exec (e->globalPos ());
 }
 
 //-----------------------------------------------------------------------------
 
-KDE_NO_CDTOR_EXPORT View::View (QWidget *parent, const char *name)
-  : KMediaPlayer::View (parent, name),
+KDE_NO_CDTOR_EXPORT View::View (TQWidget *tqparent, const char *name)
+  : KMediaPlayer::View (tqparent, name),
     m_image (0L),
     m_control_panel (0L),
     m_status_bar (0L),
@@ -148,13 +148,13 @@ KDE_NO_CDTOR_EXPORT View::View (QWidget *parent, const char *name)
     m_edit_mode (false)
 {}
 
-KDE_NO_EXPORT void View::dropEvent (QDropEvent * de) {
+KDE_NO_EXPORT void View::dropEvent (TQDropEvent * de) {
     KURL::List sl;
     if (KURLDrag::canDecode (de)) {
         KURLDrag::decode (de, sl);
-    } else if (QTextDrag::canDecode (de)) {
-        QString text;
-        QTextDrag::decode (de, text);
+    } else if (TQTextDrag::canDecode (de)) {
+        TQString text;
+        TQTextDrag::decode (de, text);
         sl.push_back (KURL (text));
     }
     if (sl.size () > 0) {
@@ -166,34 +166,34 @@ KDE_NO_EXPORT void View::dropEvent (QDropEvent * de) {
     }
 }
 
-KDE_NO_EXPORT void View::dragEnterEvent (QDragEnterEvent* dee) {
+KDE_NO_EXPORT void View::dragEnterEvent (TQDragEnterEvent* dee) {
     if (isDragValid (dee))
         dee->accept ();
 }
 
 KDE_NO_EXPORT void View::init (KActionCollection * action_collection) {
-    setBackgroundMode(Qt::NoBackground); // prevents flashing
-    //m_dockarea->setEraseColor (QColor (0, 0, 0));
-    QPalette pal (QColor (64, 64,64), QColor (32, 32, 32));
-    QVBoxLayout * viewbox = new QVBoxLayout (this, 0, 0);
+    setBackgroundMode(TQt::NoBackground); // prevents flashing
+    //m_dockarea->setEraseColor (TQColor (0, 0, 0));
+    TQPalette pal (TQColor (64, 64,64), TQColor (32, 32, 32));
+    TQVBoxLayout * viewbox = new TQVBoxLayout (this, 0, 0);
     m_dockarea = new KDockArea (this, "kde_kmplayer_dock_area");
-    m_dock_video = new KDockWidget (m_dockarea->manager (), 0, KGlobal::iconLoader ()->loadIcon (QString ("kmplayer"), KIcon::Small), m_dockarea);
-    m_dock_video->setEraseColor (QColor (0, 0, 255));
+    m_dock_video = new KDockWidget (m_dockarea->manager (), 0, KGlobal::iconLoader ()->loadIcon (TQString ("kmplayer"), KIcon::Small), m_dockarea);
+    m_dock_video->setEraseColor (TQColor (0, 0, 255));
     m_dock_video->setDockSite (KDockWidget::DockLeft | KDockWidget::DockBottom | KDockWidget::DockRight | KDockWidget::DockTop);
     m_dock_video->setEnableDocking(KDockWidget::DockNone);
     m_view_area = new ViewArea (m_dock_video, this);
     m_dock_video->setWidget (m_view_area);
     m_dockarea->setMainDockWidget (m_dock_video);
-    m_dock_playlist = m_dockarea->createDockWidget (i18n ("Play List"), KGlobal::iconLoader ()->loadIcon (QString ("player_playlist"), KIcon::Small));
+    m_dock_playlist = m_dockarea->createDockWidget (i18n ("Play List"), KGlobal::iconLoader ()->loadIcon (TQString ("player_playlist"), KIcon::Small));
     m_playlist = new PlayListView (m_dock_playlist, this, action_collection);
     m_dock_playlist->setWidget (m_playlist);
     viewbox->addWidget (m_dockarea);
-    m_widgetstack = new QWidgetStack (m_view_area);
+    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 (QString (""), 0);
-    QSize sbsize = m_status_bar->sizeHint ();
+    m_status_bar->insertItem (TQString (""), 0);
+    TQSize sbsize = m_status_bar->tqsizeHint ();
     m_status_bar->hide ();
     m_status_bar->setMaximumSize (2500, sbsize.height ());
     m_viewer = new Viewer (m_widgetstack, this);
@@ -203,14 +203,14 @@ KDE_NO_EXPORT void View::init (KActionCollection * action_collection) {
 #endif
 
     m_multiedit = new TextEdit (m_widgetstack, this);
-    m_multiedit->setTextFormat (Qt::PlainText);
-    QFont fnt = KGlobalSettings::fixedFont ();
+    m_multiedit->setTextFormat (TQt::PlainText);
+    TQFont fnt = KGlobalSettings::fixedFont ();
     m_multiedit->setFont (fnt);
     m_widgettypes[WT_Console] = m_multiedit;
 
     m_widgettypes[WT_Picture] = new KMPlayerPictureWidget (m_widgetstack, this);
 
-    m_dock_infopanel = m_dockarea->createDockWidget ("infopanel", KGlobal::iconLoader ()->loadIcon (QString ("info"), KIcon::Small));
+    m_dock_infopanel = m_dockarea->createDockWidget ("infopanel", KGlobal::iconLoader ()->loadIcon (TQString ("info"), KIcon::Small));
     m_infopanel = new InfoWindow (m_dock_infopanel, this);
     m_dock_infopanel->setWidget (m_infopanel);
 
@@ -218,7 +218,7 @@ KDE_NO_EXPORT void View::init (KActionCollection * action_collection) {
     m_widgetstack->addWidget (m_multiedit);
     m_widgetstack->addWidget (m_widgettypes[WT_Picture]);
 
-    setFocusPolicy (QWidget::ClickFocus);
+    setFocusPolicy (TQ_ClickFocus);
 
     setAcceptDrops (true);
     m_view_area->resizeEvent (0L);
@@ -228,11 +228,11 @@ KDE_NO_EXPORT void View::init (KActionCollection * action_collection) {
 
 KDE_NO_CDTOR_EXPORT View::~View () {
     delete m_image;
-    if (m_view_area->parent () != this)
+    if (TQT_BASE_OBJECT(m_view_area->tqparent ()) != TQT_BASE_OBJECT(this))
         delete m_view_area;
 }
 
-KDE_NO_EXPORT void View::setEraseColor (const QColor & color) {
+KDE_NO_EXPORT void View::setEraseColor (const TQColor & color) {
     KMediaPlayer::View::setEraseColor (color);
     if (statusBar ()) {
         statusBar ()->setEraseColor (color);
@@ -240,7 +240,7 @@ KDE_NO_EXPORT void View::setEraseColor (const QColor & color) {
     }
 }
 
-void View::setInfoMessage (const QString & msg) {
+void View::setInfoMessage (const TQString & msg) {
     bool ismain = m_dockarea->getMainDockWidget () == m_dock_infopanel;
     if (msg.isEmpty ()) {
         if (!ismain && !m_edit_mode && !infopanel_timer)
@@ -253,7 +253,7 @@ void View::setInfoMessage (const QString & msg) {
     }
 }
 
-void View::setStatusMessage (const QString & msg) {
+void View::setStatusMessage (const TQString & msg) {
     if (m_statusbar_mode != SB_Hide)
         m_status_bar->changeItem (msg, 0);
 }
@@ -266,11 +266,11 @@ void View::toggleShowPlaylist () {
             m_dock_playlist->dockBack ();
         else {
             bool horz = true;
-            QStyle & style = m_playlist->style ();
-            int h = style.pixelMetric (QStyle::PM_ScrollBarExtent, m_playlist);
-            h += style.pixelMetric(QStyle::PM_DockWindowFrameWidth, m_playlist);
-            h +=style.pixelMetric(QStyle::PM_DockWindowHandleExtent,m_playlist);
-            for (QListViewItem *i=m_playlist->firstChild();i;i=i->itemBelow()) {
+            TQStyle & style = m_playlist->tqstyle ();
+            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 ())) {
                     horz = false;
@@ -314,18 +314,18 @@ void View::setPlaylistOnly () {
 void View::setEditMode (RootPlayListItem *ri, bool enable) {
     m_edit_mode = enable;
     m_infopanel->setReadOnly (!m_edit_mode);
-    m_infopanel->setTextFormat (enable ? Qt::PlainText : Qt::AutoText);
+    m_infopanel->setTextFormat (enable ? TQt::PlainText : TQt::AutoText);
     if (m_edit_mode && m_dock_infopanel->mayBeShow ())
         m_dock_infopanel->manualDock(m_dock_video,KDockWidget::DockBottom,50);
     m_playlist->showAllNodes (ri, m_edit_mode);
 }
 
-bool View::setPicture (const QString & path) {
+bool View::setPicture (const TQString & path) {
     delete m_image;
     if (path.isEmpty ())
         m_image = 0L;
     else {
-        m_image = new QPixmap (path);
+        m_image = new TQPixmap (path);
         if (m_image->isNull ()) {
             delete m_image;
             m_image = 0L;
@@ -345,8 +345,8 @@ bool View::setPicture (const QString & path) {
 KDE_NO_EXPORT void View::updateVolume () {
     if (m_mixer_init && !m_volume_slider)
         return;
-    QByteArray data, replydata;
-    QCString replyType;
+    TQByteArray data, replydata;
+    TQCString replyType;
     int volume;
     bool has_mixer = kapp->dcopClient ()->call (m_mixer_object, "Mixer0",
             "masterVolume()", data, replyType, replydata);
@@ -356,13 +356,13 @@ KDE_NO_EXPORT void View::updateVolume () {
                 "masterVolume()", data, replyType, replydata);
     }
     if (has_mixer) {
-        QDataStream replystream (replydata, IO_ReadOnly);
+        TQDataStream replystream (replydata, IO_ReadOnly);
         replystream >> volume;
         if (!m_mixer_init) {
-            QLabel * mixer_label = new QLabel (i18n ("Volume:"), m_control_panel->popupMenu ());
+            TQLabel * mixer_label = new TQLabel (i18n ("Volume:"), m_control_panel->popupMenu ());
             m_control_panel->popupMenu ()->insertItem (mixer_label, -1, 4);
-            m_volume_slider = new QSlider (0, 100, 10, volume, Qt::Horizontal, m_control_panel->popupMenu ());
-            connect(m_volume_slider, SIGNAL(valueChanged(int)), this,SLOT(setVolume(int)));
+            m_volume_slider = new TQSlider (0, 100, 10, volume, Qt::Horizontal, m_control_panel->popupMenu ());
+            connect(m_volume_slider, TQT_SIGNAL(valueChanged(int)), this,TQT_SLOT(setVolume(int)));
             m_control_panel->popupMenu ()->insertItem (m_volume_slider, ControlPanel::menu_volume, 5);
             m_control_panel->popupMenu ()->insertSeparator (6);
         } else {
@@ -382,7 +382,7 @@ KDE_NO_EXPORT void View::updateVolume () {
 void View::showWidget (WidgetType wt) {
     m_widgetstack->raiseWidget (m_widgettypes [wt]);
     if (m_widgetstack->visibleWidget () == m_widgettypes[WT_Console]) {
-        addText (QString (""), false);
+        addText (TQString (""), false);
         if (m_controlpanel_mode == CP_AutoHide && m_playing)
             m_control_panel->show();
     } else
@@ -394,9 +394,9 @@ void View::toggleVideoConsoleWindow () {
     WidgetType wt = WT_Console;
     if (m_widgetstack->visibleWidget () == m_widgettypes[WT_Console]) {
         wt = WT_Video;
-        m_control_panel->popupMenu ()->changeItem (ControlPanel::menu_video, KGlobal::iconLoader ()->loadIconSet (QString ("konsole"), KIcon::Small, 0, true), i18n ("Con&sole"));
+        m_control_panel->popupMenu ()->changeItem (ControlPanel::menu_video, KGlobal::iconLoader ()->loadIconSet (TQString ("konsole"), KIcon::Small, 0, true), i18n ("Con&sole"));
     } else
-        m_control_panel->popupMenu ()->changeItem (ControlPanel::menu_video, KGlobal::iconLoader ()->loadIconSet (QString ("video"), KIcon::Small, 0, true), i18n ("V&ideo"));
+        m_control_panel->popupMenu ()->changeItem (ControlPanel::menu_video, KGlobal::iconLoader ()->loadIconSet (TQString ("video"), KIcon::Small, 0, true), i18n ("V&ideo"));
     showWidget (wt);
     emit windowVideoConsoleToggled (int (wt));
 }
@@ -454,8 +454,8 @@ KDE_NO_EXPORT void View::delayedShowButtons (bool show) {
 
 KDE_NO_EXPORT void View::setVolume (int vol) {
     if (m_inVolumeUpdate) return;
-    QByteArray data;
-    QDataStream arg( data, IO_WriteOnly );
+    TQByteArray data;
+    TQDataStream arg( data, IO_WriteOnly );
     arg << vol;
     if (!kapp->dcopClient()->send (m_mixer_object, "Mixer0", "setMasterVolume(int)", data))
         kdWarning() << "Failed to update volume" << endl;
@@ -475,14 +475,14 @@ void View::setKeepSizeRatio (bool b) {
     }
 }
 
-KDE_NO_EXPORT void View::timerEvent (QTimerEvent * e) {
+KDE_NO_EXPORT void View::timerEvent (TQTimerEvent * e) {
     if (e->timerId () == controlbar_timer) {
         controlbar_timer = 0;
         if (m_playing ||
                 m_widgetstack->visibleWidget () == m_widgettypes[WT_Picture]) {
             int vert_buttons_pos = m_view_area->height()-statusBarHeight ();
-            QPoint mouse_pos = m_view_area->mapFromGlobal (QCursor::pos ());
-            int cp_height = m_control_panel->maximumSize ().height ();
+            TQPoint mouse_pos = m_view_area->mapFromGlobal (TQCursor::pos ());
+            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 &&
@@ -504,9 +504,9 @@ KDE_NO_EXPORT void View::timerEvent (QTimerEvent * e) {
     killTimer (e->timerId ());
 }
 
-void View::addText (const QString & str, bool eol) {
+void View::addText (const TQString & str, bool eol) {
     if (m_tmplog_needs_eol)
-        tmplog += QChar ('\n');
+        tmplog += TQChar ('\n');
     tmplog += str;
     m_tmplog_needs_eol = eol;
     if (m_widgetstack->visibleWidget () != m_widgettypes[WT_Console] &&
@@ -517,7 +517,7 @@ void View::addText (const QString & str, bool eol) {
         tmplog.truncate (0);
         m_tmplog_needs_eol = false;
     } else {
-        int pos = tmplog.findRev (QChar ('\n'));
+        int pos = tmplog.tqfindRev (TQChar ('\n'));
         if (pos >= 0) {
             m_multiedit->append (tmplog.left (pos));
             tmplog = tmplog.mid (pos+1);
@@ -531,9 +531,9 @@ void View::addText (const QString & str, bool eol) {
     m_multiedit->setCursorPosition (m_multiedit->paragraphs () - 1, 0);
 }
 
-/* void View::print (QPrinter *pPrinter)
+/* void View::print (TQPrinter *pPrinter)
 {
-    QPainter printpainter;
+    TQPainter printpainter;
     printpainter.begin (pPrinter);
 
     // TODO: add your printing code here
@@ -581,7 +581,7 @@ KDE_NO_EXPORT void View::playingStop () {
     m_view_area->resizeEvent (0L);
 }
 
-KDE_NO_EXPORT void View::leaveEvent (QEvent *) {
+KDE_NO_EXPORT void View::leaveEvent (TQEvent *) {
     delayedShowButtons (false);
 }
 
@@ -600,16 +600,16 @@ bool View::isFullScreen () const {
 void View::fullScreen () {
     if (!m_view_area->isFullScreen()) {
         m_sreensaver_disabled = false;
-        QByteArray data, replydata;
-        QCString replyType;
+        TQByteArray data, replydata;
+        TQCString replyType;
         if (kapp->dcopClient ()->call ("kdesktop", "KScreensaverIface",
                     "isEnabled()", data, replyType, replydata)) {
             bool enabled;
-            QDataStream replystream (replydata, IO_ReadOnly);
+            TQDataStream replystream (replydata, IO_ReadOnly);
             replystream >> enabled;
             if (enabled)
                 m_sreensaver_disabled = kapp->dcopClient()->send
-                    ("kdesktop", "KScreensaverIface", "enable(bool)", "false");
+                    ("kdesktop", "KScreensaverIface", "enable(bool)", TQString("false"));
         }
         //if (m_keepsizeratio && m_viewer->aspect () < 0.01)
         //    m_viewer->setAspect (1.0 * m_viewer->width() / m_viewer->height());
@@ -619,7 +619,7 @@ void View::fullScreen () {
     } else {
         if (m_sreensaver_disabled)
             m_sreensaver_disabled = !kapp->dcopClient()->send
-                ("kdesktop", "KScreensaverIface", "enable(bool)", "true");
+                ("kdesktop", "KScreensaverIface", "enable(bool)", TQString("true"));
         m_view_area->fullScreen();
         m_control_panel->popupMenu ()->setItemVisible (ControlPanel::menu_zoom, true);
     }
@@ -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,13 +665,13 @@ 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:
             if (e->xmap.event == m_viewer->embeddedWinId ()) {
                 show ();
-                QTimer::singleShot (10, m_viewer, SLOT (sendConfigureEvent ()));
+                TQTimer::singleShot (10, m_viewer, TQT_SLOT (sendConfigureEvent ()));
             }
             break;
         /*case ConfigureNotify:
@@ -685,8 +685,8 @@ bool View::x11Event (XEvent * e) {
 
 //----------------------------------------------------------------------
 
-KDE_NO_CDTOR_EXPORT Viewer::Viewer (QWidget *parent, View * view)
-  : QXEmbed (parent), m_plain_window (0), m_bgcolor (0), m_aspect (0.0),
+KDE_NO_CDTOR_EXPORT Viewer::Viewer (TQWidget *tqparent, View * view)
+  : QXEmbed (tqparent), m_plain_window (0), m_bgcolor (0), m_aspect (0.0),
     m_view (view) {
     /*XWindowAttributes xwa;
     XGetWindowAttributes (qt_xdisplay(), winId (), &xwa);
@@ -694,7 +694,7 @@ KDE_NO_CDTOR_EXPORT Viewer::Viewer (QWidget *parent, View * view)
     xswa.background_pixel = 0;
     xswa.border_pixel = 0;
     xswa.colormap = xwa.colormap;
-    create (XCreateWindow (qt_xdisplay (), parent->winId (), 0, 0, 10, 10, 0, 
+    create (XCreateWindow (qt_xdisplay (), tqparent->winId (), 0, 0, 10, 10, 0, 
                            x11Depth (), InputOutput, (Visual*)x11Visual (),
                            CWBackPixel | CWBorderPixel | CWColormap, &xswa));*/
     setAcceptDrops (true);
@@ -747,9 +747,9 @@ KDE_NO_EXPORT void Viewer::windowChanged (WId w) {
                 PointerMotionMask);
 }
 
-KDE_NO_EXPORT void Viewer::mouseMoveEvent (QMouseEvent * e) {
+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 ();
@@ -765,11 +765,11 @@ KDE_NO_EXPORT int Viewer::heightForWidth (int w) const {
     return int (w/m_aspect); 
 }
 
-KDE_NO_EXPORT void Viewer::dropEvent (QDropEvent * de) {
+KDE_NO_EXPORT void Viewer::dropEvent (TQDropEvent * de) {
     m_view->dropEvent (de);
 }
 
-KDE_NO_EXPORT void Viewer::dragEnterEvent (QDragEnterEvent* dee) {
+KDE_NO_EXPORT void Viewer::dragEnterEvent (TQDragEnterEvent* dee) {
     m_view->dragEnterEvent (dee);
 }
 /*
@@ -804,11 +804,11 @@ KDE_NO_EXPORT void Viewer::sendConfigureEvent () {
     }
 }
 
-KDE_NO_EXPORT void Viewer::contextMenuEvent (QContextMenuEvent * e) {
+KDE_NO_EXPORT void Viewer::contextMenuEvent (TQContextMenuEvent * e) {
     m_view->controlPanel ()->popupMenu ()->exec (e->globalPos ());
 }
 
-KDE_NO_EXPORT void Viewer::setBackgroundColor (const QColor & c) {
+KDE_NO_EXPORT void Viewer::setBackgroundColor (const TQColor & c) {
     if (m_bgcolor != c.rgb ()) {
         m_bgcolor = c.rgb ();
         setCurrentBackgroundColor (c);
@@ -819,7 +819,7 @@ KDE_NO_EXPORT void Viewer::resetBackgroundColor () {
     setCurrentBackgroundColor (m_bgcolor);
 }
 
-KDE_NO_EXPORT void Viewer::setCurrentBackgroundColor (const QColor & c) {
+KDE_NO_EXPORT void Viewer::setCurrentBackgroundColor (const TQColor & c) {
     setPaletteBackgroundColor (c);
     WId w = embeddedWinId ();
     if (w) {