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

1 files changed, 4 insertions, 4 deletions

diff --git a/kicker/applets/menu/menuapplet.cpp b/kicker/applets/menu/menuapplet.cpp
index 472f3bd0d..662859bd5 100644
--- a/kicker/applets/menu/menuapplet.cpp
+++ b/kicker/applets/menu/menuapplet.cpp
@@ -48,7 +48,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  This is because TQMenuBar tries really hard to keep its preffered size,
  se even if the X window for the menubar has the size enforced by this
  applet, Qt thinks it has the size Qt wants. This results in parts
- of the menubar not being repainted. Also, old KMenuBar always forced
+ of the menubar not being tqrepainted. Also, old KMenuBar always forced
  with to be the width of the screen, so even if the menubar has only
  few entries, this applet will still indicate the menubar doesn't
  fit completely in it. There's no way to fix this, besides upgrading
@@ -266,7 +266,7 @@ void Applet::positionChange( Position )
 // Kicker's frame).
 void Applet::updateTopEdgeOffset()
     {
-    TQPoint p = topLevelWidget()->mapToGlobal( TQPoint( 0, 0 ));
+    TQPoint p = tqtopLevelWidget()->mapToGlobal( TQPoint( 0, 0 ));
     if( p.y() <= 2 ) // 2 = work also when running in appletproxy
         topEdgeOffset = mapToGlobal( TQPoint( 0, 0 )).y() - p.y();
     else
@@ -489,12 +489,12 @@ void MenuEmbed::setMinimumSize( int w, int h )
 
 void MenuEmbed::setBackground()
 {
-    const TQPixmap *pbg = parentWidget()->backgroundPixmap();
+    const TQPixmap *pbg = tqparentWidget()->backgroundPixmap();
     
     if (pbg)
     {
         TQPixmap bg(width(), height());
-        bg.fill(parentWidget(), pos());
+        bg.fill(tqparentWidget(), pos());
         setPaletteBackgroundPixmap(bg);
         setBackgroundOrigin(WidgetOrigin);
     }