Initial conversion of kdepim to TQt

This will probably require some tweaking before it will build under Qt4,
however Qt3 builds are OK.  Any alterations this commit makes to kdepim
behaviour under Qt3 are unintentional and should be fixed.


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

13 files changed, 58 insertions, 52 deletions

diff --git a/kontact/plugins/korganizer/journalplugin.cpp b/kontact/plugins/korganizer/journalplugin.cpp
index 789762d5f..a14785a7e 100644
--- a/kontact/plugins/korganizer/journalplugin.cpp
+++ b/kontact/plugins/korganizer/journalplugin.cpp
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include <tqwidget.h>
diff --git a/kontact/plugins/korganizer/journalplugin.h b/kontact/plugins/korganizer/journalplugin.h
index beb4c2e95..af76b782b 100644
--- a/kontact/plugins/korganizer/journalplugin.h
+++ b/kontact/plugins/korganizer/journalplugin.h
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 #ifndef KONTACT_JOURNALPLUGIN_H
 #define KONTACT_JOURNALPLUGIN_H
@@ -34,6 +34,7 @@
 class JournalPlugin : public Kontact::Plugin
 {
     Q_OBJECT
+  TQ_OBJECT
   public:
     JournalPlugin( Kontact::Core *core, const char *name, const TQStringList& );
     ~JournalPlugin();
diff --git a/kontact/plugins/korganizer/kcmkorgsummary.cpp b/kontact/plugins/korganizer/kcmkorgsummary.cpp
index ba431eb38..e07bd4411 100644
--- a/kontact/plugins/korganizer/kcmkorgsummary.cpp
+++ b/kontact/plugins/korganizer/kcmkorgsummary.cpp
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include <tqbuttongroup.h>
@@ -41,14 +41,14 @@
 
 extern "C"
 {
-  KDE_EXPORT KCModule *create_korgsummary( TQWidget *parent, const char * )
+  KDE_EXPORT KCModule *create_korgsummary( TQWidget *tqparent, const char * )
   {
-    return new KCMKOrgSummary( parent, "kcmkorgsummary" );
+    return new KCMKOrgSummary( tqparent, "kcmkorgsummary" );
   }
 }
 
-KCMKOrgSummary::KCMKOrgSummary( TQWidget *parent, const char *name )
-  : KCModule( parent, name )
+KCMKOrgSummary::KCMKOrgSummary( TQWidget *tqparent, const char *name )
+  : KCModule( tqparent, name )
 {
   initGUI();
 
diff --git a/kontact/plugins/korganizer/kcmkorgsummary.h b/kontact/plugins/korganizer/kcmkorgsummary.h
index 60a876d1d..6d19f30f3 100644
--- a/kontact/plugins/korganizer/kcmkorgsummary.h
+++ b/kontact/plugins/korganizer/kcmkorgsummary.h
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef KCMKORGSUMMARY_H
@@ -26,15 +26,16 @@
 
 #include <kcmodule.h>
 
-class QSpinxBox;
+class TQSpinxBox;
 class TQButtonGroup;
 
 class KCMKOrgSummary : public KCModule
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    KCMKOrgSummary( TQWidget *parent = 0, const char *name = 0 );
+    KCMKOrgSummary( TQWidget *tqparent = 0, const char *name = 0 );
 
     virtual void load();
     virtual void save();
diff --git a/kontact/plugins/korganizer/korg_uniqueapp.h b/kontact/plugins/korganizer/korg_uniqueapp.h
index d21f8c526..068fd35f2 100644
--- a/kontact/plugins/korganizer/korg_uniqueapp.h
+++ b/kontact/plugins/korganizer/korg_uniqueapp.h
@@ -19,8 +19,8 @@
    Boston, MA 02110-1301, USA.
 */
 
-#ifndef KORG_UNIQUEAPP_H
-#define KORG_UNIQUEAPP_H
+#ifndef KORG_UNITQUEAPP_H
+#define KORG_UNITQUEAPP_H
 
 #include <uniqueapphandler.h>
 
@@ -33,5 +33,5 @@ public:
 };
 
 
-#endif /* KORG_UNIQUEAPP_H */
+#endif /* KORG_UNITQUEAPP_H */
 
diff --git a/kontact/plugins/korganizer/korganizerplugin.cpp b/kontact/plugins/korganizer/korganizerplugin.cpp
index d740721c2..2a712c8cc 100644
--- a/kontact/plugins/korganizer/korganizerplugin.cpp
+++ b/kontact/plugins/korganizer/korganizerplugin.cpp
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include <tqcursor.h>
@@ -80,14 +80,14 @@ KOrganizerPlugin::~KOrganizerPlugin()
 {
 }
 
-Kontact::Summary *KOrganizerPlugin::createSummaryWidget( TQWidget *parent )
+Kontact::Summary *KOrganizerPlugin::createSummaryWidget( TQWidget *tqparent )
 {
   // korg part must be loaded, otherwise when starting kontact on summary view
   // it won't display our stuff.
   // If the part is already loaded loadPart() is harmless and just returns
   loadPart();
 
-  return new SummaryWidget( this, parent );
+  return new SummaryWidget( this, tqparent );
 }
 
 KParts::ReadOnlyPart *KOrganizerPlugin::createPart()
@@ -181,7 +181,7 @@ void KOrganizerPlugin::processDropEvent( TQDropEvent *event )
         attendees.append( email );
       }
     }
-    interface()->openEventEditor( i18n( "Meeting" ), TQString::null, TQString::null,
+    interface()->openEventEditor( i18n( "Meeting" ), TQString(), TQString(),
                                   attendees );
     return;
   }
diff --git a/kontact/plugins/korganizer/korganizerplugin.h b/kontact/plugins/korganizer/korganizerplugin.h
index 1343464ec..4aaa4a0b6 100644
--- a/kontact/plugins/korganizer/korganizerplugin.h
+++ b/kontact/plugins/korganizer/korganizerplugin.h
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef KORGANIZER_PLUGIN_H
@@ -36,6 +36,7 @@
 class KOrganizerPlugin : public Kontact::Plugin
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
     KOrganizerPlugin( Kontact::Core *core, const char *name, const TQStringList& );
@@ -50,7 +51,7 @@ class KOrganizerPlugin : public Kontact::Plugin
     bool canDecodeDrag( TQMimeSource * );
     void processDropEvent( TQDropEvent * );
 
-    virtual Kontact::Summary *createSummaryWidget( TQWidget *parent );
+    virtual Kontact::Summary *createSummaryWidget( TQWidget *tqparent );
 
     virtual TQString tipFile() const;
     virtual TQStringList invisibleToolbarActions() const;
diff --git a/kontact/plugins/korganizer/summarywidget.cpp b/kontact/plugins/korganizer/summarywidget.cpp
index 06a4694c4..1409c37b3 100644
--- a/kontact/plugins/korganizer/summarywidget.cpp
+++ b/kontact/plugins/korganizer/summarywidget.cpp
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include <tqcursor.h>
@@ -50,9 +50,9 @@
 
 #include "summarywidget.h"
 
-SummaryWidget::SummaryWidget( KOrganizerPlugin *plugin, TQWidget *parent,
+SummaryWidget::SummaryWidget( KOrganizerPlugin *plugin, TQWidget *tqparent,
                               const char *name )
-  : Kontact::Summary( parent, name ), mPlugin( plugin ), mCalendar( 0 )
+  : Kontact::Summary( tqparent, name ), mPlugin( plugin ), mCalendar( 0 )
 {
   TQVBoxLayout *mainLayout = new TQVBoxLayout( this, 3, 3 );
 
@@ -198,7 +198,7 @@ void SummaryWidget::updateView()
       urlLabel->setText( newtext );
       urlLabel->setURL( ev->uid() );
       urlLabel->installEventFilter( this );
-      urlLabel->tqsetAlignment( urlLabel->tqalignment() | Qt::WordBreak );
+      urlLabel->tqsetAlignment( urlLabel->tqalignment() | TQt::WordBreak );
       mLayout->addWidget( urlLabel, counter, 2 );
       mLabels.append( urlLabel );
 
@@ -290,7 +290,7 @@ bool SummaryWidget::eventFilter( TQObject *obj, TQEvent* e )
     if ( e->type() == TQEvent::Enter )
       emit message( i18n( "Edit Appointment: \"%1\"" ).arg( label->text() ) );
     if ( e->type() == TQEvent::Leave )
-      emit message( TQString::null );
+      emit message( TQString() );
   }
 
   return Kontact::Summary::eventFilter( obj, e );
diff --git a/kontact/plugins/korganizer/summarywidget.h b/kontact/plugins/korganizer/summarywidget.h
index 2f018a507..9e2350ead 100644
--- a/kontact/plugins/korganizer/summarywidget.h
+++ b/kontact/plugins/korganizer/summarywidget.h
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef SUMMARYWIDGET_H
@@ -39,9 +39,10 @@ class KOrganizerPlugin;
 class SummaryWidget : public Kontact::Summary
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    SummaryWidget( KOrganizerPlugin *plugin, TQWidget *parent,
+    SummaryWidget( KOrganizerPlugin *plugin, TQWidget *tqparent,
                    const char *name = 0 );
     ~SummaryWidget();
 
diff --git a/kontact/plugins/korganizer/todoplugin.cpp b/kontact/plugins/korganizer/todoplugin.cpp
index 3b553ee0f..cefd8bbe7 100644
--- a/kontact/plugins/korganizer/todoplugin.cpp
+++ b/kontact/plugins/korganizer/todoplugin.cpp
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include <tqwidget.h>
@@ -77,9 +77,9 @@ TodoPlugin::~TodoPlugin()
 {
 }
 
-Kontact::Summary *TodoPlugin::createSummaryWidget( TQWidget *parent )
+Kontact::Summary *TodoPlugin::createSummaryWidget( TQWidget *tqparent )
 {
-  return new TodoSummaryWidget( this, parent );
+  return new TodoSummaryWidget( this, tqparent );
 }
 
 KParts::ReadOnlyPart *TodoPlugin::createPart()
@@ -173,7 +173,7 @@ void TodoPlugin::processDropEvent( TQDropEvent *event )
         attendees.append( email );
       }
     }
-    interface()->openTodoEditor( i18n( "Meeting" ), TQString::null, TQString::null,
+    interface()->openTodoEditor( i18n( "Meeting" ), TQString(), TQString(),
                                  attendees );
     return;
   }
diff --git a/kontact/plugins/korganizer/todoplugin.h b/kontact/plugins/korganizer/todoplugin.h
index 5fc13316f..9bff00d0b 100644
--- a/kontact/plugins/korganizer/todoplugin.h
+++ b/kontact/plugins/korganizer/todoplugin.h
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 #ifndef KONTACT_TODOPLUGIN_H
 #define KONTACT_TODOPLUGIN_H
@@ -34,6 +34,7 @@
 class TodoPlugin : public Kontact::Plugin
 {
     Q_OBJECT
+  TQ_OBJECT
   public:
     TodoPlugin( Kontact::Core *core, const char *name, const TQStringList& );
     ~TodoPlugin();
@@ -47,7 +48,7 @@ class TodoPlugin : public Kontact::Plugin
 
     virtual TQStringList invisibleToolbarActions() const;
 
-    virtual Kontact::Summary *createSummaryWidget( TQWidget *parent );
+    virtual Kontact::Summary *createSummaryWidget( TQWidget *tqparent );
 
     void select();
 
diff --git a/kontact/plugins/korganizer/todosummarywidget.cpp b/kontact/plugins/korganizer/todosummarywidget.cpp
index 05e9ea55e..7bd1be11a 100644
--- a/kontact/plugins/korganizer/todosummarywidget.cpp
+++ b/kontact/plugins/korganizer/todosummarywidget.cpp
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include <tqcursor.h>
@@ -53,8 +53,8 @@
 #include "todosummarywidget.h"
 
 TodoSummaryWidget::TodoSummaryWidget( TodoPlugin *plugin,
-                                      TQWidget *parent, const char *name )
-  : Kontact::Summary( parent, name ), mPlugin( plugin )
+                                      TQWidget *tqparent, const char *name )
+  : Kontact::Summary( tqparent, name ), mPlugin( plugin )
 {
   TQVBoxLayout *mainLayout = new TQVBoxLayout( this, 3, 3 );
 
@@ -152,14 +152,14 @@ void TodoSummaryWidget::updateView()
       mLabels.append( label );
 
       TQString sSummary = todo->summary();
-      if ( todo->relatedTo() ) { // show parent only, not entire ancestry
+      if ( todo->relatedTo() ) { // show tqparent only, not entire ancestry
         sSummary = todo->relatedTo()->summary() + ":" + todo->summary();
       }
       KURLLabel *urlLabel = new KURLLabel( this );
       urlLabel->setText( sSummary );
       urlLabel->setURL( todo->uid() );
       urlLabel->installEventFilter( this );
-      urlLabel->setTextFormat( Qt::RichText );
+      urlLabel->setTextFormat( TQt::RichText );
       mLayout->addWidget( urlLabel, counter, 2 );
       mLabels.append( urlLabel );
 
@@ -255,7 +255,7 @@ bool TodoSummaryWidget::eventFilter( TQObject *obj, TQEvent* e )
     if ( e->type() == TQEvent::Enter )
       emit message( i18n( "Edit To-do: \"%1\"" ).arg( label->text() ) );
     if ( e->type() == TQEvent::Leave )
-      emit message( TQString::null );
+      emit message( TQString() );
   }
 
   return Kontact::Summary::eventFilter( obj, e );
diff --git a/kontact/plugins/korganizer/todosummarywidget.h b/kontact/plugins/korganizer/todosummarywidget.h
index c5286e190..974a45b30 100644
--- a/kontact/plugins/korganizer/todosummarywidget.h
+++ b/kontact/plugins/korganizer/todosummarywidget.h
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef TODO_SUMMARYWIDGET_H
@@ -39,9 +39,10 @@ class TodoPlugin;
 class TodoSummaryWidget : public Kontact::Summary
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    TodoSummaryWidget( TodoPlugin *plugin, TQWidget *parent,
+    TodoSummaryWidget( TodoPlugin *plugin, TQWidget *tqparent,
                        const char *name = 0 );
     ~TodoSummaryWidget();