TQt4 port kdeaddons

This enables compilation under both Qt3 and Qt4


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

9 files changed, 29 insertions, 26 deletions

diff --git a/konq-plugins/sidebar/delicious/bookmarkListItem.cpp b/konq-plugins/sidebar/delicious/bookmarkListItem.cpp
index 5e3b0b3..21dbcaf 100644
--- a/konq-plugins/sidebar/delicious/bookmarkListItem.cpp
+++ b/konq-plugins/sidebar/delicious/bookmarkListItem.cpp
@@ -24,8 +24,8 @@
 #include <kglobal.h>
 #include <klocale.h>
 
-BookmarkListItem::BookmarkListItem( TQListView *parent, const TQString & url, const TQString & desc, time_t time )
-    : KListViewItem( parent ), m_desc( desc )
+BookmarkListItem::BookmarkListItem( TQListView *tqparent, const TQString & url, const TQString & desc, time_t time )
+    : KListViewItem( tqparent ), m_desc( desc )
 {
     m_url = KURL::fromPathOrURL( url );
     m_dateTime.setTime_t( time );
@@ -53,7 +53,7 @@ TQString BookmarkListItem::text( int column ) const
     else if ( column == 1 )
         return KGlobal::locale()->formatDateTime( m_dateTime );
 
-    return TQString::null;
+    return TQString();
 }
 
 KURL BookmarkListItem::url() const
diff --git a/konq-plugins/sidebar/delicious/bookmarkListItem.h b/konq-plugins/sidebar/delicious/bookmarkListItem.h
index 5b4c8c7..3e37ea4 100644
--- a/konq-plugins/sidebar/delicious/bookmarkListItem.h
+++ b/konq-plugins/sidebar/delicious/bookmarkListItem.h
@@ -34,7 +34,7 @@ class TQString;
 class BookmarkListItem: public KListViewItem
 {
 public:
-    BookmarkListItem( TQListView *parent, const TQString & url, const TQString & desc, time_t time );
+    BookmarkListItem( TQListView *tqparent, const TQString & url, const TQString & desc, time_t time );
     KURL url() const;
     TQDateTime date() const;
     TQString desc() const;
diff --git a/konq-plugins/sidebar/delicious/mainWidget.cpp b/konq-plugins/sidebar/delicious/mainWidget.cpp
index 612be03..929ded4 100644
--- a/konq-plugins/sidebar/delicious/mainWidget.cpp
+++ b/konq-plugins/sidebar/delicious/mainWidget.cpp
@@ -42,8 +42,8 @@
 #include <kconfig.h>
 #include <kinputdialog.h>
 
-MainWidget::MainWidget( KConfig * config, TQWidget * parent )
-    : MainWidget_base( parent ), m_config( config )
+MainWidget::MainWidget( KConfig * config, TQWidget * tqparent )
+    : MainWidget_base( tqparent ), m_config( config )
 {
     loadTags();
 
@@ -302,7 +302,7 @@ void MainWidget::slotRenameTag()
     if ( tag )
     {
         TQString oldName = tag->name();
-        TQString newName = KInputDialog::getText( i18n( "Rename Tag" ), i18n( "Provide a new name for tag '%1':" ).arg( oldName ) );
+        TQString newName = KInputDialog::getText( i18n( "Rename Tag" ), i18n( "Provide a new name for tag '%1':" ).tqarg( oldName ) );
         if ( !newName.isEmpty() )
         {
             KURL url( "http://del.icio.us/api/tags/rename" );
@@ -334,7 +334,7 @@ void MainWidget::slotDeleteBookmark()
     BookmarkListItem * bookmark = static_cast<BookmarkListItem *>( lvBookmarks->currentItem() );
     if ( bookmark )
     {
-        int result = KMessageBox::warningContinueCancel( this, i18n( "Do you really want to remove the bookmark\n%1?" ).arg( bookmark->desc() ),
+        int result = KMessageBox::warningContinueCancel( this, i18n( "Do you really want to remove the bookmark\n%1?" ).tqarg( bookmark->desc() ),
                                                          i18n( "Delete Bookmark" ), KStdGuiItem::del() );
 
         if ( result == KMessageBox::Continue )
diff --git a/konq-plugins/sidebar/delicious/mainWidget.h b/konq-plugins/sidebar/delicious/mainWidget.h
index 15920cd..e77cfc5 100644
--- a/konq-plugins/sidebar/delicious/mainWidget.h
+++ b/konq-plugins/sidebar/delicious/mainWidget.h
@@ -38,8 +38,9 @@ class KConfig;
 class MainWidget: public MainWidget_base
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
-    MainWidget( KConfig * config, TQWidget * parent );
+    MainWidget( KConfig * config, TQWidget * tqparent );
     ~MainWidget();
 
     /**
diff --git a/konq-plugins/sidebar/delicious/plugin.cpp b/konq-plugins/sidebar/delicious/plugin.cpp
index 3ed6c09..23244b7 100644
--- a/konq-plugins/sidebar/delicious/plugin.cpp
+++ b/konq-plugins/sidebar/delicious/plugin.cpp
@@ -27,10 +27,10 @@
 #include <klocale.h>
 #include <kglobal.h>
 
-KonqSidebarDelicious::KonqSidebarDelicious( KInstance *instance, TQObject *parent,
+KonqSidebarDelicious::KonqSidebarDelicious( KInstance *instance, TQObject *tqparent,
                                             TQWidget *widgetParent, TQString &desktopName_,
                                             const char* name )
-    : KonqSidebarPlugin( instance, parent, widgetParent, desktopName_, name ),
+    : KonqSidebarPlugin( instance, tqparent, widgetParent, desktopName_, name ),
       DCOPObject( "sidebar-delicious" )
 
 {
diff --git a/konq-plugins/sidebar/delicious/plugin.h b/konq-plugins/sidebar/delicious/plugin.h
index cd9f87a..4e220da 100644
--- a/konq-plugins/sidebar/delicious/plugin.h
+++ b/konq-plugins/sidebar/delicious/plugin.h
@@ -40,9 +40,10 @@ class TQString;
 class KonqSidebarDelicious: public KonqSidebarPlugin, DCOPObject
 {
     Q_OBJECT
+//    TQ_OBJECT
     K_DCOP
 public:
-    KonqSidebarDelicious( KInstance * instance, TQObject * parent, TQWidget * widgetParent,
+    KonqSidebarDelicious( KInstance * instance, TQObject * tqparent, TQWidget * widgetParent,
                           TQString & desktopName_, const char * name = 0 );
     ~KonqSidebarDelicious();
     virtual void * provides( const TQString & );
diff --git a/konq-plugins/sidebar/delicious/tagListItem.cpp b/konq-plugins/sidebar/delicious/tagListItem.cpp
index e7396a6..a8b98cd 100644
--- a/konq-plugins/sidebar/delicious/tagListItem.cpp
+++ b/konq-plugins/sidebar/delicious/tagListItem.cpp
@@ -21,8 +21,8 @@
 
 #include "tagListItem.h"
 
-TagListItem::TagListItem( TQListView * parent, const TQString & tagName, int count )
-    : TQCheckListItem( parent, tagName, TQCheckListItem::CheckBox ), m_name( tagName ), m_count( count )
+TagListItem::TagListItem( TQListView * tqparent, const TQString & tagName, int count )
+    : TQCheckListItem( tqparent, tagName, TQCheckListItem::CheckBox ), m_name( tagName ), m_count( count )
 {
 }
 
@@ -62,7 +62,7 @@ TQString TagListItem::text( int column ) const
     else if ( column == 1 )
         return TQString::number( m_count );
     else
-        return TQString::null;
+        return TQString();
 }
 
 TQString TagListItem::name() const
diff --git a/konq-plugins/sidebar/delicious/tagListItem.h b/konq-plugins/sidebar/delicious/tagListItem.h
index fe557de..f60e0b4 100644
--- a/konq-plugins/sidebar/delicious/tagListItem.h
+++ b/konq-plugins/sidebar/delicious/tagListItem.h
@@ -25,11 +25,12 @@
 #include <tqobject.h>
 #include <tqlistview.h>
 
-class TagListItem: public TQObject, public QCheckListItem
+class TagListItem: public TQObject, public TQCheckListItem
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
-    TagListItem( TQListView * parent, const TQString & tagName, int count = 1 );
+    TagListItem( TQListView * tqparent, const TQString & tagName, int count = 1 );
     int count() const;
     TQString name() const;
     void setName( const TQString & name );
diff --git a/konq-plugins/sidebar/delicious/widget.ui b/konq-plugins/sidebar/delicious/widget.ui
index daccbe9..e7a82af 100644
--- a/konq-plugins/sidebar/delicious/widget.ui
+++ b/konq-plugins/sidebar/delicious/widget.ui
@@ -1,7 +1,7 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>MainWidget_base</class>
 <author>Lukáš Tinkl &lt;lukas@kde.org&gt;</author>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>Form1</cstring>
     </property>
@@ -17,14 +17,14 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QSplitter">
+        <widget class="TQSplitter">
             <property name="name">
                 <cstring>splitter3</cstring>
             </property>
             <property name="orientation">
                 <enum>Vertical</enum>
             </property>
-            <widget class="QGroupBox">
+            <widget class="TQGroupBox">
                 <property name="name">
                     <cstring>groupBox2</cstring>
                 </property>
@@ -35,7 +35,7 @@
                     <property name="name">
                         <cstring>unnamed</cstring>
                     </property>
-                    <widget class="QPushButton">
+                    <widget class="TQPushButton">
                         <property name="name">
                             <cstring>btnRefreshTags</cstring>
                         </property>
@@ -46,7 +46,7 @@
                             <string>Refresh the list of tags</string>
                         </property>
                     </widget>
-                    <widget class="QListView">
+                    <widget class="TQListView">
                         <column>
                             <property name="text">
                                 <string>Tag</string>
@@ -81,7 +81,7 @@
                     </widget>
                 </vbox>
             </widget>
-            <widget class="QGroupBox">
+            <widget class="TQGroupBox">
                 <property name="name">
                     <cstring>groupBox1</cstring>
                 </property>
@@ -92,7 +92,7 @@
                     <property name="name">
                         <cstring>unnamed</cstring>
                     </property>
-                    <widget class="QPushButton" row="1" column="0">
+                    <widget class="TQPushButton" row="1" column="0">
                         <property name="name">
                             <cstring>btnRefreshBookmarks</cstring>
                         </property>
@@ -103,7 +103,7 @@
                             <string>Refresh the list of bookmarks according to the selected tags</string>
                         </property>
                     </widget>
-                    <widget class="QPushButton" row="1" column="1">
+                    <widget class="TQPushButton" row="1" column="1">
                         <property name="name">
                             <cstring>btnNew</cstring>
                         </property>
@@ -158,7 +158,7 @@
         </widget>
     </vbox>
 </widget>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>klistview.h</includehint>
 </includehints>