Enable compilation with TQt for Qt4 3.4.0 TP2

This should not break compatibility with TQt for Qt3; if it does please fix it ASAP!


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

2 files changed, 8 insertions, 8 deletions

diff --git a/kicker/extensions/taskbar/taskbarextension.cpp b/kicker/extensions/taskbar/taskbarextension.cpp
index e0deb768e..56e6ea3ce 100644
--- a/kicker/extensions/taskbar/taskbarextension.cpp
+++ b/kicker/extensions/taskbar/taskbarextension.cpp
@@ -101,7 +101,7 @@ void TaskBarExtension::positionChange( Position p )
         m_container->popupDirectionChange(KPanelApplet::Right);
         break;
     case Floating:
-        if (orientation() == Horizontal)
+        if (orientation() == Qt::Horizontal)
         {
             m_container->popupDirectionChange(KPanelApplet::Down);
         }
@@ -123,17 +123,17 @@ void TaskBarExtension::preferences()
     m_container->preferences();
 }
 
-TQSize TaskBarExtension::sizeHint(Position p, TQSize maxSize) const
+TQSize TaskBarExtension::tqsizeHint(Position p, TQSize maxSize) const
 {
     if (p == Left || p == Right)
         maxSize.setWidth(sizeInPixels());
     else
         maxSize.setHeight(sizeInPixels());
 
-//    kdDebug(1210) << "TaskBarExtension::sizeHint( Position, TQSize )" << endl;
+//    kdDebug(1210) << "TaskBarExtension::tqsizeHint( Position, TQSize )" << endl;
 //    kdDebug(1210) << " width: " << size.width() << endl;
 //    kdDebug(1210) << "height: " << size.height() << endl;
-    return m_container->sizeHint(p, maxSize);
+    return m_container->tqsizeHint(p, maxSize);
 }
 
 void TaskBarExtension::configure()
@@ -155,7 +155,7 @@ void TaskBarExtension::setBackgroundTheme()
         }
         else
         {
-            m_rootPixmap->repaint(true);
+            m_rootPixmap->tqrepaint(true);
         }
 
         double tint = double(KickerSettings::tintValue()) / 100;
@@ -185,7 +185,7 @@ void TaskBarExtension::setBackgroundTheme()
         {
             TQImage bgImage = m_bgImage;
 
-            if (orientation() == Vertical)
+            if (orientation() == Qt::Vertical)
             {
                 if (KickerSettings::rotateBackground())
                 {
@@ -213,7 +213,7 @@ void TaskBarExtension::setBackgroundTheme()
             {
                 KickerLib::colorize(bgImage);
             }
-            setPaletteBackgroundPixmap(bgImage);
+            setPaletteBackgroundPixmap(TQPixmap(bgImage));
         }
     }
     
diff --git a/kicker/extensions/taskbar/taskbarextension.h b/kicker/extensions/taskbar/taskbarextension.h
index 2848e80c7..92c065beb 100644
--- a/kicker/extensions/taskbar/taskbarextension.h
+++ b/kicker/extensions/taskbar/taskbarextension.h
@@ -49,7 +49,7 @@ public:
 		      int actions = 0, TQWidget *parent = 0, const char *name = 0 );
     ~TaskBarExtension();
 
-    TQSize sizeHint( Position, TQSize maxSize ) const;
+    TQSize tqsizeHint( Position, TQSize maxSize ) const;
     Position preferedPosition() const { return Bottom; }
 
 protected: