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, 21 insertions, 21 deletions

diff --git a/lib/kopalette/kopalette.cc b/lib/kopalette/kopalette.cc
index 67fcf474..1c6fb960 100644
--- a/lib/kopalette/kopalette.cc
+++ b/lib/kopalette/kopalette.cc
@@ -15,18 +15,18 @@
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
-#include <qwidget.h>
-#include <qdockwindow.h>
-#include <qvariant.h>
-#include <qlabel.h>
-#include <qtoolbutton.h>
-#include <qtabwidget.h>
-#include <qlayout.h>
-#include <qtooltip.h>
-#include <qwhatsthis.h>
-#include <qimage.h>
-#include <qpixmap.h>
-#include <qlayout.h>
+#include <tqwidget.h>
+#include <tqdockwindow.h>
+#include <tqvariant.h>
+#include <tqlabel.h>
+#include <tqtoolbutton.h>
+#include <tqtabwidget.h>
+#include <tqlayout.h>
+#include <tqtooltip.h>
+#include <tqwhatsthis.h>
+#include <tqimage.h>
+#include <tqpixmap.h>
+#include <tqlayout.h>
 
 #include <kdebug.h>
 #include <kglobal.h>
@@ -39,23 +39,23 @@
 
 #include "kopalette.h"
 
-KoPalette::KoPalette(QWidget * parent, const char * name)
-    : QDockWindow(parent, name)
+KoPalette::KoPalette(TQWidget * tqparent, const char * name)
+    : TQDockWindow(tqparent, name)
 {
 
 #if KDE_VERSION >= KDE_MAKE_VERSION(3,3,90)
     KAcceleratorManager::setNoAccel(this);
 #endif
-    setCloseMode( QDockWindow::Never);
+    setCloseMode( TQDockWindow::Never);
     setResizeEnabled(true);
     setOpaqueMoving(true);
-    setFocusPolicy(QWidget::NoFocus);
+    setFocusPolicy(TQ_NoFocus);
     setVerticallyStretchable(false);
     setHorizontallyStretchable(false);
 
     setNewLine(true);
-    layout() -> setSpacing(0);
-    layout() -> setMargin(0);
+    tqlayout() -> setSpacing(0);
+    tqlayout() -> setMargin(0);
 
     resetFont();
 }
@@ -67,7 +67,7 @@ void KoPalette::resetFont()
     Q_ASSERT(cfg);
     cfg->setGroup("");
     m_font  = KGlobalSettings::generalFont();
-    float ps = QMIN(9, KGlobalSettings::generalFont().pointSize() * 0.8);
+    float ps = TQMIN(9, KGlobalSettings::generalFont().pointSize() * 0.8);
     ps = cfg->readNumEntry("palettefontsize", (int)ps);
     if (ps < 6) ps = 6;
     m_font.setPointSize((int)ps);
@@ -79,10 +79,10 @@ KoPalette::~KoPalette()
 {
 }
 
-void KoPalette::setMainWidget(QWidget * widget)
+void KoPalette::setMainWidget(TQWidget * widget)
 {
     setWidget(widget);
-    resize( QSize(285, 233).expandedTo(minimumSizeHint()) );
+    resize( TQSize(285, 233).expandedTo(tqminimumSizeHint()) );
     clearWState( WState_Polished );
     widget->setFont(m_font);
     m_page = widget;