TQt4 port koffice

This should enable compilation under both Qt3 and Qt4; fixes for any missed components will be forthcoming


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

1 files changed, 29 insertions, 29 deletions

diff --git a/kivio/kiviopart/kivioarrowheadaction.cpp b/kivio/kiviopart/kivioarrowheadaction.cpp
index b2ce80c9..f4f9e6cf 100644
--- a/kivio/kiviopart/kivioarrowheadaction.cpp
+++ b/kivio/kiviopart/kivioarrowheadaction.cpp
@@ -21,12 +21,12 @@
 #include "kivioarrowheadaction.h"
 #include "kivioglobal.h"
 
-#include <qbitmap.h>
-#include <qpixmap.h>
-#include <qimage.h>
-#include <qpainter.h>
-#include <qmenubar.h>
-#include <qwhatsthis.h>
+#include <tqbitmap.h>
+#include <tqpixmap.h>
+#include <tqimage.h>
+#include <tqpainter.h>
+#include <tqmenubar.h>
+#include <tqwhatsthis.h>
 
 #include <kpopupmenu.h>
 #include <ktoolbar.h>
@@ -37,9 +37,9 @@
 #include <kstandarddirs.h>
 #include <kiconloader.h>
 
-KivioArrowHeadAction::KivioArrowHeadAction(const QString &text, const QString &pix,
-  QObject* parent, const char *name)
-  : KActionMenu(text, pix, parent, name)
+KivioArrowHeadAction::KivioArrowHeadAction(const TQString &text, const TQString &pix,
+  TQObject* tqparent, const char *name)
+  : KActionMenu(text, pix, tqparent, name)
 {
   m_emitSignals = true;
   setShortcutConfigurable( false );
@@ -55,8 +55,8 @@ KivioArrowHeadAction::KivioArrowHeadAction(const QString &text, const QString &p
   m_currentStart = m_currentEnd = 0;
   m_startPopup->setItemChecked(0, true);
   m_endPopup->setItemChecked(0, true);
-  connect(m_startPopup, SIGNAL(activated(int)), SLOT(setCurrentStartArrow(int)));
-  connect(m_endPopup, SIGNAL(activated(int)), SLOT(setCurrentEndArrow(int)));
+  connect(m_startPopup, TQT_SIGNAL(activated(int)), TQT_SLOT(setCurrentStartArrow(int)));
+  connect(m_endPopup, TQT_SIGNAL(activated(int)), TQT_SLOT(setCurrentEndArrow(int)));
 }
 
 KivioArrowHeadAction::~KivioArrowHeadAction()
@@ -74,20 +74,20 @@ KPopupMenu* KivioArrowHeadAction::popupMenu() const
   return m_popup;
 }
 
-void KivioArrowHeadAction::popup( const QPoint& global )
+void KivioArrowHeadAction::popup( const TQPoint& global )
 {
   popupMenu()->popup(global);
 }
 
-int KivioArrowHeadAction::plug( QWidget* widget, int index)
+int KivioArrowHeadAction::plug( TQWidget* widget, int index)
 {
   // This function is copied from KActionMenu::plug
   if (kapp && !kapp->authorizeKAction(name()))
     return -1;
   kdDebug(129) << "KAction::plug( " << widget << ", " << index << " )" << endl; // remove -- ellis
-  if ( widget->inherits("QPopupMenu") )
+  if ( widget->inherits(TQPOPUPMENU_OBJECT_NAME_STRING) )
   {
-    QPopupMenu* menu = static_cast<QPopupMenu*>( widget );
+    TQPopupMenu* menu = static_cast<TQPopupMenu*>( widget );
     int id;
 
     if ( hasIconSet() )
@@ -100,7 +100,7 @@ int KivioArrowHeadAction::plug( QWidget* widget, int index)
       menu->setItemEnabled( id, false );
 
     addContainer( menu, id );
-    connect( menu, SIGNAL( destroyed() ), this, SLOT( slotDestroyed() ) );
+    connect( menu, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotDestroyed() ) );
 
     return containerCount() - 1;
   }
@@ -111,8 +111,8 @@ int KivioArrowHeadAction::plug( QWidget* widget, int index)
     int id_ = KAction::getToolButtonID();
 
     if ( icon().isEmpty() && !iconSet().isNull() )
-      bar->insertButton( iconSet().pixmap(), id_, SIGNAL( clicked() ), this,
-                          SLOT( slotActivated() ), isEnabled(), plainText(),
+      bar->insertButton( iconSet().pixmap(), id_, TQT_SIGNAL( clicked() ), this,
+                          TQT_SLOT( slotActivated() ), isEnabled(), plainText(),
                           index );
     else
     {
@@ -123,25 +123,25 @@ int KivioArrowHeadAction::plug( QWidget* widget, int index)
       else
         instance = KGlobal::instance();
 
-      bar->insertButton( icon(), id_, SIGNAL( clicked() ), this,
-                          SLOT( slotActivated() ), isEnabled(), plainText(),
+      bar->insertButton( icon(), id_, TQT_SIGNAL( clicked() ), this,
+                          TQT_SLOT( slotActivated() ), isEnabled(), plainText(),
                           index, instance );
     }
 
     addContainer( bar, id_ );
 
     if (!whatsThis().isEmpty())
-      QWhatsThis::add( bar->getButton(id_), whatsThis() );
+      TQWhatsThis::add( bar->getButton(id_), whatsThis() );
 
-    connect( bar, SIGNAL( destroyed() ), this, SLOT( slotDestroyed() ) );
+    connect( bar, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotDestroyed() ) );
 
     bar->getButton(id_)->setPopup(popupMenu(), true );
 
     return containerCount() - 1;
   }
-  else if ( widget->inherits( "QMenuBar" ) )
+  else if ( widget->inherits( TQMENUBAR_OBJECT_NAME_STRING ) )
   {
-    QMenuBar *bar = static_cast<QMenuBar *>( widget );
+    TQMenuBar *bar = static_cast<TQMenuBar *>( widget );
 
     int id;
 
@@ -151,7 +151,7 @@ int KivioArrowHeadAction::plug( QWidget* widget, int index)
       bar->setItemEnabled( id, false );
 
     addContainer( bar, id );
-    connect( bar, SIGNAL( destroyed() ), this, SLOT( slotDestroyed() ) );
+    connect( bar, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotDestroyed() ) );
 
     return containerCount() - 1;
   }
@@ -161,10 +161,10 @@ int KivioArrowHeadAction::plug( QWidget* widget, int index)
 
 void KivioArrowHeadAction::loadArrowHeads(KPopupMenu* popup)
 {
-  QBitmap mask;
-  QPixmap pixAll = Kivio::arrowHeadPixmap();  
-  QPixmap pix(pixAll.width(), 17);
-  QPainter p(&pix, popup);
+  TQBitmap tqmask;
+  TQPixmap pixAll = Kivio::arrowHeadPixmap();  
+  TQPixmap pix(pixAll.width(), 17);
+  TQPainter p(&pix, popup);
   int cindex = 0;
 
   // insert item "None"