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/kivio_zoomaction.cpp b/kivio/kiviopart/kivio_zoomaction.cpp
index cfec4aea..b90be1e1 100644
--- a/kivio/kiviopart/kivio_zoomaction.cpp
+++ b/kivio/kiviopart/kivio_zoomaction.cpp
@@ -18,29 +18,29 @@
  */
 #include "kivio_zoomaction.h"
 #include "tkcombobox.h"
-#include <qregexp.h>
+#include <tqregexp.h>
 
 #include <klocale.h>
 
 using namespace Kivio;
 
-ZoomAction::ZoomAction(QObject* parent, const char* name)
-: TKSelectAction(parent,name)
+ZoomAction::ZoomAction(TQObject* tqparent, const char* name)
+: TKSelectAction(tqparent,name)
 {
   setEditable(true);
-  QStringList lst;
-  lst << i18n("%1%").arg("33");
-  lst << i18n("%1%").arg("50");
-  lst << i18n("%1%").arg("75");
-  lst << i18n("%1%").arg("100");
-  lst << i18n("%1%").arg("125");
-  lst << i18n("%1%").arg("150");
-  lst << i18n("%1%").arg("200");
-  lst << i18n("%1%").arg("250");
-  lst << i18n("%1%").arg("350");
-  lst << i18n("%1%").arg("400");
-  lst << i18n("%1%").arg("450");
-  lst << i18n("%1%").arg("500");
+  TQStringList lst;
+  lst << i18n("%1%").tqarg("33");
+  lst << i18n("%1%").tqarg("50");
+  lst << i18n("%1%").tqarg("75");
+  lst << i18n("%1%").tqarg("100");
+  lst << i18n("%1%").tqarg("125");
+  lst << i18n("%1%").tqarg("150");
+  lst << i18n("%1%").tqarg("200");
+  lst << i18n("%1%").tqarg("250");
+  lst << i18n("%1%").tqarg("350");
+  lst << i18n("%1%").tqarg("400");
+  lst << i18n("%1%").tqarg("450");
+  lst << i18n("%1%").tqarg("500");
   setItems(lst);
 }
 
@@ -48,9 +48,9 @@ ZoomAction::~ZoomAction()
 {
 }
 
-void ZoomAction::slotActivated( const QString& text )
+void ZoomAction::slotActivated( const TQString& text )
 {
-  QRegExp regexp("(\\d+)"); // "Captured" non-empty sequence of digits
+  TQRegExp regexp("(\\d+)"); // "Captured" non-empty sequence of digits
   regexp.search(text);
   bool ok=false;
   // Use templates, not macro to avoid to call the functiosn many times.
@@ -63,35 +63,35 @@ void ZoomAction::slotActivated( const QString& text )
 void ZoomAction::insertItem( int zoom )
 {
   // This code is taken from KWords changeZoomMenu
-  QValueList<int> list;
+  TQValueList<int> list;
   bool ok;
-  const QStringList itemsList(items());
-  QRegExp regexp("(\\d+)"); // "Captured" non-empty sequence of digits
+  const TQStringList itemsList(items());
+  TQRegExp regexp("(\\d+)"); // "Captured" non-empty sequence of digits
 
-  for (QStringList::ConstIterator it = itemsList.begin() ; it != itemsList.end() ; ++it) {
+  for (TQStringList::ConstIterator it = itemsList.begin() ; it != itemsList.end() ; ++it) {
     regexp.search(*it);
     const int val=regexp.cap(1).toInt(&ok);
     //zoom : limit inferior=10
-    if(ok && val>9 && list.contains(val)==0)
+    if(ok && val>9 && list.tqcontains(val)==0)
       list.append( val );
   }
   //necessary at the beginning when we read config
   //this value is not in combo list
-  if(list.contains(zoom)==0)
+  if(list.tqcontains(zoom)==0)
     list.append( zoom );
 
   qHeapSort( list );
 
-  QStringList lst;
-  for (QValueList<int>::Iterator it = list.begin() ; it != list.end() ; ++it)
-    lst.append( i18n("%1%").arg(*it) );
+  TQStringList lst;
+  for (TQValueList<int>::Iterator it = list.begin() ; it != list.end() ; ++it)
+    lst.append( i18n("%1%").tqarg(*it) );
   setItems(lst);
-  setCurrentItem(lst.findIndex(i18n("%1%").arg(zoom)));
+  setCurrentItem(lst.tqfindIndex(i18n("%1%").tqarg(zoom)));
 }
 
 void ZoomAction::setEditZoom( int zoom )
 {
-  const QString zt(i18n("%1%").arg(zoom));
+  const TQString zt(i18n("%1%").tqarg(zoom));
   setEditText(zt);
 }
 #include "kivio_zoomaction.moc"