diff options
Diffstat (limited to 'kmail')
144 files changed, 282 insertions, 282 deletions
diff --git a/kmail/accountcombobox.h b/kmail/accountcombobox.h index 48c5d6a8..c2e85cf6 100644 --- a/kmail/accountcombobox.h +++ b/kmail/accountcombobox.h @@ -42,7 +42,7 @@ namespace KMail { class AccountComboBox : public TQComboBox { Q_OBJECT - TQ_OBJECT + public: AccountComboBox( TQWidget* parent, const char* name = 0 ); diff --git a/kmail/accountdialog.h b/kmail/accountdialog.h index 8a65d418..cf63c110 100644 --- a/kmail/accountdialog.h +++ b/kmail/accountdialog.h @@ -55,7 +55,7 @@ class FolderRequester; class AccountDialog : public KDialogBase { Q_OBJECT - TQ_OBJECT + public: AccountDialog( const TQString & caption, KMAccount *account, @@ -303,7 +303,7 @@ class AccountDialog : public KDialogBase class NamespaceLineEdit: public KLineEdit { Q_OBJECT - TQ_OBJECT + public: NamespaceLineEdit( TQWidget* parent ); @@ -320,7 +320,7 @@ class NamespaceLineEdit: public KLineEdit class NamespaceEditDialog: public KDialogBase { Q_OBJECT - TQ_OBJECT + public: NamespaceEditDialog( TQWidget* parent, ImapAccountBase::imapNamespace type, diff --git a/kmail/accountmanager.h b/kmail/accountmanager.h index a9ba747d..4afe8bb9 100644 --- a/kmail/accountmanager.h +++ b/kmail/accountmanager.h @@ -35,7 +35,7 @@ namespace KMail { class KDE_EXPORT AccountManager: public TQObject { Q_OBJECT - TQ_OBJECT + friend class ::KMAccount; public: diff --git a/kmail/accountwizard.h b/kmail/accountwizard.h index 6e77dd6e..b6cfe158 100644 --- a/kmail/accountwizard.h +++ b/kmail/accountwizard.h @@ -45,7 +45,7 @@ class KMTransportInfo; class AccountWizard : public KWizard { Q_OBJECT - TQ_OBJECT + public: /** diff --git a/kmail/acljobs.h b/kmail/acljobs.h index d548c621..6404a228 100644 --- a/kmail/acljobs.h +++ b/kmail/acljobs.h @@ -108,7 +108,7 @@ namespace ACLJobs { class GetACLJob : public KIO::SimpleJob { Q_OBJECT - TQ_OBJECT + public: GetACLJob( const KURL& url, const TQByteArray &packedArgs, bool showProgressInfo ); @@ -125,7 +125,7 @@ namespace ACLJobs { class GetUserRightsJob : public KIO::SimpleJob { Q_OBJECT - TQ_OBJECT + public: GetUserRightsJob( const KURL& url, const TQByteArray &packedArgs, bool showProgressInfo ); @@ -142,7 +142,7 @@ namespace ACLJobs { class DeleteACLJob : public KIO::SimpleJob { Q_OBJECT - TQ_OBJECT + public: DeleteACLJob( const KURL& url, const TQString& userId, const TQByteArray &packedArgs, @@ -157,7 +157,7 @@ namespace ACLJobs { /// Set and delete a list of permissions for different users on a given url class MultiSetACLJob : public KIO::Job { Q_OBJECT - TQ_OBJECT + public: MultiSetACLJob( KIO::Slave* slave, const KURL& url, const ACLList& acl, bool showProgressInfo ); diff --git a/kmail/actionscheduler.h b/kmail/actionscheduler.h index 797b9963..54303960 100644 --- a/kmail/actionscheduler.h +++ b/kmail/actionscheduler.h @@ -49,7 +49,7 @@ namespace KMail { class ActionScheduler : public TQObject { Q_OBJECT - TQ_OBJECT + public: enum ReturnCode { ResultOk, ResultError, ResultCriticalError }; diff --git a/kmail/annotationjobs.h b/kmail/annotationjobs.h index c700a4b4..3972a80b 100644 --- a/kmail/annotationjobs.h +++ b/kmail/annotationjobs.h @@ -108,7 +108,7 @@ MultiUrlGetAnnotationJob* multiUrlGetAnnotation( KIO::Slave* slave, class GetAnnotationJob : public KIO::SimpleJob { Q_OBJECT - TQ_OBJECT + public: GetAnnotationJob( const KURL& url, const TQString& entry, const TQByteArray &packedArgs, bool showProgressInfo ); @@ -126,7 +126,7 @@ private: class MultiGetAnnotationJob : public KIO::Job { Q_OBJECT - TQ_OBJECT + public: MultiGetAnnotationJob( KIO::Slave* slave, const KURL& url, const TQStringList& entries, bool showProgressInfo ); @@ -150,7 +150,7 @@ private: class MultiUrlGetAnnotationJob : public KIO::Job { Q_OBJECT - TQ_OBJECT + public: MultiUrlGetAnnotationJob( KIO::Slave* slave, const KURL& baseUrl, @@ -175,7 +175,7 @@ private: class MultiSetAnnotationJob : public KIO::Job { Q_OBJECT - TQ_OBJECT + public: MultiSetAnnotationJob( KIO::Slave* slave, const KURL& url, const AnnotationList& annotations, bool showProgressInfo ); diff --git a/kmail/antispamwizard.h b/kmail/antispamwizard.h index 04ec4104..e66d2f35 100644 --- a/kmail/antispamwizard.h +++ b/kmail/antispamwizard.h @@ -104,7 +104,7 @@ namespace KMail { class AntiSpamWizard : public KWizard { Q_OBJECT - TQ_OBJECT + public: /** The wizard can be used for setting up anti-spam tools and for @@ -299,7 +299,7 @@ namespace KMail { class ASWizInfoPage : public ASWizPage { Q_OBJECT - TQ_OBJECT + public: ASWizInfoPage( AntiSpamWizard::WizardMode mode, @@ -326,7 +326,7 @@ namespace KMail { class ASWizSpamRulesPage : public ASWizPage { Q_OBJECT - TQ_OBJECT + public: ASWizSpamRulesPage( TQWidget * parent, const char * name, KMFolderTree * mainFolderTree ); @@ -359,7 +359,7 @@ namespace KMail { class ASWizVirusRulesPage : public ASWizPage { Q_OBJECT - TQ_OBJECT + public: ASWizVirusRulesPage( TQWidget * parent, const char * name, KMFolderTree * mainFolderTree ); @@ -386,7 +386,7 @@ namespace KMail { class ASWizSummaryPage : public ASWizPage { Q_OBJECT - TQ_OBJECT + public: ASWizSummaryPage( TQWidget * parent, const char * name ); diff --git a/kmail/archivefolderdialog.h b/kmail/archivefolderdialog.h index b38d0aee..cf9133e6 100644 --- a/kmail/archivefolderdialog.h +++ b/kmail/archivefolderdialog.h @@ -33,7 +33,7 @@ class FolderRequester; class ArchiveFolderDialog : public KDialogBase { Q_OBJECT - TQ_OBJECT + public: diff --git a/kmail/attachmentlistview.h b/kmail/attachmentlistview.h index 3f1f83fe..68e39c2d 100644 --- a/kmail/attachmentlistview.h +++ b/kmail/attachmentlistview.h @@ -30,7 +30,7 @@ class Composer; class AttachmentListView : public KListView { Q_OBJECT - TQ_OBJECT + public: AttachmentListView( KMail::Composer * composer = 0, TQWidget* parent = 0, const char* name = 0 ); diff --git a/kmail/backupjob.h b/kmail/backupjob.h index 7a56be17..41aa429b 100644 --- a/kmail/backupjob.h +++ b/kmail/backupjob.h @@ -48,7 +48,7 @@ namespace KMail class BackupJob : public TQObject { Q_OBJECT - TQ_OBJECT + public: diff --git a/kmail/cachedimapjob.h b/kmail/cachedimapjob.h index 9931df70..f37953d3 100644 --- a/kmail/cachedimapjob.h +++ b/kmail/cachedimapjob.h @@ -60,7 +60,7 @@ namespace KMail { class CachedImapJob : public FolderJob { Q_OBJECT - TQ_OBJECT + public: /** Information about a message to be downloaded (from the 'IMAP envelope') */ struct MsgForDownload { diff --git a/kmail/chiasmuskeyselector.h b/kmail/chiasmuskeyselector.h index d136305f..46349796 100644 --- a/kmail/chiasmuskeyselector.h +++ b/kmail/chiasmuskeyselector.h @@ -9,7 +9,7 @@ class TQLabel; class ChiasmusKeySelector : public KDialogBase { Q_OBJECT - TQ_OBJECT + public: ChiasmusKeySelector( TQWidget* parent, const TQString& caption, diff --git a/kmail/colorlistbox.h b/kmail/colorlistbox.h index 384647f6..dd4cee7c 100644 --- a/kmail/colorlistbox.h +++ b/kmail/colorlistbox.h @@ -26,7 +26,7 @@ class ColorListBox : public KListBox { Q_OBJECT - TQ_OBJECT + public: ColorListBox( TQWidget *parent=0, const char * name=0, WFlags f=0 ); diff --git a/kmail/compactionjob.h b/kmail/compactionjob.h index e11e6ece..2b80f006 100644 --- a/kmail/compactionjob.h +++ b/kmail/compactionjob.h @@ -39,7 +39,7 @@ namespace KMail { class MboxCompactionJob : public ScheduledJob { Q_OBJECT - TQ_OBJECT + public: /// @p folder should be a folder with a KMFolderMbox storage. MboxCompactionJob( KMFolder* folder, bool immediate ); @@ -73,7 +73,7 @@ private: class MaildirCompactionJob : public ScheduledJob { Q_OBJECT - TQ_OBJECT + public: /// @p folder should be a folder with a KMFolderMaildir storage. MaildirCompactionJob( KMFolder* folder, bool immediate ); diff --git a/kmail/composer.h b/kmail/composer.h index ac903b37..4bbad316 100644 --- a/kmail/composer.h +++ b/kmail/composer.h @@ -35,7 +35,7 @@ namespace KMail { class Composer : public KMail::SecondaryWindow { Q_OBJECT - TQ_OBJECT + protected: Composer( const char * name=0 ) : KMail::SecondaryWindow( name ) {} public: // mailserviceimpl diff --git a/kmail/configuredialog.h b/kmail/configuredialog.h index ece1d83f..a3ffff0b 100644 --- a/kmail/configuredialog.h +++ b/kmail/configuredialog.h @@ -34,7 +34,7 @@ namespace KMail { class ConfigureDialog : public KCMultiDialog { Q_OBJECT - TQ_OBJECT + public: ConfigureDialog( TQWidget *parent=0, const char *name=0, bool modal=true ); @@ -79,7 +79,7 @@ private: */ class AccountUpdater : public TQObject { Q_OBJECT - TQ_OBJECT + public: AccountUpdater(KMail::ImapAccountBase *account); void update(); diff --git a/kmail/configuredialog_p.h b/kmail/configuredialog_p.h index 51dca5e1..290c9f9d 100644 --- a/kmail/configuredialog_p.h +++ b/kmail/configuredialog_p.h @@ -78,7 +78,7 @@ namespace Kleo { class NewIdentityDialog : public KDialogBase { Q_OBJECT - TQ_OBJECT + public: enum DuplicateMode { Empty, ControlCenter, ExistingEntry }; @@ -124,7 +124,7 @@ typedef TQValueList<LanguageItem> LanguageItemList; class NewLanguageDialog : public KDialogBase { Q_OBJECT - TQ_OBJECT + public: NewLanguageDialog( LanguageItemList & suppressedLangs, TQWidget *parent=0, @@ -139,7 +139,7 @@ class NewLanguageDialog : public KDialogBase class LanguageComboBox : public TQComboBox { Q_OBJECT - TQ_OBJECT + public: LanguageComboBox( bool rw, TQWidget *parent=0, const char *name=0 ); @@ -156,7 +156,7 @@ class LanguageComboBox : public TQComboBox class ProfileDialog : public KDialogBase { Q_OBJECT - TQ_OBJECT + public: ProfileDialog( TQWidget * parent=0, const char * name=0, bool modal=false ); @@ -178,7 +178,7 @@ private: #include <kdialog.h> class ConfigModule : public KCModule { Q_OBJECT - TQ_OBJECT + public: ConfigModule( TQWidget * parent=0, const char * name=0 ) : KCModule ( parent, name ) @@ -206,7 +206,7 @@ signals: // Individual tab of a ConfigModuleWithTabs class ConfigModuleTab : public TQWidget { Q_OBJECT - TQ_OBJECT + public: ConfigModuleTab( TQWidget *parent=0, const char* name=0 ) :TQWidget( parent, name ) @@ -241,7 +241,7 @@ private: */ class ConfigModuleWithTabs : public ConfigModule { Q_OBJECT - TQ_OBJECT + public: ConfigModuleWithTabs( TQWidget * parent=0, const char * name=0 ); ~ConfigModuleWithTabs() {} @@ -269,7 +269,7 @@ private: class KDE_EXPORT IdentityPage : public ConfigModule { Q_OBJECT - TQ_OBJECT + public: IdentityPage( TQWidget * parent=0, const char * name=0 ); ~IdentityPage() {} @@ -320,7 +320,7 @@ private: // data members // subclasses: one class per tab: class AccountsPageSendingTab : public ConfigModuleTab { Q_OBJECT - TQ_OBJECT + public: AccountsPageSendingTab( TQWidget * parent=0, const char * name=0 ); TQString helpAnchor() const; @@ -358,7 +358,7 @@ private: class AccountsPageReceivingTab : public ConfigModuleTab { Q_OBJECT - TQ_OBJECT + public: AccountsPageReceivingTab( TQWidget * parent=0, const char * name=0 ); ~AccountsPageReceivingTab(); @@ -403,7 +403,7 @@ private: class KDE_EXPORT AccountsPage : public ConfigModuleWithTabs { Q_OBJECT - TQ_OBJECT + public: AccountsPage( TQWidget * parent=0, const char * name=0 ); TQString helpAnchor() const; @@ -431,7 +431,7 @@ private: class AppearancePageFontsTab : public ConfigModuleTab { Q_OBJECT - TQ_OBJECT + public: AppearancePageFontsTab( TQWidget * parent=0, const char * name=0 ); TQString helpAnchor() const; @@ -459,7 +459,7 @@ private: class AppearancePageColorsTab : public ConfigModuleTab { Q_OBJECT - TQ_OBJECT + public: AppearancePageColorsTab( TQWidget * parent=0, const char * name=0 ); TQString helpAnchor() const; @@ -481,7 +481,7 @@ private: class AppearancePageLayoutTab : public ConfigModuleTab { Q_OBJECT - TQ_OBJECT + public: AppearancePageLayoutTab( TQWidget * parent=0, const char * name=0 ); TQString helpAnchor() const; @@ -504,7 +504,7 @@ private: // data class AppearancePageHeadersTab : public ConfigModuleTab { Q_OBJECT - TQ_OBJECT + public: AppearancePageHeadersTab( TQWidget * parent=0, const char * name=0 ); @@ -531,7 +531,7 @@ private: // data class AppearancePageReaderTab : public ConfigModuleTab { Q_OBJECT - TQ_OBJECT + public: AppearancePageReaderTab( TQWidget * parent=0, const char * name=0 ); @@ -563,7 +563,7 @@ private: // data class AppearancePageSystemTrayTab : public ConfigModuleTab { Q_OBJECT - TQ_OBJECT + public: AppearancePageSystemTrayTab( TQWidget * parent=0, const char * name=0 ); @@ -582,7 +582,7 @@ private: // data class KDE_EXPORT AppearancePage : public ConfigModuleWithTabs { Q_OBJECT - TQ_OBJECT + public: AppearancePage( TQWidget * parent=0, const char * name=0 ); @@ -613,7 +613,7 @@ private: class ComposerPageGeneralTab : public ConfigModuleTab { Q_OBJECT - TQ_OBJECT + public: ComposerPageGeneralTab( TQWidget * parent=0, const char * name=0 ); TQString helpAnchor() const; @@ -647,7 +647,7 @@ private: class ComposerPagePhrasesTab : public ConfigModuleTab { Q_OBJECT - TQ_OBJECT + public: ComposerPagePhrasesTab( TQWidget * parent=0, const char * name=0 ); TQString helpAnchor() const; @@ -679,7 +679,7 @@ private: class ComposerPageTemplatesTab : public ConfigModuleTab { Q_OBJECT - TQ_OBJECT + public: ComposerPageTemplatesTab( TQWidget * parent=0, const char * name=0 ); TQString helpAnchor() const; @@ -697,7 +697,7 @@ private: class ComposerPageCustomTemplatesTab : public ConfigModuleTab { Q_OBJECT - TQ_OBJECT + public: ComposerPageCustomTemplatesTab( TQWidget * parent=0, const char * name=0 ); TQString helpAnchor() const; @@ -715,7 +715,7 @@ private: class ComposerPageSubjectTab : public ConfigModuleTab { Q_OBJECT - TQ_OBJECT + public: ComposerPageSubjectTab( TQWidget * parent=0, const char * name=0 ); TQString helpAnchor() const; @@ -734,7 +734,7 @@ private: class ComposerPageCharsetTab : public ConfigModuleTab { Q_OBJECT - TQ_OBJECT + public: ComposerPageCharsetTab( TQWidget * parent=0, const char * name=0 ); TQString helpAnchor() const; @@ -756,7 +756,7 @@ private: class ComposerPageHeadersTab : public ConfigModuleTab { Q_OBJECT - TQ_OBJECT + public: ComposerPageHeadersTab( TQWidget * parent=0, const char * name=0 ); TQString helpAnchor() const; @@ -789,7 +789,7 @@ private: class ComposerPageAttachmentsTab : public ConfigModuleTab { Q_OBJECT - TQ_OBJECT + public: ComposerPageAttachmentsTab( TQWidget * parent=0, const char * name=0 ); TQString helpAnchor() const; @@ -811,7 +811,7 @@ private: class KDE_EXPORT ComposerPage : public ConfigModuleWithTabs { Q_OBJECT - TQ_OBJECT + public: ComposerPage( TQWidget * parent=0, const char * name=0 ); @@ -846,7 +846,7 @@ private: class SecurityPageGeneralTab : public ConfigModuleTab { Q_OBJECT - TQ_OBJECT + public: SecurityPageGeneralTab( TQWidget * parent=0, const char * name=0 ); TQString helpAnchor() const; @@ -872,7 +872,7 @@ private: class SecurityPageComposerCryptoTab : public ConfigModuleTab { Q_OBJECT - TQ_OBJECT + public: SecurityPageComposerCryptoTab( TQWidget * parent=0, const char * name=0 ); @@ -892,7 +892,7 @@ private: class SecurityPageWarningTab : public ConfigModuleTab { Q_OBJECT - TQ_OBJECT + public: SecurityPageWarningTab( TQWidget * parent=0, const char * name=0 ); @@ -915,7 +915,7 @@ private: class SecurityPageSMimeTab : public ConfigModuleTab, public DCOPObject { Q_OBJECT - TQ_OBJECT + K_DCOP public: SecurityPageSMimeTab( TQWidget * parent=0, const char * name=0 ); @@ -943,7 +943,7 @@ private: class SecurityPageCryptPlugTab : public ConfigModuleTab { Q_OBJECT - TQ_OBJECT + public: SecurityPageCryptPlugTab( TQWidget * parent = 0, const char* name = 0 ); ~SecurityPageCryptPlugTab(); @@ -962,7 +962,7 @@ private: class KDE_EXPORT SecurityPage : public ConfigModuleWithTabs { Q_OBJECT - TQ_OBJECT + public: SecurityPage( TQWidget * parent=0, const char * name=0 ); @@ -994,7 +994,7 @@ private: class MiscPageFolderTab : public ConfigModuleTab { Q_OBJECT - TQ_OBJECT + public: MiscPageFolderTab( TQWidget * parent=0, const char * name=0 ); @@ -1025,7 +1025,7 @@ private: class MiscPageGroupwareTab : public ConfigModuleTab { Q_OBJECT - TQ_OBJECT + public: MiscPageGroupwareTab( TQWidget * parent=0, const char * name=0 ); void save(); @@ -1067,7 +1067,7 @@ private: class KDE_EXPORT MiscPage : public ConfigModuleWithTabs { Q_OBJECT - TQ_OBJECT + public: MiscPage( TQWidget * parent=0, const char * name=0 ); TQString helpAnchor() const; @@ -1088,7 +1088,7 @@ private: class ListView : public KListView { Q_OBJECT - TQ_OBJECT + public: ListView( TQWidget *parent=0, const char *name=0, int visibleItem=10 ); void resizeColums(); diff --git a/kmail/copyfolderjob.h b/kmail/copyfolderjob.h index 61726cdc..02f05d2d 100644 --- a/kmail/copyfolderjob.h +++ b/kmail/copyfolderjob.h @@ -50,7 +50,7 @@ namespace KMail { class CopyFolderJob : public FolderJob { Q_OBJECT - TQ_OBJECT + public: /** * Create a new job diff --git a/kmail/customtemplates.h b/kmail/customtemplates.h index c850723f..09c8c8fb 100644 --- a/kmail/customtemplates.h +++ b/kmail/customtemplates.h @@ -35,7 +35,7 @@ class KShortcut; class CustomTemplates : public CustomTemplatesBase { Q_OBJECT - TQ_OBJECT + public: diff --git a/kmail/dictionarycombobox.h b/kmail/dictionarycombobox.h index c847baa0..0a8d5c0f 100644 --- a/kmail/dictionarycombobox.h +++ b/kmail/dictionarycombobox.h @@ -47,7 +47,7 @@ namespace KMail { class DictionaryComboBox : public TQComboBox { Q_OBJECT - TQ_OBJECT + public: DictionaryComboBox( TQWidget * parent=0, const char * name=0 ); ~DictionaryComboBox(); diff --git a/kmail/editorwatcher.h b/kmail/editorwatcher.h index d98faa4e..fc08c4db 100644 --- a/kmail/editorwatcher.h +++ b/kmail/editorwatcher.h @@ -38,7 +38,7 @@ namespace KMail { class EditorWatcher : public TQObject { Q_OBJECT - TQ_OBJECT + public: /** * Constructs an EditorWatcher. diff --git a/kmail/expirejob.h b/kmail/expirejob.h index 49a11a03..dbec3d52 100644 --- a/kmail/expirejob.h +++ b/kmail/expirejob.h @@ -36,7 +36,7 @@ namespace KMail { class ExpireJob : public ScheduledJob { Q_OBJECT - TQ_OBJECT + public: ExpireJob( KMFolder* folder, bool immediate ); virtual ~ExpireJob(); diff --git a/kmail/expirypropertiesdialog.h b/kmail/expirypropertiesdialog.h index 2fd55023..b50a73db 100644 --- a/kmail/expirypropertiesdialog.h +++ b/kmail/expirypropertiesdialog.h @@ -33,7 +33,7 @@ namespace KMail { class ExpiryPropertiesDialog : public KDialogBase { Q_OBJECT - TQ_OBJECT + public: ExpiryPropertiesDialog( KMFolderTree* tree, KMFolder* folder ); diff --git a/kmail/favoritefolderview.h b/kmail/favoritefolderview.h index 2119f13d..19fd49a9 100644 --- a/kmail/favoritefolderview.h +++ b/kmail/favoritefolderview.h @@ -28,7 +28,7 @@ class FavoriteFolderView; class FavoriteFolderViewItem : public KMFolderTreeItem { Q_OBJECT - TQ_OBJECT + public: FavoriteFolderViewItem( FavoriteFolderView *parent, const TQString & name, KMFolder* folder ); @@ -46,7 +46,7 @@ class FavoriteFolderViewItem : public KMFolderTreeItem class FavoriteFolderView : public FolderTreeBase { Q_OBJECT - TQ_OBJECT + public: FavoriteFolderView( KMMainWidget *mainWidget, TQWidget *parent = 0 ); diff --git a/kmail/filterimporterexporter.h b/kmail/filterimporterexporter.h index 0c11d34b..1b46ac02 100644 --- a/kmail/filterimporterexporter.h +++ b/kmail/filterimporterexporter.h @@ -68,7 +68,7 @@ private: class FilterSelectionDialog : public KDialogBase { Q_OBJECT - TQ_OBJECT + public: FilterSelectionDialog( TQWidget * parent = 0 ); diff --git a/kmail/filterlog.h b/kmail/filterlog.h index 83a2b383..6e84d6f1 100644 --- a/kmail/filterlog.h +++ b/kmail/filterlog.h @@ -53,7 +53,7 @@ namespace KMail { class FilterLog : public TQObject { Q_OBJECT - TQ_OBJECT + public: /** access to the singleton instance */ diff --git a/kmail/filterlogdlg.h b/kmail/filterlogdlg.h index 724c6214..d7b6a6dc 100644 --- a/kmail/filterlogdlg.h +++ b/kmail/filterlogdlg.h @@ -48,7 +48,7 @@ namespace KMail { class FilterLogDialog : public KDialogBase { Q_OBJECT - TQ_OBJECT + public: /** constructor */ diff --git a/kmail/folderIface.h b/kmail/folderIface.h index 645ab541..e348ea6b 100644 --- a/kmail/folderIface.h +++ b/kmail/folderIface.h @@ -43,7 +43,7 @@ namespace KMail { public DCOPObject { Q_OBJECT -// TQ_OBJECT +// K_DCOP public: diff --git a/kmail/folderdiaacltab.h b/kmail/folderdiaacltab.h index f518cbd3..b5484d7c 100644 --- a/kmail/folderdiaacltab.h +++ b/kmail/folderdiaacltab.h @@ -59,7 +59,7 @@ class ImapAccountBase; */ class ACLEntryDialog :public KDialogBase { Q_OBJECT - TQ_OBJECT + public: ACLEntryDialog( IMAPUserIdFormat userIdFormat, const TQString& caption, TQWidget* parent, const char* name = 0 ); @@ -87,7 +87,7 @@ private: class FolderDiaACLTab : public FolderDiaTab { Q_OBJECT - TQ_OBJECT + public: FolderDiaACLTab( KMFolderDialog* dlg, TQWidget* parent, const char* name = 0 ); diff --git a/kmail/folderdiaquotatab.h b/kmail/folderdiaquotatab.h index b75ae53d..222b7efc 100644 --- a/kmail/folderdiaquotatab.h +++ b/kmail/folderdiaquotatab.h @@ -53,7 +53,7 @@ class ImapAccountBase; class FolderDiaQuotaTab : public FolderDiaTab { Q_OBJECT - TQ_OBJECT + public: FolderDiaQuotaTab( KMFolderDialog* dlg, TQWidget* parent, const char* name = 0 ); diff --git a/kmail/folderdiaquotatab_p.h b/kmail/folderdiaquotatab_p.h index 90eba639..16b6cb5a 100644 --- a/kmail/folderdiaquotatab_p.h +++ b/kmail/folderdiaquotatab_p.h @@ -45,7 +45,7 @@ namespace KMail { class QuotaWidget : public TQWidget { Q_OBJECT - TQ_OBJECT + public: QuotaWidget( TQWidget* parent, const char* name = 0 ); virtual ~QuotaWidget() { } diff --git a/kmail/folderjob.h b/kmail/folderjob.h index c3e54e68..47838044 100644 --- a/kmail/folderjob.h +++ b/kmail/folderjob.h @@ -44,7 +44,7 @@ namespace KMail { class FolderJob : public TQObject { Q_OBJECT - TQ_OBJECT + public: enum JobType { tListMessages, tGetFolder, tCreateFolder, tExpungeFolder, diff --git a/kmail/folderrequester.h b/kmail/folderrequester.h index 4c32aaf8..7434d82a 100644 --- a/kmail/folderrequester.h +++ b/kmail/folderrequester.h @@ -46,7 +46,7 @@ namespace KMail { class FolderRequester: public TQWidget { Q_OBJECT - TQ_OBJECT + public: /** diff --git a/kmail/foldersetselector.h b/kmail/foldersetselector.h index 9c352fc2..bd4fce70 100644 --- a/kmail/foldersetselector.h +++ b/kmail/foldersetselector.h @@ -29,7 +29,7 @@ namespace KMail { class FolderSetSelector : public KDialogBase { Q_OBJECT - TQ_OBJECT + public: FolderSetSelector( KMFolderTree *ft, TQWidget *parent = 0 ); diff --git a/kmail/foldershortcutdialog.h b/kmail/foldershortcutdialog.h index c3b76073..c94bce17 100644 --- a/kmail/foldershortcutdialog.h +++ b/kmail/foldershortcutdialog.h @@ -51,7 +51,7 @@ namespace KMail class FolderShortcutDialog : public KDialogBase { Q_OBJECT - TQ_OBJECT + public: FolderShortcutDialog( KMFolder *folder, KMMainWidget *mw, TQWidget *parent=0, const char *name=0 ); diff --git a/kmail/folderstorage.h b/kmail/folderstorage.h index 3aeefbc4..9771a708 100644 --- a/kmail/folderstorage.h +++ b/kmail/folderstorage.h @@ -79,7 +79,7 @@ typedef TQValueList<TQ_UINT32> SerNumList; class FolderStorage : public TQObject { Q_OBJECT - TQ_OBJECT + public: diff --git a/kmail/foldertreebase.h b/kmail/foldertreebase.h index b8ee7149..7f5c8545 100644 --- a/kmail/foldertreebase.h +++ b/kmail/foldertreebase.h @@ -29,7 +29,7 @@ namespace KMail { class FolderTreeBase : public KFolderTree { Q_OBJECT - TQ_OBJECT + public: FolderTreeBase( KMMainWidget *mainWidget, TQWidget *parent = 0, const char *name = 0 ); diff --git a/kmail/globalsettings.h b/kmail/globalsettings.h index 6b3df406..f0b16f0c 100644 --- a/kmail/globalsettings.h +++ b/kmail/globalsettings.h @@ -31,7 +31,7 @@ class TQTimer; class GlobalSettings : public TQObject, public GlobalSettingsBase { Q_OBJECT - TQ_OBJECT + public: virtual ~GlobalSettings(); diff --git a/kmail/headerlistquicksearch.h b/kmail/headerlistquicksearch.h index 992c3515..d4ae8163 100644 --- a/kmail/headerlistquicksearch.h +++ b/kmail/headerlistquicksearch.h @@ -45,7 +45,7 @@ namespace KMail { class HeaderListQuickSearch : public KListViewSearchLine { Q_OBJECT - TQ_OBJECT + public: HeaderListQuickSearch( TQWidget *parent, KListView *listView, diff --git a/kmail/htmlstatusbar.h b/kmail/htmlstatusbar.h index 20954b82..95af5206 100644 --- a/kmail/htmlstatusbar.h +++ b/kmail/htmlstatusbar.h @@ -60,7 +60,7 @@ namespace KMail { **/ class HtmlStatusBar : public TQLabel { Q_OBJECT - TQ_OBJECT + public: HtmlStatusBar( TQWidget * parent=0, const char * name=0, WFlags f=0 ); virtual ~HtmlStatusBar(); diff --git a/kmail/identitydialog.h b/kmail/identitydialog.h index 61716983..29b50f05 100644 --- a/kmail/identitydialog.h +++ b/kmail/identitydialog.h @@ -61,7 +61,7 @@ namespace KMail { class IdentityDialog : public KDialogBase { Q_OBJECT - TQ_OBJECT + public: IdentityDialog( TQWidget * parent=0, const char * name = 0 ); virtual ~IdentityDialog(); diff --git a/kmail/identitydrag.h b/kmail/identitydrag.h index d0e468a1..1c2ddb0d 100644 --- a/kmail/identitydrag.h +++ b/kmail/identitydrag.h @@ -43,7 +43,7 @@ namespace KMail { **/ class IdentityDrag : public TQDragObject { Q_OBJECT - TQ_OBJECT + public: IdentityDrag( const KPIM::Identity & ident, TQWidget * dragSource=0, const char * name=0 ); diff --git a/kmail/identitylistview.h b/kmail/identitylistview.h index 31b80a77..aa203727 100644 --- a/kmail/identitylistview.h +++ b/kmail/identitylistview.h @@ -68,7 +68,7 @@ namespace KMail { **/ class IdentityListView : public KListView { Q_OBJECT - TQ_OBJECT + public: IdentityListView( TQWidget * parent=0, const char * name=0 ); virtual ~IdentityListView() {} diff --git a/kmail/imapaccountbase.h b/kmail/imapaccountbase.h index 95342f9e..26e5f5e3 100644 --- a/kmail/imapaccountbase.h +++ b/kmail/imapaccountbase.h @@ -58,7 +58,7 @@ namespace KMail { class ImapAccountBase : public KMail::NetworkAccount { Q_OBJECT - TQ_OBJECT + protected: ImapAccountBase( AccountManager * parent, const TQString & name, uint id ); public: diff --git a/kmail/imapjob.h b/kmail/imapjob.h index 04438eb6..5cbbd69e 100644 --- a/kmail/imapjob.h +++ b/kmail/imapjob.h @@ -54,7 +54,7 @@ class AttachmentStrategy; class ImapJob : public FolderJob { Q_OBJECT - TQ_OBJECT + friend class ::KMAcctImap; public: diff --git a/kmail/importarchivedialog.h b/kmail/importarchivedialog.h index c5b8a227..b37c519c 100644 --- a/kmail/importarchivedialog.h +++ b/kmail/importarchivedialog.h @@ -32,7 +32,7 @@ class FolderRequester; class ImportArchiveDialog : public KDialogBase { Q_OBJECT - TQ_OBJECT + public: diff --git a/kmail/importjob.h b/kmail/importjob.h index 74d1d9f5..01b60bef 100644 --- a/kmail/importjob.h +++ b/kmail/importjob.h @@ -52,7 +52,7 @@ namespace KMail class ImportJob : public TQObject { Q_OBJECT - TQ_OBJECT + public: diff --git a/kmail/index.h b/kmail/index.h index bd774944..300d511f 100644 --- a/kmail/index.h +++ b/kmail/index.h @@ -51,7 +51,7 @@ class KMSearchPattern; class KMMsgIndex : public TQObject { Q_OBJECT - TQ_OBJECT + public: explicit KMMsgIndex( TQObject* parent ); ~KMMsgIndex(); @@ -195,7 +195,7 @@ class KMMsgIndex : public TQObject { class KMMsgIndex::Search : public TQObject { Q_OBJECT - TQ_OBJECT + public: explicit Search( KMSearch* s ); ~Search(); diff --git a/kmail/jobscheduler.h b/kmail/jobscheduler.h index c0feed34..52e2cb85 100644 --- a/kmail/jobscheduler.h +++ b/kmail/jobscheduler.h @@ -96,7 +96,7 @@ private: class JobScheduler : public TQObject { Q_OBJECT - TQ_OBJECT + public: JobScheduler( TQObject* parent, const char* name = 0 ); ~JobScheduler(); diff --git a/kmail/khtmlparthtmlwriter.h b/kmail/khtmlparthtmlwriter.h index 7a551584..52fad112 100644 --- a/kmail/khtmlparthtmlwriter.h +++ b/kmail/khtmlparthtmlwriter.h @@ -45,7 +45,7 @@ namespace KMail { class KHtmlPartHtmlWriter : public TQObject, public HtmlWriter { Q_OBJECT - TQ_OBJECT + public: // Key is Content-Id, value is URL typedef TQMap<TQString, TQString> EmbeddedPartMap; diff --git a/kmail/klistboxdialog.h b/kmail/klistboxdialog.h index efb73caf..1ef8ce28 100644 --- a/kmail/klistboxdialog.h +++ b/kmail/klistboxdialog.h @@ -9,7 +9,7 @@ class TQListBox; class KListBoxDialog : public KDialogBase { Q_OBJECT - TQ_OBJECT + public: KListBoxDialog( TQString& _selectedString, diff --git a/kmail/klistviewindexedsearchline.h b/kmail/klistviewindexedsearchline.h index e8ba35c4..9dfd227b 100644 --- a/kmail/klistviewindexedsearchline.h +++ b/kmail/klistviewindexedsearchline.h @@ -49,7 +49,7 @@ class KListViewSearchLine; class TDEUI_EXPORT KListViewIndexedSearchLine: public KMail::HeaderListQuickSearch { Q_OBJECT - TQ_OBJECT + public: diff --git a/kmail/kmaccount.h b/kmail/kmaccount.h index 1c12042b..618fa130 100644 --- a/kmail/kmaccount.h +++ b/kmail/kmaccount.h @@ -52,7 +52,7 @@ typedef TQValueList< ::KMAccount* > AccountList; class KMPrecommand : public TQObject { Q_OBJECT - TQ_OBJECT + public: KMPrecommand(const TQString &precommand, TQObject *parent = 0); @@ -74,7 +74,7 @@ protected: class KMAccount: public TQObject, public KAccount { Q_OBJECT - TQ_OBJECT + friend class KMail::AccountManager; friend class ::KMail::FolderJob; friend class ::AccountsPageReceivingTab; // part of the config dialog diff --git a/kmail/kmacctcachedimap.h b/kmail/kmacctcachedimap.h index a9350c3c..a896fc42 100644 --- a/kmail/kmacctcachedimap.h +++ b/kmail/kmacctcachedimap.h @@ -54,7 +54,7 @@ namespace KIO { class KMAcctCachedImap: public KMail::ImapAccountBase { Q_OBJECT - TQ_OBJECT + friend class ::KMail::ImapJob; friend class ::KMail::CachedImapJob; diff --git a/kmail/kmacctimap.h b/kmail/kmacctimap.h index 1a6c4882..455ab931 100644 --- a/kmail/kmacctimap.h +++ b/kmail/kmacctimap.h @@ -40,7 +40,7 @@ class FolderStorage; class KMAcctImap: public KMail::ImapAccountBase { Q_OBJECT - TQ_OBJECT + friend class KMail::ImapJob; public: diff --git a/kmail/kmacctseldlg.h b/kmail/kmacctseldlg.h index 1430fe15..b28e1f52 100644 --- a/kmail/kmacctseldlg.h +++ b/kmail/kmacctseldlg.h @@ -30,7 +30,7 @@ class KMAcctSelDlg: public KDialogBase { Q_OBJECT - TQ_OBJECT + public: KMAcctSelDlg( TQWidget *parent=0, const char *name=0, bool modal=true ); diff --git a/kmail/kmail_part.h b/kmail/kmail_part.h index 6d0a5382..8501519f 100644 --- a/kmail/kmail_part.h +++ b/kmail/kmail_part.h @@ -52,7 +52,7 @@ class ActionManager; class KDE_EXPORT KMailPart: public KParts::ReadOnlyPart, virtual public KMailPartIface { Q_OBJECT - TQ_OBJECT + public: KMailPart(TQWidget *parentWidget, const char *widgetName, TQObject *parent, const char *name, const TQStringList &); diff --git a/kmail/kmailicalifaceimpl.h b/kmail/kmailicalifaceimpl.h index 90765ed7..3b4a194c 100644 --- a/kmail/kmailicalifaceimpl.h +++ b/kmail/kmailicalifaceimpl.h @@ -83,7 +83,7 @@ public: /** The implementation of the interface. */ class KMailICalIfaceImpl : public TQObject, virtual public KMailICalIface { Q_OBJECT - TQ_OBJECT + public: KMailICalIfaceImpl(); diff --git a/kmail/kmatmlistview.h b/kmail/kmatmlistview.h index f69ea96a..f4d86595 100644 --- a/kmail/kmatmlistview.h +++ b/kmail/kmatmlistview.h @@ -15,7 +15,7 @@ class TQCheckBox; class KMAtmListViewItem : public TQObject, public TQListViewItem { Q_OBJECT - TQ_OBJECT + public: KMAtmListViewItem( TQListView *parent ); diff --git a/kmail/kmcommands.h b/kmail/kmcommands.h index 8f03571b..17c5512e 100644 --- a/kmail/kmcommands.h +++ b/kmail/kmcommands.h @@ -51,7 +51,7 @@ typedef TQMap<partNode*, KMMessage*> PartNodeMessageMap; class KDE_EXPORT KMCommand : public TQObject { Q_OBJECT - TQ_OBJECT + friend class LaterDeleterWithCommandCompletion; public: @@ -165,7 +165,7 @@ private: class KDE_EXPORT KMMailtoComposeCommand : public KMCommand { Q_OBJECT - TQ_OBJECT + public: KMMailtoComposeCommand( const KURL &url, KMMessage *msg=0 ); @@ -180,7 +180,7 @@ private: class KDE_EXPORT KMMailtoReplyCommand : public KMCommand { Q_OBJECT - TQ_OBJECT + public: KMMailtoReplyCommand( TQWidget *parent, const KURL &url, @@ -196,7 +196,7 @@ private: class KDE_EXPORT KMMailtoForwardCommand : public KMCommand { Q_OBJECT - TQ_OBJECT + public: KMMailtoForwardCommand( TQWidget *parent, const KURL &url, @@ -211,7 +211,7 @@ private: class KDE_EXPORT KMMailtoAddAddrBookCommand : public KMCommand { Q_OBJECT - TQ_OBJECT + public: KMMailtoAddAddrBookCommand( const KURL &url, TQWidget *parent ); @@ -225,7 +225,7 @@ private: class KDE_EXPORT KMAddBookmarksCommand : public KMCommand { Q_OBJECT - TQ_OBJECT + public: KMAddBookmarksCommand( const KURL &url, TQWidget *parent ); @@ -240,7 +240,7 @@ private: class KDE_EXPORT KMMailtoOpenAddrBookCommand : public KMCommand { Q_OBJECT - TQ_OBJECT + public: KMMailtoOpenAddrBookCommand( const KURL &url, TQWidget *parent ); @@ -254,7 +254,7 @@ private: class KDE_EXPORT KMUrlCopyCommand : public KMCommand { Q_OBJECT - TQ_OBJECT + public: KMUrlCopyCommand( const KURL &url, KMMainWidget *mainWidget = 0 ); @@ -269,7 +269,7 @@ private: class KDE_EXPORT KMUrlOpenCommand : public KMCommand { Q_OBJECT - TQ_OBJECT + public: KMUrlOpenCommand( const KURL &url, KMReaderWin *readerWin ); @@ -284,7 +284,7 @@ private: class KDE_EXPORT KMUrlSaveCommand : public KMCommand { Q_OBJECT - TQ_OBJECT + public: KMUrlSaveCommand( const KURL &url, TQWidget *parent ); @@ -301,7 +301,7 @@ private: class KDE_EXPORT KMEditMsgCommand : public KMCommand { Q_OBJECT - TQ_OBJECT + public: KMEditMsgCommand( TQWidget *parent, KMMessage *msg ); @@ -313,7 +313,7 @@ private: class KDE_EXPORT KMUseTemplateCommand : public KMCommand { Q_OBJECT - TQ_OBJECT + public: KMUseTemplateCommand( TQWidget *parent, KMMessage *msg ); @@ -325,7 +325,7 @@ private: class KDE_EXPORT KMShowMsgSrcCommand : public KMCommand { Q_OBJECT - TQ_OBJECT + public: KMShowMsgSrcCommand( TQWidget *parent, KMMessage *msg, @@ -340,7 +340,7 @@ private: class KDE_EXPORT KMSaveMsgCommand : public KMCommand { Q_OBJECT - TQ_OBJECT + public: KMSaveMsgCommand( TQWidget *parent, const TQPtrList<KMMsgBase> &msgList ); @@ -372,7 +372,7 @@ private: class KDE_EXPORT KMOpenMsgCommand : public KMCommand { Q_OBJECT - TQ_OBJECT + public: KMOpenMsgCommand( TQWidget *parent, const KURL & url = KURL(), @@ -396,7 +396,7 @@ private: class KDE_EXPORT KMSaveAttachmentsCommand : public KMCommand { Q_OBJECT - TQ_OBJECT + public: /** Use this to save all attachments of the given message. @param parent The parent widget of the command used for message boxes. @@ -435,7 +435,7 @@ private: class KDE_EXPORT KMReplyToCommand : public KMCommand { Q_OBJECT - TQ_OBJECT + public: KMReplyToCommand( TQWidget *parent, KMMessage *msg, @@ -451,7 +451,7 @@ private: class KDE_EXPORT KMNoQuoteReplyToCommand : public KMCommand { Q_OBJECT - TQ_OBJECT + public: KMNoQuoteReplyToCommand( TQWidget *parent, KMMessage *msg ); @@ -463,7 +463,7 @@ private: class KMReplyListCommand : public KMCommand { Q_OBJECT - TQ_OBJECT + public: KMReplyListCommand( TQWidget *parent, KMMessage *msg, @@ -479,7 +479,7 @@ private: class KDE_EXPORT KMReplyToAllCommand : public KMCommand { Q_OBJECT - TQ_OBJECT + public: KMReplyToAllCommand( TQWidget *parent, KMMessage *msg, @@ -495,7 +495,7 @@ private: class KDE_EXPORT KMReplyAuthorCommand : public KMCommand { Q_OBJECT - TQ_OBJECT + public: KMReplyAuthorCommand( TQWidget *parent, KMMessage *msg, @@ -511,7 +511,7 @@ private: class KDE_EXPORT KMForwardInlineCommand : public KMCommand { Q_OBJECT - TQ_OBJECT + public: KMForwardInlineCommand( TQWidget *parent, const TQPtrList<KMMsgBase> &msgList, @@ -529,7 +529,7 @@ private: class KDE_EXPORT KMForwardAttachedCommand : public KMCommand { Q_OBJECT - TQ_OBJECT + public: KMForwardAttachedCommand( TQWidget *parent, const TQPtrList<KMMsgBase> &msgList, @@ -547,7 +547,7 @@ private: class KDE_EXPORT KMForwardDigestCommand : public KMCommand { Q_OBJECT - TQ_OBJECT + public: KMForwardDigestCommand( TQWidget *parent, const TQPtrList<KMMsgBase> &msgList, @@ -565,7 +565,7 @@ private: class KDE_EXPORT KMRedirectCommand : public KMCommand { Q_OBJECT - TQ_OBJECT + public: KMRedirectCommand( TQWidget *parent, KMMessage *msg ); @@ -577,7 +577,7 @@ private: class KDE_EXPORT KMCustomReplyToCommand : public KMCommand { Q_OBJECT - TQ_OBJECT + public: KMCustomReplyToCommand( TQWidget *parent, KMMessage *msg, @@ -595,7 +595,7 @@ private: class KDE_EXPORT KMCustomReplyAllToCommand : public KMCommand { Q_OBJECT - TQ_OBJECT + public: KMCustomReplyAllToCommand( TQWidget *parent, KMMessage *msg, @@ -613,7 +613,7 @@ private: class KDE_EXPORT KMCustomForwardCommand : public KMCommand { Q_OBJECT - TQ_OBJECT + public: KMCustomForwardCommand( TQWidget *parent, const TQPtrList<KMMsgBase> &msgList, @@ -631,7 +631,7 @@ private: class KDE_EXPORT KMPrintCommand : public KMCommand { Q_OBJECT - TQ_OBJECT + public: KMPrintCommand( TQWidget *parent, KMMessage *msg, @@ -659,7 +659,7 @@ private: class KDE_EXPORT KMSeStatusCommand : public KMCommand { Q_OBJECT - TQ_OBJECT + public: // Serial numbers @@ -678,7 +678,7 @@ private: class KDE_EXPORT KMFilterCommand : public KMCommand { Q_OBJECT - TQ_OBJECT + public: KMFilterCommand( const TQCString &field, const TQString &value ); @@ -694,7 +694,7 @@ private: class KDE_EXPORT KMFilterActionCommand : public KMCommand { Q_OBJECT - TQ_OBJECT + public: KMFilterActionCommand( TQWidget *parent, @@ -711,7 +711,7 @@ private: class KDE_EXPORT KMMetaFilterActionCommand : public TQObject { Q_OBJECT - TQ_OBJECT + public: KMMetaFilterActionCommand( KMFilter *filter, KMHeaders *headers, @@ -729,7 +729,7 @@ private: class KDE_EXPORT FolderShortcutCommand : public TQObject { Q_OBJECT - TQ_OBJECT + public: FolderShortcutCommand( KMMainWidget* mainwidget, KMFolder *folder ); @@ -752,7 +752,7 @@ private: class KDE_EXPORT KMMailingListFilterCommand : public KMCommand { Q_OBJECT - TQ_OBJECT + public: KMMailingListFilterCommand( TQWidget *parent, KMMessage *msg ); @@ -772,7 +772,7 @@ private: class KDE_EXPORT KMMenuCommand : public KMCommand { Q_OBJECT - TQ_OBJECT + public: static void folderToPopupMenu(bool move, TQObject *receiver, @@ -785,7 +785,7 @@ public: class KDE_EXPORT KMCopyCommand : public KMMenuCommand { Q_OBJECT - TQ_OBJECT + public: KMCopyCommand( KMFolder* destFolder, @@ -811,7 +811,7 @@ namespace KPIM { class KDE_EXPORT KMMoveCommand : public KMMenuCommand { Q_OBJECT - TQ_OBJECT + public: KMMoveCommand( KMFolder* destFolder, const TQPtrList<KMMsgBase> &msgList ); @@ -847,7 +847,7 @@ private: class KDE_EXPORT KMDeleteMsgCommand : public KMMoveCommand { Q_OBJECT - TQ_OBJECT + public: KMDeleteMsgCommand( KMFolder* srcFolder, const TQPtrList<KMMsgBase> &msgList ); @@ -862,7 +862,7 @@ private: class KDE_EXPORT KMUrlClickedCommand : public KMCommand { Q_OBJECT - TQ_OBJECT + public: KMUrlClickedCommand( const KURL &url, uint identity, @@ -881,7 +881,7 @@ private: class KDE_EXPORT KMLoadPartsCommand : public KMCommand { Q_OBJECT - TQ_OBJECT + public: KMLoadPartsCommand( TQPtrList<partNode>& parts, KMMessage* msg ); @@ -907,7 +907,7 @@ private: class KDE_EXPORT KMResendMessageCommand : public KMCommand { Q_OBJECT - TQ_OBJECT + public: KMResendMessageCommand( TQWidget *parent, KMMessage *msg=0 ); @@ -919,7 +919,7 @@ private: class KDE_EXPORT KMMailingListCommand : public KMCommand { Q_OBJECT - TQ_OBJECT + public: KMMailingListCommand( TQWidget *parent, KMFolder *folder ); private: @@ -935,7 +935,7 @@ protected: class KDE_EXPORT KMMailingListPostCommand : public KMMailingListCommand { Q_OBJECT - TQ_OBJECT + public: KMMailingListPostCommand( TQWidget *parent, KMFolder *folder ); protected: @@ -945,7 +945,7 @@ protected: class KDE_EXPORT KMMailingListSubscribeCommand : public KMMailingListCommand { Q_OBJECT - TQ_OBJECT + public: KMMailingListSubscribeCommand( TQWidget *parent, KMFolder *folder ); protected: @@ -955,7 +955,7 @@ protected: class KDE_EXPORT KMMailingListUnsubscribeCommand : public KMMailingListCommand { Q_OBJECT - TQ_OBJECT + public: KMMailingListUnsubscribeCommand( TQWidget *parent, KMFolder *folder ); protected: @@ -965,7 +965,7 @@ protected: class KDE_EXPORT KMMailingListArchivesCommand : public KMMailingListCommand { Q_OBJECT - TQ_OBJECT + public: KMMailingListArchivesCommand( TQWidget *parent, KMFolder *folder ); protected: @@ -975,7 +975,7 @@ protected: class KDE_EXPORT KMMailingListHelpCommand : public KMMailingListCommand { Q_OBJECT - TQ_OBJECT + public: KMMailingListHelpCommand( TQWidget *parent, KMFolder *folder ); protected: @@ -985,7 +985,7 @@ protected: class KDE_EXPORT KMIMChatCommand : public KMCommand { Q_OBJECT - TQ_OBJECT + public: KMIMChatCommand( const KURL &url, KMMessage *msg=0 ); @@ -1006,7 +1006,7 @@ private: class KDE_EXPORT KMHandleAttachmentCommand : public KMCommand { Q_OBJECT - TQ_OBJECT + public: /** Supported types of attachment handling */ @@ -1093,7 +1093,7 @@ private: class KDE_EXPORT AttachmentModifyCommand : public KMCommand { Q_OBJECT - TQ_OBJECT + public: AttachmentModifyCommand( partNode *node, KMMessage *msg, TQWidget *parent ); AttachmentModifyCommand( int nodeId, KMMessage *msg, TQWidget *parent ); @@ -1121,7 +1121,7 @@ class KDE_EXPORT AttachmentModifyCommand : public KMCommand class KDE_EXPORT KMDeleteAttachmentCommand : public AttachmentModifyCommand { Q_OBJECT - TQ_OBJECT + public: KMDeleteAttachmentCommand( partNode *node, KMMessage *msg, TQWidget *parent ); KMDeleteAttachmentCommand( int nodeId, KMMessage *msg, TQWidget *parent ); @@ -1135,7 +1135,7 @@ class KDE_EXPORT KMDeleteAttachmentCommand : public AttachmentModifyCommand class KDE_EXPORT KMEditAttachmentCommand : public AttachmentModifyCommand { Q_OBJECT - TQ_OBJECT + public: KMEditAttachmentCommand( partNode *node, KMMessage *msg, TQWidget *parent ); KMEditAttachmentCommand( int nodeId, KMMessage *msg, TQWidget *parent ); @@ -1154,7 +1154,7 @@ class KDE_EXPORT KMEditAttachmentCommand : public AttachmentModifyCommand class KDE_EXPORT CreateTodoCommand : public KMCommand { Q_OBJECT - TQ_OBJECT + public: CreateTodoCommand( TQWidget *parent, KMMessage *msg ); diff --git a/kmail/kmcomposewin.h b/kmail/kmcomposewin.h index 1115a846..9918c5c0 100644 --- a/kmail/kmcomposewin.h +++ b/kmail/kmcomposewin.h @@ -99,7 +99,7 @@ namespace GpgME { class KMComposeWin : public KMail::Composer, public MailComposerIface { Q_OBJECT - TQ_OBJECT + friend class ::KMEdit; friend class ::MessageComposer; diff --git a/kmail/kmedit.h b/kmail/kmedit.h index 4d2535e4..2f51f435 100644 --- a/kmail/kmedit.h +++ b/kmail/kmedit.h @@ -65,7 +65,7 @@ class KMSyntaxHighter : public KDictSpellingHighlighter class KMEdit : public KEdit { Q_OBJECT - TQ_OBJECT + public: KMEdit(TQWidget *parent=0,KMComposeWin* composer=0, KSpellConfig* spellConfig = 0, diff --git a/kmail/kmfawidgets.h b/kmail/kmfawidgets.h index 2528f2ba..f5602f5e 100644 --- a/kmail/kmfawidgets.h +++ b/kmail/kmfawidgets.h @@ -18,7 +18,7 @@ class KURLRequester; class KMFilterActionWithAddressWidget : public TQWidget { Q_OBJECT - TQ_OBJECT + public: KMFilterActionWithAddressWidget( TQWidget* parent=0, const char* name=0 ); @@ -41,7 +41,7 @@ private: class KMSoundTestWidget : public TQWidget { Q_OBJECT - TQ_OBJECT + public: KMSoundTestWidget( TQWidget * parent, const char * name=0 ); ~KMSoundTestWidget(); diff --git a/kmail/kmfilterdlg.h b/kmail/kmfilterdlg.h index ed72d991..4742ff40 100644 --- a/kmail/kmfilterdlg.h +++ b/kmail/kmfilterdlg.h @@ -60,7 +60,7 @@ class KListView; class KMFilterListBox : public TQGroupBox { Q_OBJECT - TQ_OBJECT + public: /** Constuctor. */ KMFilterListBox( const TQString & title, TQWidget* parent=0, const char* name=0, bool popFilter = false); @@ -196,7 +196,7 @@ private: class KMFilterActionWidget : public TQHBox { Q_OBJECT - TQ_OBJECT + public: /** Constructor. Creates a filter action widget with no type selected. */ @@ -230,7 +230,7 @@ private: class KMPopFilterActionWidget : public TQVButtonGroup { Q_OBJECT - TQ_OBJECT + public: KMPopFilterActionWidget( const TQString &title, TQWidget* parent=0, const char* name=0 ); void setAction( KMPopFilterAction aAction ); @@ -255,7 +255,7 @@ signals: // Signals class KMFilterActionWidgetLister : public KWidgetLister { Q_OBJECT - TQ_OBJECT + public: KMFilterActionWidgetLister( TQWidget *parent=0, const char* name=0 ); @@ -339,7 +339,7 @@ private: class KMFilterDlg: public KDialogBase { Q_OBJECT - TQ_OBJECT + public: /** Create the filter dialog. The only class which should be able to do this is KMFilterMgr. This ensures that there is only a diff --git a/kmail/kmfiltermgr.h b/kmail/kmfiltermgr.h index 6b0130af..45e77863 100644 --- a/kmail/kmfiltermgr.h +++ b/kmail/kmfiltermgr.h @@ -34,7 +34,7 @@ template <typename T> class TQValueList; class KMFilterMgr: public TQObject { Q_OBJECT - TQ_OBJECT + public: KMFilterMgr(bool popFilter = false); diff --git a/kmail/kmfolder.h b/kmail/kmfolder.h index abf0a2da..fe290000 100644 --- a/kmail/kmfolder.h +++ b/kmail/kmfolder.h @@ -68,7 +68,7 @@ typedef TQValueList<TQ_UINT32> SerNumList; class KMFolder: public KMFolderNode { Q_OBJECT - TQ_OBJECT + friend class ::KMFolderJob; public: diff --git a/kmail/kmfoldercachedimap.h b/kmail/kmfoldercachedimap.h index 613b3752..59c444e6 100644 --- a/kmail/kmfoldercachedimap.h +++ b/kmail/kmfoldercachedimap.h @@ -66,7 +66,7 @@ using KMail::AttachmentStrategy; class DImapTroubleShootDialog : public KDialogBase { Q_OBJECT - TQ_OBJECT + public: enum SelectedOperation { None = -1, @@ -93,7 +93,7 @@ private: class KMFolderCachedImap : public KMFolderMaildir { Q_OBJECT - TQ_OBJECT + public: static TQString cacheLocation() { diff --git a/kmail/kmfoldercombobox.h b/kmail/kmfoldercombobox.h index 7537c5af..ae90497a 100644 --- a/kmail/kmfoldercombobox.h +++ b/kmail/kmfoldercombobox.h @@ -14,7 +14,7 @@ class KMFolderComboBox : public TQComboBox { Q_OBJECT - TQ_OBJECT + public: KMFolderComboBox( TQWidget *parent = 0, char *name = 0 ); diff --git a/kmail/kmfolderdia.h b/kmail/kmfolderdia.h index baec75f8..95f7b31b 100644 --- a/kmail/kmfolderdia.h +++ b/kmail/kmfolderdia.h @@ -70,7 +70,7 @@ namespace KMail { class FolderDiaTab : public TQWidget { Q_OBJECT - TQ_OBJECT + public: FolderDiaTab( TQWidget *parent=0, const char* name=0 ) : TQWidget( parent, name ) {} @@ -112,7 +112,7 @@ signals: class FolderDiaGeneralTab : public FolderDiaTab { Q_OBJECT - TQ_OBJECT + public: FolderDiaGeneralTab( KMFolderDialog* dlg, @@ -164,7 +164,7 @@ private: class FolderDiaTemplatesTab : public FolderDiaTab { Q_OBJECT - TQ_OBJECT + public: FolderDiaTemplatesTab( KMFolderDialog *dlg, TQWidget *parent ); @@ -199,7 +199,7 @@ private: class KMFolderDialog : public KDialogBase { Q_OBJECT - TQ_OBJECT + public: KMFolderDialog( KMFolder *folder, KMFolderDir *aFolderDir, diff --git a/kmail/kmfolderdir.h b/kmail/kmfolderdir.h index 6d33add3..7fe81689 100644 --- a/kmail/kmfolderdir.h +++ b/kmail/kmfolderdir.h @@ -15,7 +15,7 @@ class KMFolderMgr; class KMFolderDir: public KMFolderNode, public KMFolderNodeList { Q_OBJECT - TQ_OBJECT + public: KMFolderDir( KMFolder * owner, KMFolderDir * parent = 0, @@ -71,7 +71,7 @@ protected: class KMFolderRootDir: public KMFolderDir { Q_OBJECT - TQ_OBJECT + public: KMFolderRootDir( KMFolderMgr* manager, diff --git a/kmail/kmfolderimap.h b/kmail/kmfolderimap.h index 14b7d3b9..059e1a4c 100644 --- a/kmail/kmfolderimap.h +++ b/kmail/kmfolderimap.h @@ -78,7 +78,7 @@ private: class KMFolderImap : public KMFolderMbox { Q_OBJECT - TQ_OBJECT + friend class ::KMail::ImapJob; public: diff --git a/kmail/kmfolderindex.h b/kmail/kmfolderindex.h index 563fe5d6..8a8176e6 100644 --- a/kmail/kmfolderindex.h +++ b/kmail/kmfolderindex.h @@ -37,7 +37,7 @@ class KMFolderIndex: public FolderStorage { Q_OBJECT - TQ_OBJECT + //TODO:Have to get rid of this friend declaration and add necessary pure //virtuals to kmfolder.h so that KMMsgBase::parent() can be a plain KMFolder //rather than a KMFolderIndex. Need this for database indices. diff --git a/kmail/kmfoldermaildir.h b/kmail/kmfoldermaildir.h index 1f8dc6ab..832638ad 100644 --- a/kmail/kmfoldermaildir.h +++ b/kmail/kmfoldermaildir.h @@ -24,7 +24,7 @@ using KMail::AttachmentStrategy; class KMFolderMaildir : public KMFolderIndex { Q_OBJECT - TQ_OBJECT + friend class ::KMail::MaildirJob; public: /** Usually a parent is given. But in some cases there is no diff --git a/kmail/kmfoldermbox.h b/kmail/kmfoldermbox.h index 68b52aca..d1993b17 100644 --- a/kmail/kmfoldermbox.h +++ b/kmail/kmfoldermbox.h @@ -47,7 +47,7 @@ using KMail::AttachmentStrategy; class KMFolderMbox : public KMFolderIndex { Q_OBJECT - TQ_OBJECT + friend class ::KMail::MboxJob; public: diff --git a/kmail/kmfoldermgr.h b/kmail/kmfoldermgr.h index 2a0808bb..b6b80ad9 100644 --- a/kmail/kmfoldermgr.h +++ b/kmail/kmfoldermgr.h @@ -16,7 +16,7 @@ class KMFolder; class KMFolderMgr: public TQObject { Q_OBJECT - TQ_OBJECT + public: KMFolderMgr(const TQString& basePath, KMFolderDirType dirType = KMStandardDir); diff --git a/kmail/kmfoldernode.h b/kmail/kmfoldernode.h index aec47e3b..b4542c96 100644 --- a/kmail/kmfoldernode.h +++ b/kmail/kmfoldernode.h @@ -29,7 +29,7 @@ class KMFolderDir; class KMFolderNode: public TQObject { Q_OBJECT - TQ_OBJECT + public: KMFolderNode( KMFolderDir * parent, const TQString & name ); diff --git a/kmail/kmfoldersearch.h b/kmail/kmfoldersearch.h index 3dc9462e..a3fb9706 100644 --- a/kmail/kmfoldersearch.h +++ b/kmail/kmfoldersearch.h @@ -52,7 +52,7 @@ using KMail::AttachmentStrategy; class KMSearch: public TQObject { Q_OBJECT - TQ_OBJECT + public: KMSearch(TQObject * parent = 0, const char * name = 0); @@ -110,7 +110,7 @@ private: class KMFolderSearch: public FolderStorage { Q_OBJECT - TQ_OBJECT + friend class ::KMFolderSearchJob; public: KMFolderSearch(KMFolder* folder, const char* name=0); diff --git a/kmail/kmfolderseldlg.h b/kmail/kmfolderseldlg.h index 2d699b80..1a7f7508 100644 --- a/kmail/kmfolderseldlg.h +++ b/kmail/kmfolderseldlg.h @@ -21,7 +21,7 @@ namespace KMail { class KMFolderSelDlg: public KDialogBase { Q_OBJECT - TQ_OBJECT + public: /** diff --git a/kmail/kmfoldertree.h b/kmail/kmfoldertree.h index 58932c17..696c7cca 100644 --- a/kmail/kmfoldertree.h +++ b/kmail/kmfoldertree.h @@ -45,7 +45,7 @@ template <typename T> class TQGuardedPtr; class KDE_EXPORT KMFolderTreeItem : public TQObject, public KFolderTreeItem { Q_OBJECT - TQ_OBJECT + public: /** Construct a root item _without_ folder */ KMFolderTreeItem( KFolderTree *parent, const TQString & name, @@ -109,7 +109,7 @@ private: class KMFolderTree : public KMail::FolderTreeBase { Q_OBJECT - TQ_OBJECT + public: KMFolderTree( KMMainWidget *mainWidget, TQWidget *parent=0, diff --git a/kmail/kmheaders.h b/kmail/kmheaders.h index 3dce0a66..28b75142 100644 --- a/kmail/kmheaders.h +++ b/kmail/kmheaders.h @@ -48,7 +48,7 @@ enum NestingPolicy { AlwaysOpen = 0, DefaultOpen, DefaultClosed, OpenUnread }; class KMHeaders : public KListView { Q_OBJECT - TQ_OBJECT + friend class ::KMail::HeaderItem; // For easy access to the pixmaps diff --git a/kmail/kmkernel.h b/kmail/kmkernel.h index bfcd053a..c334291e 100644 --- a/kmail/kmkernel.h +++ b/kmail/kmkernel.h @@ -83,7 +83,7 @@ class ConfigureDialog; class KDE_EXPORT KMKernel : public TQObject, virtual public KMailIface { Q_OBJECT - TQ_OBJECT + public: KMKernel (TQObject *parent=0, const char *name=0); diff --git a/kmail/kmlineeditspell.h b/kmail/kmlineeditspell.h index c5681573..536d3158 100644 --- a/kmail/kmlineeditspell.h +++ b/kmail/kmlineeditspell.h @@ -12,7 +12,7 @@ class TQPopupMenu; class KMLineEdit : public KPIM::AddresseeLineEdit { Q_OBJECT - TQ_OBJECT + public: KMLineEdit(bool useCompletion, TQWidget *parent = 0, const char *name = 0); @@ -41,7 +41,7 @@ private: class KMLineEditSpell : public KMLineEdit { Q_OBJECT - TQ_OBJECT + public: KMLineEditSpell(bool useCompletion, TQWidget *parent = 0, const char *name = 0); diff --git a/kmail/kmmainwidget.h b/kmail/kmmainwidget.h index e67f4fbd..fbfd9eeb 100644 --- a/kmail/kmmainwidget.h +++ b/kmail/kmmainwidget.h @@ -82,7 +82,7 @@ typedef TQMap<int,KMFolder*> KMMenuToFolder; class KDE_EXPORT KMMainWidget : public TQWidget { Q_OBJECT - TQ_OBJECT + public: KMMainWidget(TQWidget *parent, const char *name, diff --git a/kmail/kmmainwin.h b/kmail/kmmainwin.h index e4c9fa04..aa545244 100644 --- a/kmail/kmmainwin.h +++ b/kmail/kmmainwin.h @@ -35,7 +35,7 @@ using KPIM::ProgressDialog; class KMMainWin : public KMainWindow { Q_OBJECT - TQ_OBJECT + public: // the main window needs to have a name since else restoring the window diff --git a/kmail/kmmimeparttree.h b/kmail/kmmimeparttree.h index c8d3c598..e6985d2c 100644 --- a/kmail/kmmimeparttree.h +++ b/kmail/kmmimeparttree.h @@ -47,7 +47,7 @@ class KMMimePartTreeItem; class KMMimePartTree : public KListView { Q_OBJECT - TQ_OBJECT + friend class ::KMReaderWin; public: diff --git a/kmail/kmmsgpartdlg.h b/kmail/kmmsgpartdlg.h index 723ebda7..1a7a83d3 100644 --- a/kmail/kmmsgpartdlg.h +++ b/kmail/kmmsgpartdlg.h @@ -39,7 +39,7 @@ class TQLineEdit; class KMMsgPartDialog: public KDialogBase { Q_OBJECT - TQ_OBJECT + public: KMMsgPartDialog( const TQString & caption=TQString(), @@ -140,7 +140,7 @@ protected: */ class KMMsgPartDialogCompat : public KMMsgPartDialog { Q_OBJECT - TQ_OBJECT + public: KMMsgPartDialogCompat( TQWidget * parent=0, const char * caption=0, bool=FALSE ); virtual ~KMMsgPartDialogCompat(); diff --git a/kmail/kmpopfiltercnfrmdlg.h b/kmail/kmpopfiltercnfrmdlg.h index 8055faea..98a277e5 100644 --- a/kmail/kmpopfiltercnfrmdlg.h +++ b/kmail/kmpopfiltercnfrmdlg.h @@ -36,7 +36,7 @@ class KMPopFilterCnfrmDlg; class KMPopHeadersView : public KListView { Q_OBJECT - TQ_OBJECT + public: KMPopHeadersView(TQWidget *aParent=0, KMPopFilterCnfrmDlg *aDialog=0); @@ -79,7 +79,7 @@ class KMPopFilterCnfrmDlg : public KDialogBase { friend class ::KMPopHeadersView; Q_OBJECT - TQ_OBJECT + protected: KMPopFilterCnfrmDlg() { }; TQMap<TQListViewItem*, KMPopHeaders*> mItemMap; diff --git a/kmail/kmreadermainwin.h b/kmail/kmreadermainwin.h index 83d87267..ca4f29e7 100644 --- a/kmail/kmreadermainwin.h +++ b/kmail/kmreadermainwin.h @@ -25,7 +25,7 @@ class MessageActions; class KMReaderMainWin : public KMail::SecondaryWindow { Q_OBJECT - TQ_OBJECT + public: KMReaderMainWin( bool htmlOverride, bool htmlLoadExtOverride, char *name = 0 ); diff --git a/kmail/kmreaderwin.h b/kmail/kmreaderwin.h index baa63731..f8c4e74e 100644 --- a/kmail/kmreaderwin.h +++ b/kmail/kmreaderwin.h @@ -75,7 +75,7 @@ namespace KParts { class KMReaderWin: public TQWidget, public KMail::Interface::Observer { Q_OBJECT - TQ_OBJECT + friend void KMMimePartTree::itemClicked( TQListViewItem* item ); friend void KMMimePartTree::itemRightClicked( TQListViewItem* item, const TQPoint & ); diff --git a/kmail/kmsearchpatternedit.h b/kmail/kmsearchpatternedit.h index 625d8f86..77089df4 100644 --- a/kmail/kmsearchpatternedit.h +++ b/kmail/kmsearchpatternedit.h @@ -40,7 +40,7 @@ class KMSearchPatternEdit; class KMSearchRuleWidget : public TQWidget { Q_OBJECT - TQ_OBJECT + public: /** Constructor. You can give a KMSearchRule as parameter, which will be used to initialize the widget. */ @@ -106,7 +106,7 @@ private: class KMSearchRuleWidgetLister : public KWidgetLister { Q_OBJECT - TQ_OBJECT + friend class ::KMSearchPatternEdit; @@ -167,7 +167,7 @@ private: class KMSearchPatternEdit : public TQGroupBox { Q_OBJECT - TQ_OBJECT + public: /** Constructor. The parent and name parameters are passed to the underlying TQGroupBox, as usual. */ diff --git a/kmail/kmsender.h b/kmail/kmsender.h index 36153a2a..e01cba08 100644 --- a/kmail/kmsender.h +++ b/kmail/kmsender.h @@ -53,7 +53,7 @@ namespace KPIM { class KMSender: public TQObject, public KMail::MessageSender { Q_OBJECT - TQ_OBJECT + friend class ::KMSendProc; friend class ::KMSendSendmail; friend class ::KMSendSMTP; diff --git a/kmail/kmsender_p.h b/kmail/kmsender_p.h index ddfb56f9..74520389 100644 --- a/kmail/kmsender_p.h +++ b/kmail/kmsender_p.h @@ -23,7 +23,7 @@ namespace KIO { class KMSendProc: public TQObject { Q_OBJECT - TQ_OBJECT + public: KMSendProc(KMSender*); @@ -87,7 +87,7 @@ protected: class KMSendSendmail: public KMSendProc { Q_OBJECT - TQ_OBJECT + public: KMSendSendmail(KMSender*); ~KMSendSendmail(); @@ -118,7 +118,7 @@ private: class KMSendSMTP : public KMSendProc { Q_OBJECT - TQ_OBJECT + public: KMSendSMTP(KMSender *sender); ~KMSendSMTP(); diff --git a/kmail/kmservertest.h b/kmail/kmservertest.h index ca2392a7..74fa8833 100644 --- a/kmail/kmservertest.h +++ b/kmail/kmservertest.h @@ -47,7 +47,7 @@ namespace KIO { class KMServerTest : public TQObject { Q_OBJECT - TQ_OBJECT + public: KMServerTest( const TQString & protocol, const TQString & host, int port ); diff --git a/kmail/kmsystemtray.h b/kmail/kmsystemtray.h index 5e02b15b..208dd0c7 100644 --- a/kmail/kmsystemtray.h +++ b/kmail/kmsystemtray.h @@ -41,7 +41,7 @@ class TQPoint; class KMSystemTray : public KSystemTray { Q_OBJECT - TQ_OBJECT + public: /** construtor */ KMSystemTray(TQWidget* parent=0, const char *name=0); diff --git a/kmail/kmtransport.h b/kmail/kmtransport.h index ba43ebc0..e4dd6f1e 100644 --- a/kmail/kmtransport.h +++ b/kmail/kmtransport.h @@ -64,7 +64,7 @@ public: class KMTransportSelDlg : public KDialogBase { Q_OBJECT - TQ_OBJECT + public: KMTransportSelDlg( TQWidget *parent=0, const char *name=0, bool modal=TRUE ); @@ -80,7 +80,7 @@ private: class KMTransportDialog : public KDialogBase { Q_OBJECT - TQ_OBJECT + public: KMTransportDialog( const TQString & caption, KMTransportInfo *transportInfo, diff --git a/kmail/listjob.h b/kmail/listjob.h index 8f4ac73d..fc289569 100644 --- a/kmail/listjob.h +++ b/kmail/listjob.h @@ -54,7 +54,7 @@ namespace KMail { class ListJob : public FolderJob { Q_OBJECT - TQ_OBJECT + public: /** * Create a new job diff --git a/kmail/localsubscriptiondialog.h b/kmail/localsubscriptiondialog.h index d7f3dd0b..601a8463 100644 --- a/kmail/localsubscriptiondialog.h +++ b/kmail/localsubscriptiondialog.h @@ -40,7 +40,7 @@ namespace KMail { class LocalSubscriptionDialog: public SubscriptionDialog { Q_OBJECT - TQ_OBJECT + public: LocalSubscriptionDialog( TQWidget *parent, const TQString &caption, diff --git a/kmail/maildirjob.h b/kmail/maildirjob.h index d31635cc..1d5a9710 100644 --- a/kmail/maildirjob.h +++ b/kmail/maildirjob.h @@ -41,7 +41,7 @@ namespace KMail { class MaildirJob : public FolderJob { Q_OBJECT - TQ_OBJECT + public: MaildirJob( KMMessage *msg, JobType jt = tGetMessage, KMFolder *folder = 0 ); MaildirJob( TQPtrList<KMMessage>& msgList, const TQString& sets, diff --git a/kmail/mailinglistpropertiesdialog.h b/kmail/mailinglistpropertiesdialog.h index ed7073a6..e527a5ae 100644 --- a/kmail/mailinglistpropertiesdialog.h +++ b/kmail/mailinglistpropertiesdialog.h @@ -45,7 +45,7 @@ namespace KMail class MailingListFolderPropertiesDialog : public KDialogBase { Q_OBJECT - TQ_OBJECT + public: MailingListFolderPropertiesDialog( TQWidget *parent, KMFolder *folder ); ~MailingListFolderPropertiesDialog() {}; diff --git a/kmail/managesievescriptsdialog.h b/kmail/managesievescriptsdialog.h index 048fbcdd..25a53dad 100644 --- a/kmail/managesievescriptsdialog.h +++ b/kmail/managesievescriptsdialog.h @@ -15,7 +15,7 @@ class SieveEditor; class ManageSieveScriptsDialog : public KDialogBase { Q_OBJECT - TQ_OBJECT + public: ManageSieveScriptsDialog( TQWidget * parent=0, const char * name=0 ); ~ManageSieveScriptsDialog(); diff --git a/kmail/managesievescriptsdialog_p.h b/kmail/managesievescriptsdialog_p.h index f860ffb5..584d011b 100644 --- a/kmail/managesievescriptsdialog_p.h +++ b/kmail/managesievescriptsdialog_p.h @@ -9,7 +9,7 @@ namespace KMail { class SieveEditor : public KDialogBase { Q_OBJECT - TQ_OBJECT + TQ_PROPERTY( TQString script READ script WRITE setScript ) public: SieveEditor( TQWidget * parent=0, const char * name=0 ); diff --git a/kmail/mboxjob.h b/kmail/mboxjob.h index 656a3928..9b1d2dea 100644 --- a/kmail/mboxjob.h +++ b/kmail/mboxjob.h @@ -41,7 +41,7 @@ namespace KMail { class MboxJob : public FolderJob { Q_OBJECT - TQ_OBJECT + friend class ::KMFolderMbox; public: MboxJob( KMMessage *msg, JobType jt = tGetMessage, KMFolder *folder = 0 ); diff --git a/kmail/messageactions.h b/kmail/messageactions.h index f0b47372..e2256123 100644 --- a/kmail/messageactions.h +++ b/kmail/messageactions.h @@ -39,7 +39,7 @@ namespace KMail { class MessageActions : public TQObject { Q_OBJECT - TQ_OBJECT + public: MessageActions( KActionCollection* ac, TQWidget *parent ); void setMessageView( KMReaderWin *msgView ); diff --git a/kmail/messagecomposer.h b/kmail/messagecomposer.h index f6392b83..11290cc2 100644 --- a/kmail/messagecomposer.h +++ b/kmail/messagecomposer.h @@ -64,7 +64,7 @@ namespace KPIM { class MessageComposer : public TQObject { Q_OBJECT - TQ_OBJECT + friend class ::MessageComposerJob; friend class ::EncryptMessageJob; friend class ::SetLastMessageAsUnencryptedVersionOfLastButOne; diff --git a/kmail/messagecopyhelper.h b/kmail/messagecopyhelper.h index 05627e17..6d38d7b5 100644 --- a/kmail/messagecopyhelper.h +++ b/kmail/messagecopyhelper.h @@ -39,7 +39,7 @@ namespace KMail { class MessageCopyHelper : public TQObject { Q_OBJECT - TQ_OBJECT + public: /** diff --git a/kmail/messageproperty.h b/kmail/messageproperty.h index bd040ef5..fdd3f35d 100644 --- a/kmail/messageproperty.h +++ b/kmail/messageproperty.h @@ -57,7 +57,7 @@ class ActionScheduler; class MessageProperty : public TQObject { Q_OBJECT - TQ_OBJECT + public: /** If the message is being filtered */ diff --git a/kmail/networkaccount.h b/kmail/networkaccount.h index 433e30af..112cc71d 100644 --- a/kmail/networkaccount.h +++ b/kmail/networkaccount.h @@ -45,7 +45,7 @@ namespace KMail { class NetworkAccount : public KMAccount { Q_OBJECT - TQ_OBJECT + protected: NetworkAccount( AccountManager * parent, const TQString & name, uint id ); public: diff --git a/kmail/newfolderdialog.h b/kmail/newfolderdialog.h index 485bf910..96cfc277 100644 --- a/kmail/newfolderdialog.h +++ b/kmail/newfolderdialog.h @@ -47,7 +47,7 @@ namespace KMail { class NewFolderDialog : public KDialogBase { Q_OBJECT - TQ_OBJECT + public: NewFolderDialog( TQWidget* parent = 0, KMFolder *folder = 0 ); diff --git a/kmail/objecttreeparser_p.h b/kmail/objecttreeparser_p.h index 5bac65f6..44a1e9af 100644 --- a/kmail/objecttreeparser_p.h +++ b/kmail/objecttreeparser_p.h @@ -61,7 +61,7 @@ namespace KMail { public KMail::ISubject { Q_OBJECT - TQ_OBJECT + public: CryptoBodyPartMemento(); ~CryptoBodyPartMemento(); @@ -88,7 +88,7 @@ namespace KMail { : public CryptoBodyPartMemento { Q_OBJECT - TQ_OBJECT + public: DecryptVerifyBodyPartMemento( Kleo::DecryptVerifyJob * job, const TQByteArray & cipherText ); ~DecryptVerifyBodyPartMemento(); @@ -124,7 +124,7 @@ namespace KMail { : public CryptoBodyPartMemento { Q_OBJECT - TQ_OBJECT + public: VerifyDetachedBodyPartMemento( Kleo::VerifyDetachedJob * job, Kleo::KeyListJob * klj, @@ -164,7 +164,7 @@ namespace KMail { : public CryptoBodyPartMemento { Q_OBJECT - TQ_OBJECT + public: VerifyOpaqueBodyPartMemento( Kleo::VerifyOpaqueJob * job, Kleo::KeyListJob * klj, diff --git a/kmail/popaccount.h b/kmail/popaccount.h index 4c8dfdd5..51cb8452 100644 --- a/kmail/popaccount.h +++ b/kmail/popaccount.h @@ -27,7 +27,7 @@ namespace KMail { */ class PopAccount: public NetworkAccount { Q_OBJECT - TQ_OBJECT + public: virtual ~PopAccount(); diff --git a/kmail/quotajobs.h b/kmail/quotajobs.h index 0188a1eb..1db1b3d2 100644 --- a/kmail/quotajobs.h +++ b/kmail/quotajobs.h @@ -137,7 +137,7 @@ GetStorageQuotaJob* getStorageQuota( KIO::Slave* slave, const KURL& url ); class GetQuotarootJob : public KIO::SimpleJob { Q_OBJECT - TQ_OBJECT + public: GetQuotarootJob( const KURL& url, const TQByteArray &packedArgs, bool showProgressInfo ); @@ -164,7 +164,7 @@ protected slots: class GetStorageQuotaJob : public KIO::Job { Q_OBJECT - TQ_OBJECT + public: GetStorageQuotaJob( KIO::Slave* slave, const KURL& url ); diff --git a/kmail/recipientseditor.h b/kmail/recipientseditor.h index db63c8fe..aadf25bc 100644 --- a/kmail/recipientseditor.h +++ b/kmail/recipientseditor.h @@ -72,7 +72,7 @@ class Recipient class RecipientComboBox : public TQComboBox { Q_OBJECT - TQ_OBJECT + public: RecipientComboBox( TQWidget *parent ); @@ -86,7 +86,7 @@ class RecipientComboBox : public TQComboBox class RecipientLineEdit : public KMLineEdit { Q_OBJECT - TQ_OBJECT + public: RecipientLineEdit( TQWidget * parent ) : KMLineEdit( true, parent ) {} @@ -103,7 +103,7 @@ class RecipientLineEdit : public KMLineEdit class RecipientLine : public TQWidget { Q_OBJECT - TQ_OBJECT + public: RecipientLine( TQWidget *parent ); @@ -173,7 +173,7 @@ class RecipientLine : public TQWidget class RecipientsView : public TQScrollView { Q_OBJECT - TQ_OBJECT + public: RecipientsView( TQWidget *parent ); @@ -267,7 +267,7 @@ class RecipientsToolTip : public TQToolTip class SideWidget : public TQWidget { Q_OBJECT - TQ_OBJECT + public: SideWidget( RecipientsView *view, TQWidget *parent ); ~SideWidget(); @@ -299,7 +299,7 @@ class SideWidget : public TQWidget class RecipientsEditor : public TQWidget { Q_OBJECT - TQ_OBJECT + public: RecipientsEditor( TQWidget *parent ); ~RecipientsEditor(); diff --git a/kmail/recipientseditortest.h b/kmail/recipientseditortest.h index 77387218..12d0c2fc 100644 --- a/kmail/recipientseditortest.h +++ b/kmail/recipientseditortest.h @@ -31,7 +31,7 @@ class RecipientsEditor; class Composer : public TQWidget { Q_OBJECT - TQ_OBJECT + public: Composer( TQWidget *parent ); diff --git a/kmail/recipientspicker.h b/kmail/recipientspicker.h index fb6e657f..85f7432a 100644 --- a/kmail/recipientspicker.h +++ b/kmail/recipientspicker.h @@ -163,7 +163,7 @@ class RecipientsCollection class SearchLine : public KListViewSearchLine { Q_OBJECT - TQ_OBJECT + public: SearchLine( TQWidget *parent, KListView *listView ); @@ -179,7 +179,7 @@ using namespace KABC; class RecipientsPicker : public TQDialog { Q_OBJECT - TQ_OBJECT + public: RecipientsPicker( TQWidget *parent ); ~RecipientsPicker(); diff --git a/kmail/redirectdialog.h b/kmail/redirectdialog.h index c3480313..aa46404f 100644 --- a/kmail/redirectdialog.h +++ b/kmail/redirectdialog.h @@ -50,7 +50,7 @@ namespace KMail { class RedirectDialog : public KDialogBase { Q_OBJECT - TQ_OBJECT + public: /** Constructor diff --git a/kmail/regexplineedit.h b/kmail/regexplineedit.h index 2cfeaa4a..4db2e922 100644 --- a/kmail/regexplineedit.h +++ b/kmail/regexplineedit.h @@ -47,7 +47,7 @@ namespace KMail { class RegExpLineEdit : public TQWidget { Q_OBJECT - TQ_OBJECT + public: RegExpLineEdit( const TQString &str, TQWidget *parent = 0, diff --git a/kmail/renamejob.h b/kmail/renamejob.h index 9389fc0c..58a8f6d3 100644 --- a/kmail/renamejob.h +++ b/kmail/renamejob.h @@ -51,7 +51,7 @@ class CopyFolderJob; class RenameJob : public FolderJob { Q_OBJECT - TQ_OBJECT + public: /** * Create a new job diff --git a/kmail/searchjob.h b/kmail/searchjob.h index 7e59fb7f..d90f7fa1 100644 --- a/kmail/searchjob.h +++ b/kmail/searchjob.h @@ -53,7 +53,7 @@ class ImapAccountBase; class SearchJob : public FolderJob { Q_OBJECT - TQ_OBJECT + public: /** * Creates a new job diff --git a/kmail/searchwindow.h b/kmail/searchwindow.h index 19183e66..0cd5303a 100644 --- a/kmail/searchwindow.h +++ b/kmail/searchwindow.h @@ -68,7 +68,7 @@ namespace KMail { class SearchWindow: public KDialogBase, virtual public KXMLGUIClient { Q_OBJECT - TQ_OBJECT + public: /** diff --git a/kmail/secondarywindow.h b/kmail/secondarywindow.h index c17d604e..11d6cbae 100644 --- a/kmail/secondarywindow.h +++ b/kmail/secondarywindow.h @@ -44,7 +44,7 @@ namespace KMail { class SecondaryWindow : public KMainWindow { Q_OBJECT - TQ_OBJECT + public: SecondaryWindow( const char * name = 0 ); diff --git a/kmail/sieveconfig.h b/kmail/sieveconfig.h index 2765f6a5..5c6fb4ad 100644 --- a/kmail/sieveconfig.h +++ b/kmail/sieveconfig.h @@ -87,7 +87,7 @@ namespace KMail { class SieveConfigEditor : public TQWidget { Q_OBJECT - TQ_OBJECT + public: SieveConfigEditor( TQWidget * parent=0, const char * name=0 ); diff --git a/kmail/sievedebugdialog.h b/kmail/sievedebugdialog.h index 669a13d5..7eacab62 100644 --- a/kmail/sievedebugdialog.h +++ b/kmail/sievedebugdialog.h @@ -50,7 +50,7 @@ class SieveJob; class SieveDebugDialog : public KDialogBase { Q_OBJECT - TQ_OBJECT + public: SieveDebugDialog( TQWidget *parent = 0, const char *name = 0 ); diff --git a/kmail/sievejob.h b/kmail/sievejob.h index ddf3e6a9..a350740f 100644 --- a/kmail/sievejob.h +++ b/kmail/sievejob.h @@ -33,7 +33,7 @@ namespace KMail { class SieveJob : public TQObject { Q_OBJECT - TQ_OBJECT + protected: enum Command { Get, Put, Activate, Deactivate, SearchActive, List, Delete }; SieveJob( const KURL & url, const TQString & script, diff --git a/kmail/signatureconfigurator.h b/kmail/signatureconfigurator.h index 2d46ac5d..48e6c5d6 100644 --- a/kmail/signatureconfigurator.h +++ b/kmail/signatureconfigurator.h @@ -33,7 +33,7 @@ namespace KMail { class SignatureConfigurator : public TQWidget { Q_OBJECT - TQ_OBJECT + public: SignatureConfigurator( TQWidget * parent=0, const char * name=0 ); virtual ~SignatureConfigurator(); diff --git a/kmail/simplestringlisteditor.h b/kmail/simplestringlisteditor.h index 49169f7a..cb28d57b 100644 --- a/kmail/simplestringlisteditor.h +++ b/kmail/simplestringlisteditor.h @@ -47,7 +47,7 @@ class TQPushButton; class SimpleStringListEditor : public TQWidget { Q_OBJECT - TQ_OBJECT + public: enum ButtonCode { None = 0x00, Add = 0x01, diff --git a/kmail/snippetdlg.h b/kmail/snippetdlg.h index bc845a90..4aa89c1d 100644 --- a/kmail/snippetdlg.h +++ b/kmail/snippetdlg.h @@ -19,7 +19,7 @@ class KShortcut; class SnippetDlg : public SnippetDlgBase { Q_OBJECT - TQ_OBJECT + public: SnippetDlg( KActionCollection* ac, TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); diff --git a/kmail/snippetitem.h b/kmail/snippetitem.h index 4274fde8..3222449a 100644 --- a/kmail/snippetitem.h +++ b/kmail/snippetitem.h @@ -33,7 +33,7 @@ class SnippetItem : public TQObject, public TQListViewItem { friend class SnippetGroup; Q_OBJECT - TQ_OBJECT + public: SnippetItem(TQListViewItem * parent, TQString name, TQString text); diff --git a/kmail/snippetsettings.h b/kmail/snippetsettings.h index 6d908a9f..706de5af 100644 --- a/kmail/snippetsettings.h +++ b/kmail/snippetsettings.h @@ -29,7 +29,7 @@ same named .ui file class SnippetSettings : public SnippetSettingsBase { Q_OBJECT - TQ_OBJECT + public: SnippetSettings(TQWidget *parent = 0, const char *name = 0); SnippetSettings(SnippetWidget * w, TQWidget *parent = 0, const char *name = 0); diff --git a/kmail/snippetwidget.h b/kmail/snippetwidget.h index 45d684ec..120f64ad 100644 --- a/kmail/snippetwidget.h +++ b/kmail/snippetwidget.h @@ -45,7 +45,7 @@ tooltips which contains the text of the snippet class SnippetWidget : public KListView, public TQToolTip { Q_OBJECT - TQ_OBJECT + public: SnippetWidget(KMEdit* editor, KActionCollection* actionCollection, TQWidget* parent = 0); diff --git a/kmail/subscriptiondialog.h b/kmail/subscriptiondialog.h index 9d16c9e2..30a06d9f 100644 --- a/kmail/subscriptiondialog.h +++ b/kmail/subscriptiondialog.h @@ -47,7 +47,7 @@ namespace KMail { class SubscriptionDialogBase : public KSubscription { Q_OBJECT - TQ_OBJECT + public: SubscriptionDialogBase( TQWidget *parent, @@ -128,7 +128,7 @@ namespace KMail { class SubscriptionDialog : public SubscriptionDialogBase { Q_OBJECT - TQ_OBJECT + public: SubscriptionDialog( TQWidget *parent, diff --git a/kmail/templateparser.h b/kmail/templateparser.h index bf011851..da6a5234 100644 --- a/kmail/templateparser.h +++ b/kmail/templateparser.h @@ -54,7 +54,7 @@ class KProcess; class TemplateParser : public TQObject { Q_OBJECT - TQ_OBJECT + public: enum Mode { diff --git a/kmail/templatesconfiguration.h b/kmail/templatesconfiguration.h index 47dbdea5..a0196c8e 100644 --- a/kmail/templatesconfiguration.h +++ b/kmail/templatesconfiguration.h @@ -29,7 +29,7 @@ class TemplatesConfiguration : public TemplatesConfigurationBase { Q_OBJECT - TQ_OBJECT + public: diff --git a/kmail/templatesinsertcommand.h b/kmail/templatesinsertcommand.h index 2251340d..26ba889d 100644 --- a/kmail/templatesinsertcommand.h +++ b/kmail/templatesinsertcommand.h @@ -30,7 +30,7 @@ class KActionMenu; class TemplatesInsertCommand : public TQPushButton { Q_OBJECT - TQ_OBJECT + public: TemplatesInsertCommand( TQWidget *parent, const char *name = 0 ); diff --git a/kmail/tests/messagedicttests.h b/kmail/tests/messagedicttests.h index 52a09cc6..abff55da 100644 --- a/kmail/tests/messagedicttests.h +++ b/kmail/tests/messagedicttests.h @@ -14,7 +14,7 @@ class KMDict; class MessageDictTester : public KUnitTest::SlotTester { Q_OBJECT - TQ_OBJECT + public slots: void setUp(); diff --git a/kmail/tests/mimelibtests.h b/kmail/tests/mimelibtests.h index ef9a4b96..0f503324 100644 --- a/kmail/tests/mimelibtests.h +++ b/kmail/tests/mimelibtests.h @@ -26,7 +26,7 @@ class DwString; class MimeLibTester : public KUnitTest::SlotTester { Q_OBJECT - TQ_OBJECT + public slots: void setUp(); diff --git a/kmail/tests/utiltests.h b/kmail/tests/utiltests.h index cb6c225a..b2cb8c69 100644 --- a/kmail/tests/utiltests.h +++ b/kmail/tests/utiltests.h @@ -12,7 +12,7 @@ class UtilTester : public KUnitTest::SlotTester { Q_OBJECT - TQ_OBJECT + public slots: void setUp(); diff --git a/kmail/treebase.h b/kmail/treebase.h index b89461e2..94f0756c 100644 --- a/kmail/treebase.h +++ b/kmail/treebase.h @@ -33,7 +33,7 @@ class TreeItemBase; class TreeBase : public KListView { Q_OBJECT - TQ_OBJECT + public: TreeBase( TQWidget * parent, KMFolderTree *folderTree, const TQString &preSelection, bool mustBeReadWrite ); diff --git a/kmail/twindowpositioner.h b/kmail/twindowpositioner.h index efb65390..88fab3f8 100644 --- a/kmail/twindowpositioner.h +++ b/kmail/twindowpositioner.h @@ -28,7 +28,7 @@ class TQWindow; class KWindowPositioner : public TQObject { Q_OBJECT - TQ_OBJECT + public: enum Mode { Right, Bottom }; diff --git a/kmail/undostack.h b/kmail/undostack.h index d1e9408a..1debbf10 100644 --- a/kmail/undostack.h +++ b/kmail/undostack.h @@ -44,7 +44,7 @@ public: class UndoStack : public TQObject { Q_OBJECT - TQ_OBJECT + public: UndoStack(int size); diff --git a/kmail/vacation.h b/kmail/vacation.h index c7a9980a..eac3bd9d 100644 --- a/kmail/vacation.h +++ b/kmail/vacation.h @@ -37,7 +37,7 @@ namespace KMail { class Vacation : public TQObject { Q_OBJECT - TQ_OBJECT + public: Vacation( TQObject * parent=0, bool checkOnly = false, const char * name=0 ); virtual ~Vacation(); diff --git a/kmail/vacationdialog.h b/kmail/vacationdialog.h index bbb2a2c1..d38c75d0 100644 --- a/kmail/vacationdialog.h +++ b/kmail/vacationdialog.h @@ -36,7 +36,7 @@ namespace KMail { class VacationDialog : public KDialogBase { Q_OBJECT - TQ_OBJECT + public: VacationDialog( const TQString & caption, TQWidget * parent=0, const char * name=0, bool modal=true ); diff --git a/kmail/vcardviewer.h b/kmail/vcardviewer.h index 87a6611a..3ed8b213 100644 --- a/kmail/vcardviewer.h +++ b/kmail/vcardviewer.h @@ -37,7 +37,7 @@ namespace KMail { class VCardViewer : public KDialogBase { Q_OBJECT - TQ_OBJECT + public: #if defined(KABC_VCARD_ENCODING_FIX) VCardViewer( TQWidget *parent, const TQByteArray &vCard, const char *name ); diff --git a/kmail/xfaceconfigurator.h b/kmail/xfaceconfigurator.h index e8fa1b0e..e6530714 100644 --- a/kmail/xfaceconfigurator.h +++ b/kmail/xfaceconfigurator.h @@ -31,7 +31,7 @@ namespace KMail { class XFaceConfigurator : public TQWidget { Q_OBJECT - TQ_OBJECT + public: XFaceConfigurator( TQWidget * parent=0, const char * name=0 ); virtual ~XFaceConfigurator(); |