TQt4 port kdeutils

This enables compilation under both Qt3 and Qt4


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

6 files changed, 18 insertions, 14 deletions

diff --git a/khexedit/parts/kbytesedit/kbyteseditwidget.cpp b/khexedit/parts/kbytesedit/kbyteseditwidget.cpp
index cb2b549..1e53c05 100644
--- a/khexedit/parts/kbytesedit/kbyteseditwidget.cpp
+++ b/khexedit/parts/kbytesedit/kbyteseditwidget.cpp
@@ -26,8 +26,8 @@
 #include "kbyteseditwidget.h"
 
 
-KBytesEditWidget::KBytesEditWidget( TQWidget *parent, const char *name, const TQStringList & )
-  : TQWidget( parent, name)
+KBytesEditWidget::KBytesEditWidget( TQWidget *tqparent, const char *name, const TQStringList & )
+  : TQWidget( tqparent, name)
 {
   TQHBoxLayout* Layout = new TQHBoxLayout( this );
   BytesEdit = new KHE::KBytesEdit( this, "BytesEdit" );
@@ -247,9 +247,9 @@ bool KBytesEditWidget::hasSelectedData() const
 }
 
 
-void KBytesEditWidget::repaintRange( int i1, int i2 )
+void KBytesEditWidget::tqrepaintRange( int i1, int i2 )
 {
-  BytesEdit->repaintRange( i1, i2 );
+  BytesEdit->tqrepaintRange( i1, i2 );
 }
 
 
diff --git a/khexedit/parts/kbytesedit/kbyteseditwidget.h b/khexedit/parts/kbytesedit/kbyteseditwidget.h
index 72bfeb6..616981f 100644
--- a/khexedit/parts/kbytesedit/kbyteseditwidget.h
+++ b/khexedit/parts/kbytesedit/kbyteseditwidget.h
@@ -43,10 +43,11 @@ class KBytesEditWidget : public TQWidget, public KHE::BytesEditInterface,
                          public KHE::ZoomInterface, public KHE::ClipboardInterface
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
     /** constructor API as demanded by KGenericFactory */
-    KBytesEditWidget( TQWidget *parent, const char *name, const TQStringList & = TQStringList() );
+    KBytesEditWidget( TQWidget *tqparent, const char *name, const TQStringList & = TQStringList() );
 
   public: // bytesedit interface
     /** hands over to the editor a new byte array.
@@ -85,15 +86,15 @@ class KBytesEditWidget : public TQWidget, public KHE::BytesEditInterface,
     virtual bool isOverwriteOnly() const;
     virtual bool isReadOnly() const;
     virtual bool isModified() const;
-    /** repaint the indizes from i1 to i2 */
-    virtual void repaintRange( int i1, int i2 );
+    /** tqrepaint the indizes from i1 to i2 */
+    virtual void tqrepaintRange( int i1, int i2 );
 
   public: // cursor interface
     /** */
     virtual void setCursorPosition( int Index );
 //     virtual bool tabChangesFocus() const;
 
-  public: // layout interface ??
+  public: // tqlayout interface ??
     /** sets the resizestyle for the value column. Default is KHE::FullSizeUsage */
     virtual void setResizeStyle( KResizeStyle Style );
     /** sets the number of bytes per line, switching the resize style to KHE::NoResize */
diff --git a/khexedit/parts/kpart/khebrowserextension.h b/khexedit/parts/kpart/khebrowserextension.h
index 67a6d45..f962b0b 100644
--- a/khexedit/parts/kpart/khebrowserextension.h
+++ b/khexedit/parts/kpart/khebrowserextension.h
@@ -34,6 +34,7 @@ class KHexEditPart;
 class KHexEditBrowserExtension : public KParts::BrowserExtension
 {
     Q_OBJECT
+  TQ_OBJECT
 
   public:
     KHexEditBrowserExtension( KHexEditPart *P );
diff --git a/khexedit/parts/kpart/khepart.cpp b/khexedit/parts/kpart/khepart.cpp
index 1fa95fb..3d17dd5 100644
--- a/khexedit/parts/kpart/khepart.cpp
+++ b/khexedit/parts/kpart/khepart.cpp
@@ -83,7 +83,7 @@ void KHexEditPart::setupActions( bool BrowserViewWanted )
 {
   KActionCollection *AC = actionCollection();
   // create our actions
-  CopyAction = BrowserViewWanted ? 0 : KStdAction::copy( HexEdit, TQT_SLOT(copy()), AC );
+  CopyAction = BrowserViewWanted ? 0 : KStdAction::copy( TQT_TQOBJECT(HexEdit), TQT_SLOT(copy()), AC );
 
   KStdAction::selectAll( this, TQT_SLOT(slotSelectAll()), AC );
   KStdAction::deselect(  this, TQT_SLOT(slotUnselect()),  AC );
@@ -105,8 +105,8 @@ void KHexEditPart::setupActions( bool BrowserViewWanted )
 
   ShowUnprintableAction = new KToggleAction( i18n("Show &Unprintable Chars (<32)"), 0, this, TQT_SLOT(slotSetShowUnprintable()), actionCollection(), "view_showunprintable" );
 
-  KStdAction::zoomIn(  HexEdit, TQT_SLOT(zoomIn()),   actionCollection() );
-  KStdAction::zoomOut( HexEdit, TQT_SLOT(zoomOut()),  actionCollection() );
+  KStdAction::zoomIn(  TQT_TQOBJECT(HexEdit), TQT_SLOT(zoomIn()),   actionCollection() );
+  KStdAction::zoomOut( TQT_TQOBJECT(HexEdit), TQT_SLOT(zoomOut()),  actionCollection() );
 
   // resize style
   ResizeStyleAction = new KSelectAction( i18n("&Resize Style"), 0, AC, "resizestyle" );
@@ -141,7 +141,7 @@ void KHexEditPart::fitActionSettings()
   ShowUnprintableAction->setChecked( HexEdit->showUnprintable() );
 
   CodingAction->setCurrentItem( (int)HexEdit->coding() );
-  EncodingAction->setCurrentItem( KCharCodec::codecNames().findIndex(HexEdit->encodingName()) );
+  EncodingAction->setCurrentItem( KCharCodec::codecNames().tqfindIndex(HexEdit->encodingName()) );
 
   ResizeStyleAction->setCurrentItem( (int)HexEdit->resizeStyle() );
 
diff --git a/khexedit/parts/kpart/khepart.h b/khexedit/parts/kpart/khepart.h
index 0526462..4c3fcd9 100644
--- a/khexedit/parts/kpart/khepart.h
+++ b/khexedit/parts/kpart/khepart.h
@@ -45,6 +45,7 @@ class KHexEdit;
 class KHexEditPart : public KParts::ReadOnlyPart
 {
     Q_OBJECT
+  TQ_OBJECT
 
     friend class KHexEditBrowserExtension;
 
diff --git a/khexedit/parts/kpart/khepartfactory.h b/khexedit/parts/kpart/khepartfactory.h
index 15a1cee..cc918a7 100644
--- a/khexedit/parts/kpart/khepartfactory.h
+++ b/khexedit/parts/kpart/khepartfactory.h
@@ -27,14 +27,15 @@ class KAboutData;
 class KHexEditPartFactory : public KParts::Factory
 {
     Q_OBJECT
+  TQ_OBJECT
 
   public:
     KHexEditPartFactory();
     virtual ~KHexEditPartFactory();
 
   public:
-    virtual KParts::Part* createPartObject( TQWidget *parentWidget, const char *widgetName,
-                                            TQObject *parent, const char *name,
+    virtual KParts::Part* createPartObject( TQWidget *tqparentWidget, const char *widgetName,
+                                            TQObject *tqparent, const char *name,
                                             const char *classname, const TQStringList &args );
     static KInstance* instance();