diff --git a/Documentation/ConduitProgrammingTutorial/index.tex b/Documentation/ConduitProgrammingTutorial/index.tex index 909df86..6d75230 100644 --- a/Documentation/ConduitProgrammingTutorial/index.tex +++ b/Documentation/ConduitProgrammingTutorial/index.tex @@ -401,7 +401,7 @@ class MALWidget; class MALWidgetSetup : public ConduitConfig { -Q_OBJECT +TQ_OBJECT public: MALWidgetSetup(QWidget *,const char *,const QStringList &); virtual ~MALWidgetSetup() {}; diff --git a/Documentation/ConduitProgrammingTutorial/mal-factory.h b/Documentation/ConduitProgrammingTutorial/mal-factory.h index ff9727c..51ca6fb 100644 --- a/Documentation/ConduitProgrammingTutorial/mal-factory.h +++ b/Documentation/ConduitProgrammingTutorial/mal-factory.h @@ -14,7 +14,7 @@ class TDEAboutData; class MALConduitFactory : public KLibFactory { -Q_OBJECT +TQ_OBJECT public: MALConduitFactory(TQObject * = 0L,const char * = 0L); diff --git a/conduits/abbrowserconduit/abbrowser-conduit.h b/conduits/abbrowserconduit/abbrowser-conduit.h index e652e40..8926176 100644 --- a/conduits/abbrowserconduit/abbrowser-conduit.h +++ b/conduits/abbrowserconduit/abbrowser-conduit.h @@ -53,7 +53,7 @@ typedef TQValueList RecordIDList; class AbbrowserConduit : public ConduitAction { -Q_OBJECT +TQ_OBJECT public: AbbrowserConduit(KPilotLink *o,const char *n = 0L, diff --git a/conduits/abbrowserconduit/resolutionDialog.h b/conduits/abbrowserconduit/resolutionDialog.h index b14c74a..647711b 100644 --- a/conduits/abbrowserconduit/resolutionDialog.h +++ b/conduits/abbrowserconduit/resolutionDialog.h @@ -39,7 +39,7 @@ class ResolutionTable; class ResolutionDlg : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/conduits/docconduit/DOC-converter.h b/conduits/docconduit/DOC-converter.h index 4eed37e..22e6167 100644 --- a/conduits/docconduit/DOC-converter.h +++ b/conduits/docconduit/DOC-converter.h @@ -103,7 +103,7 @@ class docRegExpBookmark:public docMatchBookmark { *************************************************************************************************************/ class DOCConverter:public TQObject { -Q_OBJECT +TQ_OBJECT private: PilotDatabase * docdb; diff --git a/conduits/docconduit/doc-conduit.h b/conduits/docconduit/doc-conduit.h index 83fec83..c705640 100644 --- a/conduits/docconduit/doc-conduit.h +++ b/conduits/docconduit/doc-conduit.h @@ -55,7 +55,7 @@ enum eTexStatus { TQString dirToString(eSyncDirectionEnum dir); class DOCConduit:public ConduitAction { -Q_OBJECT +TQ_OBJECT public: eSyncDirectionEnum eSyncDirection; diff --git a/conduits/docconduit/doc-conflictdialog.h b/conduits/docconduit/doc-conflictdialog.h index ddd392e..0cd3f32 100644 --- a/conduits/docconduit/doc-conflictdialog.h +++ b/conduits/docconduit/doc-conflictdialog.h @@ -53,7 +53,7 @@ struct conflictEntry { class ResolutionDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/conduits/docconduit/doc-factory.h b/conduits/docconduit/doc-factory.h index 44a47c4..8fa94ea 100644 --- a/conduits/docconduit/doc-factory.h +++ b/conduits/docconduit/doc-factory.h @@ -37,7 +37,7 @@ class TDEAboutData; class DOCConduitFactory:public KLibFactory { - Q_OBJECT + TQ_OBJECT public: diff --git a/conduits/docconduit/kpalmdoc_dlg.h b/conduits/docconduit/kpalmdoc_dlg.h index 2fd44fd..e7c5784 100644 --- a/conduits/docconduit/kpalmdoc_dlg.h +++ b/conduits/docconduit/kpalmdoc_dlg.h @@ -34,7 +34,7 @@ class DOCConverter; class ConverterDlg : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/conduits/knotes/knotes-action.h b/conduits/knotes/knotes-action.h index 3c2288b..f0642c6 100644 --- a/conduits/knotes/knotes-action.h +++ b/conduits/knotes/knotes-action.h @@ -36,7 +36,7 @@ class PilotMemo; class KNotesAction : public ConduitAction { -Q_OBJECT +TQ_OBJECT public: KNotesAction( diff --git a/conduits/knotes/knotes-factory.h b/conduits/knotes/knotes-factory.h index fd3f714..781afdb 100644 --- a/conduits/knotes/knotes-factory.h +++ b/conduits/knotes/knotes-factory.h @@ -36,7 +36,7 @@ class TDEAboutData; class KNotesConduitFactory : public KLibFactory { -Q_OBJECT +TQ_OBJECT public: diff --git a/conduits/malconduit/mal-conduit.h b/conduits/malconduit/mal-conduit.h index 861772a..9f30da8 100644 --- a/conduits/malconduit/mal-conduit.h +++ b/conduits/malconduit/mal-conduit.h @@ -37,7 +37,7 @@ class MALConduit : public ConduitAction { -Q_OBJECT +TQ_OBJECT public: MALConduit( diff --git a/conduits/malconduit/mal-factory.h b/conduits/malconduit/mal-factory.h index 1b45852..d047339 100644 --- a/conduits/malconduit/mal-factory.h +++ b/conduits/malconduit/mal-factory.h @@ -39,7 +39,7 @@ class TDEAboutData; class MALConduitFactory : public KLibFactory { -Q_OBJECT +TQ_OBJECT public: diff --git a/conduits/malconduit/mal-setup.h b/conduits/malconduit/mal-setup.h index 6bcd6c6..a37daf3 100644 --- a/conduits/malconduit/mal-setup.h +++ b/conduits/malconduit/mal-setup.h @@ -39,7 +39,7 @@ class MALWidget; class MALWidgetSetup : public ConduitConfigBase { -Q_OBJECT +TQ_OBJECT public: MALWidgetSetup(TQWidget *,const char *); diff --git a/conduits/memofileconduit/memofile-conduit.h b/conduits/memofileconduit/memofile-conduit.h index 8166313..3cc7ef1 100644 --- a/conduits/memofileconduit/memofile-conduit.h +++ b/conduits/memofileconduit/memofile-conduit.h @@ -36,7 +36,7 @@ class PilotMemo; class MemofileConduit : public ConduitAction { -Q_OBJECT +TQ_OBJECT public: MemofileConduit(KPilotLink *, diff --git a/conduits/popmail/setupDialog.h b/conduits/popmail/setupDialog.h index 151ad09..e585390 100644 --- a/conduits/popmail/setupDialog.h +++ b/conduits/popmail/setupDialog.h @@ -39,7 +39,7 @@ class PopMailWidget; // From setup-dialog.ui class PopMailWidgetConfig : public ConduitConfigBase { -Q_OBJECT +TQ_OBJECT public: PopMailWidgetConfig(TQWidget *, const char *); diff --git a/conduits/sysinfoconduit/sysinfo-conduit.h b/conduits/sysinfoconduit/sysinfo-conduit.h index db3d14e..d59b6d1 100644 --- a/conduits/sysinfoconduit/sysinfo-conduit.h +++ b/conduits/sysinfoconduit/sysinfo-conduit.h @@ -32,7 +32,7 @@ class SysInfoConduit : public ConduitAction { - Q_OBJECT + TQ_OBJECT public: SysInfoConduit( diff --git a/conduits/timeconduit/time-setup.h b/conduits/timeconduit/time-setup.h index 06f2522..4fcc2eb 100644 --- a/conduits/timeconduit/time-setup.h +++ b/conduits/timeconduit/time-setup.h @@ -36,7 +36,7 @@ class TDEAboutData; class TimeWidgetConfig : public ConduitConfigBase { -Q_OBJECT +TQ_OBJECT public: TimeWidgetConfig(TQWidget *parent, const char *); diff --git a/conduits/vcalconduit/todo-conduit.h b/conduits/vcalconduit/todo-conduit.h index 50490e2..fb636a5 100644 --- a/conduits/vcalconduit/todo-conduit.h +++ b/conduits/vcalconduit/todo-conduit.h @@ -63,7 +63,7 @@ public: class TodoConduit : public VCalConduitBase { -Q_OBJECT +TQ_OBJECT public: TodoConduit(KPilotLink *, diff --git a/conduits/vcalconduit/vcal-conduit.h b/conduits/vcalconduit/vcal-conduit.h index 6833fd4..a069edd 100644 --- a/conduits/vcalconduit/vcal-conduit.h +++ b/conduits/vcalconduit/vcal-conduit.h @@ -66,7 +66,7 @@ public: class VCalConduit : public VCalConduitBase { -Q_OBJECT +TQ_OBJECT public: VCalConduit(KPilotLink *, diff --git a/conduits/vcalconduit/vcal-conduitbase.h b/conduits/vcalconduit/vcal-conduitbase.h index bf55248..a52b7f8 100644 --- a/conduits/vcalconduit/vcal-conduitbase.h +++ b/conduits/vcalconduit/vcal-conduitbase.h @@ -74,7 +74,7 @@ public: class VCalConduitBase : public ConduitAction { - Q_OBJECT + TQ_OBJECT public: VCalConduitBase(KPilotLink *, diff --git a/kpilot/addressEditor.h b/kpilot/addressEditor.h index 20a7c4c..9a715a0 100644 --- a/kpilot/addressEditor.h +++ b/kpilot/addressEditor.h @@ -37,7 +37,7 @@ class TQLineEdit; class AddressEditor : public KDialogBase { - Q_OBJECT + TQ_OBJECT diff --git a/kpilot/addressWidget.h b/kpilot/addressWidget.h index a59d3ad..bc7b9a3 100644 --- a/kpilot/addressWidget.h +++ b/kpilot/addressWidget.h @@ -43,7 +43,7 @@ class PilotDatabase; class AddressWidget : public PilotComponent { -Q_OBJECT +TQ_OBJECT public: diff --git a/kpilot/conduitConfigDialog.h b/kpilot/conduitConfigDialog.h index a122e1c..5b44a67 100644 --- a/kpilot/conduitConfigDialog.h +++ b/kpilot/conduitConfigDialog.h @@ -44,7 +44,7 @@ class ConduitConfig; class ConduitConfigWidgetBase : public TDECModule { -Q_OBJECT +TQ_OBJECT public: ConduitConfigWidgetBase(TQWidget *p=0L,const char *n=0L); @@ -59,7 +59,7 @@ public: class ConduitConfigWidget : public ConduitConfigWidgetBase { -Q_OBJECT +TQ_OBJECT public: ConduitConfigWidget(TQWidget *, diff --git a/kpilot/datebookWidget.h b/kpilot/datebookWidget.h index 1cc645c..51af59a 100644 --- a/kpilot/datebookWidget.h +++ b/kpilot/datebookWidget.h @@ -38,7 +38,7 @@ class TDEListView; class DatebookWidget : public PilotComponent { -Q_OBJECT +TQ_OBJECT public: diff --git a/kpilot/dbAppInfoEditor.h b/kpilot/dbAppInfoEditor.h index a21fba7..525bef7 100644 --- a/kpilot/dbAppInfoEditor.h +++ b/kpilot/dbAppInfoEditor.h @@ -34,7 +34,7 @@ class TQWidget; class DBAppInfoEditor : public KDialogBase { -Q_OBJECT +TQ_OBJECT public: DBAppInfoEditor(char*appInfoData, int l, TQWidget *parent = 0); diff --git a/kpilot/dbFlagsEditor.h b/kpilot/dbFlagsEditor.h index 3aab7fa..88bee05 100644 --- a/kpilot/dbFlagsEditor.h +++ b/kpilot/dbFlagsEditor.h @@ -37,7 +37,7 @@ struct DBInfo; */ class DBFlagsEditor : public KDialogBase { -Q_OBJECT +TQ_OBJECT public: DBFlagsEditor(DBInfo*dbinfo=0L, TQWidget *parent = 0); diff --git a/kpilot/dbRecordEditor.h b/kpilot/dbRecordEditor.h index 43f13dd..b69a0ac 100644 --- a/kpilot/dbRecordEditor.h +++ b/kpilot/dbRecordEditor.h @@ -53,7 +53,7 @@ class PilotRecord; */ class DBRecordEditor : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: DBRecordEditor(PilotRecord*r=0L, int n=-1, TQWidget *parent = 0); diff --git a/kpilot/dbSelectionDialog.h b/kpilot/dbSelectionDialog.h index ed2acbc..e729abe 100644 --- a/kpilot/dbSelectionDialog.h +++ b/kpilot/dbSelectionDialog.h @@ -36,7 +36,7 @@ class KPilotDBSelectionWidget; class KPilotDBSelectionDialog : public KDialogBase { -Q_OBJECT +TQ_OBJECT public: KPilotDBSelectionDialog(TQStringList &selectedDBs, TQStringList &deviceDBs, diff --git a/kpilot/dbviewerWidget.h b/kpilot/dbviewerWidget.h index 5d2c30c..23bc52c 100644 --- a/kpilot/dbviewerWidget.h +++ b/kpilot/dbviewerWidget.h @@ -42,7 +42,7 @@ class TDEListView; class GenericDBWidget : public PilotComponent { -Q_OBJECT +TQ_OBJECT public: diff --git a/kpilot/fileInstallWidget.h b/kpilot/fileInstallWidget.h index e61880d..dc52e76 100644 --- a/kpilot/fileInstallWidget.h +++ b/kpilot/fileInstallWidget.h @@ -44,7 +44,7 @@ class FileInstaller; class FileInstallWidget : public PilotComponent { -Q_OBJECT +TQ_OBJECT public: diff --git a/kpilot/fileInstaller.h b/kpilot/fileInstaller.h index 652e4ac..f1646bb 100644 --- a/kpilot/fileInstaller.h +++ b/kpilot/fileInstaller.h @@ -41,7 +41,7 @@ class TQString; class FileInstaller : public TQObject { - Q_OBJECT + TQ_OBJECT public: FileInstaller(); diff --git a/kpilot/hotSync.h b/kpilot/hotSync.h index 308cd3e..680691e 100644 --- a/kpilot/hotSync.h +++ b/kpilot/hotSync.h @@ -51,7 +51,7 @@ protected: class BackupAction : public SyncAction { -Q_OBJECT +TQ_OBJECT public: @@ -117,7 +117,7 @@ private: class FileInstallAction : public SyncAction { -Q_OBJECT +TQ_OBJECT public: FileInstallAction(KPilotLink *, @@ -145,7 +145,7 @@ private: class RestoreAction : public SyncAction { -Q_OBJECT +TQ_OBJECT public: RestoreAction(KPilotLink *,TQWidget *w=0L); diff --git a/kpilot/internalEditorAction.h b/kpilot/internalEditorAction.h index ec9712a..40e4ea3 100644 --- a/kpilot/internalEditorAction.h +++ b/kpilot/internalEditorAction.h @@ -35,7 +35,7 @@ class InternalEditorAction : public SyncAction { -Q_OBJECT +TQ_OBJECT public: diff --git a/kpilot/kpilot.h b/kpilot/kpilot.h index 1dcf947..4f52123 100644 --- a/kpilot/kpilot.h +++ b/kpilot/kpilot.h @@ -49,7 +49,7 @@ class LogWidget; class KPilotInstaller : public TDEMainWindow, public KPilotDCOP { - Q_OBJECT + TQ_OBJECT public: diff --git a/kpilot/kpilotConfigDialog.h b/kpilot/kpilotConfigDialog.h index ac4dfa3..09fa182 100644 --- a/kpilot/kpilotConfigDialog.h +++ b/kpilot/kpilotConfigDialog.h @@ -52,7 +52,7 @@ protected: class DeviceConfigPage : public ConfigPage { -Q_OBJECT +TQ_OBJECT public: DeviceConfigPage( TQWidget *, const char * ); @@ -90,7 +90,7 @@ private: class BackupConfigPage : public ConfigPage { -Q_OBJECT +TQ_OBJECT public: BackupConfigPage( TQWidget *, const char * ); diff --git a/kpilot/kpilotConfigWizard.h b/kpilot/kpilotConfigWizard.h index b5961cf..de5c110 100644 --- a/kpilot/kpilotConfigWizard.h +++ b/kpilot/kpilotConfigWizard.h @@ -36,7 +36,7 @@ class ConfigWizard_base3; class ConfigWizard : public KWizard { -Q_OBJECT +TQ_OBJECT public: enum Mode { InDialog=0, Standalone=1 } ; diff --git a/kpilot/kpilotProbeDialog.h b/kpilot/kpilotProbeDialog.h index 311b326..2202f0e 100644 --- a/kpilot/kpilotProbeDialog.h +++ b/kpilot/kpilotProbeDialog.h @@ -45,7 +45,7 @@ typedef TQMap PilotLinkMap; class ProbeDialog : public KDialogBase { -Q_OBJECT +TQ_OBJECT public: ProbeDialog(TQWidget *p=0L,const char *n=0L); diff --git a/kpilot/listCat.h b/kpilot/listCat.h index a816f37..38118f9 100644 --- a/kpilot/listCat.h +++ b/kpilot/listCat.h @@ -63,7 +63,7 @@ class TQStringList; class ListCategorizer : public TDEListView { - Q_OBJECT + TQ_OBJECT public: diff --git a/kpilot/logFile.h b/kpilot/logFile.h index de4fbd5..e8081ba 100644 --- a/kpilot/logFile.h +++ b/kpilot/logFile.h @@ -38,7 +38,7 @@ class TQTextStream; class LogFile : public TQObject, public LoggerDCOP { -Q_OBJECT +TQ_OBJECT public: diff --git a/kpilot/logWidget.h b/kpilot/logWidget.h index 3dca85f..5a38b1e 100644 --- a/kpilot/logWidget.h +++ b/kpilot/logWidget.h @@ -39,7 +39,7 @@ class KProgress; class LogWidget : public PilotComponent , public LoggerDCOP { -Q_OBJECT +TQ_OBJECT public: diff --git a/kpilot/memoWidget.h b/kpilot/memoWidget.h index fa509b4..433384c 100644 --- a/kpilot/memoWidget.h +++ b/kpilot/memoWidget.h @@ -41,7 +41,7 @@ class PilotListItem; class MemoWidget : public PilotComponent { -Q_OBJECT +TQ_OBJECT public: diff --git a/kpilot/pilotComponent.h b/kpilot/pilotComponent.h index 94c42f3..89089fb 100644 --- a/kpilot/pilotComponent.h +++ b/kpilot/pilotComponent.h @@ -40,7 +40,7 @@ class TQString; class PilotComponent : public TQWidget { -Q_OBJECT +TQ_OBJECT friend class KPilotInstaller; diff --git a/kpilot/pilotDaemon.h b/kpilot/pilotDaemon.h index 4929fb5..a8896f9 100644 --- a/kpilot/pilotDaemon.h +++ b/kpilot/pilotDaemon.h @@ -53,7 +53,7 @@ class KPilotDeviceLink; class PilotDaemonTray : public KSystemTray { - Q_OBJECT + TQ_OBJECT friend class PilotDaemon; @@ -127,7 +127,7 @@ private: class PilotDaemon : public TQObject, virtual public PilotDaemonDCOP { - Q_OBJECT + TQ_OBJECT // The tray must be our friend so that we can let it stop the daemon. diff --git a/kpilot/todoEditor.h b/kpilot/todoEditor.h index bc56014..d36e87b 100644 --- a/kpilot/todoEditor.h +++ b/kpilot/todoEditor.h @@ -42,7 +42,7 @@ class TodoEditorBase; class TodoEditor : public KDialogBase { - Q_OBJECT + TQ_OBJECT diff --git a/kpilot/todoWidget.h b/kpilot/todoWidget.h index 238d818..80f8953 100644 --- a/kpilot/todoWidget.h +++ b/kpilot/todoWidget.h @@ -40,7 +40,7 @@ class TQTextView; class TodoListView : public TDEListView { -Q_OBJECT +TQ_OBJECT public: TodoListView(TQWidget * parent = 0, const char * name = 0 ):TDEListView(parent, name){}; @@ -66,7 +66,7 @@ public: class TodoWidget : public PilotComponent { -Q_OBJECT +TQ_OBJECT public: diff --git a/lib/actionQueue.h b/lib/actionQueue.h index 850b33a..48c9718 100644 --- a/lib/actionQueue.h +++ b/lib/actionQueue.h @@ -56,7 +56,7 @@ */ class KDE_EXPORT ActionQueue : public SyncAction { -Q_OBJECT +TQ_OBJECT public: /** diff --git a/lib/kpilotdevicelink.h b/lib/kpilotdevicelink.h index 673cfb0..f932371 100644 --- a/lib/kpilotdevicelink.h +++ b/lib/kpilotdevicelink.h @@ -74,7 +74,7 @@ class KDE_EXPORT KPilotDeviceLink : public KPilotLink friend class PilotSerialDatabase; friend class DeviceCommThread; -Q_OBJECT +TQ_OBJECT public: diff --git a/lib/kpilotdevicelinkPrivate.h b/lib/kpilotdevicelinkPrivate.h index 573f3e4..e14ffae 100644 --- a/lib/kpilotdevicelinkPrivate.h +++ b/lib/kpilotdevicelinkPrivate.h @@ -215,7 +215,7 @@ class DeviceCommThread : public TQObject, public TQThread { friend class KPilotDeviceLink; -Q_OBJECT +TQ_OBJECT public: diff --git a/lib/kpilotlink.h b/lib/kpilotlink.h index c2fde40..25da326 100644 --- a/lib/kpilotlink.h +++ b/lib/kpilotlink.h @@ -170,7 +170,7 @@ class PilotDatabase; */ class KDE_EXPORT KPilotLink : public TQObject { -Q_OBJECT +TQ_OBJECT friend class SyncAction; public: diff --git a/lib/kpilotlocallink.h b/lib/kpilotlocallink.h index eeeb298..cd3213c 100644 --- a/lib/kpilotlocallink.h +++ b/lib/kpilotlocallink.h @@ -42,7 +42,7 @@ */ class KDE_EXPORT KPilotLocalLink : public KPilotLink { -Q_OBJECT +TQ_OBJECT public: KPilotLocalLink( TQObject *parent=0L, const char *name=0L ); diff --git a/lib/plugin.h b/lib/plugin.h index 37a88ec..f3012c4 100644 --- a/lib/plugin.h +++ b/lib/plugin.h @@ -77,7 +77,7 @@ namespace Pilot */ class KDE_EXPORT ConduitConfigBase : public TQObject { -Q_OBJECT +TQ_OBJECT public: /** @@ -260,7 +260,7 @@ private: class KDE_EXPORT ConduitAction : public SyncAction { -Q_OBJECT +TQ_OBJECT public: @@ -368,7 +368,7 @@ private: */ class ConduitProxy : public ConduitAction { -Q_OBJECT +TQ_OBJECT public: @@ -420,7 +420,7 @@ namespace PluginUtility KDE_EXPORT *
 * class KPilotPlugin : public KLibFactory
 * {
-* Q_OBJECT
+* TQ_OBJECT
   
 *
 * public:
diff --git a/lib/recordConduit.h b/lib/recordConduit.h
index d1499a5..754a248 100644
--- a/lib/recordConduit.h
+++ b/lib/recordConduit.h
@@ -55,7 +55,7 @@ class KPilotDeviceLink;
 
 class RecordConduitBase : public ConduitAction
 {
-Q_OBJECT
+TQ_OBJECT
   
 public:
 	/** Constructor. The TQStringList @p a sets flags for the ConduitAction.
diff --git a/lib/syncAction.h b/lib/syncAction.h
index e2e7f97..3ac16e8 100644
--- a/lib/syncAction.h
+++ b/lib/syncAction.h
@@ -49,7 +49,7 @@ class SyncAction;
 
 class KDE_EXPORT SyncAction : public TQObject
 {
-Q_OBJECT
+TQ_OBJECT
   
 
 public: