diff options
Diffstat (limited to 'kmail')
307 files changed, 3974 insertions, 3952 deletions
diff --git a/kmail/CMakeLists.txt b/kmail/CMakeLists.txt index daa365ec..9d503d31 100644 --- a/kmail/CMakeLists.txt +++ b/kmail/CMakeLists.txt @@ -212,8 +212,8 @@ add_custom_target( kmail_settings_base tde_add_library( ${target} SHARED AUTOMOC SOURCES ${${target}_SRCS} LINK - emailfunctions-static kmime-shared kpgp-shared tdepim-shared kpimidentities-shared - mimelib-shared ksieve-shared tdehtml-shared ${INDEX_LIBRARY} + kmime-shared kpgp-shared tdepim-shared kpimidentities-shared + mimelib-shared ksieve-shared tdecore-shared tdehtml-shared ${INDEX_LIBRARY} DESTINATION ${LIB_INSTALL_DIR} DEPENDENCIES kmail_settings_base ) diff --git a/kmail/Mainpage.dox b/kmail/Mainpage.dox index 3121e2d9..148f9e60 100644 --- a/kmail/Mainpage.dox +++ b/kmail/Mainpage.dox @@ -71,7 +71,7 @@ is not modal and the user may hit apply/ok anytime between calls to function that want to use the identity reference. Store the UOID instead if you need to keep track of the identity. You may also want to connect to one of the KPIM::IdentityManager::changed() or ::deleted() -Q_SIGNALS, if you want to do special processing in case the identity +signals, if you want to do special processing in case the identity changes. Thus, in the ConfigureDialog, you will see non-const KPIM::Identity @@ -109,8 +109,8 @@ instance of the filter manager is held by the kernel The search pattern is a QPtrList of search rules (kmsearchpattern.h) and a boolean operator that defines their relation (and/or). -A search rule consists of a field-QString, a "function"-enum and a -"contents" or "value" QString. The first gives the header (or +A search rule consists of a field-TQString, a "function"-enum and a +"contents" or "value" TQString. The first gives the header (or pseudoheader) to match against, the second says how to match (equals, consists, is less than,...) and the third holds the pattern to match against. @@ -155,7 +155,7 @@ the corresponding config manager instead. But that won't change the basic principle. Thus, there is an abstract base class ConfigurePage (defined in -configuredialog_p.h), which derives from QWidget. It has four methods +configuredialog_p.h), which derives from TQWidget. It has four methods of which you have to reimplement at least the first two: - void setup() @@ -239,7 +239,7 @@ as follows : ---< actual folder types: KMFolderImap, KMFolderMbox... >-- At the base KMail's folder design starts with KMFolderNode which -inherits QObject. KMFolderNode is the base class encapsulating +inherits TQObject. KMFolderNode is the base class encapsulating common folder properties such as the name and a boolean signifying whether the folder is a folder holding mail directly or a KMFolderDir. KMFolderNode's often do not have an on-disk representation, they are @@ -277,13 +277,13 @@ accessed via KMKernel ( the "kmkernel" construct ). Those methods are : FolderJob classes - These classes allow asynchronous operations on KMFolder's. You create a Job on the heap, connect to one of its -Q_SIGNALS and wait for the job to finish. Folders serve as FolderJob +signals and wait for the job to finish. Folders serve as FolderJob factories. For example, to retrieve the full message from a folder you do : FolderJob *job = folderParent->createJob( aMsg, tGetMessage ); -connect( job, SIGNAL(messageRetrieved(KMMessage*)), - SLOT(msgWasRetrieved(KMMessage*)) ); +connect( job, TQ_SIGNAL(messageRetrieved(KMMessage*)), + TQ_SLOT(msgWasRetrieved(KMMessage*)) ); job->start(); @@ -410,7 +410,7 @@ uniq: 3 bits = max. 8 different types with same chunk size: 010 Offset32 011 SerNum/UOID 100 DateTime - 101 Color (QRgb: (a,r,g,b)) + 101 Color (TQRgb: (a,r,g,b)) 110 reserved 111 Extend @@ -821,7 +821,7 @@ During the design phase we identified a need for BodyPartFormatters to request their being called on some form of events, e.g. a dcop signal. Thus, the Memento interface also includes the IObserver and ISubject interfaces. If a BodyPartFormatter needs to react to a signal -(Qt or DCOP), it implements the Memento interface using a QObject, +(Qt or DCOP), it implements the Memento interface using a TQObject, connects the signal to a slot on the Memento and (as an ISubject) notifies it's IObservers when the slot is called. If a Memento is created, the reader window registers itself as an observer of the @@ -850,16 +850,16 @@ public: }; class DelayedHelloWorldBodyPartMemento - : public QObject, public KMail::BodyPartMemento { + : public TQObject, public KMail::BodyPartMemento { public: DelayedHelloWorldBodyPartMemento() - : QObject( 0, "DelayedHelloWorldBodyPartMemento" ), + : TQObject( 0, "DelayedHelloWorldBodyPartMemento" ), KMail::BodyPartMemento() { - QTimer::singleShot( 10*1000, this, SLOT(slotTimeout()) ); + QTimer::singleShot( 10*1000, this, TQ_SLOT(slotTimeout()) ); } -private Q_SLOTS: +private slots: void slotTimeout() { notify(): } private: diff --git a/kmail/about/top-right-kmail.png b/kmail/about/top-right-kmail.png Binary files differindex dd83cd5b..5d3d7076 100644 --- a/kmail/about/top-right-kmail.png +++ b/kmail/about/top-right-kmail.png diff --git a/kmail/aboutdata.h b/kmail/aboutdata.h index 2ae6283a..b8a4f404 100644 --- a/kmail/aboutdata.h +++ b/kmail/aboutdata.h @@ -33,11 +33,11 @@ #define __KMAIL_ABOUTDATA_H__ #include <tdeaboutdata.h> -#include <kdemacros.h> +#include <tdemacros.h> namespace KMail { - class KDE_EXPORT AboutData : public TDEAboutData { + class TDE_EXPORT AboutData : public TDEAboutData { public: AboutData(); ~AboutData(); diff --git a/kmail/accountcombobox.cpp b/kmail/accountcombobox.cpp index 97f95b11..3f200f66 100644 --- a/kmail/accountcombobox.cpp +++ b/kmail/accountcombobox.cpp @@ -37,10 +37,10 @@ using namespace KMail; AccountComboBox::AccountComboBox( TQWidget* parent, const char* name ) : TQComboBox( parent, name ) { - connect( kmkernel->acctMgr(), TQT_SIGNAL( accountAdded( KMAccount* ) ), - this, TQT_SLOT( slotRefreshAccounts() ) ); - connect( kmkernel->acctMgr(), TQT_SIGNAL( accountRemoved( KMAccount* ) ), - this, TQT_SLOT( slotRefreshAccounts() ) ); + connect( kmkernel->acctMgr(), TQ_SIGNAL( accountAdded( KMAccount* ) ), + this, TQ_SLOT( slotRefreshAccounts() ) ); + connect( kmkernel->acctMgr(), TQ_SIGNAL( accountRemoved( KMAccount* ) ), + this, TQ_SLOT( slotRefreshAccounts() ) ); slotRefreshAccounts(); } diff --git a/kmail/accountcombobox.h b/kmail/accountcombobox.h index 2fa27f39..b0d0df6d 100644 --- a/kmail/accountcombobox.h +++ b/kmail/accountcombobox.h @@ -41,7 +41,7 @@ namespace KMail { */ class AccountComboBox : public TQComboBox { - Q_OBJECT + TQ_OBJECT public: diff --git a/kmail/accountdialog.cpp b/kmail/accountdialog.cpp index 3c6265e7..2967b87d 100644 --- a/kmail/accountdialog.cpp +++ b/kmail/accountdialog.cpp @@ -353,11 +353,11 @@ void AccountDialog::makeLocalAccountPage() TQPushButton *choose = new TQPushButton( i18n("Choo&se..."), page ); choose->setAutoDefault( false ); - connect( choose, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotLocationChooser()) ); + connect( choose, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotLocationChooser()) ); topLayout->addWidget( choose, 3, 2 ); TQButtonGroup *group = new TQButtonGroup(i18n("Locking Method"), page ); - group->setColumnLayout(0, Qt::Horizontal); + group->setColumnLayout(0, TQt::Horizontal); group->layout()->setSpacing( 0 ); group->layout()->setMargin( 0 ); TQGridLayout *groupLayout = new TQGridLayout( group->layout() ); @@ -373,8 +373,8 @@ void AccountDialog::makeLocalAccountPage() mLocal.procmailLockFileName->insertStringList(procmailrcParser.getLockFilesList()); mLocal.procmailLockFileName->setEnabled(false); - TQObject::connect(mLocal.lockProcmail, TQT_SIGNAL(toggled(bool)), - mLocal.procmailLockFileName, TQT_SLOT(setEnabled(bool))); + TQObject::connect(mLocal.lockProcmail, TQ_SIGNAL(toggled(bool)), + mLocal.procmailLockFileName, TQ_SLOT(setEnabled(bool))); mLocal.lockMutt = new TQRadioButton( i18n("&Mutt dotlock"), group); @@ -404,19 +404,19 @@ void AccountDialog::makeLocalAccountPage() TQWhatsThis::add( mLocal.resourceClearButton, i18n( "Delete all allocations for the resource represented by this account." ) ); mLocal.resourceClearButton->setEnabled( false ); - connect( mLocal.resourceCheck, TQT_SIGNAL( toggled(bool) ), - mLocal.resourceClearButton, TQT_SLOT( setEnabled(bool) ) ); - connect( mLocal.resourceClearButton, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( slotClearResourceAllocations() ) ); + connect( mLocal.resourceCheck, TQ_SIGNAL( toggled(bool) ), + mLocal.resourceClearButton, TQ_SLOT( setEnabled(bool) ) ); + connect( mLocal.resourceClearButton, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( slotClearResourceAllocations() ) ); mLocal.resourceClearPastButton = new TQPushButton( i18n( "Clear Past" ), resourceHB ); mLocal.resourceClearPastButton->setEnabled( false ); - connect( mLocal.resourceCheck, TQT_SIGNAL( toggled(bool) ), - mLocal.resourceClearPastButton, TQT_SLOT( setEnabled(bool) ) ); + connect( mLocal.resourceCheck, TQ_SIGNAL( toggled(bool) ), + mLocal.resourceClearPastButton, TQ_SLOT( setEnabled(bool) ) ); TQWhatsThis::add( mLocal.resourceClearPastButton, i18n( "Delete all outdated allocations for the resource represented by this account." ) ); - connect( mLocal.resourceClearPastButton, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( slotClearPastResourceAllocations() ) ); + connect( mLocal.resourceClearPastButton, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( slotClearPastResourceAllocations() ) ); topLayout->addMultiCellWidget( resourceHB, 5, 5, 0, 2 ); #endif @@ -428,8 +428,8 @@ void AccountDialog::makeLocalAccountPage() mLocal.intervalCheck = new TQCheckBox( i18n("Enable &interval mail checking"), page ); topLayout->addMultiCellWidget( mLocal.intervalCheck, 6, 6, 0, 2 ); - connect( mLocal.intervalCheck, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(slotEnableLocalInterval(bool)) ); + connect( mLocal.intervalCheck, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(slotEnableLocalInterval(bool)) ); mLocal.intervalLabel = new TQLabel( i18n("Check inter&val:"), page ); topLayout->addWidget( mLocal.intervalLabel, 7, 0 ); mLocal.intervalSpin = new KIntNumInput( page ); @@ -457,7 +457,7 @@ void AccountDialog::makeLocalAccountPage() mLocal.identityLabel->setBuddy( mLocal.identityCombo ); topLayout->addWidget( mLocal.identityCombo, 10, 1 ); - connect(kapp,TQT_SIGNAL(tdedisplayFontChanged()),TQT_SLOT(slotFontChanged())); + connect(tdeApp,TQ_SIGNAL(tdedisplayFontChanged()),TQ_SLOT(slotFontChanged())); } void AccountDialog::makeMaildirAccountPage() @@ -492,7 +492,7 @@ void AccountDialog::makeMaildirAccountPage() TQPushButton *choose = new TQPushButton( i18n("Choo&se..."), page ); choose->setAutoDefault( false ); - connect( choose, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotMaildirChooser()) ); + connect( choose, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotMaildirChooser()) ); topLayout->addWidget( choose, 3, 2 ); #if 0 @@ -503,21 +503,21 @@ void AccountDialog::makeMaildirAccountPage() mMaildir.resourceClearButton = new TQPushButton( i18n( "Clear" ), resourceHB ); mMaildir.resourceClearButton->setEnabled( false ); - connect( mMaildir.resourceCheck, TQT_SIGNAL( toggled(bool) ), - mMaildir.resourceClearButton, TQT_SLOT( setEnabled(bool) ) ); + connect( mMaildir.resourceCheck, TQ_SIGNAL( toggled(bool) ), + mMaildir.resourceClearButton, TQ_SLOT( setEnabled(bool) ) ); TQWhatsThis::add( mMaildir.resourceClearButton, i18n( "Delete all allocations for the resource represented by this account." ) ); - connect( mMaildir.resourceClearButton, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( slotClearResourceAllocations() ) ); + connect( mMaildir.resourceClearButton, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( slotClearResourceAllocations() ) ); mMaildir.resourceClearPastButton = new TQPushButton( i18n( "Clear Past" ), resourceHB ); mMaildir.resourceClearPastButton->setEnabled( false ); - connect( mMaildir.resourceCheck, TQT_SIGNAL( toggled(bool) ), - mMaildir.resourceClearPastButton, TQT_SLOT( setEnabled(bool) ) ); + connect( mMaildir.resourceCheck, TQ_SIGNAL( toggled(bool) ), + mMaildir.resourceClearPastButton, TQ_SLOT( setEnabled(bool) ) ); TQWhatsThis::add( mMaildir.resourceClearPastButton, i18n( "Delete all outdated allocations for the resource represented by this account." ) ); - connect( mMaildir.resourceClearPastButton, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( slotClearPastResourceAllocations() ) ); + connect( mMaildir.resourceClearPastButton, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( slotClearPastResourceAllocations() ) ); topLayout->addMultiCellWidget( resourceHB, 4, 4, 0, 2 ); #endif @@ -528,8 +528,8 @@ void AccountDialog::makeMaildirAccountPage() mMaildir.intervalCheck = new TQCheckBox( i18n("Enable &interval mail checking"), page ); topLayout->addMultiCellWidget( mMaildir.intervalCheck, 5, 5, 0, 2 ); - connect( mMaildir.intervalCheck, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(slotEnableMaildirInterval(bool)) ); + connect( mMaildir.intervalCheck, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(slotEnableMaildirInterval(bool)) ); mMaildir.intervalLabel = new TQLabel( i18n("Check inter&val:"), page ); topLayout->addWidget( mMaildir.intervalLabel, 6, 0 ); mMaildir.intervalSpin = new KIntNumInput( page ); @@ -557,7 +557,7 @@ void AccountDialog::makeMaildirAccountPage() mMaildir.identityLabel->setBuddy( mMaildir.identityCombo ); topLayout->addWidget( mMaildir.identityCombo, 9, 1 ); - connect(kapp,TQT_SIGNAL(tdedisplayFontChanged()),TQT_SLOT(slotFontChanged())); + connect(tdeApp,TQ_SIGNAL(tdedisplayFontChanged()),TQ_SLOT(slotFontChanged())); } @@ -618,7 +618,7 @@ void AccountDialog::makePopAccountPage() label = new TQLabel( i18n("&Port:"), page1 ); grid->addWidget( label, 4, 0 ); mPop.portEdit = new KLineEdit( page1 ); - mPop.portEdit->setValidator( new TQIntValidator(TQT_TQOBJECT(this)) ); + mPop.portEdit->setValidator( new TQIntValidator(this) ); label->setBuddy( mPop.portEdit ); grid->addWidget( mPop.portEdit, 4, 1 ); @@ -638,19 +638,19 @@ void AccountDialog::makePopAccountPage() mPop.leaveOnServerCheck = new TQCheckBox( i18n("Lea&ve fetched messages on the server"), page1 ); - connect( mPop.leaveOnServerCheck, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( slotLeaveOnServerClicked() ) ); + connect( mPop.leaveOnServerCheck, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( slotLeaveOnServerClicked() ) ); grid->addMultiCellWidget( mPop.leaveOnServerCheck, 6, 6, 0, 1 ); TQHBox *afterDaysBox = new TQHBox( page1 ); afterDaysBox->setSpacing( KDialog::spacingHint() ); mPop.leaveOnServerDaysCheck = new TQCheckBox( i18n("Leave messages on the server for"), afterDaysBox ); - connect( mPop.leaveOnServerDaysCheck, TQT_SIGNAL( toggled(bool) ), - this, TQT_SLOT( slotEnableLeaveOnServerDays(bool)) ); + connect( mPop.leaveOnServerDaysCheck, TQ_SIGNAL( toggled(bool) ), + this, TQ_SLOT( slotEnableLeaveOnServerDays(bool)) ); mPop.leaveOnServerDaysSpin = new KIntNumInput( afterDaysBox ); mPop.leaveOnServerDaysSpin->setRange( 1, 365, 1, false ); - connect( mPop.leaveOnServerDaysSpin, TQT_SIGNAL(valueChanged(int)), - TQT_SLOT(slotLeaveOnServerDaysChanged(int))); + connect( mPop.leaveOnServerDaysSpin, TQ_SIGNAL(valueChanged(int)), + TQ_SLOT(slotLeaveOnServerDaysChanged(int))); mPop.leaveOnServerDaysSpin->setValue( 1 ); afterDaysBox->setStretchFactor( mPop.leaveOnServerDaysSpin, 1 ); grid->addMultiCellWidget( afterDaysBox, 7, 7, 0, 1 ); @@ -658,20 +658,20 @@ void AccountDialog::makePopAccountPage() leaveOnServerCountBox->setSpacing( KDialog::spacingHint() ); mPop.leaveOnServerCountCheck = new TQCheckBox( i18n("Keep only the last"), leaveOnServerCountBox ); - connect( mPop.leaveOnServerCountCheck, TQT_SIGNAL( toggled(bool) ), - this, TQT_SLOT( slotEnableLeaveOnServerCount(bool)) ); + connect( mPop.leaveOnServerCountCheck, TQ_SIGNAL( toggled(bool) ), + this, TQ_SLOT( slotEnableLeaveOnServerCount(bool)) ); mPop.leaveOnServerCountSpin = new KIntNumInput( leaveOnServerCountBox ); mPop.leaveOnServerCountSpin->setRange( 1, 999999, 1, false ); - connect( mPop.leaveOnServerCountSpin, TQT_SIGNAL(valueChanged(int)), - TQT_SLOT(slotLeaveOnServerCountChanged(int))); + connect( mPop.leaveOnServerCountSpin, TQ_SIGNAL(valueChanged(int)), + TQ_SLOT(slotLeaveOnServerCountChanged(int))); mPop.leaveOnServerCountSpin->setValue( 100 ); grid->addMultiCellWidget( leaveOnServerCountBox, 8, 8, 0, 1 ); TQHBox *leaveOnServerSizeBox = new TQHBox( page1 ); leaveOnServerSizeBox->setSpacing( KDialog::spacingHint() ); mPop.leaveOnServerSizeCheck = new TQCheckBox( i18n("Keep only the last"), leaveOnServerSizeBox ); - connect( mPop.leaveOnServerSizeCheck, TQT_SIGNAL( toggled(bool) ), - this, TQT_SLOT( slotEnableLeaveOnServerSize(bool)) ); + connect( mPop.leaveOnServerSizeCheck, TQ_SIGNAL( toggled(bool) ), + this, TQ_SLOT( slotEnableLeaveOnServerSize(bool)) ); mPop.leaveOnServerSizeSpin = new KIntNumInput( leaveOnServerSizeBox ); mPop.leaveOnServerSizeSpin->setRange( 1, 999999, 1, false ); mPop.leaveOnServerSizeSpin->setSuffix( i18n(" MB") ); @@ -685,21 +685,21 @@ void AccountDialog::makePopAccountPage() mPop.resourceClearButton = new TQPushButton( i18n( "Clear" ), resourceHB ); mPop.resourceClearButton->setEnabled( false ); - connect( mPop.resourceCheck, TQT_SIGNAL( toggled(bool) ), - mPop.resourceClearButton, TQT_SLOT( setEnabled(bool) ) ); + connect( mPop.resourceCheck, TQ_SIGNAL( toggled(bool) ), + mPop.resourceClearButton, TQ_SLOT( setEnabled(bool) ) ); TQWhatsThis::add( mPop.resourceClearButton, i18n( "Delete all allocations for the resource represented by this account." ) ); - connect( mPop.resourceClearButton, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( slotClearResourceAllocations() ) ); + connect( mPop.resourceClearButton, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( slotClearResourceAllocations() ) ); mPop.resourceClearPastButton = new TQPushButton( i18n( "Clear Past" ), resourceHB ); mPop.resourceClearPastButton->setEnabled( false ); - connect( mPop.resourceCheck, TQT_SIGNAL( toggled(bool) ), - mPop.resourceClearPastButton, TQT_SLOT( setEnabled(bool) ) ); + connect( mPop.resourceCheck, TQ_SIGNAL( toggled(bool) ), + mPop.resourceClearPastButton, TQ_SLOT( setEnabled(bool) ) ); TQWhatsThis::add( mPop.resourceClearPastButton, i18n( "Delete all outdated allocations for the resource represented by this account." ) ); - connect( mPop.resourceClearPastButton, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( slotClearPastResourceAllocations() ) ); + connect( mPop.resourceClearPastButton, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( slotClearPastResourceAllocations() ) ); grid->addMultiCellWidget( resourceHB, 10, 10, 0, 2 ); #endif @@ -715,14 +715,14 @@ void AccountDialog::makePopAccountPage() mPop.filterOnServerSizeSpin->setEnabled( false ); hbox->setStretchFactor( mPop.filterOnServerSizeSpin, 1 ); mPop.filterOnServerSizeSpin->setRange( 1, 10000000, 100, false ); - connect(mPop.filterOnServerSizeSpin, TQT_SIGNAL(valueChanged(int)), - TQT_SLOT(slotFilterOnServerSizeChanged(int))); + connect(mPop.filterOnServerSizeSpin, TQ_SIGNAL(valueChanged(int)), + TQ_SLOT(slotFilterOnServerSizeChanged(int))); mPop.filterOnServerSizeSpin->setValue( 50000 ); grid->addMultiCellWidget( hbox, 11, 11, 0, 1 ); - connect( mPop.filterOnServerCheck, TQT_SIGNAL(toggled(bool)), - mPop.filterOnServerSizeSpin, TQT_SLOT(setEnabled(bool)) ); - connect( mPop.filterOnServerCheck, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( slotFilterOnServerClicked() ) ); + connect( mPop.filterOnServerCheck, TQ_SIGNAL(toggled(bool)), + mPop.filterOnServerSizeSpin, TQ_SLOT(setEnabled(bool)) ); + connect( mPop.filterOnServerCheck, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( slotFilterOnServerClicked() ) ); TQString msg = i18n("If you select this option, POP Filters will be used to " "decide what to do with messages. You can then select " "to download, delete or keep them on the server." ); @@ -732,8 +732,8 @@ void AccountDialog::makePopAccountPage() mPop.intervalCheck = new TQCheckBox( i18n("Enable &interval mail checking"), page1 ); grid->addMultiCellWidget( mPop.intervalCheck, 12, 12, 0, 1 ); - connect( mPop.intervalCheck, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(slotEnablePopInterval(bool)) ); + connect( mPop.intervalCheck, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(slotEnablePopInterval(bool)) ); mPop.intervalLabel = new TQLabel( i18n("Chec&k interval:"), page1 ); grid->addWidget( mPop.intervalLabel, 13, 0 ); mPop.intervalSpin = new KIntNumInput( page1 ); @@ -770,29 +770,29 @@ void AccountDialog::makePopAccountPage() TQHBoxLayout *buttonLay = new TQHBoxLayout( vlay ); mPop.checkCapabilities = new TQPushButton( i18n("Check &What the Server Supports"), page2 ); - connect(mPop.checkCapabilities, TQT_SIGNAL(clicked()), - TQT_SLOT(slotCheckPopCapabilities())); + connect(mPop.checkCapabilities, TQ_SIGNAL(clicked()), + TQ_SLOT(slotCheckPopCapabilities())); buttonLay->addStretch(); buttonLay->addWidget( mPop.checkCapabilities ); buttonLay->addStretch(); vlay->addSpacing( KDialog::spacingHint() ); - mPop.encryptionGroup = new TQButtonGroup( 1, Qt::Horizontal, + mPop.encryptionGroup = new TQButtonGroup( 1, TQt::Horizontal, i18n("Encryption"), page2 ); mPop.encryptionNone = new TQRadioButton( i18n("&None"), mPop.encryptionGroup ); - mPop.encryptionSSL = - new TQRadioButton( i18n("Use &SSL for secure mail download"), - mPop.encryptionGroup ); mPop.encryptionTLS = - new TQRadioButton( i18n("Use &TLS for secure mail download"), + new TQRadioButton( i18n("Use &StartTLS"), + mPop.encryptionGroup ); + mPop.encryptionSSL = + new TQRadioButton( i18n("Enforce SSL/&TLS"), mPop.encryptionGroup ); - connect(mPop.encryptionGroup, TQT_SIGNAL(clicked(int)), - TQT_SLOT(slotPopEncryptionChanged(int))); + connect(mPop.encryptionGroup, TQ_SIGNAL(clicked(int)), + TQ_SLOT(slotPopEncryptionChanged(int))); vlay->addWidget( mPop.encryptionGroup ); - mPop.authGroup = new TQButtonGroup( 1, Qt::Horizontal, + mPop.authGroup = new TQButtonGroup( 1, TQt::Horizontal, i18n("Authentication Method"), page2 ); mPop.authUser = new TQRadioButton( i18n("Clear te&xt") , mPop.authGroup, "auth clear text" ); @@ -817,13 +817,13 @@ void AccountDialog::makePopAccountPage() mPop.usePipeliningCheck = new TQCheckBox( i18n("&Use pipelining for faster mail download"), page2 ); - connect(mPop.usePipeliningCheck, TQT_SIGNAL(clicked()), - TQT_SLOT(slotPipeliningClicked())); + connect(mPop.usePipeliningCheck, TQ_SIGNAL(clicked()), + TQ_SLOT(slotPipeliningClicked())); vlay->addWidget( mPop.usePipeliningCheck ); vlay->addStretch(); - connect(kapp,TQT_SIGNAL(tdedisplayFontChanged()),TQT_SLOT(slotFontChanged())); + connect(tdeApp,TQ_SIGNAL(tdedisplayFontChanged()),TQ_SLOT(slotFontChanged())); } @@ -891,7 +891,7 @@ void AccountDialog::makeImapAccountPage( bool connected ) label = new TQLabel( i18n("&Port:"), page1 ); grid->addWidget( label, row, 0 ); mImap.portEdit = new KLineEdit( page1 ); - mImap.portEdit->setValidator( new TQIntValidator(TQT_TQOBJECT(this)) ); + mImap.portEdit->setValidator( new TQIntValidator(this) ); label->setBuddy( mImap.portEdit ); grid->addWidget( mImap.portEdit, row, 1 ); @@ -909,7 +909,7 @@ void AccountDialog::makeImapAccountPage( bool connected ) button->setFixedSize( 22, 22 ); button->setIconSet( TDEGlobal::iconLoader()->loadIconSet( "reload", TDEIcon::Small, 0 ) ); - connect( button, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotReloadNamespaces()) ); + connect( button, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotReloadNamespaces()) ); TQWhatsThis::add( button, i18n("Reload the namespaces from the server. This overwrites any changes.") ); grid->addWidget( box, row, 0 ); @@ -926,7 +926,7 @@ void AccountDialog::makeImapAccountPage( bool connected ) mImap.editPNS->setAutoRaise( true ); mImap.editPNS->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) ); mImap.editPNS->setFixedSize( 22, 22 ); - connect( mImap.editPNS, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotEditPersonalNamespace()) ); + connect( mImap.editPNS, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotEditPersonalNamespace()) ); label = new TQLabel( i18n("Other Users"), listbox ); TQWhatsThis::add( label, i18n( "These namespaces include the folders of other users." ) ); @@ -938,7 +938,7 @@ void AccountDialog::makeImapAccountPage( bool connected ) mImap.editONS->setAutoRaise( true ); mImap.editONS->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) ); mImap.editONS->setFixedSize( 22, 22 ); - connect( mImap.editONS, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotEditOtherUsersNamespace()) ); + connect( mImap.editONS, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotEditOtherUsersNamespace()) ); label = new TQLabel( i18n("Shared"), listbox ); TQWhatsThis::add( label, i18n( "These namespaces include the shared folders." ) ); @@ -950,7 +950,7 @@ void AccountDialog::makeImapAccountPage( bool connected ) mImap.editSNS->setAutoRaise( true ); mImap.editSNS->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) ); mImap.editSNS->setFixedSize( 22, 22 ); - connect( mImap.editSNS, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotEditSharedNamespace()) ); + connect( mImap.editSNS, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotEditSharedNamespace()) ); label->setBuddy( listbox ); grid->addWidget( listbox, row, 1 ); @@ -1021,21 +1021,21 @@ void AccountDialog::makeImapAccountPage( bool connected ) mImap.resourceClearButton = new TQPushButton( i18n( "Clear" ), resourceHB ); mImap.resourceClearButton->setEnabled( false ); - connect( mImap.resourceCheck, TQT_SIGNAL( toggled(bool) ), - mImap.resourceClearButton, TQT_SLOT( setEnabled(bool) ) ); + connect( mImap.resourceCheck, TQ_SIGNAL( toggled(bool) ), + mImap.resourceClearButton, TQ_SLOT( setEnabled(bool) ) ); TQWhatsThis::add( mImap.resourceClearButton, i18n( "Delete all allocations for the resource represented by this account." ) ); - connect( mImap.resourceClearButton, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( slotClearResourceAllocations() ) ); + connect( mImap.resourceClearButton, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( slotClearResourceAllocations() ) ); mImap.resourceClearPastButton = new TQPushButton( i18n( "Clear Past" ), resourceHB ); mImap.resourceClearPastButton->setEnabled( false ); - connect( mImap.resourceCheck, TQT_SIGNAL( toggled(bool) ), - mImap.resourceClearPastButton, TQT_SLOT( setEnabled(bool) ) ); + connect( mImap.resourceCheck, TQ_SIGNAL( toggled(bool) ), + mImap.resourceClearPastButton, TQ_SLOT( setEnabled(bool) ) ); TQWhatsThis::add( mImap.resourceClearPastButton, i18n( "Delete all outdated allocations for the resource represented by this account." ) ); - connect( mImap.resourceClearPastButton, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( slotClearPastResourceAllocations() ) ); + connect( mImap.resourceClearPastButton, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( slotClearPastResourceAllocations() ) ); grid->addMultiCellWidget( resourceHB, row, row, 0, 2 ); #endif @@ -1048,8 +1048,8 @@ void AccountDialog::makeImapAccountPage( bool connected ) mImap.intervalCheck = new TQCheckBox( i18n("Enable &interval mail checking"), page1 ); grid->addMultiCellWidget( mImap.intervalCheck, row, row, 0, 2 ); - connect( mImap.intervalCheck, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(slotEnableImapInterval(bool)) ); + connect( mImap.intervalCheck, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(slotEnableImapInterval(bool)) ); ++row; mImap.intervalLabel = new TQLabel( i18n("Check inter&val:"), page1 ); grid->addWidget( mImap.intervalLabel, row, 0 ); @@ -1085,29 +1085,29 @@ void AccountDialog::makeImapAccountPage( bool connected ) TQHBoxLayout *buttonLay = new TQHBoxLayout( vlay ); mImap.checkCapabilities = new TQPushButton( i18n("Check &What the Server Supports"), page2 ); - connect(mImap.checkCapabilities, TQT_SIGNAL(clicked()), - TQT_SLOT(slotCheckImapCapabilities())); + connect(mImap.checkCapabilities, TQ_SIGNAL(clicked()), + TQ_SLOT(slotCheckImapCapabilities())); buttonLay->addStretch(); buttonLay->addWidget( mImap.checkCapabilities ); buttonLay->addStretch(); vlay->addSpacing( KDialog::spacingHint() ); - mImap.encryptionGroup = new TQButtonGroup( 1, Qt::Horizontal, + mImap.encryptionGroup = new TQButtonGroup( 1, TQt::Horizontal, i18n("Encryption"), page2 ); mImap.encryptionNone = new TQRadioButton( i18n("&None"), mImap.encryptionGroup ); - mImap.encryptionSSL = - new TQRadioButton( i18n("Use &SSL for secure mail download"), - mImap.encryptionGroup ); mImap.encryptionTLS = - new TQRadioButton( i18n("Use &TLS for secure mail download"), + new TQRadioButton( i18n("Use &StartTLS"), + mImap.encryptionGroup ); + mImap.encryptionSSL = + new TQRadioButton( i18n("Enforce SSL/&TLS"), mImap.encryptionGroup ); - connect(mImap.encryptionGroup, TQT_SIGNAL(clicked(int)), - TQT_SLOT(slotImapEncryptionChanged(int))); + connect(mImap.encryptionGroup, TQ_SIGNAL(clicked(int)), + TQ_SLOT(slotImapEncryptionChanged(int))); vlay->addWidget( mImap.encryptionGroup ); - mImap.authGroup = new TQButtonGroup( 1, Qt::Horizontal, + mImap.authGroup = new TQButtonGroup( 1, TQt::Horizontal, i18n("Authentication Method"), page2 ); mImap.authUser = new TQRadioButton( i18n("Clear te&xt"), mImap.authGroup ); mImap.authLogin = new TQRadioButton( i18n("Please translate this " @@ -1130,7 +1130,7 @@ void AccountDialog::makeImapAccountPage( bool connected ) mSieveConfigEditor->layout()->setMargin( KDialog::marginHint() ); tabWidget->addTab( mSieveConfigEditor, i18n("&Filtering") ); - connect(kapp,TQT_SIGNAL(tdedisplayFontChanged()),TQT_SLOT(slotFontChanged())); + connect(tdeApp,TQ_SIGNAL(tdedisplayFontChanged()),TQ_SLOT(slotFontChanged())); } @@ -1499,12 +1499,12 @@ void AccountDialog::slotPopEncryptionChanged(int id) { kdDebug(5006) << "slotPopEncryptionChanged( " << id << " )" << endl; // adjust port - if ( id == SSL || mPop.portEdit->text() == "995" ) - mPop.portEdit->setText( ( id == SSL ) ? "995" : "110" ); + if ( id == EnforceSSL || mPop.portEdit->text() == "995" ) + mPop.portEdit->setText( ( id == EnforceSSL ) ? "995" : "110" ); // switch supported auth methods - mCurCapa = ( id == TLS ) ? mCapaTLS - : ( id == SSL ) ? mCapaSSL + mCurCapa = ( id == StartTLS ) ? mCapaTLS + : ( id == EnforceSSL ) ? mCapaSSL : mCapaNormal; enablePopFeatures( mCurCapa ); const TQButton *old = mPop.authGroup->selected(); @@ -1517,12 +1517,12 @@ void AccountDialog::slotImapEncryptionChanged(int id) { kdDebug(5006) << "slotImapEncryptionChanged( " << id << " )" << endl; // adjust port - if ( id == SSL || mImap.portEdit->text() == "993" ) - mImap.portEdit->setText( ( id == SSL ) ? "993" : "143" ); + if ( id == EnforceSSL || mImap.portEdit->text() == "993" ) + mImap.portEdit->setText( ( id == EnforceSSL ) ? "993" : "143" ); // switch supported auth methods - int authMethods = ( id == TLS ) ? mCapaTLS - : ( id == SSL ) ? mCapaSSL + int authMethods = ( id == StartTLS ) ? mCapaTLS + : ( id == EnforceSSL ) ? mCapaSSL : mCapaNormal; enableImapAuthMethods( authMethods ); TQButton *old = mImap.authGroup->selected(); @@ -1542,9 +1542,9 @@ void AccountDialog::slotCheckPopCapabilities() delete mServerTest; mServerTest = new KMServerTest(POP_PROTOCOL, mPop.hostEdit->text(), mPop.portEdit->text().toInt()); - connect( mServerTest, TQT_SIGNAL( capabilities( const TQStringList &, + connect( mServerTest, TQ_SIGNAL( capabilities( const TQStringList &, const TQStringList & ) ), - this, TQT_SLOT( slotPopCapabilities( const TQStringList &, + this, TQ_SLOT( slotPopCapabilities( const TQStringList &, const TQStringList & ) ) ); mPop.checkCapabilities->setEnabled(false); } @@ -1561,9 +1561,9 @@ void AccountDialog::slotCheckImapCapabilities() delete mServerTest; mServerTest = new KMServerTest(IMAP_PROTOCOL, mImap.hostEdit->text(), mImap.portEdit->text().toInt()); - connect( mServerTest, TQT_SIGNAL( capabilities( const TQStringList &, + connect( mServerTest, TQ_SIGNAL( capabilities( const TQStringList &, const TQStringList & ) ), - this, TQT_SLOT( slotImapCapabilities( const TQStringList &, + this, TQ_SLOT( slotImapCapabilities( const TQStringList &, const TQStringList & ) ) ); mImap.checkCapabilities->setEnabled(false); } @@ -2120,10 +2120,10 @@ void AccountDialog::slotReloadNamespaces() mImap.otherUsersNS->setText( TQString() ); mImap.sharedNS->setText( TQString() ); ImapAccountBase* ai = static_cast<ImapAccountBase*>( mAccount ); - connect( ai, TQT_SIGNAL( namespacesFetched( const ImapAccountBase::nsDelimMap& ) ), - this, TQT_SLOT( slotSetupNamespaces( const ImapAccountBase::nsDelimMap& ) ) ); - connect( ai, TQT_SIGNAL( connectionResult(int, const TQString&) ), - this, TQT_SLOT( slotConnectionResult(int, const TQString&) ) ); + connect( ai, TQ_SIGNAL( namespacesFetched( const ImapAccountBase::nsDelimMap& ) ), + this, TQ_SLOT( slotSetupNamespaces( const ImapAccountBase::nsDelimMap& ) ) ); + connect( ai, TQ_SIGNAL( connectionResult(int, const TQString&) ), + this, TQ_SLOT( slotConnectionResult(int, const TQString&) ) ); ai->getNamespaces(); } } @@ -2132,17 +2132,17 @@ void AccountDialog::slotConnectionResult( int errorCode, const TQString& ) { if ( errorCode > 0 ) { ImapAccountBase* ai = static_cast<ImapAccountBase*>( mAccount ); - disconnect( ai, TQT_SIGNAL( namespacesFetched( const ImapAccountBase::nsDelimMap& ) ), - this, TQT_SLOT( slotSetupNamespaces( const ImapAccountBase::nsDelimMap& ) ) ); - disconnect( ai, TQT_SIGNAL( connectionResult(int, const TQString&) ), - this, TQT_SLOT( slotConnectionResult(int, const TQString&) ) ); + disconnect( ai, TQ_SIGNAL( namespacesFetched( const ImapAccountBase::nsDelimMap& ) ), + this, TQ_SLOT( slotSetupNamespaces( const ImapAccountBase::nsDelimMap& ) ) ); + disconnect( ai, TQ_SIGNAL( connectionResult(int, const TQString&) ), + this, TQ_SLOT( slotConnectionResult(int, const TQString&) ) ); mImap.personalNS->setText( TQString() ); } } void AccountDialog::slotSetupNamespaces( const ImapAccountBase::nsDelimMap& map ) { - disconnect( this, TQT_SLOT( slotSetupNamespaces( const ImapAccountBase::nsDelimMap& ) ) ); + disconnect( this, TQ_SLOT( slotSetupNamespaces( const ImapAccountBase::nsDelimMap& ) ) ); mImap.personalNS->setText( TQString() ); mImap.otherUsersNS->setText( TQString() ); mImap.sharedNS->setText( TQString() ); @@ -2297,7 +2297,7 @@ NamespaceEditDialog::NamespaceEditDialog( TQWidget *parent, TQGrid* grid = new TQGrid( 2, page ); mBg = new TQButtonGroup( 0 ); - connect( mBg, TQT_SIGNAL( clicked(int) ), this, TQT_SLOT( slotRemoveEntry(int) ) ); + connect( mBg, TQ_SIGNAL( clicked(int) ), this, TQ_SLOT( slotRemoveEntry(int) ) ); mDelimMap = mNamespaceMap->find( mType ).data(); ImapAccountBase::namespaceDelim::Iterator it; for ( it = mDelimMap.begin(); it != mDelimMap.end(); ++it ) { diff --git a/kmail/accountdialog.h b/kmail/accountdialog.h index fb15cb38..e80dbb61 100644 --- a/kmail/accountdialog.h +++ b/kmail/accountdialog.h @@ -54,7 +54,7 @@ class FolderRequester; class AccountDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: @@ -273,8 +273,8 @@ class AccountDialog : public KDialogBase KMServerTest *mServerTest; enum EncryptionMethods { NoEncryption = 0, - SSL = 1, - TLS = 2 + StartTLS = 1, + EnforceSSL = 2 }; enum Capabilities { Plain = 1, @@ -302,7 +302,7 @@ class AccountDialog : public KDialogBase class NamespaceLineEdit: public KLineEdit { - Q_OBJECT + TQ_OBJECT public: @@ -319,7 +319,7 @@ class NamespaceLineEdit: public KLineEdit class NamespaceEditDialog: public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/kmail/accountmanager.cpp b/kmail/accountmanager.cpp index 6b9f38fe..8e4565c8 100644 --- a/kmail/accountmanager.cpp +++ b/kmail/accountmanager.cpp @@ -149,8 +149,8 @@ void AccountManager::processNextCheck( bool _newMail ) kdDebug(5006) << "account " << acct->name() << " finished check" << endl; mAcctChecking.remove( acct ); kmkernel->filterMgr()->deref(); - disconnect( acct, TQT_SIGNAL( finishedCheck( bool, CheckStatus ) ), - this, TQT_SLOT( processNextCheck( bool ) ) ); + disconnect( acct, TQ_SIGNAL( finishedCheck( bool, CheckStatus ) ), + this, TQ_SLOT( processNextCheck( bool ) ) ); } if ( mAcctChecking.isEmpty() ) { // all checks finished, display summary @@ -203,7 +203,7 @@ void AccountManager::processNextCheck( bool _newMail ) TQDataStream stream( params, IO_WriteOnly ); stream << static_cast<NetworkAccount*>( curAccount )->host(); - if ( kapp->dcopClient()->call( "kded", "networkstatus", "status(TQString)", + if ( tdeApp->dcopClient()->call( "kded", "networkstatus", "status(TQString)", params, replyType, reply ) && ( replyType == "int" ) ) { int result; @@ -219,8 +219,8 @@ void AccountManager::processNextCheck( bool _newMail ) } } - connect( curAccount, TQT_SIGNAL( finishedCheck( bool, CheckStatus ) ), - this, TQT_SLOT( processNextCheck( bool ) ) ); + connect( curAccount, TQ_SIGNAL( finishedCheck( bool, CheckStatus ) ), + this, TQ_SLOT( processNextCheck( bool ) ) ); KPIM::BroadcastStatus::instance()->setStatusMsg( i18n("Checking account %1 for new mail").arg(curAccount->name())); @@ -258,8 +258,8 @@ KMAccount* AccountManager::create( const TQString &aType, const TQString &aName, kdWarning(5006) << "Attempt to instantiate a non-existing account type!" << endl; return 0; } - connect( act, TQT_SIGNAL( newMailsProcessed( const TQMap<TQString, int> & ) ), - this, TQT_SLOT( addToTotalNewMailCount( const TQMap<TQString, int> & ) ) ); + connect( act, TQ_SIGNAL( newMailsProcessed( const TQMap<TQString, int> & ) ), + this, TQ_SLOT( addToTotalNewMailCount( const TQMap<TQString, int> & ) ) ); return act; } @@ -416,7 +416,7 @@ uint AccountManager::createId() int newId; do { - newId = kapp->random(); + newId = tdeApp->random(); } while ( usedIds.find(newId) != usedIds.end() ); return newId; diff --git a/kmail/accountmanager.h b/kmail/accountmanager.h index b1c1ef7c..edffac54 100644 --- a/kmail/accountmanager.h +++ b/kmail/accountmanager.h @@ -22,7 +22,7 @@ #include <tqobject.h> #include "kmaccount.h" -#include <kdemacros.h> +#include <tdemacros.h> class TQString; class TQStringList; @@ -32,9 +32,9 @@ namespace KMail { * The account manager is responsible for creating accounts of various types * via the factory method create() and for keeping track of them. */ -class KDE_EXPORT AccountManager: public TQObject +class TDE_EXPORT AccountManager: public TQObject { - Q_OBJECT + TQ_OBJECT friend class ::KMAccount; @@ -68,7 +68,7 @@ public: KMAccount* find( const uint id ) const; /** Physically remove account. Also deletes the given account object ! - Returns FALSE and does nothing if the account cannot be removed. */ + Returns false and does nothing if the account cannot be removed. */ bool remove( KMAccount* ); /** First account of the list */ diff --git a/kmail/accountwizard.cpp b/kmail/accountwizard.cpp index 92e6a232..aec50b7c 100644 --- a/kmail/accountwizard.cpp +++ b/kmail/accountwizard.cpp @@ -276,14 +276,14 @@ void AccountWizard::setupServerInformationPage() mIncomingServerWdg = new TQVBox( mServerInformationPage ); mIncomingServer = new KLineEdit( mIncomingServerWdg ); - mIncomingUseSSL = new TQCheckBox( i18n( "Use secure connection (SSL)" ), mIncomingServerWdg ); + mIncomingUseSSL = new TQCheckBox( i18n( "Use secure connection (SSL/TLS)" ), mIncomingServerWdg ); mIncomingLocationWdg = new TQHBox( mServerInformationPage ); mIncomingLocation = new KLineEdit( mIncomingLocationWdg ); mChooseLocation = new TQPushButton( i18n( "Choose..." ), mIncomingLocationWdg ); - connect( mChooseLocation, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( chooseLocation() ) ); + connect( mChooseLocation, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( chooseLocation() ) ); layout->addWidget( mIncomingLabel, 0, 0, AlignTop ); layout->addWidget( mIncomingLocationWdg, 0, 1 ); @@ -296,15 +296,15 @@ void AccountWizard::setupServerInformationPage() layout->addWidget( label, 1, 0 ); layout->addWidget( mOutgoingServer, 1, 1 ); - mOutgoingUseSSL = new TQCheckBox( i18n( "Use secure connection (SSL)" ), mServerInformationPage ); + mOutgoingUseSSL = new TQCheckBox( i18n( "Use secure connection (SSL/TLS)" ), mServerInformationPage ); layout->addWidget( mOutgoingUseSSL, 2, 1 ); mLocalDelivery = new TQCheckBox( i18n( "Use local delivery" ), mServerInformationPage ); layout->addWidget( mLocalDelivery, 3, 0 ); - connect( mLocalDelivery, TQT_SIGNAL( toggled( bool ) ), - mOutgoingServer, TQT_SLOT( setDisabled( bool ) ) ); + connect( mLocalDelivery, TQ_SIGNAL( toggled( bool ) ), + mOutgoingServer, TQ_SLOT( setDisabled( bool ) ) ); addPage( mServerInformationPage, i18n( "Server Information" ) ); } @@ -361,7 +361,7 @@ void AccountWizard::accept() manager->commit(); - TQTimer::singleShot( 0, this, TQT_SLOT( createTransport() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( createTransport() ) ); } void AccountWizard::createTransport() @@ -386,7 +386,7 @@ void AccountWizard::createTransport() mTransportInfo->auth = false; mTransportInfo->setStorePasswd( false ); - TQTimer::singleShot( 0, this, TQT_SLOT( transportCreated() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( transportCreated() ) ); } else { // delivery via SMTP mTransportInfo->type = "smtp"; mTransportInfo->name = accountName(); @@ -425,7 +425,7 @@ void AccountWizard::transportCreated() mTransportInfoList.setAutoDelete( true ); mTransportInfoList.clear(); - TQTimer::singleShot( 0, this, TQT_SLOT( createAccount() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( createAccount() ) ); } void AccountWizard::createAccount() @@ -485,7 +485,7 @@ void AccountWizard::createAccount() else if ( mTypeBox->type() == AccountTypeBox::IMAP || mTypeBox->type() == AccountTypeBox::dIMAP ) checkImapCapabilities( mIncomingServer->text(), port ); else - TQTimer::singleShot( 0, this, TQT_SLOT( accountCreated() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( accountCreated() ) ); } void AccountWizard::accountCreated() @@ -513,10 +513,10 @@ void AccountWizard::checkPopCapabilities( const TQString &server, int port ) delete mServerTest; mServerTest = new KMServerTest( POP_PROTOCOL, server, port ); - connect( mServerTest, TQT_SIGNAL( capabilities( const TQStringList&, const TQStringList& ) ), - this, TQT_SLOT( popCapabilities( const TQStringList&, const TQStringList& ) ) ); + connect( mServerTest, TQ_SIGNAL( capabilities( const TQStringList&, const TQStringList& ) ), + this, TQ_SLOT( popCapabilities( const TQStringList&, const TQStringList& ) ) ); - mAuthInfoLabel = createInfoLabel( i18n( "Check for supported security capabilities of %1..." ).arg( server ) ); + mAuthInfoLabel = createInfoLabel( i18n( "Checking for supported security capabilities of %1..." ).arg( server ) ); } void AccountWizard::checkImapCapabilities( const TQString &server, int port ) @@ -524,10 +524,10 @@ void AccountWizard::checkImapCapabilities( const TQString &server, int port ) delete mServerTest; mServerTest = new KMServerTest( IMAP_PROTOCOL, server, port ); - connect( mServerTest, TQT_SIGNAL( capabilities( const TQStringList&, const TQStringList& ) ), - this, TQT_SLOT( imapCapabilities( const TQStringList&, const TQStringList& ) ) ); + connect( mServerTest, TQ_SIGNAL( capabilities( const TQStringList&, const TQStringList& ) ), + this, TQ_SLOT( imapCapabilities( const TQStringList&, const TQStringList& ) ) ); - mAuthInfoLabel = createInfoLabel( i18n( "Check for supported security capabilities of %1..." ).arg( server ) ); + mAuthInfoLabel = createInfoLabel( i18n( "Checking for supported security capabilities of %1..." ).arg( server ) ); } void AccountWizard::checkSmtpCapabilities( const TQString &server, int port ) @@ -535,12 +535,12 @@ void AccountWizard::checkSmtpCapabilities( const TQString &server, int port ) delete mServerTest; mServerTest = new KMServerTest( SMTP_PROTOCOL, server, port ); - connect( mServerTest, TQT_SIGNAL( capabilities( const TQStringList&, const TQStringList&, + connect( mServerTest, TQ_SIGNAL( capabilities( const TQStringList&, const TQStringList&, const TQString&, const TQString&, const TQString& ) ), - this, TQT_SLOT( smtpCapabilities( const TQStringList&, const TQStringList&, + this, TQ_SLOT( smtpCapabilities( const TQStringList&, const TQStringList&, const TQString&, const TQString&, const TQString& ) ) ); - mAuthInfoLabel = createInfoLabel( i18n( "Check for supported security capabilities of %1..." ).arg( server ) ); + mAuthInfoLabel = createInfoLabel( i18n( "Checking for supported security capabilities of %1..." ).arg( server ) ); } void AccountWizard::popCapabilities( const TQStringList &capaNormalList, diff --git a/kmail/accountwizard.h b/kmail/accountwizard.h index b6cfe158..0b30ca80 100644 --- a/kmail/accountwizard.h +++ b/kmail/accountwizard.h @@ -44,7 +44,7 @@ class KMTransportInfo; class AccountWizard : public KWizard { - Q_OBJECT + TQ_OBJECT public: diff --git a/kmail/acljobs.cpp b/kmail/acljobs.cpp index 4b5f54f6..036ed51d 100644 --- a/kmail/acljobs.cpp +++ b/kmail/acljobs.cpp @@ -170,8 +170,8 @@ ACLJobs::GetACLJob::GetACLJob( const KURL& url, const TQByteArray &packedArgs, bool showProgressInfo ) : TDEIO::SimpleJob( url, TDEIO::CMD_SPECIAL, packedArgs, showProgressInfo ) { - connect( this, TQT_SIGNAL(infoMessage(TDEIO::Job*,const TQString&)), - TQT_SLOT(slotInfoMessage(TDEIO::Job*,const TQString&)) ); + connect( this, TQ_SIGNAL(infoMessage(TDEIO::Job*,const TQString&)), + TQ_SLOT(slotInfoMessage(TDEIO::Job*,const TQString&)) ); } void ACLJobs::GetACLJob::slotInfoMessage( TDEIO::Job*, const TQString& str ) @@ -191,8 +191,8 @@ ACLJobs::GetUserRightsJob::GetUserRightsJob( const KURL& url, const TQByteArray bool showProgressInfo ) : TDEIO::SimpleJob( url, TDEIO::CMD_SPECIAL, packedArgs, showProgressInfo ) { - connect( this, TQT_SIGNAL(infoMessage(TDEIO::Job*,const TQString&)), - TQT_SLOT(slotInfoMessage(TDEIO::Job*,const TQString&)) ); + connect( this, TQ_SIGNAL(infoMessage(TDEIO::Job*,const TQString&)), + TQ_SLOT(slotInfoMessage(TDEIO::Job*,const TQString&)) ); } void ACLJobs::GetUserRightsJob::slotInfoMessage( TDEIO::Job*, const TQString& str ) @@ -216,7 +216,7 @@ ACLJobs::MultiSetACLJob::MultiSetACLJob( TDEIO::Slave* slave, const KURL& url, c mSlave( slave ), mUrl( url ), mACLList( acl ), mACLListIterator( mACLList.begin() ) { - TQTimer::singleShot(0, this, TQT_SLOT(slotStart())); + TQTimer::singleShot(0, this, TQ_SLOT(slotStart())); } void ACLJobs::MultiSetACLJob::slotStart() diff --git a/kmail/acljobs.h b/kmail/acljobs.h index dd988343..025fc168 100644 --- a/kmail/acljobs.h +++ b/kmail/acljobs.h @@ -107,7 +107,7 @@ namespace ACLJobs { /// List all ACLs for a given url class GetACLJob : public TDEIO::SimpleJob { - Q_OBJECT + TQ_OBJECT public: GetACLJob( const KURL& url, const TQByteArray &packedArgs, @@ -124,7 +124,7 @@ namespace ACLJobs { /// Get the users' rights for a given url class GetUserRightsJob : public TDEIO::SimpleJob { - Q_OBJECT + TQ_OBJECT public: GetUserRightsJob( const KURL& url, const TQByteArray &packedArgs, @@ -141,7 +141,7 @@ namespace ACLJobs { /// This class only exists to store the userid in the job class DeleteACLJob : public TDEIO::SimpleJob { - Q_OBJECT + TQ_OBJECT public: DeleteACLJob( const KURL& url, const TQString& userId, @@ -156,7 +156,7 @@ namespace ACLJobs { /// Set and delete a list of permissions for different users on a given url class MultiSetACLJob : public TDEIO::Job { - Q_OBJECT + TQ_OBJECT public: diff --git a/kmail/actionscheduler.cpp b/kmail/actionscheduler.cpp index 738d6285..e5b0bdf5 100644 --- a/kmail/actionscheduler.cpp +++ b/kmail/actionscheduler.cpp @@ -48,7 +48,7 @@ using KMail::AccountManager; #include <tqtimer.h> #include <tdeconfig.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> using namespace KMail; typedef TQPtrList<KMMsgBase> KMMessageList; @@ -82,19 +82,19 @@ ActionScheduler::ActionScheduler(KMFilterMgr::FilterSet set, lastCommand = 0; lastJob = 0; finishTimer = new TQTimer( this, "finishTimer" ); - connect( finishTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(finish())); + connect( finishTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(finish())); fetchMessageTimer = new TQTimer( this, "fetchMessageTimer" ); - connect( fetchMessageTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(fetchMessage())); + connect( fetchMessageTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(fetchMessage())); tempCloseFoldersTimer = new TQTimer( this, "tempCloseFoldersTimer" ); - connect( tempCloseFoldersTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(tempCloseFolders())); + connect( tempCloseFoldersTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(tempCloseFolders())); processMessageTimer = new TQTimer( this, "processMessageTimer" ); - connect( processMessageTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(processMessage())); + connect( processMessageTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(processMessage())); filterMessageTimer = new TQTimer( this, "filterMessageTimer" ); - connect( filterMessageTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(filterMessage())); + connect( filterMessageTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(filterMessage())); timeOutTimer = new TQTimer( this, "timeOutTimer" ); - connect( timeOutTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(timeOut())); + connect( timeOutTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(timeOut())); fetchTimeOutTimer = new TQTimer( this, "fetchTimeOutTimer" ); - connect( fetchTimeOutTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(fetchTimeOut())); + connect( fetchTimeOutTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(fetchTimeOut())); TQValueList<KMFilter*>::Iterator it = filters.begin(); for (; it != filters.end(); ++it) @@ -122,10 +122,10 @@ ActionScheduler::~ActionScheduler() { schedulerList->remove( this ); tempCloseFolders(); - disconnect( mSrcFolder, TQT_SIGNAL(closed()), - this, TQT_SLOT(folderClosedOrExpunged()) ); - disconnect( mSrcFolder, TQT_SIGNAL(expunged(KMFolder*)), - this, TQT_SLOT(folderClosedOrExpunged()) ); + disconnect( mSrcFolder, TQ_SIGNAL(closed()), + this, TQ_SLOT(folderClosedOrExpunged()) ); + disconnect( mSrcFolder, TQ_SIGNAL(expunged(KMFolder*)), + this, TQ_SLOT(folderClosedOrExpunged()) ); mSrcFolder->close("actionschedsrc"); if (mDeleteSrcFolder) @@ -157,12 +157,12 @@ void ActionScheduler::setSourceFolder( KMFolder *srcFolder ) { srcFolder->open("actionschedsrc"); if (mSrcFolder) { - disconnect( mSrcFolder, TQT_SIGNAL(msgAdded(KMFolder*, TQ_UINT32)), - this, TQT_SLOT(msgAdded(KMFolder*, TQ_UINT32)) ); - disconnect( mSrcFolder, TQT_SIGNAL(closed()), - this, TQT_SLOT(folderClosedOrExpunged()) ); - disconnect( mSrcFolder, TQT_SIGNAL(expunged(KMFolder*)), - this, TQT_SLOT(folderClosedOrExpunged()) ); + disconnect( mSrcFolder, TQ_SIGNAL(msgAdded(KMFolder*, TQ_UINT32)), + this, TQ_SLOT(msgAdded(KMFolder*, TQ_UINT32)) ); + disconnect( mSrcFolder, TQ_SIGNAL(closed()), + this, TQ_SLOT(folderClosedOrExpunged()) ); + disconnect( mSrcFolder, TQ_SIGNAL(expunged(KMFolder*)), + this, TQ_SLOT(folderClosedOrExpunged()) ); mSrcFolder->close("actionschedsrc"); } mSrcFolder = srcFolder; @@ -170,12 +170,12 @@ void ActionScheduler::setSourceFolder( KMFolder *srcFolder ) for (i = 0; i < mSrcFolder->count(); ++i) enqueue( mSrcFolder->getMsgBase( i )->getMsgSerNum() ); if (mSrcFolder) { - connect( mSrcFolder, TQT_SIGNAL(msgAdded(KMFolder*, TQ_UINT32)), - this, TQT_SLOT(msgAdded(KMFolder*, TQ_UINT32)) ); - connect( mSrcFolder, TQT_SIGNAL(closed()), - this, TQT_SLOT(folderClosedOrExpunged()) ); - connect( mSrcFolder, TQT_SIGNAL(expunged(KMFolder*)), - this, TQT_SLOT(folderClosedOrExpunged()) ); + connect( mSrcFolder, TQ_SIGNAL(msgAdded(KMFolder*, TQ_UINT32)), + this, TQ_SLOT(msgAdded(KMFolder*, TQ_UINT32)) ); + connect( mSrcFolder, TQ_SIGNAL(closed()), + this, TQ_SLOT(folderClosedOrExpunged()) ); + connect( mSrcFolder, TQ_SIGNAL(expunged(KMFolder*)), + this, TQ_SLOT(folderClosedOrExpunged()) ); } } @@ -422,8 +422,8 @@ void ActionScheduler::fetchMessage() fetchTimeOutTime = TQTime::currentTime(); fetchTimeOutTimer->start( 60 * 1000, true ); FolderJob *job = msg->parent()->createJob( msg ); - connect( job, TQT_SIGNAL(messageRetrieved( KMMessage* )), - TQT_SLOT(messageFetched( KMMessage* )) ); + connect( job, TQ_SIGNAL(messageRetrieved( KMMessage* )), + TQ_SLOT(messageFetched( KMMessage* )) ); lastJob = job; job->start(); } else { @@ -563,8 +563,8 @@ void ActionScheduler::processMessage() } if (msg) { FolderJob *job = msg->parent()->createJob( msg ); - connect( job, TQT_SIGNAL(messageRetrieved( KMMessage* )), - TQT_SLOT(messageRetrieved( KMMessage* )) ); + connect( job, TQ_SIGNAL(messageRetrieved( KMMessage* )), + TQ_SLOT(messageRetrieved( KMMessage* )) ); job->start(); } else { mExecuting = false; @@ -689,8 +689,8 @@ void ActionScheduler::moveMessage() timeOutTime = TQTime::currentTime(); KMCommand *cmd = new KMMoveCommand( folder, msg ); - connect( cmd, TQT_SIGNAL( completed( KMCommand * ) ), - this, TQT_SLOT( moveMessageFinished( KMCommand * ) ) ); + connect( cmd, TQ_SIGNAL( completed( KMCommand * ) ), + this, TQ_SLOT( moveMessageFinished( KMCommand * ) ) ); cmd->start(); // sometimes the move command doesn't complete so time out after a minute // and move onto the next message @@ -727,16 +727,16 @@ void ActionScheduler::moveMessageFinished( KMCommand *command ) if (mResult == ResultOk) { mExecutingLock = false; if (cmd) - connect( cmd, TQT_SIGNAL( completed( KMCommand * ) ), - this, TQT_SLOT( processMessage() ) ); + connect( cmd, TQ_SIGNAL( completed( KMCommand * ) ), + this, TQ_SLOT( processMessage() ) ); else processMessageTimer->start( 0, true ); } else { // Note: An alternative to consider is just calling // finishTimer->start and returning if (cmd) - connect( cmd, TQT_SIGNAL( completed( KMCommand * ) ), - this, TQT_SLOT( finish() ) ); + connect( cmd, TQ_SIGNAL( completed( KMCommand * ) ), + this, TQ_SLOT( finish() ) ); else finishTimer->start( 0, true ); } @@ -758,8 +758,8 @@ void ActionScheduler::timeOut() // Note: This is a good place for a debug statement assert( lastCommand ); // sometimes imap jobs seem to just stall so give up and move on - disconnect( lastCommand, TQT_SIGNAL( completed( KMCommand * ) ), - this, TQT_SLOT( moveMessageFinished( KMCommand * ) ) ); + disconnect( lastCommand, TQ_SIGNAL( completed( KMCommand * ) ), + this, TQ_SLOT( moveMessageFinished( KMCommand * ) ) ); lastCommand = 0; mExecutingLock = false; mExecuting = false; @@ -773,8 +773,8 @@ void ActionScheduler::fetchTimeOut() // Note: This is a good place for a debug statement assert( lastJob ); // sometimes imap jobs seem to just stall so give up and move on - disconnect( lastJob, TQT_SIGNAL(messageRetrieved( KMMessage* )), - this, TQT_SLOT(messageFetched( KMMessage* )) ); + disconnect( lastJob, TQ_SIGNAL(messageRetrieved( KMMessage* )), + this, TQ_SLOT(messageFetched( KMMessage* )) ); lastJob->kill(); lastJob = 0; fetchMessageTimer->start( 0, true ); diff --git a/kmail/actionscheduler.h b/kmail/actionscheduler.h index 4551b3d2..b837c450 100644 --- a/kmail/actionscheduler.h +++ b/kmail/actionscheduler.h @@ -48,7 +48,7 @@ namespace KMail { /* A class for asynchronous filtering of messages */ class ActionScheduler : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/kmail/annotationjobs.cpp b/kmail/annotationjobs.cpp index c2fd8267..37f16d64 100644 --- a/kmail/annotationjobs.cpp +++ b/kmail/annotationjobs.cpp @@ -66,8 +66,8 @@ AnnotationJobs::GetAnnotationJob::GetAnnotationJob( const KURL& url, const TQStr : TDEIO::SimpleJob( url, TDEIO::CMD_SPECIAL, packedArgs, showProgressInfo ), mEntry( entry ) { - connect( this, TQT_SIGNAL(infoMessage(TDEIO::Job*,const TQString&)), - TQT_SLOT(slotInfoMessage(TDEIO::Job*,const TQString&)) ); + connect( this, TQ_SIGNAL(infoMessage(TDEIO::Job*,const TQString&)), + TQ_SLOT(slotInfoMessage(TDEIO::Job*,const TQString&)) ); } void AnnotationJobs::GetAnnotationJob::slotInfoMessage( TDEIO::Job*, const TQString& str ) @@ -88,7 +88,7 @@ AnnotationJobs::MultiGetAnnotationJob::MultiGetAnnotationJob( mSlave( slave ), mUrl( url ), mEntryList( entries ), mEntryListIterator( mEntryList.begin() ) { - TQTimer::singleShot(0, this, TQT_SLOT(slotStart())); + TQTimer::singleShot(0, this, TQ_SLOT(slotStart())); } @@ -143,7 +143,7 @@ AnnotationJobs::MultiSetAnnotationJob::MultiSetAnnotationJob( mSlave( slave ), mUrl( url ), mAnnotationList( annotations ), mAnnotationListIterator( mAnnotationList.begin() ) { - TQTimer::singleShot(0, this, TQT_SLOT(slotStart())); + TQTimer::singleShot(0, this, TQ_SLOT(slotStart())); } @@ -196,7 +196,7 @@ AnnotationJobs::MultiUrlGetAnnotationJob::MultiUrlGetAnnotationJob( TDEIO::Slave mPathListIterator( mPathList.begin() ), mAnnotation( annotation ) { - TQTimer::singleShot(0, this, TQT_SLOT(slotStart())); + TQTimer::singleShot(0, this, TQ_SLOT(slotStart())); } diff --git a/kmail/annotationjobs.h b/kmail/annotationjobs.h index 2e7529f2..954a1dea 100644 --- a/kmail/annotationjobs.h +++ b/kmail/annotationjobs.h @@ -107,7 +107,7 @@ MultiUrlGetAnnotationJob* multiUrlGetAnnotation( TDEIO::Slave* slave, /// for getAnnotation() class GetAnnotationJob : public TDEIO::SimpleJob { - Q_OBJECT + TQ_OBJECT public: GetAnnotationJob( const KURL& url, const TQString& entry, const TQByteArray &packedArgs, @@ -125,7 +125,7 @@ private: /// for multiGetAnnotation class MultiGetAnnotationJob : public TDEIO::Job { - Q_OBJECT + TQ_OBJECT public: @@ -149,7 +149,7 @@ private: /// for multiUrlGetAnnotation class MultiUrlGetAnnotationJob : public TDEIO::Job { - Q_OBJECT + TQ_OBJECT public: @@ -174,7 +174,7 @@ private: /// for multiSetAnnotation class MultiSetAnnotationJob : public TDEIO::Job { - Q_OBJECT + TQ_OBJECT public: diff --git a/kmail/antispamconfig.cpp b/kmail/antispamconfig.cpp index f187dcd6..e0dbb5bf 100644 --- a/kmail/antispamconfig.cpp +++ b/kmail/antispamconfig.cpp @@ -33,8 +33,6 @@ #include "antispamconfig.h" -#include <kasciistricmp.h> - #include <kstaticdeleter.h> #include <tdeconfig.h> diff --git a/kmail/antispamwizard.cpp b/kmail/antispamwizard.cpp index 5552b058..6c537334 100644 --- a/kmail/antispamwizard.cpp +++ b/kmail/antispamwizard.cpp @@ -46,7 +46,7 @@ #include <kiconloader.h> #include <tdelocale.h> #include <tdemessagebox.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <tqdom.h> #include <tqlabel.h> @@ -104,24 +104,24 @@ AntiSpamWizard::AntiSpamWizard( WizardMode mode, ( mMode == AntiSpam ) ? i18n( "Welcome to the KMail Anti-Spam Wizard" ) : i18n( "Welcome to the KMail Anti-Virus Wizard" ) ); - connect( mInfoPage, TQT_SIGNAL( selectionChanged( void ) ), - this, TQT_SLOT( checkProgramsSelections( void ) ) ); + connect( mInfoPage, TQ_SIGNAL( selectionChanged( void ) ), + this, TQ_SLOT( checkProgramsSelections( void ) ) ); if ( mMode == AntiSpam ) { mSpamRulesPage = new ASWizSpamRulesPage( 0, "", mainFolderTree ); addPage( mSpamRulesPage, i18n( "Options to fine-tune the handling of spam messages" )); - connect( mSpamRulesPage, TQT_SIGNAL( selectionChanged( void ) ), - this, TQT_SLOT( slotBuildSummary( void ) ) ); + connect( mSpamRulesPage, TQ_SIGNAL( selectionChanged( void ) ), + this, TQ_SLOT( slotBuildSummary( void ) ) ); } else { mVirusRulesPage = new ASWizVirusRulesPage( 0, "", mainFolderTree ); addPage( mVirusRulesPage, i18n( "Options to fine-tune the handling of virus messages" )); - connect( mVirusRulesPage, TQT_SIGNAL( selectionChanged( void ) ), - this, TQT_SLOT( checkVirusRulesSelections( void ) ) ); + connect( mVirusRulesPage, TQ_SIGNAL( selectionChanged( void ) ), + this, TQ_SLOT( checkVirusRulesSelections( void ) ) ); } - connect( this, TQT_SIGNAL( helpClicked( void) ), - this, TQT_SLOT( slotHelpClicked( void ) ) ); + connect( this, TQ_SIGNAL( helpClicked( void) ), + this, TQ_SLOT( slotHelpClicked( void ) ) ); setNextEnabled( mInfoPage, false ); @@ -132,7 +132,7 @@ AntiSpamWizard::AntiSpamWizard( WizardMode mode, setFinishEnabled( mSummaryPage, true ); } - TQTimer::singleShot( 0, this, TQT_SLOT( checkToolAvailability( void ) ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( checkToolAvailability( void ) ) ); } @@ -517,7 +517,7 @@ void AntiSpamWizard::checkToolAvailability() } else { // check the availability of the application - TDEApplication::kApplication()->processEvents( 200 ); + tdeApp->processEvents( 200 ); if ( !checkForProgram( (*it).getExecutable() ) ) { mInfoPage->addAvailableTool( (*it).getVisibleName() ); found = true; @@ -540,9 +540,9 @@ void AntiSpamWizard::checkToolAvailability() void AntiSpamWizard::slotHelpClicked() { if ( mMode == AntiSpam ) - kapp->invokeHelp( "the-anti-spam-wizard", "kmail" ); + tdeApp->invokeHelp( "the-anti-spam-wizard", "kmail" ); else - kapp->invokeHelp( "the-anti-virus-wizard", "kmail" ); + tdeApp->invokeHelp( "the-anti-virus-wizard", "kmail" ); } @@ -891,8 +891,8 @@ ASWizInfoPage::ASWizInfoPage( AntiSpamWizard::WizardMode mode, mToolsList->setRowMode( TQListBox::FixedNumber ); mToolsList->setRowMode( 10 ); layout->addWidget( mToolsList ); - connect( mToolsList, TQT_SIGNAL(selectionChanged()), - this, TQT_SLOT(processSelectionChange(void)) ); + connect( mToolsList, TQ_SIGNAL(selectionChanged()), + this, TQ_SLOT(processSelectionChange(void)) ); mSelectionHint = new TQLabel( this ); mSelectionHint->setText( "" ); @@ -983,16 +983,16 @@ ASWizSpamRulesPage::ASWizSpamRulesPage( TQWidget * parent, const char * name, layout->addStretch(); - connect( mMarkRules, TQT_SIGNAL(clicked()), - this, TQT_SLOT(processSelectionChange(void)) ); - connect( mMoveSpamRules, TQT_SIGNAL(clicked()), - this, TQT_SLOT(processSelectionChange(void)) ); - connect( mMoveUnsureRules, TQT_SIGNAL(clicked()), - this, TQT_SLOT(processSelectionChange(void)) ); - connect( mFolderReqForSpamFolder, TQT_SIGNAL(folderChanged(KMFolder*)), - this, TQT_SLOT(processSelectionChange(KMFolder*)) ); - connect( mFolderReqForUnsureFolder, TQT_SIGNAL(folderChanged(KMFolder*)), - this, TQT_SLOT(processSelectionChange(KMFolder*)) ); + connect( mMarkRules, TQ_SIGNAL(clicked()), + this, TQ_SLOT(processSelectionChange(void)) ); + connect( mMoveSpamRules, TQ_SIGNAL(clicked()), + this, TQ_SLOT(processSelectionChange(void)) ); + connect( mMoveUnsureRules, TQ_SIGNAL(clicked()), + this, TQ_SLOT(processSelectionChange(void)) ); + connect( mFolderReqForSpamFolder, TQ_SIGNAL(folderChanged(KMFolder*)), + this, TQ_SLOT(processSelectionChange(KMFolder*)) ); + connect( mFolderReqForUnsureFolder, TQ_SIGNAL(folderChanged(KMFolder*)), + this, TQ_SLOT(processSelectionChange(KMFolder*)) ); mMarkRules->setChecked( true ); mMoveSpamRules->setChecked( true ); @@ -1093,14 +1093,14 @@ ASWizVirusRulesPage::ASWizVirusRulesPage( TQWidget * parent, const char * name, mFolderTree = new SimpleFolderTree( this, mainFolderTree, s, true ); grid->addWidget( mFolderTree, 3, 0 ); - connect( mPipeRules, TQT_SIGNAL(clicked()), - this, TQT_SLOT(processSelectionChange(void)) ); - connect( mMoveRules, TQT_SIGNAL(clicked()), - this, TQT_SLOT(processSelectionChange(void)) ); - connect( mMarkRules, TQT_SIGNAL(clicked()), - this, TQT_SLOT(processSelectionChange(void)) ); - connect( mMoveRules, TQT_SIGNAL( toggled( bool ) ), - mMarkRules, TQT_SLOT( setEnabled( bool ) ) ); + connect( mPipeRules, TQ_SIGNAL(clicked()), + this, TQ_SLOT(processSelectionChange(void)) ); + connect( mMoveRules, TQ_SIGNAL(clicked()), + this, TQ_SLOT(processSelectionChange(void)) ); + connect( mMarkRules, TQ_SIGNAL(clicked()), + this, TQ_SLOT(processSelectionChange(void)) ); + connect( mMoveRules, TQ_SIGNAL( toggled( bool ) ), + mMarkRules, TQ_SLOT( setEnabled( bool ) ) ); } bool ASWizVirusRulesPage::pipeRulesSelected() const diff --git a/kmail/antispamwizard.h b/kmail/antispamwizard.h index e93480c1..3f13ce8e 100644 --- a/kmail/antispamwizard.h +++ b/kmail/antispamwizard.h @@ -103,7 +103,7 @@ namespace KMail { */ class AntiSpamWizard : public KWizard { - Q_OBJECT + TQ_OBJECT public: @@ -298,7 +298,7 @@ namespace KMail { //--------------------------------------------------------------------------- class ASWizInfoPage : public ASWizPage { - Q_OBJECT + TQ_OBJECT public: @@ -325,7 +325,7 @@ namespace KMail { //--------------------------------------------------------------------------- class ASWizSpamRulesPage : public ASWizPage { - Q_OBJECT + TQ_OBJECT public: @@ -358,7 +358,7 @@ namespace KMail { //------------------------------------------------------------------------- class ASWizVirusRulesPage : public ASWizPage { - Q_OBJECT + TQ_OBJECT public: @@ -385,7 +385,7 @@ namespace KMail { //--------------------------------------------------------------------------- class ASWizSummaryPage : public ASWizPage { - Q_OBJECT + TQ_OBJECT public: diff --git a/kmail/app_octetstream.cpp b/kmail/app_octetstream.cpp index b45140ac..990f1ff3 100644 --- a/kmail/app_octetstream.cpp +++ b/kmail/app_octetstream.cpp @@ -32,7 +32,7 @@ #include "interfaces/bodypartformatter.h" -#include <kdemacros.h> +#include <tdemacros.h> namespace { @@ -59,7 +59,7 @@ namespace { } extern "C" -KDE_EXPORT KMail::Interface::BodyPartFormatterPlugin * +TDE_EXPORT KMail::Interface::BodyPartFormatterPlugin * libkmail_bodypartformatter_application_octetstream_create_bodypart_formatter_plugin() { return new Plugin(); } diff --git a/kmail/archivefolderdialog.cpp b/kmail/archivefolderdialog.cpp index 435752c6..4a62497c 100644 --- a/kmail/archivefolderdialog.cpp +++ b/kmail/archivefolderdialog.cpp @@ -46,7 +46,7 @@ static TQString standardArchivePath( const TQString &folderName ) } return currentPath + i18n( "Start of the filename for a mail archive file" , "Archive" ) + "_" + folderName + - "_" + TQDate::currentDate().toString( Qt::ISODate ) + ".tar.bz2"; + "_" + TQDate::currentDate().toString( TQt::ISODate ) + ".tar.bz2"; } ArchiveFolderDialog::ArchiveFolderDialog( TQWidget *parent ) @@ -71,8 +71,8 @@ ArchiveFolderDialog::ArchiveFolderDialog( TQWidget *parent ) mainLayout->addWidget( folderLabel, row, 0 ); mFolderRequester = new FolderRequester( mainWidget, kmkernel->getKMMainWidget()->folderTree() ); mFolderRequester->setMustBeReadWrite( false ); - connect( mFolderRequester, TQT_SIGNAL(folderChanged(KMFolder *)), - TQT_SLOT(slotFolderChanged(KMFolder *)) ); + connect( mFolderRequester, TQ_SIGNAL(folderChanged(KMFolder *)), + TQ_SLOT(slotFolderChanged(KMFolder *)) ); folderLabel->setBuddy( mFolderRequester ); mainLayout->addWidget( mFolderRequester, row, 1 ); row++; @@ -88,8 +88,8 @@ ArchiveFolderDialog::ArchiveFolderDialog( TQWidget *parent ) mFormatComboBox->insertItem( i18n( "BZ2-Compressed Tar Archive (.tar.bz2)" ) ); mFormatComboBox->insertItem( i18n( "GZ-Compressed Tar Archive (.tar.gz)" ) ); mFormatComboBox->setCurrentItem( 2 ); - connect( mFormatComboBox, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotFixFileExtension()) ); + connect( mFormatComboBox, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotFixFileExtension()) ); mainLayout->addWidget( mFormatComboBox, row, 1 ); row++; @@ -100,10 +100,10 @@ ArchiveFolderDialog::ArchiveFolderDialog( TQWidget *parent ) mUrlRequester->setFilter( "*.tar *.zip *.tar.gz *.tar.bz2" ); mUrlRequester->fileDialog()->setKeepLocation( true ); fileNameLabel->setBuddy( mUrlRequester ); - connect( mUrlRequester->lineEdit(), TQT_SIGNAL(textChanged(const TQString &)), - TQT_SLOT(slotUrlChanged(const TQString &)) ); - connect( mUrlRequester, TQT_SIGNAL(urlSelected(const TQString&)), - this, TQT_SLOT(slotFixFileExtension()) ); + connect( mUrlRequester->lineEdit(), TQ_SIGNAL(textChanged(const TQString &)), + TQ_SLOT(slotUrlChanged(const TQString &)) ); + connect( mUrlRequester, TQ_SIGNAL(urlSelected(const TQString&)), + this, TQ_SLOT(slotFixFileExtension()) ); mainLayout->addWidget( mUrlRequester, row, 1 ); row++; diff --git a/kmail/archivefolderdialog.h b/kmail/archivefolderdialog.h index cf9133e6..7e5b7853 100644 --- a/kmail/archivefolderdialog.h +++ b/kmail/archivefolderdialog.h @@ -32,7 +32,7 @@ class FolderRequester; class ArchiveFolderDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/kmail/attachmentlistview.h b/kmail/attachmentlistview.h index d0a0b63e..7a6e1353 100644 --- a/kmail/attachmentlistview.h +++ b/kmail/attachmentlistview.h @@ -29,7 +29,7 @@ class Composer; class AttachmentListView : public TDEListView { - Q_OBJECT + TQ_OBJECT public: AttachmentListView( KMail::Composer * composer = 0, TQWidget* parent = 0, diff --git a/kmail/backupjob.cpp b/kmail/backupjob.cpp index bf78e68c..b67834c4 100644 --- a/kmail/backupjob.cpp +++ b/kmail/backupjob.cpp @@ -234,15 +234,15 @@ void BackupJob::archiveNextMessage() // Use a singleshot timer, or otherwise we risk ending up in a very big recursion // for folders that have many messages mCurrentMessage = message; - TQTimer::singleShot( 0, this, TQT_SLOT( processCurrentMessage() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( processCurrentMessage() ) ); } else if ( message->parent() ) { mCurrentJob = message->parent()->createJob( message ); mCurrentJob->setCancellable( false ); - connect( mCurrentJob, TQT_SIGNAL( messageRetrieved( KMMessage* ) ), - this, TQT_SLOT( messageRetrieved( KMMessage* ) ) ); - connect( mCurrentJob, TQT_SIGNAL( result( KMail::FolderJob* ) ), - this, TQT_SLOT( folderJobFinished( KMail::FolderJob* ) ) ); + connect( mCurrentJob, TQ_SIGNAL( messageRetrieved( KMMessage* ) ), + this, TQ_SLOT( messageRetrieved( KMMessage* ) ) ); + connect( mCurrentJob, TQ_SIGNAL( result( KMail::FolderJob* ) ), + this, TQ_SLOT( folderJobFinished( KMail::FolderJob* ) ) ); mCurrentJob->start(); } else { @@ -490,8 +490,8 @@ void BackupJob::start() TQString(), true ); mProgressItem->setUsesBusyIndicator( true ); - connect( mProgressItem, TQT_SIGNAL(progressItemCanceled(KPIM::ProgressItem*)), - this, TQT_SLOT(cancelJob()) ); + connect( mProgressItem, TQ_SIGNAL(progressItemCanceled(KPIM::ProgressItem*)), + this, TQ_SLOT(cancelJob()) ); archiveNextFolder(); } diff --git a/kmail/backupjob.h b/kmail/backupjob.h index 4ca6728f..495641a6 100644 --- a/kmail/backupjob.h +++ b/kmail/backupjob.h @@ -47,7 +47,7 @@ namespace KMail */ class BackupJob : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/kmail/bodypartformatter.cpp b/kmail/bodypartformatter.cpp index 8435ef25..3ee62d97 100644 --- a/kmail/bodypartformatter.cpp +++ b/kmail/bodypartformatter.cpp @@ -46,7 +46,6 @@ #include <mimelib/utility.h> #include <kdebug.h> -#include <kasciistricmp.h> namespace { class AnyTypeBodyPartFormatter diff --git a/kmail/cachedimapjob.cpp b/kmail/cachedimapjob.cpp index bba5b1b6..89dd1116 100644 --- a/kmail/cachedimapjob.cpp +++ b/kmail/cachedimapjob.cpp @@ -200,11 +200,11 @@ void CachedImapJob::listMessages() ImapAccountBase::jobData jd( url.url(), mFolder->folder() ); jd.cancellable = true; mAccount->insertJob( job, jd ); - connect( job, TQT_SIGNAL( result(TDEIO::Job *) ), - this, TQT_SLOT( slotListMessagesResult( TDEIO::Job* ) ) ); + connect( job, TQ_SIGNAL( result(TDEIO::Job *) ), + this, TQ_SLOT( slotListMessagesResult( TDEIO::Job* ) ) ); // send the data directly for KMFolderCachedImap - connect( job, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ), - mFolder, TQT_SLOT( slotGetMessagesData( TDEIO::Job* , const TQByteArray& ) ) ); + connect( job, TQ_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ), + mFolder, TQ_SLOT( slotGetMessagesData( TDEIO::Job* , const TQByteArray& ) ) ); } void CachedImapJob::slotDeleteNextMessages( TDEIO::Job* job ) @@ -240,8 +240,8 @@ void CachedImapJob::slotDeleteNextMessages( TDEIO::Job* job ) TDEIO::Scheduler::assignJobToSlave( mAccount->slave(), simpleJob ); ImapAccountBase::jobData jd( url.url(), mFolder->folder() ); mAccount->insertJob( simpleJob, jd ); - connect( simpleJob, TQT_SIGNAL( result(TDEIO::Job *) ), - this, TQT_SLOT( slotDeleteNextMessages(TDEIO::Job *) ) ); + connect( simpleJob, TQ_SIGNAL( result(TDEIO::Job *) ), + this, TQ_SLOT( slotDeleteNextMessages(TDEIO::Job *) ) ); } void CachedImapJob::expungeFolder() @@ -254,8 +254,8 @@ void CachedImapJob::expungeFolder() TDEIO::Scheduler::assignJobToSlave( mAccount->slave(), job ); ImapAccountBase::jobData jd( url.url(), mFolder->folder() ); mAccount->insertJob( job, jd ); - connect( job, TQT_SIGNAL( result(TDEIO::Job *) ), - this, TQT_SLOT( slotExpungeResult(TDEIO::Job *) ) ); + connect( job, TQ_SIGNAL( result(TDEIO::Job *) ), + this, TQ_SLOT( slotExpungeResult(TDEIO::Job *) ) ); } void CachedImapJob::slotExpungeResult( TDEIO::Job * job ) @@ -349,12 +349,12 @@ void CachedImapJob::slotGetNextMessage(TDEIO::Job * job) TDEIO::SimpleJob *simpleJob = TDEIO::get(url, false, false); TDEIO::Scheduler::assignJobToSlave(mAccount->slave(), simpleJob); mAccount->insertJob(simpleJob, jd); - connect(simpleJob, TQT_SIGNAL(processedSize(TDEIO::Job *, TDEIO::filesize_t)), - this, TQT_SLOT(slotProcessedSize(TDEIO::Job *, TDEIO::filesize_t))); - connect(simpleJob, TQT_SIGNAL(result(TDEIO::Job *)), - this, TQT_SLOT(slotGetNextMessage(TDEIO::Job *))); - connect(simpleJob, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), - mFolder, TQT_SLOT(slotSimpleData(TDEIO::Job *, const TQByteArray &))); + connect(simpleJob, TQ_SIGNAL(processedSize(TDEIO::Job *, TDEIO::filesize_t)), + this, TQ_SLOT(slotProcessedSize(TDEIO::Job *, TDEIO::filesize_t))); + connect(simpleJob, TQ_SIGNAL(result(TDEIO::Job *)), + this, TQ_SLOT(slotGetNextMessage(TDEIO::Job *))); + connect(simpleJob, TQ_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), + mFolder, TQ_SLOT(slotSimpleData(TDEIO::Job *, const TQByteArray &))); } void CachedImapJob::slotProcessedSize(TDEIO::Job *, TDEIO::filesize_t processed) @@ -420,14 +420,14 @@ void CachedImapJob::slotPutNextMessage() TDEIO::SimpleJob *simpleJob = TDEIO::put(url, 0, false, false, false); TDEIO::Scheduler::assignJobToSlave(mAccount->slave(), simpleJob); mAccount->insertJob(simpleJob, jd); - connect( simpleJob, TQT_SIGNAL( result(TDEIO::Job *) ), - TQT_SLOT( slotPutMessageResult(TDEIO::Job *) ) ); - connect( simpleJob, TQT_SIGNAL( dataReq(TDEIO::Job *, TQByteArray &) ), - TQT_SLOT( slotPutMessageDataReq(TDEIO::Job *, TQByteArray &) ) ); - connect( simpleJob, TQT_SIGNAL( data(TDEIO::Job *, const TQByteArray &) ), - mFolder, TQT_SLOT( slotSimpleData(TDEIO::Job *, const TQByteArray &) ) ); - connect( simpleJob, TQT_SIGNAL(infoMessage(TDEIO::Job *, const TQString &)), - TQT_SLOT(slotPutMessageInfoData(TDEIO::Job *, const TQString &)) ); + connect( simpleJob, TQ_SIGNAL( result(TDEIO::Job *) ), + TQ_SLOT( slotPutMessageResult(TDEIO::Job *) ) ); + connect( simpleJob, TQ_SIGNAL( dataReq(TDEIO::Job *, TQByteArray &) ), + TQ_SLOT( slotPutMessageDataReq(TDEIO::Job *, TQByteArray &) ) ); + connect( simpleJob, TQ_SIGNAL( data(TDEIO::Job *, const TQByteArray &) ), + mFolder, TQ_SLOT( slotSimpleData(TDEIO::Job *, const TQByteArray &) ) ); + connect( simpleJob, TQ_SIGNAL(infoMessage(TDEIO::Job *, const TQString &)), + TQ_SLOT(slotPutMessageInfoData(TDEIO::Job *, const TQString &)) ); } @@ -590,8 +590,8 @@ void CachedImapJob::slotAddNextSubfolder( TDEIO::Job * job ) TDEIO::SimpleJob *simpleJob = TDEIO::mkdir(url); TDEIO::Scheduler::assignJobToSlave(mAccount->slave(), simpleJob); mAccount->insertJob(simpleJob, jd); - connect( simpleJob, TQT_SIGNAL(result(TDEIO::Job *)), - this, TQT_SLOT(slotAddNextSubfolder(TDEIO::Job *)) ); + connect( simpleJob, TQ_SIGNAL(result(TDEIO::Job *)), + this, TQ_SLOT(slotAddNextSubfolder(TDEIO::Job *)) ); } else { TQByteArray packedArgs; TQDataStream stream( packedArgs, IO_WriteOnly ); @@ -608,8 +608,8 @@ void CachedImapJob::slotAddNextSubfolder( TDEIO::Job * job ) TDEIO::SimpleJob *simpleJob = TDEIO::special( url.url(), packedArgs, false ); TDEIO::Scheduler::assignJobToSlave(mAccount->slave(), simpleJob); mAccount->insertJob(simpleJob, jd); - connect( simpleJob, TQT_SIGNAL(result(TDEIO::Job *)), - this, TQT_SLOT(slotAddNextSubfolder(TDEIO::Job *)) ); + connect( simpleJob, TQ_SIGNAL(result(TDEIO::Job *)), + this, TQ_SLOT(slotAddNextSubfolder(TDEIO::Job *)) ); } } @@ -648,8 +648,8 @@ void CachedImapJob::slotDeleteNextFolder( TDEIO::Job *job ) TDEIO::SimpleJob *simpleJob = TDEIO::file_delete(url, false); TDEIO::Scheduler::assignJobToSlave(mAccount->slave(), simpleJob); mAccount->insertJob(simpleJob, jd); - connect( simpleJob, TQT_SIGNAL( result(TDEIO::Job *) ), - TQT_SLOT( slotDeleteNextFolder(TDEIO::Job *) ) ); + connect( simpleJob, TQ_SIGNAL( result(TDEIO::Job *) ), + TQ_SLOT( slotDeleteNextFolder(TDEIO::Job *) ) ); } void CachedImapJob::checkUidValidity() @@ -663,10 +663,10 @@ void CachedImapJob::checkUidValidity() TDEIO::SimpleJob *job = TDEIO::get( url, false, false ); TDEIO::Scheduler::assignJobToSlave( mAccount->slave(), job ); mAccount->insertJob( job, jd ); - connect( job, TQT_SIGNAL(result(TDEIO::Job *)), - TQT_SLOT(slotCheckUidValidityResult(TDEIO::Job *)) ); - connect( job, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), - mFolder, TQT_SLOT(slotSimpleData(TDEIO::Job *, const TQByteArray &))); + connect( job, TQ_SIGNAL(result(TDEIO::Job *)), + TQ_SLOT(slotCheckUidValidityResult(TDEIO::Job *)) ); + connect( job, TQ_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), + mFolder, TQ_SLOT(slotSimpleData(TDEIO::Job *, const TQByteArray &))); } void CachedImapJob::slotCheckUidValidityResult(TDEIO::Job * job) @@ -752,8 +752,8 @@ void CachedImapJob::renameFolder( const TQString &newName ) TDEIO::SimpleJob *simpleJob = TDEIO::rename( urlSrc, urlDst, false ); TDEIO::Scheduler::assignJobToSlave( mAccount->slave(), simpleJob ); mAccount->insertJob( simpleJob, jd ); - connect( simpleJob, TQT_SIGNAL(result(TDEIO::Job *)), - TQT_SLOT(slotRenameFolderResult(TDEIO::Job *)) ); + connect( simpleJob, TQ_SIGNAL(result(TDEIO::Job *)), + TQ_SLOT(slotRenameFolderResult(TDEIO::Job *)) ); } static void renameChildFolders( KMFolderDir* dir, const TQString& oldPath, @@ -826,14 +826,14 @@ void CachedImapJob::slotSubscribtionChange2Failed( const TQString &errorMessage void CachedImapJob::slotSubscribtionChange1Done( const TQString&, bool ) { - disconnect( mAccount, TQT_SIGNAL( subscriptionChanged( const TQString&, bool ) ), - this, TQT_SLOT( slotSubscribtionChange1Done( const TQString&, bool ) ) ); - connect( mAccount, TQT_SIGNAL( subscriptionChanged( const TQString&, bool ) ), - this, TQT_SLOT( slotSubscribtionChange2Done( const TQString&, bool ) ) ); - disconnect( mAccount, TQT_SIGNAL( subscriptionChangeFailed( const TQString& ) ), - this, TQT_SLOT( slotSubscribtionChange1Failed( const TQString& ) ) ); - connect( mAccount, TQT_SIGNAL( subscriptionChangeFailed( const TQString& ) ), - this, TQT_SLOT( slotSubscribtionChange2Failed( const TQString& ) ) ); + disconnect( mAccount, TQ_SIGNAL( subscriptionChanged( const TQString&, bool ) ), + this, TQ_SLOT( slotSubscribtionChange1Done( const TQString&, bool ) ) ); + connect( mAccount, TQ_SIGNAL( subscriptionChanged( const TQString&, bool ) ), + this, TQ_SLOT( slotSubscribtionChange2Done( const TQString&, bool ) ) ); + disconnect( mAccount, TQ_SIGNAL( subscriptionChangeFailed( const TQString& ) ), + this, TQ_SLOT( slotSubscribtionChange1Failed( const TQString& ) ) ); + connect( mAccount, TQ_SIGNAL( subscriptionChangeFailed( const TQString& ) ), + this, TQ_SLOT( slotSubscribtionChange2Failed( const TQString& ) ) ); mAccount->changeSubscription( false, mOldImapPath, true /* quiet */ ); } @@ -865,10 +865,10 @@ void CachedImapJob::slotRenameFolderResult( TDEIO::Job *job ) // Okay, the folder seems to be renamed on the server and on disk. // Now unsubscribe from the old folder name and subscribe to the new folder name, // so that the folder doesn't suddenly disappear after renaming it - connect( mAccount, TQT_SIGNAL( subscriptionChangeFailed( const TQString& ) ), - this, TQT_SLOT( slotSubscribtionChange1Failed( const TQString& ) ) ); - connect( mAccount, TQT_SIGNAL( subscriptionChanged( const TQString&, bool ) ), - this, TQT_SLOT( slotSubscribtionChange1Done( const TQString&, bool ) ) ); + connect( mAccount, TQ_SIGNAL( subscriptionChangeFailed( const TQString& ) ), + this, TQ_SLOT( slotSubscribtionChange1Failed( const TQString& ) ) ); + connect( mAccount, TQ_SIGNAL( subscriptionChanged( const TQString&, bool ) ), + this, TQ_SLOT( slotSubscribtionChange1Done( const TQString&, bool ) ) ); mAccount->changeSubscription( true, mNewImapPath, true /* quiet */ ); } } diff --git a/kmail/cachedimapjob.h b/kmail/cachedimapjob.h index f2daa6c7..aa9094bf 100644 --- a/kmail/cachedimapjob.h +++ b/kmail/cachedimapjob.h @@ -59,7 +59,7 @@ class KMMessage; namespace KMail { class CachedImapJob : public FolderJob { - Q_OBJECT + TQ_OBJECT public: /** Information about a message to be downloaded (from the 'IMAP envelope') */ diff --git a/kmail/callback.cpp b/kmail/callback.cpp index 66bcd12f..70020037 100644 --- a/kmail/callback.cpp +++ b/kmail/callback.cpp @@ -76,7 +76,7 @@ TQString Callback::askForTransport( bool nullIdentity ) const "Please select the transport which should be used to send your reply.</qt>"); bool ok; const TQString transport = KInputDialog::getItem( i18n( "Select Transport" ), text, - transports, defaultIndex, FALSE, &ok, kmkernel->mainWin() ); + transports, defaultIndex, false, &ok, kmkernel->mainWin() ); if ( !ok ) return TQString(); @@ -232,7 +232,7 @@ TQString Callback::receiver() const mReceiver = KInputDialog::getItem( i18n( "Select Address" ), selectMessage, - addrs+ccaddrs, defaultIndex, FALSE, &ok, kmkernel->mainWin() ); + addrs+ccaddrs, defaultIndex, false, &ok, kmkernel->mainWin() ); if( !ok ) mReceiver = TQString(); } diff --git a/kmail/callback.h b/kmail/callback.h index 2722d0ff..4fff0f73 100644 --- a/kmail/callback.h +++ b/kmail/callback.h @@ -38,7 +38,7 @@ class KMMessage; class KMReaderWin; -#include <kdemacros.h> +#include <tdemacros.h> #include <libkcal/attendee.h> // only for an enum, we are not linking @@ -52,7 +52,7 @@ namespace KMail { Feel free to put whatever you want in here. It's not supposed to be a nicely formatted class, but simply include everything necessary for the plugins. */ -class KDE_EXPORT Callback { +class TDE_EXPORT Callback { public: Callback( KMMessage* msg, KMReaderWin* readerWin ); diff --git a/kmail/chiasmuskeyselector.cpp b/kmail/chiasmuskeyselector.cpp index 9e25743e..c4e546ff 100644 --- a/kmail/chiasmuskeyselector.cpp +++ b/kmail/chiasmuskeyselector.cpp @@ -35,8 +35,8 @@ ChiasmusKeySelector::ChiasmusKeySelector( TQWidget* parent, const TQString& capt layout->addStretch(); - connect( mListBox, TQT_SIGNAL( doubleClicked( TQListBoxItem * ) ), this, TQT_SLOT( slotOk() ) ); - connect( mListBox, TQT_SIGNAL( returnPressed( TQListBoxItem * ) ), this, TQT_SLOT( slotOk() ) ); + connect( mListBox, TQ_SIGNAL( doubleClicked( TQListBoxItem * ) ), this, TQ_SLOT( slotOk() ) ); + connect( mListBox, TQ_SIGNAL( returnPressed( TQListBoxItem * ) ), this, TQ_SLOT( slotOk() ) ); mListBox->setFocus(); } diff --git a/kmail/chiasmuskeyselector.h b/kmail/chiasmuskeyselector.h index 7e0d36fb..7039e05a 100644 --- a/kmail/chiasmuskeyselector.h +++ b/kmail/chiasmuskeyselector.h @@ -8,7 +8,7 @@ class TQLabel; class ChiasmusKeySelector : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/kmail/colorlistbox.cpp b/kmail/colorlistbox.cpp index c7481924..a8610dcd 100644 --- a/kmail/colorlistbox.cpp +++ b/kmail/colorlistbox.cpp @@ -32,7 +32,7 @@ ColorListBox::ColorListBox( TQWidget *parent, const char *name, WFlags f ) :TDEListBox( parent, name, f ), mCurrentOnDragEnter(-1) { - connect( this, TQT_SIGNAL(selected(int)), this, TQT_SLOT(newColor(int)) ); + connect( this, TQ_SIGNAL(selected(int)), this, TQ_SLOT(newColor(int)) ); setAcceptDrops( true); } diff --git a/kmail/colorlistbox.h b/kmail/colorlistbox.h index 03ae5069..b6ae2551 100644 --- a/kmail/colorlistbox.h +++ b/kmail/colorlistbox.h @@ -25,7 +25,7 @@ class ColorListBox : public TDEListBox { - Q_OBJECT + TQ_OBJECT public: diff --git a/kmail/compactionjob.cpp b/kmail/compactionjob.cpp index a2ace485..90d0e9f4 100644 --- a/kmail/compactionjob.cpp +++ b/kmail/compactionjob.cpp @@ -131,7 +131,7 @@ int MboxCompactionJob::executeNow( bool silent ) mCurrentIndex = 0; kdDebug(5006) << "MboxCompactionJob: starting to compact folder " << mSrcFolder->location() << " into " << mTempName << endl; - connect( &mTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotDoWork() ) ); + connect( &mTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( slotDoWork() ) ); if ( !mImmediate ) mTimer.start( COMPACTIONJOB_TIMERINTERVAL ); slotDoWork(); @@ -229,7 +229,7 @@ int MaildirCompactionJob::executeNow( bool silent ) mCurrentIndex = 0; kdDebug(5006) << "MaildirCompactionJob: starting to compact in folder " << mSrcFolder->location() << endl; - connect( &mTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotDoWork() ) ); + connect( &mTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( slotDoWork() ) ); if ( !mImmediate ) mTimer.start( COMPACTIONJOB_TIMERINTERVAL ); slotDoWork(); diff --git a/kmail/compactionjob.h b/kmail/compactionjob.h index 2b80f006..c7279fe1 100644 --- a/kmail/compactionjob.h +++ b/kmail/compactionjob.h @@ -38,7 +38,7 @@ namespace KMail { */ class MboxCompactionJob : public ScheduledJob { - Q_OBJECT + TQ_OBJECT public: /// @p folder should be a folder with a KMFolderMbox storage. @@ -72,7 +72,7 @@ private: */ class MaildirCompactionJob : public ScheduledJob { - Q_OBJECT + TQ_OBJECT public: /// @p folder should be a folder with a KMFolderMaildir storage. diff --git a/kmail/composer.h b/kmail/composer.h index 709bfb73..ba2ab035 100644 --- a/kmail/composer.h +++ b/kmail/composer.h @@ -34,7 +34,7 @@ namespace KMail { Composer * makeComposer( KMMessage * msg=0, uint identity=0 ); class Composer : public KMail::SecondaryWindow { - Q_OBJECT + TQ_OBJECT protected: Composer( const char * name=0 ) : KMail::SecondaryWindow( name ) {} @@ -83,7 +83,7 @@ namespace KMail { public: // kmkernel, callback /** * If this flag is set the message of the composer is deleted when - * the composer is closed and the message was not sent. Default: FALSE + * the composer is closed and the message was not sent. Default: false */ virtual void setAutoDelete( bool f ) = 0; diff --git a/kmail/configuredialog.cpp b/kmail/configuredialog.cpp index 7dcf8ce2..2c0d619e 100644 --- a/kmail/configuredialog.cpp +++ b/kmail/configuredialog.cpp @@ -85,7 +85,6 @@ using KMime::DateFormatter; #include <tdelocale.h> #include <tdeapplication.h> #include <kcharsets.h> -#include <kasciistringtools.h> #include <kdebug.h> #include <knuminput.h> #include <tdefontdialog.h> @@ -93,7 +92,7 @@ using KMime::DateFormatter; #include <kurlrequester.h> #include <kseparator.h> #include <kiconloader.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <twin.h> #include <knotifydialog.h> #include <tdeconfig.h> @@ -117,6 +116,7 @@ using KMime::DateFormatter; #include <tqlayout.h> #include <tqcheckbox.h> #include <tqwidgetstack.h> +#include <tqglobal.h> // other headers: #include <assert.h> @@ -219,7 +219,7 @@ ConfigureDialog::ConfigureDialog( TQWidget *parent, const char *name, bool modal KGuiItem(), User2, i18n( "Configure" ), parent, name, modal ) , mProfileDialog( 0 ) { - KWin::setIcons( winId(), kapp->icon(), kapp->miniIcon() ); + KWin::setIcons( winId(), tdeApp->icon(), tdeApp->miniIcon() ); showButton( User1, true ); addModule ( "kmail_config_identity", false ); @@ -270,8 +270,8 @@ void ConfigureDialog::slotUser2() { return; } mProfileDialog = new ProfileDialog( this, "mProfileDialog" ); - connect( mProfileDialog, TQT_SIGNAL(profileSelected(TDEConfig*)), - this, TQT_SIGNAL(installProfile(TDEConfig*)) ); + connect( mProfileDialog, TQ_SIGNAL(profileSelected(TDEConfig*)), + this, TQ_SIGNAL(installProfile(TDEConfig*)) ); mProfileDialog->show(); } @@ -291,14 +291,14 @@ IdentityPage::IdentityPage( TQWidget * parent, const char * name ) TQHBoxLayout * hlay = new TQHBoxLayout( this, 0, KDialog::spacingHint() ); mIdentityList = new IdentityListView( this ); - connect( mIdentityList, TQT_SIGNAL(selectionChanged()), - TQT_SLOT(slotIdentitySelectionChanged()) ); - connect( mIdentityList, TQT_SIGNAL(itemRenamed(TQListViewItem*,const TQString&,int)), - TQT_SLOT(slotRenameIdentity(TQListViewItem*,const TQString&,int)) ); - connect( mIdentityList, TQT_SIGNAL(doubleClicked(TQListViewItem*,const TQPoint&,int)), - TQT_SLOT(slotModifyIdentity()) ); - connect( mIdentityList, TQT_SIGNAL(contextMenu(TDEListView*,TQListViewItem*,const TQPoint&)), - TQT_SLOT(slotContextMenu(TDEListView*,TQListViewItem*,const TQPoint&)) ); + connect( mIdentityList, TQ_SIGNAL(selectionChanged()), + TQ_SLOT(slotIdentitySelectionChanged()) ); + connect( mIdentityList, TQ_SIGNAL(itemRenamed(TQListViewItem*,const TQString&,int)), + TQ_SLOT(slotRenameIdentity(TQListViewItem*,const TQString&,int)) ); + connect( mIdentityList, TQ_SIGNAL(doubleClicked(TQListViewItem*,const TQPoint&,int)), + TQ_SLOT(slotModifyIdentity()) ); + connect( mIdentityList, TQ_SIGNAL(contextMenu(TDEListView*,TQListViewItem*,const TQPoint&)), + TQ_SLOT(slotContextMenu(TDEListView*,TQListViewItem*,const TQPoint&)) ); // ### connect dragged(...), ... hlay->addWidget( mIdentityList, 1 ); @@ -319,16 +319,16 @@ IdentityPage::IdentityPage( TQWidget * parent, const char * name ) mRemoveButton->setEnabled( false ); mSetAsDefaultButton->setAutoDefault( false ); mSetAsDefaultButton->setEnabled( false ); - connect( button, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotNewIdentity()) ); - connect( mModifyButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotModifyIdentity()) ); - connect( mRenameButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotRenameIdentity()) ); - connect( mRemoveButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotRemoveIdentity()) ); - connect( mSetAsDefaultButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotSetAsDefault()) ); + connect( button, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotNewIdentity()) ); + connect( mModifyButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotModifyIdentity()) ); + connect( mRenameButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotRenameIdentity()) ); + connect( mRemoveButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotRemoveIdentity()) ); + connect( mSetAsDefaultButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotSetAsDefault()) ); vlay->addWidget( button ); vlay->addWidget( mModifyButton ); vlay->addWidget( mRenameButton ); @@ -493,13 +493,13 @@ void IdentityPage::slotContextMenu( TDEListView *, TQListViewItem * i, IdentityListViewItem * item = dynamic_cast<IdentityListViewItem*>( i ); TQPopupMenu * menu = new TQPopupMenu( this ); - menu->insertItem( i18n("Add..."), this, TQT_SLOT(slotNewIdentity()) ); + menu->insertItem( i18n("Add..."), this, TQ_SLOT(slotNewIdentity()) ); if ( item ) { - menu->insertItem( i18n("Modify..."), this, TQT_SLOT(slotModifyIdentity()) ); + menu->insertItem( i18n("Modify..."), this, TQ_SLOT(slotModifyIdentity()) ); if ( mIdentityList->childCount() > 1 ) - menu->insertItem( i18n("Remove"), this, TQT_SLOT(slotRemoveIdentity()) ); + menu->insertItem( i18n("Remove"), this, TQ_SLOT(slotRemoveIdentity()) ); if ( !item->identity().isDefault() ) - menu->insertItem( i18n("Set as Default"), this, TQT_SLOT(slotSetAsDefault()) ); + menu->insertItem( i18n("Set as Default"), this, TQ_SLOT(slotSetAsDefault()) ); } menu->exec( pos ); delete menu; @@ -563,16 +563,16 @@ AccountsPage::AccountsPage( TQWidget * parent, const char * name ) // mReceivingTab = new ReceivingTab(); addTab( mReceivingTab, i18n( "&Receiving" ) ); - connect( mReceivingTab, TQT_SIGNAL(accountListChanged(const TQStringList &)), - this, TQT_SIGNAL(accountListChanged(const TQStringList &)) ); + connect( mReceivingTab, TQ_SIGNAL(accountListChanged(const TQStringList &)), + this, TQ_SIGNAL(accountListChanged(const TQStringList &)) ); // // "Sending" tab: // mSendingTab = new SendingTab(); addTab( mSendingTab, i18n( "&Sending" ) ); - connect( mSendingTab, TQT_SIGNAL(transportListChanged(const TQStringList&)), - this, TQT_SIGNAL(transportListChanged(const TQStringList&)) ); + connect( mSendingTab, TQ_SIGNAL(transportListChanged(const TQStringList&)), + this, TQ_SIGNAL(transportListChanged(const TQStringList&)) ); load(); } @@ -608,10 +608,10 @@ AccountsPageSendingTab::AccountsPageSendingTab( TQWidget * parent, const char * mTransportList->addColumn( i18n("Type") ); mTransportList->setAllColumnsShowFocus( true ); mTransportList->setSorting( -1 ); - connect( mTransportList, TQT_SIGNAL(selectionChanged()), - this, TQT_SLOT(slotTransportSelected()) ); - connect( mTransportList, TQT_SIGNAL(doubleClicked( TQListViewItem *)), - this, TQT_SLOT(slotModifySelectedTransport()) ); + connect( mTransportList, TQ_SIGNAL(selectionChanged()), + this, TQ_SLOT(slotTransportSelected()) ); + connect( mTransportList, TQ_SIGNAL(doubleClicked( TQListViewItem *)), + this, TQ_SLOT(slotModifySelectedTransport()) ); hlay->addWidget( mTransportList, 1 ); // a vbox layout for the buttons: zero stretch, spacing inherited from hlay @@ -620,36 +620,36 @@ AccountsPageSendingTab::AccountsPageSendingTab( TQWidget * parent, const char * // "add..." button: stretch 0 button = new TQPushButton( i18n("A&dd..."), this ); button->setAutoDefault( false ); - connect( button, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotAddTransport()) ); + connect( button, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotAddTransport()) ); btn_vlay->addWidget( button ); // "modify..." button: stretch 0 mModifyTransportButton = new TQPushButton( i18n("&Modify..."), this ); mModifyTransportButton->setAutoDefault( false ); mModifyTransportButton->setEnabled( false ); // b/c no item is selected yet - connect( mModifyTransportButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotModifySelectedTransport()) ); + connect( mModifyTransportButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotModifySelectedTransport()) ); btn_vlay->addWidget( mModifyTransportButton ); // "remove" button: stretch 0 mRemoveTransportButton = new TQPushButton( i18n("R&emove"), this ); mRemoveTransportButton->setAutoDefault( false ); mRemoveTransportButton->setEnabled( false ); // b/c no item is selected yet - connect( mRemoveTransportButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotRemoveSelectedTransport()) ); + connect( mRemoveTransportButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotRemoveSelectedTransport()) ); btn_vlay->addWidget( mRemoveTransportButton ); mSetDefaultTransportButton = new TQPushButton( i18n("Set Default"), this ); mSetDefaultTransportButton->setAutoDefault( false ); mSetDefaultTransportButton->setEnabled( false ); - connect ( mSetDefaultTransportButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotSetDefaultTransport()) ); + connect ( mSetDefaultTransportButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotSetDefaultTransport()) ); btn_vlay->addWidget( mSetDefaultTransportButton ); btn_vlay->addStretch( 1 ); // spacer // "Common options" groupbox: - group = new TQGroupBox( 0, Qt::Vertical, + group = new TQGroupBox( 0, TQt::Vertical, i18n("Common Options"), this ); vlay->addWidget(group); @@ -660,8 +660,8 @@ AccountsPageSendingTab::AccountsPageSendingTab( TQWidget * parent, const char * // "confirm before send" check box: mConfirmSendCheck = new TQCheckBox( i18n("Confirm &before send"), group ); glay->addMultiCellWidget( mConfirmSendCheck, 0, 0, 0, 1 ); - connect( mConfirmSendCheck, TQT_SIGNAL( stateChanged( int ) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mConfirmSendCheck, TQ_SIGNAL( stateChanged( int ) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); // "send on check" combo: mSendOnCheckCombo = new TQComboBox( false, group ); @@ -670,8 +670,8 @@ AccountsPageSendingTab::AccountsPageSendingTab( TQWidget * parent, const char * << i18n("On Manual Mail Checks") << i18n("On All Mail Checks") ); glay->addWidget( mSendOnCheckCombo, 1, 1 ); - connect( mSendOnCheckCombo, TQT_SIGNAL( activated( int ) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mSendOnCheckCombo, TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); // "default send method" combo: mSendMethodCombo = new TQComboBox( false, group ); @@ -679,8 +679,8 @@ AccountsPageSendingTab::AccountsPageSendingTab( TQWidget * parent, const char * << i18n("Send Now") << i18n("Send Later") ); glay->addWidget( mSendMethodCombo, 2, 1 ); - connect( mSendMethodCombo, TQT_SIGNAL( activated( int ) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mSendMethodCombo, TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); // "message property" combo: @@ -690,14 +690,14 @@ AccountsPageSendingTab::AccountsPageSendingTab( TQWidget * parent, const char * << i18n("Allow 8-bit") << i18n("MIME Compliant (Quoted Printable)") ); glay->addWidget( mMessagePropertyCombo, 3, 1 ); - connect( mMessagePropertyCombo, TQT_SIGNAL( activated( int ) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mMessagePropertyCombo, TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); // "default domain" input field: mDefaultDomainEdit = new KLineEdit( group ); glay->addMultiCellWidget( mDefaultDomainEdit, 4, 4, 1, 2 ); - connect( mDefaultDomainEdit, TQT_SIGNAL( textChanged( const TQString& ) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mDefaultDomainEdit, TQ_SIGNAL( textChanged( const TQString& ) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); // labels: TQLabel *l = new TQLabel( mSendOnCheckCombo, /*buddy*/ @@ -1082,10 +1082,10 @@ AccountsPageReceivingTab::AccountsPageReceivingTab( TQWidget * parent, const cha mAccountList->addColumn( i18n("Folder") ); mAccountList->setAllColumnsShowFocus( true ); mAccountList->setSorting( -1 ); - connect( mAccountList, TQT_SIGNAL(selectionChanged()), - this, TQT_SLOT(slotAccountSelected()) ); - connect( mAccountList, TQT_SIGNAL(doubleClicked( TQListViewItem *)), - this, TQT_SLOT(slotModifySelectedAccount()) ); + connect( mAccountList, TQ_SIGNAL(selectionChanged()), + this, TQ_SLOT(slotAccountSelected()) ); + connect( mAccountList, TQ_SIGNAL(doubleClicked( TQListViewItem *)), + this, TQ_SLOT(slotModifySelectedAccount()) ); hlay->addWidget( mAccountList, 1 ); // a vbox layout for the buttons: zero stretch, spacing inherited from hlay @@ -1094,31 +1094,31 @@ AccountsPageReceivingTab::AccountsPageReceivingTab( TQWidget * parent, const cha // "add..." button: stretch 0 button = new TQPushButton( i18n("A&dd..."), this ); button->setAutoDefault( false ); - connect( button, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotAddAccount()) ); + connect( button, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotAddAccount()) ); btn_vlay->addWidget( button ); // "modify..." button: stretch 0 mModifyAccountButton = new TQPushButton( i18n("&Modify..."), this ); mModifyAccountButton->setAutoDefault( false ); mModifyAccountButton->setEnabled( false ); // b/c no item is selected yet - connect( mModifyAccountButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotModifySelectedAccount()) ); + connect( mModifyAccountButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotModifySelectedAccount()) ); btn_vlay->addWidget( mModifyAccountButton ); // "remove..." button: stretch 0 mRemoveAccountButton = new TQPushButton( i18n("R&emove"), this ); mRemoveAccountButton->setAutoDefault( false ); mRemoveAccountButton->setEnabled( false ); // b/c no item is selected yet - connect( mRemoveAccountButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotRemoveSelectedAccount()) ); + connect( mRemoveAccountButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotRemoveSelectedAccount()) ); btn_vlay->addWidget( mRemoveAccountButton ); btn_vlay->addStretch( 1 ); // spacer mCheckmailStartupCheck = new TQCheckBox( i18n("Chec&k mail on startup"), this ); vlay->addWidget( mCheckmailStartupCheck ); - connect( mCheckmailStartupCheck, TQT_SIGNAL( stateChanged( int ) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mCheckmailStartupCheck, TQ_SIGNAL( stateChanged( int ) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); // "New Mail Notification" group box: stretch 0 group = new TQVGroupBox( i18n("New Mail Notification"), this ); @@ -1129,8 +1129,8 @@ AccountsPageReceivingTab::AccountsPageReceivingTab( TQWidget * parent, const cha mBeepNewMailCheck = new TQCheckBox(i18n("&Beep"), group ); mBeepNewMailCheck->setSizePolicy( TQSizePolicy( TQSizePolicy::MinimumExpanding, TQSizePolicy::Fixed ) ); - connect( mBeepNewMailCheck, TQT_SIGNAL( stateChanged( int ) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mBeepNewMailCheck, TQ_SIGNAL( stateChanged( int ) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); // "Detailed new mail notification" check box mVerboseNotificationCheck = @@ -1142,15 +1142,15 @@ AccountsPageReceivingTab::AccountsPageReceivingTab( TQWidget * parent, const cha "messages" ) ); TQWhatsThis::add( mVerboseNotificationCheck, GlobalSettings::self()->verboseNewMailNotificationItem()->whatsThis() ); - connect( mVerboseNotificationCheck, TQT_SIGNAL( stateChanged( int ) ), - this, TQT_SLOT( slotEmitChanged() ) ); + connect( mVerboseNotificationCheck, TQ_SIGNAL( stateChanged( int ) ), + this, TQ_SLOT( slotEmitChanged() ) ); // "Other Actions" button: mOtherNewMailActionsButton = new TQPushButton( i18n("Other Actio&ns"), group ); mOtherNewMailActionsButton->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) ); - connect( mOtherNewMailActionsButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotEditNotifications()) ); + connect( mOtherNewMailActionsButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotEditNotifications()) ); } AccountsPageReceivingTab::~AccountsPageReceivingTab() @@ -1412,7 +1412,7 @@ void AccountsPage::ReceivingTab::doLoadOther() { mBeepNewMailCheck->setChecked( general.readBoolEntry("beep-on-mail", false ) ); mCheckmailStartupCheck->setChecked( general.readBoolEntry("checkmail-startup", false) ); - TQTimer::singleShot( 0, this, TQT_SLOT( slotTweakAccountList() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( slotTweakAccountList() ) ); } void AccountsPage::ReceivingTab::slotTweakAccountList() @@ -1565,8 +1565,8 @@ AppearancePageFontsTab::AppearancePageFontsTab( TQWidget * parent, const char * mCustomFontCheck = new TQCheckBox( i18n("&Use custom fonts"), this ); vlay->addWidget( mCustomFontCheck ); vlay->addWidget( new KSeparator( KSeparator::HLine, this ) ); - connect ( mCustomFontCheck, TQT_SIGNAL( stateChanged( int ) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect ( mCustomFontCheck, TQ_SIGNAL( stateChanged( int ) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); // "font location" combo box and label: hlay = new TQHBoxLayout( vlay ); // inherites spacing @@ -1589,20 +1589,20 @@ AppearancePageFontsTab::AppearancePageFontsTab( TQWidget * parent, const char * false, 4 ); mFontChooser->setEnabled( false ); // since !mCustomFontCheck->isChecked() vlay->addWidget( mFontChooser ); - connect ( mFontChooser, TQT_SIGNAL( fontSelected( const TQFont& ) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect ( mFontChooser, TQ_SIGNAL( fontSelected( const TQFont& ) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); // {en,dis}able widgets depending on the state of mCustomFontCheck: - connect( mCustomFontCheck, TQT_SIGNAL(toggled(bool)), - label, TQT_SLOT(setEnabled(bool)) ); - connect( mCustomFontCheck, TQT_SIGNAL(toggled(bool)), - mFontLocationCombo, TQT_SLOT(setEnabled(bool)) ); - connect( mCustomFontCheck, TQT_SIGNAL(toggled(bool)), - mFontChooser, TQT_SLOT(setEnabled(bool)) ); + connect( mCustomFontCheck, TQ_SIGNAL(toggled(bool)), + label, TQ_SLOT(setEnabled(bool)) ); + connect( mCustomFontCheck, TQ_SIGNAL(toggled(bool)), + mFontLocationCombo, TQ_SLOT(setEnabled(bool)) ); + connect( mCustomFontCheck, TQ_SIGNAL(toggled(bool)), + mFontChooser, TQ_SLOT(setEnabled(bool)) ); // load the right font settings into mFontChooser: - connect( mFontLocationCombo, TQT_SIGNAL(activated(int) ), - this, TQT_SLOT(slotFontSelectorChanged(int)) ); + connect( mFontLocationCombo, TQ_SIGNAL(activated(int) ), + this, TQ_SLOT(slotFontSelectorChanged(int)) ); } @@ -1629,14 +1629,14 @@ void AppearancePage::FontsTab::slotFontSelectorChanged( int index ) mActiveFontIndex = index; // Disonnect so the "Apply" button is not activated by the change - disconnect ( mFontChooser, TQT_SIGNAL( fontSelected( const TQFont& ) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + disconnect ( mFontChooser, TQ_SIGNAL( fontSelected( const TQFont& ) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); // Display the new setting: mFontChooser->setFont( mFont[index], fontNames[index].onlyFixed ); - connect ( mFontChooser, TQT_SIGNAL( fontSelected( const TQFont& ) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect ( mFontChooser, TQ_SIGNAL( fontSelected( const TQFont& ) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); // Disable Family and Size list if we have selected a quote font: mFontChooser->enableColumn( TDEFontChooser::FamilyList|TDEFontChooser::SizeList, @@ -1739,8 +1739,8 @@ AppearancePageColorsTab::AppearancePageColorsTab( TQWidget * parent, const char vlay = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() ); mCustomColorCheck = new TQCheckBox( i18n("&Use custom colors"), this ); vlay->addWidget( mCustomColorCheck ); - connect( mCustomColorCheck, TQT_SIGNAL( stateChanged( int ) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mCustomColorCheck, TQ_SIGNAL( stateChanged( int ) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); // color list box: mColorList = new ColorListBox( this ); @@ -1755,8 +1755,8 @@ AppearancePageColorsTab::AppearancePageColorsTab( TQWidget * parent, const char new TQCheckBox( i18n("Recycle colors on deep "ing"), this ); mRecycleColorCheck->setEnabled( false ); vlay->addWidget( mRecycleColorCheck ); - connect( mRecycleColorCheck, TQT_SIGNAL( stateChanged( int ) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mRecycleColorCheck, TQ_SIGNAL( stateChanged( int ) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); // close to quota threshold TQHBoxLayout *hbox = new TQHBoxLayout(vlay); @@ -1764,25 +1764,25 @@ AppearancePageColorsTab::AppearancePageColorsTab( TQWidget * parent, const char hbox->addWidget( l ); l->setEnabled( false ); mCloseToQuotaThreshold = new TQSpinBox( 0, 100, 1, this ); - connect( mCloseToQuotaThreshold, TQT_SIGNAL( valueChanged( int ) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mCloseToQuotaThreshold, TQ_SIGNAL( valueChanged( int ) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); mCloseToQuotaThreshold->setEnabled( false ); mCloseToQuotaThreshold->setSuffix( i18n("%")); hbox->addWidget( mCloseToQuotaThreshold ); hbox->addWidget( new TQWidget(this), 2 ); // {en,dir}able widgets depending on the state of mCustomColorCheck: - connect( mCustomColorCheck, TQT_SIGNAL(toggled(bool)), - mColorList, TQT_SLOT(setEnabled(bool)) ); - connect( mCustomColorCheck, TQT_SIGNAL(toggled(bool)), - mRecycleColorCheck, TQT_SLOT(setEnabled(bool)) ); - connect( mCustomColorCheck, TQT_SIGNAL(toggled(bool)), - l, TQT_SLOT(setEnabled(bool)) ); - connect( mCustomColorCheck, TQT_SIGNAL(toggled(bool)), - mCloseToQuotaThreshold, TQT_SLOT(setEnabled(bool)) ); + connect( mCustomColorCheck, TQ_SIGNAL(toggled(bool)), + mColorList, TQ_SLOT(setEnabled(bool)) ); + connect( mCustomColorCheck, TQ_SIGNAL(toggled(bool)), + mRecycleColorCheck, TQ_SLOT(setEnabled(bool)) ); + connect( mCustomColorCheck, TQ_SIGNAL(toggled(bool)), + l, TQ_SLOT(setEnabled(bool)) ); + connect( mCustomColorCheck, TQ_SIGNAL(toggled(bool)), + mCloseToQuotaThreshold, TQ_SLOT(setEnabled(bool)) ); - connect( mCustomColorCheck, TQT_SIGNAL( stateChanged( int ) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mCustomColorCheck, TQ_SIGNAL( stateChanged( int ) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); } void AppearancePage::ColorsTab::doLoadOther() { @@ -1793,9 +1793,9 @@ void AppearancePage::ColorsTab::doLoadOther() { mCloseToQuotaThreshold->setValue( GlobalSettings::closeToQuotaThreshold() ); static const TQColor defaultColor[ numColorNames ] = { - kapp->palette().active().base(), // bg + tdeApp->palette().active().base(), // bg TDEGlobalSettings::alternateBackgroundColor(), // alt bg - kapp->palette().active().text(), // fg + tdeApp->palette().active().text(), // fg TQColor( 0x00, 0x80, 0x00 ), // quoted l1 TQColor( 0x00, 0x70, 0x00 ), // quoted l2 TQColor( 0x00, 0x60, 0x00 ), // quoted l3 @@ -1823,8 +1823,8 @@ void AppearancePage::ColorsTab::doLoadOther() { mColorList->setColor( i, reader.readColorEntry( colorNames[i].configName, &defaultColor[i] ) ); } - connect( mColorList, TQT_SIGNAL( changed( ) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mColorList, TQ_SIGNAL( changed( ) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); } void AppearancePage::ColorsTab::installProfile( TDEConfig * profile ) { @@ -1911,30 +1911,30 @@ AppearancePageLayoutTab::AppearancePageLayoutTab( TQWidget * parent, const char // "folder list" radio buttons: populateButtonGroup( mFolderListGroup = new TQHButtonGroup( this ), folderListMode ); vlay->addWidget( mFolderListGroup ); - connect( mFolderListGroup, TQT_SIGNAL ( clicked( int ) ), - this, TQT_SLOT( slotEmitChanged() ) ); + connect( mFolderListGroup, TQ_SIGNAL ( clicked( int ) ), + this, TQ_SLOT( slotEmitChanged() ) ); mFavoriteFolderViewCB = new TQCheckBox( i18n("Show favorite folder view"), this ); - connect( mFavoriteFolderViewCB, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotEmitChanged()) ); + connect( mFavoriteFolderViewCB, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotEmitChanged()) ); vlay->addWidget( mFavoriteFolderViewCB ); // "show reader window" radio buttons: populateButtonGroup( mReaderWindowModeGroup = new TQVButtonGroup( this ), readerWindowMode ); vlay->addWidget( mReaderWindowModeGroup ); - connect( mReaderWindowModeGroup, TQT_SIGNAL ( clicked( int ) ), - this, TQT_SLOT( slotEmitChanged() ) ); + connect( mReaderWindowModeGroup, TQ_SIGNAL ( clicked( int ) ), + this, TQ_SLOT( slotEmitChanged() ) ); // "Show MIME Tree" radio buttons: populateButtonGroup( mMIMETreeModeGroup = new TQVButtonGroup( this ), mimeTreeMode ); vlay->addWidget( mMIMETreeModeGroup ); - connect( mMIMETreeModeGroup, TQT_SIGNAL ( clicked( int ) ), - this, TQT_SLOT( slotEmitChanged() ) ); + connect( mMIMETreeModeGroup, TQ_SIGNAL ( clicked( int ) ), + this, TQ_SLOT( slotEmitChanged() ) ); // "MIME Tree Location" radio buttons: populateButtonGroup( mMIMETreeLocationGroup = new TQHButtonGroup( this ), mimeTreeLocation ); vlay->addWidget( mMIMETreeLocationGroup ); - connect( mMIMETreeLocationGroup, TQT_SIGNAL ( clicked( int ) ), - this, TQT_SLOT( slotEmitChanged() ) ); + connect( mMIMETreeLocationGroup, TQ_SIGNAL ( clicked( int ) ), + this, TQ_SLOT( slotEmitChanged() ) ); vlay->addStretch( 10 ); // spacer } @@ -2015,14 +2015,14 @@ AppearancePageHeadersTab::AppearancePageHeadersTab( TQWidget * parent, const cha mNestedMessagesCheck = new TQCheckBox( i18n("&Threaded message list"), group ); - connect( mMessageSizeCheck, TQT_SIGNAL( stateChanged( int ) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); - connect( mAttachmentCheck, TQT_SIGNAL( stateChanged( int ) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); - connect( mCryptoIconsCheck, TQT_SIGNAL( stateChanged( int ) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); - connect( mNestedMessagesCheck, TQT_SIGNAL( stateChanged( int ) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mMessageSizeCheck, TQ_SIGNAL( stateChanged( int ) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); + connect( mAttachmentCheck, TQ_SIGNAL( stateChanged( int ) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); + connect( mCryptoIconsCheck, TQ_SIGNAL( stateChanged( int ) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); + connect( mNestedMessagesCheck, TQ_SIGNAL( stateChanged( int ) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); vlay->addWidget( group ); @@ -2048,8 +2048,8 @@ AppearancePageHeadersTab::AppearancePageHeadersTab( TQWidget * parent, const cha vlay->addWidget( mNestingPolicy ); - connect( mNestingPolicy, TQT_SIGNAL( clicked( int ) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mNestingPolicy, TQ_SIGNAL( clicked( int ) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); // "Date Display" group: mDateDisplay = new TQVButtonGroup( i18n("Date Display"), this ); @@ -2064,10 +2064,10 @@ AppearancePageHeadersTab::AppearancePageHeadersTab( TQWidget * parent, const cha if ( dateDisplayConfig[i].dateDisplay == DateFormatter::Custom ) { mCustomDateFormatEdit = new KLineEdit( mDateDisplay ); mCustomDateFormatEdit->setEnabled( false ); - connect( radio, TQT_SIGNAL(toggled(bool)), - mCustomDateFormatEdit, TQT_SLOT(setEnabled(bool)) ); - connect( mCustomDateFormatEdit, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(slotEmitChanged(void)) ); + connect( radio, TQ_SIGNAL(toggled(bool)), + mCustomDateFormatEdit, TQ_SLOT(setEnabled(bool)) ); + connect( mCustomDateFormatEdit, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(slotEmitChanged(void)) ); TQString customDateWhatsThis = i18n("<qt><p><strong>These expressions may be used for the date:" "</strong></p>" @@ -2106,8 +2106,8 @@ AppearancePageHeadersTab::AppearancePageHeadersTab( TQWidget * parent, const cha } // end for loop populating mDateDisplay vlay->addWidget( mDateDisplay ); - connect( mDateDisplay, TQT_SIGNAL( clicked( int ) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mDateDisplay, TQ_SIGNAL( clicked( int ) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); vlay->addStretch( 10 ); // spacer @@ -2261,40 +2261,40 @@ AppearancePageReaderTab::AppearancePageReaderTab( TQWidget * parent, TQToolTip::add( mCloseAfterReplyOrForwardCheck, i18n( "Close the standalone message window after replying or forwarding the message" ) ); vlay->addWidget( mCloseAfterReplyOrForwardCheck ); - connect( mCloseAfterReplyOrForwardCheck, TQT_SIGNAL ( stateChanged( int ) ), - this, TQT_SLOT( slotEmitChanged() ) ); + connect( mCloseAfterReplyOrForwardCheck, TQ_SIGNAL ( stateChanged( int ) ), + this, TQ_SLOT( slotEmitChanged() ) ); // "show colorbar" check box: populateCheckBox( mShowColorbarCheck = new TQCheckBox( this ), showColorbarMode ); vlay->addWidget( mShowColorbarCheck ); - connect( mShowColorbarCheck, TQT_SIGNAL ( stateChanged( int ) ), - this, TQT_SLOT( slotEmitChanged() ) ); + connect( mShowColorbarCheck, TQ_SIGNAL ( stateChanged( int ) ), + this, TQ_SLOT( slotEmitChanged() ) ); // "show spam status" check box; populateCheckBox( mShowSpamStatusCheck = new TQCheckBox( this ), showSpamStatusMode ); vlay->addWidget( mShowSpamStatusCheck ); - connect( mShowSpamStatusCheck, TQT_SIGNAL ( stateChanged( int ) ), - this, TQT_SLOT( slotEmitChanged() ) ); + connect( mShowSpamStatusCheck, TQ_SIGNAL ( stateChanged( int ) ), + this, TQ_SLOT( slotEmitChanged() ) ); // "replace smileys by emoticons" check box; populateCheckBox( mShowEmoticonsCheck = new TQCheckBox( this ), showEmoticons ); vlay->addWidget( mShowEmoticonsCheck ); - connect( mShowEmoticonsCheck, TQT_SIGNAL ( stateChanged( int ) ), - this, TQT_SLOT( slotEmitChanged() ) ); + connect( mShowEmoticonsCheck, TQ_SIGNAL ( stateChanged( int ) ), + this, TQ_SLOT( slotEmitChanged() ) ); // "Use smaller font for quoted text" check box mShrinkQuotesCheck = new TQCheckBox( i18n( shrinkQuotes.desc ), this, "kcfg_ShrinkQuotes" ); vlay->addWidget( mShrinkQuotesCheck ); - connect( mShrinkQuotesCheck, TQT_SIGNAL( stateChanged( int ) ), - this, TQT_SLOT( slotEmitChanged() ) ); + connect( mShrinkQuotesCheck, TQ_SIGNAL( stateChanged( int ) ), + this, TQ_SLOT( slotEmitChanged() ) ); // "Show expand/collaps quote marks" check box; TQHBoxLayout *hlay= new TQHBoxLayout( vlay ); // inherits spacing populateCheckBox( mShowExpandQuotesMark= new TQCheckBox( this ), showExpandQuotesMark); hlay->addWidget( mShowExpandQuotesMark); - connect( mShowExpandQuotesMark, TQT_SIGNAL ( stateChanged( int ) ), - this, TQT_SLOT( slotEmitChanged() ) ); + connect( mShowExpandQuotesMark, TQ_SIGNAL ( stateChanged( int ) ), + this, TQ_SLOT( slotEmitChanged() ) ); hlay->addStretch( 1 ); mCollapseQuoteLevelSpin = new KIntSpinBox( 0/*min*/,10/*max*/,1/*step*/, @@ -2306,20 +2306,20 @@ AppearancePageReaderTab::AppearancePageReaderTab( TQWidget * parent, hlay->addWidget( label ); mCollapseQuoteLevelSpin->setEnabled( false ); //since !mShowExpandQuotesMark->isCheckec() - connect( mCollapseQuoteLevelSpin, TQT_SIGNAL( valueChanged( int ) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mCollapseQuoteLevelSpin, TQ_SIGNAL( valueChanged( int ) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); hlay->addWidget( mCollapseQuoteLevelSpin); - connect( mShowExpandQuotesMark, TQT_SIGNAL( toggled( bool ) ), - mCollapseQuoteLevelSpin, TQT_SLOT( setEnabled( bool ) ) ); + connect( mShowExpandQuotesMark, TQ_SIGNAL( toggled( bool ) ), + mCollapseQuoteLevelSpin, TQ_SLOT( setEnabled( bool ) ) ); // Fallback Character Encoding hlay = new TQHBoxLayout( vlay ); // inherits spacing mCharsetCombo = new TQComboBox( this ); mCharsetCombo->insertStringList( KMMsgBase::supportedEncodings( false ) ); - connect( mCharsetCombo, TQT_SIGNAL( activated( int ) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mCharsetCombo, TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); TQString fallbackCharsetWhatsThis = i18n( GlobalSettings::self()->fallbackCharacterEncodingItem()->whatsThis().utf8() ); @@ -2339,8 +2339,8 @@ AppearancePageReaderTab::AppearancePageReaderTab( TQWidget * parent, mOverrideCharsetCombo->insertStringList( encodings ); mOverrideCharsetCombo->setCurrentItem(0); - connect( mOverrideCharsetCombo, TQT_SIGNAL( activated( int ) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mOverrideCharsetCombo, TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); TQString overrideCharsetWhatsThis = i18n( GlobalSettings::self()->overrideCharacterEncodingItem()->whatsThis().utf8() ); @@ -2354,8 +2354,8 @@ AppearancePageReaderTab::AppearancePageReaderTab( TQWidget * parent, populateCheckBox( mShowCurrentTimeCheck = new TQCheckBox( this ), showCurrentTime ); vlay->addWidget( mShowCurrentTimeCheck ); - connect( mShowCurrentTimeCheck, TQT_SIGNAL ( stateChanged( int ) ), - this, TQT_SLOT( slotEmitChanged() ) ); + connect( mShowCurrentTimeCheck, TQ_SIGNAL ( stateChanged( int ) ), + this, TQ_SLOT( slotEmitChanged() ) ); vlay->addStretch( 100 ); // spacer } @@ -2485,17 +2485,17 @@ AppearancePageSystemTrayTab::AppearancePageSystemTrayTab( TQWidget * parent, // "Enable system tray applet" check box mSystemTrayCheck = new TQCheckBox( i18n("Enable system tray icon"), this ); vlay->addWidget( mSystemTrayCheck ); - connect( mSystemTrayCheck, TQT_SIGNAL( stateChanged( int ) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mSystemTrayCheck, TQ_SIGNAL( stateChanged( int ) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); // System tray modes mSystemTrayGroup = new TQVButtonGroup( i18n("System Tray Mode"), this ); mSystemTrayGroup->layout()->setSpacing( KDialog::spacingHint() ); vlay->addWidget( mSystemTrayGroup ); - connect( mSystemTrayGroup, TQT_SIGNAL( clicked( int ) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); - connect( mSystemTrayCheck, TQT_SIGNAL( toggled( bool ) ), - mSystemTrayGroup, TQT_SLOT( setEnabled( bool ) ) ); + connect( mSystemTrayGroup, TQ_SIGNAL( clicked( int ) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); + connect( mSystemTrayCheck, TQ_SIGNAL( toggled( bool ) ), + mSystemTrayGroup, TQ_SLOT( setEnabled( bool ) ) ); mSystemTrayGroup->insert( new TQRadioButton( i18n("Always show KMail in system tray"), mSystemTrayGroup ), GlobalSettings::EnumSystemTrayPolicy::ShowAlways ); @@ -2617,14 +2617,14 @@ ComposerPageGeneralTab::ComposerPageGeneralTab( TQWidget * parent, const char * GlobalSettings::self()->autoTextSignatureItem()->label(), this ); vlay->addWidget( mAutoAppSignFileCheck ); - connect( mAutoAppSignFileCheck, TQT_SIGNAL( stateChanged(int) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mAutoAppSignFileCheck, TQ_SIGNAL( stateChanged(int) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); mTopQuoteCheck = new TQCheckBox( GlobalSettings::self()->prependSignatureItem()->label(), this ); vlay->addWidget( mTopQuoteCheck); - connect( mTopQuoteCheck, TQT_SIGNAL( stateChanged(int) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mTopQuoteCheck, TQ_SIGNAL( stateChanged(int) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); mSmartQuoteCheck = new TQCheckBox( GlobalSettings::self()->smartQuoteItem()->label(), @@ -2634,8 +2634,8 @@ ComposerPageGeneralTab::ComposerPageGeneralTab( TQWidget * parent, const char * "even when the line was created by adding an additional linebreak while\n" "word-wrapping the text." ) ); vlay->addWidget( mSmartQuoteCheck ); - connect( mSmartQuoteCheck, TQT_SIGNAL( stateChanged(int) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mSmartQuoteCheck, TQ_SIGNAL( stateChanged(int) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); mQuoteSelectionOnlyCheck = new TQCheckBox( GlobalSettings::self()->quoteSelectionOnlyItem()->label(), this, "kcfg_QuoteSelectionOnly" ); @@ -2643,28 +2643,28 @@ ComposerPageGeneralTab::ComposerPageGeneralTab( TQWidget * parent, const char * i18n( "When replying, only quote the selected text instead of the complete message " "when there is text selected in the message window." ) ); vlay->addWidget( mQuoteSelectionOnlyCheck ); - connect( mQuoteSelectionOnlyCheck, TQT_SIGNAL( stateChanged(int) ), - this, TQT_SLOT( slotEmitChanged(void) ) ); + connect( mQuoteSelectionOnlyCheck, TQ_SIGNAL( stateChanged(int) ), + this, TQ_SLOT( slotEmitChanged(void) ) ); mStripSignatureCheck = new TQCheckBox( GlobalSettings::self()->stripSignatureItem()->label(), this, "kcfg_StripSignature" ); vlay->addWidget( mStripSignatureCheck ); - connect( mStripSignatureCheck, TQT_SIGNAL( stateChanged(int) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mStripSignatureCheck, TQ_SIGNAL( stateChanged(int) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); mAutoRequestMDNCheck = new TQCheckBox( GlobalSettings::self()->requestMDNItem()->label(), this, "kcfg_RequestMDN" ); vlay->addWidget( mAutoRequestMDNCheck ); - connect( mAutoRequestMDNCheck, TQT_SIGNAL( stateChanged(int) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mAutoRequestMDNCheck, TQ_SIGNAL( stateChanged(int) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); mShowRecentAddressesInComposer = new TQCheckBox( GlobalSettings::self()->showRecentAddressesInComposerItem()->label(), this, "kcfg_ShowRecentAddressesInComposer" ); vlay->addWidget( mShowRecentAddressesInComposer ); - connect( mShowRecentAddressesInComposer, TQT_SIGNAL( stateChanged(int) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mShowRecentAddressesInComposer, TQ_SIGNAL( stateChanged(int) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); // a checkbox for "word wrap" and a spinbox for the column in // which to wrap: @@ -2673,20 +2673,20 @@ ComposerPageGeneralTab::ComposerPageGeneralTab( TQWidget * parent, const char * GlobalSettings::self()->wordWrapItem()->label(), this, "kcfg_WordWrap" ); hlay->addWidget( mWordWrapCheck ); - connect( mWordWrapCheck, TQT_SIGNAL( stateChanged(int) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mWordWrapCheck, TQ_SIGNAL( stateChanged(int) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); mWrapColumnSpin = new KIntSpinBox( 30/*min*/, 78/*max*/, 1/*step*/, 78/*init*/, 10 /*base*/, this, "kcfg_LineWrapWidth" ); mWrapColumnSpin->setEnabled( false ); // since !mWordWrapCheck->isChecked() - connect( mWrapColumnSpin, TQT_SIGNAL( valueChanged(int) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mWrapColumnSpin, TQ_SIGNAL( valueChanged(int) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); hlay->addWidget( mWrapColumnSpin ); hlay->addStretch( 1 ); // only enable the spinbox if the checkbox is checked: - connect( mWordWrapCheck, TQT_SIGNAL(toggled(bool)), - mWrapColumnSpin, TQT_SLOT(setEnabled(bool)) ); + connect( mWordWrapCheck, TQ_SIGNAL(toggled(bool)), + mWrapColumnSpin, TQ_SLOT(setEnabled(bool)) ); // a checkbox for "too many recipient warning" and a spinbox for the recipient threshold hlay = new TQHBoxLayout( vlay ); // inherits spacing @@ -2694,8 +2694,8 @@ ComposerPageGeneralTab::ComposerPageGeneralTab( TQWidget * parent, const char * GlobalSettings::self()->tooManyRecipientsItem()->label(), this, "kcfg_TooManyRecipients" ); hlay->addWidget( mRecipientCheck ); - connect( mRecipientCheck, TQT_SIGNAL( stateChanged(int) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mRecipientCheck, TQ_SIGNAL( stateChanged(int) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); TQString recipientCheckWhatsthis = i18n( GlobalSettings::self()->tooManyRecipientsItem()->whatsThis().utf8() ); @@ -2706,8 +2706,8 @@ ComposerPageGeneralTab::ComposerPageGeneralTab( TQWidget * parent, const char * mRecipientSpin = new KIntSpinBox( 1/*min*/, 100/*max*/, 1/*step*/, 5/*init*/, 10 /*base*/, this, "kcfg_RecipientThreshold" ); mRecipientSpin->setEnabled( false ); - connect( mRecipientSpin, TQT_SIGNAL( valueChanged(int) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mRecipientSpin, TQ_SIGNAL( valueChanged(int) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); TQString recipientWhatsthis = i18n( GlobalSettings::self()->recipientThresholdItem()->whatsThis().utf8() ); @@ -2719,8 +2719,8 @@ ComposerPageGeneralTab::ComposerPageGeneralTab( TQWidget * parent, const char * hlay->addWidget( mRecipientSpin ); hlay->addStretch( 1 ); // only enable the spinbox if the checkbox is checked: - connect( mRecipientCheck, TQT_SIGNAL(toggled(bool)), - mRecipientSpin, TQT_SLOT(setEnabled(bool)) ); + connect( mRecipientCheck, TQ_SIGNAL(toggled(bool)), + mRecipientSpin, TQ_SLOT(setEnabled(bool)) ); hlay = new TQHBoxLayout( vlay ); // inherits spacing @@ -2732,8 +2732,8 @@ ComposerPageGeneralTab::ComposerPageGeneralTab( TQWidget * parent, const char * mAutoSave->setSpecialValueText( i18n("No autosave") ); mAutoSave->setSuffix( i18n(" min") ); hlay->addStretch( 1 ); - connect( mAutoSave, TQT_SIGNAL( valueChanged(int) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mAutoSave, TQ_SIGNAL( valueChanged(int) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); hlay = new TQHBoxLayout( vlay ); // inherits spacing mForwardTypeCombo = new KComboBox( false, this ); @@ -2746,21 +2746,21 @@ ComposerPageGeneralTab::ComposerPageGeneralTab( TQWidget * parent, const char * hlay->addWidget( label ); hlay->addWidget( mForwardTypeCombo ); hlay->addStretch( 1 ); - connect( mForwardTypeCombo, TQT_SIGNAL(activated(int)), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mForwardTypeCombo, TQ_SIGNAL(activated(int)), + this, TQ_SLOT( slotEmitChanged( void ) ) ); hlay = new TQHBoxLayout( vlay ); // inherits spacing TQPushButton *completionOrderBtn = new TQPushButton( i18n( "Configure Completion Order" ), this ); - connect( completionOrderBtn, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( slotConfigureCompletionOrder() ) ); + connect( completionOrderBtn, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( slotConfigureCompletionOrder() ) ); hlay->addWidget( completionOrderBtn ); hlay->addItem( new TQSpacerItem(0, 0) ); // recent addresses hlay = new TQHBoxLayout( vlay ); // inherits spacing TQPushButton *recentAddressesBtn = new TQPushButton( i18n( "Edit Recent Addresses..." ), this ); - connect( recentAddressesBtn, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( slotConfigureRecentAddresses() ) ); + connect( recentAddressesBtn, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( slotConfigureRecentAddresses() ) ); hlay->addWidget( recentAddressesBtn ); hlay->addItem( new TQSpacerItem(0, 0) ); @@ -2771,17 +2771,17 @@ ComposerPageGeneralTab::ComposerPageGeneralTab( TQWidget * parent, const char * mExternalEditorCheck = new TQCheckBox( GlobalSettings::self()->useExternalEditorItem()->label(), group, "kcfg_UseExternalEditor" ); - connect( mExternalEditorCheck, TQT_SIGNAL( toggled( bool ) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mExternalEditorCheck, TQ_SIGNAL( toggled( bool ) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); hbox = new TQHBox( group ); label = new TQLabel( GlobalSettings::self()->externalEditorItem()->label(), hbox ); mEditorRequester = new KURLRequester( hbox, "kcfg_ExternalEditor" ); - connect( mEditorRequester, TQT_SIGNAL( urlSelected(const TQString&) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); - connect( mEditorRequester, TQT_SIGNAL( textChanged(const TQString&) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mEditorRequester, TQ_SIGNAL( urlSelected(const TQString&) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); + connect( mEditorRequester, TQ_SIGNAL( textChanged(const TQString&) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); hbox->setStretchFactor( mEditorRequester, 1 ); label->setBuddy( mEditorRequester ); @@ -2791,16 +2791,16 @@ ComposerPageGeneralTab::ComposerPageGeneralTab( TQWidget * parent, const char * "application/x-shellscript " "application/x-desktop" ); mEditorRequester->setEnabled( false ); // !mExternalEditorCheck->isChecked() - connect( mExternalEditorCheck, TQT_SIGNAL(toggled(bool)), - label, TQT_SLOT(setEnabled(bool)) ); - connect( mExternalEditorCheck, TQT_SIGNAL(toggled(bool)), - mEditorRequester, TQT_SLOT(setEnabled(bool)) ); + connect( mExternalEditorCheck, TQ_SIGNAL(toggled(bool)), + label, TQ_SLOT(setEnabled(bool)) ); + connect( mExternalEditorCheck, TQ_SIGNAL(toggled(bool)), + mEditorRequester, TQ_SLOT(setEnabled(bool)) ); label = new TQLabel( i18n("<b>%f</b> will be replaced with the " "filename to edit."), group ); label->setEnabled( false ); // see above - connect( mExternalEditorCheck, TQT_SIGNAL(toggled(bool)), - label, TQT_SLOT(setEnabled(bool)) ); + connect( mExternalEditorCheck, TQ_SIGNAL(toggled(bool)), + label, TQ_SLOT(setEnabled(bool)) ); vlay->addWidget( group ); vlay->addStretch( 100 ); @@ -2942,8 +2942,8 @@ ComposerPagePhrasesTab::ComposerPagePhrasesTab( TQWidget * parent, const char * glay->addWidget( new TQLabel( mPhraseLanguageCombo, i18n("Lang&uage:"), this ), 1, 0 ); glay->addMultiCellWidget( mPhraseLanguageCombo, 1, 1, 1, 2 ); - connect( mPhraseLanguageCombo, TQT_SIGNAL(activated(const TQString&)), - this, TQT_SLOT(slotLanguageChanged(const TQString&)) ); + connect( mPhraseLanguageCombo, TQ_SIGNAL(activated(const TQString&)), + this, TQ_SLOT(slotLanguageChanged(const TQString&)) ); // row 2: "add..." and "remove" push buttons: button = new TQPushButton( i18n("A&dd..."), this ); @@ -2953,39 +2953,39 @@ ComposerPagePhrasesTab::ComposerPagePhrasesTab( TQWidget * parent, const char * mRemoveButton->setAutoDefault( false ); mRemoveButton->setEnabled( false ); // combo doesn't contain anything... glay->addWidget( mRemoveButton, 2, 2 ); - connect( button, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotNewLanguage()) ); - connect( mRemoveButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotRemoveLanguage()) ); + connect( button, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotNewLanguage()) ); + connect( mRemoveButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotRemoveLanguage()) ); // row 3: "reply to sender" line edit and label: mPhraseReplyEdit = new KLineEdit( this ); - connect( mPhraseReplyEdit, TQT_SIGNAL( textChanged( const TQString& ) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mPhraseReplyEdit, TQ_SIGNAL( textChanged( const TQString& ) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); glay->addWidget( new TQLabel( mPhraseReplyEdit, i18n("Reply to se&nder:"), this ), 3, 0 ); glay->addMultiCellWidget( mPhraseReplyEdit, 3, 3, 1, 2 ); // cols 1..2 // row 4: "reply to all" line edit and label: mPhraseReplyAllEdit = new KLineEdit( this ); - connect( mPhraseReplyAllEdit, TQT_SIGNAL( textChanged( const TQString& ) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mPhraseReplyAllEdit, TQ_SIGNAL( textChanged( const TQString& ) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); glay->addWidget( new TQLabel( mPhraseReplyAllEdit, i18n("Repl&y to all:"), this ), 4, 0 ); glay->addMultiCellWidget( mPhraseReplyAllEdit, 4, 4, 1, 2 ); // cols 1..2 // row 5: "forward" line edit and label: mPhraseForwardEdit = new KLineEdit( this ); - connect( mPhraseForwardEdit, TQT_SIGNAL( textChanged( const TQString& ) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mPhraseForwardEdit, TQ_SIGNAL( textChanged( const TQString& ) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); glay->addWidget( new TQLabel( mPhraseForwardEdit, i18n("&Forward:"), this ), 5, 0 ); glay->addMultiCellWidget( mPhraseForwardEdit, 5, 5, 1, 2 ); // cols 1..2 // row 6: "quote indicator" line edit and label: mPhraseIndentPrefixEdit = new KLineEdit( this ); - connect( mPhraseIndentPrefixEdit, TQT_SIGNAL( textChanged( const TQString& ) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mPhraseIndentPrefixEdit, TQ_SIGNAL( textChanged( const TQString& ) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); glay->addWidget( new TQLabel( mPhraseIndentPrefixEdit, i18n("&Quote indicator:"), this ), 6, 0 ); glay->addMultiCellWidget( mPhraseIndentPrefixEdit, 6, 6, 1, 2 ); @@ -3133,8 +3133,8 @@ ComposerPageTemplatesTab::ComposerPageTemplatesTab( TQWidget * parent, const cha mWidget = new TemplatesConfiguration( this ); vlay->addWidget( mWidget ); - connect( mWidget, TQT_SIGNAL( changed() ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mWidget, TQ_SIGNAL( changed() ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); } void ComposerPage::TemplatesTab::doLoadFromGlobalSettings() { @@ -3157,8 +3157,8 @@ ComposerPageCustomTemplatesTab::ComposerPageCustomTemplatesTab( TQWidget * paren mWidget = new CustomTemplates( this ); vlay->addWidget( mWidget ); - connect( mWidget, TQT_SIGNAL( changed() ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mWidget, TQ_SIGNAL( changed() ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); } void ComposerPage::CustomTemplatesTab::doLoadFromGlobalSettings() { @@ -3200,15 +3200,15 @@ ComposerPageSubjectTab::ComposerPageSubjectTab( TQWidget * parent, const char * i18n("A&dd..."), i18n("Re&move"), i18n("Mod&ify..."), i18n("Enter new reply prefix:") ); - connect( mReplyListEditor, TQT_SIGNAL( changed( void ) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mReplyListEditor, TQ_SIGNAL( changed( void ) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); // row 2: "replace [...]" check box: mReplaceReplyPrefixCheck = new TQCheckBox( GlobalSettings::self()->replaceReplyPrefixItem()->label(), group, "kcfg_ReplaceReplyPrefix" ); - connect( mReplaceReplyPrefixCheck, TQT_SIGNAL( stateChanged( int ) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mReplaceReplyPrefixCheck, TQ_SIGNAL( stateChanged( int ) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); vlay->addWidget( group ); @@ -3228,15 +3228,15 @@ ComposerPageSubjectTab::ComposerPageSubjectTab( TQWidget * parent, const char * i18n("Remo&ve"), i18n("Modify..."), i18n("Enter new forward prefix:") ); - connect( mForwardListEditor, TQT_SIGNAL( changed( void ) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mForwardListEditor, TQ_SIGNAL( changed( void ) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); // row 3: "replace [...]" check box: mReplaceForwardPrefixCheck = new TQCheckBox( GlobalSettings::self()->replaceForwardPrefixItem()->label(), group, "kcfg_ReplaceForwardPrefix" ); - connect( mReplaceForwardPrefixCheck, TQT_SIGNAL( stateChanged( int ) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mReplaceForwardPrefixCheck, TQ_SIGNAL( stateChanged( int ) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); vlay->addWidget( group ); } @@ -3276,20 +3276,20 @@ ComposerPageCharsetTab::ComposerPageCharsetTab( TQWidget * parent, const char * new SimpleStringListEditor( this, 0, SimpleStringListEditor::All, i18n("A&dd..."), i18n("Remo&ve"), i18n("&Modify..."), i18n("Enter charset:") ); - connect( mCharsetListEditor, TQT_SIGNAL( changed( void ) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mCharsetListEditor, TQ_SIGNAL( changed( void ) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); vlay->addWidget( mCharsetListEditor, 1 ); mKeepReplyCharsetCheck = new TQCheckBox( i18n("&Keep original charset when " "replying or forwarding (if " "possible)"), this ); - connect( mKeepReplyCharsetCheck, TQT_SIGNAL ( stateChanged( int ) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mKeepReplyCharsetCheck, TQ_SIGNAL ( stateChanged( int ) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); vlay->addWidget( mKeepReplyCharsetCheck ); - connect( mCharsetListEditor, TQT_SIGNAL(aboutToAdd(TQString&)), - this, TQT_SLOT(slotVerifyCharset(TQString&)) ); + connect( mCharsetListEditor, TQ_SIGNAL(aboutToAdd(TQString&)), + this, TQ_SLOT(slotVerifyCharset(TQString&)) ); } void ComposerPage::CharsetTab::slotVerifyCharset( TQString & charset ) { @@ -3327,7 +3327,7 @@ void ComposerPage::CharsetTab::doLoadOther() { it != charsets.end() ; ++it ) if ( (*it) == TQString::fromLatin1("locale") ) { TQCString cset = kmkernel->networkCodec()->mimeName(); - KPIM::kAsciiToLower( cset.data() ); + kasciitolower( cset.data() ); (*it) = TQString("%1 (locale)").arg( TQString(cset) ); } @@ -3367,8 +3367,8 @@ ComposerPageHeadersTab::ComposerPageHeadersTab( TQWidget * parent, const char * // "Use custom Message-Id suffix" checkbox: mCreateOwnMessageIdCheck = new TQCheckBox( i18n("&Use custom message-id suffix"), this ); - connect( mCreateOwnMessageIdCheck, TQT_SIGNAL ( stateChanged( int ) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mCreateOwnMessageIdCheck, TQ_SIGNAL ( stateChanged( int ) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); vlay->addWidget( mCreateOwnMessageIdCheck ); // "Message-Id suffix" line edit and label: @@ -3376,7 +3376,7 @@ ComposerPageHeadersTab::ComposerPageHeadersTab( TQWidget * parent, const char * mMessageIdSuffixEdit = new KLineEdit( this ); // only ASCII letters, digits, plus, minus and dots are allowed mMessageIdSuffixValidator = - new TQRegExpValidator( TQRegExp( "[a-zA-Z0-9+-]+(?:\\.[a-zA-Z0-9+-]+)*" ), TQT_TQOBJECT(this) ); + new TQRegExpValidator( TQRegExp( "[a-zA-Z0-9+-]+(?:\\.[a-zA-Z0-9+-]+)*" ), this ); mMessageIdSuffixEdit->setValidator( mMessageIdSuffixValidator ); label = new TQLabel( mMessageIdSuffixEdit, i18n("Custom message-&id suffix:"), this ); @@ -3384,12 +3384,12 @@ ComposerPageHeadersTab::ComposerPageHeadersTab( TQWidget * parent, const char * mMessageIdSuffixEdit->setEnabled( false ); hlay->addWidget( label ); hlay->addWidget( mMessageIdSuffixEdit, 1 ); - connect( mCreateOwnMessageIdCheck, TQT_SIGNAL(toggled(bool) ), - label, TQT_SLOT(setEnabled(bool)) ); - connect( mCreateOwnMessageIdCheck, TQT_SIGNAL(toggled(bool) ), - mMessageIdSuffixEdit, TQT_SLOT(setEnabled(bool)) ); - connect( mMessageIdSuffixEdit, TQT_SIGNAL( textChanged( const TQString& ) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mCreateOwnMessageIdCheck, TQ_SIGNAL(toggled(bool) ), + label, TQ_SLOT(setEnabled(bool)) ); + connect( mCreateOwnMessageIdCheck, TQ_SIGNAL(toggled(bool) ), + mMessageIdSuffixEdit, TQ_SLOT(setEnabled(bool)) ); + connect( mMessageIdSuffixEdit, TQ_SIGNAL( textChanged( const TQString& ) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); // horizontal rule and "custom header fields" label: vlay->addWidget( new KSeparator( KSeparator::HLine, this ) ); @@ -3404,18 +3404,18 @@ ComposerPageHeadersTab::ComposerPageHeadersTab( TQWidget * parent, const char * mTagList->addColumn( i18n("Value") ); mTagList->setAllColumnsShowFocus( true ); mTagList->setSorting( -1 ); - connect( mTagList, TQT_SIGNAL(selectionChanged()), - this, TQT_SLOT(slotMimeHeaderSelectionChanged()) ); + connect( mTagList, TQ_SIGNAL(selectionChanged()), + this, TQ_SLOT(slotMimeHeaderSelectionChanged()) ); glay->addMultiCellWidget( mTagList, 0, 2, 0, 1 ); // "new" and "remove" buttons: button = new TQPushButton( i18n("Ne&w"), this ); - connect( button, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotNewMimeHeader()) ); + connect( button, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotNewMimeHeader()) ); button->setAutoDefault( false ); glay->addWidget( button, 0, 2 ); mRemoveHeaderButton = new TQPushButton( i18n("Re&move"), this ); - connect( mRemoveHeaderButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotRemoveMimeHeader()) ); + connect( mRemoveHeaderButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotRemoveMimeHeader()) ); button->setAutoDefault( false ); glay->addWidget( mRemoveHeaderButton, 1, 2 ); @@ -3426,8 +3426,8 @@ ComposerPageHeadersTab::ComposerPageHeadersTab( TQWidget * parent, const char * mTagNameLabel->setEnabled( false ); glay->addWidget( mTagNameLabel, 3, 0 ); glay->addWidget( mTagNameEdit, 3, 1 ); - connect( mTagNameEdit, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(slotMimeHeaderNameChanged(const TQString&)) ); + connect( mTagNameEdit, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(slotMimeHeaderNameChanged(const TQString&)) ); mTagValueEdit = new KLineEdit( this ); mTagValueEdit->setEnabled( false ); @@ -3435,8 +3435,8 @@ ComposerPageHeadersTab::ComposerPageHeadersTab( TQWidget * parent, const char * mTagValueLabel->setEnabled( false ); glay->addWidget( mTagValueLabel, 4, 0 ); glay->addWidget( mTagValueEdit, 4, 1 ); - connect( mTagValueEdit, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(slotMimeHeaderValueChanged(const TQString&)) ); + connect( mTagValueEdit, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(slotMimeHeaderValueChanged(const TQString&)) ); } void ComposerPage::HeadersTab::slotMimeHeaderSelectionChanged() @@ -3583,10 +3583,10 @@ ComposerPageAttachmentsTab::ComposerPageAttachmentsTab( TQWidget * parent, TQToolTip::add( mOutlookCompatibleCheck, i18n( "Turn this option on to make Outlook(tm) understand attachment names " "containing non-English characters" ) ); - connect( mOutlookCompatibleCheck, TQT_SIGNAL( stateChanged( int ) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); - connect( mOutlookCompatibleCheck, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( slotOutlookCompatibleClicked() ) ); + connect( mOutlookCompatibleCheck, TQ_SIGNAL( stateChanged( int ) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); + connect( mOutlookCompatibleCheck, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( slotOutlookCompatibleClicked() ) ); vlay->addWidget( mOutlookCompatibleCheck ); vlay->addSpacing( 5 ); @@ -3594,8 +3594,8 @@ ComposerPageAttachmentsTab::ComposerPageAttachmentsTab( TQWidget * parent, mMissingAttachmentDetectionCheck = new TQCheckBox( i18n("E&nable detection of missing attachments"), this ); mMissingAttachmentDetectionCheck->setChecked( true ); - connect( mMissingAttachmentDetectionCheck, TQT_SIGNAL( stateChanged( int ) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mMissingAttachmentDetectionCheck, TQ_SIGNAL( stateChanged( int ) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); vlay->addWidget( mMissingAttachmentDetectionCheck ); // "Attachment key words" label and string list editor @@ -3611,14 +3611,14 @@ ComposerPageAttachmentsTab::ComposerPageAttachmentsTab( TQWidget * parent, i18n("A&dd..."), i18n("Re&move"), i18n("Mod&ify..."), i18n("Enter new key word:") ); - connect( mAttachWordsListEditor, TQT_SIGNAL( changed( void ) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mAttachWordsListEditor, TQ_SIGNAL( changed( void ) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); vlay->addWidget( mAttachWordsListEditor ); - connect( mMissingAttachmentDetectionCheck, TQT_SIGNAL(toggled(bool) ), - label, TQT_SLOT(setEnabled(bool)) ); - connect( mMissingAttachmentDetectionCheck, TQT_SIGNAL(toggled(bool) ), - mAttachWordsListEditor, TQT_SLOT(setEnabled(bool)) ); + connect( mMissingAttachmentDetectionCheck, TQ_SIGNAL(toggled(bool) ), + label, TQ_SLOT(setEnabled(bool)) ); + connect( mMissingAttachmentDetectionCheck, TQ_SIGNAL(toggled(bool) ), + mAttachWordsListEditor, TQ_SLOT(setEnabled(bool)) ); } void ComposerPage::AttachmentsTab::doLoadFromGlobalSettings() { @@ -3770,7 +3770,7 @@ SecurityPageGeneralTab::SecurityPageGeneralTab( TQWidget * parent, const char * "receipt</b>. The message author requests a disposition " "notification to be sent and the receiver's mail program " "generates a reply from which the author can learn what " - "happened to his message. Common disposition types include " + "happened to their message. Common disposition types include " "<b>displayed</b> (i.e. read), <b>deleted</b> and <b>dispatched</b> " "(e.g. forwarded).</p>" "<p>The following options are available to control KMail's " @@ -3785,7 +3785,7 @@ SecurityPageGeneralTab::SecurityPageGeneralTab( TQWidget * parent, const char * "<li><em>Deny</em>: Always sends a <b>denied</b> notification. This " "is only <em>slightly</em> better than always sending MDNs. " "The author will still know that the messages has been acted " - "upon, he just cannot tell whether it was deleted or read etc.</li>" + "upon, they just cannot tell whether it was deleted or read etc.</li>" "<li><em>Always send</em>: Always sends the requested " "disposition notification. That means that the author of the " "message gets to know when the message was acted upon and, " @@ -3802,13 +3802,13 @@ SecurityPageGeneralTab::SecurityPageGeneralTab( TQWidget * parent, const char * mHtmlMailCheck = new TQCheckBox( i18n("Prefer H&TML to plain text"), group ); TQWhatsThis::add( mHtmlMailCheck, htmlWhatsThis ); - connect( mHtmlMailCheck, TQT_SIGNAL( stateChanged( int ) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mHtmlMailCheck, TQ_SIGNAL( stateChanged( int ) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); mExternalReferences = new TQCheckBox( i18n("Allow messages to load e&xternal " "references from the Internet" ), group ); TQWhatsThis::add( mExternalReferences, externalWhatsThis ); - connect( mExternalReferences, TQT_SIGNAL( stateChanged( int ) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mExternalReferences, TQ_SIGNAL( stateChanged( int ) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); label = new KActiveLabel( i18n("<b>WARNING:</b> Allowing HTML in email may " "increase the risk that your system will be " "compromised by present and anticipated security " @@ -3824,7 +3824,7 @@ SecurityPageGeneralTab::SecurityPageGeneralTab( TQWidget * parent, const char * group = new TQVGroupBox( i18n("Encrypted Messages"), this ); group->layout()->setSpacing( KDialog::spacingHint() ); mAlwaysDecrypt = new TQCheckBox( i18n( "Attempt decryption of encrypted messages when viewing" ), group ); - connect( mAlwaysDecrypt, TQT_SIGNAL(stateChanged(int)), this, TQT_SLOT(slotEmitChanged()) ); + connect( mAlwaysDecrypt, TQ_SIGNAL(stateChanged(int)), this, TQ_SLOT(slotEmitChanged()) ); vlay->addWidget( group ); // "Message Disposition Notification" groupbox: @@ -3835,8 +3835,8 @@ SecurityPageGeneralTab::SecurityPageGeneralTab( TQWidget * parent, const char * // "ignore", "ask", "deny", "always send" radiobutton line: mMDNGroup = new TQButtonGroup( group ); mMDNGroup->hide(); - connect( mMDNGroup, TQT_SIGNAL( clicked( int ) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mMDNGroup, TQ_SIGNAL( clicked( int ) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); hbox = new TQHBox( group ); hbox->setSpacing( KDialog::spacingHint() ); @@ -3863,8 +3863,8 @@ SecurityPageGeneralTab::SecurityPageGeneralTab( TQWidget * parent, const char * // "Original Message quote" radiobutton line: mOrigQuoteGroup = new TQButtonGroup( group ); mOrigQuoteGroup->hide(); - connect( mOrigQuoteGroup, TQT_SIGNAL( clicked( int ) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mOrigQuoteGroup, TQ_SIGNAL( clicked( int ) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); hbox = new TQHBox( group ); hbox->setSpacing( KDialog::spacingHint() ); @@ -3884,7 +3884,7 @@ SecurityPageGeneralTab::SecurityPageGeneralTab( TQWidget * parent, const char * hbox->setStretchFactor( w, 1 ); mNoMDNsWhenEncryptedCheck = new TQCheckBox( i18n("Do not send MDNs in response to encrypted messages"), group ); - connect( mNoMDNsWhenEncryptedCheck, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotEmitChanged()) ); + connect( mNoMDNsWhenEncryptedCheck, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotEmitChanged()) ); // Warning label: label = new KActiveLabel( i18n("<b>WARNING:</b> Unconditionally returning " @@ -3900,7 +3900,7 @@ SecurityPageGeneralTab::SecurityPageGeneralTab( TQWidget * parent, const char * group->layout()->setSpacing( KDialog::spacingHint() ); mAutomaticallyImportAttachedKeysCheck = new TQCheckBox( i18n("Automatically import keys and certificates"), group ); - connect( mAutomaticallyImportAttachedKeysCheck, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotEmitChanged()) ); + connect( mAutomaticallyImportAttachedKeysCheck, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotEmitChanged()) ); vlay->addWidget( group ); @@ -4003,13 +4003,13 @@ SecurityPageComposerCryptoTab::SecurityPageComposerCryptoTab( TQWidget * parent, TQVBoxLayout* vlay = new TQVBoxLayout( this, 0, 0 ); mWidget = new ComposerCryptoConfiguration( this ); - connect( mWidget->mAutoSignature, TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT( slotEmitChanged() ) ); - connect( mWidget->mEncToSelf, TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT( slotEmitChanged() ) ); - connect( mWidget->mShowEncryptionResult, TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT( slotEmitChanged() ) ); - connect( mWidget->mShowKeyApprovalDlg, TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT( slotEmitChanged() ) ); - connect( mWidget->mAutoEncrypt, TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT( slotEmitChanged() ) ); - connect( mWidget->mNeverEncryptWhenSavingInDrafts, TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT( slotEmitChanged() ) ); - connect( mWidget->mStoreEncrypted, TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT( slotEmitChanged() ) ); + connect( mWidget->mAutoSignature, TQ_SIGNAL( toggled(bool) ), this, TQ_SLOT( slotEmitChanged() ) ); + connect( mWidget->mEncToSelf, TQ_SIGNAL( toggled(bool) ), this, TQ_SLOT( slotEmitChanged() ) ); + connect( mWidget->mShowEncryptionResult, TQ_SIGNAL( toggled(bool) ), this, TQ_SLOT( slotEmitChanged() ) ); + connect( mWidget->mShowKeyApprovalDlg, TQ_SIGNAL( toggled(bool) ), this, TQ_SLOT( slotEmitChanged() ) ); + connect( mWidget->mAutoEncrypt, TQ_SIGNAL( toggled(bool) ), this, TQ_SLOT( slotEmitChanged() ) ); + connect( mWidget->mNeverEncryptWhenSavingInDrafts, TQ_SIGNAL( toggled(bool) ), this, TQ_SLOT( slotEmitChanged() ) ); + connect( mWidget->mStoreEncrypted, TQ_SIGNAL( toggled(bool) ), this, TQ_SLOT( slotEmitChanged() ) ); vlay->addWidget( mWidget ); } @@ -4080,20 +4080,20 @@ SecurityPageWarningTab::SecurityPageWarningTab( TQWidget * parent, const char * mWidget = new WarningConfiguration( this ); vlay->addWidget( mWidget ); - connect( mWidget->warnGroupBox, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotEmitChanged()) ); - connect( mWidget->mWarnUnsigned, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotEmitChanged()) ); - connect( mWidget->warnUnencryptedCB, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotEmitChanged()) ); - connect( mWidget->warnReceiverNotInCertificateCB, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotEmitChanged()) ); - connect( mWidget->mWarnSignKeyExpiresSB, TQT_SIGNAL( valueChanged( int ) ), TQT_SLOT( slotEmitChanged() ) ); - connect( mWidget->mWarnSignChainCertExpiresSB, TQT_SIGNAL( valueChanged( int ) ), TQT_SLOT( slotEmitChanged() ) ); - connect( mWidget->mWarnSignRootCertExpiresSB, TQT_SIGNAL( valueChanged( int ) ), TQT_SLOT( slotEmitChanged() ) ); + connect( mWidget->warnGroupBox, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotEmitChanged()) ); + connect( mWidget->mWarnUnsigned, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotEmitChanged()) ); + connect( mWidget->warnUnencryptedCB, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotEmitChanged()) ); + connect( mWidget->warnReceiverNotInCertificateCB, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotEmitChanged()) ); + connect( mWidget->mWarnSignKeyExpiresSB, TQ_SIGNAL( valueChanged( int ) ), TQ_SLOT( slotEmitChanged() ) ); + connect( mWidget->mWarnSignChainCertExpiresSB, TQ_SIGNAL( valueChanged( int ) ), TQ_SLOT( slotEmitChanged() ) ); + connect( mWidget->mWarnSignRootCertExpiresSB, TQ_SIGNAL( valueChanged( int ) ), TQ_SLOT( slotEmitChanged() ) ); - connect( mWidget->mWarnEncrKeyExpiresSB, TQT_SIGNAL( valueChanged( int ) ), TQT_SLOT( slotEmitChanged() ) ); - connect( mWidget->mWarnEncrChainCertExpiresSB, TQT_SIGNAL( valueChanged( int ) ), TQT_SLOT( slotEmitChanged() ) ); - connect( mWidget->mWarnEncrRootCertExpiresSB, TQT_SIGNAL( valueChanged( int ) ), TQT_SLOT( slotEmitChanged() ) ); + connect( mWidget->mWarnEncrKeyExpiresSB, TQ_SIGNAL( valueChanged( int ) ), TQ_SLOT( slotEmitChanged() ) ); + connect( mWidget->mWarnEncrChainCertExpiresSB, TQ_SIGNAL( valueChanged( int ) ), TQ_SLOT( slotEmitChanged() ) ); + connect( mWidget->mWarnEncrRootCertExpiresSB, TQ_SIGNAL( valueChanged( int ) ), TQ_SLOT( slotEmitChanged() ) ); - connect( mWidget->enableAllWarningsPB, TQT_SIGNAL(clicked()), - TQT_SLOT(slotReenableAllWarningsClicked()) ); + connect( mWidget->enableAllWarningsPB, TQ_SIGNAL(clicked()), + TQ_SLOT(slotReenableAllWarningsClicked()) ); } void SecurityPage::WarningTab::doLoadOther() { @@ -4206,28 +4206,28 @@ SecurityPageSMimeTab::SecurityPageSMimeTab( TQWidget * parent, const char * name mConfig = Kleo::CryptoBackendFactory::instance()->config(); - connect( mWidget->CRLRB, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotEmitChanged() ) ); - connect( mWidget->OCSPRB, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotEmitChanged() ) ); - connect( mWidget->OCSPResponderURL, TQT_SIGNAL( textChanged( const TQString& ) ), this, TQT_SLOT( slotEmitChanged() ) ); - connect( mWidget->OCSPResponderSignature, TQT_SIGNAL( changed() ), this, TQT_SLOT( slotEmitChanged() ) ); - connect( mWidget->doNotCheckCertPolicyCB, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotEmitChanged() ) ); - connect( mWidget->neverConsultCB, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotEmitChanged() ) ); - connect( mWidget->fetchMissingCB, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotEmitChanged() ) ); - - connect( mWidget->ignoreServiceURLCB, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotEmitChanged() ) ); - connect( mWidget->ignoreHTTPDPCB, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotEmitChanged() ) ); - connect( mWidget->disableHTTPCB, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotEmitChanged() ) ); - connect( mWidget->honorHTTPProxyRB, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotEmitChanged() ) ); - connect( mWidget->useCustomHTTPProxyRB, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotEmitChanged() ) ); - connect( mWidget->customHTTPProxy, TQT_SIGNAL( textChanged( const TQString& ) ), this, TQT_SLOT( slotEmitChanged() ) ); - connect( mWidget->ignoreLDAPDPCB, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotEmitChanged() ) ); - connect( mWidget->disableLDAPCB, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotEmitChanged() ) ); - connect( mWidget->customLDAPProxy, TQT_SIGNAL( textChanged( const TQString& ) ), this, TQT_SLOT( slotEmitChanged() ) ); - - connect( mWidget->disableHTTPCB, TQT_SIGNAL( toggled( bool ) ), - this, TQT_SLOT( slotUpdateHTTPActions() ) ); - connect( mWidget->ignoreHTTPDPCB, TQT_SIGNAL( toggled( bool ) ), - this, TQT_SLOT( slotUpdateHTTPActions() ) ); + connect( mWidget->CRLRB, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotEmitChanged() ) ); + connect( mWidget->OCSPRB, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotEmitChanged() ) ); + connect( mWidget->OCSPResponderURL, TQ_SIGNAL( textChanged( const TQString& ) ), this, TQ_SLOT( slotEmitChanged() ) ); + connect( mWidget->OCSPResponderSignature, TQ_SIGNAL( changed() ), this, TQ_SLOT( slotEmitChanged() ) ); + connect( mWidget->doNotCheckCertPolicyCB, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotEmitChanged() ) ); + connect( mWidget->neverConsultCB, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotEmitChanged() ) ); + connect( mWidget->fetchMissingCB, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotEmitChanged() ) ); + + connect( mWidget->ignoreServiceURLCB, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotEmitChanged() ) ); + connect( mWidget->ignoreHTTPDPCB, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotEmitChanged() ) ); + connect( mWidget->disableHTTPCB, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotEmitChanged() ) ); + connect( mWidget->honorHTTPProxyRB, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotEmitChanged() ) ); + connect( mWidget->useCustomHTTPProxyRB, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotEmitChanged() ) ); + connect( mWidget->customHTTPProxy, TQ_SIGNAL( textChanged( const TQString& ) ), this, TQ_SLOT( slotEmitChanged() ) ); + connect( mWidget->ignoreLDAPDPCB, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotEmitChanged() ) ); + connect( mWidget->disableLDAPCB, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotEmitChanged() ) ); + connect( mWidget->customLDAPProxy, TQ_SIGNAL( textChanged( const TQString& ) ), this, TQ_SLOT( slotEmitChanged() ) ); + + connect( mWidget->disableHTTPCB, TQ_SIGNAL( toggled( bool ) ), + this, TQ_SLOT( slotUpdateHTTPActions() ) ); + connect( mWidget->ignoreHTTPDPCB, TQ_SIGNAL( toggled( bool ) ), + this, TQ_SLOT( slotUpdateHTTPActions() ) ); // Button-group for exclusive radiobuttons TQButtonGroup* bgHTTPProxy = new TQButtonGroup( mWidget ); @@ -4504,7 +4504,7 @@ SecurityPageCryptPlugTab::SecurityPageCryptPlugTab( TQWidget * parent, const cha TQVBoxLayout * vlay = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() ); mBackendConfig = Kleo::CryptoBackendFactory::instance()->configWidget( this, "mBackendConfig" ); - connect( mBackendConfig, TQT_SIGNAL( changed( bool ) ), this, TQT_SIGNAL( changed( bool ) ) ); + connect( mBackendConfig, TQ_SIGNAL( changed( bool ) ), this, TQ_SIGNAL( changed( bool ) ) ); vlay->addWidget( mBackendConfig ); } @@ -4563,13 +4563,13 @@ MiscPageFolderTab::MiscPageFolderTab( TQWidget * parent, const char * name ) "trash"), this ); vlay->addWidget( mEmptyFolderConfirmCheck ); - connect( mEmptyFolderConfirmCheck, TQT_SIGNAL( stateChanged( int ) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mEmptyFolderConfirmCheck, TQ_SIGNAL( stateChanged( int ) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); mExcludeImportantFromExpiry = new TQCheckBox( i18n("E&xclude important messages from expiry"), this ); vlay->addWidget( mExcludeImportantFromExpiry ); - connect( mExcludeImportantFromExpiry, TQT_SIGNAL( stateChanged( int ) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mExcludeImportantFromExpiry, TQ_SIGNAL( stateChanged( int ) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); // "when trying to find unread messages" combo + label: stretch 0 hlay = new TQHBoxLayout( vlay ); // inherits spacing @@ -4587,8 +4587,8 @@ MiscPageFolderTab::MiscPageFolderTab( TQWidget * parent, const char * name ) "Loop in All Folders")); hlay->addWidget( label ); hlay->addWidget( mLoopOnGotoUnread, 1 ); - connect( mLoopOnGotoUnread, TQT_SIGNAL( activated( int ) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mLoopOnGotoUnread, TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); // when entering a folder hlay = new TQHBoxLayout( vlay ); // inherits spacing @@ -4611,8 +4611,8 @@ MiscPageFolderTab::MiscPageFolderTab( TQWidget * parent, const char * name ) "Jump to Oldest Message") ); hlay->addWidget( label ); hlay->addWidget( mActionEnterFolder, 1 ); - connect( mActionEnterFolder, TQT_SIGNAL( activated( int ) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mActionEnterFolder, TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); hlay = new TQHBoxLayout( vlay ); // inherits spacing mDelayedMarkAsRead = new TQCheckBox( i18n("Mar&k selected message as read after"), this ); @@ -4623,19 +4623,19 @@ MiscPageFolderTab::MiscPageFolderTab( TQWidget * parent, const char * name ) mDelayedMarkTime->setEnabled( false ); // since mDelayedMarkAsREad is off hlay->addWidget( mDelayedMarkTime ); hlay->addStretch( 1 ); - connect( mDelayedMarkTime, TQT_SIGNAL( valueChanged( int ) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); - connect( mDelayedMarkAsRead, TQT_SIGNAL(toggled(bool)), - mDelayedMarkTime, TQT_SLOT(setEnabled(bool))); - connect( mDelayedMarkAsRead, TQT_SIGNAL(toggled(bool)), - this , TQT_SLOT(slotEmitChanged( void ))); + connect( mDelayedMarkTime, TQ_SIGNAL( valueChanged( int ) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); + connect( mDelayedMarkAsRead, TQ_SIGNAL(toggled(bool)), + mDelayedMarkTime, TQ_SLOT(setEnabled(bool))); + connect( mDelayedMarkAsRead, TQ_SIGNAL(toggled(bool)), + this , TQ_SLOT(slotEmitChanged( void ))); // "show popup after Drag'n'Drop" checkbox: stretch 0 mShowPopupAfterDnD = new TQCheckBox( i18n("Ask for action after &dragging messages to another folder"), this ); vlay->addWidget( mShowPopupAfterDnD ); - connect( mShowPopupAfterDnD, TQT_SIGNAL( stateChanged( int ) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mShowPopupAfterDnD, TQ_SIGNAL( stateChanged( int ) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); // "default mailbox format" combo + label: stretch 0 hlay = new TQHBoxLayout( vlay ); // inherits spacing @@ -4668,8 +4668,8 @@ MiscPageFolderTab::MiscPageFolderTab( TQWidget * parent, const char * name ) TQWhatsThis::add( label, msg ); hlay->addWidget( label ); hlay->addWidget( mMailboxPrefCombo, 1 ); - connect( mMailboxPrefCombo, TQT_SIGNAL( activated( int ) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mMailboxPrefCombo, TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); // "On startup..." option: hlay = new TQHBoxLayout( vlay ); // inherits spacing @@ -4679,23 +4679,23 @@ MiscPageFolderTab::MiscPageFolderTab( TQWidget * parent, const char * name ) i18n("Open this folder on startup:"), this ); hlay->addWidget( label ); hlay->addWidget( mOnStartupOpenFolder, 1 ); - connect( mOnStartupOpenFolder, TQT_SIGNAL( folderChanged( KMFolder* ) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mOnStartupOpenFolder, TQ_SIGNAL( folderChanged( KMFolder* ) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); // "Empty &trash on program exit" option: hlay = new TQHBoxLayout( vlay ); // inherits spacing mEmptyTrashCheck = new TQCheckBox( i18n("Empty local &trash folder on program exit"), this ); hlay->addWidget( mEmptyTrashCheck ); - connect( mEmptyTrashCheck, TQT_SIGNAL( stateChanged( int ) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mEmptyTrashCheck, TQ_SIGNAL( stateChanged( int ) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); #ifdef HAVE_INDEXLIB // indexing enabled option: mIndexingEnabled = new TQCheckBox( i18n("Enable full text &indexing"), this ); vlay->addWidget( mIndexingEnabled ); - connect( mIndexingEnabled, TQT_SIGNAL( stateChanged( int ) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mIndexingEnabled, TQ_SIGNAL( stateChanged( int ) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); #endif // "Quota Units" @@ -4709,7 +4709,7 @@ MiscPageFolderTab::MiscPageFolderTab( TQWidget * parent, const char * name ) << i18n("GB") ); hlay->addWidget( label ); hlay->addWidget( mQuotaCmbBox, 1 ); - connect( mQuotaCmbBox, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mQuotaCmbBox, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( slotEmitChanged( void ) ) ); vlay->addStretch( 1 ); @@ -4817,14 +4817,14 @@ MiscPageGroupwareTab::MiscPageGroupwareTab( TQWidget* parent, const char* name ) "the Kontact applications" ) ); TQWhatsThis::add( mEnableImapResCB, i18n( GlobalSettings::self()->theIMAPResourceEnabledItem()->whatsThis().utf8() ) ); - connect( mEnableImapResCB, TQT_SIGNAL( stateChanged( int ) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mEnableImapResCB, TQ_SIGNAL( stateChanged( int ) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); mBox = new TQWidget( b1 ); TQGridLayout* grid = new TQGridLayout( mBox, 5, 2, 0, KDialog::spacingHint() ); grid->setColStretch( 1, 1 ); - connect( mEnableImapResCB, TQT_SIGNAL( toggled(bool) ), - mBox, TQT_SLOT( setEnabled(bool) ) ); + connect( mEnableImapResCB, TQ_SIGNAL( toggled(bool) ), + mBox, TQ_SLOT( setEnabled(bool) ) ); TQLabel* storageFormatLA = new TQLabel( i18n("&Format used for the groupware folders:"), mBox ); @@ -4842,8 +4842,8 @@ MiscPageGroupwareTab::MiscPageGroupwareTab( TQWidget* parent, const char* name ) grid->addWidget( mStorageFormatCombo, 0, 1 ); TQToolTip::add( mStorageFormatCombo, toolTip ); TQWhatsThis::add( mStorageFormatCombo, whatsThis ); - connect( mStorageFormatCombo, TQT_SIGNAL( activated( int ) ), - this, TQT_SLOT( slotStorageFormatChanged( int ) ) ); + connect( mStorageFormatCombo, TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( slotStorageFormatChanged( int ) ) ); TQLabel* languageLA = new TQLabel( i18n("&Language of the groupware folders:"), mBox ); @@ -4862,8 +4862,8 @@ MiscPageGroupwareTab::MiscPageGroupwareTab( TQWidget* parent, const char* name ) grid->addWidget( mLanguageCombo, 1, 1 ); TQToolTip::add( mLanguageCombo, toolTip ); TQWhatsThis::add( mLanguageCombo, whatsThis ); - connect( mLanguageCombo, TQT_SIGNAL( activated( int ) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mLanguageCombo, TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); mFolderComboLabel = new TQLabel( mBox ); // text depends on storage format toolTip = i18n( "Set the parent of the resource folders" ); @@ -4882,8 +4882,8 @@ MiscPageGroupwareTab::MiscPageGroupwareTab( TQWidget* parent, const char* name ) mFolderComboStack->addWidget( mFolderCombo, 0 ); TQToolTip::add( mFolderCombo, toolTip ); TQWhatsThis::add( mFolderCombo, whatsThis ); - connect( mFolderCombo, TQT_SIGNAL( folderChanged( KMFolder* ) ), - this, TQT_SLOT( slotEmitChanged() ) ); + connect( mFolderCombo, TQ_SIGNAL( folderChanged( KMFolder* ) ), + this, TQ_SLOT( slotEmitChanged() ) ); // Second possibility in the widgetstack: a combo showing the list of accounts // This is used with the kolab xml storage since the groupware folders @@ -4892,8 +4892,8 @@ MiscPageGroupwareTab::MiscPageGroupwareTab( TQWidget* parent, const char* name ) mFolderComboStack->addWidget( mAccountCombo, 1 ); TQToolTip::add( mAccountCombo, toolTip ); TQWhatsThis::add( mAccountCombo, whatsThis ); - connect( mAccountCombo, TQT_SIGNAL( activated( int ) ), - this, TQT_SLOT( slotEmitChanged() ) ); + connect( mAccountCombo, TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( slotEmitChanged() ) ); mHideGroupwareFolders = new TQCheckBox( i18n( "&Hide groupware folders" ), mBox, "HideGroupwareFoldersBox" ); @@ -4903,8 +4903,8 @@ MiscPageGroupwareTab::MiscPageGroupwareTab( TQWidget* parent, const char* name ) "resource folders in the folder tree." ) ); TQWhatsThis::add( mHideGroupwareFolders, i18n( GlobalSettings::self() ->hideGroupwareFoldersItem()->whatsThis().utf8() ) ); - connect( mHideGroupwareFolders, TQT_SIGNAL( toggled( bool ) ), - this, TQT_SLOT( slotEmitChanged() ) ); + connect( mHideGroupwareFolders, TQ_SIGNAL( toggled( bool ) ), + this, TQ_SLOT( slotEmitChanged() ) ); mOnlyShowGroupwareFolders = new TQCheckBox( i18n( "&Only show groupware folders for this account" ), mBox, "OnlyGroupwareFoldersBox" ); @@ -4915,20 +4915,20 @@ MiscPageGroupwareTab::MiscPageGroupwareTab( TQWidget* parent, const char* name ) "configured for groupware." ) ); TQWhatsThis::add( mOnlyShowGroupwareFolders, i18n( GlobalSettings::self() ->showOnlyGroupwareFoldersForGroupwareAccountItem()->whatsThis().utf8() ) ); - connect( mOnlyShowGroupwareFolders, TQT_SIGNAL( toggled( bool ) ), - this, TQT_SLOT( slotEmitChanged() ) ); + connect( mOnlyShowGroupwareFolders, TQ_SIGNAL( toggled( bool ) ), + this, TQ_SLOT( slotEmitChanged() ) ); mSyncImmediately = new TQCheckBox( i18n( "Synchronize groupware changes immediately" ), mBox ); TQToolTip::add( mSyncImmediately, i18n( "Synchronize groupware changes in disconnected IMAP folders immediately when being online." ) ); - connect( mSyncImmediately, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotEmitChanged()) ); + connect( mSyncImmediately, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotEmitChanged()) ); grid->addMultiCellWidget( mSyncImmediately, 4, 4, 0, 1 ); mDeleteInvitations = new TQCheckBox( i18n( GlobalSettings::self()->deleteInvitationEmailsAfterSendingReplyItem()->label().utf8() ), mBox ); TQWhatsThis::add( mDeleteInvitations, i18n( GlobalSettings::self() ->deleteInvitationEmailsAfterSendingReplyItem()->whatsThis().utf8() ) ); - connect( mDeleteInvitations, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotEmitChanged()) ); + connect( mDeleteInvitations, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotEmitChanged()) ); grid->addMultiCellWidget( mDeleteInvitations, 5, 5, 0, 1 ); // Groupware functionality compatibility setup @@ -4939,47 +4939,47 @@ MiscPageGroupwareTab::MiscPageGroupwareTab( TQWidget* parent, const char* name ) // Currently believed to be disused. mEnableGwCB = new TQCheckBox( i18n("&Enable groupware functionality"), b1 ); gBox->setSpacing( KDialog::spacingHint() ); - connect( mEnableGwCB, TQT_SIGNAL( toggled(bool) ), - gBox, TQT_SLOT( setEnabled(bool) ) ); - connect( mEnableGwCB, TQT_SIGNAL( stateChanged( int ) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mEnableGwCB, TQ_SIGNAL( toggled(bool) ), + gBox, TQ_SLOT( setEnabled(bool) ) ); + connect( mEnableGwCB, TQ_SIGNAL( stateChanged( int ) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); #endif mEnableGwCB = 0; mLegacyMangleFromTo = new TQCheckBox( i18n( "Mangle From:/To: headers in replies to invitations" ), gBox ); TQToolTip::add( mLegacyMangleFromTo, i18n( "Turn this option on in order to make Outlook(tm) understand your answers to invitation replies" ) ); TQWhatsThis::add( mLegacyMangleFromTo, i18n( GlobalSettings::self()-> legacyMangleFromToHeadersItem()->whatsThis().utf8() ) ); - connect( mLegacyMangleFromTo, TQT_SIGNAL( stateChanged( int ) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mLegacyMangleFromTo, TQ_SIGNAL( stateChanged( int ) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); mLegacyBodyInvites = new TQCheckBox( i18n( "Send invitations in the mail body" ), gBox ); TQToolTip::add( mLegacyBodyInvites, i18n( "Turn this option on in order to make Outlook(tm) understand your answers to invitations" ) ); TQWhatsThis::add( mLegacyMangleFromTo, i18n( GlobalSettings::self()-> legacyBodyInvitesItem()->whatsThis().utf8() ) ); - connect( mLegacyBodyInvites, TQT_SIGNAL( toggled( bool ) ), - this, TQT_SLOT( slotLegacyBodyInvitesToggled( bool ) ) ); - connect( mLegacyBodyInvites, TQT_SIGNAL( stateChanged( int ) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mLegacyBodyInvites, TQ_SIGNAL( toggled( bool ) ), + this, TQ_SLOT( slotLegacyBodyInvitesToggled( bool ) ) ); + connect( mLegacyBodyInvites, TQ_SIGNAL( stateChanged( int ) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); mExchangeCompatibleInvitations = new TQCheckBox( i18n( "Exchange compatible invitation naming" ), gBox ); TQToolTip::add( mExchangeCompatibleInvitations, i18n( "Outlook(tm), when used in combination with a Microsoft Exchange server,\nhas a problem understanding standards-compliant groupware e-mail.\nTurn this option on to send groupware invitations and replies in an Exchange compatible way." ) ); TQWhatsThis::add( mExchangeCompatibleInvitations, i18n( GlobalSettings::self()-> exchangeCompatibleInvitationsItem()->whatsThis().utf8() ) ); - connect( mExchangeCompatibleInvitations, TQT_SIGNAL( stateChanged( int ) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mExchangeCompatibleInvitations, TQ_SIGNAL( stateChanged( int ) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); mOutlookCompatibleInvitationComments = new TQCheckBox( i18n( "Outlook compatible invitation reply comments" ), gBox ); TQToolTip::add( mOutlookCompatibleInvitationComments, i18n( "Send invitation reply comments in a way that Microsoft Outlook(tm) understands." ) ); TQWhatsThis::add( mOutlookCompatibleInvitationComments, i18n( GlobalSettings::self()-> outlookCompatibleInvitationReplyCommentsItem()->whatsThis().utf8() ) ); - connect( mOutlookCompatibleInvitationComments, TQT_SIGNAL( stateChanged( int ) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mOutlookCompatibleInvitationComments, TQ_SIGNAL( stateChanged( int ) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); mAutomaticSending = new TQCheckBox( i18n( "Automatic invitation sending" ), gBox ); TQToolTip::add( mAutomaticSending, i18n( "When this is on, the user will not see the mail composer window. Invitation mails are sent automatically" ) ); TQWhatsThis::add( mAutomaticSending, i18n( GlobalSettings::self()-> automaticSendingItem()->whatsThis().utf8() ) ); - connect( mAutomaticSending, TQT_SIGNAL( stateChanged( int ) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mAutomaticSending, TQ_SIGNAL( stateChanged( int ) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); // Open space padding at the end new TQLabel( this ); @@ -5174,8 +5174,8 @@ AccountUpdater::AccountUpdater(ImapAccountBase *account) void AccountUpdater::update() { - connect( mAccount, TQT_SIGNAL( connectionResult(int, const TQString&) ), - this, TQT_SLOT( namespacesFetched() ) ); + connect( mAccount, TQ_SIGNAL( connectionResult(int, const TQString&) ), + this, TQ_SLOT( namespacesFetched() ) ); mAccount->makeConnection(); } diff --git a/kmail/configuredialog.h b/kmail/configuredialog.h index acd0bc5a..84887169 100644 --- a/kmail/configuredialog.h +++ b/kmail/configuredialog.h @@ -33,7 +33,7 @@ namespace KMail { class ConfigureDialog : public KCMultiDialog { - Q_OBJECT + TQ_OBJECT public: @@ -78,7 +78,7 @@ private: * takes care of that. */ class AccountUpdater : public TQObject { - Q_OBJECT + TQ_OBJECT public: AccountUpdater(KMail::ImapAccountBase *account); diff --git a/kmail/configuredialog_p.cpp b/kmail/configuredialog_p.cpp index 83c13a31..bd5fdcd1 100644 --- a/kmail/configuredialog_p.cpp +++ b/kmail/configuredialog_p.cpp @@ -20,8 +20,8 @@ // other tdenetwork headers: (none) // other KDE headers: -#include <ksimpleconfig.h> -#include <kstandarddirs.h> +#include <tdesimpleconfig.h> +#include <tdestandarddirs.h> #include <tdelocale.h> #include <kdebug.h> @@ -53,8 +53,8 @@ NewIdentityDialog::NewIdentityDialog( const TQStringList & identities, mLineEdit->setFocus(); hlay->addWidget( new TQLabel( mLineEdit, i18n("&New identity:"), page ) ); hlay->addWidget( mLineEdit, 1 ); - connect( mLineEdit, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(slotEnableOK(const TQString&)) ); + connect( mLineEdit, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(slotEnableOK(const TQString&)) ); mButtonGroup = new TQButtonGroup( page ); mButtonGroup->hide(); @@ -89,10 +89,10 @@ NewIdentityDialog::NewIdentityDialog( const TQStringList & identities, // enable/disable combobox and label depending on the third radio // button's state: - connect( radio, TQT_SIGNAL(toggled(bool)), - label, TQT_SLOT(setEnabled(bool)) ); - connect( radio, TQT_SIGNAL(toggled(bool)), - mComboBox, TQT_SLOT(setEnabled(bool)) ); + connect( radio, TQ_SIGNAL(toggled(bool)), + label, TQ_SLOT(setEnabled(bool)) ); + connect( radio, TQ_SIGNAL(toggled(bool)), + mComboBox, TQ_SLOT(setEnabled(bool)) ); enableButtonOK( false ); // since line edit is empty } @@ -214,7 +214,7 @@ NewLanguageDialog::NewLanguageDialog( LanguageItemList & suppressedLangs, for ( TQStringList::ConstIterator it = pathList.begin(); it != pathList.end(); ++it ) { - KSimpleConfig entry( *it ); + TDESimpleConfig entry( *it ); entry.setGroup( "KCM Locale" ); // full name: TQString name = entry.readEntry( "Name" ); @@ -252,7 +252,7 @@ LanguageComboBox::LanguageComboBox( bool rw, TQWidget *parent, const char *name int LanguageComboBox::insertLanguage( const TQString & language ) { static TQString entryDesktop = TQString::fromLatin1("/entry.desktop"); - KSimpleConfig entry( locate("locale", language + entryDesktop) ); + TDESimpleConfig entry( locate("locale", language + entryDesktop) ); entry.setGroup( "KCM Locale" ); TQString name = entry.readEntry( "Name" ); TQString output = TQString::fromLatin1("%1 (%2)").arg( name ).arg( language ); @@ -305,12 +305,12 @@ ProfileDialog::ProfileDialog( TQWidget * parent, const char * name, bool modal ) setup(); - connect( mListView, TQT_SIGNAL(selectionChanged()), - TQT_SLOT(slotSelectionChanged()) ); - connect( mListView, TQT_SIGNAL(doubleClicked ( TQListViewItem *, const TQPoint &, int ) ), - TQT_SLOT(slotOk()) ); + connect( mListView, TQ_SIGNAL(selectionChanged()), + TQ_SLOT(slotSelectionChanged()) ); + connect( mListView, TQ_SIGNAL(doubleClicked ( TQListViewItem *, const TQPoint &, int ) ), + TQ_SLOT(slotOk()) ); - connect( this, TQT_SIGNAL(finished()), TQT_SLOT(delayedDestruct()) ); + connect( this, TQ_SIGNAL(finished()), TQ_SLOT(delayedDestruct()) ); enableButtonOK( false ); } @@ -375,8 +375,8 @@ ConfigModuleWithTabs::ConfigModuleWithTabs( TQWidget * parent, void ConfigModuleWithTabs::addTab( ConfigModuleTab* tab, const TQString & title ) { mTabWidget->addTab( tab, title ); - connect( tab, TQT_SIGNAL(changed( bool )), - this, TQT_SIGNAL(changed( bool )) ); + connect( tab, TQ_SIGNAL(changed( bool )), + this, TQ_SIGNAL(changed( bool )) ); } void ConfigModuleWithTabs::load() { diff --git a/kmail/configuredialog_p.h b/kmail/configuredialog_p.h index 3d8447a0..7294c96e 100644 --- a/kmail/configuredialog_p.h +++ b/kmail/configuredialog_p.h @@ -17,7 +17,7 @@ #include <tdelistview.h> #include <tdecmodule.h> #include <tdelocale.h> -#include <kdemacros.h> +#include <tdemacros.h> class TQPushButton; class TQLabel; @@ -76,7 +76,7 @@ namespace Kleo { class NewIdentityDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: @@ -122,7 +122,7 @@ typedef TQValueList<LanguageItem> LanguageItemList; class NewLanguageDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: @@ -137,7 +137,7 @@ class NewLanguageDialog : public KDialogBase class LanguageComboBox : public TQComboBox { - Q_OBJECT + TQ_OBJECT public: @@ -154,7 +154,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 ); @@ -176,7 +176,7 @@ private: #include <kdialog.h> class ConfigModule : public TDECModule { - Q_OBJECT + TQ_OBJECT public: ConfigModule( TQWidget * parent=0, const char * name=0 ) @@ -204,7 +204,7 @@ signals: // Individual tab of a ConfigModuleWithTabs class ConfigModuleTab : public TQWidget { - Q_OBJECT + TQ_OBJECT public: ConfigModuleTab( TQWidget *parent=0, const char* name=0 ) @@ -239,7 +239,7 @@ private: * It simply forwards load and save operations to all tabs. */ class ConfigModuleWithTabs : public ConfigModule { - Q_OBJECT + TQ_OBJECT public: ConfigModuleWithTabs( TQWidget * parent=0, const char * name=0 ); @@ -266,8 +266,8 @@ private: // // -class KDE_EXPORT IdentityPage : public ConfigModule { - Q_OBJECT +class TDE_EXPORT IdentityPage : public ConfigModule { + TQ_OBJECT public: IdentityPage( TQWidget * parent=0, const char * name=0 ); @@ -318,7 +318,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 ); @@ -356,7 +356,7 @@ private: class AccountsPageReceivingTab : public ConfigModuleTab { - Q_OBJECT + TQ_OBJECT public: AccountsPageReceivingTab( TQWidget * parent=0, const char * name=0 ); @@ -400,8 +400,8 @@ private: TQValueList< ModifiedAccountsType* > mModifiedAccounts; }; -class KDE_EXPORT AccountsPage : public ConfigModuleWithTabs { - Q_OBJECT +class TDE_EXPORT AccountsPage : public ConfigModuleWithTabs { + TQ_OBJECT public: AccountsPage( TQWidget * parent=0, const char * name=0 ); @@ -429,7 +429,7 @@ private: // class AppearancePageFontsTab : public ConfigModuleTab { - Q_OBJECT + TQ_OBJECT public: AppearancePageFontsTab( TQWidget * parent=0, const char * name=0 ); @@ -457,7 +457,7 @@ private: }; class AppearancePageColorsTab : public ConfigModuleTab { - Q_OBJECT + TQ_OBJECT public: AppearancePageColorsTab( TQWidget * parent=0, const char * name=0 ); @@ -479,7 +479,7 @@ private: }; class AppearancePageLayoutTab : public ConfigModuleTab { - Q_OBJECT + TQ_OBJECT public: AppearancePageLayoutTab( TQWidget * parent=0, const char * name=0 ); @@ -502,7 +502,7 @@ private: // data }; class AppearancePageHeadersTab : public ConfigModuleTab { - Q_OBJECT + TQ_OBJECT public: AppearancePageHeadersTab( TQWidget * parent=0, const char * name=0 ); @@ -529,7 +529,7 @@ private: // data }; class AppearancePageReaderTab : public ConfigModuleTab { - Q_OBJECT + TQ_OBJECT public: AppearancePageReaderTab( TQWidget * parent=0, const char * name=0 ); @@ -561,7 +561,7 @@ private: // data class AppearancePageSystemTrayTab : public ConfigModuleTab { - Q_OBJECT + TQ_OBJECT public: AppearancePageSystemTrayTab( TQWidget * parent=0, const char * name=0 ); @@ -579,8 +579,8 @@ private: // data TQButtonGroup *mSystemTrayGroup; }; -class KDE_EXPORT AppearancePage : public ConfigModuleWithTabs { - Q_OBJECT +class TDE_EXPORT AppearancePage : public ConfigModuleWithTabs { + TQ_OBJECT public: AppearancePage( TQWidget * parent=0, const char * name=0 ); @@ -611,7 +611,7 @@ private: // class ComposerPageGeneralTab : public ConfigModuleTab { - Q_OBJECT + TQ_OBJECT public: ComposerPageGeneralTab( TQWidget * parent=0, const char * name=0 ); @@ -645,7 +645,7 @@ private: }; class ComposerPagePhrasesTab : public ConfigModuleTab { - Q_OBJECT + TQ_OBJECT public: ComposerPagePhrasesTab( TQWidget * parent=0, const char * name=0 ); @@ -677,7 +677,7 @@ private: }; class ComposerPageTemplatesTab : public ConfigModuleTab { - Q_OBJECT + TQ_OBJECT public: ComposerPageTemplatesTab( TQWidget * parent=0, const char * name=0 ); @@ -695,7 +695,7 @@ private: }; class ComposerPageCustomTemplatesTab : public ConfigModuleTab { - Q_OBJECT + TQ_OBJECT public: ComposerPageCustomTemplatesTab( TQWidget * parent=0, const char * name=0 ); @@ -713,7 +713,7 @@ private: }; class ComposerPageSubjectTab : public ConfigModuleTab { - Q_OBJECT + TQ_OBJECT public: ComposerPageSubjectTab( TQWidget * parent=0, const char * name=0 ); @@ -732,7 +732,7 @@ private: }; class ComposerPageCharsetTab : public ConfigModuleTab { - Q_OBJECT + TQ_OBJECT public: ComposerPageCharsetTab( TQWidget * parent=0, const char * name=0 ); @@ -754,7 +754,7 @@ private: }; class ComposerPageHeadersTab : public ConfigModuleTab { - Q_OBJECT + TQ_OBJECT public: ComposerPageHeadersTab( TQWidget * parent=0, const char * name=0 ); @@ -787,7 +787,7 @@ private: }; class ComposerPageAttachmentsTab : public ConfigModuleTab { - Q_OBJECT + TQ_OBJECT public: ComposerPageAttachmentsTab( TQWidget * parent=0, const char * name=0 ); @@ -808,8 +808,8 @@ private: SimpleStringListEditor *mAttachWordsListEditor; }; -class KDE_EXPORT ComposerPage : public ConfigModuleWithTabs { - Q_OBJECT +class TDE_EXPORT ComposerPage : public ConfigModuleWithTabs { + TQ_OBJECT public: ComposerPage( TQWidget * parent=0, const char * name=0 ); @@ -844,7 +844,7 @@ private: // class SecurityPageGeneralTab : public ConfigModuleTab { - Q_OBJECT + TQ_OBJECT public: SecurityPageGeneralTab( TQWidget * parent=0, const char * name=0 ); @@ -870,7 +870,7 @@ private: class SecurityPageComposerCryptoTab : public ConfigModuleTab { - Q_OBJECT + TQ_OBJECT public: SecurityPageComposerCryptoTab( TQWidget * parent=0, const char * name=0 ); @@ -890,7 +890,7 @@ private: }; class SecurityPageWarningTab : public ConfigModuleTab { - Q_OBJECT + TQ_OBJECT public: SecurityPageWarningTab( TQWidget * parent=0, const char * name=0 ); @@ -913,7 +913,7 @@ private: }; class SecurityPageSMimeTab : public ConfigModuleTab, public DCOPObject { - Q_OBJECT + TQ_OBJECT K_DCOP public: @@ -941,7 +941,7 @@ private: class SecurityPageCryptPlugTab : public ConfigModuleTab { - Q_OBJECT + TQ_OBJECT public: SecurityPageCryptPlugTab( TQWidget * parent = 0, const char* name = 0 ); @@ -959,8 +959,8 @@ private: Kleo::BackendConfigWidget * mBackendConfig; }; -class KDE_EXPORT SecurityPage : public ConfigModuleWithTabs { - Q_OBJECT +class TDE_EXPORT SecurityPage : public ConfigModuleWithTabs { + TQ_OBJECT public: SecurityPage( TQWidget * parent=0, const char * name=0 ); @@ -992,7 +992,7 @@ private: // class MiscPageFolderTab : public ConfigModuleTab { - Q_OBJECT + TQ_OBJECT public: MiscPageFolderTab( TQWidget * parent=0, const char * name=0 ); @@ -1023,7 +1023,7 @@ private: }; class MiscPageGroupwareTab : public ConfigModuleTab { - Q_OBJECT + TQ_OBJECT public: MiscPageGroupwareTab( TQWidget * parent=0, const char * name=0 ); @@ -1064,8 +1064,8 @@ private: TQCheckBox* mAutomaticSending; }; -class KDE_EXPORT MiscPage : public ConfigModuleWithTabs { - Q_OBJECT +class TDE_EXPORT MiscPage : public ConfigModuleWithTabs { + TQ_OBJECT public: MiscPage( TQWidget * parent=0, const char * name=0 ); @@ -1086,7 +1086,7 @@ private: // class ListView : public TDEListView { - Q_OBJECT + TQ_OBJECT public: ListView( TQWidget *parent=0, const char *name=0, int visibleItem=10 ); diff --git a/kmail/copyfolderjob.cpp b/kmail/copyfolderjob.cpp index 165d9468..a237db10 100644 --- a/kmail/copyfolderjob.cpp +++ b/kmail/copyfolderjob.cpp @@ -95,8 +95,8 @@ void CopyFolderJob::copyMessagesToTargetDir() slotCopyNextChild(); // no contents, check subfolders } else { KMCommand *command = new KMCopyCommand( mNewFolder, msgList ); - connect( command, TQT_SIGNAL( completed( KMCommand * ) ), - this, TQT_SLOT( slotCopyCompleted( KMCommand * ) ) ); + connect( command, TQ_SIGNAL( completed( KMCommand * ) ), + this, TQ_SLOT( slotCopyCompleted( KMCommand * ) ) ); command->start(); } } @@ -104,8 +104,8 @@ void CopyFolderJob::copyMessagesToTargetDir() void CopyFolderJob::slotCopyCompleted( KMCommand* command ) { kdDebug(5006) << k_funcinfo << (command?command->result():0) << endl; - disconnect( command, TQT_SIGNAL( completed( KMCommand * ) ), - this, TQT_SLOT( slotCopyCompleted( KMCommand * ) ) ); + disconnect( command, TQ_SIGNAL( completed( KMCommand * ) ), + this, TQ_SLOT( slotCopyCompleted( KMCommand * ) ) ); mStorage->blockSignals( false ); @@ -160,8 +160,8 @@ void CopyFolderJob::slotCopyNextChild( bool success ) // let it do its thing and report back when we are ready to do the next sibling mNextChildFolder->open( "copyfolder" ); // refcount FolderJob* job = new CopyFolderJob( mNextChildFolder->storage(), dir); - connect( job, TQT_SIGNAL( folderCopyComplete( bool ) ), - this, TQT_SLOT( slotCopyNextChild( bool ) ) ); + connect( job, TQ_SIGNAL( folderCopyComplete( bool ) ), + this, TQ_SLOT( slotCopyNextChild( bool ) ) ); job->start(); } @@ -194,8 +194,8 @@ bool CopyFolderJob::createTargetDir() TQString imapPath; imapPath = anAccount->createImapPath( selectedStorage->imapPath(), mStorage->folder()->name() ); KMFolderImap* newStorage = static_cast<KMFolderImap*>( mNewFolder->storage() ); - connect( selectedStorage, TQT_SIGNAL(folderCreationResult(const TQString&, bool)), - this, TQT_SLOT(folderCreationDone(const TQString&, bool)) ); + connect( selectedStorage, TQ_SIGNAL(folderCreationResult(const TQString&, bool)), + this, TQ_SLOT(folderCreationDone(const TQString&, bool)) ); selectedStorage->createFolder(mStorage->folder()->name(), TQString()); // create it on the server newStorage->initializeFrom( selectedStorage, imapPath, TQString() ); static_cast<KMFolderImap*>(mNewParent->owner()->storage())->setAccount( selectedStorage->account() ); diff --git a/kmail/copyfolderjob.h b/kmail/copyfolderjob.h index 02f05d2d..43f08ec3 100644 --- a/kmail/copyfolderjob.h +++ b/kmail/copyfolderjob.h @@ -49,7 +49,7 @@ namespace KMail { */ class CopyFolderJob : public FolderJob { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/kmail/customtemplates.cpp b/kmail/customtemplates.cpp index 5daf001d..4d4080ed 100644 --- a/kmail/customtemplates.cpp +++ b/kmail/customtemplates.cpp @@ -68,29 +68,29 @@ CustomTemplates::CustomTemplates( TQWidget *parent, const char *name ) mEditFrame->setEnabled( false ); - connect( mName, TQT_SIGNAL( textChanged ( const TQString &) ), - this, TQT_SLOT( slotNameChanged( const TQString & ) ) ); - connect( mEdit, TQT_SIGNAL( textChanged() ), - this, TQT_SLOT( slotTextChanged( void ) ) ); - connect( mToEdit, TQT_SIGNAL( textChanged(const TQString&) ), - this, TQT_SLOT( slotTextChanged( void ) ) ); - connect( mCCEdit, TQT_SIGNAL( textChanged(const TQString&) ), - this, TQT_SLOT( slotTextChanged( void ) ) ); - - connect( mInsertCommand, TQT_SIGNAL( insertCommand(TQString, int) ), - this, TQT_SLOT( slotInsertCommand(TQString, int) ) ); - - connect( mAdd, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( slotAddClicked() ) ); - connect( mRemove, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( slotRemoveClicked() ) ); - connect( mList, TQT_SIGNAL( selectionChanged() ), - this, TQT_SLOT( slotListSelectionChanged() ) ); - connect( mType, TQT_SIGNAL( activated( int ) ), - this, TQT_SLOT( slotTypeActivated( int ) ) ); - - connect( mKeyButton, TQT_SIGNAL( capturedShortcut( const TDEShortcut& ) ), - this, TQT_SLOT( slotShortcutCaptured( const TDEShortcut& ) ) ); + connect( mName, TQ_SIGNAL( textChanged ( const TQString &) ), + this, TQ_SLOT( slotNameChanged( const TQString & ) ) ); + connect( mEdit, TQ_SIGNAL( textChanged() ), + this, TQ_SLOT( slotTextChanged( void ) ) ); + connect( mToEdit, TQ_SIGNAL( textChanged(const TQString&) ), + this, TQ_SLOT( slotTextChanged( void ) ) ); + connect( mCCEdit, TQ_SIGNAL( textChanged(const TQString&) ), + this, TQ_SLOT( slotTextChanged( void ) ) ); + + connect( mInsertCommand, TQ_SIGNAL( insertCommand(TQString, int) ), + this, TQ_SLOT( slotInsertCommand(TQString, int) ) ); + + connect( mAdd, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( slotAddClicked() ) ); + connect( mRemove, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( slotRemoveClicked() ) ); + connect( mList, TQ_SIGNAL( selectionChanged() ), + this, TQ_SLOT( slotListSelectionChanged() ) ); + connect( mType, TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( slotTypeActivated( int ) ) ); + + connect( mKeyButton, TQ_SIGNAL( capturedShortcut( const TDEShortcut& ) ), + this, TQ_SLOT( slotShortcutCaptured( const TDEShortcut& ) ) ); mReplyPix = TDEIconLoader().loadIcon( "mail-reply-sender", TDEIcon::Small ); mReplyAllPix = TDEIconLoader().loadIcon( "mail-reply-all", TDEIcon::Small ); diff --git a/kmail/customtemplates.h b/kmail/customtemplates.h index b117dd69..e8bca882 100644 --- a/kmail/customtemplates.h +++ b/kmail/customtemplates.h @@ -34,7 +34,7 @@ class TDEShortcut; class CustomTemplates : public CustomTemplatesBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/kmail/customtemplates_base.ui b/kmail/customtemplates_base.ui index 82d477b5..2d0d7796 100644 --- a/kmail/customtemplates_base.ui +++ b/kmail/customtemplates_base.ui @@ -351,10 +351,10 @@ <data format="PNG" length="1002">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b000003b149444154388dad945f4c5b551cc73fe7dc4b7b4bcba0762d45c43114323599ee6192609c51d883892ce083f1718b3ebb185f8dc91e972cf39d2d2a2f1af664b6f1e0fe3863a0718969700eb0c52142da0242a1bd6d696f7bcff101585203ceb8fd9ece39f99dcff9fe7edf939f88c562ec465f5f9fe609442c161362173c3e3eae7b7a7ac8e7f36432196cdbfe4f907c3e4f2291201e8fe338cec3737357e9e8e828aded1e229d650e1f2d51754b082110124c13a4dc5ea341eb9dc284c0558a853f3ce8cb0677ef500fde7d39d2596679e326597b8e9abb85d7a770ab16ab6983ec5a05b487a70e36f0f4e10afe408d6a558310980108478dba4a1e8233990c5d474b64ed39aa3a8fe5f3317fbf81dbd70bccfeb205947632fd74f6589c1c6ea2f70d03a58ba0c1f2c9bdc1b66de3b8256a6e11cbe7e3ee1d181b590124fe2693aeee08d223c82c3a2c24b7b874bec8f26288774f7bd054504aef0dde6e99c0eb83f9fb266323cb80a27fb0958141836044605a2ee5523393371cc646fee2da37195aa35d0c0c5b4859ac03d7e91712dcaac5adab3650a3ff9d08ef7dd8404bb48869e5d958b5b87dadc4c9a1464e9f0d0326df7ebd86bd2e310cb1bf62d384d59441f2d70a070e1c60e09489929b988681bdd9cc97170bcc4c65595f71f8e0e3301337fc24a7732467831875a47f289652b0be5e4151e6d07316c1b0c0340d8ab92023e76d66a6b2840e36d2fb7a13fee632475e6edc367ea98a90fb98b7dd6310ca0328a44761582e1bab41befabcc0ec940d28bc5e93b68e064cab84e1d9beaeb48934eac1f53b01c1b000fca496aa54b61a99fcde61662a4b4b4b23d1680be9d426173e4df3602a48ea411989a4fd590f52a8fd156b05ed9d350e3defe3cfdf4b4c7ce770ea7d3fb9f520afbe1620daeee5c26735d20b9b9cfb6811a754a439e4e5c5639a4caa1e5caf586bfc0197b78702005cb9b4cae4cd3267ce8638fe964bd72b393e39d74928d242617303a756a37f284447770dcdbffc6384a05a85de1306e9a52057c7527c7131c3c42d3f475eb2303c82d4fc3276d6811db37efeb148723082d9b08f79f97c1e5729109a9a28307cc622d2d6cdf52b2b24efe548dedb00142009862cfa879ee1a71f6cec928353511472fbf4389148b0b0e0c108081412458dfe21c9f11351e67e7358595468246d1d1e5e38a6e9e851bc39d84ab502a669331dafec0d8ec7e3e8cb06e1a881d727d1ae40180a434a8c9db129a54126ad48a7358c2b4c5352c8c374bcccdab2bb37d8719cba79fab8211f9df218e0582c261e95f8bfc04f1a1e8bc5c4dfe0a190172af6a9690000000049454e44ae426082</data> </image> </images> -<Q_SLOTS> +<slots> <slot>mAdd_clicked()</slot> <slot>mRemove_clicked()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">kactivelabel.h</include> diff --git a/kmail/dictionarycombobox.cpp b/kmail/dictionarycombobox.cpp index be705d3d..b6da5abf 100644 --- a/kmail/dictionarycombobox.cpp +++ b/kmail/dictionarycombobox.cpp @@ -48,10 +48,10 @@ namespace KMail { mDefaultDictionary( 0 ) { reloadCombo(); - connect( this, TQT_SIGNAL( activated( int ) ), - this, TQT_SLOT( slotDictionaryChanged( int ) ) ); - connect( this, TQT_SIGNAL( dictionaryChanged( int ) ), - mSpellConfig, TQT_SLOT( sSetDictionary( int ) ) ); + connect( this, TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( slotDictionaryChanged( int ) ) ); + connect( this, TQ_SIGNAL( dictionaryChanged( int ) ), + mSpellConfig, TQ_SLOT( sSetDictionary( int ) ) ); } DictionaryComboBox::~DictionaryComboBox() diff --git a/kmail/dictionarycombobox.h b/kmail/dictionarycombobox.h index a6d3584a..101b86e7 100644 --- a/kmail/dictionarycombobox.h +++ b/kmail/dictionarycombobox.h @@ -46,7 +46,7 @@ namespace KMail { **/ class DictionaryComboBox : public TQComboBox { - Q_OBJECT + TQ_OBJECT public: DictionaryComboBox( TQWidget * parent=0, const char * name=0 ); diff --git a/kmail/editorwatcher.cpp b/kmail/editorwatcher.cpp index a7f25c3b..defa47df 100644 --- a/kmail/editorwatcher.cpp +++ b/kmail/editorwatcher.cpp @@ -24,7 +24,7 @@ #include <tdelocale.h> #include <tdemessagebox.h> #include <kopenwith.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <kuserprofile.h> #include <tqsocketnotifier.h> @@ -63,7 +63,7 @@ EditorWatcher::EditorWatcher(const KURL & url, const TQString &mimeType, bool op mDone( false ) { assert( mUrl.isLocalFile() ); - connect( &mTimer, TQT_SIGNAL(timeout()), TQT_SLOT(checkEditDone()) ); + connect( &mTimer, TQ_SIGNAL(timeout()), TQ_SLOT(checkEditDone()) ); } bool EditorWatcher::start() @@ -88,7 +88,7 @@ bool EditorWatcher::start() mInotifyWatch = inotify_add_watch( mInotifyFd, mUrl.path().latin1(), IN_CLOSE | IN_OPEN | IN_MODIFY ); if ( mInotifyWatch >= 0 ) { TQSocketNotifier *sn = new TQSocketNotifier( mInotifyFd, TQSocketNotifier::Read, this ); - connect( sn, TQT_SIGNAL(activated(int)), TQT_SLOT(inotifyEvent()) ); + connect( sn, TQ_SIGNAL(activated(int)), TQ_SLOT(inotifyEvent()) ); mHaveInotify = true; mFileModified = false; } @@ -101,7 +101,7 @@ bool EditorWatcher::start() TQStringList params = KRun::processDesktopExec( *offer, list, false ); mEditor = new TDEProcess( this ); *mEditor << params; - connect( mEditor, TQT_SIGNAL(processExited(TDEProcess*)), TQT_SLOT(editorExited()) ); + connect( mEditor, TQ_SIGNAL(processExited(TDEProcess*)), TQ_SLOT(editorExited()) ); if ( !mEditor->start() ) return false; mEditorRunning = true; diff --git a/kmail/editorwatcher.h b/kmail/editorwatcher.h index 9a408d69..9d85a061 100644 --- a/kmail/editorwatcher.h +++ b/kmail/editorwatcher.h @@ -37,7 +37,7 @@ namespace KMail { */ class EditorWatcher : public TQObject { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/kmail/expirejob.cpp b/kmail/expirejob.cpp index a3749947..b38ad294 100644 --- a/kmail/expirejob.cpp +++ b/kmail/expirejob.cpp @@ -107,7 +107,7 @@ void ExpireJob::execute() mFolderOpen = true; mCurrentIndex = storage->count()-1; kdDebug(5006) << "ExpireJob: starting to expire in folder " << mSrcFolder->location() << endl; - connect( &mTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotDoWork() ) ); + connect( &mTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( slotDoWork() ) ); mTimer.start( EXPIREJOB_TIMERINTERVAL ); slotDoWork(); // do nothing here, we might be deleted! @@ -169,8 +169,8 @@ void ExpireJob::done() << mSrcFolder->location() << " " << count << " messages to remove." << endl; KMMoveCommand* cmd = new KMMoveCommand( 0, mRemovedMsgs ); - connect( cmd, TQT_SIGNAL( completed( KMCommand * ) ), - this, TQT_SLOT( slotMessagesMoved( KMCommand * ) ) ); + connect( cmd, TQ_SIGNAL( completed( KMCommand * ) ), + this, TQ_SLOT( slotMessagesMoved( KMCommand * ) ) ); cmd->start(); moving = true; str = i18n( "Removing 1 old message from folder %1...", @@ -191,8 +191,8 @@ void ExpireJob::done() << mRemovedMsgs.count() << " messages to move to " << mMoveToFolder->label() << endl; KMMoveCommand* cmd = new KMMoveCommand( mMoveToFolder, mRemovedMsgs ); - connect( cmd, TQT_SIGNAL( completed( KMCommand * ) ), - this, TQT_SLOT( slotMessagesMoved( KMCommand * ) ) ); + connect( cmd, TQ_SIGNAL( completed( KMCommand * ) ), + this, TQ_SLOT( slotMessagesMoved( KMCommand * ) ) ); cmd->start(); moving = true; str = i18n( "Moving 1 old message from folder %1 to folder %2...", diff --git a/kmail/expirejob.h b/kmail/expirejob.h index dbdb6a3a..4371ed0f 100644 --- a/kmail/expirejob.h +++ b/kmail/expirejob.h @@ -35,7 +35,7 @@ namespace KMail { class ExpireJob : public ScheduledJob { - Q_OBJECT + TQ_OBJECT public: ExpireJob( KMFolder* folder, bool immediate ); diff --git a/kmail/expirypropertiesdialog.cpp b/kmail/expirypropertiesdialog.cpp index f1c3274f..76e8d219 100644 --- a/kmail/expirypropertiesdialog.cpp +++ b/kmail/expirypropertiesdialog.cpp @@ -44,8 +44,8 @@ ExpiryPropertiesDialog::ExpiryPropertiesDialog( KMFolderTree* tree, KMFolder* fo expireReadMailCB = new TQCheckBox( privateLayoutWidget, "expireReadMailCB" ); expireReadMailCB->setText( i18n( "Expire read mails after" ) ); - connect( expireReadMailCB, TQT_SIGNAL( toggled( bool )), - this, TQT_SLOT( slotUpdateControls() ) ); + connect( expireReadMailCB, TQ_SIGNAL( toggled( bool )), + this, TQ_SLOT( slotUpdateControls() ) ); readHBox->addWidget( expireReadMailCB ); expireReadMailSB = new TQSpinBox( privateLayoutWidget, "expireReadMailSB" ); @@ -62,8 +62,8 @@ ExpiryPropertiesDialog::ExpiryPropertiesDialog( KMFolderTree* tree, KMFolder* fo expireUnreadMailCB = new TQCheckBox( privateLayoutWidget, "expireUnreadMailCB" ); expireUnreadMailCB->setText( i18n( "Expire unread mails after" ) ); - connect( expireUnreadMailCB, TQT_SIGNAL( toggled( bool )), - this, TQT_SLOT( slotUpdateControls() ) ); + connect( expireUnreadMailCB, TQ_SIGNAL( toggled( bool )), + this, TQ_SLOT( slotUpdateControls() ) ); unreadHBox->addWidget( expireUnreadMailCB ); expireUnreadMailSB = new TQSpinBox( privateLayoutWidget, "expireUnreadMailSB" ); @@ -92,8 +92,8 @@ ExpiryPropertiesDialog::ExpiryPropertiesDialog( KMFolderTree* tree, KMFolder* fo moveToRB = new TQRadioButton( privateLayoutWidget, "moveToRB" ); actionsGroup->insert( moveToRB ); - connect( moveToRB, TQT_SIGNAL( toggled( bool ) ), - this, TQT_SLOT( slotUpdateControls() ) ); + connect( moveToRB, TQ_SIGNAL( toggled( bool ) ), + this, TQ_SLOT( slotUpdateControls() ) ); moveToRB->setText( i18n( "Move to:" ) ); moveToHBox->addWidget( moveToRB ); diff --git a/kmail/expirypropertiesdialog.h b/kmail/expirypropertiesdialog.h index b50a73db..36e11a7f 100644 --- a/kmail/expirypropertiesdialog.h +++ b/kmail/expirypropertiesdialog.h @@ -32,7 +32,7 @@ namespace KMail { class ExpiryPropertiesDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/kmail/favoritefolderview.cpp b/kmail/favoritefolderview.cpp index 22d093aa..6e6c56bf 100644 --- a/kmail/favoritefolderview.cpp +++ b/kmail/favoritefolderview.cpp @@ -55,15 +55,15 @@ FavoriteFolderViewItem::FavoriteFolderViewItem(FavoriteFolderView * parent, cons { // same stuff as in KMFolderTreeItem again, this time even with virtual methods working init(); - connect( folder, TQT_SIGNAL(nameChanged()), TQT_SLOT(nameChanged()) ); - connect( folder, TQT_SIGNAL(iconsChanged()), TQT_SLOT(slotIconsChanged()) ); + connect( folder, TQ_SIGNAL(nameChanged()), TQ_SLOT(nameChanged()) ); + connect( folder, TQ_SIGNAL(iconsChanged()), TQ_SLOT(slotIconsChanged()) ); - connect( folder, TQT_SIGNAL(msgAdded(KMFolder*,TQ_UINT32)), TQT_SLOT(updateCount()) ); - connect( folder, TQT_SIGNAL(numUnreadMsgsChanged(KMFolder*)), TQT_SLOT(updateCount()) ); - connect( folder, TQT_SIGNAL(msgRemoved(KMFolder*)), TQT_SLOT(updateCount()) ); - connect( folder, TQT_SIGNAL(folderSizeChanged( KMFolder* )), TQT_SLOT(updateCount()) ); + connect( folder, TQ_SIGNAL(msgAdded(KMFolder*,TQ_UINT32)), TQ_SLOT(updateCount()) ); + connect( folder, TQ_SIGNAL(numUnreadMsgsChanged(KMFolder*)), TQ_SLOT(updateCount()) ); + connect( folder, TQ_SIGNAL(msgRemoved(KMFolder*)), TQ_SLOT(updateCount()) ); + connect( folder, TQ_SIGNAL(folderSizeChanged( KMFolder* )), TQ_SLOT(updateCount()) ); - TQTimer::singleShot( 0, this, TQT_SLOT(updateCount()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(updateCount()) ); if ( unreadCount() > 0 ) setPixmap( 0, unreadIcon( iconSize() ) ); @@ -97,23 +97,23 @@ FavoriteFolderView::FavoriteFolderView( KMMainWidget *mainWidget, TQWidget * par setSorting( -1 ); setShowSortIndicator( false ); - connect( this, TQT_SIGNAL(selectionChanged()), TQT_SLOT(selectionChanged()) ); - connect( this, TQT_SIGNAL(clicked(TQListViewItem*)), TQT_SLOT(itemClicked(TQListViewItem*)) ); - connect( this, TQT_SIGNAL(dropped(TQDropEvent*,TQListViewItem*)), TQT_SLOT(dropped(TQDropEvent*,TQListViewItem*)) ); - connect( this, TQT_SIGNAL(contextMenuRequested(TQListViewItem*, const TQPoint &, int)), - TQT_SLOT(contextMenu(TQListViewItem*,const TQPoint&)) ); - connect( this, TQT_SIGNAL(moved()), TQT_SLOT(notifyInstancesOnChange()) ); - connect( this, TQT_SIGNAL(triggerRefresh()), TQT_SLOT(refresh()) ); + connect( this, TQ_SIGNAL(selectionChanged()), TQ_SLOT(selectionChanged()) ); + connect( this, TQ_SIGNAL(clicked(TQListViewItem*)), TQ_SLOT(itemClicked(TQListViewItem*)) ); + connect( this, TQ_SIGNAL(dropped(TQDropEvent*,TQListViewItem*)), TQ_SLOT(dropped(TQDropEvent*,TQListViewItem*)) ); + connect( this, TQ_SIGNAL(contextMenuRequested(TQListViewItem*, const TQPoint &, int)), + TQ_SLOT(contextMenu(TQListViewItem*,const TQPoint&)) ); + connect( this, TQ_SIGNAL(moved()), TQ_SLOT(notifyInstancesOnChange()) ); + connect( this, TQ_SIGNAL(triggerRefresh()), TQ_SLOT(refresh()) ); - connect( kmkernel->folderMgr(), TQT_SIGNAL(changed()), TQT_SLOT(initializeFavorites()) ); - connect( kmkernel->dimapFolderMgr(), TQT_SIGNAL(changed()), TQT_SLOT(initializeFavorites()) ); - connect( kmkernel->imapFolderMgr(), TQT_SIGNAL(changed()), TQT_SLOT(initializeFavorites()) ); - connect( kmkernel->searchFolderMgr(), TQT_SIGNAL(changed()), TQT_SLOT(initializeFavorites()) ); + connect( kmkernel->folderMgr(), TQ_SIGNAL(changed()), TQ_SLOT(initializeFavorites()) ); + connect( kmkernel->dimapFolderMgr(), TQ_SIGNAL(changed()), TQ_SLOT(initializeFavorites()) ); + connect( kmkernel->imapFolderMgr(), TQ_SIGNAL(changed()), TQ_SLOT(initializeFavorites()) ); + connect( kmkernel->searchFolderMgr(), TQ_SIGNAL(changed()), TQ_SLOT(initializeFavorites()) ); - connect( kmkernel->folderMgr(), TQT_SIGNAL(folderRemoved(KMFolder*)), TQT_SLOT(folderRemoved(KMFolder*)) ); - connect( kmkernel->dimapFolderMgr(), TQT_SIGNAL(folderRemoved(KMFolder*)), TQT_SLOT(folderRemoved(KMFolder*)) ); - connect( kmkernel->imapFolderMgr(), TQT_SIGNAL(folderRemoved(KMFolder*)), TQT_SLOT(folderRemoved(KMFolder*)) ); - connect( kmkernel->searchFolderMgr(), TQT_SIGNAL(folderRemoved(KMFolder*)), TQT_SLOT(folderRemoved(KMFolder*)) ); + connect( kmkernel->folderMgr(), TQ_SIGNAL(folderRemoved(KMFolder*)), TQ_SLOT(folderRemoved(KMFolder*)) ); + connect( kmkernel->dimapFolderMgr(), TQ_SIGNAL(folderRemoved(KMFolder*)), TQ_SLOT(folderRemoved(KMFolder*)) ); + connect( kmkernel->imapFolderMgr(), TQ_SIGNAL(folderRemoved(KMFolder*)), TQ_SLOT(folderRemoved(KMFolder*)) ); + connect( kmkernel->searchFolderMgr(), TQ_SIGNAL(folderRemoved(KMFolder*)), TQ_SLOT(folderRemoved(KMFolder*)) ); TQFont f = font(); f.setItalic( true ); @@ -153,7 +153,7 @@ void FavoriteFolderView::readConfig() ensureItemVisible( firstChild() ); // folder tree is not yet populated at this point - TQTimer::singleShot( 0, this, TQT_SLOT(initializeFavorites()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(initializeFavorites()) ); readColorConfig(); mReadingConfig = false; @@ -222,7 +222,7 @@ void FavoriteFolderView::handleGroupwareFolder( KMFolderTreeItem *fti ) TQByteArray arg; TQDataStream s( arg, IO_WriteOnly ); s << TQString( "kontact_knotesplugin" ); - kapp->dcopClient()->send( "kontact", "KontactIface", "selectPlugin(TQString)", arg ); + tdeApp->dcopClient()->send( "kontact", "KontactIface", "selectPlugin(TQString)", arg ); break; } case KMail::ContentsTypeCalendar: @@ -241,7 +241,7 @@ void FavoriteFolderView::handleGroupwareFolder( KMFolderTreeItem *fti ) s << TQString( "kontact_journalplugin" ); break; default: assert( false ); } - kapp->dcopClient()->send( "kontact", "KontactIface", "selectPlugin(TQString)", arg ); + tdeApp->dcopClient()->send( "kontact", "KontactIface", "selectPlugin(TQString)", arg ); break; } default: break; @@ -334,18 +334,18 @@ void FavoriteFolderView::contextMenu(TQListViewItem * item, const TQPoint & poin mainWidget()->action("empty")->plug( &contextMenu ); contextMenu.insertSeparator(); - contextMenu.insertItem( SmallIconSet("configure_shortcuts"), i18n("&Assign Shortcut..."), fti, TQT_SLOT(assignShortcut()) ); - contextMenu.insertItem( i18n("Expire..."), fti, TQT_SLOT(slotShowExpiryProperties()) ); + contextMenu.insertItem( SmallIconSet("configure_shortcuts"), i18n("&Assign Shortcut..."), fti, TQ_SLOT(assignShortcut()) ); + contextMenu.insertItem( i18n("Expire..."), fti, TQ_SLOT(slotShowExpiryProperties()) ); mainWidget()->action("modify")->plug( &contextMenu ); contextMenu.insertSeparator(); contextMenu.insertItem( SmallIconSet("edit-delete"), i18n("Remove From Favorites"), - this, TQT_SLOT(removeFolder()) ); - contextMenu.insertItem( SmallIconSet("edit"), i18n("Rename Favorite"), this, TQT_SLOT(renameFolder()) ); + this, TQ_SLOT(removeFolder()) ); + contextMenu.insertItem( SmallIconSet("edit"), i18n("Rename Favorite"), this, TQ_SLOT(renameFolder()) ); } else { contextMenu.insertItem( SmallIconSet("bookmark_add"), i18n("Add Favorite Folder..."), - this, TQT_SLOT(addFolder()) ); + this, TQ_SLOT(addFolder()) ); } contextMenu.exec( point, 0 ); } diff --git a/kmail/favoritefolderview.h b/kmail/favoritefolderview.h index 19fd49a9..604c5e44 100644 --- a/kmail/favoritefolderview.h +++ b/kmail/favoritefolderview.h @@ -27,7 +27,7 @@ class FavoriteFolderView; class FavoriteFolderViewItem : public KMFolderTreeItem { - Q_OBJECT + TQ_OBJECT public: FavoriteFolderViewItem( FavoriteFolderView *parent, const TQString & name, KMFolder* folder ); @@ -45,7 +45,7 @@ class FavoriteFolderViewItem : public KMFolderTreeItem class FavoriteFolderView : public FolderTreeBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/kmail/filehtmlwriter.cpp b/kmail/filehtmlwriter.cpp index abad6420..8c74ebb6 100644 --- a/kmail/filehtmlwriter.cpp +++ b/kmail/filehtmlwriter.cpp @@ -96,7 +96,7 @@ namespace KMail { if ( !mFile.open( IO_WriteOnly ) ) kdWarning( 5006 ) << "FileHtmlWriter: Cannot open file " << mFile.name() << endl; else - mStream.setDevice( &TQT_TQIODEVICE_OBJECT(mFile) ); + mStream.setDevice( &mFile ); } void FileHtmlWriter::embedPart( const TQCString & contentId, const TQString & url ) { diff --git a/kmail/filterimporterexporter.cpp b/kmail/filterimporterexporter.cpp index df91b8dc..6703ef1d 100644 --- a/kmail/filterimporterexporter.cpp +++ b/kmail/filterimporterexporter.cpp @@ -66,8 +66,8 @@ FilterSelectionDialog::FilterSelectionDialog( TQWidget * parent ) buttonLayout->addWidget( selectAllButton ); unselectAllButton = new KPushButton( i18n( "Unselect All" ), w ); buttonLayout->addWidget( unselectAllButton ); - connect( selectAllButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotSelectAllButton() ) ); - connect( unselectAllButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotUnselectAllButton() ) ); + connect( selectAllButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotSelectAllButton() ) ); + connect( unselectAllButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotUnselectAllButton() ) ); resize( 300, 350 ); } diff --git a/kmail/filterimporterexporter.h b/kmail/filterimporterexporter.h index 37f4aab9..fcdf1765 100644 --- a/kmail/filterimporterexporter.h +++ b/kmail/filterimporterexporter.h @@ -67,7 +67,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 6e84d6f1..432be2f4 100644 --- a/kmail/filterlog.h +++ b/kmail/filterlog.h @@ -52,7 +52,7 @@ namespace KMail { */ class FilterLog : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/kmail/filterlogdlg.cpp b/kmail/filterlogdlg.cpp index eaaefd79..6ea6e29d 100644 --- a/kmail/filterlogdlg.cpp +++ b/kmail/filterlogdlg.cpp @@ -73,8 +73,8 @@ FilterLogDialog::FilterLogDialog( TQWidget * parent ) mLogActiveBox = new TQCheckBox( i18n("&Log filter activities"), page ); mLogActiveBox->setChecked( FilterLog::instance()->isLogging() ); - connect( mLogActiveBox, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotSwitchLogState(void)) ); + connect( mLogActiveBox, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotSwitchLogState(void)) ); TQWhatsThis::add( mLogActiveBox, i18n( "You can turn logging of filter activities on and off here. " "Of course, log data is collected and shown only when logging " @@ -82,15 +82,15 @@ FilterLogDialog::FilterLogDialog( TQWidget * parent ) mLogDetailsBox = new TQVGroupBox( i18n( "Logging Details" ), page ); mLogDetailsBox->setEnabled( mLogActiveBox->isChecked() ); - connect( mLogActiveBox, TQT_SIGNAL( toggled( bool ) ), - mLogDetailsBox, TQT_SLOT( setEnabled( bool ) ) ); + connect( mLogActiveBox, TQ_SIGNAL( toggled( bool ) ), + mLogDetailsBox, TQ_SLOT( setEnabled( bool ) ) ); mLogPatternDescBox = new TQCheckBox( i18n("Log pattern description"), mLogDetailsBox ); mLogPatternDescBox->setChecked( FilterLog::instance()->isContentTypeEnabled( FilterLog::patternDesc ) ); - connect( mLogPatternDescBox, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotChangeLogDetail(void)) ); + connect( mLogPatternDescBox, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotChangeLogDetail(void)) ); // TODO //TQWhatsThis::add( mLogPatternDescBox, // i18n( "" ) ); @@ -99,8 +99,8 @@ FilterLogDialog::FilterLogDialog( TQWidget * parent ) mLogDetailsBox ); mLogRuleEvaluationBox->setChecked( FilterLog::instance()->isContentTypeEnabled( FilterLog::ruleResult ) ); - connect( mLogRuleEvaluationBox, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotChangeLogDetail(void)) ); + connect( mLogRuleEvaluationBox, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotChangeLogDetail(void)) ); TQWhatsThis::add( mLogRuleEvaluationBox, i18n( "You can control the feedback in the log concerning the " "evaluation of the filter rules of applied filters: " @@ -113,8 +113,8 @@ FilterLogDialog::FilterLogDialog( TQWidget * parent ) mLogDetailsBox ); mLogPatternResultBox->setChecked( FilterLog::instance()->isContentTypeEnabled( FilterLog::patternResult ) ); - connect( mLogPatternResultBox, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotChangeLogDetail(void)) ); + connect( mLogPatternResultBox, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotChangeLogDetail(void)) ); // TODO //TQWhatsThis::add( mLogPatternResultBox, // i18n( "" ) ); @@ -123,8 +123,8 @@ FilterLogDialog::FilterLogDialog( TQWidget * parent ) mLogDetailsBox ); mLogFilterActionBox->setChecked( FilterLog::instance()->isContentTypeEnabled( FilterLog::appliedAction ) ); - connect( mLogFilterActionBox, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotChangeLogDetail(void)) ); + connect( mLogFilterActionBox, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotChangeLogDetail(void)) ); // TODO //TQWhatsThis::add( mLogFilterActionBox, // i18n( "" ) ); @@ -138,8 +138,8 @@ FilterLogDialog::FilterLogDialog( TQWidget * parent ) mLogMemLimitSpin->setValue( FilterLog::instance()->getMaxLogSize() / 1024 ); mLogMemLimitSpin->setSuffix( " KB" ); mLogMemLimitSpin->setSpecialValueText( i18n("unlimited") ); - connect( mLogMemLimitSpin, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(slotChangeLogMemLimit(int)) ); + connect( mLogMemLimitSpin, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(slotChangeLogMemLimit(int)) ); TQWhatsThis::add( mLogMemLimitSpin, i18n( "Collecting log data uses memory to temporarily store the " "log data; here you can limit the maximum amount of memory " @@ -147,12 +147,12 @@ FilterLogDialog::FilterLogDialog( TQWidget * parent ) "this limit then the oldest data will be discarded until " "the limit is no longer exceeded. " ) ); - connect(FilterLog::instance(), TQT_SIGNAL(logEntryAdded(TQString)), - this, TQT_SLOT(slotLogEntryAdded(TQString))); - connect(FilterLog::instance(), TQT_SIGNAL(logShrinked(void)), - this, TQT_SLOT(slotLogShrinked(void))); - connect(FilterLog::instance(), TQT_SIGNAL(logStateChanged(void)), - this, TQT_SLOT(slotLogStateChanged(void))); + connect(FilterLog::instance(), TQ_SIGNAL(logEntryAdded(TQString)), + this, TQ_SLOT(slotLogEntryAdded(TQString))); + connect(FilterLog::instance(), TQ_SIGNAL(logShrinked(void)), + this, TQ_SLOT(slotLogShrinked(void))); + connect(FilterLog::instance(), TQ_SIGNAL(logStateChanged(void)), + this, TQ_SLOT(slotLogStateChanged(void))); setInitialSize( TQSize( 500, 500 ) ); #if !KDE_IS_VERSION( 3, 2, 91 ) diff --git a/kmail/filterlogdlg.h b/kmail/filterlogdlg.h index d7b6a6dc..88daaf47 100644 --- a/kmail/filterlogdlg.h +++ b/kmail/filterlogdlg.h @@ -47,7 +47,7 @@ namespace KMail { */ class FilterLogDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/kmail/folderIface.h b/kmail/folderIface.h index c8593d2c..37e6edff 100644 --- a/kmail/folderIface.h +++ b/kmail/folderIface.h @@ -42,7 +42,7 @@ namespace KMail { class FolderIface : public TQObject, public DCOPObject { - Q_OBJECT + TQ_OBJECT // K_DCOP diff --git a/kmail/folderdiaacltab.cpp b/kmail/folderdiaacltab.cpp index 43d15a51..94cf2d48 100644 --- a/kmail/folderdiaacltab.cpp +++ b/kmail/folderdiaacltab.cpp @@ -117,9 +117,9 @@ KMail::ACLEntryDialog::ACLEntryDialog( IMAPUserIdFormat userIdFormat, const TQSt TQLabel *noteLabel = new TQLabel( i18n( "<b>Note: </b>Renaming requires write permissions on the parent folder." ), page ); topLayout->addMultiCellWidget( noteLabel, 2, 2, 0, 2 ); - connect( mUserIdLineEdit, TQT_SIGNAL( textChanged( const TQString& ) ), TQT_SLOT( slotChanged() ) ); - connect( kabBtn, TQT_SIGNAL( clicked() ), TQT_SLOT( slotSelectAddresses() ) ); - connect( mButtonGroup, TQT_SIGNAL( clicked( int ) ), TQT_SLOT( slotChanged() ) ); + connect( mUserIdLineEdit, TQ_SIGNAL( textChanged( const TQString& ) ), TQ_SLOT( slotChanged() ) ); + connect( kabBtn, TQ_SIGNAL( clicked() ), TQ_SLOT( slotSelectAddresses() ) ); + connect( mButtonGroup, TQ_SIGNAL( clicked( int ) ), TQ_SLOT( slotChanged() ) ); enableButtonOK( false ); mUserIdLineEdit->setFocus(); @@ -338,12 +338,12 @@ KMail::FolderDiaACLTab::FolderDiaACLTab( KMFolderDialog* dlg, TQWidget* parent, mListView->addColumn( i18n( "User Id" ) ); mListView->addColumn( i18n( "Permissions" ) ); - connect( mListView, TQT_SIGNAL(doubleClicked(TQListViewItem*,const TQPoint&,int)), - TQT_SLOT(slotEditACL(TQListViewItem*)) ); - connect( mListView, TQT_SIGNAL(returnPressed(TQListViewItem*)), - TQT_SLOT(slotEditACL(TQListViewItem*)) ); - connect( mListView, TQT_SIGNAL(currentChanged(TQListViewItem*)), - TQT_SLOT(slotSelectionChanged(TQListViewItem*)) ); + connect( mListView, TQ_SIGNAL(doubleClicked(TQListViewItem*,const TQPoint&,int)), + TQ_SLOT(slotEditACL(TQListViewItem*)) ); + connect( mListView, TQ_SIGNAL(returnPressed(TQListViewItem*)), + TQ_SLOT(slotEditACL(TQListViewItem*)) ); + connect( mListView, TQ_SIGNAL(currentChanged(TQListViewItem*)), + TQ_SLOT(slotSelectionChanged(TQListViewItem*)) ); TQVBox* buttonBox = new TQVBox( mACLWidget ); buttonBox->setSpacing( KDialog::spacingHint() ); @@ -353,13 +353,13 @@ KMail::FolderDiaACLTab::FolderDiaACLTab( KMFolderDialog* dlg, TQWidget* parent, TQWidget *spacer = new TQWidget( buttonBox ); spacer->setSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Expanding ); - connect( mAddACL, TQT_SIGNAL( clicked() ), TQT_SLOT( slotAddACL() ) ); - connect( mEditACL, TQT_SIGNAL( clicked() ), TQT_SLOT( slotEditACL() ) ); - connect( mRemoveACL, TQT_SIGNAL( clicked() ), TQT_SLOT( slotRemoveACL() ) ); + connect( mAddACL, TQ_SIGNAL( clicked() ), TQ_SLOT( slotAddACL() ) ); + connect( mEditACL, TQ_SIGNAL( clicked() ), TQ_SLOT( slotEditACL() ) ); + connect( mRemoveACL, TQ_SIGNAL( clicked() ), TQ_SLOT( slotRemoveACL() ) ); mEditACL->setEnabled( false ); mRemoveACL->setEnabled( false ); - connect( this, TQT_SIGNAL( changed(bool) ), TQT_SLOT( slotChanged(bool) ) ); + connect( this, TQ_SIGNAL( changed(bool) ), TQ_SLOT( slotChanged(bool) ) ); } // Warning before save() this will return the url of the _parent_ folder, when creating a new one @@ -457,8 +457,8 @@ void KMail::FolderDiaACLTab::load() if ( state == ImapAccountBase::Error ) { // Cancelled by user, or slave can't start slotConnectionResult( -1, TQString() ); } else if ( state == ImapAccountBase::Connecting ) { - connect( mImapAccount, TQT_SIGNAL( connectionResult(int, const TQString&) ), - this, TQT_SLOT( slotConnectionResult(int, const TQString&) ) ); + connect( mImapAccount, TQ_SIGNAL( connectionResult(int, const TQString&) ), + this, TQ_SLOT( slotConnectionResult(int, const TQString&) ) ); } else { // Connected slotConnectionResult( 0, TQString() ); } @@ -466,8 +466,8 @@ void KMail::FolderDiaACLTab::load() void KMail::FolderDiaACLTab::slotConnectionResult( int errorCode, const TQString& errorMsg ) { - disconnect( mImapAccount, TQT_SIGNAL( connectionResult(int, const TQString&) ), - this, TQT_SLOT( slotConnectionResult(int, const TQString&) ) ); + disconnect( mImapAccount, TQ_SIGNAL( connectionResult(int, const TQString&) ), + this, TQ_SLOT( slotConnectionResult(int, const TQString&) ) ); if ( errorCode ) { if ( errorCode == -1 ) // unspecified error mLabel->setText( i18n( "Error connecting to server %1" ).arg( mImapAccount->host() ) ); @@ -478,8 +478,8 @@ void KMail::FolderDiaACLTab::slotConnectionResult( int errorCode, const TQString } if ( mUserRightsState != KMail::ACLJobs::Ok ) { - connect( mImapAccount, TQT_SIGNAL( receivedUserRights( KMFolder* ) ), - this, TQT_SLOT( slotReceivedUserRights( KMFolder* ) ) ); + connect( mImapAccount, TQ_SIGNAL( receivedUserRights( KMFolder* ) ), + this, TQ_SLOT( slotReceivedUserRights( KMFolder* ) ) ); KMFolder* folder = mDlg->folder() ? mDlg->folder() : mDlg->parentFolder(); mImapAccount->getUserRights( folder, mImapPath ); } @@ -506,15 +506,15 @@ void KMail::FolderDiaACLTab::startListing() { // List ACLs of folder - or its parent, if creating a new folder mImapAccount->getACL( mDlg->folder() ? mDlg->folder() : mDlg->parentFolder(), mImapPath ); - connect( mImapAccount, TQT_SIGNAL(receivedACL( KMFolder*, TDEIO::Job*, const KMail::ACLList& )), - this, TQT_SLOT(slotReceivedACL( KMFolder*, TDEIO::Job*, const KMail::ACLList& )) ); + connect( mImapAccount, TQ_SIGNAL(receivedACL( KMFolder*, TDEIO::Job*, const KMail::ACLList& )), + this, TQ_SLOT(slotReceivedACL( KMFolder*, TDEIO::Job*, const KMail::ACLList& )) ); } void KMail::FolderDiaACLTab::slotReceivedACL( KMFolder* folder, TDEIO::Job* job, const KMail::ACLList& aclList ) { if ( folder == ( mDlg->folder() ? mDlg->folder() : mDlg->parentFolder() ) ) { - disconnect( mImapAccount, TQT_SIGNAL(receivedACL( KMFolder*, TDEIO::Job*, const KMail::ACLList& )), - this, TQT_SLOT(slotReceivedACL( KMFolder*, TDEIO::Job*, const KMail::ACLList& )) ); + disconnect( mImapAccount, TQ_SIGNAL(receivedACL( KMFolder*, TDEIO::Job*, const KMail::ACLList& )), + this, TQ_SLOT(slotReceivedACL( KMFolder*, TDEIO::Job*, const KMail::ACLList& )) ); if ( job && job->error() ) { if ( job->error() == TDEIO::ERR_UNSUPPORTED_ACTION ) @@ -727,8 +727,8 @@ bool KMail::FolderDiaACLTab::save() if ( mDlg->isNewFolder() ) { // The folder isn't created yet, wait for it // It's a two-step process (mkdir+listDir) so we wait for the dir listing to be complete - connect( parentImap, TQT_SIGNAL( directoryListingFinished(KMFolderImap*) ), - this, TQT_SLOT( slotDirectoryListingFinished(KMFolderImap*) ) ); + connect( parentImap, TQ_SIGNAL( directoryListingFinished(KMFolderImap*) ), + this, TQ_SLOT( slotDirectoryListingFinished(KMFolderImap*) ) ); } else { slotDirectoryListingFinished( parentImap ); } @@ -756,10 +756,10 @@ void KMail::FolderDiaACLTab::slotDirectoryListingFinished(KMFolderImap* f) jd.total = 1; jd.done = 0; jd.parent = 0; mImapAccount->insertJob(job, jd); - connect(job, TQT_SIGNAL(result(TDEIO::Job *)), - TQT_SLOT(slotMultiSetACLResult(TDEIO::Job *))); - connect(job, TQT_SIGNAL(aclChanged( const TQString&, int )), - TQT_SLOT(slotACLChanged( const TQString&, int )) ); + connect(job, TQ_SIGNAL(result(TDEIO::Job *)), + TQ_SLOT(slotMultiSetACLResult(TDEIO::Job *))); + connect(job, TQ_SIGNAL(aclChanged( const TQString&, int )), + TQ_SLOT(slotACLChanged( const TQString&, int )) ); } void KMail::FolderDiaACLTab::slotMultiSetACLResult(TDEIO::Job* job) diff --git a/kmail/folderdiaacltab.h b/kmail/folderdiaacltab.h index 0a5d6465..1c65f162 100644 --- a/kmail/folderdiaacltab.h +++ b/kmail/folderdiaacltab.h @@ -57,7 +57,7 @@ class ImapAccountBase; * Internal class, only used by FolderDiaACLTab */ class ACLEntryDialog :public KDialogBase { - Q_OBJECT + TQ_OBJECT public: @@ -85,7 +85,7 @@ private: */ class FolderDiaACLTab : public FolderDiaTab { - Q_OBJECT + TQ_OBJECT public: diff --git a/kmail/folderdiaquotatab.cpp b/kmail/folderdiaquotatab.cpp index 2fd950b2..3afc0905 100644 --- a/kmail/folderdiaquotatab.cpp +++ b/kmail/folderdiaquotatab.cpp @@ -121,8 +121,8 @@ void KMail::FolderDiaQuotaTab::load() if ( state == ImapAccountBase::Error ) { // Cancelled by user, or slave can't start slotConnectionResult( -1, TQString() ); } else if ( state == ImapAccountBase::Connecting ) { - connect( mImapAccount, TQT_SIGNAL( connectionResult(int, const TQString&) ), - this, TQT_SLOT( slotConnectionResult(int, const TQString&) ) ); + connect( mImapAccount, TQ_SIGNAL( connectionResult(int, const TQString&) ), + this, TQ_SLOT( slotConnectionResult(int, const TQString&) ) ); } else { // Connected slotConnectionResult( 0, TQString() ); } @@ -131,8 +131,8 @@ void KMail::FolderDiaQuotaTab::load() void KMail::FolderDiaQuotaTab::slotConnectionResult( int errorCode, const TQString& errorMsg ) { - disconnect( mImapAccount, TQT_SIGNAL( connectionResult(int, const TQString&) ), - this, TQT_SLOT( slotConnectionResult(int, const TQString&) ) ); + disconnect( mImapAccount, TQ_SIGNAL( connectionResult(int, const TQString&) ), + this, TQ_SLOT( slotConnectionResult(int, const TQString&) ) ); if ( errorCode ) { if ( errorCode == -1 ) // unspecified error mLabel->setText( i18n( "Error connecting to server %1" ).arg( mImapAccount->host() ) ); @@ -141,8 +141,8 @@ void KMail::FolderDiaQuotaTab::slotConnectionResult( int errorCode, const TQStri mLabel->setText( TDEIO::buildErrorString( errorCode, errorMsg ) ); return; } - connect( mImapAccount, TQT_SIGNAL( receivedStorageQuotaInfo( KMFolder*, TDEIO::Job*, const KMail::QuotaInfo& ) ), - this, TQT_SLOT( slotReceivedQuotaInfo( KMFolder*, TDEIO::Job*, const KMail::QuotaInfo& ) ) ); + connect( mImapAccount, TQ_SIGNAL( receivedStorageQuotaInfo( KMFolder*, TDEIO::Job*, const KMail::QuotaInfo& ) ), + this, TQ_SLOT( slotReceivedQuotaInfo( KMFolder*, TDEIO::Job*, const KMail::QuotaInfo& ) ) ); KMFolder* folder = mDlg->folder() ? mDlg->folder() : mDlg->parentFolder(); mImapAccount->getStorageQuotaInfo( folder, mImapPath ); } @@ -154,8 +154,8 @@ void KMail::FolderDiaQuotaTab::slotReceivedQuotaInfo( KMFolder* folder, if ( folder == mDlg->folder() ? mDlg->folder() : mDlg->parentFolder() ) { //KMFolderImap* folderImap = static_cast<KMFolderImap*>( folder->storage() ); - disconnect( mImapAccount, TQT_SIGNAL(receivedStorageQuotaInfo( KMFolder*, TDEIO::Job*, const KMail::QuotaInfo& )), - this, TQT_SLOT(slotReceivedQuotaInfo( KMFolder*, TDEIO::Job*, const KMail::QuotaInfo& )) ); + disconnect( mImapAccount, TQ_SIGNAL(receivedStorageQuotaInfo( KMFolder*, TDEIO::Job*, const KMail::QuotaInfo& )), + this, TQ_SLOT(slotReceivedQuotaInfo( KMFolder*, TDEIO::Job*, const KMail::QuotaInfo& )) ); if ( job && job->error() ) { if ( job->error() == TDEIO::ERR_UNSUPPORTED_ACTION ) diff --git a/kmail/folderdiaquotatab.h b/kmail/folderdiaquotatab.h index fe7af431..e5aab5ff 100644 --- a/kmail/folderdiaquotatab.h +++ b/kmail/folderdiaquotatab.h @@ -51,7 +51,7 @@ class ImapAccountBase; */ class FolderDiaQuotaTab : public FolderDiaTab { - Q_OBJECT + TQ_OBJECT public: diff --git a/kmail/folderdiaquotatab_p.h b/kmail/folderdiaquotatab_p.h index 16b6cb5a..428d4597 100644 --- a/kmail/folderdiaquotatab_p.h +++ b/kmail/folderdiaquotatab_p.h @@ -44,7 +44,7 @@ namespace KMail { class QuotaWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: QuotaWidget( TQWidget* parent, const char* name = 0 ); diff --git a/kmail/folderjob.h b/kmail/folderjob.h index 5b7f4037..31a6857b 100644 --- a/kmail/folderjob.h +++ b/kmail/folderjob.h @@ -43,7 +43,7 @@ namespace KMail { class FolderJob : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/kmail/folderpropertiesdialog.ui b/kmail/folderpropertiesdialog.ui index 80bdfad2..d9532133 100644 --- a/kmail/folderpropertiesdialog.ui +++ b/kmail/folderpropertiesdialog.ui @@ -630,9 +630,9 @@ <variable>TQValueList<TQGuardedPtr<KMFolder> > mFolders;</variable> <variable>KMFolderDir *mFolderDIr;</variable> </variables> -<Q_SLOTS> +<slots> <slot access="protected">slotChangeIcon( TQString )</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includes> diff --git a/kmail/folderrequester.cpp b/kmail/folderrequester.cpp index f2f7ec16..29c557f9 100644 --- a/kmail/folderrequester.cpp +++ b/kmail/folderrequester.cpp @@ -53,11 +53,11 @@ FolderRequester::FolderRequester( TQWidget *parent, KMFolderTree *tree ) TQToolButton* button = new TQToolButton( this ); button->setIconSet( TDEGlobal::iconLoader()->loadIconSet( "folder", TDEIcon::Small, 0 ) ); - connect( button, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotOpenDialog()) ); + connect( button, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotOpenDialog()) ); setSizePolicy( TQSizePolicy( TQSizePolicy::MinimumExpanding, TQSizePolicy::Fixed ) ); - setFocusPolicy( TQ_StrongFocus ); + setFocusPolicy( TQWidget::StrongFocus ); } //----------------------------------------------------------------------------- diff --git a/kmail/folderrequester.h b/kmail/folderrequester.h index 7434d82a..c3408d19 100644 --- a/kmail/folderrequester.h +++ b/kmail/folderrequester.h @@ -45,7 +45,7 @@ namespace KMail { */ class FolderRequester: public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/kmail/foldersetselector.h b/kmail/foldersetselector.h index 0173327b..217e170e 100644 --- a/kmail/foldersetselector.h +++ b/kmail/foldersetselector.h @@ -28,7 +28,7 @@ namespace KMail { class FolderSetSelector : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/kmail/foldershortcutdialog.cpp b/kmail/foldershortcutdialog.cpp index 1c4e79cf..75b77fb5 100644 --- a/kmail/foldershortcutdialog.cpp +++ b/kmail/foldershortcutdialog.cpp @@ -71,8 +71,8 @@ FolderShortcutDialog::FolderShortcutDialog( KMFolder *folder, mKeyButton = new KKeyButton( hb, "FolderShortcutSelector" ); new TQWidget(hb); - connect( mKeyButton, TQT_SIGNAL( capturedShortcut( const TDEShortcut& ) ), - this, TQT_SLOT( slotCapturedShortcut( const TDEShortcut& ) ) ); + connect( mKeyButton, TQ_SIGNAL( capturedShortcut( const TDEShortcut& ) ), + this, TQ_SLOT( slotCapturedShortcut( const TDEShortcut& ) ) ); mKeyButton->setShortcut( folder->shortcut(), false ); } diff --git a/kmail/foldershortcutdialog.h b/kmail/foldershortcutdialog.h index 930ac36f..ccd93125 100644 --- a/kmail/foldershortcutdialog.h +++ b/kmail/foldershortcutdialog.h @@ -50,7 +50,7 @@ namespace KMail class FolderShortcutDialog : public KDialogBase { -Q_OBJECT +TQ_OBJECT public: FolderShortcutDialog( KMFolder *folder, KMMainWidget *mw, diff --git a/kmail/folderstorage.cpp b/kmail/folderstorage.cpp index f6d1a358..f9605df3 100644 --- a/kmail/folderstorage.cpp +++ b/kmail/folderstorage.cpp @@ -80,20 +80,20 @@ FolderStorage::FolderStorage( KMFolder* folder, const char* aName ) mNoChildren = false; mRDict = 0; mDirtyTimer = new TQTimer(this, "mDirtyTimer"); - connect(mDirtyTimer, TQT_SIGNAL(timeout()), - this, TQT_SLOT(updateIndex())); + connect(mDirtyTimer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(updateIndex())); mHasChildren = HasNoChildren; mContentsType = KMail::ContentsTypeMail; - connect(this, TQT_SIGNAL(closed(KMFolder*)), mFolder, TQT_SIGNAL(closed())); + connect(this, TQ_SIGNAL(closed(KMFolder*)), mFolder, TQ_SIGNAL(closed())); } //----------------------------------------------------------------------------- FolderStorage::~FolderStorage() { mJobList.setAutoDelete( true ); - TQObject::disconnect( TQT_SIGNAL(destroyed(TQObject*)), this, 0 ); + TQObject::disconnect( TQ_SIGNAL(destroyed(TQObject*)), this, 0 ); mJobList.clear(); KMMsgDict::deleteRentry(mRDict); } @@ -118,8 +118,8 @@ TQString FolderStorage::dotEscape(const TQString& aStr) void FolderStorage::addJob( FolderJob* job ) const { - TQObject::connect( job, TQT_SIGNAL(destroyed(TQObject*)), - TQT_SLOT(removeJob(TQObject*)) ); + TQObject::connect( job, TQ_SIGNAL(destroyed(TQObject*)), + TQ_SLOT(removeJob(TQObject*)) ); mJobList.append( job ); } @@ -212,8 +212,8 @@ void FolderStorage::quiet(bool beQuiet) */ if ( !mEmitChangedTimer) { mEmitChangedTimer= new TQTimer( this, "mEmitChangedTimer" ); - connect( mEmitChangedTimer, TQT_SIGNAL( timeout() ), - this, TQT_SLOT( slotEmitChangedTimer() ) ); + connect( mEmitChangedTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( slotEmitChangedTimer() ) ); } mQuiet++; } else { @@ -309,8 +309,8 @@ bool FolderStorage::canAddMsgNow(KMMessage* aMsg, int* aIndex_ret) if (!aMsg->isComplete() && msgParent && msgParent->folderType() == KMFolderTypeImap) { FolderJob *job = msgParent->createJob(aMsg); - connect(job, TQT_SIGNAL(messageRetrieved(KMMessage*)), - TQT_SLOT(reallyAddMsg(KMMessage*))); + connect(job, TQ_SIGNAL(messageRetrieved(KMMessage*)), + TQ_SLOT(reallyAddMsg(KMMessage*))); job->start(); aMsg->setTransferInProgress( true ); return false; @@ -1147,7 +1147,7 @@ void FolderStorage::slotProcessNextSearchBatch() bool complete = ( end >= count() ); emit searchResult( folder(), matchingSerNums, mSearchPattern, complete ); if ( !complete ) - TQTimer::singleShot( 0, this, TQT_SLOT(slotProcessNextSearchBatch()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(slotProcessNextSearchBatch()) ); } //----------------------------------------------------------------------------- diff --git a/kmail/folderstorage.h b/kmail/folderstorage.h index 9771a708..87d63d00 100644 --- a/kmail/folderstorage.h +++ b/kmail/folderstorage.h @@ -78,7 +78,7 @@ typedef TQValueList<TQ_UINT32> SerNumList; class FolderStorage : public TQObject { - Q_OBJECT + TQ_OBJECT public: @@ -208,7 +208,7 @@ public: Emits msgAdded signals */ void emitMsgAddedSignals(int idx); - /** Returns FALSE, if the message has to be retrieved from an IMAP account + /** Returns false, if the message has to be retrieved from an IMAP account * first. In this case this function does this and cares for the rest */ virtual bool canAddMsgNow(KMMessage* aMsg, int* aIndex_ret); @@ -310,14 +310,14 @@ public: on failure. */ virtual int rename(const TQString& newName, KMFolderDir *aParent = 0); - /** Returns TRUE if a table of contents file is automatically created. */ + /** Returns true if a table of contents file is automatically created. */ bool autoCreateIndex() const { return mAutoCreateIndex; } /** Allow/disallow automatic creation of a table of contents file. - Default is TRUE. */ + Default is true. */ virtual void setAutoCreateIndex(bool); - /** Returns TRUE if the table of contents is dirty. This happens when + /** Returns true if the table of contents is dirty. This happens when a message is deleted from the folder. The toc will then be re-created when the folder is closed. */ bool dirty() const { return mDirty; } @@ -325,7 +325,7 @@ public: /** Change the dirty flag. */ void setDirty(bool f); - /** Returns TRUE if the folder contains deleted messages */ + /** Returns true if the folder contains deleted messages */ bool needsCompacting() const { return needsCompact; } virtual void setNeedsCompacting(bool f) { needsCompact = f; } @@ -618,7 +618,7 @@ friend class KMMsgDict; bool mExportsSernums :1; /** if the index is dirty it will be recreated upon close() */ bool mDirty :1; - /** TRUE if the files of the folder are locked (writable) */ + /** true if the files of the folder are locked (writable) */ bool mFilesLocked :1; /** number of unread messages, -1 if not yet set */ diff --git a/kmail/foldertreebase.cpp b/kmail/foldertreebase.cpp index 9d18138a..7415591e 100644 --- a/kmail/foldertreebase.cpp +++ b/kmail/foldertreebase.cpp @@ -74,7 +74,7 @@ void FolderTreeBase::contentsDropEvent(TQDropEvent * e) int FolderTreeBase::dndMode(bool alwaysAsk) { int action = -1; - int keybstate = kapp->keyboardModifiers(); + int keybstate = tdeApp->keyboardModifiers(); if ( keybstate & TDEApplication::ControlModifier ) { action = DRAG_COPY; } else if ( keybstate & TDEApplication::ShiftModifier ) { @@ -108,9 +108,9 @@ void FolderTreeBase::readColorConfig() TDEConfig* conf = KMKernel::config(); // Custom/System color support TDEConfigGroupSaver saver(conf, "Reader"); - TQColor c1=TQColor(kapp->palette().active().text()); + TQColor c1=TQColor(tdeApp->palette().active().text()); TQColor c2=TQColor("blue"); - TQColor c4=TQColor(kapp->palette().active().base()); + TQColor c4=TQColor(tdeApp->palette().active().base()); TQColor c5=TQColor("red"); if (!conf->readBoolEntry("defaultColors",true)) { @@ -125,7 +125,7 @@ void FolderTreeBase::readColorConfig() mPaintInfo.colBack = c4; mPaintInfo.colCloseToQuota = c5; } - TQPalette newPal = kapp->palette(); + TQPalette newPal = tdeApp->palette(); newPal.setColor( TQColorGroup::Base, mPaintInfo.colBack ); newPal.setColor( TQColorGroup::Text, mPaintInfo.colFore ); setPalette( newPal ); @@ -235,7 +235,7 @@ void FolderTreeBase::handleMailListDrop(TQDropEvent * event, KMFolder *destinati else action = dndMode(); if ( action == DRAG_COPY || action == DRAG_MOVE ) { - new MessageCopyHelper( serNums, destination, action == DRAG_MOVE, TQT_TQOBJECT(this) ); + new MessageCopyHelper( serNums, destination, action == DRAG_MOVE, this ); } } } diff --git a/kmail/foldertreebase.h b/kmail/foldertreebase.h index 7f5c8545..49441f74 100644 --- a/kmail/foldertreebase.h +++ b/kmail/foldertreebase.h @@ -28,7 +28,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.cpp b/kmail/globalsettings.cpp index c09b0591..4a33d2cb 100644 --- a/kmail/globalsettings.cpp +++ b/kmail/globalsettings.cpp @@ -41,7 +41,7 @@ GlobalSettings *GlobalSettings::self() GlobalSettings::GlobalSettings() { mConfigSyncTimer = new TQTimer( this, "mConfigSyncTimer" ); - connect( mConfigSyncTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotSyncNow() ) ); + connect( mConfigSyncTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( slotSyncNow() ) ); } void GlobalSettings::requestSync() diff --git a/kmail/globalsettings.h b/kmail/globalsettings.h index dd8cd5b5..8ddd2230 100644 --- a/kmail/globalsettings.h +++ b/kmail/globalsettings.h @@ -30,7 +30,7 @@ class TQTimer; class GlobalSettings : public TQObject, public GlobalSettingsBase { - Q_OBJECT + TQ_OBJECT public: virtual ~GlobalSettings(); diff --git a/kmail/headerlistquicksearch.cpp b/kmail/headerlistquicksearch.cpp index eeb8d797..ab2491aa 100644 --- a/kmail/headerlistquicksearch.cpp +++ b/kmail/headerlistquicksearch.cpp @@ -57,8 +57,8 @@ HeaderListQuickSearch::HeaderListQuickSearch( TQWidget *parent, TQApplication::reverseLayout() ? "clear_left" : "locationbar_erase", - 0, TQT_TQOBJECT(this), - TQT_SLOT( reset() ), + 0, this, + TQ_SLOT( reset() ), actionCollection, "reset_quicksearch" ); resetQuickSearch->plug( parent ); @@ -84,24 +84,24 @@ HeaderListQuickSearch::HeaderListQuickSearch( TQWidget *parent, inserStatus( StatusIgnored ); mStatusCombo->setCurrentItem( 0 ); mStatusCombo->installEventFilter( this ); - connect( mStatusCombo, TQT_SIGNAL ( activated( int ) ), - this, TQT_SLOT( slotStatusChanged( int ) ) ); + connect( mStatusCombo, TQ_SIGNAL ( activated( int ) ), + this, TQ_SLOT( slotStatusChanged( int ) ) ); label->setBuddy( mStatusCombo ); TDEToolBarButton * btn = new TDEToolBarButton( "mail_find", 0, parent, 0, i18n( "Open Full Search" ) ); - connect( btn, TQT_SIGNAL( clicked() ), TQT_SIGNAL( requestFullSearch() ) ); + connect( btn, TQ_SIGNAL( clicked() ), TQ_SIGNAL( requestFullSearch() ) ); /* Disable the signal connected by TDEListViewSearchLine since it will call * itemAdded during KMHeaders::readSortOrder() which will in turn result * in getMsgBaseForItem( item ) wanting to access items which are no longer * there. Rather rely on KMHeaders::msgAdded and its signal. */ - disconnect(listView, TQT_SIGNAL(itemAdded(TQListViewItem *)), - this, TQT_SLOT(itemAdded(TQListViewItem *))); + disconnect(listView, TQ_SIGNAL(itemAdded(TQListViewItem *)), + this, TQ_SLOT(itemAdded(TQListViewItem *))); KMHeaders *headers = static_cast<KMHeaders*>( listView ); - connect( headers, TQT_SIGNAL( msgAddedToListView( TQListViewItem* ) ), - this, TQT_SLOT( itemAdded( TQListViewItem* ) ) ); + connect( headers, TQ_SIGNAL( msgAddedToListView( TQListViewItem* ) ), + this, TQ_SLOT( itemAdded( TQListViewItem* ) ) ); } @@ -112,12 +112,12 @@ HeaderListQuickSearch::~HeaderListQuickSearch() bool HeaderListQuickSearch::eventFilter( TQObject *watched, TQEvent *event ) { - if ( TQT_BASE_OBJECT(watched) == TQT_BASE_OBJECT(mStatusCombo) ) { + if ( watched == mStatusCombo ) { KMMainWidget *mainWidget = 0; // Travel up the parents list until we find the main widget for ( TQWidget *curWidget = parentWidget(); curWidget; curWidget = curWidget->parentWidget() ) { - mainWidget = ::tqqt_cast<KMMainWidget *>( curWidget ); + mainWidget = ::tqt_cast<KMMainWidget *>( curWidget ); if ( mainWidget ) break; } diff --git a/kmail/headerlistquicksearch.h b/kmail/headerlistquicksearch.h index 4a3aa098..56753ed9 100644 --- a/kmail/headerlistquicksearch.h +++ b/kmail/headerlistquicksearch.h @@ -44,7 +44,7 @@ namespace KMail { class HeaderListQuickSearch : public TDEListViewSearchLine { -Q_OBJECT +TQ_OBJECT public: HeaderListQuickSearch( TQWidget *parent, diff --git a/kmail/headerstyle.cpp b/kmail/headerstyle.cpp index 44f12b38..8d289056 100644 --- a/kmail/headerstyle.cpp +++ b/kmail/headerstyle.cpp @@ -64,7 +64,7 @@ using namespace KPIM; #include <tqapplication.h> #include <tqregexp.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> namespace KMail { @@ -645,7 +645,7 @@ namespace KMail { // kdDebug() << "FancyHeaderStyle::format() local zone offset (in minutes): " << lzone << endl; - TQTime currTime = TQTime::currentTime( Qt::UTC ); + TQTime currTime = TQTime::currentTime( TQt::UTC ); // kdDebug() << "FancyHeaderStyle::format() current time: " << currTime << endl; diff --git a/kmail/htmlstatusbar.h b/kmail/htmlstatusbar.h index 9a86302f..caf01d7d 100644 --- a/kmail/htmlstatusbar.h +++ b/kmail/htmlstatusbar.h @@ -59,7 +59,7 @@ namespace KMail { * @author Ingo Kloecker <kloecker@kde.org>, Marc Mutz <mutz@kde.org> **/ class HtmlStatusBar : public TQLabel { - Q_OBJECT + TQ_OBJECT public: HtmlStatusBar( TQWidget * parent=0, const char * name=0, WFlags f=0 ); diff --git a/kmail/identitydialog.cpp b/kmail/identitydialog.cpp index 91b108c9..a5c9af36 100644 --- a/kmail/identitydialog.cpp +++ b/kmail/identitydialog.cpp @@ -396,8 +396,8 @@ namespace KMail { mTransportCombo->setEnabled( false ); // since !mTransportCheck->isChecked() mTransportCombo->insertStringList( KMail::TransportManager::transportNames() ); glay->addWidget( mTransportCombo, row, 1 ); - connect( mTransportCheck, TQT_SIGNAL(toggled(bool)), - mTransportCombo, TQT_SLOT(setEnabled(bool)) ); + connect( mTransportCheck, TQ_SIGNAL(toggled(bool)), + mTransportCombo, TQ_SLOT(setEnabled(bool)) ); // the last row is a spacer @@ -416,12 +416,12 @@ namespace KMail { mCopyGlobal = new KPushButton( i18n("&Copy global templates"), tab ); mCopyGlobal->setEnabled( false ); btns->addWidget( mCopyGlobal ); - connect( mCustom, TQT_SIGNAL( toggled( bool ) ), - mWidget, TQT_SLOT( setEnabled( bool ) ) ); - connect( mCustom, TQT_SIGNAL( toggled( bool ) ), - mCopyGlobal, TQT_SLOT( setEnabled( bool ) ) ); - connect( mCopyGlobal, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotCopyGlobal()) ); + connect( mCustom, TQ_SIGNAL( toggled( bool ) ), + mWidget, TQ_SLOT( setEnabled( bool ) ) ); + connect( mCustom, TQ_SIGNAL( toggled( bool ) ), + mCopyGlobal, TQ_SLOT( setEnabled( bool ) ) ); + connect( mCopyGlobal, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotCopyGlobal()) ); // // Tab Widget: Signature @@ -439,8 +439,8 @@ namespace KMail { resize( geometry.readSizeEntry( "Identity Dialog size" ) ); mNameEdit->setFocus(); - connect( tabWidget, TQT_SIGNAL(currentChanged(TQWidget*)), - TQT_SLOT(slotAboutToShow(TQWidget*)) ); + connect( tabWidget, TQ_SIGNAL(currentChanged(TQWidget*)), + TQ_SLOT(slotAboutToShow(TQWidget*)) ); } IdentityDialog::~IdentityDialog() { diff --git a/kmail/identitydialog.h b/kmail/identitydialog.h index fc9b4594..cfa27bd9 100644 --- a/kmail/identitydialog.h +++ b/kmail/identitydialog.h @@ -60,7 +60,7 @@ namespace KMail { namespace KMail { class IdentityDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: IdentityDialog( TQWidget * parent=0, const char * name = 0 ); diff --git a/kmail/identitydrag.h b/kmail/identitydrag.h index 295c83ad..b7aa2250 100644 --- a/kmail/identitydrag.h +++ b/kmail/identitydrag.h @@ -42,7 +42,7 @@ namespace KMail { @author Marc Mutz <mutz@kde.org> **/ class IdentityDrag : public TQDragObject { - Q_OBJECT + TQ_OBJECT public: IdentityDrag( const KPIM::Identity & ident, diff --git a/kmail/identitylistview.h b/kmail/identitylistview.h index 586767c7..eabd63d7 100644 --- a/kmail/identitylistview.h +++ b/kmail/identitylistview.h @@ -67,7 +67,7 @@ namespace KMail { @author Marc Mutz <mutz@kde.org> **/ class IdentityListView : public TDEListView { - Q_OBJECT + TQ_OBJECT public: IdentityListView( TQWidget * parent=0, const char * name=0 ); diff --git a/kmail/imapaccountbase.cpp b/kmail/imapaccountbase.cpp index 40ff81f7..527ad334 100644 --- a/kmail/imapaccountbase.cpp +++ b/kmail/imapaccountbase.cpp @@ -105,12 +105,12 @@ namespace KMail { { mPort = imapDefaultPort; mBodyPartList.setAutoDelete(true); - TDEIO::Scheduler::connect(TQT_SIGNAL(slaveError(TDEIO::Slave *, int, const TQString &)), - this, TQT_SLOT(slotSchedulerSlaveError(TDEIO::Slave *, int, const TQString &))); - TDEIO::Scheduler::connect(TQT_SIGNAL(slaveConnected(TDEIO::Slave *)), - this, TQT_SLOT(slotSchedulerSlaveConnected(TDEIO::Slave *))); - connect(&mNoopTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotNoopTimeout())); - connect(&mIdleTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotIdleTimeout())); + TDEIO::Scheduler::connect(TQ_SIGNAL(slaveError(TDEIO::Slave *, int, const TQString &)), + this, TQ_SLOT(slotSchedulerSlaveError(TDEIO::Slave *, int, const TQString &))); + TDEIO::Scheduler::connect(TQ_SIGNAL(slaveConnected(TDEIO::Slave *)), + this, TQ_SLOT(slotSchedulerSlaveConnected(TDEIO::Slave *))); + connect(&mNoopTimer, TQ_SIGNAL(timeout()), TQ_SLOT(slotNoopTimeout())); + connect(&mIdleTimer, TQ_SIGNAL(timeout()), TQ_SLOT(slotIdleTimeout())); } ImapAccountBase::~ImapAccountBase() { @@ -385,8 +385,8 @@ namespace KMail { jd.quiet = quiet; insertJob(job, jd); - connect(job, TQT_SIGNAL(result(TDEIO::Job *)), - TQT_SLOT(slotSubscriptionResult(TDEIO::Job *))); + connect(job, TQ_SIGNAL(result(TDEIO::Job *)), + TQ_SLOT(slotSubscriptionResult(TDEIO::Job *))); } //----------------------------------------------------------------------------- @@ -437,8 +437,8 @@ namespace KMail { jd.cancellable = true; insertJob(job, jd); - connect(job, TQT_SIGNAL(result(TDEIO::Job *)), - TQT_SLOT(slotGetUserRightsResult(TDEIO::Job *))); + connect(job, TQ_SIGNAL(result(TDEIO::Job *)), + TQ_SLOT(slotGetUserRightsResult(TDEIO::Job *))); } void ImapAccountBase::slotGetUserRightsResult( TDEIO::Job* _job ) @@ -481,8 +481,8 @@ namespace KMail { jd.cancellable = true; insertJob(job, jd); - connect(job, TQT_SIGNAL(result(TDEIO::Job *)), - TQT_SLOT(slotGetACLResult(TDEIO::Job *))); + connect(job, TQ_SIGNAL(result(TDEIO::Job *)), + TQ_SLOT(slotGetACLResult(TDEIO::Job *))); } void ImapAccountBase::slotGetACLResult( TDEIO::Job* _job ) @@ -509,8 +509,8 @@ namespace KMail { jd.cancellable = true; insertJob(job, jd); - connect(job, TQT_SIGNAL(result(TDEIO::Job *)), - TQT_SLOT(slotGetStorageQuotaInfoResult(TDEIO::Job *))); + connect(job, TQ_SIGNAL(result(TDEIO::Job *)), + TQ_SLOT(slotGetStorageQuotaInfoResult(TDEIO::Job *))); } void ImapAccountBase::slotGetStorageQuotaInfoResult( TDEIO::Job* _job ) @@ -536,8 +536,8 @@ namespace KMail { TDEIO::SimpleJob *job = TDEIO::special( getUrl(), packedArgs, false ); TDEIO::Scheduler::assignJobToSlave(mSlave, job); - connect( job, TQT_SIGNAL(result( TDEIO::Job * ) ), - this, TQT_SLOT( slotSimpleResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL(result( TDEIO::Job * ) ), + this, TQ_SLOT( slotSimpleResult( TDEIO::Job * ) ) ); } else { /* Stop the timer, we have disconnected. We have to make sure it is started again when a new slave appears. */ @@ -596,8 +596,8 @@ namespace KMail { emit connectionResult( 0, TQString() ); // success if ( mNamespaces.isEmpty() || mNamespaceToDelimiter.isEmpty() ) { - connect( this, TQT_SIGNAL( namespacesFetched( const ImapAccountBase::nsDelimMap& ) ), - this, TQT_SLOT( slotSaveNamespaces( const ImapAccountBase::nsDelimMap& ) ) ); + connect( this, TQ_SIGNAL( namespacesFetched( const ImapAccountBase::nsDelimMap& ) ), + this, TQ_SLOT( slotSaveNamespaces( const ImapAccountBase::nsDelimMap& ) ) ); getNamespaces(); } @@ -607,8 +607,8 @@ namespace KMail { stream << (int) 'c'; TDEIO::SimpleJob *job = TDEIO::special( getUrl(), packedArgs, false ); TDEIO::Scheduler::assignJobToSlave( mSlave, job ); - connect( job, TQT_SIGNAL(infoMessage(TDEIO::Job*, const TQString&)), - TQT_SLOT(slotCapabilitiesResult(TDEIO::Job*, const TQString&)) ); + connect( job, TQ_SIGNAL(infoMessage(TDEIO::Job*, const TQString&)), + TQ_SLOT(slotCapabilitiesResult(TDEIO::Job*, const TQString&)) ); } //----------------------------------------------------------------------------- @@ -621,16 +621,16 @@ namespace KMail { //----------------------------------------------------------------------------- void ImapAccountBase::getNamespaces() { - disconnect( this, TQT_SIGNAL( connectionResult(int, const TQString&) ), - this, TQT_SLOT( getNamespaces() ) ); + disconnect( this, TQ_SIGNAL( connectionResult(int, const TQString&) ), + this, TQ_SLOT( getNamespaces() ) ); if ( makeConnection() != Connected || !mSlave ) { kdDebug(5006) << "getNamespaces - wait for connection" << endl; if ( mNamespaces.isEmpty() || mNamespaceToDelimiter.isEmpty() ) { // when the connection is established slotSchedulerSlaveConnected notifies us } else { // getNamespaces was called by someone else - connect( this, TQT_SIGNAL( connectionResult(int, const TQString&) ), - this, TQT_SLOT( getNamespaces() ) ); + connect( this, TQ_SIGNAL( connectionResult(int, const TQString&) ), + this, TQ_SLOT( getNamespaces() ) ); } return; } @@ -646,14 +646,14 @@ namespace KMail { TQString(), true, useSSL() || useTLS() ); jd.progressItem->setTotalItems( 1 ); connect ( jd.progressItem, - TQT_SIGNAL( progressItemCanceled( KPIM::ProgressItem* ) ), + TQ_SIGNAL( progressItemCanceled( KPIM::ProgressItem* ) ), this, - TQT_SLOT( slotAbortRequested( KPIM::ProgressItem* ) ) ); + TQ_SLOT( slotAbortRequested( KPIM::ProgressItem* ) ) ); TDEIO::SimpleJob *job = TDEIO::special( getUrl(), packedArgs, false ); TDEIO::Scheduler::assignJobToSlave( mSlave, job ); insertJob( job, jd ); - connect( job, TQT_SIGNAL( infoMessage(TDEIO::Job*, const TQString&) ), - TQT_SLOT( slotNamespaceResult(TDEIO::Job*, const TQString&) ) ); + connect( job, TQ_SIGNAL( infoMessage(TDEIO::Job*, const TQString&) ), + TQ_SLOT( slotNamespaceResult(TDEIO::Job*, const TQString&) ) ); } //----------------------------------------------------------------------------- @@ -958,7 +958,7 @@ namespace KMail { if ( errorCode == TDEIO::ERR_SERVER_TIMEOUT || errorCode == TDEIO::ERR_CONNECTION_BROKEN ) { msg = i18n("The connection to the server %1 was unexpectedly closed or timed out. It will be re-established automatically if possible."). arg( name() ); - KMessageBox::information( TQT_TQWIDGET(kapp->activeWindow()), msg, caption, "kmailConnectionBrokenErrorDialog" ); + KMessageBox::information( tdeApp->activeWindow(), msg, caption, "kmailConnectionBrokenErrorDialog" ); // Show it in the status bar, in case the user has ticked "don't show again" if ( errorCode == TDEIO::ERR_CONNECTION_BROKEN ) KPIM::BroadcastStatus::instance()->setStatusMsg( @@ -968,9 +968,9 @@ namespace KMail { i18n( "The connection to account %1 timed out." ).arg( name() ) ); } else { if ( !errors.isEmpty() ) - KMessageBox::detailedError( TQT_TQWIDGET(kapp->activeWindow()), msg, errors.join("\n").prepend("<qt>"), caption ); + KMessageBox::detailedError( tdeApp->activeWindow(), msg, errors.join("\n").prepend("<qt>"), caption ); else - KMessageBox::error( TQT_TQWIDGET(kapp->activeWindow()), msg, caption ); + KMessageBox::error( tdeApp->activeWindow(), msg, caption ); } } else { // i.e. we have a chance to continue, ask the user about it if ( errors.count() >= 3 ) { // there is no detailedWarningContinueCancel... (#86517) @@ -978,7 +978,7 @@ namespace KMail { msg = TQString( "<qt>") + context + error + '\n' + errors[2]; caption = errors[0]; } - int ret = KMessageBox::warningContinueCancel( TQT_TQWIDGET(kapp->activeWindow()), msg, caption ); + int ret = KMessageBox::warningContinueCancel( tdeApp->activeWindow(), msg, caption ); if ( ret == KMessageBox::Cancel ) { jobsKilled = true; killAllJobs( false ); @@ -1031,10 +1031,10 @@ namespace KMail { mCheckingSingleFolder = ( type == Single ); if ( checkingMail() ) { - disconnect( this, TQT_SIGNAL( finishedCheck( bool, CheckStatus ) ), - this, TQT_SLOT( slotCheckQueuedFolders() ) ); - connect( this, TQT_SIGNAL( finishedCheck( bool, CheckStatus ) ), - this, TQT_SLOT( slotCheckQueuedFolders() ) ); + disconnect( this, TQ_SIGNAL( finishedCheck( bool, CheckStatus ) ), + this, TQ_SLOT( slotCheckQueuedFolders() ) ); + connect( this, TQ_SIGNAL( finishedCheck( bool, CheckStatus ) ), + this, TQ_SLOT( slotCheckQueuedFolders() ) ); } else { slotCheckQueuedFolders(); } @@ -1043,8 +1043,8 @@ namespace KMail { //----------------------------------------------------------------------------- void ImapAccountBase::slotCheckQueuedFolders() { - disconnect( this, TQT_SIGNAL( finishedCheck( bool, CheckStatus ) ), - this, TQT_SLOT( slotCheckQueuedFolders() ) ); + disconnect( this, TQ_SIGNAL( finishedCheck( bool, CheckStatus ) ), + this, TQ_SLOT( slotCheckQueuedFolders() ) ); TQValueList<TQGuardedPtr<KMFolder> > mSaveList = mMailCheckFolders; mMailCheckFolders = mFoldersQueuedForChecking; @@ -1214,8 +1214,8 @@ namespace KMail { ImapAccountBase::jobData jd( url.url(), folder ); jd.path = path; insertJob(job, jd); - connect(job, TQT_SIGNAL(result(TDEIO::Job *)), - TQT_SLOT(slotSetStatusResult(TDEIO::Job *))); + connect(job, TQ_SIGNAL(result(TDEIO::Job *)), + TQ_SLOT(slotSetStatusResult(TDEIO::Job *))); } void ImapAccountBase::setImapSeenStatus(KMFolder * folder, const TQString & path, bool seen) @@ -1236,8 +1236,8 @@ namespace KMail { ImapAccountBase::jobData jd( url.url(), folder ); jd.path = path; insertJob(job, jd); - connect(job, TQT_SIGNAL(result(TDEIO::Job *)), - TQT_SLOT(slotSetStatusResult(TDEIO::Job *))); + connect(job, TQ_SIGNAL(result(TDEIO::Job *)), + TQ_SLOT(slotSetStatusResult(TDEIO::Job *))); } //----------------------------------------------------------------------------- @@ -1299,9 +1299,9 @@ namespace KMail { true, useSSL() || useTLS() ); connect ( mListDirProgressItem, - TQT_SIGNAL( progressItemCanceled( KPIM::ProgressItem* ) ), + TQ_SIGNAL( progressItemCanceled( KPIM::ProgressItem* ) ), this, - TQT_SLOT( slotAbortRequested( KPIM::ProgressItem* ) ) ); + TQ_SLOT( slotAbortRequested( KPIM::ProgressItem* ) ) ); // Start with a guessed value of the old folder count plus 5%. As long // as the list of folders doesn't constantly change, that should be good // enough. diff --git a/kmail/imapaccountbase.h b/kmail/imapaccountbase.h index 1c022044..8bb5f097 100644 --- a/kmail/imapaccountbase.h +++ b/kmail/imapaccountbase.h @@ -59,7 +59,7 @@ namespace KMail { class AttachmentStrategy; class ImapAccountBase : public KMail::NetworkAccount { - Q_OBJECT + TQ_OBJECT protected: ImapAccountBase( AccountManager * parent, const TQString & name, uint id ); @@ -187,7 +187,7 @@ namespace KMail { void removeJob( TDEIO::Job* job ); /** - * Subscribe (@p subscribe = TRUE) / Unsubscribe the folder + * Subscribe (@p subscribe = true) / Unsubscribe the folder * identified by @p imapPath. * Emits subscriptionChanged signal on success. * Emits subscriptionChangeFailed signal when it fails. @@ -202,7 +202,7 @@ namespace KMail { bool locallySubscribedTo( const TQString& imapPath ); /** - * Locally subscribe (@p subscribe = TRUE) / Unsubscribe the folder + * Locally subscribe (@p subscribe = true) / Unsubscribe the folder * identified by @p imapPath. */ void changeLocalSubscription( const TQString& imapPath, bool subscribe ); diff --git a/kmail/imapjob.cpp b/kmail/imapjob.cpp index 1f7682b5..ecf2b5e7 100644 --- a/kmail/imapjob.cpp +++ b/kmail/imapjob.cpp @@ -155,19 +155,19 @@ void ImapJob::init( JobType jt, TQString sets, KMFolderImap* folder, true, account->useSSL() || account->useTLS() ); jd.progressItem->setTotalItems( jd.total ); - connect ( jd.progressItem, TQT_SIGNAL( progressItemCanceled( KPIM::ProgressItem*)), - account, TQT_SLOT( slotAbortRequested( KPIM::ProgressItem* ) ) ); + connect ( jd.progressItem, TQ_SIGNAL( progressItemCanceled( KPIM::ProgressItem*)), + account, TQ_SLOT( slotAbortRequested( KPIM::ProgressItem* ) ) ); TDEIO::SimpleJob *job = TDEIO::put( url, 0, false, false, false ); TDEIO::Scheduler::assignJobToSlave( account->slave(), job ); account->insertJob( job, jd ); - connect( job, TQT_SIGNAL(result(TDEIO::Job *)), - TQT_SLOT(slotPutMessageResult(TDEIO::Job *)) ); - connect( job, TQT_SIGNAL(dataReq(TDEIO::Job *, TQByteArray &)), - TQT_SLOT(slotPutMessageDataReq(TDEIO::Job *, TQByteArray &)) ); - connect( job, TQT_SIGNAL(infoMessage(TDEIO::Job *, const TQString &)), - TQT_SLOT(slotPutMessageInfoData(TDEIO::Job *, const TQString &)) ); - connect( job, TQT_SIGNAL(processedSize(TDEIO::Job *, TDEIO::filesize_t)), - TQT_SLOT(slotProcessedSize(TDEIO::Job *, TDEIO::filesize_t))); + connect( job, TQ_SIGNAL(result(TDEIO::Job *)), + TQ_SLOT(slotPutMessageResult(TDEIO::Job *)) ); + connect( job, TQ_SIGNAL(dataReq(TDEIO::Job *, TQByteArray &)), + TQ_SLOT(slotPutMessageDataReq(TDEIO::Job *, TQByteArray &)) ); + connect( job, TQ_SIGNAL(infoMessage(TDEIO::Job *, const TQString &)), + TQ_SLOT(slotPutMessageInfoData(TDEIO::Job *, const TQString &)) ); + connect( job, TQ_SIGNAL(processedSize(TDEIO::Job *, TDEIO::filesize_t)), + TQ_SLOT(slotProcessedSize(TDEIO::Job *, TDEIO::filesize_t))); } } else if ( jt == tCopyMessage || jt == tMoveMessage ) @@ -196,18 +196,18 @@ void ImapJob::init( JobType jt, TQString sets, KMFolderImap* folder, true, account->useSSL() || account->useTLS() ); jd.progressItem->setTotalItems( jd.total ); - connect ( jd.progressItem, TQT_SIGNAL(progressItemCanceled(KPIM::ProgressItem*)), - account, TQT_SLOT( slotAbortRequested(KPIM::ProgressItem* ) ) ); + connect ( jd.progressItem, TQ_SIGNAL(progressItemCanceled(KPIM::ProgressItem*)), + account, TQ_SLOT( slotAbortRequested(KPIM::ProgressItem* ) ) ); TDEIO::SimpleJob *simpleJob = TDEIO::special( url, packedArgs, false ); TDEIO::Scheduler::assignJobToSlave( account->slave(), simpleJob ); mJob = simpleJob; account->insertJob( mJob, jd ); - connect( mJob, TQT_SIGNAL(result(TDEIO::Job *)), - TQT_SLOT(slotCopyMessageResult(TDEIO::Job *)) ); + connect( mJob, TQ_SIGNAL(result(TDEIO::Job *)), + TQ_SLOT(slotCopyMessageResult(TDEIO::Job *)) ); if ( jt == tMoveMessage ) { - connect( mJob, TQT_SIGNAL(infoMessage(TDEIO::Job *, const TQString &)), - TQT_SLOT(slotCopyMessageInfoData(TDEIO::Job *, const TQString &)) ); + connect( mJob, TQ_SIGNAL(infoMessage(TDEIO::Job *, const TQString &)), + TQ_SLOT(slotCopyMessageInfoData(TDEIO::Job *, const TQString &)) ); } } else { @@ -317,8 +317,8 @@ void ImapJob::slotGetNextMessage() TQStyleSheet::escape( msg->subject() ), true, account->useSSL() || account->useTLS() ); - connect ( jd.progressItem, TQT_SIGNAL( progressItemCanceled( KPIM::ProgressItem*)), - account, TQT_SLOT( slotAbortRequested( KPIM::ProgressItem* ) ) ); + connect ( jd.progressItem, TQ_SIGNAL( progressItemCanceled( KPIM::ProgressItem*)), + account, TQ_SLOT( slotAbortRequested( KPIM::ProgressItem* ) ) ); jd.progressItem->setTotalItems( jd.total ); TDEIO::SimpleJob *simpleJob = TDEIO::get( url, false, false ); @@ -327,18 +327,18 @@ void ImapJob::slotGetNextMessage() account->insertJob( mJob, jd ); if ( mPartSpecifier.find( "STRUCTURE", 0, false ) != -1 ) { - connect( mJob, TQT_SIGNAL(result(TDEIO::Job *)), - this, TQT_SLOT(slotGetBodyStructureResult(TDEIO::Job *)) ); + connect( mJob, TQ_SIGNAL(result(TDEIO::Job *)), + this, TQ_SLOT(slotGetBodyStructureResult(TDEIO::Job *)) ); } else { - connect( mJob, TQT_SIGNAL(result(TDEIO::Job *)), - this, TQT_SLOT(slotGetMessageResult(TDEIO::Job *)) ); + connect( mJob, TQ_SIGNAL(result(TDEIO::Job *)), + this, TQ_SLOT(slotGetMessageResult(TDEIO::Job *)) ); } - connect( mJob, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), - msgParent, TQT_SLOT(slotSimpleData(TDEIO::Job *, const TQByteArray &)) ); + connect( mJob, TQ_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), + msgParent, TQ_SLOT(slotSimpleData(TDEIO::Job *, const TQByteArray &)) ); if ( jd.total > 1 ) { - connect(mJob, TQT_SIGNAL(processedSize(TDEIO::Job *, TDEIO::filesize_t)), - this, TQT_SLOT(slotProcessedSize(TDEIO::Job *, TDEIO::filesize_t))); + connect(mJob, TQ_SIGNAL(processedSize(TDEIO::Job *, TDEIO::filesize_t)), + this, TQ_SLOT(slotProcessedSize(TDEIO::Job *, TDEIO::filesize_t))); } } diff --git a/kmail/imapjob.h b/kmail/imapjob.h index e348b2df..cd4b9ab7 100644 --- a/kmail/imapjob.h +++ b/kmail/imapjob.h @@ -53,7 +53,7 @@ class AttachmentStrategy; class ImapJob : public FolderJob { - Q_OBJECT + TQ_OBJECT friend class ::KMAcctImap; diff --git a/kmail/importarchivedialog.h b/kmail/importarchivedialog.h index b37c519c..11bcc00d 100644 --- a/kmail/importarchivedialog.h +++ b/kmail/importarchivedialog.h @@ -31,7 +31,7 @@ class FolderRequester; // TODO: Common base class for ArchiveFolderDialog and ImportArchiveDialog? class ImportArchiveDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/kmail/importjob.cpp b/kmail/importjob.cpp index 58f9d974..9fe9bbbe 100644 --- a/kmail/importjob.cpp +++ b/kmail/importjob.cpp @@ -174,7 +174,7 @@ void KMail::ImportJob::messageAdded() mCurrentMessage = 0; mCurrentMessageFile = 0; - TQTimer::singleShot( 0, this, TQT_SLOT( importNextMessage() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( importNextMessage() ) ); } void KMail::ImportJob::importNextMessage() @@ -239,8 +239,8 @@ void KMail::ImportJob::importNextMessage() else { ImapJob *imapJob = new ImapJob( mCurrentMessage, ImapJob::tPutMessage, dynamic_cast<KMFolderImap*>( mCurrentFolder->storage() ) ); - connect( imapJob, TQT_SIGNAL(result(KMail::FolderJob*)), - TQT_SLOT(messagePutResult(KMail::FolderJob*)) ); + connect( imapJob, TQ_SIGNAL(result(KMail::FolderJob*)), + TQ_SLOT(messagePutResult(KMail::FolderJob*)) ); imapJob->start(); } } @@ -383,8 +383,8 @@ void KMail::ImportJob::start() TQString(), true ); mProgressItem->setUsesBusyIndicator( true ); - connect( mProgressItem, TQT_SIGNAL(progressItemCanceled(KPIM::ProgressItem*)), - this, TQT_SLOT(cancelJob()) ); + connect( mProgressItem, TQ_SIGNAL(progressItemCanceled(KPIM::ProgressItem*)), + this, TQ_SLOT(cancelJob()) ); Folder nextFolder; nextFolder.archiveDir = mArchive->directory(); diff --git a/kmail/importjob.h b/kmail/importjob.h index 01b60bef..e7c88881 100644 --- a/kmail/importjob.h +++ b/kmail/importjob.h @@ -51,7 +51,7 @@ namespace KMail */ class ImportJob : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/kmail/index.cpp b/kmail/index.cpp index af4f4cb5..f9b157d2 100644 --- a/kmail/index.cpp +++ b/kmail/index.cpp @@ -91,13 +91,13 @@ KMMsgIndex::KMMsgIndex( TQObject* parent ): mSlowDown( false ) { kdDebug( 5006 ) << "KMMsgIndex::KMMsgIndex()" << endl; - connect( kmkernel->folderMgr(), TQT_SIGNAL( msgRemoved( KMFolder*, TQ_UINT32 ) ), TQT_SLOT( slotRemoveMessage( KMFolder*, TQ_UINT32 ) ) ); - connect( kmkernel->folderMgr(), TQT_SIGNAL( msgAdded( KMFolder*, TQ_UINT32 ) ), TQT_SLOT( slotAddMessage( KMFolder*, TQ_UINT32 ) ) ); - connect( kmkernel->dimapFolderMgr(), TQT_SIGNAL( msgRemoved( KMFolder*, TQ_UINT32 ) ), TQT_SLOT( slotRemoveMessage( KMFolder*, TQ_UINT32 ) ) ); - connect( kmkernel->dimapFolderMgr(), TQT_SIGNAL( msgAdded( KMFolder*, TQ_UINT32 ) ), TQT_SLOT( slotAddMessage( KMFolder*, TQ_UINT32 ) ) ); + connect( kmkernel->folderMgr(), TQ_SIGNAL( msgRemoved( KMFolder*, TQ_UINT32 ) ), TQ_SLOT( slotRemoveMessage( KMFolder*, TQ_UINT32 ) ) ); + connect( kmkernel->folderMgr(), TQ_SIGNAL( msgAdded( KMFolder*, TQ_UINT32 ) ), TQ_SLOT( slotAddMessage( KMFolder*, TQ_UINT32 ) ) ); + connect( kmkernel->dimapFolderMgr(), TQ_SIGNAL( msgRemoved( KMFolder*, TQ_UINT32 ) ), TQ_SLOT( slotRemoveMessage( KMFolder*, TQ_UINT32 ) ) ); + connect( kmkernel->dimapFolderMgr(), TQ_SIGNAL( msgAdded( KMFolder*, TQ_UINT32 ) ), TQ_SLOT( slotAddMessage( KMFolder*, TQ_UINT32 ) ) ); - connect( mTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( act() ) ); - //connect( mSyncTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( syncIndex() ) ); + connect( mTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( act() ) ); + //connect( mSyncTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( syncIndex() ) ); #ifdef HAVE_INDEXLIB TDEConfigGroup cfg( KMKernel::config(), "text-index" ); @@ -116,11 +116,11 @@ KMMsgIndex::KMMsgIndex( TQObject* parent ): mIndex = indexlib::open( mIndexPath, indexlib::open_flags::fail_if_nonexistant ).release(); } if ( !mIndex ) { - TQTimer::singleShot( 8000, this, TQT_SLOT( create() ) ); + TQTimer::singleShot( 8000, this, TQ_SLOT( create() ) ); mState = s_willcreate; } else { if ( cfg.readBoolEntry( "creating" ) ) { - TQTimer::singleShot( 8000, this, TQT_SLOT( continueCreation() ) ); + TQTimer::singleShot( 8000, this, TQ_SLOT( continueCreation() ) ); mState = s_creating; } else { mPendingMsgs = TQValueListToVector( cfg.readIntListEntry( "pending" ) ); @@ -182,7 +182,7 @@ void KMMsgIndex::setEnabled( bool e ) { // nothing can be done, probably return; case s_disabled: - TQTimer::singleShot( 8000, this, TQT_SLOT( create() ) ); + TQTimer::singleShot( 8000, this, TQ_SLOT( create() ) ); mState = s_willcreate; } } else { @@ -264,8 +264,8 @@ void KMMsgIndex::clear() { void KMMsgIndex::maintenance() { #ifdef HAVE_INDEXLIB - if ( mState != s_idle || kapp->hasPendingEvents() ) { - TQTimer::singleShot( 8000, this, TQT_SLOT( maintenance() ) ); + if ( mState != s_idle || tdeApp->hasPendingEvents() ) { + TQTimer::singleShot( 8000, this, TQ_SLOT( maintenance() ) ); return; } mIndex->maintenance(); @@ -305,7 +305,7 @@ int KMMsgIndex::addMessage( TQ_UINT32 serNum ) { void KMMsgIndex::act() { kdDebug( 5006 ) << "KMMsgIndex::act()" << endl; - if ( kapp->hasPendingEvents() ) { + if ( tdeApp->hasPendingEvents() ) { //nah, some other time.. mTimer->start( 500 ); mSlowDown = true; @@ -404,10 +404,10 @@ bool KMMsgIndex::startQuery( KMSearch* s ) { kdDebug( 5006 ) << "KMMsgIndex::startQuery( . ) starting query" << endl; Search* search = new Search( s ); - connect( search, TQT_SIGNAL( finished( bool ) ), s, TQT_SIGNAL( finished( bool ) ) ); - connect( search, TQT_SIGNAL( finished( bool ) ), s, TQT_SLOT( indexFinished() ) ); - connect( search, TQT_SIGNAL( destroyed( TQObject* ) ), TQT_SLOT( removeSearch( TQObject* ) ) ); - connect( search, TQT_SIGNAL( found( TQ_UINT32 ) ), s, TQT_SIGNAL( found( TQ_UINT32 ) ) ); + connect( search, TQ_SIGNAL( finished( bool ) ), s, TQ_SIGNAL( finished( bool ) ) ); + connect( search, TQ_SIGNAL( finished( bool ) ), s, TQ_SLOT( indexFinished() ) ); + connect( search, TQ_SIGNAL( destroyed( TQObject* ) ), TQ_SLOT( removeSearch( TQObject* ) ) ); + connect( search, TQ_SIGNAL( found( TQ_UINT32 ) ), s, TQ_SIGNAL( found( TQ_UINT32 ) ) ); mSearches.push_back( search ); return true; } @@ -517,7 +517,7 @@ void KMMsgIndex::removeMessage( TQ_UINT32 serNum ) { mIndex->remove_doc( TQString::number( serNum ).latin1() ); ++mMaintenanceCount; if ( mMaintenanceCount > MaintenanceLimit && mRemovedMsgs.empty() ) { - TQTimer::singleShot( 100, this, TQT_SLOT( maintenance() ) ); + TQTimer::singleShot( 100, this, TQ_SLOT( maintenance() ) ); } #endif } @@ -535,7 +535,7 @@ KMMsgIndex::Search::Search( KMSearch* s ): mTimer( new TQTimer( this, "mTimer" ) ), mResidual( new KMSearchPattern ), mState( s_starting ) { - connect( mTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( act() ) ); + connect( mTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( act() ) ); mTimer->start( 0 ); } @@ -561,7 +561,7 @@ void KMMsgIndex::Search::act() { mState = s_emitting; // fall throu case s_emitting: - if ( kapp->hasPendingEvents() ) { + if ( tdeApp->hasPendingEvents() ) { //nah, some other time.. mTimer->start( 250 ); mState = s_emitstopped; diff --git a/kmail/index.h b/kmail/index.h index 015bc106..4ac6ca45 100644 --- a/kmail/index.h +++ b/kmail/index.h @@ -50,7 +50,7 @@ class KMSearchRule; class KMSearchPattern; class KMMsgIndex : public TQObject { - Q_OBJECT + TQ_OBJECT public: explicit KMMsgIndex( TQObject* parent ); @@ -194,7 +194,7 @@ class KMMsgIndex : public TQObject { class KMMsgIndex::Search : public TQObject { - Q_OBJECT + TQ_OBJECT public: explicit Search( KMSearch* s ); diff --git a/kmail/jobscheduler.cpp b/kmail/jobscheduler.cpp index d5374fe4..dc2ef506 100644 --- a/kmail/jobscheduler.cpp +++ b/kmail/jobscheduler.cpp @@ -39,7 +39,7 @@ JobScheduler::JobScheduler( TQObject* parent, const char* name ) mPendingImmediateTasks( 0 ), mCurrentTask( 0 ), mCurrentJob( 0 ) { - connect( &mTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotRunNextJob() ) ); + connect( &mTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( slotRunNextJob() ) ); // No need to start the internal timer yet, we wait for a task to be scheduled } @@ -212,7 +212,7 @@ void JobScheduler::runTaskNow( ScheduledTask* task ) } // Register the job in the folder. This makes it autodeleted if the folder is deleted. mCurrentTask->folder()->storage()->addJob( mCurrentJob ); - connect( mCurrentJob, TQT_SIGNAL( finished() ), this, TQT_SLOT( slotJobFinished() ) ); + connect( mCurrentJob, TQ_SIGNAL( finished() ), this, TQ_SLOT( slotJobFinished() ) ); mCurrentJob->start(); } diff --git a/kmail/jobscheduler.h b/kmail/jobscheduler.h index 52e2cb85..0c649a57 100644 --- a/kmail/jobscheduler.h +++ b/kmail/jobscheduler.h @@ -95,7 +95,7 @@ private: */ class JobScheduler : public TQObject { - Q_OBJECT + TQ_OBJECT public: JobScheduler( TQObject* parent, const char* name = 0 ); diff --git a/kmail/kcm_kmail.cpp b/kmail/kcm_kmail.cpp index 07dc1d72..19262ae5 100644 --- a/kmail/kcm_kmail.cpp +++ b/kmail/kcm_kmail.cpp @@ -31,7 +31,7 @@ //---------------------------- extern "C" { - KDE_EXPORT TDECModule *create_kmail_config_misc( TQWidget *parent, const char * ) + TDE_EXPORT TDECModule *create_kmail_config_misc( TQWidget *parent, const char * ) { MiscPage *page = new MiscPage( parent, "kcmkmail_config_misc" ); return page; @@ -40,7 +40,7 @@ extern "C" extern "C" { - KDE_EXPORT TDECModule *create_kmail_config_appearance( TQWidget *parent, const char * ) + TDE_EXPORT TDECModule *create_kmail_config_appearance( TQWidget *parent, const char * ) { AppearancePage *page = new AppearancePage( parent, "kcmkmail_config_appearance" ); @@ -50,7 +50,7 @@ extern "C" extern "C" { - KDE_EXPORT TDECModule *create_kmail_config_composer( TQWidget *parent, const char * ) + TDE_EXPORT TDECModule *create_kmail_config_composer( TQWidget *parent, const char * ) { ComposerPage *page = new ComposerPage( parent, "kcmkmail_config_composer" ); return page; @@ -59,7 +59,7 @@ extern "C" extern "C" { - KDE_EXPORT TDECModule *create_kmail_config_identity( TQWidget *parent, const char * ) + TDE_EXPORT TDECModule *create_kmail_config_identity( TQWidget *parent, const char * ) { IdentityPage *page = new IdentityPage( parent, "kcmkmail_config_identity" ); return page; @@ -68,7 +68,7 @@ extern "C" extern "C" { - KDE_EXPORT TDECModule *create_kmail_config_accounts( TQWidget *parent, const char * ) + TDE_EXPORT TDECModule *create_kmail_config_accounts( TQWidget *parent, const char * ) { AccountsPage *page = new AccountsPage( parent, "kcmkmail_config_accounts" ); return page; @@ -77,7 +77,7 @@ extern "C" extern "C" { - KDE_EXPORT TDECModule *create_kmail_config_security( TQWidget *parent, const char * ) + TDE_EXPORT TDECModule *create_kmail_config_security( TQWidget *parent, const char * ) { SecurityPage *page = new SecurityPage( parent, "kcmkmail_config_security" ); return page; diff --git a/kmail/keyresolver.cpp b/kmail/keyresolver.cpp index fcd2f279..c0b0cf69 100644 --- a/kmail/keyresolver.cpp +++ b/kmail/keyresolver.cpp @@ -335,7 +335,7 @@ static std::vector<GpgME::Key> trustedOrConfirmed( const std::vector<GpgME::Key> } namespace { - struct IsNotForFormat : public std::unary_function<GpgME::Key,bool> { + struct IsNotForFormat : public std::function<bool(GpgME::Key)> { IsNotForFormat( Kleo::CryptoMessageFormat f ) : format( f ) {} bool operator()( const GpgME::Key & key ) const { @@ -347,7 +347,7 @@ namespace { const Kleo::CryptoMessageFormat format; }; - struct IsForFormat : std::unary_function<GpgME::Key,bool> { + struct IsForFormat : std::function<bool(GpgME::Key)> { explicit IsForFormat( Kleo::CryptoMessageFormat f ) : protocol( isOpenPGP( f ) ? GpgME::Context::OpenPGP : isSMIME( f ) ? GpgME::Context::CMS : @@ -364,7 +364,7 @@ namespace { -class Kleo::KeyResolver::SigningPreferenceCounter : public std::unary_function<Kleo::KeyResolver::Item,void> { +class Kleo::KeyResolver::SigningPreferenceCounter : public std::function<void(Kleo::KeyResolver::Item)> { public: SigningPreferenceCounter() : mTotal( 0 ), @@ -409,7 +409,7 @@ void Kleo::KeyResolver::SigningPreferenceCounter::operator()( const Kleo::KeyRes -class Kleo::KeyResolver::EncryptionPreferenceCounter : public std::unary_function<Item,void> { +class Kleo::KeyResolver::EncryptionPreferenceCounter : public std::function<void(Item)> { const Kleo::KeyResolver * _this; public: EncryptionPreferenceCounter( const Kleo::KeyResolver * kr, EncryptionPreference defaultPreference ) @@ -476,7 +476,7 @@ void Kleo::KeyResolver::EncryptionPreferenceCounter::operator()( Item & item ) { namespace { - class FormatPreferenceCounterBase : public std::unary_function<Kleo::KeyResolver::Item,void> { + class FormatPreferenceCounterBase : public std::function<void(Kleo::KeyResolver::Item)> { public: FormatPreferenceCounterBase() : mTotal( 0 ), @@ -1701,8 +1701,8 @@ std::vector<GpgME::Key> Kleo::KeyResolver::lookup( const TQStringList & patterns std::vector<GpgME::Key> result; if ( mCryptoMessageFormats & (InlineOpenPGPFormat|OpenPGPMIMEFormat) ) if ( const Kleo::CryptoBackend::Protocol * p = Kleo::CryptoBackendFactory::instance()->openpgp() ) { - std::auto_ptr<Kleo::KeyListJob> job( p->keyListJob( false, false, true ) ); // use validating keylisting - if ( job.get() ) { + std::unique_ptr<Kleo::KeyListJob> job( p->keyListJob( false, false, true ) ); // use validating keylisting + if ( job ) { std::vector<GpgME::Key> keys; job->exec( patterns, secret, keys ); result.insert( result.end(), keys.begin(), keys.end() ); @@ -1710,8 +1710,8 @@ std::vector<GpgME::Key> Kleo::KeyResolver::lookup( const TQStringList & patterns } if ( mCryptoMessageFormats & (SMIMEFormat|SMIMEOpaqueFormat) ) if ( const Kleo::CryptoBackend::Protocol * p = Kleo::CryptoBackendFactory::instance()->smime() ) { - std::auto_ptr<Kleo::KeyListJob> job( p->keyListJob( false, false, true ) ); // use validating keylisting - if ( job.get() ) { + std::unique_ptr<Kleo::KeyListJob> job( p->keyListJob( false, false, true ) ); // use validating keylisting + if ( job ) { std::vector<GpgME::Key> keys; job->exec( patterns, secret, keys ); result.insert( result.end(), keys.begin(), keys.end() ); diff --git a/kmail/kmaccount.cpp b/kmail/kmaccount.cpp index 825e0cef..0d36844a 100644 --- a/kmail/kmaccount.cpp +++ b/kmail/kmaccount.cpp @@ -51,8 +51,8 @@ KMPrecommand::KMPrecommand(const TQString &precommand, TQObject *parent) mPrecommandProcess.setUseShell(true); mPrecommandProcess << precommand; - connect(&mPrecommandProcess, TQT_SIGNAL(processExited(TDEProcess *)), - TQT_SLOT(precommandExited(TDEProcess *))); + connect(&mPrecommandProcess, TQ_SIGNAL(processExited(TDEProcess *)), + TQ_SLOT(precommandExited(TDEProcess *))); } //----------------------------------------------------------------------------- @@ -207,7 +207,7 @@ void KMAccount::sendReceipt(KMMessage* aMsg) KMMessage *newMsg = aMsg->createDeliveryReceipt(); if (newMsg) { mReceipts.append(newMsg); - TQTimer::singleShot( 0, this, TQT_SLOT( sendReceipts() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( sendReceipts() ) ); } } @@ -351,7 +351,7 @@ void KMAccount::installTimer() if(!mTimer) { mTimer = new TQTimer(0, "mTimer"); - connect(mTimer,TQT_SIGNAL(timeout()),TQT_SLOT(mailCheck())); + connect(mTimer,TQ_SIGNAL(timeout()),TQ_SLOT(mailCheck())); } else { @@ -380,13 +380,13 @@ bool KMAccount::runPrecommand(const TQString &precommand) BroadcastStatus::instance()->setStatusMsg( i18n("Executing precommand %1").arg(precommand )); - connect(&precommandProcess, TQT_SIGNAL(finished(bool)), - TQT_SLOT(precommandExited(bool))); + connect(&precommandProcess, TQ_SIGNAL(finished(bool)), + TQ_SLOT(precommandExited(bool))); kdDebug(5006) << "Running precommand " << precommand << endl; if (!precommandProcess.start()) return false; - kapp->eventLoop()->enterLoop(); + tdeApp->eventLoop()->enterLoop(); return mPrecommandSuccess; } @@ -395,7 +395,7 @@ bool KMAccount::runPrecommand(const TQString &precommand) void KMAccount::precommandExited(bool success) { mPrecommandSuccess = success; - kapp->eventLoop()->exitLoop(); + tdeApp->eventLoop()->exitLoop(); } //----------------------------------------------------------------------------- diff --git a/kmail/kmaccount.h b/kmail/kmaccount.h index 8445d55e..89d33dcc 100644 --- a/kmail/kmaccount.h +++ b/kmail/kmaccount.h @@ -20,7 +20,7 @@ #ifndef kmaccount_h #define kmaccount_h -#include <kprocess.h> +#include <tdeprocess.h> #include <kaccount.h> #include <tqstring.h> @@ -51,7 +51,7 @@ typedef TQValueList< ::KMAccount* > AccountList; class KMPrecommand : public TQObject { - Q_OBJECT + TQ_OBJECT public: @@ -73,7 +73,7 @@ protected: class KMAccount: public TQObject, public KAccount { - Q_OBJECT + TQ_OBJECT friend class KMail::AccountManager; friend class ::KMail::FolderJob; @@ -132,7 +132,7 @@ public: virtual void setTrash(const TQString& aTrash) { mTrash = aTrash; } /** - * Process new mail for this account if one arrived. Returns TRUE if new + * Process new mail for this account if one arrived. Returns true if new * mail has been found. Whether the mail is automatically loaded to * an associated folder or not depends on the type of the account. */ diff --git a/kmail/kmacctcachedimap.cpp b/kmail/kmacctcachedimap.cpp index 9de08019..07c3eb0a 100644 --- a/kmail/kmacctcachedimap.cpp +++ b/kmail/kmacctcachedimap.cpp @@ -49,7 +49,7 @@ using KMail::AccountManager; #include <tdeio/scheduler.h> #include <tdeio/slave.h> #include <kdebug.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeapplication.h> #include <tdeconfig.h> @@ -186,8 +186,8 @@ void KMAcctCachedImap::slotCheckQueuedFolders() mMailCheckFolders.append( mFoldersQueuedForChecking.front() ); mFoldersQueuedForChecking.pop_front(); if ( mFoldersQueuedForChecking.isEmpty() ) - disconnect( this, TQT_SIGNAL( finishedCheck( bool, CheckStatus ) ), - this, TQT_SLOT( slotCheckQueuedFolders() ) ); + disconnect( this, TQ_SIGNAL( finishedCheck( bool, CheckStatus ) ), + this, TQ_SLOT( slotCheckQueuedFolders() ) ); kmkernel->acctMgr()->singleCheckMail(this, true); mMailCheckFolders.clear(); @@ -246,20 +246,20 @@ void KMAcctCachedImap::processNewMail( KMFolderCachedImap* folder, TQString(), true, // can be cancelled useSSL() || useTLS() ); - connect( mMailCheckProgressItem, TQT_SIGNAL( progressItemCanceled( KPIM::ProgressItem* ) ), - this, TQT_SLOT( slotProgressItemCanceled( KPIM::ProgressItem* ) ) ); + connect( mMailCheckProgressItem, TQ_SIGNAL( progressItemCanceled( KPIM::ProgressItem* ) ), + this, TQ_SLOT( slotProgressItemCanceled( KPIM::ProgressItem* ) ) ); folder->setAccount(this); - connect(folder, TQT_SIGNAL(folderComplete(KMFolderCachedImap*, bool)), - this, TQT_SLOT(postProcessNewMail(KMFolderCachedImap*, bool))); + connect(folder, TQ_SIGNAL(folderComplete(KMFolderCachedImap*, bool)), + this, TQ_SLOT(postProcessNewMail(KMFolderCachedImap*, bool))); folder->serverSync( recurse ); } void KMAcctCachedImap::postProcessNewMail( KMFolderCachedImap* folder, bool ) { mNoopTimer.start( 60000 ); // send a noop every minute to avoid "connection broken" errors - disconnect(folder, TQT_SIGNAL(folderComplete(KMFolderCachedImap*, bool)), - this, TQT_SLOT(postProcessNewMail(KMFolderCachedImap*, bool))); + disconnect(folder, TQ_SIGNAL(folderComplete(KMFolderCachedImap*, bool)), + this, TQ_SLOT(postProcessNewMail(KMFolderCachedImap*, bool))); mMailCheckProgressItem->setComplete(); mMailCheckProgressItem = 0; diff --git a/kmail/kmacctcachedimap.h b/kmail/kmacctcachedimap.h index a580b90c..8f9fd6c9 100644 --- a/kmail/kmacctcachedimap.h +++ b/kmail/kmacctcachedimap.h @@ -53,7 +53,7 @@ namespace TDEIO { class KMAcctCachedImap: public KMail::ImapAccountBase { - Q_OBJECT + TQ_OBJECT friend class ::KMail::ImapJob; friend class ::KMail::CachedImapJob; diff --git a/kmail/kmacctimap.cpp b/kmail/kmacctimap.cpp index 8fd2bea0..72f7c183 100644 --- a/kmail/kmacctimap.cpp +++ b/kmail/kmacctimap.cpp @@ -64,9 +64,9 @@ KMAcctImap::KMAcctImap(AccountManager* aOwner, const TQString& aAccountName, uin mScheduler = 0; mNoopTimer.start( 60000 ); // // send a noop every minute mOpenFolders.setAutoDelete(true); - connect(kmkernel->imapFolderMgr(), TQT_SIGNAL(changed()), - this, TQT_SLOT(slotUpdateFolderList())); - connect(&mErrorTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotResetConnectionError())); + connect(kmkernel->imapFolderMgr(), TQ_SIGNAL(changed()), + this, TQ_SLOT(slotUpdateFolderList())); + connect(&mErrorTimer, TQ_SIGNAL(timeout()), TQ_SLOT(slotResetConnectionError())); TQString serNumUri = locateLocal( "data", "kmail/unfiltered." + TQString("%1").arg(KAccount::id()) ); @@ -161,7 +161,7 @@ void KMAcctImap::killAllJobs( bool disconnectSlave ) fld->quiet(false); fld->setContentState(KMFolderImap::imapNoInformation); fld->setSubfolderState(KMFolderImap::imapNoInformation); - fld->sendFolderComplete(FALSE); + fld->sendFolderComplete(false); fld->removeJobs(); } if ( (*it).progressItem ) @@ -264,7 +264,7 @@ void KMAcctImap::cancelMailCheck() // KMAccount::checkingMail() to be reset, in case we restart checking mail later. for( TQValueList<KMFolderImap*>::Iterator it = folderList.begin(); it != folderList.end(); ++it ) { KMFolderImap *fld = *it; - fld->sendFolderComplete(FALSE); + fld->sendFolderComplete(false); } } @@ -304,9 +304,9 @@ void KMAcctImap::processNewMail(bool interactive) mMailCheckProgressItem->setTotalItems( mMailCheckFolders.count() ); connect ( mMailCheckProgressItem, - TQT_SIGNAL( progressItemCanceled( KPIM::ProgressItem*) ), + TQ_SIGNAL( progressItemCanceled( KPIM::ProgressItem*) ), this, - TQT_SLOT( slotMailCheckCanceled() ) ); + TQ_SLOT( slotMailCheckCanceled() ) ); TQValueList<TQGuardedPtr<KMFolder> >::Iterator it; // first get the current count of unread-messages @@ -336,8 +336,8 @@ void KMAcctImap::processNewMail(bool interactive) mCountRemainChecks++; if (imapFolder->isSelected()) { - connect(imapFolder, TQT_SIGNAL(folderComplete(KMFolderImap*, bool)), - this, TQT_SLOT(postProcessNewMail(KMFolderImap*, bool))); + connect(imapFolder, TQ_SIGNAL(folderComplete(KMFolderImap*, bool)), + this, TQ_SLOT(postProcessNewMail(KMFolderImap*, bool))); imapFolder->getFolder(); } else if ( kmkernel->filterMgr()->atLeastOneIncomingFilterAppliesTo( id() ) && imapFolder->folder()->isSystemFolder() && @@ -345,13 +345,13 @@ void KMAcctImap::processNewMail(bool interactive) imapFolder->open("acctimap"); // will be closed in the folderSelected slot // first get new headers before we select the folder imapFolder->setSelected( true ); - connect( imapFolder, TQT_SIGNAL( folderComplete( KMFolderImap*, bool ) ), - this, TQT_SLOT( slotFolderSelected( KMFolderImap*, bool) ) ); + connect( imapFolder, TQ_SIGNAL( folderComplete( KMFolderImap*, bool ) ), + this, TQ_SLOT( slotFolderSelected( KMFolderImap*, bool) ) ); imapFolder->getFolder(); } else { - connect(imapFolder, TQT_SIGNAL(numUnreadMsgsChanged(KMFolder*)), - this, TQT_SLOT(postProcessNewMail(KMFolder*))); + connect(imapFolder, TQ_SIGNAL(numUnreadMsgsChanged(KMFolder*)), + this, TQ_SLOT(postProcessNewMail(KMFolder*))); bool ok = imapFolder->processNewMail(interactive); if (!ok) { @@ -382,15 +382,15 @@ void KMAcctImap::processNewMail(bool interactive) //----------------------------------------------------------------------------- void KMAcctImap::postProcessNewMail(KMFolderImap* folder, bool) { - disconnect(folder, TQT_SIGNAL(folderComplete(KMFolderImap*, bool)), - this, TQT_SLOT(postProcessNewMail(KMFolderImap*, bool))); + disconnect(folder, TQ_SIGNAL(folderComplete(KMFolderImap*, bool)), + this, TQ_SLOT(postProcessNewMail(KMFolderImap*, bool))); postProcessNewMail(static_cast<KMFolder*>(folder->folder())); } void KMAcctImap::postProcessNewMail( KMFolder * folder ) { - disconnect( folder->storage(), TQT_SIGNAL(numUnreadMsgsChanged(KMFolder*)), - this, TQT_SLOT(postProcessNewMail(KMFolder*)) ); + disconnect( folder->storage(), TQ_SIGNAL(numUnreadMsgsChanged(KMFolder*)), + this, TQ_SLOT(postProcessNewMail(KMFolder*)) ); if ( mMailCheckProgressItem ) { mMailCheckProgressItem->incCompletedItems(); @@ -420,7 +420,7 @@ void KMAcctImap::postProcessNewMail( KMFolder * folder ) if (!mScheduler) { mScheduler = new KMail::ActionScheduler( set, filters ); mScheduler->setAccountId( id() ); - connect( mScheduler, TQT_SIGNAL(filtered(TQ_UINT32)), this, TQT_SLOT(slotFiltered(TQ_UINT32)) ); + connect( mScheduler, TQ_SIGNAL(filtered(TQ_UINT32)), this, TQ_SLOT(slotFiltered(TQ_UINT32)) ); } else { mScheduler->setFilterList( filters ); } @@ -469,8 +469,8 @@ void KMAcctImap::postProcessNewMail( KMFolder * folder ) msg->setTransferInProgress(true); if ( !msg->isComplete() ) { FolderJob *job = folder->createJob(msg); - connect(job, TQT_SIGNAL(messageRetrieved(KMMessage*)), - TQT_SLOT(slotFilterMsg(KMMessage*))); + connect(job, TQ_SIGNAL(messageRetrieved(KMMessage*)), + TQ_SLOT(slotFilterMsg(KMMessage*))); job->start(); } else { mFilterSerNumsToSave.remove( TQString( "%1" ).arg( *filterIt ) ); @@ -571,8 +571,8 @@ void KMAcctImap::slotResetConnectionError() void KMAcctImap::slotFolderSelected( KMFolderImap* folder, bool ) { folder->setSelected( false ); - disconnect( folder, TQT_SIGNAL( folderComplete( KMFolderImap*, bool ) ), - this, TQT_SLOT( slotFolderSelected( KMFolderImap*, bool) ) ); + disconnect( folder, TQ_SIGNAL( folderComplete( KMFolderImap*, bool ) ), + this, TQ_SLOT( slotFolderSelected( KMFolderImap*, bool) ) ); postProcessNewMail( static_cast<KMFolder*>(folder->folder()) ); folder->close( "acctimap" ); } diff --git a/kmail/kmacctimap.h b/kmail/kmacctimap.h index 6be22c01..6a7bb89a 100644 --- a/kmail/kmacctimap.h +++ b/kmail/kmacctimap.h @@ -39,7 +39,7 @@ class FolderStorage; //----------------------------------------------------------------------------- class KMAcctImap: public KMail::ImapAccountBase { - Q_OBJECT + TQ_OBJECT friend class KMail::ImapJob; diff --git a/kmail/kmacctlocal.cpp b/kmail/kmacctlocal.cpp index e42407e6..fc045a33 100644 --- a/kmail/kmacctlocal.cpp +++ b/kmail/kmacctlocal.cpp @@ -88,7 +88,7 @@ void KMAcctLocal::processNewMail(bool) break; if (t.elapsed() >= 200) { //hardwired constant - kapp->processEvents(); + tdeApp->processEvents(); t.start(); } } diff --git a/kmail/kmacctmaildir.cpp b/kmail/kmacctmaildir.cpp index 52b398e8..1770480d 100644 --- a/kmail/kmacctmaildir.cpp +++ b/kmail/kmacctmaildir.cpp @@ -181,7 +181,7 @@ void KMAcctMaildir::processNewMail(bool) } if (t.elapsed() >= 200) { //hardwired constant - kapp->processEvents(); + tdeApp->processEvents(); t.start(); } diff --git a/kmail/kmacctseldlg.cpp b/kmail/kmacctseldlg.cpp index 35f1fc42..cac1f81f 100644 --- a/kmail/kmacctseldlg.cpp +++ b/kmail/kmacctseldlg.cpp @@ -39,7 +39,7 @@ KMAcctSelDlg::KMAcctSelDlg( TQWidget *parent, const char *name, bool modal ) TQVBoxLayout *topLayout = new TQVBoxLayout( page, 0, spacingHint() ); TQButtonGroup *group = new TQButtonGroup( i18n("Account Type"), page ); - connect(group, TQT_SIGNAL(clicked(int)), TQT_SLOT(buttonClicked(int)) ); + connect(group, TQ_SIGNAL(clicked(int)), TQ_SLOT(buttonClicked(int)) ); topLayout->addWidget( group, 10 ); TQVBoxLayout *vlay = new TQVBoxLayout( group, spacingHint()*2, spacingHint() ); diff --git a/kmail/kmacctseldlg.h b/kmail/kmacctseldlg.h index b28e1f52..d3f02b2f 100644 --- a/kmail/kmacctseldlg.h +++ b/kmail/kmacctseldlg.h @@ -29,7 +29,7 @@ /** Select account from given list of account types */ class KMAcctSelDlg: public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/kmail/kmail.antispamrc-HOWTO b/kmail/kmail.antispamrc-HOWTO index 9edcabb0..a107d81c 100644 --- a/kmail/kmail.antispamrc-HOWTO +++ b/kmail/kmail.antispamrc-HOWTO @@ -49,7 +49,7 @@ General options - Priority: Specifies the priority of the filter. This value is used to place faster filters before the slower ones in the selection list. If the - user chooses the top item, he gets the fastest filter. Provider sided + user chooses the top item, they get the fastest filter. Provider sided "filters" (which produce headers tough) like the GMX filter have a prio at about 70, they are very fast as they don't consume time on the client side. Since CRM114 is almost as fast it gets 65 ;-). diff --git a/kmail/kmail.kcfg b/kmail/kmail.kcfg index 922e295c..e12b04b3 100644 --- a/kmail/kmail.kcfg +++ b/kmail/kmail.kcfg @@ -557,10 +557,10 @@ <default>true</default> </entry> <entry name="ForegroundColor" type="Color" key="ForegroundColor"> - <default code="true">kapp->palette().active().text()</default> + <default code="true">tdeApp->palette().active().text()</default> </entry> <entry name="BackgroundColor" type="Color" key="BackgroundColor"> - <default code="true">kapp->palette().active().base()</default> + <default code="true">tdeApp->palette().active().base()</default> </entry> <entry name="FallbackCharacterEncoding" type="String" key="FallbackCharacterEncoding"> <default code="true"> TQCString(TQTextCodec::codecForLocale()->name()).lower() == "eucjp"? TQCString("jis7") : TQCString(TQTextCodec::codecForLocale()->name()).lower()</default> diff --git a/kmail/kmail_part.cpp b/kmail/kmail_part.cpp index 4d665422..1add4e7a 100644 --- a/kmail/kmail_part.cpp +++ b/kmail/kmail_part.cpp @@ -65,12 +65,12 @@ KMailPart::KMailPart(TQWidget *parentWidget, const char *widgetName, mParentWidget( parentWidget ) { kdDebug(5006) << "KMailPart()" << endl; - kdDebug(5006) << " InstanceName: " << kapp->instanceName() << endl; + kdDebug(5006) << " InstanceName: " << tdeApp->instanceName() << endl; setInstance(KMailFactory::instance()); kdDebug(5006) << "KMailPart()..." << endl; - kdDebug(5006) << " InstanceName: " << kapp->instanceName() << endl; + kdDebug(5006) << " InstanceName: " << tdeApp->instanceName() << endl; // import i18n data and icons from libraries: KMail::insertLibraryCataloguesAndIcons(); @@ -81,7 +81,7 @@ KMailPart::KMailPart(TQWidget *parentWidget, const char *widgetName, KMail::lockOrDie(); - kapp->dcopClient()->suspend(); // Don't handle DCOP requests yet + tdeApp->dcopClient()->suspend(); // Don't handle DCOP requests yet //local, do the init KMKernel *mKMailKernel = new KMKernel(); @@ -95,18 +95,18 @@ KMailPart::KMailPart(TQWidget *parentWidget, const char *widgetName, mKMailKernel->recoverDeadLetters(); kmsetSignalHandler(kmsignalHandler); - kapp->dcopClient()->resume(); // Ok. We are ready for DCOP requests. + tdeApp->dcopClient()->resume(); // Ok. We are ready for DCOP requests. // create a canvas to insert our widget TQWidget *canvas = new TQWidget(parentWidget, widgetName); - canvas->setFocusPolicy(TQ_ClickFocus); + canvas->setFocusPolicy(TQWidget::ClickFocus); setWidget(canvas); TDEGlobal::iconLoader()->addAppDir("kmail"); #if 0 //It's also possible to make a part out of a readerWin KMReaderWin *mReaderWin = new KMReaderWin( canvas, canvas, actionCollection() ); - connect(mReaderWin, TQT_SIGNAL(urlClicked(const KURL&,int)), - mReaderWin, TQT_SLOT(slotUrlClicked())); + connect(mReaderWin, TQ_SIGNAL(urlClicked(const KURL&,int)), + mReaderWin, TQ_SLOT(slotUrlClicked())); TQVBoxLayout *topLayout = new TQVBoxLayout(canvas); topLayout->addWidget(mReaderWin); mReaderWin->setAutoDelete( true ); @@ -121,10 +121,10 @@ KMailPart::KMailPart(TQWidget *parentWidget, const char *widgetName, kmkernel->inboxFolder()->close(); #else mainWidget = new KMMainWidget( canvas, "mainWidget", this, actionCollection(), - kapp->config()); + tdeApp->config()); TQVBoxLayout *topLayout = new TQVBoxLayout(canvas); topLayout->addWidget(mainWidget); - mainWidget->setFocusPolicy(TQ_ClickFocus); + mainWidget->setFocusPolicy(TQWidget::ClickFocus); mStatusBar = new KMailStatusBarExtension(this); mStatusBar->addStatusBarItem( mainWidget->vacationScriptIndicator(), 2, false ); @@ -134,26 +134,26 @@ KMailPart::KMailPart(TQWidget *parentWidget, const char *widgetName, // Get to know when the user clicked on a folder in the KMail part and update the headerWidget of Kontact KParts::InfoExtension *ie = new KParts::InfoExtension( this, "KMailInfo" ); - connect( mainWidget->folderTree(), TQT_SIGNAL(folderSelected(KMFolder*)), this, TQT_SLOT(exportFolder(KMFolder*)) ); - connect( mainWidget->folderTree(), TQT_SIGNAL(iconChanged(KMFolderTreeItem*)), - this, TQT_SLOT(slotIconChanged(KMFolderTreeItem*)) ); - connect( mainWidget->folderTree(), TQT_SIGNAL(nameChanged(KMFolderTreeItem*)), - this, TQT_SLOT(slotNameChanged(KMFolderTreeItem*)) ); - connect( this, TQT_SIGNAL(textChanged(const TQString&)), ie, TQT_SIGNAL(textChanged(const TQString&)) ); - connect( this, TQT_SIGNAL(iconChanged(const TQPixmap&)), ie, TQT_SIGNAL(iconChanged(const TQPixmap&)) ); + connect( mainWidget->folderTree(), TQ_SIGNAL(folderSelected(KMFolder*)), this, TQ_SLOT(exportFolder(KMFolder*)) ); + connect( mainWidget->folderTree(), TQ_SIGNAL(iconChanged(KMFolderTreeItem*)), + this, TQ_SLOT(slotIconChanged(KMFolderTreeItem*)) ); + connect( mainWidget->folderTree(), TQ_SIGNAL(nameChanged(KMFolderTreeItem*)), + this, TQ_SLOT(slotNameChanged(KMFolderTreeItem*)) ); + connect( this, TQ_SIGNAL(textChanged(const TQString&)), ie, TQ_SIGNAL(textChanged(const TQString&)) ); + connect( this, TQ_SIGNAL(iconChanged(const TQPixmap&)), ie, TQ_SIGNAL(iconChanged(const TQPixmap&)) ); TDEGlobal::iconLoader()->addAppDir( "kmail" ); setXMLFile( "kmail_part.rc" ); #endif KSettings::Dispatcher::self()->registerInstance( KMailFactory::instance(), mKMailKernel, - TQT_SLOT( slotConfigChanged() ) ); + TQ_SLOT( slotConfigChanged() ) ); } KMailPart::~KMailPart() { kdDebug(5006) << "Closing last KMMainWin: stopping mail check" << endl; - // Running TDEIO jobs prevent kapp from exiting, so we need to kill them + // Running TDEIO jobs prevent tdeApp from exiting, so we need to kill them // if they are only about checking mail (not important stuff like moving messages) kmkernel->abortMailCheck(); kmkernel->acctMgr()->cancelMailCheck(); diff --git a/kmail/kmail_part.h b/kmail/kmail_part.h index 3738aed7..daef055d 100644 --- a/kmail/kmail_part.h +++ b/kmail/kmail_part.h @@ -35,7 +35,7 @@ #include <tdeparts/part.h> #include <tqwidget.h> -#include <kdemacros.h> +#include <tdemacros.h> class TDEInstance; class TDEAboutData; @@ -49,9 +49,9 @@ class KMFolderTreeItem; class ActionManager; -class KDE_EXPORT KMailPart: public KParts::ReadOnlyPart, virtual public KMailPartIface +class TDE_EXPORT KMailPart: public KParts::ReadOnlyPart, virtual public KMailPartIface { - Q_OBJECT + TQ_OBJECT public: KMailPart(TQWidget *parentWidget, const char *widgetName, diff --git a/kmail/kmailicalifaceimpl.cpp b/kmail/kmailicalifaceimpl.cpp index 8f10be35..a65b6cdd 100644 --- a/kmail/kmailicalifaceimpl.cpp +++ b/kmail/kmailicalifaceimpl.cpp @@ -161,9 +161,9 @@ KMailICalIfaceImpl::KMailICalIfaceImpl() mUseResourceIMAP( false ), mResourceQuiet( false ), mHideFolders( true ) { // Listen to config changes - connect( kmkernel, TQT_SIGNAL( configChanged() ), this, TQT_SLOT( readConfig() ) ); - connect( kmkernel, TQT_SIGNAL( folderRemoved( KMFolder* ) ), - this, TQT_SLOT( slotFolderRemoved( KMFolder* ) ) ); + connect( kmkernel, TQ_SIGNAL( configChanged() ), this, TQ_SLOT( readConfig() ) ); + connect( kmkernel, TQ_SIGNAL( folderRemoved( KMFolder* ) ), + this, TQ_SLOT( slotFolderRemoved( KMFolder* ) ) ); mExtraFolders.setAutoDelete( true ); mAccumulators.setAutoDelete( true ); @@ -1140,8 +1140,8 @@ void KMailICalIfaceImpl::slotIncidenceAdded( KMFolder* folder, // TODO: Till, port me if ( unget ) mTheUnGetMes.insert( msg->getMsgSerNum(), true ); FolderJob *job = msg->parent()->createJob( msg ); - connect( job, TQT_SIGNAL( messageRetrieved( KMMessage* ) ), - this, TQT_SLOT( slotMessageRetrieved( KMMessage* ) ) ); + connect( job, TQ_SIGNAL( messageRetrieved( KMMessage* ) ), + this, TQ_SLOT( slotMessageRetrieved( KMMessage* ) ) ); job->start(); return; } @@ -1717,10 +1717,10 @@ void KMailICalIfaceImpl::readConfig() Q_ASSERT( account ); if ( account ) { // just in case we were connected already - disconnect( account, TQT_SIGNAL( finishedCheck( bool, CheckStatus ) ), - this, TQT_SLOT( slotCheckDone() ) ); - connect( account, TQT_SIGNAL( finishedCheck( bool, CheckStatus ) ), - this, TQT_SLOT( slotCheckDone() ) ); + disconnect( account, TQ_SIGNAL( finishedCheck( bool, CheckStatus ) ), + this, TQ_SLOT( slotCheckDone() ) ); + connect( account, TQ_SIGNAL( finishedCheck( bool, CheckStatus ) ), + this, TQ_SLOT( slotCheckDone() ) ); } mUseResourceIMAP = false; // We can't really call cleanup(), if those folders were completely deleted. @@ -1966,8 +1966,8 @@ void KMailICalIfaceImpl::slotCheckDone() { KMAccount* account = kmkernel->acctMgr()->find( GlobalSettings::self()->theIMAPResourceAccount() ); if ( account ) - disconnect( account, TQT_SIGNAL( finishedCheck( bool, CheckStatus ) ), - this, TQT_SLOT( slotCheckDone() ) ); + disconnect( account, TQ_SIGNAL( finishedCheck( bool, CheckStatus ) ), + this, TQ_SLOT( slotCheckDone() ) ); readConfig(); } } @@ -2084,32 +2084,32 @@ KMFolder* KMailICalIfaceImpl::initScalixFolder( KMail::FolderContentsType conten void KMailICalIfaceImpl::connectFolder( KMFolder* folder ) { // avoid multiple connections - disconnect( folder, TQT_SIGNAL( msgAdded( KMFolder*, TQ_UINT32 ) ), - this, TQT_SLOT( slotIncidenceAdded( KMFolder*, TQ_UINT32 ) ) ); - disconnect( folder, TQT_SIGNAL( msgRemoved( KMFolder*, TQ_UINT32 ) ), - this, TQT_SLOT( slotIncidenceDeleted( KMFolder*, TQ_UINT32 ) ) ); - disconnect( folder, TQT_SIGNAL( expunged( KMFolder* ) ), - this, TQT_SLOT( slotRefreshFolder( KMFolder* ) ) ); - disconnect( folder->storage(), TQT_SIGNAL( readOnlyChanged( KMFolder* ) ), - this, TQT_SLOT( slotFolderPropertiesChanged( KMFolder* ) ) ); - disconnect( folder, TQT_SIGNAL( nameChanged() ), - this, TQT_SLOT( slotFolderRenamed() ) ); - disconnect( folder->storage(), TQT_SIGNAL( locationChanged( const TQString&, const TQString&) ), - this, TQT_SLOT( slotFolderLocationChanged( const TQString&, const TQString&) ) ); + disconnect( folder, TQ_SIGNAL( msgAdded( KMFolder*, TQ_UINT32 ) ), + this, TQ_SLOT( slotIncidenceAdded( KMFolder*, TQ_UINT32 ) ) ); + disconnect( folder, TQ_SIGNAL( msgRemoved( KMFolder*, TQ_UINT32 ) ), + this, TQ_SLOT( slotIncidenceDeleted( KMFolder*, TQ_UINT32 ) ) ); + disconnect( folder, TQ_SIGNAL( expunged( KMFolder* ) ), + this, TQ_SLOT( slotRefreshFolder( KMFolder* ) ) ); + disconnect( folder->storage(), TQ_SIGNAL( readOnlyChanged( KMFolder* ) ), + this, TQ_SLOT( slotFolderPropertiesChanged( KMFolder* ) ) ); + disconnect( folder, TQ_SIGNAL( nameChanged() ), + this, TQ_SLOT( slotFolderRenamed() ) ); + disconnect( folder->storage(), TQ_SIGNAL( locationChanged( const TQString&, const TQString&) ), + this, TQ_SLOT( slotFolderLocationChanged( const TQString&, const TQString&) ) ); // Setup the signals to listen for changes - connect( folder, TQT_SIGNAL( msgAdded( KMFolder*, TQ_UINT32 ) ), - this, TQT_SLOT( slotIncidenceAdded( KMFolder*, TQ_UINT32 ) ) ); - connect( folder, TQT_SIGNAL( msgRemoved( KMFolder*, TQ_UINT32 ) ), - this, TQT_SLOT( slotIncidenceDeleted( KMFolder*, TQ_UINT32 ) ) ); - connect( folder, TQT_SIGNAL( expunged( KMFolder* ) ), - this, TQT_SLOT( slotRefreshFolder( KMFolder* ) ) ); - connect( folder->storage(), TQT_SIGNAL( readOnlyChanged( KMFolder* ) ), - this, TQT_SLOT( slotFolderPropertiesChanged( KMFolder* ) ) ); - connect( folder, TQT_SIGNAL( nameChanged() ), - this, TQT_SLOT( slotFolderRenamed() ) ); - connect( folder->storage(), TQT_SIGNAL( locationChanged( const TQString&, const TQString&) ), - this, TQT_SLOT( slotFolderLocationChanged( const TQString&, const TQString&) ) ); + connect( folder, TQ_SIGNAL( msgAdded( KMFolder*, TQ_UINT32 ) ), + this, TQ_SLOT( slotIncidenceAdded( KMFolder*, TQ_UINT32 ) ) ); + connect( folder, TQ_SIGNAL( msgRemoved( KMFolder*, TQ_UINT32 ) ), + this, TQ_SLOT( slotIncidenceDeleted( KMFolder*, TQ_UINT32 ) ) ); + connect( folder, TQ_SIGNAL( expunged( KMFolder* ) ), + this, TQ_SLOT( slotRefreshFolder( KMFolder* ) ) ); + connect( folder->storage(), TQ_SIGNAL( readOnlyChanged( KMFolder* ) ), + this, TQ_SLOT( slotFolderPropertiesChanged( KMFolder* ) ) ); + connect( folder, TQ_SIGNAL( nameChanged() ), + this, TQ_SLOT( slotFolderRenamed() ) ); + connect( folder->storage(), TQ_SIGNAL( locationChanged( const TQString&, const TQString&) ), + this, TQ_SLOT( slotFolderLocationChanged( const TQString&, const TQString&) ) ); } diff --git a/kmail/kmailicalifaceimpl.h b/kmail/kmailicalifaceimpl.h index 3b4a194c..b047ed98 100644 --- a/kmail/kmailicalifaceimpl.h +++ b/kmail/kmailicalifaceimpl.h @@ -82,7 +82,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.cpp b/kmail/kmatmlistview.cpp index d6a9c4c4..f8a573ed 100644 --- a/kmail/kmatmlistview.cpp +++ b/kmail/kmatmlistview.cpp @@ -18,12 +18,12 @@ KMAtmListViewItem::KMAtmListViewItem( TQListView *parent ) mCBCompress->setShown( true ); updateAllCheckBoxes(); - connect( mCBCompress, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotCompress() ) ); - connect( listView()->header(), TQT_SIGNAL( sizeChange(int, int, int) ), - TQT_SLOT( slotHeaderChange( int, int, int ) ) ); - connect( listView()->header(), TQT_SIGNAL( indexChange(int, int, int) ), - TQT_SLOT( slotHeaderChange( int, int, int ) ) ); - connect( listView()->header(), TQT_SIGNAL( clicked( int ) ), TQT_SLOT( slotHeaderClick( int ) ) ); + connect( mCBCompress, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotCompress() ) ); + connect( listView()->header(), TQ_SIGNAL( sizeChange(int, int, int) ), + TQ_SLOT( slotHeaderChange( int, int, int ) ) ); + connect( listView()->header(), TQ_SIGNAL( indexChange(int, int, int) ), + TQ_SLOT( slotHeaderChange( int, int, int ) ) ); + connect( listView()->header(), TQ_SIGNAL( clicked( int ) ), TQ_SLOT( slotHeaderClick( int ) ) ); } KMAtmListViewItem::~KMAtmListViewItem() diff --git a/kmail/kmatmlistview.h b/kmail/kmatmlistview.h index 30f0bd5f..a1e0797b 100644 --- a/kmail/kmatmlistview.h +++ b/kmail/kmatmlistview.h @@ -14,7 +14,7 @@ class TQCheckBox; class KMAtmListViewItem : public TQObject, public TQListViewItem { - Q_OBJECT + TQ_OBJECT public: diff --git a/kmail/kmcommands.cpp b/kmail/kmcommands.cpp index 5239ceda..7f509078 100644 --- a/kmail/kmcommands.cpp +++ b/kmail/kmcommands.cpp @@ -71,7 +71,7 @@ #include <kprogress.h> #include <krun.h> #include <kbookmarkmanager.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdetempfile.h> #include <tdeimproxy.h> #include <kuserprofile.h> @@ -202,7 +202,7 @@ KMCommand::Result KMCommand::result() void KMCommand::start() { - TQTimer::singleShot( 0, this, TQT_SLOT( slotStart() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( slotStart() ) ); } @@ -225,8 +225,8 @@ int KMCommand::mCountJobs = 0; void KMCommand::slotStart() { - connect( this, TQT_SIGNAL( messagesTransfered( KMCommand::Result ) ), - this, TQT_SLOT( slotPostTransfer( KMCommand::Result ) ) ); + connect( this, TQ_SIGNAL( messagesTransfered( KMCommand::Result ) ), + this, TQ_SLOT( slotPostTransfer( KMCommand::Result ) ) ); kmkernel->filterMgr()->ref(); if (mMsgList.find(0) != -1) { @@ -261,8 +261,8 @@ void KMCommand::slotStart() void KMCommand::slotPostTransfer( KMCommand::Result result ) { - disconnect( this, TQT_SIGNAL( messagesTransfered( KMCommand::Result ) ), - this, TQT_SLOT( slotPostTransfer( KMCommand::Result ) ) ); + disconnect( this, TQ_SIGNAL( messagesTransfered( KMCommand::Result ) ), + this, TQ_SLOT( slotPostTransfer( KMCommand::Result ) ) ); if ( result == OK ) result = execute(); mResult = result; @@ -339,13 +339,13 @@ void KMCommand::transferSelectedMsgs() job->setCancellable( false ); totalSize += thisMsg->msgSizeServer(); // emitted when the message was transferred successfully - connect(job, TQT_SIGNAL(messageRetrieved(KMMessage*)), - this, TQT_SLOT(slotMsgTransfered(KMMessage*))); + connect(job, TQ_SIGNAL(messageRetrieved(KMMessage*)), + this, TQ_SLOT(slotMsgTransfered(KMMessage*))); // emitted when the job is destroyed - connect(job, TQT_SIGNAL(finished()), - this, TQT_SLOT(slotJobFinished())); - connect(job, TQT_SIGNAL(progress(unsigned long, unsigned long)), - this, TQT_SLOT(slotProgress(unsigned long, unsigned long))); + connect(job, TQ_SIGNAL(finished()), + this, TQ_SLOT(slotJobFinished())); + connect(job, TQ_SIGNAL(progress(unsigned long, unsigned long)), + this, TQ_SLOT(slotProgress(unsigned long, unsigned long))); // msg musn't be deleted thisMsg->setTransferInProgress(true); job->start(); @@ -363,8 +363,8 @@ void KMCommand::transferSelectedMsgs() } else { // wait for the transfer and tell the progressBar the necessary steps if ( mProgressDialog ) { - connect(mProgressDialog, TQT_SIGNAL(cancelClicked()), - this, TQT_SLOT(slotTransferCancelled())); + connect(mProgressDialog, TQ_SIGNAL(cancelClicked()), + this, TQ_SLOT(slotTransferCancelled())); mProgressDialog->progressBar()->setTotalSteps(totalSize); } } @@ -645,7 +645,7 @@ KMCommand::Result KMUrlSaveCommand::execute() return Canceled; } TDEIO::Job *job = TDEIO::file_copy(mUrl, saveUrl, -1, true); - connect(job, TQT_SIGNAL(result(TDEIO::Job*)), TQT_SLOT(slotUrlSaveResult(TDEIO::Job*))); + connect(job, TQ_SIGNAL(result(TDEIO::Job*)), TQ_SLOT(slotUrlSaveResult(TDEIO::Job*))); setEmitsCompletedItself( true ); return OK; } @@ -845,10 +845,10 @@ KMCommand::Result KMSaveMsgCommand::execute() mJob->slotTotalSize( mTotalSize ); mJob->setAsyncDataEnabled( true ); mJob->setReportDataSent( true ); - connect(mJob, TQT_SIGNAL(dataReq(TDEIO::Job*, TQByteArray &)), - TQT_SLOT(slotSaveDataReq())); - connect(mJob, TQT_SIGNAL(result(TDEIO::Job*)), - TQT_SLOT(slotSaveResult(TDEIO::Job*))); + connect(mJob, TQ_SIGNAL(dataReq(TDEIO::Job*, TQByteArray &)), + TQ_SLOT(slotSaveDataReq())); + connect(mJob, TQ_SIGNAL(result(TDEIO::Job*)), + TQ_SLOT(slotSaveResult(TDEIO::Job*))); setEmitsCompletedItself( true ); return OK; } @@ -898,8 +898,8 @@ void KMSaveMsgCommand::slotSaveDataReq() if ( msg->parent() && !msg->isComplete() ) { FolderJob *job = msg->parent()->createJob( msg ); job->setCancellable( false ); - connect(job, TQT_SIGNAL( messageRetrieved( KMMessage* ) ), - this, TQT_SLOT( slotMessageRetrievedForSaving( KMMessage* ) ) ); + connect(job, TQ_SIGNAL( messageRetrieved( KMMessage* ) ), + this, TQ_SLOT( slotMessageRetrievedForSaving( KMMessage* ) ) ); job->start(); } } @@ -971,10 +971,10 @@ void KMSaveMsgCommand::slotSaveResult(TDEIO::Job *job) mJob->slotTotalSize( mTotalSize ); mJob->setAsyncDataEnabled( true ); mJob->setReportDataSent( true ); - connect(mJob, TQT_SIGNAL(dataReq(TDEIO::Job*, TQByteArray &)), - TQT_SLOT(slotSaveDataReq())); - connect(mJob, TQT_SIGNAL(result(TDEIO::Job*)), - TQT_SLOT(slotSaveResult(TDEIO::Job*))); + connect(mJob, TQ_SIGNAL(dataReq(TDEIO::Job*, TQByteArray &)), + TQ_SLOT(slotSaveDataReq())); + connect(mJob, TQ_SIGNAL(result(TDEIO::Job*)), + TQ_SLOT(slotSaveResult(TDEIO::Job*))); } } else @@ -1014,10 +1014,10 @@ KMCommand::Result KMOpenMsgCommand::execute() } mJob = TDEIO::get( mUrl, false, false ); mJob->setReportDataSent( true ); - connect( mJob, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), - this, TQT_SLOT( slotDataArrived( TDEIO::Job*, const TQByteArray & ) ) ); - connect( mJob, TQT_SIGNAL( result( TDEIO::Job * ) ), - TQT_SLOT( slotResult( TDEIO::Job * ) ) ); + connect( mJob, TQ_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), + this, TQ_SLOT( slotDataArrived( TDEIO::Job*, const TQByteArray & ) ) ); + connect( mJob, TQ_SIGNAL( result( TDEIO::Job * ) ), + TQ_SLOT( slotResult( TDEIO::Job * ) ) ); setEmitsCompletedItself( true ); return OK; } @@ -1705,7 +1705,7 @@ KMCommand::Result KMSeStatusCommand::execute() f->setStatus( (*it2), mStatus, mToggle ); ++it2; } - //kapp->dcopClient()->emitDCOPSignal( "unreadCountChanged()", TQByteArray() ); + //tdeApp->dcopClient()->emitDCOPSignal( "unreadCountChanged()", TQByteArray() ); return OK; } @@ -1755,7 +1755,7 @@ KMCommand::Result KMFilterActionCommand::execute() TQString statusMsg = i18n("Filtering message %1 of %2"); statusMsg = statusMsg.arg( msgCount ).arg( msgCountToFilter ); KPIM::BroadcastStatus::instance()->setStatusMsg( statusMsg ); - TDEApplication::kApplication()->eventLoop()->processEvents( TQEventLoop::ExcludeUserInput, 50 ); + tdeApp->eventLoop()->processEvents( TQEventLoop::ExcludeUserInput, 50 ); } int filterResult = kmkernel->filterMgr()->process( serNum, mFilter ); @@ -1904,15 +1904,15 @@ void KMMenuCommand::makeFolderMenu(KMFolderNode* node, bool move, // connect the signals if (move) { - disconnect(menu, TQT_SIGNAL(activated(int)), receiver, - TQT_SLOT(moveSelectedToFolder(int))); - connect(menu, TQT_SIGNAL(activated(int)), receiver, - TQT_SLOT(moveSelectedToFolder(int))); + disconnect(menu, TQ_SIGNAL(activated(int)), receiver, + TQ_SLOT(moveSelectedToFolder(int))); + connect(menu, TQ_SIGNAL(activated(int)), receiver, + TQ_SLOT(moveSelectedToFolder(int))); } else { - disconnect(menu, TQT_SIGNAL(activated(int)), receiver, - TQT_SLOT(copySelectedToFolder(int))); - connect(menu, TQT_SIGNAL(activated(int)), receiver, - TQT_SLOT(copySelectedToFolder(int))); + disconnect(menu, TQ_SIGNAL(activated(int)), receiver, + TQ_SLOT(copySelectedToFolder(int))); + connect(menu, TQ_SIGNAL(activated(int)), receiver, + TQ_SLOT(copySelectedToFolder(int))); } KMFolder *folder = 0; @@ -2036,10 +2036,10 @@ KMCommand::Result KMCopyCommand::execute() FolderJob *job = srcFolder->createJob(newMsg); job->setCancellable( false ); mPendingJobs << job; - connect(job, TQT_SIGNAL(messageRetrieved(KMMessage*)), - mDestFolder, TQT_SLOT(reallyAddCopyOfMsg(KMMessage*))); - connect( job, TQT_SIGNAL(result(KMail::FolderJob*)), - this, TQT_SLOT(slotJobFinished(KMail::FolderJob*)) ); + connect(job, TQ_SIGNAL(messageRetrieved(KMMessage*)), + mDestFolder, TQ_SLOT(reallyAddCopyOfMsg(KMMessage*))); + connect( job, TQ_SIGNAL(result(KMail::FolderJob*)), + this, TQ_SLOT(slotJobFinished(KMail::FolderJob*)) ); job->start(); } else { // local => others @@ -2067,8 +2067,8 @@ KMCommand::Result KMCopyCommand::execute() if ( mPendingJobs.isEmpty() ) { // wait for the end of the copy before closing the folder KMFolderImap *imapDestFolder = static_cast<KMFolderImap*>(mDestFolder->storage()); - connect( imapDestFolder, TQT_SIGNAL( folderComplete( KMFolderImap*, bool ) ), - this, TQT_SLOT( slotFolderComplete( KMFolderImap*, bool ) ) ); + connect( imapDestFolder, TQ_SIGNAL( folderComplete( KMFolderImap*, bool ) ), + this, TQ_SLOT( slotFolderComplete( KMFolderImap*, bool ) ) ); } } else { deleteNow = list.isEmpty() && mPendingJobs.isEmpty(); // we're done if there are no other mails we need to fetch @@ -2081,8 +2081,8 @@ KMCommand::Result KMCopyCommand::execute() { // copy the message(s); note: the list is empty afterwards! KMFolderImap *imapDestFolder = static_cast<KMFolderImap*>(mDestFolder->storage()); - connect( imapDestFolder, TQT_SIGNAL( folderComplete( KMFolderImap*, bool ) ), - this, TQT_SLOT( slotFolderComplete( KMFolderImap*, bool ) ) ); + connect( imapDestFolder, TQ_SIGNAL( folderComplete( KMFolderImap*, bool ) ), + this, TQ_SLOT( slotFolderComplete( KMFolderImap*, bool ) ) ); imapDestFolder->copyMsg(list); imapDestFolder->getFolder(); } @@ -2107,8 +2107,8 @@ void KMCopyCommand::slotJobFinished(KMail::FolderJob * job) kdDebug(5006) << k_funcinfo << "folder job failed: " << job->error() << endl; // kill all pending jobs for ( TQValueList<KMail::FolderJob*>::Iterator it = mPendingJobs.begin(); it != mPendingJobs.end(); ++it ) { - disconnect( (*it), TQT_SIGNAL(result(KMail::FolderJob*)), - this, TQT_SLOT(slotJobFinished(KMail::FolderJob*)) ); + disconnect( (*it), TQ_SIGNAL(result(KMail::FolderJob*)), + this, TQ_SLOT(slotJobFinished(KMail::FolderJob*)) ); (*it)->kill(); } mPendingJobs.clear(); @@ -2181,8 +2181,8 @@ KMCommand::Result KMMoveCommand::execute() ProgressManager::createProgressItem ( "move"+ProgressManager::getUniqueID(), mDestFolder ? i18n( "Moving messages" ) : i18n( "Deleting messages" ) ); - connect( mProgressItem, TQT_SIGNAL( progressItemCanceled( KPIM::ProgressItem* ) ), - this, TQT_SLOT( slotMoveCanceled() ) ); + connect( mProgressItem, TQ_SIGNAL( progressItemCanceled( KPIM::ProgressItem* ) ), + this, TQ_SLOT( slotMoveCanceled() ) ); KMMessage *msg; int rc = 0; @@ -2192,8 +2192,8 @@ KMCommand::Result KMMoveCommand::execute() mCompleteWithAddedMsg = false; if (mDestFolder) { - connect (mDestFolder, TQT_SIGNAL(msgAdded(KMFolder*, TQ_UINT32)), - this, TQT_SLOT(slotMsgAddedToDestFolder(KMFolder*, TQ_UINT32))); + connect (mDestFolder, TQ_SIGNAL(msgAdded(KMFolder*, TQ_UINT32)), + this, TQ_SLOT(slotMsgAddedToDestFolder(KMFolder*, TQ_UINT32))); mLostBoys = mSerNumList; } mProgressItem->setTotalItems( mSerNumList.count() ); @@ -2235,11 +2235,11 @@ KMCommand::Result KMMoveCommand::execute() * signal so we notice when all the mails should have showed up in it * but haven't for some reason. */ KMFolderImap *imapFolder = static_cast<KMFolderImap*> ( mDestFolder->storage() ); - disconnect (imapFolder, TQT_SIGNAL(folderComplete( KMFolderImap*, bool )), - this, TQT_SLOT(slotImapFolderCompleted( KMFolderImap*, bool ))); + disconnect (imapFolder, TQ_SIGNAL(folderComplete( KMFolderImap*, bool )), + this, TQ_SLOT(slotImapFolderCompleted( KMFolderImap*, bool ))); - connect (imapFolder, TQT_SIGNAL(folderComplete( KMFolderImap*, bool )), - this, TQT_SLOT(slotImapFolderCompleted( KMFolderImap*, bool ))); + connect (imapFolder, TQ_SIGNAL(folderComplete( KMFolderImap*, bool )), + this, TQ_SLOT(slotImapFolderCompleted( KMFolderImap*, bool ))); list.append(msg); } else { // We are moving to a local folder. @@ -2297,8 +2297,8 @@ KMCommand::Result KMMoveCommand::execute() void KMMoveCommand::slotImapFolderCompleted(KMFolderImap* imapFolder, bool success) { - disconnect (imapFolder, TQT_SIGNAL(folderComplete( KMFolderImap*, bool )), - this, TQT_SLOT(slotImapFolderCompleted( KMFolderImap*, bool ))); + disconnect (imapFolder, TQ_SIGNAL(folderComplete( KMFolderImap*, bool )), + this, TQ_SLOT(slotImapFolderCompleted( KMFolderImap*, bool ))); if ( success ) { // the folder was checked successfully but we were still called, so check // if we are still waiting for messages to show up. If so, uidValidity @@ -2327,8 +2327,8 @@ void KMMoveCommand::slotMsgAddedToDestFolder(KMFolder *folder, TQ_UINT32 serNum) mLostBoys.remove(serNum); if ( mLostBoys.isEmpty() ) { // we are done. All messages transferred to the host succesfully - disconnect (mDestFolder, TQT_SIGNAL(msgAdded(KMFolder*, TQ_UINT32)), - this, TQT_SLOT(slotMsgAddedToDestFolder(KMFolder*, TQ_UINT32))); + disconnect (mDestFolder, TQ_SIGNAL(msgAdded(KMFolder*, TQ_UINT32)), + this, TQ_SLOT(slotMsgAddedToDestFolder(KMFolder*, TQ_UINT32))); if (mDestFolder && mDestFolder->folderType() != KMFolderTypeImap) { mDestFolder->sync(); } @@ -2526,8 +2526,8 @@ KMCommand::Result KMSaveAttachmentsCommand::execute() setDeletesItself( true ); // load all parts KMLoadPartsCommand *command = new KMLoadPartsCommand( mAttachmentMap ); - connect( command, TQT_SIGNAL( partsRetrieved() ), - this, TQT_SLOT( slotSaveAll() ) ); + connect( command, TQ_SIGNAL( partsRetrieved() ), + this, TQ_SLOT( slotSaveAll() ) ); command->start(); return OK; @@ -2832,8 +2832,8 @@ void KMLoadPartsCommand::slotStart() curFolder->createJob( it.data(), FolderJob::tGetMessage, 0, it.key()->msgPart().partSpecifier() ); job->setCancellable( false ); - connect( job, TQT_SIGNAL(messageUpdated(KMMessage*, TQString)), - this, TQT_SLOT(slotPartRetrieved(KMMessage*, TQString)) ); + connect( job, TQ_SIGNAL(messageUpdated(KMMessage*, TQString)), + this, TQ_SLOT(slotPartRetrieved(KMMessage*, TQString)) ); job->start(); } else kdWarning(5006) << "KMLoadPartsCommand - msg has no parent" << endl; @@ -2928,8 +2928,8 @@ KMCommand::Result KMMailingListCommand::execute() new KMUrlClickedCommand( lst.first(), mFolder->identity(), 0, false ); } if ( command ) { - connect( command, TQT_SIGNAL( completed( KMCommand * ) ), - this, TQT_SLOT( commandCompleted( KMCommand * ) ) ); + connect( command, TQ_SIGNAL( completed( KMCommand * ) ), + this, TQ_SLOT( commandCompleted( KMCommand * ) ) ); setDeletesItself( true ); setEmitsCompletedItself( true ); command->start(); @@ -3049,8 +3049,8 @@ void KMHandleAttachmentCommand::slotStart() // load the part kdDebug(5006) << "load part" << endl; KMLoadPartsCommand *command = new KMLoadPartsCommand( mNode, mMsg ); - connect( command, TQT_SIGNAL( partsRetrieved() ), - this, TQT_SLOT( slotPartComplete() ) ); + connect( command, TQ_SIGNAL( partsRetrieved() ), + this, TQ_SLOT( slotPartComplete() ) ); command->start(); } else { @@ -3239,8 +3239,8 @@ void KMHandleAttachmentCommand::atmEncryptWithChiasmus() if ( !chiasmus ) return; - const STD_NAMESPACE_PREFIX auto_ptr<Kleo::SpecialJob> listjob( chiasmus->specialJob( "x-obtain-keys", TQStringVariantMap() ) ); - if ( !listjob.get() ) { + const STD_NAMESPACE_PREFIX unique_ptr<Kleo::SpecialJob> listjob( chiasmus->specialJob( "x-obtain-keys", TQStringVariantMap() ) ); + if ( !listjob ) { const TQString msg = i18n( "Chiasmus backend does not offer the " "\"x-obtain-keys\" function. Please report this bug." ); KMessageBox::error( parentWidget(), msg, i18n( "Chiasmus Backend Error" ) ); @@ -3306,8 +3306,8 @@ void KMHandleAttachmentCommand::atmEncryptWithChiasmus() } mJob = job; - connect( job, TQT_SIGNAL(result(const GpgME::Error&,const TQVariant&)), - this, TQT_SLOT(slotAtmDecryptWithChiasmusResult(const GpgME::Error&,const TQVariant&)) ); + connect( job, TQ_SIGNAL(result(const GpgME::Error&,const TQVariant&)), + this, TQ_SLOT(slotAtmDecryptWithChiasmusResult(const GpgME::Error&,const TQVariant&)) ); } static const TQString chomp( const TQString & base, const TQString & suffix, bool cs ) { @@ -3350,8 +3350,8 @@ void KMHandleAttachmentCommand::slotAtmDecryptWithChiasmusResult( const GpgME::E d.setDisabled( true ); // we got this far, don't delete yet TDEIO::Job * uploadJob = TDEIO::storedPut( result.toByteArray(), url, -1, overwrite, false /*resume*/ ); uploadJob->setWindow( parentWidget() ); - connect( uploadJob, TQT_SIGNAL(result(TDEIO::Job*)), - this, TQT_SLOT(slotAtmDecryptWithChiasmusUploadResult(TDEIO::Job*)) ); + connect( uploadJob, TQ_SIGNAL(result(TDEIO::Job*)), + this, TQ_SLOT(slotAtmDecryptWithChiasmusUploadResult(TDEIO::Job*)) ); } void KMHandleAttachmentCommand::slotAtmDecryptWithChiasmusUploadResult( TDEIO::Job * job ) @@ -3412,8 +3412,8 @@ void AttachmentModifyCommand::storeChangedMessage(KMMessage * msg) int res = mFolder->addMsg( msg ) != 0; if ( mFolder->folderType() == KMFolderTypeImap ) { KMFolderImap *f = static_cast<KMFolderImap*>( mFolder->storage() ); - connect( f, TQT_SIGNAL(folderComplete(KMFolderImap*,bool)), - TQT_SLOT(messageStoreResult(KMFolderImap*,bool)) ); + connect( f, TQ_SIGNAL(folderComplete(KMFolderImap*,bool)), + TQ_SLOT(messageStoreResult(KMFolderImap*,bool)) ); } else { messageStoreResult( 0, res == 0 ); } @@ -3424,7 +3424,7 @@ void AttachmentModifyCommand::messageStoreResult(KMFolderImap* folder, bool succ Q_UNUSED( folder ); if ( success ) { KMCommand *delCmd = new KMDeleteMsgCommand( mSernum ); - connect( delCmd, TQT_SIGNAL(completed(KMCommand*)), TQT_SLOT(messageDeleteResult(KMCommand*)) ); + connect( delCmd, TQ_SIGNAL(completed(KMCommand*)), TQ_SLOT(messageDeleteResult(KMCommand*)) ); delCmd->start(); return; } @@ -3515,7 +3515,7 @@ KMCommand::Result KMEditAttachmentCommand::doAttachmentModify() new KMail::EditorWatcher( KURL( mTempFile.file()->name() ), part.typeStr() + "/" + part.subtypeStr(), false, this, parentWidget() ); - connect( watcher, TQT_SIGNAL(editDone(KMail::EditorWatcher*)), TQT_SLOT(editDone(KMail::EditorWatcher*)) ); + connect( watcher, TQ_SIGNAL(editDone(KMail::EditorWatcher*)), TQ_SLOT(editDone(KMail::EditorWatcher*)) ); if ( !watcher->start() ) return Failed; setEmitsCompletedItself( true ); @@ -3586,7 +3586,7 @@ KMCommand::Result CreateTodoCommand::execute() tf.file()->writeBlock( msg->asDwString().c_str(), msg->asDwString().length() ); tf.close(); - KCalendarIface_stub *iface = new KCalendarIface_stub( kapp->dcopClient(), "korganizer", "CalendarIface" ); + KCalendarIface_stub *iface = new KCalendarIface_stub( tdeApp->dcopClient(), "korganizer", "CalendarIface" ); iface->openTodoEditor( i18n("Mail: %1").arg( msg->subject() ), txt, uri, tf.name(), TQStringList(), "message/rfc822", true ); delete iface; diff --git a/kmail/kmcommands.h b/kmail/kmcommands.h index 24e42524..54d4bf14 100644 --- a/kmail/kmcommands.h +++ b/kmail/kmcommands.h @@ -11,7 +11,7 @@ #include <tdeio/job.h> #include "kmmsgbase.h" // for KMMsgStatus #include <mimelib/string.h> -#include <kdemacros.h> +#include <tdemacros.h> #include <kservice.h> #include <tdetempfile.h> @@ -46,9 +46,9 @@ namespace Kleo { class SpecialJob; } typedef TQMap<int,KMFolder*> KMMenuToFolder; typedef TQMap<partNode*, KMMessage*> PartNodeMessageMap; -class KDE_EXPORT KMCommand : public TQObject +class TDE_EXPORT KMCommand : public TQObject { - Q_OBJECT + TQ_OBJECT friend class LaterDeleterWithCommandCompletion; @@ -160,9 +160,9 @@ private: TQValueList<TQGuardedPtr<KMFolder> > mFolders; }; -class KDE_EXPORT KMMailtoComposeCommand : public KMCommand +class TDE_EXPORT KMMailtoComposeCommand : public KMCommand { - Q_OBJECT + TQ_OBJECT public: @@ -175,9 +175,9 @@ private: KMMessage *mMessage; }; -class KDE_EXPORT KMMailtoReplyCommand : public KMCommand +class TDE_EXPORT KMMailtoReplyCommand : public KMCommand { - Q_OBJECT + TQ_OBJECT public: @@ -191,9 +191,9 @@ private: TQString mSelection; }; -class KDE_EXPORT KMMailtoForwardCommand : public KMCommand +class TDE_EXPORT KMMailtoForwardCommand : public KMCommand { - Q_OBJECT + TQ_OBJECT public: @@ -206,9 +206,9 @@ private: KURL mUrl; }; -class KDE_EXPORT KMMailtoAddAddrBookCommand : public KMCommand +class TDE_EXPORT KMMailtoAddAddrBookCommand : public KMCommand { - Q_OBJECT + TQ_OBJECT public: @@ -220,9 +220,9 @@ private: KURL mUrl; }; -class KDE_EXPORT KMAddBookmarksCommand : public KMCommand +class TDE_EXPORT KMAddBookmarksCommand : public KMCommand { - Q_OBJECT + TQ_OBJECT public: @@ -235,9 +235,9 @@ private: }; -class KDE_EXPORT KMMailtoOpenAddrBookCommand : public KMCommand +class TDE_EXPORT KMMailtoOpenAddrBookCommand : public KMCommand { - Q_OBJECT + TQ_OBJECT public: @@ -249,9 +249,9 @@ private: KURL mUrl; }; -class KDE_EXPORT KMUrlCopyCommand : public KMCommand +class TDE_EXPORT KMUrlCopyCommand : public KMCommand { - Q_OBJECT + TQ_OBJECT public: @@ -264,9 +264,9 @@ private: KMMainWidget *mMainWidget; }; -class KDE_EXPORT KMUrlOpenCommand : public KMCommand +class TDE_EXPORT KMUrlOpenCommand : public KMCommand { - Q_OBJECT + TQ_OBJECT public: @@ -279,9 +279,9 @@ private: KMReaderWin *mReaderWin; }; -class KDE_EXPORT KMUrlSaveCommand : public KMCommand +class TDE_EXPORT KMUrlSaveCommand : public KMCommand { - Q_OBJECT + TQ_OBJECT public: @@ -296,9 +296,9 @@ private: KURL mUrl; }; -class KDE_EXPORT KMEditMsgCommand : public KMCommand +class TDE_EXPORT KMEditMsgCommand : public KMCommand { - Q_OBJECT + TQ_OBJECT public: @@ -308,9 +308,9 @@ private: virtual Result execute(); }; -class KDE_EXPORT KMUseTemplateCommand : public KMCommand +class TDE_EXPORT KMUseTemplateCommand : public KMCommand { - Q_OBJECT + TQ_OBJECT public: @@ -320,9 +320,9 @@ private: virtual Result execute(); }; -class KDE_EXPORT KMShowMsgSrcCommand : public KMCommand +class TDE_EXPORT KMShowMsgSrcCommand : public KMCommand { - Q_OBJECT + TQ_OBJECT public: @@ -335,9 +335,9 @@ private: bool mMsgWasComplete; }; -class KDE_EXPORT KMSaveMsgCommand : public KMCommand +class TDE_EXPORT KMSaveMsgCommand : public KMCommand { - Q_OBJECT + TQ_OBJECT public: @@ -367,9 +367,9 @@ private: TDEIO::TransferJob *mJob; }; -class KDE_EXPORT KMOpenMsgCommand : public KMCommand +class TDE_EXPORT KMOpenMsgCommand : public KMCommand { - Q_OBJECT + TQ_OBJECT public: @@ -391,9 +391,9 @@ private: const TQString mEncoding; }; -class KDE_EXPORT KMSaveAttachmentsCommand : public KMCommand +class TDE_EXPORT KMSaveAttachmentsCommand : public KMCommand { - Q_OBJECT + TQ_OBJECT public: /** Use this to save all attachments of the given message. @@ -430,9 +430,9 @@ private: bool mEncoded; }; -class KDE_EXPORT KMReplyToCommand : public KMCommand +class TDE_EXPORT KMReplyToCommand : public KMCommand { - Q_OBJECT + TQ_OBJECT public: @@ -446,9 +446,9 @@ private: TQString mSelection; }; -class KDE_EXPORT KMNoQuoteReplyToCommand : public KMCommand +class TDE_EXPORT KMNoQuoteReplyToCommand : public KMCommand { - Q_OBJECT + TQ_OBJECT public: @@ -460,7 +460,7 @@ private: class KMReplyListCommand : public KMCommand { - Q_OBJECT + TQ_OBJECT public: @@ -474,9 +474,9 @@ private: TQString mSelection; }; -class KDE_EXPORT KMReplyToAllCommand : public KMCommand +class TDE_EXPORT KMReplyToAllCommand : public KMCommand { - Q_OBJECT + TQ_OBJECT public: @@ -490,9 +490,9 @@ private: TQString mSelection; }; -class KDE_EXPORT KMReplyAuthorCommand : public KMCommand +class TDE_EXPORT KMReplyAuthorCommand : public KMCommand { - Q_OBJECT + TQ_OBJECT public: @@ -506,9 +506,9 @@ private: TQString mSelection; }; -class KDE_EXPORT KMForwardInlineCommand : public KMCommand +class TDE_EXPORT KMForwardInlineCommand : public KMCommand { - Q_OBJECT + TQ_OBJECT public: @@ -524,9 +524,9 @@ private: uint mIdentity; }; -class KDE_EXPORT KMForwardAttachedCommand : public KMCommand +class TDE_EXPORT KMForwardAttachedCommand : public KMCommand { - Q_OBJECT + TQ_OBJECT public: @@ -542,9 +542,9 @@ private: TQGuardedPtr<KMail::Composer> mWin; }; -class KDE_EXPORT KMForwardDigestCommand : public KMCommand +class TDE_EXPORT KMForwardDigestCommand : public KMCommand { - Q_OBJECT + TQ_OBJECT public: @@ -560,9 +560,9 @@ private: TQGuardedPtr<KMail::Composer> mWin; }; -class KDE_EXPORT KMRedirectCommand : public KMCommand +class TDE_EXPORT KMRedirectCommand : public KMCommand { - Q_OBJECT + TQ_OBJECT public: @@ -572,9 +572,9 @@ private: virtual Result execute(); }; -class KDE_EXPORT KMCustomReplyToCommand : public KMCommand +class TDE_EXPORT KMCustomReplyToCommand : public KMCommand { - Q_OBJECT + TQ_OBJECT public: @@ -590,9 +590,9 @@ private: TQString mTemplate; }; -class KDE_EXPORT KMCustomReplyAllToCommand : public KMCommand +class TDE_EXPORT KMCustomReplyAllToCommand : public KMCommand { - Q_OBJECT + TQ_OBJECT public: @@ -608,9 +608,9 @@ private: TQString mTemplate; }; -class KDE_EXPORT KMCustomForwardCommand : public KMCommand +class TDE_EXPORT KMCustomForwardCommand : public KMCommand { - Q_OBJECT + TQ_OBJECT public: @@ -626,9 +626,9 @@ private: TQString mTemplate; }; -class KDE_EXPORT KMPrintCommand : public KMCommand +class TDE_EXPORT KMPrintCommand : public KMCommand { - Q_OBJECT + TQ_OBJECT public: @@ -654,9 +654,9 @@ private: TQString mEncoding; }; -class KDE_EXPORT KMSeStatusCommand : public KMCommand +class TDE_EXPORT KMSeStatusCommand : public KMCommand { - Q_OBJECT + TQ_OBJECT public: @@ -673,9 +673,9 @@ private: bool mToggle; }; -class KDE_EXPORT KMFilterCommand : public KMCommand +class TDE_EXPORT KMFilterCommand : public KMCommand { - Q_OBJECT + TQ_OBJECT public: @@ -689,9 +689,9 @@ private: }; -class KDE_EXPORT KMFilterActionCommand : public KMCommand +class TDE_EXPORT KMFilterActionCommand : public KMCommand { - Q_OBJECT + TQ_OBJECT public: @@ -706,9 +706,9 @@ private: }; -class KDE_EXPORT KMMetaFilterActionCommand : public TQObject +class TDE_EXPORT KMMetaFilterActionCommand : public TQObject { - Q_OBJECT + TQ_OBJECT public: @@ -724,9 +724,9 @@ private: KMMainWidget *mMainWidget; }; -class KDE_EXPORT FolderShortcutCommand : public TQObject +class TDE_EXPORT FolderShortcutCommand : public TQObject { - Q_OBJECT + TQ_OBJECT public: @@ -747,9 +747,9 @@ private: }; -class KDE_EXPORT KMMailingListFilterCommand : public KMCommand +class TDE_EXPORT KMMailingListFilterCommand : public KMCommand { - Q_OBJECT + TQ_OBJECT public: @@ -762,14 +762,14 @@ private: /** Returns a popupmenu containing a hierarchy of folder names. Each item in the popupmenu is connected to a slot, if - move is TRUE this slot will cause all selected messages to + move is true this slot will cause all selected messages to be moved into the given folder, otherwise messages will be copied. Am empty KMMenuToFolder must be passed in. */ -class KDE_EXPORT KMMenuCommand : public KMCommand +class TDE_EXPORT KMMenuCommand : public KMCommand { - Q_OBJECT + TQ_OBJECT public: @@ -780,9 +780,9 @@ public: TQObject *receiver, KMMenuToFolder *aMenuToFolder, TQPopupMenu *menu ); }; -class KDE_EXPORT KMCopyCommand : public KMMenuCommand +class TDE_EXPORT KMCopyCommand : public KMMenuCommand { - Q_OBJECT + TQ_OBJECT public: @@ -806,9 +806,9 @@ private: namespace KPIM { class ProgressItem; } -class KDE_EXPORT KMMoveCommand : public KMMenuCommand +class TDE_EXPORT KMMoveCommand : public KMMenuCommand { - Q_OBJECT + TQ_OBJECT public: @@ -842,9 +842,9 @@ private: bool mCompleteWithAddedMsg; }; -class KDE_EXPORT KMDeleteMsgCommand : public KMMoveCommand +class TDE_EXPORT KMDeleteMsgCommand : public KMMoveCommand { - Q_OBJECT + TQ_OBJECT public: @@ -857,9 +857,9 @@ private: }; -class KDE_EXPORT KMUrlClickedCommand : public KMCommand +class TDE_EXPORT KMUrlClickedCommand : public KMCommand { - Q_OBJECT + TQ_OBJECT public: @@ -876,9 +876,9 @@ private: KMMainWidget *mMainWidget; }; -class KDE_EXPORT KMLoadPartsCommand : public KMCommand +class TDE_EXPORT KMLoadPartsCommand : public KMCommand { - Q_OBJECT + TQ_OBJECT public: @@ -902,9 +902,9 @@ private: PartNodeMessageMap mPartMap; }; -class KDE_EXPORT KMResendMessageCommand : public KMCommand +class TDE_EXPORT KMResendMessageCommand : public KMCommand { - Q_OBJECT + TQ_OBJECT public: @@ -914,9 +914,9 @@ private: virtual Result execute(); }; -class KDE_EXPORT KMMailingListCommand : public KMCommand +class TDE_EXPORT KMMailingListCommand : public KMCommand { - Q_OBJECT + TQ_OBJECT public: KMMailingListCommand( TQWidget *parent, KMFolder *folder ); @@ -930,9 +930,9 @@ protected: KMFolder *mFolder; }; -class KDE_EXPORT KMMailingListPostCommand : public KMMailingListCommand +class TDE_EXPORT KMMailingListPostCommand : public KMMailingListCommand { - Q_OBJECT + TQ_OBJECT public: KMMailingListPostCommand( TQWidget *parent, KMFolder *folder ); @@ -940,9 +940,9 @@ protected: virtual KURL::List urls() const; }; -class KDE_EXPORT KMMailingListSubscribeCommand : public KMMailingListCommand +class TDE_EXPORT KMMailingListSubscribeCommand : public KMMailingListCommand { - Q_OBJECT + TQ_OBJECT public: KMMailingListSubscribeCommand( TQWidget *parent, KMFolder *folder ); @@ -950,9 +950,9 @@ protected: virtual KURL::List urls() const; }; -class KDE_EXPORT KMMailingListUnsubscribeCommand : public KMMailingListCommand +class TDE_EXPORT KMMailingListUnsubscribeCommand : public KMMailingListCommand { - Q_OBJECT + TQ_OBJECT public: KMMailingListUnsubscribeCommand( TQWidget *parent, KMFolder *folder ); @@ -960,9 +960,9 @@ protected: virtual KURL::List urls() const; }; -class KDE_EXPORT KMMailingListArchivesCommand : public KMMailingListCommand +class TDE_EXPORT KMMailingListArchivesCommand : public KMMailingListCommand { - Q_OBJECT + TQ_OBJECT public: KMMailingListArchivesCommand( TQWidget *parent, KMFolder *folder ); @@ -970,9 +970,9 @@ protected: virtual KURL::List urls() const; }; -class KDE_EXPORT KMMailingListHelpCommand : public KMMailingListCommand +class TDE_EXPORT KMMailingListHelpCommand : public KMMailingListCommand { - Q_OBJECT + TQ_OBJECT public: KMMailingListHelpCommand( TQWidget *parent, KMFolder *folder ); @@ -980,9 +980,9 @@ protected: virtual KURL::List urls() const; }; -class KDE_EXPORT KMIMChatCommand : public KMCommand +class TDE_EXPORT KMIMChatCommand : public KMCommand { - Q_OBJECT + TQ_OBJECT public: @@ -1001,9 +1001,9 @@ private: KMMessage *mMessage; }; -class KDE_EXPORT KMHandleAttachmentCommand : public KMCommand +class TDE_EXPORT KMHandleAttachmentCommand : public KMCommand { - Q_OBJECT + TQ_OBJECT public: @@ -1088,9 +1088,9 @@ private: /** Base class for commands modifying attachements of existing messages. */ -class KDE_EXPORT AttachmentModifyCommand : public KMCommand +class TDE_EXPORT AttachmentModifyCommand : public KMCommand { - Q_OBJECT + TQ_OBJECT public: AttachmentModifyCommand( partNode *node, KMMessage *msg, TQWidget *parent ); @@ -1116,9 +1116,9 @@ class KDE_EXPORT AttachmentModifyCommand : public KMCommand TQGuardedPtr<KMFolder> mFolder; }; -class KDE_EXPORT KMDeleteAttachmentCommand : public AttachmentModifyCommand +class TDE_EXPORT KMDeleteAttachmentCommand : public AttachmentModifyCommand { - Q_OBJECT + TQ_OBJECT public: KMDeleteAttachmentCommand( partNode *node, KMMessage *msg, TQWidget *parent ); @@ -1130,9 +1130,9 @@ class KDE_EXPORT KMDeleteAttachmentCommand : public AttachmentModifyCommand }; -class KDE_EXPORT KMEditAttachmentCommand : public AttachmentModifyCommand +class TDE_EXPORT KMEditAttachmentCommand : public AttachmentModifyCommand { - Q_OBJECT + TQ_OBJECT public: KMEditAttachmentCommand( partNode *node, KMMessage *msg, TQWidget *parent ); @@ -1149,9 +1149,9 @@ class KDE_EXPORT KMEditAttachmentCommand : public AttachmentModifyCommand KTempFile mTempFile; }; -class KDE_EXPORT CreateTodoCommand : public KMCommand +class TDE_EXPORT CreateTodoCommand : public KMCommand { - Q_OBJECT + TQ_OBJECT public: CreateTodoCommand( TQWidget *parent, KMMessage *msg ); diff --git a/kmail/kmcomposewin.cpp b/kmail/kmcomposewin.cpp index 9125f56f..2202deec 100644 --- a/kmail/kmcomposewin.cpp +++ b/kmail/kmcomposewin.cpp @@ -103,7 +103,7 @@ using TDERecentAddress::RecentAddresses; #include <kuserprofile.h> #include <krun.h> #include <ktempdir.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> //#include <keditlistbox.h> #include "globalsettings.h" #include "replyphrases.h" @@ -195,7 +195,7 @@ KMComposeWin::KMComposeWin( KMMessage *aMsg, uint id ) setInstance( kmkernel->xmlGuiInstance() ); mMainWidget = new TQWidget(this); // splitter between the headers area and the actual editor - mHeadersToEditorSplitter = new TQSplitter( Qt::Vertical, mMainWidget, "mHeadersToEditorSplitter" ); + mHeadersToEditorSplitter = new TQSplitter( TQt::Vertical, mMainWidget, "mHeadersToEditorSplitter" ); mHeadersToEditorSplitter->setChildrenCollapsible( false ); mHeadersArea = new TQWidget( mHeadersToEditorSplitter ); mHeadersArea->setSizePolicy( mHeadersToEditorSplitter->sizePolicy().horData(), TQSizePolicy::Maximum ); @@ -225,8 +225,8 @@ KMComposeWin::KMComposeWin( KMMessage *aMsg, uint id ) mEdtReplyTo = new KMLineEdit(true,mHeadersArea, "replyToLine"); TQToolTip::add( mEdtReplyTo, i18n( "Set the \"Reply-To:\" email address for this message" ) ); - connect(mEdtReplyTo,TQT_SIGNAL(completionModeChanged(TDEGlobalSettings::Completion)), - TQT_SLOT(slotCompletionModeChanged(TDEGlobalSettings::Completion))); + connect(mEdtReplyTo,TQ_SIGNAL(completionModeChanged(TDEGlobalSettings::Completion)), + TQ_SLOT(slotCompletionModeChanged(TDEGlobalSettings::Completion))); if ( mClassicalRecipients ) { mRecipientsEditor = 0; @@ -249,22 +249,22 @@ KMComposeWin::KMComposeWin( KMMessage *aMsg, uint id ) TQToolTip::add( mBtnCc, tip ); TQToolTip::add( mBtnBcc, tip ); - mBtnTo->setFocusPolicy(TQ_NoFocus); - mBtnCc->setFocusPolicy(TQ_NoFocus); - mBtnBcc->setFocusPolicy(TQ_NoFocus); - //mBtnFrom->setFocusPolicy(TQ_NoFocus); + mBtnTo->setFocusPolicy(TQWidget::NoFocus); + mBtnCc->setFocusPolicy(TQWidget::NoFocus); + mBtnBcc->setFocusPolicy(TQWidget::NoFocus); + //mBtnFrom->setFocusPolicy(TQWidget::NoFocus); - connect(mBtnTo,TQT_SIGNAL(clicked()),TQT_SLOT(slotAddrBookTo())); - connect(mBtnCc,TQT_SIGNAL(clicked()),TQT_SLOT(slotAddrBookTo())); - connect(mBtnBcc,TQT_SIGNAL(clicked()),TQT_SLOT(slotAddrBookTo())); - //connect(mBtnFrom,TQT_SIGNAL(clicked()),TQT_SLOT(slotAddrBookFrom())); + connect(mBtnTo,TQ_SIGNAL(clicked()),TQ_SLOT(slotAddrBookTo())); + connect(mBtnCc,TQ_SIGNAL(clicked()),TQ_SLOT(slotAddrBookTo())); + connect(mBtnBcc,TQ_SIGNAL(clicked()),TQ_SLOT(slotAddrBookTo())); + //connect(mBtnFrom,TQ_SIGNAL(clicked()),TQ_SLOT(slotAddrBookFrom())); - connect(mEdtTo,TQT_SIGNAL(completionModeChanged(TDEGlobalSettings::Completion)), - TQT_SLOT(slotCompletionModeChanged(TDEGlobalSettings::Completion))); - connect(mEdtCc,TQT_SIGNAL(completionModeChanged(TDEGlobalSettings::Completion)), - TQT_SLOT(slotCompletionModeChanged(TDEGlobalSettings::Completion))); - connect(mEdtBcc,TQT_SIGNAL(completionModeChanged(TDEGlobalSettings::Completion)), - TQT_SLOT(slotCompletionModeChanged(TDEGlobalSettings::Completion))); + connect(mEdtTo,TQ_SIGNAL(completionModeChanged(TDEGlobalSettings::Completion)), + TQ_SLOT(slotCompletionModeChanged(TDEGlobalSettings::Completion))); + connect(mEdtCc,TQ_SIGNAL(completionModeChanged(TDEGlobalSettings::Completion)), + TQ_SLOT(slotCompletionModeChanged(TDEGlobalSettings::Completion))); + connect(mEdtBcc,TQ_SIGNAL(completionModeChanged(TDEGlobalSettings::Completion)), + TQ_SLOT(slotCompletionModeChanged(TDEGlobalSettings::Completion))); mEdtTo->setFocus(); } else { @@ -283,9 +283,9 @@ KMComposeWin::KMComposeWin( KMMessage *aMsg, uint id ) mRecipientsEditor = new RecipientsEditor( mHeadersArea ); connect( mRecipientsEditor, - TQT_SIGNAL( completionModeChanged( TDEGlobalSettings::Completion ) ), - TQT_SLOT( slotCompletionModeChanged( TDEGlobalSettings::Completion ) ) ); - connect( mRecipientsEditor, TQT_SIGNAL(sizeHintChanged()), TQT_SLOT(recipientEditorSizeHintChanged()) ); + TQ_SIGNAL( completionModeChanged( TDEGlobalSettings::Completion ) ), + TQ_SLOT( slotCompletionModeChanged( TDEGlobalSettings::Completion ) ) ); + connect( mRecipientsEditor, TQ_SIGNAL(sizeHintChanged()), TQ_SLOT(recipientEditorSizeHintChanged()) ); mRecipientsEditor->setFocus(); } @@ -330,9 +330,9 @@ KMComposeWin::KMComposeWin( KMMessage *aMsg, uint id ) mFixedFontAction = 0; mTempDir = 0; // the attachment view is separated from the editor by a splitter - mSplitter = new TQSplitter( Qt::Vertical, mHeadersToEditorSplitter, "mSplitter" ); + mSplitter = new TQSplitter( TQt::Vertical, mHeadersToEditorSplitter, "mSplitter" ); mSplitter->setChildrenCollapsible( false ); - mSnippetSplitter = new TQSplitter( Qt::Horizontal, mSplitter, "mSnippetSplitter"); + mSnippetSplitter = new TQSplitter( TQt::Horizontal, mSplitter, "mSnippetSplitter"); mSnippetSplitter->setChildrenCollapsible( false ); TQWidget *editorAndCryptoStateIndicators = new TQWidget( mSnippetSplitter ); @@ -385,10 +385,10 @@ KMComposeWin::KMComposeWin( KMMessage *aMsg, uint id ) setCaption( i18n("Composer") ); setMinimumSize(200,200); - mBtnIdentity->setFocusPolicy(TQ_NoFocus); - mBtnFcc->setFocusPolicy(TQ_NoFocus); - mBtnTransport->setFocusPolicy(TQ_NoFocus); - mBtnDictionary->setFocusPolicy( TQ_NoFocus ); + mBtnIdentity->setFocusPolicy(TQWidget::NoFocus); + mBtnFcc->setFocusPolicy(TQWidget::NoFocus); + mBtnTransport->setFocusPolicy(TQWidget::NoFocus); + mBtnDictionary->setFocusPolicy( TQWidget::NoFocus ); mAtmListView = new AttachmentListView( this, mSplitter, "attachment list view" ); @@ -413,20 +413,20 @@ KMComposeWin::KMComposeWin( KMMessage *aMsg, uint id ) mAtmListView->setAllColumnsShowFocus( true ); connect( mAtmListView, - TQT_SIGNAL( doubleClicked( TQListViewItem* ) ), - TQT_SLOT( slotAttachEdit() ) ); + TQ_SIGNAL( doubleClicked( TQListViewItem* ) ), + TQ_SLOT( slotAttachEdit() ) ); connect( mAtmListView, - TQT_SIGNAL( rightButtonPressed( TQListViewItem*, const TQPoint&, int ) ), - TQT_SLOT( slotAttachPopupMenu( TQListViewItem*, const TQPoint&, int ) ) ); + TQ_SIGNAL( rightButtonPressed( TQListViewItem*, const TQPoint&, int ) ), + TQ_SLOT( slotAttachPopupMenu( TQListViewItem*, const TQPoint&, int ) ) ); connect( mAtmListView, - TQT_SIGNAL( selectionChanged() ), - TQT_SLOT( slotUpdateAttachActions() ) ); + TQ_SIGNAL( selectionChanged() ), + TQ_SLOT( slotUpdateAttachActions() ) ); connect( mAtmListView, - TQT_SIGNAL( attachmentDeleted() ), - TQT_SLOT( slotAttachRemove() ) ); + TQ_SIGNAL( attachmentDeleted() ), + TQ_SLOT( slotAttachRemove() ) ); connect( mAtmListView, - TQT_SIGNAL( dragStarted() ), - TQT_SLOT( slotAttachmentDragStarted() ) ); + TQ_SIGNAL( dragStarted() ), + TQ_SLOT( slotAttachmentDragStarted() ) ); mAttachMenu = 0; readConfig(); @@ -437,32 +437,32 @@ KMComposeWin::KMComposeWin( KMMessage *aMsg, uint id ) applyMainWindowSettings(KMKernel::config(), "Composer"); - connect( mEdtSubject, TQT_SIGNAL( subjectTextSpellChecked() ), - TQT_SLOT( slotSubjectTextSpellChecked() ) ); - connect(mEdtSubject,TQT_SIGNAL(textChanged(const TQString&)), - TQT_SLOT(slotUpdWinTitle(const TQString&))); - connect(mIdentity,TQT_SIGNAL(identityChanged(uint)), - TQT_SLOT(slotIdentityChanged(uint))); - connect( kmkernel->identityManager(), TQT_SIGNAL(changed(uint)), - TQT_SLOT(slotIdentityChanged(uint))); - - connect(mEdtFrom,TQT_SIGNAL(completionModeChanged(TDEGlobalSettings::Completion)), - TQT_SLOT(slotCompletionModeChanged(TDEGlobalSettings::Completion))); - connect(kmkernel->folderMgr(),TQT_SIGNAL(folderRemoved(KMFolder*)), - TQT_SLOT(slotFolderRemoved(KMFolder*))); - connect(kmkernel->imapFolderMgr(),TQT_SIGNAL(folderRemoved(KMFolder*)), - TQT_SLOT(slotFolderRemoved(KMFolder*))); - connect(kmkernel->dimapFolderMgr(),TQT_SIGNAL(folderRemoved(KMFolder*)), - TQT_SLOT(slotFolderRemoved(KMFolder*))); - connect( kmkernel, TQT_SIGNAL( configChanged() ), - TQT_TQOBJECT(this), TQT_SLOT( slotConfigChanged() ) ); - - connect (mEditor, TQT_SIGNAL (spellcheck_done(int)), - this, TQT_SLOT (slotSpellcheckDone (int))); - connect (mEditor, TQT_SIGNAL( attachPNGImageData(const TQByteArray &) ), - this, TQT_SLOT ( slotAttachPNGImageData(const TQByteArray &) ) ); - connect (mEditor, TQT_SIGNAL( focusChanged(bool) ), - this, TQT_SLOT (editorFocusChanged(bool)) ); + connect( mEdtSubject, TQ_SIGNAL( subjectTextSpellChecked() ), + TQ_SLOT( slotSubjectTextSpellChecked() ) ); + connect(mEdtSubject,TQ_SIGNAL(textChanged(const TQString&)), + TQ_SLOT(slotUpdWinTitle(const TQString&))); + connect(mIdentity,TQ_SIGNAL(identityChanged(uint)), + TQ_SLOT(slotIdentityChanged(uint))); + connect( kmkernel->identityManager(), TQ_SIGNAL(changed(uint)), + TQ_SLOT(slotIdentityChanged(uint))); + + connect(mEdtFrom,TQ_SIGNAL(completionModeChanged(TDEGlobalSettings::Completion)), + TQ_SLOT(slotCompletionModeChanged(TDEGlobalSettings::Completion))); + connect(kmkernel->folderMgr(),TQ_SIGNAL(folderRemoved(KMFolder*)), + TQ_SLOT(slotFolderRemoved(KMFolder*))); + connect(kmkernel->imapFolderMgr(),TQ_SIGNAL(folderRemoved(KMFolder*)), + TQ_SLOT(slotFolderRemoved(KMFolder*))); + connect(kmkernel->dimapFolderMgr(),TQ_SIGNAL(folderRemoved(KMFolder*)), + TQ_SLOT(slotFolderRemoved(KMFolder*))); + connect( kmkernel, TQ_SIGNAL( configChanged() ), + this, TQ_SLOT( slotConfigChanged() ) ); + + connect (mEditor, TQ_SIGNAL (spellcheck_done(int)), + this, TQ_SLOT (slotSpellcheckDone (int))); + connect (mEditor, TQ_SIGNAL( attachPNGImageData(const TQByteArray &) ), + this, TQ_SLOT ( slotAttachPNGImageData(const TQByteArray &) ) ); + connect (mEditor, TQ_SIGNAL( focusChanged(bool) ), + this, TQ_SLOT (editorFocusChanged(bool)) ); mMainWidget->resize(480,510); setCentralWidget(mMainWidget); @@ -553,7 +553,7 @@ void KMComposeWin::addAttachmentsAndSend(const KURL::List &urls, const TQString } mAttachFilesSend = how; mAttachFilesPending = urls; - connect(this, TQT_SIGNAL(attachmentAdded(const KURL&, bool)), TQT_SLOT(slotAttachedFile(const KURL&))); + connect(this, TQ_SIGNAL(attachmentAdded(const KURL&, bool)), TQ_SLOT(slotAttachedFile(const KURL&))); for( KURL::List::ConstIterator itr = urls.begin(); itr != urls.end(); ++itr ) { if (!addAttach( *itr )) mAttachFilesPending.remove(mAttachFilesPending.find(*itr)); // only remove one copy of the url @@ -647,15 +647,15 @@ bool KMComposeWin::event(TQEvent *e) void KMComposeWin::readColorConfig(void) { if ( GlobalSettings::self()->useDefaultColors() ) { - mForeColor = TQColor(kapp->palette().active().text()); - mBackColor = TQColor(kapp->palette().active().base()); + mForeColor = TQColor(tdeApp->palette().active().text()); + mBackColor = TQColor(tdeApp->palette().active().base()); } else { mForeColor = GlobalSettings::self()->foregroundColor(); mBackColor = GlobalSettings::self()->backgroundColor(); } // Color setup - mPalette = kapp->palette(); + mPalette = tdeApp->palette(); TQColorGroup cgrp = mPalette.active(); cgrp.setColor( TQColorGroup::Base, mBackColor); cgrp.setColor( TQColorGroup::Text, mForeColor); @@ -815,8 +815,8 @@ void KMComposeWin::autoSaveMessage() if ( mAutoSaveTimer ) mAutoSaveTimer->stop(); - connect( this, TQT_SIGNAL( applyChangesDone( bool ) ), - TQT_TQOBJECT(this), TQT_SLOT( slotContinueAutoSave() ) ); + connect( this, TQ_SIGNAL( applyChangesDone( bool ) ), + this, TQ_SLOT( slotContinueAutoSave() ) ); // This method is called when KMail crashed, so don't try signing/encryption // and don't disable controls because it is also called from a timer and // then the disabling is distracting. @@ -827,8 +827,8 @@ void KMComposeWin::autoSaveMessage() void KMComposeWin::slotContinueAutoSave() { - disconnect( this, TQT_SIGNAL( applyChangesDone( bool ) ), - TQT_TQOBJECT(this), TQT_SLOT( slotContinueAutoSave() ) ); + disconnect( this, TQ_SIGNAL( applyChangesDone( bool ) ), + this, TQ_SLOT( slotContinueAutoSave() ) ); // Ok, it's done now - continue dead letter saving if ( mComposedMessages.isEmpty() ) { @@ -887,7 +887,7 @@ void KMComposeWin::slotView(void) //This sucks awfully, but no, I cannot get an activated(int id) from // actionContainer() - if (!TQT_TQOBJECT_CONST(sender())->isA("TDEToggleAction")) + if (!sender()->isA("TDEToggleAction")) return; TDEToggleAction *act = (TDEToggleAction *) sender(); @@ -1076,22 +1076,22 @@ void KMComposeWin::rethinkFields(bool fromSlot) ++row; if ( showHeaders & HDR_REPLY_TO ) { - connect( mEdtReplyTo, TQT_SIGNAL( focusDown() ), mRecipientsEditor, - TQT_SLOT( setFocusTop() ) ); + connect( mEdtReplyTo, TQ_SIGNAL( focusDown() ), mRecipientsEditor, + TQ_SLOT( setFocusTop() ) ); } else { - connect( mEdtFrom, TQT_SIGNAL( focusDown() ), mRecipientsEditor, - TQT_SLOT( setFocusTop() ) ); + connect( mEdtFrom, TQ_SIGNAL( focusDown() ), mRecipientsEditor, + TQ_SLOT( setFocusTop() ) ); } if ( showHeaders & HDR_REPLY_TO ) { - connect( mRecipientsEditor, TQT_SIGNAL( focusUp() ), mEdtReplyTo, TQT_SLOT( setFocus() ) ); + connect( mRecipientsEditor, TQ_SIGNAL( focusUp() ), mEdtReplyTo, TQ_SLOT( setFocus() ) ); } else { - connect( mRecipientsEditor, TQT_SIGNAL( focusUp() ), mEdtFrom, TQT_SLOT( setFocus() ) ); + connect( mRecipientsEditor, TQ_SIGNAL( focusUp() ), mEdtFrom, TQ_SLOT( setFocus() ) ); } - connect( mRecipientsEditor, TQT_SIGNAL( focusDown() ), mEdtSubject, - TQT_SLOT( setFocus() ) ); - connect( mEdtSubject, TQT_SIGNAL( focusUp() ), mRecipientsEditor, - TQT_SLOT( setFocusBottom() ) ); + connect( mRecipientsEditor, TQ_SIGNAL( focusDown() ), mEdtSubject, + TQ_SLOT( setFocus() ) ); + connect( mEdtSubject, TQ_SIGNAL( focusUp() ), mRecipientsEditor, + TQ_SLOT( setFocusBottom() ) ); prevFocus = mRecipientsEditor; } @@ -1131,8 +1131,8 @@ void KMComposeWin::rethinkFields(bool fromSlot) TQWidget *KMComposeWin::connectFocusMoving( TQWidget *prev, TQWidget *next ) { - connect( prev, TQT_SIGNAL( focusDown() ), next, TQT_SLOT( setFocus() ) ); - connect( next, TQT_SIGNAL( focusUp() ), prev, TQT_SLOT( setFocus() ) ); + connect( prev, TQ_SIGNAL( focusDown() ), next, TQ_SLOT( setFocus() ) ); + connect( next, TQ_SIGNAL( focusUp() ), prev, TQ_SLOT( setFocus() ) ); return next; } @@ -1233,14 +1233,14 @@ void KMComposeWin::setupActions(void) { //default = send now, alternative = queue ( void ) new TDEAction( i18n("&Send Mail"), "mail-send", CTRL+Key_Return, - TQT_TQOBJECT(this), TQT_SLOT(slotSendNow()), actionCollection(),"send_default"); + this, TQ_SLOT(slotSendNow()), actionCollection(),"send_default"); // FIXME: change to mail_send_via icon when this exits. actActionNowMenu = new TDEActionMenu (i18n("&Send Mail Via"), "mail-send", actionCollection(), "send_default_via" ); - (void) new TDEAction (i18n("Send &Later"), "queue", 0, TQT_TQOBJECT(this), - TQT_SLOT(slotSendLater()), actionCollection(),"send_alternative"); + (void) new TDEAction (i18n("Send &Later"), "queue", 0, this, + TQ_SLOT(slotSendLater()), actionCollection(),"send_alternative"); actActionLaterMenu = new TDEActionMenu (i18n("Send &Later Via"), "queue", actionCollection(), "send_alternative_via" ); @@ -1250,12 +1250,12 @@ void KMComposeWin::setupActions(void) //default = queue, alternative = send now (void) new TDEAction (i18n("Send &Later"), "queue", CTRL+Key_Return, - TQT_TQOBJECT(this), TQT_SLOT(slotSendLater()), actionCollection(),"send_default"); + this, TQ_SLOT(slotSendLater()), actionCollection(),"send_default"); actActionLaterMenu = new TDEActionMenu (i18n("Send &Later Via"), "queue", actionCollection(), "send_default_via" ); ( void ) new TDEAction( i18n("&Send Mail"), "mail-send", 0, - TQT_TQOBJECT(this), TQT_SLOT(slotSendNow()), actionCollection(),"send_alternative"); + this, TQ_SLOT(slotSendNow()), actionCollection(),"send_alternative"); // FIXME: change to mail_send_via icon when this exits. actActionNowMenu = new TDEActionMenu (i18n("&Send Mail Via"), "mail-send", @@ -1267,102 +1267,102 @@ void KMComposeWin::setupActions(void) actActionNowMenu->setDelayed(true); actActionLaterMenu->setDelayed(true); - connect( actActionNowMenu, TQT_SIGNAL( activated() ), this, - TQT_SLOT( slotSendNow() ) ); - connect( actActionLaterMenu, TQT_SIGNAL( activated() ), this, - TQT_SLOT( slotSendLater() ) ); + connect( actActionNowMenu, TQ_SIGNAL( activated() ), this, + TQ_SLOT( slotSendNow() ) ); + connect( actActionLaterMenu, TQ_SIGNAL( activated() ), this, + TQ_SLOT( slotSendLater() ) ); mActNowMenu = actActionNowMenu->popupMenu(); mActLaterMenu = actActionLaterMenu->popupMenu(); - connect( mActNowMenu, TQT_SIGNAL( activated( int ) ), this, - TQT_SLOT( slotSendNowVia( int ) ) ); - connect( mActNowMenu, TQT_SIGNAL( aboutToShow() ), this, - TQT_SLOT( getTransportMenu() ) ); + connect( mActNowMenu, TQ_SIGNAL( activated( int ) ), this, + TQ_SLOT( slotSendNowVia( int ) ) ); + connect( mActNowMenu, TQ_SIGNAL( aboutToShow() ), this, + TQ_SLOT( getTransportMenu() ) ); - connect( mActLaterMenu, TQT_SIGNAL( activated( int ) ), this, - TQT_SLOT( slotSendLaterVia( int ) ) ); - connect( mActLaterMenu, TQT_SIGNAL( aboutToShow() ), this, - TQT_SLOT( getTransportMenu() ) ); + connect( mActLaterMenu, TQ_SIGNAL( activated( int ) ), this, + TQ_SLOT( slotSendLaterVia( int ) ) ); + connect( mActLaterMenu, TQ_SIGNAL( aboutToShow() ), this, + TQ_SLOT( getTransportMenu() ) ); (void) new TDEAction (i18n("Save as &Draft"), "document-save", 0, - TQT_TQOBJECT(this), TQT_SLOT(slotSaveDraft()), + this, TQ_SLOT(slotSaveDraft()), actionCollection(), "save_in_drafts"); (void) new TDEAction (i18n("Save as &Template"), "document-save", 0, - TQT_TQOBJECT(this), TQT_SLOT(slotSaveTemplate()), + this, TQ_SLOT(slotSaveTemplate()), actionCollection(), "save_in_templates"); (void) new TDEAction (i18n("&Insert File..."), "document-open", 0, - TQT_TQOBJECT(this), TQT_SLOT(slotInsertFile()), + this, TQ_SLOT(slotInsertFile()), actionCollection(), "insert_file"); mRecentAction = new TDERecentFilesAction (i18n("&Insert File Recent"), "document-open", 0, - TQT_TQOBJECT(this), TQT_SLOT(slotInsertRecentFile(const KURL&)), + this, TQ_SLOT(slotInsertRecentFile(const KURL&)), actionCollection(), "insert_file_recent"); mRecentAction->loadEntries( KMKernel::config() ); (void) new TDEAction (i18n("&Address Book"), "contents",0, - TQT_TQOBJECT(this), TQT_SLOT(slotAddrBook()), + this, TQ_SLOT(slotAddrBook()), actionCollection(), "addressbook"); (void) new TDEAction (i18n("&New Composer"), "mail-message-new", TDEStdAccel::shortcut(TDEStdAccel::New), - TQT_TQOBJECT(this), TQT_SLOT(slotNewComposer()), + this, TQ_SLOT(slotNewComposer()), actionCollection(), "new_composer"); (void) new TDEAction (i18n("New Main &Window"), "window-new", 0, - TQT_TQOBJECT(this), TQT_SLOT(slotNewMailReader()), + this, TQ_SLOT(slotNewMailReader()), actionCollection(), "open_mailreader"); if ( !mClassicalRecipients ) { - new TDEAction( i18n("Select &Recipients..."), CTRL + Key_L, TQT_TQOBJECT(mRecipientsEditor), - TQT_SLOT( selectRecipients() ), actionCollection(), "select_recipients" ); - new TDEAction( i18n("Save &Distribution List..."), 0, TQT_TQOBJECT(mRecipientsEditor), - TQT_SLOT( saveDistributionList() ), actionCollection(), + new TDEAction( i18n("Select &Recipients..."), CTRL + Key_L, mRecipientsEditor, + TQ_SLOT( selectRecipients() ), actionCollection(), "select_recipients" ); + new TDEAction( i18n("Save &Distribution List..."), 0, mRecipientsEditor, + TQ_SLOT( saveDistributionList() ), actionCollection(), "save_distribution_list" ); } - //KStdAction::save(TQT_TQOBJECT(this), TQT_SLOT(), actionCollection(), "save_message"); - KStdAction::print (TQT_TQOBJECT(this), TQT_SLOT(slotPrint()), actionCollection()); - KStdAction::close (TQT_TQOBJECT(this), TQT_SLOT(slotClose()), actionCollection()); + //KStdAction::save(this, TQ_SLOT(), actionCollection(), "save_message"); + KStdAction::print (this, TQ_SLOT(slotPrint()), actionCollection()); + KStdAction::close (this, TQ_SLOT(slotClose()), actionCollection()); - KStdAction::undo (TQT_TQOBJECT(this), TQT_SLOT(slotUndo()), actionCollection()); - KStdAction::redo (TQT_TQOBJECT(this), TQT_SLOT(slotRedo()), actionCollection()); - KStdAction::cut (TQT_TQOBJECT(this), TQT_SLOT(slotCut()), actionCollection()); - KStdAction::copy (TQT_TQOBJECT(this), TQT_SLOT(slotCopy()), actionCollection()); - KStdAction::pasteText (TQT_TQOBJECT(this), TQT_SLOT(slotPasteClipboard()), actionCollection()); - KStdAction::selectAll (TQT_TQOBJECT(this), TQT_SLOT(slotMarkAll()), actionCollection()); + KStdAction::undo (this, TQ_SLOT(slotUndo()), actionCollection()); + KStdAction::redo (this, TQ_SLOT(slotRedo()), actionCollection()); + KStdAction::cut (this, TQ_SLOT(slotCut()), actionCollection()); + KStdAction::copy (this, TQ_SLOT(slotCopy()), actionCollection()); + KStdAction::pasteText (this, TQ_SLOT(slotPasteClipboard()), actionCollection()); + KStdAction::selectAll (this, TQ_SLOT(slotMarkAll()), actionCollection()); - KStdAction::find (TQT_TQOBJECT(this), TQT_SLOT(slotFind()), actionCollection()); - KStdAction::findNext(TQT_TQOBJECT(this), TQT_SLOT(slotSearchAgain()), actionCollection()); + KStdAction::find (this, TQ_SLOT(slotFind()), actionCollection()); + KStdAction::findNext(this, TQ_SLOT(slotSearchAgain()), actionCollection()); - KStdAction::replace (TQT_TQOBJECT(this), TQT_SLOT(slotReplace()), actionCollection()); - KStdAction::spelling (TQT_TQOBJECT(this), TQT_SLOT(slotSpellcheck()), actionCollection(), "tools-check-spelling"); + KStdAction::replace (this, TQ_SLOT(slotReplace()), actionCollection()); + KStdAction::spelling (this, TQ_SLOT(slotSpellcheck()), actionCollection(), "tools-check-spelling"); - mPasteQuotation = new TDEAction (i18n("Pa&ste as Quotation"),0,TQT_TQOBJECT(this),TQT_SLOT( slotPasteClipboardAsQuotation()), + mPasteQuotation = new TDEAction (i18n("Pa&ste as Quotation"),0,this,TQ_SLOT( slotPasteClipboardAsQuotation()), actionCollection(), "paste_quoted"); - (void) new TDEAction (i18n("Paste as Attac&hment"),0,TQT_TQOBJECT(this),TQT_SLOT( slotPasteClipboardAsAttachment()), + (void) new TDEAction (i18n("Paste as Attac&hment"),0,this,TQ_SLOT( slotPasteClipboardAsAttachment()), actionCollection(), "paste_att"); - TDEAction * addq = new TDEAction(i18n("Add &Quote Characters"), 0, TQT_TQOBJECT(this), - TQT_SLOT(slotAddQuotes()), actionCollection(), "tools_quote"); - connect( mEditor, TQT_SIGNAL(selectionAvailable(bool)), - addq, TQT_SLOT(setEnabled(bool)) ); + TDEAction * addq = new TDEAction(i18n("Add &Quote Characters"), 0, this, + TQ_SLOT(slotAddQuotes()), actionCollection(), "tools_quote"); + connect( mEditor, TQ_SIGNAL(selectionAvailable(bool)), + addq, TQ_SLOT(setEnabled(bool)) ); - TDEAction * remq = new TDEAction(i18n("Re&move Quote Characters"), 0, TQT_TQOBJECT(this), - TQT_SLOT(slotRemoveQuotes()), actionCollection(), "tools_unquote"); - connect( mEditor, TQT_SIGNAL(selectionAvailable(bool)), - remq, TQT_SLOT(setEnabled(bool)) ); + TDEAction * remq = new TDEAction(i18n("Re&move Quote Characters"), 0, this, + TQ_SLOT(slotRemoveQuotes()), actionCollection(), "tools_unquote"); + connect( mEditor, TQ_SIGNAL(selectionAvailable(bool)), + remq, TQ_SLOT(setEnabled(bool)) ); - (void) new TDEAction (i18n("Cl&ean Spaces"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotCleanSpace()), + (void) new TDEAction (i18n("Cl&ean Spaces"), 0, this, TQ_SLOT(slotCleanSpace()), actionCollection(), "clean_spaces"); - mFixedFontAction = new TDEToggleAction( i18n("Use Fi&xed Font"), 0, TQT_TQOBJECT(this), - TQT_SLOT(slotUpdateFont()), actionCollection(), "toggle_fixedfont" ); + mFixedFontAction = new TDEToggleAction( i18n("Use Fi&xed Font"), 0, this, + TQ_SLOT(slotUpdateFont()), actionCollection(), "toggle_fixedfont" ); mFixedFontAction->setChecked( GlobalSettings::self()->useFixedFont() ); //these are checkable!!! @@ -1375,16 +1375,16 @@ void KMComposeWin::setupActions(void) mRequestMDNAction->setChecked(GlobalSettings::self()->requestMDN()); //----- Message-Encoding Submenu mEncodingAction = new TDESelectAction( i18n( "Se&t Encoding" ), "charset", - 0, TQT_TQOBJECT(this), TQT_SLOT(slotSetCharset() ), + 0, this, TQ_SLOT(slotSetCharset() ), actionCollection(), "charsets" ); mWordWrapAction = new TDEToggleAction (i18n("&Wordwrap"), 0, actionCollection(), "wordwrap"); mWordWrapAction->setChecked(GlobalSettings::self()->wordWrap()); - connect(mWordWrapAction, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotWordWrapToggled(bool))); + connect(mWordWrapAction, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotWordWrapToggled(bool))); mSnippetAction = new TDEToggleAction ( i18n("&Snippets"), 0, actionCollection(), "snippets"); - connect(mSnippetAction, TQT_SIGNAL(toggled(bool)), mSnippetWidget, TQT_SLOT(setShown(bool)) ); + connect(mSnippetAction, TQ_SIGNAL(toggled(bool)), mSnippetWidget, TQ_SLOT(setShown(bool)) ); mSnippetAction->setChecked( GlobalSettings::self()->showSnippetManager() ); mAutoSpellCheckingAction = @@ -1394,8 +1394,8 @@ void KMComposeWin::setupActions(void) mAutoSpellCheckingAction->setEnabled( !GlobalSettings::self()->useExternalEditor() ); mAutoSpellCheckingAction->setChecked( !GlobalSettings::self()->useExternalEditor() && spellChecking ); slotAutoSpellCheckingToggled( !GlobalSettings::self()->useExternalEditor() && spellChecking ); - connect( mAutoSpellCheckingAction, TQT_SIGNAL( toggled( bool ) ), - TQT_TQOBJECT(this), TQT_SLOT( slotAutoSpellCheckingToggled( bool ) ) ); + connect( mAutoSpellCheckingAction, TQ_SIGNAL( toggled( bool ) ), + this, TQ_SLOT( slotAutoSpellCheckingToggled( bool ) ) ); TQStringList encodings = KMMsgBase::supportedEncodings(true); encodings.prepend( i18n("Auto-Detect")); @@ -1403,84 +1403,84 @@ void KMComposeWin::setupActions(void) mEncodingAction->setCurrentItem( -1 ); //these are checkable!!! - markupAction = new TDEToggleAction (i18n("Formatting (HTML)"), 0, TQT_TQOBJECT(this), - TQT_SLOT(slotToggleMarkup()), + markupAction = new TDEToggleAction (i18n("Formatting (HTML)"), 0, this, + TQ_SLOT(slotToggleMarkup()), actionCollection(), "html"); - mAllFieldsAction = new TDEToggleAction (i18n("&All Fields"), 0, TQT_TQOBJECT(this), - TQT_SLOT(slotView()), + mAllFieldsAction = new TDEToggleAction (i18n("&All Fields"), 0, this, + TQ_SLOT(slotView()), actionCollection(), "show_all_fields"); - mIdentityAction = new TDEToggleAction (i18n("&Identity"), 0, TQT_TQOBJECT(this), - TQT_SLOT(slotView()), + mIdentityAction = new TDEToggleAction (i18n("&Identity"), 0, this, + TQ_SLOT(slotView()), actionCollection(), "show_identity"); - mDictionaryAction = new TDEToggleAction (i18n("&Dictionary"), 0, TQT_TQOBJECT(this), - TQT_SLOT(slotView()), + mDictionaryAction = new TDEToggleAction (i18n("&Dictionary"), 0, this, + TQ_SLOT(slotView()), actionCollection(), "show_dictionary"); - mFccAction = new TDEToggleAction (i18n("&Sent-Mail Folder"), 0, TQT_TQOBJECT(this), - TQT_SLOT(slotView()), + mFccAction = new TDEToggleAction (i18n("&Sent-Mail Folder"), 0, this, + TQ_SLOT(slotView()), actionCollection(), "show_fcc"); - mTransportAction = new TDEToggleAction (i18n("&Mail Transport"), 0, TQT_TQOBJECT(this), - TQT_SLOT(slotView()), + mTransportAction = new TDEToggleAction (i18n("&Mail Transport"), 0, this, + TQ_SLOT(slotView()), actionCollection(), "show_transport"); - mFromAction = new TDEToggleAction (i18n("&From"), 0, TQT_TQOBJECT(this), - TQT_SLOT(slotView()), + mFromAction = new TDEToggleAction (i18n("&From"), 0, this, + TQ_SLOT(slotView()), actionCollection(), "show_from"); - mReplyToAction = new TDEToggleAction (i18n("&Reply To"), 0, TQT_TQOBJECT(this), - TQT_SLOT(slotView()), + mReplyToAction = new TDEToggleAction (i18n("&Reply To"), 0, this, + TQ_SLOT(slotView()), actionCollection(), "show_reply_to"); if ( mClassicalRecipients ) { - mToAction = new TDEToggleAction (i18n("&To"), 0, TQT_TQOBJECT(this), - TQT_SLOT(slotView()), + mToAction = new TDEToggleAction (i18n("&To"), 0, this, + TQ_SLOT(slotView()), actionCollection(), "show_to"); - mCcAction = new TDEToggleAction (i18n("&CC"), 0, TQT_TQOBJECT(this), - TQT_SLOT(slotView()), + mCcAction = new TDEToggleAction (i18n("&CC"), 0, this, + TQ_SLOT(slotView()), actionCollection(), "show_cc"); - mBccAction = new TDEToggleAction (i18n("&BCC"), 0, TQT_TQOBJECT(this), - TQT_SLOT(slotView()), + mBccAction = new TDEToggleAction (i18n("&BCC"), 0, this, + TQ_SLOT(slotView()), actionCollection(), "show_bcc"); } - mSubjectAction = new TDEToggleAction (i18n("S&ubject"), 0, TQT_TQOBJECT(this), - TQT_SLOT(slotView()), + mSubjectAction = new TDEToggleAction (i18n("S&ubject"), 0, this, + TQ_SLOT(slotView()), actionCollection(), "show_subject"); //end of checkable - mAppendSignatureAction = new TDEAction (i18n("Append S&ignature"), 0, TQT_TQOBJECT(this), - TQT_SLOT(slotAppendSignature()), + mAppendSignatureAction = new TDEAction (i18n("Append S&ignature"), 0, this, + TQ_SLOT(slotAppendSignature()), actionCollection(), "append_signature"); - mPrependSignatureAction = new TDEAction (i18n("Prepend S&ignature"), 0, TQT_TQOBJECT(this), - TQT_SLOT(slotPrependSignature()), + mPrependSignatureAction = new TDEAction (i18n("Prepend S&ignature"), 0, this, + TQ_SLOT(slotPrependSignature()), actionCollection(), "prepend_signature"); - mInsertSignatureAction = new TDEAction (i18n("Insert Signature At C&ursor Position"), "edit", 0, TQT_TQOBJECT(this), - TQT_SLOT(slotInsertSignatureAtCursor()), + mInsertSignatureAction = new TDEAction (i18n("Insert Signature At C&ursor Position"), "edit", 0, this, + TQ_SLOT(slotInsertSignatureAtCursor()), actionCollection(), "insert_signature_at_cursor_position"); - mAttachPK = new TDEAction (i18n("Attach &Public Key..."), 0, TQT_TQOBJECT(this), - TQT_SLOT(slotInsertPublicKey()), + mAttachPK = new TDEAction (i18n("Attach &Public Key..."), 0, this, + TQ_SLOT(slotInsertPublicKey()), actionCollection(), "attach_public_key"); - mAttachMPK = new TDEAction (i18n("Attach &My Public Key"), 0, TQT_TQOBJECT(this), - TQT_SLOT(slotInsertMyPublicKey()), + mAttachMPK = new TDEAction (i18n("Attach &My Public Key"), 0, this, + TQ_SLOT(slotInsertMyPublicKey()), actionCollection(), "attach_my_public_key"); (void) new TDEAction (i18n("&Attach File..."), "attach", - 0, TQT_TQOBJECT(this), TQT_SLOT(slotAttachFile()), + 0, this, TQ_SLOT(slotAttachFile()), actionCollection(), "attach"); - mAttachRemoveAction = new TDEAction (i18n("&Remove Attachment"), 0, TQT_TQOBJECT(this), - TQT_SLOT(slotAttachRemove()), + mAttachRemoveAction = new TDEAction (i18n("&Remove Attachment"), 0, this, + TQ_SLOT(slotAttachRemove()), actionCollection(), "remove"); mAttachSaveAction = new TDEAction (i18n("&Save Attachment As..."), "document-save",0, - TQT_TQOBJECT(this), TQT_SLOT(slotAttachSave()), + this, TQ_SLOT(slotAttachSave()), actionCollection(), "attach_save"); - mAttachPropertiesAction = new TDEAction (i18n("Attachment Pr&operties"), 0, TQT_TQOBJECT(this), - TQT_SLOT(slotAttachProperties()), + mAttachPropertiesAction = new TDEAction (i18n("Attachment Pr&operties"), 0, this, + TQ_SLOT(slotAttachProperties()), actionCollection(), "attach_properties"); setStandardToolBarMenuEnabled(true); - KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(slotEditKeys()), actionCollection()); - KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(slotEditToolbars()), actionCollection()); - KStdAction::preferences(kmkernel, TQT_SLOT(slotShowConfigurationDialog()), actionCollection()); + KStdAction::keyBindings(this, TQ_SLOT(slotEditKeys()), actionCollection()); + KStdAction::configureToolbars(this, TQ_SLOT(slotEditToolbars()), actionCollection()); + KStdAction::preferences(kmkernel, TQ_SLOT(slotShowConfigurationDialog()), actionCollection()); - (void) new TDEAction (i18n("&Spellchecker..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotSpellcheckConfig()), + (void) new TDEAction (i18n("&Spellchecker..."), 0, this, TQ_SLOT(slotSpellcheckConfig()), actionCollection(), "setup_spellchecker"); if ( Kleo::CryptoBackendFactory::instance()->protocol( "Chiasmus" ) ) { @@ -1489,8 +1489,8 @@ void KMComposeWin::setupActions(void) "encrypt_message_chiasmus" ); a->setCheckedState( KGuiItem( i18n( "Encrypt Message with Chiasmus..." ), "chiencrypted" ) ); mEncryptChiasmusAction = a; - connect( mEncryptChiasmusAction, TQT_SIGNAL(toggled(bool)), - TQT_TQOBJECT(this), TQT_SLOT(slotEncryptChiasmusToggled(bool)) ); + connect( mEncryptChiasmusAction, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(slotEncryptChiasmusToggled(bool)) ); } else { mEncryptChiasmusAction = 0; } @@ -1536,17 +1536,17 @@ void KMComposeWin::setupActions(void) setSigning( ( canOpenPGPSign || canSMIMESign ) && GlobalSettings::self()->pgpAutoSign() ); } - connect(mEncryptAction, TQT_SIGNAL(toggled(bool)), - TQT_SLOT(slotEncryptToggled( bool ))); - connect(mSignAction, TQT_SIGNAL(toggled(bool)), - TQT_SLOT(slotSignToggled( bool ))); + connect(mEncryptAction, TQ_SIGNAL(toggled(bool)), + TQ_SLOT(slotEncryptToggled( bool ))); + connect(mSignAction, TQ_SIGNAL(toggled(bool)), + TQ_SLOT(slotSignToggled( bool ))); TQStringList l; for ( int i = 0 ; i < numCryptoMessageFormats ; ++i ) l.push_back( Kleo::cryptoMessageFormatToLabel( cryptoMessageFormats[i] ) ); mCryptoModuleAction = new TDESelectAction( i18n( "&Cryptographic Message Format" ), 0, - TQT_TQOBJECT(this), TQT_SLOT(slotSelectCryptoModule()), + this, TQ_SLOT(slotSelectCryptoModule()), actionCollection(), "options_select_crypto" ); mCryptoModuleAction->setItems( l ); mCryptoModuleAction->setCurrentItem( format2cb( ident.preferredCryptoMessageFormat() ) ); @@ -1566,50 +1566,50 @@ void KMComposeWin::setupActions(void) "text_list" ); listAction->setItems( styleItems ); listAction->setToolTip( i18n( "Select a list style" ) ); - connect( listAction, TQT_SIGNAL( activated( const TQString& ) ), - TQT_SLOT( slotListAction( const TQString& ) ) ); + connect( listAction, TQ_SIGNAL( activated( const TQString& ) ), + TQ_SLOT( slotListAction( const TQString& ) ) ); fontAction = new TDEFontAction( "Select Font", 0, actionCollection(), "text_font" ); fontAction->setToolTip( i18n( "Select a font" ) ); - connect( fontAction, TQT_SIGNAL( activated( const TQString& ) ), - TQT_SLOT( slotFontAction( const TQString& ) ) ); + connect( fontAction, TQ_SIGNAL( activated( const TQString& ) ), + TQ_SLOT( slotFontAction( const TQString& ) ) ); fontSizeAction = new TDEFontSizeAction( "Select Size", 0, actionCollection(), "text_size" ); fontSizeAction->setToolTip( i18n( "Select a font size" ) ); - connect( fontSizeAction, TQT_SIGNAL( fontSizeChanged( int ) ), - TQT_SLOT( slotSizeAction( int ) ) ); + connect( fontSizeAction, TQ_SIGNAL( fontSizeChanged( int ) ), + TQ_SLOT( slotSizeAction( int ) ) ); alignLeftAction = new TDEToggleAction (i18n("Align Left"), "format-text-direction-ltr", 0, - TQT_TQOBJECT(this), TQT_SLOT(slotAlignLeft()), actionCollection(), + this, TQ_SLOT(slotAlignLeft()), actionCollection(), "align_left"); alignLeftAction->setChecked( true ); alignRightAction = new TDEToggleAction (i18n("Align Right"), "format-text-direction-rtl", 0, - TQT_TQOBJECT(this), TQT_SLOT(slotAlignRight()), actionCollection(), + this, TQ_SLOT(slotAlignRight()), actionCollection(), "align_right"); alignCenterAction = new TDEToggleAction (i18n("Align Center"), "text_center", 0, - TQT_TQOBJECT(this), TQT_SLOT(slotAlignCenter()), actionCollection(), + this, TQ_SLOT(slotAlignCenter()), actionCollection(), "align_center"); textBoldAction = new TDEToggleAction( i18n("&Bold"), "format-text-bold", CTRL+Key_B, - TQT_TQOBJECT(this), TQT_SLOT(slotTextBold()), + this, TQ_SLOT(slotTextBold()), actionCollection(), "format-text-bold"); textItalicAction = new TDEToggleAction( i18n("&Italic"), "format-text-italic", CTRL+Key_I, - TQT_TQOBJECT(this), TQT_SLOT(slotTextItalic()), + this, TQ_SLOT(slotTextItalic()), actionCollection(), "format-text-italic"); textUnderAction = new TDEToggleAction( i18n("&Underline"), "format-text-underline", CTRL+Key_U, - TQT_TQOBJECT(this), TQT_SLOT(slotTextUnder()), + this, TQ_SLOT(slotTextUnder()), actionCollection(), "format-text-underline"); actionFormatReset = new TDEAction( i18n( "Reset Font Settings" ), "eraser", 0, - TQT_TQOBJECT(this), TQT_SLOT( slotFormatReset() ), + this, TQ_SLOT( slotFormatReset() ), actionCollection(), "format_reset"); actionFormatColor = new TDEAction( i18n( "Text Color..." ), "colorize", 0, - TQT_TQOBJECT(this), TQT_SLOT( slotTextColor() ), + this, TQ_SLOT( slotTextColor() ), actionCollection(), "format_color"); // editorFocusChanged(false); createGUI("kmcomposerui.rc"); - connect( toolBar("htmlToolBar"), TQT_SIGNAL( visibilityChanged(bool) ), - TQT_TQOBJECT(this), TQT_SLOT( htmlToolBarVisibilityChanged(bool) ) ); + connect( toolBar("htmlToolBar"), TQ_SIGNAL( visibilityChanged(bool) ), + this, TQ_SLOT( htmlToolBarVisibilityChanged(bool) ) ); // In Kontact, this entry would read "Configure Kontact", but bring // up KMail's config dialog. That's sensible, though, so fix the label. @@ -1663,28 +1663,28 @@ void KMComposeWin::setupEditor(void) menu = new TQPopupMenu(this); //#ifdef BROKEN menu->insertItem(i18n("Undo"),mEditor, - TQT_SLOT(undo()), TDEStdAccel::shortcut(TDEStdAccel::Undo)); + TQ_SLOT(undo()), TDEStdAccel::shortcut(TDEStdAccel::Undo)); menu->insertItem(i18n("Redo"),mEditor, - TQT_SLOT(redo()), TDEStdAccel::shortcut(TDEStdAccel::Redo)); + TQ_SLOT(redo()), TDEStdAccel::shortcut(TDEStdAccel::Redo)); menu->insertSeparator(); //#endif //BROKEN - menu->insertItem(i18n("Cut"), this, TQT_SLOT(slotCut())); - menu->insertItem(i18n("Copy"), this, TQT_SLOT(slotCopy())); - menu->insertItem(i18n("Paste"), this, TQT_SLOT(slotPasteClipboard())); - menu->insertItem(i18n("Mark All"),this, TQT_SLOT(slotMarkAll())); + menu->insertItem(i18n("Cut"), this, TQ_SLOT(slotCut())); + menu->insertItem(i18n("Copy"), this, TQ_SLOT(slotCopy())); + menu->insertItem(i18n("Paste"), this, TQ_SLOT(slotPasteClipboard())); + menu->insertItem(i18n("Mark All"),this, TQ_SLOT(slotMarkAll())); menu->insertSeparator(); - menu->insertItem(i18n("Find..."), this, TQT_SLOT(slotFind())); - menu->insertItem(i18n("Replace..."), this, TQT_SLOT(slotReplace())); + menu->insertItem(i18n("Find..."), this, TQ_SLOT(slotFind())); + menu->insertItem(i18n("Replace..."), this, TQ_SLOT(slotReplace())); menu->insertSeparator(); - menu->insertItem(i18n("Fixed Font Widths"), this, TQT_SLOT(slotUpdateFont())); + menu->insertItem(i18n("Fixed Font Widths"), this, TQ_SLOT(slotUpdateFont())); mEditor->installRBPopup(menu); */ updateCursorPosition(); - connect(mEditor,TQT_SIGNAL(CursorPositionChanged()),TQT_SLOT(updateCursorPosition())); - connect( mEditor, TQT_SIGNAL( currentFontChanged( const TQFont & ) ), - TQT_TQOBJECT(this), TQT_SLOT( fontChanged( const TQFont & ) ) ); - connect( mEditor, TQT_SIGNAL( currentAlignmentChanged( int ) ), - TQT_TQOBJECT(this), TQT_SLOT( alignmentChanged( int ) ) ); + connect(mEditor,TQ_SIGNAL(CursorPositionChanged()),TQ_SLOT(updateCursorPosition())); + connect( mEditor, TQ_SIGNAL( currentFontChanged( const TQFont & ) ), + this, TQ_SLOT( fontChanged( const TQFont & ) ) ); + connect( mEditor, TQ_SIGNAL( currentAlignmentChanged( int ) ), + this, TQ_SLOT( alignmentChanged( int ) ) ); } @@ -1874,15 +1874,15 @@ void KMComposeWin::setMsg(KMMessage* newMsg, bool mayAutoSign, // don't overwrite the header values with identity specific values // unless the identity is sticky if ( !stickyIdentity ) { - disconnect(mIdentity,TQT_SIGNAL(identityChanged(uint)), - TQT_TQOBJECT(this), TQT_SLOT(slotIdentityChanged(uint))); + disconnect(mIdentity,TQ_SIGNAL(identityChanged(uint)), + this, TQ_SLOT(slotIdentityChanged(uint))); } // load the mId into the gui, sticky or not, without emitting mIdentity->setCurrentIdentity( mId ); const uint idToApply = mId; if ( !stickyIdentity ) { - connect(mIdentity,TQT_SIGNAL(identityChanged(uint)), - TQT_TQOBJECT(this), TQT_SLOT(slotIdentityChanged(uint))); + connect(mIdentity,TQ_SIGNAL(identityChanged(uint)), + this, TQ_SLOT(slotIdentityChanged(uint))); } else { // load the message's state into the mId, without applying it to the gui // that's so we can detect that the id changed (because a sticky was set) @@ -2165,11 +2165,11 @@ void KMComposeWin::setMsg(KMMessage* newMsg, bool mayAutoSign, // Not user friendy if this modal fileseletor opens before the // composer. // - //TQTimer::singleShot( 200, this, TQT_SLOT(slotAppendSignature()) ); + //TQTimer::singleShot( 200, this, TQ_SLOT(slotAppendSignature()) ); if ( GlobalSettings::self()->prependSignature() ) { - TQTimer::singleShot( 0, this, TQT_SLOT(slotPrependSignature()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(slotPrependSignature()) ); } else { - TQTimer::singleShot( 0, this, TQT_SLOT(slotAppendSignature()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(slotAppendSignature()) ); } } @@ -2240,7 +2240,7 @@ bool KMComposeWin::queryClose () { if ( !mEditor->checkExternalEditorFinished() ) return false; - if ( kmkernel->shuttingDown() || kapp->sessionSaving() ) + if ( kmkernel->shuttingDown() || tdeApp->sessionSaving() ) return true; if ( mComposer && mComposer->isPerformingSignOperation() ) // since the non-gpg-agent gpg plugin gets a passphrase using TQDialog::exec() return false; // the user can try to close the window, which destroys mComposer mid-call. @@ -2358,8 +2358,8 @@ void KMComposeWin::applyChanges( bool dontSignNorEncrypt, bool dontDisable ) // Make new job and execute it mComposer = new MessageComposer( this ); - connect( mComposer, TQT_SIGNAL( done( bool ) ), - TQT_TQOBJECT(this), TQT_SLOT( slotComposerDone( bool ) ) ); + connect( mComposer, TQ_SIGNAL( done( bool ) ), + this, TQ_SLOT( slotComposerDone( bool ) ) ); // TODO: Add a cancel button for the following operations? // Disable any input to the window, so that we have a snapshot of the @@ -2435,10 +2435,10 @@ bool KMComposeWin::addAttach(const KURL aUrl) mMapAtmLoadData.insert(job, ld); mAttachJobs[job] = aUrl; - connect(job, TQT_SIGNAL(result(TDEIO::Job *)), - TQT_TQOBJECT(this), TQT_SLOT(slotAttachFileResult(TDEIO::Job *))); - connect(job, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), - TQT_TQOBJECT(this), TQT_SLOT(slotAttachFileData(TDEIO::Job *, const TQByteArray &))); + connect(job, TQ_SIGNAL(result(TDEIO::Job *)), + this, TQ_SLOT(slotAttachFileResult(TDEIO::Job *))); + connect(job, TQ_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), + this, TQ_SLOT(slotAttachFileData(TDEIO::Job *, const TQByteArray &))); return true; } @@ -2467,10 +2467,10 @@ void KMComposeWin::addAttach(const KMMessagePart* msgPart) mTempDir = 0; } - connect( lvi, TQT_SIGNAL( compress( int ) ), - TQT_TQOBJECT(this), TQT_SLOT( compressAttach( int ) ) ); - connect( lvi, TQT_SIGNAL( uncompress( int ) ), - TQT_TQOBJECT(this), TQT_SLOT( uncompressAttach( int ) ) ); + connect( lvi, TQ_SIGNAL( compress( int ) ), + this, TQ_SLOT( compressAttach( int ) ) ); + connect( lvi, TQ_SIGNAL( uncompress( int ) ), + this, TQ_SLOT( uncompressAttach( int ) ) ); slotUpdateAttachActions(); } @@ -3019,10 +3019,10 @@ void KMComposeWin::slotInsertRecentFile(const KURL& u) } } mMapAtmLoadData.insert(job, ld); - connect(job, TQT_SIGNAL(result(TDEIO::Job *)), - TQT_TQOBJECT(this), TQT_SLOT(slotAttachFileResult(TDEIO::Job *))); - connect(job, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), - TQT_TQOBJECT(this), TQT_SLOT(slotAttachFileData(TDEIO::Job *, const TQByteArray &))); + connect(job, TQ_SIGNAL(result(TDEIO::Job *)), + this, TQ_SLOT(slotAttachFileResult(TDEIO::Job *))); + connect(job, TQ_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), + this, TQ_SLOT(slotAttachFileData(TDEIO::Job *, const TQByteArray &))); } @@ -3149,8 +3149,8 @@ void KMComposeWin::startPublicKeyExport() { Kleo::ExportJob * job = Kleo::CryptoBackendFactory::instance()->openpgp()->publicKeyExportJob( true ); assert( job ); - connect( job, TQT_SIGNAL(result(const GpgME::Error&,const TQByteArray&)), - this, TQT_SLOT(slotPublicKeyExportResult(const GpgME::Error&,const TQByteArray&)) ); + connect( job, TQ_SIGNAL(result(const GpgME::Error&,const TQByteArray&)), + this, TQ_SLOT(slotPublicKeyExportResult(const GpgME::Error&,const TQByteArray&)) ); const GpgME::Error err = job->start( mFingerprint ); if ( err ) @@ -3206,21 +3206,21 @@ void KMComposeWin::slotAttachPopupMenu(TQListViewItem *, const TQPoint &, int) mAttachMenu = new TQPopupMenu(this); mOpenId = mAttachMenu->insertItem(i18n("to open", "Open"), this, - TQT_SLOT(slotAttachOpen())); + TQ_SLOT(slotAttachOpen())); mOpenWithId = mAttachMenu->insertItem(i18n("Open With..."), this, - TQT_SLOT(slotAttachOpenWith())); + TQ_SLOT(slotAttachOpenWith())); mViewId = mAttachMenu->insertItem(i18n("to view", "View"), this, - TQT_SLOT(slotAttachView())); - mEditId = mAttachMenu->insertItem( i18n("Edit"), this, TQT_SLOT(slotAttachEdit()) ); + TQ_SLOT(slotAttachView())); + mEditId = mAttachMenu->insertItem( i18n("Edit"), this, TQ_SLOT(slotAttachEdit()) ); mEditWithId = mAttachMenu->insertItem( i18n("Edit With..."), this, - TQT_SLOT(slotAttachEditWith()) ); - mRemoveId = mAttachMenu->insertItem(i18n("Remove"), this, TQT_SLOT(slotAttachRemove())); + TQ_SLOT(slotAttachEditWith()) ); + mRemoveId = mAttachMenu->insertItem(i18n("Remove"), this, TQ_SLOT(slotAttachRemove())); mSaveAsId = mAttachMenu->insertItem( SmallIconSet("document-save-as"), i18n("Save As..."), this, - TQT_SLOT( slotAttachSave() ) ); + TQ_SLOT( slotAttachSave() ) ); mPropertiesId = mAttachMenu->insertItem( i18n("Properties"), this, - TQT_SLOT( slotAttachProperties() ) ); + TQ_SLOT( slotAttachProperties() ) ); mAttachMenu->insertSeparator(); - mAttachMenu->insertItem(i18n("Add Attachment..."), this, TQT_SLOT(slotAttachFile())); + mAttachMenu->insertItem(i18n("Add Attachment..."), this, TQ_SLOT(slotAttachFile())); } int selectedCount = 0; @@ -3304,7 +3304,7 @@ void KMComposeWin::compressAttach( int idx ) msgPart = mAtmList.at( i ); TQByteArray array; TQBuffer dev( array ); - KZip zip( &TQT_TQIODEVICE_OBJECT(dev) ); + KZip zip( &dev ); TQByteArray decoded = msgPart->bodyDecodedBinary(); if ( ! zip.open( IO_WriteOnly ) ) { KMessageBox::sorry(0, i18n("KMail could not compress the file.") ); @@ -3383,7 +3383,7 @@ void KMComposeWin::uncompressAttach( int idx ) msgPart = mAtmList.at( i ); TQBuffer dev( msgPart->bodyDecodedBinary() ); - KZip zip( &TQT_TQIODEVICE_OBJECT(dev) ); + KZip zip( &dev ); TQByteArray decoded; decoded = msgPart->bodyDecodedBinary(); @@ -3575,8 +3575,8 @@ void KMComposeWin::editAttach(int index, bool openWith) KMail::EditorWatcher *watcher = new KMail::EditorWatcher( KURL( atmTempFile->name() ), contentTypeStr, openWith, - TQT_TQOBJECT(this), this ); - connect( watcher, TQT_SIGNAL(editDone(KMail::EditorWatcher*)), TQT_SLOT(slotEditDone(KMail::EditorWatcher*)) ); + this, this ); + connect( watcher, TQ_SIGNAL(editDone(KMail::EditorWatcher*)), TQ_SLOT(slotEditDone(KMail::EditorWatcher*)) ); if ( watcher->start() ) { mEditorMap.insert( watcher, msgPart ); mEditorTempFiles.insert( watcher, atmTempFile ); @@ -3789,9 +3789,9 @@ void KMComposeWin::slotUndo() TQWidget* fw = focusWidget(); if (!fw) return; - if ( ::tqqt_cast<KEdit*>(fw) ) + if ( ::tqt_cast<KEdit*>(fw) ) static_cast<TQTextEdit*>(fw)->undo(); - else if (::tqqt_cast<TQLineEdit*>(fw)) + else if (::tqt_cast<TQLineEdit*>(fw)) static_cast<TQLineEdit*>(fw)->undo(); } @@ -3800,9 +3800,9 @@ void KMComposeWin::slotRedo() TQWidget* fw = focusWidget(); if (!fw) return; - if (::tqqt_cast<KEdit*>(fw)) + if (::tqt_cast<KEdit*>(fw)) static_cast<KEdit*>(fw)->redo(); - else if (::tqqt_cast<TQLineEdit*>(fw)) + else if (::tqt_cast<TQLineEdit*>(fw)) static_cast<TQLineEdit*>(fw)->redo(); } @@ -3812,9 +3812,9 @@ void KMComposeWin::slotCut() TQWidget* fw = focusWidget(); if (!fw) return; - if (::tqqt_cast<KEdit*>(fw)) + if (::tqt_cast<KEdit*>(fw)) static_cast<KEdit*>(fw)->cut(); - else if (::tqqt_cast<TQLineEdit*>(fw)) + else if (::tqt_cast<TQLineEdit*>(fw)) static_cast<TQLineEdit*>(fw)->cut(); } @@ -3830,7 +3830,7 @@ void KMComposeWin::slotCopy() #endif TQKeyEvent k(TQEvent::KeyPress, Key_C, 0, ControlButton); - kapp->notify(TQT_TQOBJECT(fw), TQT_TQEVENT(&k)); + tdeApp->notify(fw, &k); } @@ -3888,9 +3888,9 @@ void KMComposeWin::slotMarkAll() TQWidget* fw = focusWidget(); if (!fw) return; - if (::tqqt_cast<TQLineEdit*>(fw)) + if (::tqt_cast<TQLineEdit*>(fw)) static_cast<TQLineEdit*>(fw)->selectAll(); - else if (::tqqt_cast<KEdit*>(fw)) + else if (::tqt_cast<KEdit*>(fw)) static_cast<KEdit*>(fw)->selectAll(); } @@ -4082,15 +4082,15 @@ void KMComposeWin::ignoreStickyFields() void KMComposeWin::slotPrint() { mMessageWasModified = isModified(); - connect( this, TQT_SIGNAL( applyChangesDone( bool ) ), - TQT_TQOBJECT(this), TQT_SLOT( slotContinuePrint( bool ) ) ); + connect( this, TQ_SIGNAL( applyChangesDone( bool ) ), + this, TQ_SLOT( slotContinuePrint( bool ) ) ); applyChanges( true ); } void KMComposeWin::slotContinuePrint( bool rc ) { - disconnect( this, TQT_SIGNAL( applyChangesDone( bool ) ), - TQT_TQOBJECT(this), TQT_SLOT( slotContinuePrint( bool ) ) ); + disconnect( this, TQ_SIGNAL( applyChangesDone( bool ) ), + this, TQ_SLOT( slotContinuePrint( bool ) ) ); if( rc ) { if ( mComposedMessages.isEmpty() ) { @@ -4220,8 +4220,8 @@ void KMComposeWin::doSend( KMail::MessageSender::SendMethod method, const bool neverEncrypt = ( mDisableBreaking && GlobalSettings::self()->neverEncryptDrafts() ) || mSigningAndEncryptionExplicitlyDisabled; - connect( this, TQT_SIGNAL( applyChangesDone( bool ) ), - TQT_SLOT( slotContinueDoSend( bool ) ) ); + connect( this, TQ_SIGNAL( applyChangesDone( bool ) ), + TQ_SLOT( slotContinueDoSend( bool ) ) ); if ( mEditor->textFormat() == TQt::RichText ) mMsg->setHeaderField( "X-KMail-Markup", "true" ); @@ -4333,8 +4333,8 @@ void KMComposeWin::slotContinueDoSend( bool sentOk ) { kdDebug(5006) << "KMComposeWin::slotContinueDoSend( " << sentOk << " )" << endl; - disconnect( this, TQT_SIGNAL( applyChangesDone( bool ) ), - TQT_TQOBJECT(this), TQT_SLOT( slotContinueDoSend( bool ) ) ); + disconnect( this, TQ_SIGNAL( applyChangesDone( bool ) ), + this, TQ_SLOT( slotContinueDoSend( bool ) ) ); if ( !sentOk ) { mDisableBreaking = false; @@ -4576,7 +4576,7 @@ void KMComposeWin::insertSignature( SignaturePlacement placement ) //----------------------------------------------------------------------------- void KMComposeWin::slotHelp() { - kapp->invokeHelp(); + tdeApp->invokeHelp(); } //----------------------------------------------------------------------------- @@ -4735,8 +4735,8 @@ void KMComposeWin::slotSpellcheck() mSubjectTextWasSpellChecked = false; mSpellCheckInProgress=true; /* - connect (mEditor, TQT_SIGNAL (spellcheck_progress (unsigned)), - this, TQT_SLOT (spell_progress (unsigned))); + connect (mEditor, TQ_SIGNAL (spellcheck_progress (unsigned)), + this, TQ_SLOT (spell_progress (unsigned))); */ mEditor->spellcheck(); @@ -4791,7 +4791,7 @@ void KMComposeWin::slotSpellcheckDone(int result) statusBar()->changeItem(i18n(" Spell check complete."),0); break; } - TQTimer::singleShot( 2000, this, TQT_SLOT(slotSpellcheckDoneClearStatus()) ); + TQTimer::singleShot( 2000, this, TQ_SLOT(slotSpellcheckDoneClearStatus()) ); } void KMComposeWin::slotSpellcheckDoneClearStatus() @@ -4989,7 +4989,7 @@ void KMComposeWin::slotSpellcheckConfig() { KDialogBase dlg(KDialogBase::Plain, i18n("Spellchecker"), KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok, - TQT_TQWIDGET(this), 0, true, true ); + this, 0, true, true ); KWin twin; TQTabDialog qtd (this, "tabdialog", true); KSpellConfig mKSpellConfig (&qtd); @@ -4998,7 +4998,7 @@ void KMComposeWin::slotSpellcheckConfig() qtd.addTab (&mKSpellConfig, i18n("Spellchecker")); qtd.setCancelButton (); - twin.setIcons (qtd.winId(), kapp->icon(), kapp->miniIcon()); + twin.setIcons (qtd.winId(), tdeApp->icon(), tdeApp->miniIcon()); qtd.setCancelButton(KStdGuiItem::cancel().text()); qtd.setOkButton(KStdGuiItem::ok().text()); @@ -5017,8 +5017,8 @@ void KMComposeWin::slotEditToolbars() saveMainWindowSettings(KMKernel::config(), "Composer"); KEditToolbar dlg(guiFactory(), this); - connect( &dlg, TQT_SIGNAL(newToolbarConfig()), - TQT_SLOT(slotUpdateToolbars()) ); + connect( &dlg, TQ_SIGNAL(newToolbarConfig()), + TQ_SLOT(slotUpdateToolbars()) ); dlg.exec(); } @@ -5078,8 +5078,8 @@ void KMComposeWin::updateAutoSave() else { if ( !mAutoSaveTimer ) { mAutoSaveTimer = new TQTimer( this, "mAutoSaveTimer" ); - connect( mAutoSaveTimer, TQT_SIGNAL( timeout() ), - TQT_TQOBJECT(this), TQT_SLOT( autoSaveMessage() ) ); + connect( mAutoSaveTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( autoSaveMessage() ) ); } mAutoSaveTimer->start( autoSaveInterval() ); } @@ -5310,8 +5310,8 @@ void KMComposeWin::slotEncryptChiasmusToggled( bool on ) { return; } - STD_NAMESPACE_PREFIX auto_ptr<Kleo::SpecialJob> job( chiasmus->specialJob( "x-obtain-keys", TQStringVariantMap() ) ); - if ( !job.get() ) { + STD_NAMESPACE_PREFIX unique_ptr<Kleo::SpecialJob> job( chiasmus->specialJob( "x-obtain-keys", TQStringVariantMap() ) ); + if ( !job ) { const TQString msg = i18n( "Chiasmus backend does not offer the " "\"x-obtain-keys\" function. Please report this bug." ); KMessageBox::error( this, msg, i18n( "Chiasmus Backend Error" ) ); @@ -5410,7 +5410,7 @@ void KMComposeWin::slotAttachmentDragStarted() void KMComposeWin::recipientEditorSizeHintChanged() { - TQTimer::singleShot( 1, this, TQT_SLOT(setMaximumHeaderSize()) ); + TQTimer::singleShot( 1, this, TQ_SLOT(setMaximumHeaderSize()) ); } void KMComposeWin::setMaximumHeaderSize() diff --git a/kmail/kmcomposewin.h b/kmail/kmcomposewin.h index b9fbe1c7..76f46060 100644 --- a/kmail/kmcomposewin.h +++ b/kmail/kmcomposewin.h @@ -98,7 +98,7 @@ namespace GpgME { //----------------------------------------------------------------------------- class KMComposeWin : public KMail::Composer, public MailComposerIface { - Q_OBJECT + TQ_OBJECT friend class ::KMEdit; friend class ::MessageComposer; @@ -157,8 +157,8 @@ public: // kmkernel, kmcommands, callback * Set the message the composer shall work with. This discards * previous messages without calling applyChanges() on them before. */ - void setMsg(KMMessage* newMsg, bool mayAutoSign=TRUE, - bool allowDecryption=FALSE, bool isModified=FALSE); + void setMsg(KMMessage* newMsg, bool mayAutoSign=true, + bool allowDecryption=false, bool isModified=false); void disableWordWrap(); @@ -215,7 +215,7 @@ private: public: // kmkernel, callback /** * If this flag is set the message of the composer is deleted when - * the composer is closed and the message was not sent. Default: FALSE + * the composer is closed and the message was not sent. Default: false */ inline void setAutoDelete(bool f) { mAutoDeleteMsg = f; } @@ -235,7 +235,7 @@ public: // kmkernel, kmcommand, mailserviceimpl /** * Recode to the specified charset */ - void setCharset(const TQCString& aCharset, bool forceDefault = FALSE); + void setCharset(const TQCString& aCharset, bool forceDefault = false); public: // kmcommand /** @@ -527,7 +527,7 @@ signals: private: /** * Applies the user changes to the message object of the composer - * and signs/encrypts the message if activated. Returns FALSE in + * and signs/encrypts the message if activated. Returns false in * case of an error (e.g. if PGP encryption fails). * Disables the controls of the composer window unless @dontDisable * is true. diff --git a/kmail/kmedit.cpp b/kmail/kmedit.cpp index 1fe54648..e19b0f46 100644 --- a/kmail/kmedit.cpp +++ b/kmail/kmedit.cpp @@ -21,7 +21,7 @@ using KPIM::MailListDrag; #include <libemailfunctions/email.h> #include <kcursor.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <tdepopupmenu.h> #include <kdebug.h> @@ -226,21 +226,21 @@ KMEdit::KMEdit(TQWidget *parent, KMComposeWin* composer, mSpellLineEdit( false ), mPasteMode( TQClipboard::Clipboard ) { - connect( this, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotSelectionChanged()) ); + connect( this, TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(slotSelectionChanged()) ); installEventFilter(this); KCursor::setAutoHideCursor( this, true, true ); setOverwriteEnabled( true ); createSpellers(); - connect( mSpellConfig, TQT_SIGNAL( configChanged() ), - this, TQT_SLOT( createSpellers() ) ); - connect( mSpeller, TQT_SIGNAL( death() ), - this, TQT_SLOT( spellerDied() ) ); + connect( mSpellConfig, TQ_SIGNAL( configChanged() ), + this, TQ_SLOT( createSpellers() ) ); + connect( mSpeller, TQ_SIGNAL( death() ), + this, TQ_SLOT( spellerDied() ) ); } void KMEdit::createSpellers() { delete mSpeller; - mSpeller = new KMSpell( TQT_TQOBJECT(this), TQT_SLOT( spellerReady( KSpell * ) ), mSpellConfig ); + mSpeller = new KMSpell( this, TQ_SLOT( spellerReady( KSpell * ) ), mSpellConfig ); } void KMEdit::initializeAutoSpellChecking() @@ -250,7 +250,7 @@ void KMEdit::initializeAutoSpellChecking() TQColor defaultColor1( 0x00, 0x80, 0x00 ); // defaults from kmreaderwin.cpp TQColor defaultColor2( 0x00, 0x70, 0x00 ); TQColor defaultColor3( 0x00, 0x60, 0x00 ); - TQColor defaultForeground( kapp->palette().active().text() ); + TQColor defaultForeground( tdeApp->palette().active().text() ); TQColor c = TQt::red; TDEConfigGroup readerConfig( KMKernel::config(), "Reader" ); @@ -270,8 +270,8 @@ void KMEdit::initializeAutoSpellChecking() col1, col2, col3, col4, mSpellConfig ); - connect( mHighlighter, TQT_SIGNAL(newSuggestions(const TQString&, const TQStringList&, unsigned int)), - this, TQT_SLOT(addSuggestion(const TQString&, const TQStringList&, unsigned int)) ); + connect( mHighlighter, TQ_SIGNAL(newSuggestions(const TQString&, const TQStringList&, unsigned int)), + this, TQ_SLOT(addSuggestion(const TQString&, const TQStringList&, unsigned int)) ); } @@ -412,7 +412,7 @@ void KMEdit::spellerReady( KSpell *spell ) bool KMEdit::eventFilter(TQObject*o, TQEvent* e) { - if (TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(this)) + if (o == this) KCursor::autoHideEventFilter(o, e); if (e->type() == TQEvent::KeyPress) @@ -449,17 +449,17 @@ bool KMEdit::eventFilter(TQObject*o, TQEvent* e) *mExtEditorProcess << sysLine.left(sysLine.find(" ")).local8Bit(); sysLine.remove(0, sysLine.find(" ") + 1); } - connect(mExtEditorProcess, TQT_SIGNAL(processExited(TDEProcess*)), - TQT_SLOT(slotExternalEditorDone(TDEProcess*))); + connect(mExtEditorProcess, TQ_SIGNAL(processExited(TDEProcess*)), + TQ_SLOT(slotExternalEditorDone(TDEProcess*))); if (!mExtEditorProcess->start()) { KMessageBox::error( topLevelWidget(), i18n("Unable to start external editor.") ); killExternalEditor(); } else { - mExtEditorTempFileWatcher = new KDirWatch( TQT_TQOBJECT(this), "mExtEditorTempFileWatcher" ); - connect( mExtEditorTempFileWatcher, TQT_SIGNAL(dirty(const TQString&)), - TQT_SLOT(slotExternalEditorTempFileChanged(const TQString&)) ); + mExtEditorTempFileWatcher = new KDirWatch( this, "mExtEditorTempFileWatcher" ); + connect( mExtEditorTempFileWatcher, TQ_SIGNAL(dirty(const TQString&)), + TQ_SLOT(slotExternalEditorTempFileChanged(const TQString&)) ); mExtEditorTempFileWatcher->addFile( mExtEditorTempFile->name() ); } return true; @@ -542,7 +542,7 @@ bool KMEdit::eventFilter(TQObject*o, TQEvent* e) if ( mHighlighter ) { // Wait a bit until reloading the highlighter, the mSpeller first needs to finish saving // the personal word list. - TQTimer::singleShot( 200, mHighlighter, TQT_SLOT( slotLocalSpellConfigChanged() ) ); + TQTimer::singleShot( 200, mHighlighter, TQ_SLOT( slotLocalSpellConfigChanged() ) ); } } else if( id > -1 ) @@ -569,7 +569,7 @@ bool KMEdit::eventFilter(TQObject*o, TQEvent* e) } } } else if ( e->type() == TQEvent::FocusIn || e->type() == TQEvent::FocusOut ) { - TQFocusEvent *fe = TQT_TQFOCUSEVENT(e); + TQFocusEvent *fe = static_cast<TQFocusEvent*>(e); if(! (fe->reason() == TQFocusEvent::ActiveWindow || fe->reason() == TQFocusEvent::Popup) ) emit focusChanged( fe->gotFocus() ); } @@ -651,28 +651,28 @@ void KMEdit::spellcheck() // if (textFormat() == TQt::RichText ) { // kdDebug(5006) << "KMEdit::spellcheck, spellchecking for RichText" << endl; // mKSpellForDialog = new KSpell(this, i18n("Spellcheck - KMail"), this, -// TQT_SLOT(slotSpellcheck2(KSpell*)),0,true,false,KSpell::HTML); +// TQ_SLOT(slotSpellcheck2(KSpell*)),0,true,false,KSpell::HTML); // } // else { // Don't use mSpellConfig here. Reason is that the spell dialog, KSpellDlg, uses its own // spell config, and therefore the two wouldn't be in sync. - mKSpellForDialog = new KSpell( TQT_TQWIDGET(this), i18n("Spellcheck - KMail"), TQT_TQOBJECT(this), - TQT_SLOT(slotSpellcheck2(KSpell*))/*, mSpellConfig*/ ); + mKSpellForDialog = new KSpell( this, i18n("Spellcheck - KMail"), this, + TQ_SLOT(slotSpellcheck2(KSpell*))/*, mSpellConfig*/ ); // } TQStringList l = KSpellingHighlighter::personalWords(); for ( TQStringList::Iterator it = l.begin(); it != l.end(); ++it ) { mKSpellForDialog->addPersonal( *it ); } - connect (mKSpellForDialog, TQT_SIGNAL( death()), - this, TQT_SLOT (slotSpellDone())); - connect (mKSpellForDialog, TQT_SIGNAL (misspelling (const TQString &, const TQStringList &, unsigned int)), - this, TQT_SLOT (slotMisspelling (const TQString &, const TQStringList &, unsigned int))); - connect (mKSpellForDialog, TQT_SIGNAL (corrected (const TQString &, const TQString &, unsigned int)), - this, TQT_SLOT (slotCorrected (const TQString &, const TQString &, unsigned int))); - connect (mKSpellForDialog, TQT_SIGNAL (done(const TQString &)), - this, TQT_SLOT (slotSpellResult (const TQString&))); + connect (mKSpellForDialog, TQ_SIGNAL( death()), + this, TQ_SLOT (slotSpellDone())); + connect (mKSpellForDialog, TQ_SIGNAL (misspelling (const TQString &, const TQStringList &, unsigned int)), + this, TQ_SLOT (slotMisspelling (const TQString &, const TQStringList &, unsigned int))); + connect (mKSpellForDialog, TQ_SIGNAL (corrected (const TQString &, const TQString &, unsigned int)), + this, TQ_SLOT (slotCorrected (const TQString &, const TQString &, unsigned int))); + connect (mKSpellForDialog, TQ_SIGNAL (done(const TQString &)), + this, TQ_SLOT (slotSpellResult (const TQString&))); } void KMEdit::cut() @@ -708,7 +708,7 @@ void KMEdit::paste() // Roll our own internal flag. void KMEdit::contentsMouseReleaseEvent( TQMouseEvent * e ) { - if( e->button() != Qt::MidButton ) + if( e->button() != TQt::MidButton ) return KEdit::contentsMouseReleaseEvent( e ); mPasteMode = TQClipboard::Selection; KEdit::contentsMouseReleaseEvent( e ); @@ -718,7 +718,7 @@ void KMEdit::contentsMouseReleaseEvent( TQMouseEvent * e ) void KMEdit::contentsMouseDoubleClickEvent( TQMouseEvent *e ) { bool handled = false; - if ( e->button() == Qt::LeftButton ) { + if ( e->button() == TQt::LeftButton ) { // Get the cursor position for the place where the user clicked to int paragraphPos; diff --git a/kmail/kmedit.h b/kmail/kmedit.h index c42734dc..7327327e 100644 --- a/kmail/kmedit.h +++ b/kmail/kmedit.h @@ -64,7 +64,7 @@ class KMSyntaxHighter : public KDictSpellingHighlighter }; class KMEdit : public KEdit { - Q_OBJECT + TQ_OBJECT public: KMEdit(TQWidget *parent=0,KMComposeWin* composer=0, diff --git a/kmail/kmfawidgets.cpp b/kmail/kmfawidgets.cpp index fdd444b4..93899599 100644 --- a/kmail/kmfawidgets.cpp +++ b/kmail/kmfawidgets.cpp @@ -14,7 +14,7 @@ #include <kaudioplayer.h> #include <kurlrequester.h> #include <tdefiledialog.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tqlayout.h> #include <tqtooltip.h> @@ -39,10 +39,10 @@ KMFilterActionWithAddressWidget::KMFilterActionWithAddressWidget( TQWidget* pare TQToolTip::add( mBtn, i18n( "Open Address Book" ) ); hbl->addWidget( mBtn ); - connect( mBtn, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotAddrBook()) ); - connect( mLineEdit, TQT_SIGNAL( textChanged(const TQString&) ), - this, TQT_SIGNAL( textChanged(const TQString&) ) ); + connect( mBtn, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotAddrBook()) ); + connect( mLineEdit, TQ_SIGNAL( textChanged(const TQString&) ), + this, TQ_SIGNAL( textChanged(const TQString&) ) ); } void KMFilterActionWithAddressWidget::slotAddrBook() @@ -75,14 +75,14 @@ KMSoundTestWidget::KMSoundTestWidget(TQWidget *parent, const char *name) TQHBoxLayout *lay1 = new TQHBoxLayout( this ); m_playButton = new TQPushButton( this, "m_playButton" ); m_playButton->setPixmap( SmallIcon( "1rightarrow" ) ); - connect( m_playButton, TQT_SIGNAL( clicked() ), TQT_SLOT( playSound() )); + connect( m_playButton, TQ_SIGNAL( clicked() ), TQ_SLOT( playSound() )); lay1->addWidget( m_playButton ); m_urlRequester = new KURLRequester( this ); lay1->addWidget( m_urlRequester ); - connect( m_urlRequester, TQT_SIGNAL( openFileDialog( KURLRequester * )), - TQT_SLOT( openSoundDialog( KURLRequester * ))); - connect( m_urlRequester->lineEdit(), TQT_SIGNAL( textChanged ( const TQString & )), TQT_SLOT( slotUrlChanged(const TQString & ))); + connect( m_urlRequester, TQ_SIGNAL( openFileDialog( KURLRequester * )), + TQ_SLOT( openSoundDialog( KURLRequester * ))); + connect( m_urlRequester->lineEdit(), TQ_SIGNAL( textChanged ( const TQString & )), TQ_SLOT( slotUrlChanged(const TQString & ))); slotUrlChanged(m_urlRequester->lineEdit()->text() ); } diff --git a/kmail/kmfawidgets.h b/kmail/kmfawidgets.h index f5602f5e..90f980e0 100644 --- a/kmail/kmfawidgets.h +++ b/kmail/kmfawidgets.h @@ -17,7 +17,7 @@ class KURLRequester; class KMFilterActionWithAddressWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: KMFilterActionWithAddressWidget( TQWidget* parent=0, const char* name=0 ); @@ -40,7 +40,7 @@ private: class KMSoundTestWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: KMSoundTestWidget( TQWidget * parent, const char * name=0 ); diff --git a/kmail/kmfilteraction.cpp b/kmail/kmfilteraction.cpp index d97e5fa7..fb89777f 100644 --- a/kmail/kmfilteraction.cpp +++ b/kmail/kmfilteraction.cpp @@ -39,7 +39,7 @@ using KMail::RegExpLineEdit; #include <tdetempfile.h> #include <kdebug.h> #include <tdelocale.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <kaudioplayer.h> #include <kurlrequester.h> @@ -1423,8 +1423,8 @@ void KMFilterActionCopy::processAsync(KMMessage* msg) const ActionScheduler *handler = MessageProperty::filterHandler( msg ); KMCommand *cmd = new KMCopyCommand( mFolder, msg ); - TQObject::connect( cmd, TQT_SIGNAL( completed( KMCommand * ) ), - handler, TQT_SLOT( copyMessageFinished( KMCommand * ) ) ); + TQObject::connect( cmd, TQ_SIGNAL( completed( KMCommand * ) ), + handler, TQ_SLOT( copyMessageFinished( KMCommand * ) ) ); cmd->start(); } @@ -1816,7 +1816,7 @@ void KMFilterActionExtFilter::processAsync(KMMessage* aMsg) const inFile->close(); PipeJob *job = new PipeJob(0, 0, aMsg, commandLine, tempFileName); - TQObject::connect ( job, TQT_SIGNAL( done() ), handler, TQT_SLOT( actionMessage() ) ); + TQObject::connect ( job, TQ_SIGNAL( done() ), handler, TQ_SLOT( actionMessage() ) ); kmkernel->weaver()->enqueue(job); } diff --git a/kmail/kmfilteraction.h b/kmail/kmfilteraction.h index f0705b58..1242a1b3 100644 --- a/kmail/kmfilteraction.h +++ b/kmail/kmfilteraction.h @@ -107,7 +107,7 @@ public: quick test. Eg., actions that have a mail address as parameter shouldn't try real address validation, but only check if the string representation is empty. */ - virtual bool isEmpty() const { return FALSE; } + virtual bool isEmpty() const { return false; } /** Creates a widget for setting the filter action parameter. Also sets the value of the widget. */ @@ -138,7 +138,7 @@ public: /** Called from the filter when a folder is removed. Tests if the folder @p aFolder is used and changes to @p aNewFolder in this - case. Returns TRUE if a change was made. */ + case. Returns true if a change was made. */ virtual bool folderRemoved(KMFolder* aFolder, KMFolder* aNewFolder); /** Static function that creates a filter action of this type. */ @@ -431,7 +431,7 @@ public: /** Called from the filter when a folder is removed. Tests if the folder @p aFolder is used and changes to @p aNewFolder in this - case. Returns TRUE if a change was made. */ + case. Returns true if a change was made. */ virtual bool folderRemoved(KMFolder* aFolder, KMFolder* aNewFolder); protected: diff --git a/kmail/kmfilterdlg.cpp b/kmail/kmfilterdlg.cpp index b1bbb9ab..51fd8ac9 100644 --- a/kmail/kmfilterdlg.cpp +++ b/kmail/kmfilterdlg.cpp @@ -134,14 +134,14 @@ KMFilterDlg::KMFilterDlg(TQWidget* parent, const char* name, bool popFilter, boo Ok /* default btn */, false /* separator */), bPopFilter(popFilter) { - KWin::setIcons( winId(), kapp->icon(), kapp->miniIcon() ); + KWin::setIcons( winId(), tdeApp->icon(), tdeApp->miniIcon() ); setHelp( (bPopFilter)? KMPopFilterDlgHelpAnchor: KMFilterDlgHelpAnchor ); setButtonText( User1, i18n("Import") ); setButtonText( User2, i18n("Export") ); - connect( this, TQT_SIGNAL(user1Clicked()), - this, TQT_SLOT( slotImportFilters()) ); - connect( this, TQT_SIGNAL(user2Clicked()), - this, TQT_SLOT( slotExportFilters()) ); + connect( this, TQ_SIGNAL(user1Clicked()), + this, TQ_SLOT( slotImportFilters()) ); + connect( this, TQ_SIGNAL(user2Clicked()), + this, TQ_SLOT( slotExportFilters()) ); TQWidget *w = new TQWidget( this ); setMainWidget( w ); @@ -184,11 +184,11 @@ KMFilterDlg::KMFilterDlg(TQWidget* parent, const char* name, bool popFilter, boo vbl->addWidget( mGlobalsBox, 0, TQt::AlignTop ); } else { - TQGroupBox *agb = new TQGroupBox( 1 /*column*/, Qt::Vertical, i18n("Filter Actions"), page1 ); + TQGroupBox *agb = new TQGroupBox( 1 /*column*/, TQt::Vertical, i18n("Filter Actions"), page1 ); mActionLister = new KMFilterActionWidgetLister( agb ); vbl->addWidget( agb, 0, TQt::AlignTop ); - mAdvOptsGroup = new TQGroupBox ( 1 /*columns*/, Qt::Vertical, + mAdvOptsGroup = new TQGroupBox ( 1 /*columns*/, TQt::Vertical, i18n("Advanced Options"), page2); { TQWidget *adv_w = new TQWidget( mAdvOptsGroup ); @@ -262,81 +262,81 @@ KMFilterDlg::KMFilterDlg(TQWidget* parent, const char* name, bool popFilter, boo vbl->addStretch( 1 ); // load the filter parts into the edit widgets - connect( mFilterList, TQT_SIGNAL(filterSelected(KMFilter*)), - this, TQT_SLOT(slotFilterSelected(KMFilter*)) ); + connect( mFilterList, TQ_SIGNAL(filterSelected(KMFilter*)), + this, TQ_SLOT(slotFilterSelected(KMFilter*)) ); if (bPopFilter){ // set the state of the global setting 'show later msgs' - connect( mShowLaterBtn, TQT_SIGNAL(toggled(bool)), - mFilterList, TQT_SLOT(slotShowLaterToggled(bool))); + connect( mShowLaterBtn, TQ_SIGNAL(toggled(bool)), + mFilterList, TQ_SLOT(slotShowLaterToggled(bool))); // set the action in the filter when changed - connect( mActionGroup, TQT_SIGNAL(actionChanged(const KMPopFilterAction)), - this, TQT_SLOT(slotActionChanged(const KMPopFilterAction)) ); + connect( mActionGroup, TQ_SIGNAL(actionChanged(const KMPopFilterAction)), + this, TQ_SLOT(slotActionChanged(const KMPopFilterAction)) ); } else { // transfer changes from the 'Apply this filter on...' // combo box to the filter - connect( mApplyOnIn, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotApplicabilityChanged()) ); - connect( mApplyOnForAll, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotApplicabilityChanged()) ); - connect( mApplyOnForTraditional, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotApplicabilityChanged()) ); - connect( mApplyOnForChecked, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotApplicabilityChanged()) ); - connect( mApplyOnOut, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotApplicabilityChanged()) ); - connect( mApplyOnCtrlJ, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotApplicabilityChanged()) ); - connect( mAccountList, TQT_SIGNAL(clicked(TQListViewItem*)), - this, TQT_SLOT(slotApplicableAccountsChanged()) ); - connect( mAccountList, TQT_SIGNAL(spacePressed(TQListViewItem*)), - this, TQT_SLOT(slotApplicableAccountsChanged()) ); + connect( mApplyOnIn, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotApplicabilityChanged()) ); + connect( mApplyOnForAll, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotApplicabilityChanged()) ); + connect( mApplyOnForTraditional, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotApplicabilityChanged()) ); + connect( mApplyOnForChecked, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotApplicabilityChanged()) ); + connect( mApplyOnOut, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotApplicabilityChanged()) ); + connect( mApplyOnCtrlJ, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotApplicabilityChanged()) ); + connect( mAccountList, TQ_SIGNAL(clicked(TQListViewItem*)), + this, TQ_SLOT(slotApplicableAccountsChanged()) ); + connect( mAccountList, TQ_SIGNAL(spacePressed(TQListViewItem*)), + this, TQ_SLOT(slotApplicableAccountsChanged()) ); // transfer changes from the 'stop processing here' // check box to the filter - connect( mStopProcessingHere, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(slotStopProcessingButtonToggled(bool)) ); + connect( mStopProcessingHere, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(slotStopProcessingButtonToggled(bool)) ); - connect( mConfigureShortcut, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(slotConfigureShortcutButtonToggled(bool)) ); + connect( mConfigureShortcut, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(slotConfigureShortcutButtonToggled(bool)) ); - connect( mKeyButton, TQT_SIGNAL( capturedShortcut( const TDEShortcut& ) ), - this, TQT_SLOT( slotCapturedShortcutChanged( const TDEShortcut& ) ) ); + connect( mKeyButton, TQ_SIGNAL( capturedShortcut( const TDEShortcut& ) ), + this, TQ_SLOT( slotCapturedShortcutChanged( const TDEShortcut& ) ) ); - connect( mConfigureToolbar, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(slotConfigureToolbarButtonToggled(bool)) ); + connect( mConfigureToolbar, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(slotConfigureToolbarButtonToggled(bool)) ); - connect( mFilterActionIconButton, TQT_SIGNAL( iconChanged( TQString ) ), - this, TQT_SLOT( slotFilterActionIconChanged( TQString ) ) ); + connect( mFilterActionIconButton, TQ_SIGNAL( iconChanged( TQString ) ), + this, TQ_SLOT( slotFilterActionIconChanged( TQString ) ) ); } // reset all widgets here - connect( mFilterList, TQT_SIGNAL(resetWidgets()), - this, TQT_SLOT(slotReset()) ); + connect( mFilterList, TQ_SIGNAL(resetWidgets()), + this, TQ_SLOT(slotReset()) ); - connect( mFilterList, TQT_SIGNAL( applyWidgets() ), - this, TQT_SLOT( slotUpdateFilter() ) ); + connect( mFilterList, TQ_SIGNAL( applyWidgets() ), + this, TQ_SLOT( slotUpdateFilter() ) ); // support auto-naming the filter - connect( mPatternEdit, TQT_SIGNAL(maybeNameChanged()), - mFilterList, TQT_SLOT(slotUpdateFilterName()) ); + connect( mPatternEdit, TQ_SIGNAL(maybeNameChanged()), + mFilterList, TQ_SLOT(slotUpdateFilterName()) ); // apply changes on 'Apply' - connect( this, TQT_SIGNAL(applyClicked()), - mFilterList, TQT_SLOT(slotApplyFilterChanges()) ); + connect( this, TQ_SIGNAL(applyClicked()), + mFilterList, TQ_SLOT(slotApplyFilterChanges()) ); // apply changes on 'OK' - connect( this, TQT_SIGNAL(okClicked()), - mFilterList, TQT_SLOT(slotApplyFilterChanges()) ); + connect( this, TQ_SIGNAL(okClicked()), + mFilterList, TQ_SLOT(slotApplyFilterChanges()) ); // save dialog size on 'OK' - connect( this, TQT_SIGNAL(okClicked()), - this, TQT_SLOT(slotSaveSize()) ); + connect( this, TQ_SIGNAL(okClicked()), + this, TQ_SLOT(slotSaveSize()) ); // destruct the dialog on OK, close and Cancel - connect( this, TQT_SIGNAL(finished()), - this, TQT_SLOT(slotFinished()) ); + connect( this, TQ_SIGNAL(finished()), + this, TQ_SLOT(slotFinished()) ); TDEConfigGroup geometry( KMKernel::config(), "Geometry"); const char * configKey @@ -577,7 +577,7 @@ void KMFilterDlg::slotUpdateAccountList() //============================================================================= KMFilterListBox::KMFilterListBox( const TQString & title, TQWidget *parent, const char* name, bool popFilter ) - : TQGroupBox( 1, Qt::Horizontal, title, parent, name ), + : TQGroupBox( 1, TQt::Horizontal, title, parent, name ), bPopFilter(popFilter) { mFilterList.setAutoDelete( true ); @@ -642,31 +642,31 @@ KMFilterListBox::KMFilterListBox( const TQString & title, TQWidget *parent, cons hb = new TQHBox( this ); hb->setSpacing( 4 ); TQPushButton *btn = new TQPushButton( i18n("Select Source Folders"), hb ); - connect( btn, TQT_SIGNAL(clicked()), TQT_SLOT(slotSelectSourceFolders()) ); + connect( btn, TQ_SIGNAL(clicked()), TQ_SLOT(slotSelectSourceFolders()) ); } //----------- now connect everything - connect( mListBox, TQT_SIGNAL(highlighted(int)), - this, TQT_SLOT(slotSelected(int)) ); - connect( mListBox, TQT_SIGNAL( doubleClicked ( TQListBoxItem * )), - this, TQT_SLOT( slotRename()) ); - connect( mBtnTop, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotTop()) ); - connect( mBtnUp, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotUp()) ); - connect( mBtnDown, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotDown()) ); - connect( mBtnBot, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotBottom()) ); - connect( mBtnNew, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotNew()) ); - connect( mBtnCopy, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotCopy()) ); - connect( mBtnDelete, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotDelete()) ); - connect( mBtnRename, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotRename()) ); + connect( mListBox, TQ_SIGNAL(highlighted(int)), + this, TQ_SLOT(slotSelected(int)) ); + connect( mListBox, TQ_SIGNAL( doubleClicked ( TQListBoxItem * )), + this, TQ_SLOT( slotRename()) ); + connect( mBtnTop, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotTop()) ); + connect( mBtnUp, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotUp()) ); + connect( mBtnDown, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotDown()) ); + connect( mBtnBot, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotBottom()) ); + connect( mBtnNew, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotNew()) ); + connect( mBtnCopy, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotCopy()) ); + connect( mBtnDelete, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotDelete()) ); + connect( mBtnRename, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotRename()) ); // the dialog should call loadFilterList() // when all signals are connected. @@ -1152,8 +1152,8 @@ KMFilterActionWidget::KMFilterActionWidget( TQWidget *parent, const char* name ) setFocusProxy( mComboBox ); // now connect the combo box and the widget stack - connect( mComboBox, TQT_SIGNAL(activated(int)), - mWidgetStack, TQT_SLOT(raiseWidget(int)) ); + connect( mComboBox, TQ_SIGNAL(activated(int)), + mWidgetStack, TQ_SLOT(raiseWidget(int)) ); } void KMFilterActionWidget::setAction( const KMFilterAction* aAction ) @@ -1306,8 +1306,8 @@ KMPopFilterActionWidget::KMPopFilterActionWidget( const TQString& title, TQWidge mIdMap[id(mActionMap[Down])] = Down; mIdMap[id(mActionMap[Delete])] = Delete; - connect( this, TQT_SIGNAL(clicked(int)), - this, TQT_SLOT( slotActionClicked(int)) ); + connect( this, TQ_SIGNAL(clicked(int)), + this, TQ_SLOT( slotActionClicked(int)) ); } void KMPopFilterActionWidget::setAction( KMPopFilterAction aAction ) diff --git a/kmail/kmfilterdlg.h b/kmail/kmfilterdlg.h index e2d414b9..8e3b62f9 100644 --- a/kmail/kmfilterdlg.h +++ b/kmail/kmfilterdlg.h @@ -59,7 +59,7 @@ class TDEListView; */ class KMFilterListBox : public TQGroupBox { - Q_OBJECT + TQ_OBJECT public: /** Constuctor. */ @@ -195,7 +195,7 @@ private: */ class KMFilterActionWidget : public TQHBox { - Q_OBJECT + TQ_OBJECT public: /** Constructor. Creates a filter action widget with no type @@ -229,7 +229,7 @@ private: class KMPopFilterActionWidget : public TQVButtonGroup { - Q_OBJECT + TQ_OBJECT public: KMPopFilterActionWidget( const TQString &title, TQWidget* parent=0, const char* name=0 ); @@ -254,7 +254,7 @@ signals: // Signals class KMFilterActionWidgetLister : public KWidgetLister { - Q_OBJECT + TQ_OBJECT public: KMFilterActionWidgetLister( TQWidget *parent=0, const char* name=0 ); @@ -338,7 +338,7 @@ private: class KMFilterDlg: public KDialogBase { - Q_OBJECT + TQ_OBJECT public: /** Create the filter dialog. The only class which should be able to diff --git a/kmail/kmfiltermgr.cpp b/kmail/kmfiltermgr.cpp index 8c47afc0..f98a78dd 100644 --- a/kmail/kmfiltermgr.cpp +++ b/kmail/kmfiltermgr.cpp @@ -41,8 +41,8 @@ KMFilterMgr::KMFilterMgr( bool popFilter ) mBufferedFolderTarget( true ), mRefCount( 0 ) { - connect( kmkernel, TQT_SIGNAL( folderRemoved( KMFolder* ) ), - this, TQT_SLOT( slotFolderRemoved( KMFolder* ) ) ); + connect( kmkernel, TQ_SIGNAL( folderRemoved( KMFolder* ) ), + this, TQ_SLOT( slotFolderRemoved( KMFolder* ) ) ); } diff --git a/kmail/kmfiltermgr.h b/kmail/kmfiltermgr.h index 45e77863..a6805172 100644 --- a/kmail/kmfiltermgr.h +++ b/kmail/kmfiltermgr.h @@ -33,7 +33,7 @@ template <typename T> class TQValueList; class KMFilterMgr: public TQObject { - Q_OBJECT + TQ_OBJECT public: @@ -50,7 +50,7 @@ public: void readConfig(void); /** Store filter rules in config file. */ - void writeConfig(bool withSync=TRUE); + void writeConfig(bool withSync=true); /** Open an edit dialog. If checkForEmptyFilterList is true, an empty filter is created to improve the visibility of the dialog in case no filter @@ -157,7 +157,7 @@ public: /** Called from the folder manager when a folder is removed. Tests if the folder aFolder is used in any action. Changes - to aNewFolder folder in this case. Returns TRUE if a change + to aNewFolder folder in this case. Returns true if a change occurred. */ bool folderRemoved(KMFolder* aFolder, KMFolder* aNewFolder); diff --git a/kmail/kmfolder.cpp b/kmail/kmfolder.cpp index b1b9c261..4bcd4992 100644 --- a/kmail/kmfolder.cpp +++ b/kmail/kmfolder.cpp @@ -87,53 +87,53 @@ KMFolder::KMFolder( KMFolderDir* aParent, const TQString& aFolderName, } if ( aParent ) { - connect( mStorage, TQT_SIGNAL( msgAdded( KMFolder*, TQ_UINT32 ) ), - aParent->manager(), TQT_SIGNAL( msgAdded( KMFolder*, TQ_UINT32 ) ) ); - connect( mStorage, TQT_SIGNAL( msgRemoved( KMFolder*, TQ_UINT32 ) ), - parent()->manager(), TQT_SIGNAL( msgRemoved( KMFolder*, TQ_UINT32 ) ) ); - connect( this, TQT_SIGNAL( msgChanged( KMFolder*, TQ_UINT32, int ) ), - parent()->manager(), TQT_SIGNAL( msgChanged( KMFolder*, TQ_UINT32, int ) ) ); - connect( this, TQT_SIGNAL( msgHeaderChanged( KMFolder*, int ) ), - parent()->manager(), TQT_SIGNAL( msgHeaderChanged( KMFolder*, int ) ) ); - connect( mStorage, TQT_SIGNAL( invalidated( KMFolder* ) ), - parent()->manager(), TQT_SIGNAL( folderInvalidated( KMFolder* ) ) ); + connect( mStorage, TQ_SIGNAL( msgAdded( KMFolder*, TQ_UINT32 ) ), + aParent->manager(), TQ_SIGNAL( msgAdded( KMFolder*, TQ_UINT32 ) ) ); + connect( mStorage, TQ_SIGNAL( msgRemoved( KMFolder*, TQ_UINT32 ) ), + parent()->manager(), TQ_SIGNAL( msgRemoved( KMFolder*, TQ_UINT32 ) ) ); + connect( this, TQ_SIGNAL( msgChanged( KMFolder*, TQ_UINT32, int ) ), + parent()->manager(), TQ_SIGNAL( msgChanged( KMFolder*, TQ_UINT32, int ) ) ); + connect( this, TQ_SIGNAL( msgHeaderChanged( KMFolder*, int ) ), + parent()->manager(), TQ_SIGNAL( msgHeaderChanged( KMFolder*, int ) ) ); + connect( mStorage, TQ_SIGNAL( invalidated( KMFolder* ) ), + parent()->manager(), TQ_SIGNAL( folderInvalidated( KMFolder* ) ) ); } // Resend all mStorage signals - connect( mStorage, TQT_SIGNAL( changed() ), TQT_SIGNAL( changed() ) ); - connect( mStorage, TQT_SIGNAL( cleared() ), TQT_SIGNAL( cleared() ) ); - connect( mStorage, TQT_SIGNAL( expunged( KMFolder* ) ), - TQT_SIGNAL( expunged( KMFolder* ) ) ); - connect( mStorage, TQT_SIGNAL( nameChanged() ), TQT_SIGNAL( nameChanged() ) ); - connect( mStorage, TQT_SIGNAL( msgRemoved( KMFolder*, TQ_UINT32 ) ), - TQT_SIGNAL( msgRemoved( KMFolder*, TQ_UINT32 ) ) ); - connect( mStorage, TQT_SIGNAL( msgRemoved( int, TQString ) ), - TQT_SIGNAL( msgRemoved( int, TQString ) ) ); - connect( mStorage, TQT_SIGNAL( msgRemoved( KMFolder* ) ), - TQT_SIGNAL( msgRemoved( KMFolder* ) ) ); - connect( mStorage, TQT_SIGNAL( msgAdded( int ) ), TQT_SIGNAL( msgAdded( int ) ) ); - connect( mStorage, TQT_SIGNAL( msgAdded( KMFolder*, TQ_UINT32 ) ), - TQT_SIGNAL( msgAdded( KMFolder*, TQ_UINT32 ) ) ); - connect( mStorage, TQT_SIGNAL( msgChanged( KMFolder*, TQ_UINT32 , int ) ), - TQT_SIGNAL( msgChanged( KMFolder*, TQ_UINT32 , int ) ) ); - connect( mStorage, TQT_SIGNAL( msgHeaderChanged( KMFolder*, int ) ), - TQT_SIGNAL( msgHeaderChanged( KMFolder*, int ) ) ); - connect( mStorage, TQT_SIGNAL( statusMsg( const TQString& ) ), - TQT_SIGNAL( statusMsg( const TQString& ) ) ); - connect( mStorage, TQT_SIGNAL( numUnreadMsgsChanged( KMFolder* ) ), - TQT_SIGNAL( numUnreadMsgsChanged( KMFolder* ) ) ); - connect( mStorage, TQT_SIGNAL( removed( KMFolder*, bool ) ), - TQT_SIGNAL( removed( KMFolder*, bool ) ) ); - connect( mStorage, TQT_SIGNAL(noContentChanged()), - TQT_SIGNAL(noContentChanged()) ); - connect( mStorage, TQT_SIGNAL(syncStateChanged()), - TQT_SIGNAL(syncStateChanged()) ); - - connect( mStorage, TQT_SIGNAL( contentsTypeChanged( KMail::FolderContentsType ) ), - this, TQT_SLOT( slotContentsTypeChanged( KMail::FolderContentsType ) ) ); - - connect( mStorage, TQT_SIGNAL( folderSizeChanged() ), - this, TQT_SLOT( slotFolderSizeChanged() ) ); + connect( mStorage, TQ_SIGNAL( changed() ), TQ_SIGNAL( changed() ) ); + connect( mStorage, TQ_SIGNAL( cleared() ), TQ_SIGNAL( cleared() ) ); + connect( mStorage, TQ_SIGNAL( expunged( KMFolder* ) ), + TQ_SIGNAL( expunged( KMFolder* ) ) ); + connect( mStorage, TQ_SIGNAL( nameChanged() ), TQ_SIGNAL( nameChanged() ) ); + connect( mStorage, TQ_SIGNAL( msgRemoved( KMFolder*, TQ_UINT32 ) ), + TQ_SIGNAL( msgRemoved( KMFolder*, TQ_UINT32 ) ) ); + connect( mStorage, TQ_SIGNAL( msgRemoved( int, TQString ) ), + TQ_SIGNAL( msgRemoved( int, TQString ) ) ); + connect( mStorage, TQ_SIGNAL( msgRemoved( KMFolder* ) ), + TQ_SIGNAL( msgRemoved( KMFolder* ) ) ); + connect( mStorage, TQ_SIGNAL( msgAdded( int ) ), TQ_SIGNAL( msgAdded( int ) ) ); + connect( mStorage, TQ_SIGNAL( msgAdded( KMFolder*, TQ_UINT32 ) ), + TQ_SIGNAL( msgAdded( KMFolder*, TQ_UINT32 ) ) ); + connect( mStorage, TQ_SIGNAL( msgChanged( KMFolder*, TQ_UINT32 , int ) ), + TQ_SIGNAL( msgChanged( KMFolder*, TQ_UINT32 , int ) ) ); + connect( mStorage, TQ_SIGNAL( msgHeaderChanged( KMFolder*, int ) ), + TQ_SIGNAL( msgHeaderChanged( KMFolder*, int ) ) ); + connect( mStorage, TQ_SIGNAL( statusMsg( const TQString& ) ), + TQ_SIGNAL( statusMsg( const TQString& ) ) ); + connect( mStorage, TQ_SIGNAL( numUnreadMsgsChanged( KMFolder* ) ), + TQ_SIGNAL( numUnreadMsgsChanged( KMFolder* ) ) ); + connect( mStorage, TQ_SIGNAL( removed( KMFolder*, bool ) ), + TQ_SIGNAL( removed( KMFolder*, bool ) ) ); + connect( mStorage, TQ_SIGNAL(noContentChanged()), + TQ_SIGNAL(noContentChanged()) ); + connect( mStorage, TQ_SIGNAL(syncStateChanged()), + TQ_SIGNAL(syncStateChanged()) ); + + connect( mStorage, TQ_SIGNAL( contentsTypeChanged( KMail::FolderContentsType ) ), + this, TQ_SLOT( slotContentsTypeChanged( KMail::FolderContentsType ) ) ); + + connect( mStorage, TQ_SIGNAL( folderSizeChanged() ), + this, TQ_SLOT( slotFolderSizeChanged() ) ); //FIXME: Centralize all the readConfig calls somehow - Zack // Meanwhile, readConfig must be done before registerWithMessageDict, since diff --git a/kmail/kmfolder.h b/kmail/kmfolder.h index e8de8207..e1178ee0 100644 --- a/kmail/kmfolder.h +++ b/kmail/kmfolder.h @@ -67,7 +67,7 @@ typedef TQValueList<TQ_UINT32> SerNumList; class KMFolder: public KMFolderNode { - Q_OBJECT + TQ_OBJECT friend class ::KMFolderJob; public: @@ -124,7 +124,7 @@ public: void setAcctList( AccountList* list ) { mAcctList = list; } AccountList* acctList() { return mAcctList; } - /** Returns TRUE if accounts are associated with this folder. */ + /** Returns true if accounts are associated with this folder. */ bool hasAccounts() const { return (mAcctList != 0); } /** This is used by the storage to read the folder specific configuration */ diff --git a/kmail/kmfoldercachedimap.cpp b/kmail/kmfoldercachedimap.cpp index dcfcbe7f..f7acebf6 100644 --- a/kmail/kmfoldercachedimap.cpp +++ b/kmail/kmfoldercachedimap.cpp @@ -153,10 +153,10 @@ DImapTroubleShootDialog::DImapTroubleShootDialog( TQWidget* parent, enableButtonSeparator( true ); - connect ( mIndexButton, TQT_SIGNAL(toggled(bool)), mIndexScope, TQT_SLOT(setEnabled(bool)) ); - connect ( mIndexButton, TQT_SIGNAL(toggled(bool)), scopeLabel, TQT_SLOT(setEnabled(bool)) ); - connect( mButtonGroup, TQT_SIGNAL( clicked( int ) ), TQT_SLOT( slotChanged() ) ); - connect( this, TQT_SIGNAL( okClicked () ), this, TQT_SLOT( slotDone() ) ); + connect ( mIndexButton, TQ_SIGNAL(toggled(bool)), mIndexScope, TQ_SLOT(setEnabled(bool)) ); + connect ( mIndexButton, TQ_SIGNAL(toggled(bool)), scopeLabel, TQ_SLOT(setEnabled(bool)) ); + connect( mButtonGroup, TQ_SIGNAL( clicked( int ) ), TQ_SLOT( slotChanged() ) ); + connect( this, TQ_SIGNAL( okClicked () ), this, TQ_SLOT( slotDone() ) ); enableButtonOK( false ); } @@ -908,8 +908,8 @@ void KMFolderCachedImap::serverSyncInternal() // kdDebug(5006) << "makeConnection said Connecting, waiting for signal." << endl; newState( mProgress, i18n("Connecting to %1").arg( mAccount->host() ) ); // We'll wait for the connectionResult signal from the account. - connect( mAccount, TQT_SIGNAL( connectionResult(int, const TQString&) ), - this, TQT_SLOT( slotConnectionResult(int, const TQString&) ) ); + connect( mAccount, TQ_SIGNAL( connectionResult(int, const TQString&) ), + this, TQ_SLOT( slotConnectionResult(int, const TQString&) ) ); break; } else { // Connected @@ -932,8 +932,8 @@ void KMFolderCachedImap::serverSyncInternal() // Check the user's own rights. We do this every time in case they changed. mOldUserRights = mUserRights; newState( mProgress, i18n("Checking permissions")); - connect( mAccount, TQT_SIGNAL( receivedUserRights( KMFolder* ) ), - this, TQT_SLOT( slotReceivedUserRights( KMFolder* ) ) ); + connect( mAccount, TQ_SIGNAL( receivedUserRights( KMFolder* ) ), + this, TQ_SLOT( slotReceivedUserRights( KMFolder* ) ) ); mAccount->getUserRights( folder(), imapPath() ); // after connecting, due to the INBOX case break; } @@ -955,8 +955,8 @@ void KMFolderCachedImap::serverSyncInternal() if ( !newName.isEmpty() && !folder()->isSystemFolder() && !isResourceFolder ) { newState( mProgress, i18n("Renaming folder") ); CachedImapJob *job = new CachedImapJob( newName, CachedImapJob::tRenameFolder, this ); - connect( job, TQT_SIGNAL( result(KMail::FolderJob *) ), this, TQT_SLOT( slotIncreaseProgress() ) ); - connect( job, TQT_SIGNAL( finished() ), this, TQT_SLOT( slotRenameFolderFinished() ) ); + connect( job, TQ_SIGNAL( result(KMail::FolderJob *) ), this, TQ_SLOT( slotIncreaseProgress() ) ); + connect( job, TQ_SIGNAL( finished() ), this, TQ_SLOT( slotRenameFolderFinished() ) ); job->start(); break; } @@ -1043,8 +1043,8 @@ void KMFolderCachedImap::serverSyncInternal() newState( mProgress, i18n("Deleting folders from server")); CachedImapJob* job = new CachedImapJob( foldersForDeletionOnServer, CachedImapJob::tDeleteFolders, this ); - connect( job, TQT_SIGNAL( result(KMail::FolderJob *) ), this, TQT_SLOT( slotIncreaseProgress() ) ); - connect( job, TQT_SIGNAL( finished() ), this, TQT_SLOT( slotFolderDeletionOnServerFinished() ) ); + connect( job, TQ_SIGNAL( result(KMail::FolderJob *) ), this, TQ_SLOT( slotIncreaseProgress() ) ); + connect( job, TQ_SIGNAL( finished() ), this, TQ_SLOT( slotFolderDeletionOnServerFinished() ) ); job->start(); break; } @@ -1082,8 +1082,8 @@ void KMFolderCachedImap::serverSyncInternal() newState( mProgress, i18n("Expunging deleted messages")); CachedImapJob *job = new CachedImapJob( TQString(), CachedImapJob::tExpungeFolder, this ); - connect( job, TQT_SIGNAL( result(KMail::FolderJob *) ), this, TQT_SLOT( slotIncreaseProgress() ) ); - connect( job, TQT_SIGNAL( finished() ), this, TQT_SLOT( serverSyncInternal() ) ); + connect( job, TQ_SIGNAL( result(KMail::FolderJob *) ), this, TQ_SLOT( slotIncreaseProgress() ) ); + connect( job, TQ_SIGNAL( finished() ), this, TQ_SLOT( serverSyncInternal() ) ); job->start(); break; } @@ -1097,10 +1097,10 @@ void KMFolderCachedImap::serverSyncInternal() CachedImapJob *job = new CachedImapJob( mMsgsForDownload, CachedImapJob::tGetMessage, this ); - connect( job, TQT_SIGNAL( progress(unsigned long, unsigned long) ), - this, TQT_SLOT( slotProgress(unsigned long, unsigned long) ) ); - connect( job, TQT_SIGNAL( finished() ), this, TQT_SLOT( slotUpdateLastUid() ) ); - connect( job, TQT_SIGNAL( finished() ), this, TQT_SLOT( serverSyncInternal() ) ); + connect( job, TQ_SIGNAL( progress(unsigned long, unsigned long) ), + this, TQ_SLOT( slotProgress(unsigned long, unsigned long) ) ); + connect( job, TQ_SIGNAL( finished() ), this, TQ_SLOT( slotUpdateLastUid() ) ); + connect( job, TQ_SIGNAL( finished() ), this, TQ_SLOT( serverSyncInternal() ) ); job->start(); mMsgsForDownload.clear(); break; @@ -1153,8 +1153,8 @@ void KMFolderCachedImap::serverSyncInternal() ImapAccountBase::jobData jd( url.url(), folder() ); jd.cancellable = true; // we can always do so later mAccount->insertJob(job, jd); - connect(job, TQT_SIGNAL(result(TDEIO::Job *)), - TQT_SLOT(slotTestAnnotationResult(TDEIO::Job *))); + connect(job, TQ_SIGNAL(result(TDEIO::Job *)), + TQ_SLOT(slotTestAnnotationResult(TDEIO::Job *))); break; } @@ -1197,10 +1197,10 @@ void KMFolderCachedImap::serverSyncInternal() jd.cancellable = true; mAccount->insertJob(job, jd); - connect( job, TQT_SIGNAL(annotationResult(const TQString&, const TQString&, bool)), - TQT_SLOT(slotAnnotationResult(const TQString&, const TQString&, bool)) ); - connect( job, TQT_SIGNAL(result(TDEIO::Job *)), - TQT_SLOT(slotGetAnnotationResult(TDEIO::Job *)) ); + connect( job, TQ_SIGNAL(annotationResult(const TQString&, const TQString&, bool)), + TQ_SLOT(slotAnnotationResult(const TQString&, const TQString&, bool)) ); + connect( job, TQ_SIGNAL(result(TDEIO::Job *)), + TQ_SLOT(slotGetAnnotationResult(TDEIO::Job *)) ); break; } } @@ -1238,10 +1238,10 @@ void KMFolderCachedImap::serverSyncInternal() jd.cancellable = true; // we can always do so later mAccount->insertJob(job, jd); - connect(job, TQT_SIGNAL(annotationChanged( const TQString&, const TQString&, const TQString& ) ), - TQT_SLOT( slotAnnotationChanged( const TQString&, const TQString&, const TQString& ) )); - connect(job, TQT_SIGNAL(result(TDEIO::Job *)), - TQT_SLOT(slotSetAnnotationResult(TDEIO::Job *))); + connect(job, TQ_SIGNAL(annotationChanged( const TQString&, const TQString&, const TQString& ) ), + TQ_SLOT( slotAnnotationChanged( const TQString&, const TQString&, const TQString& ) )); + connect(job, TQ_SIGNAL(result(TDEIO::Job *)), + TQ_SLOT(slotSetAnnotationResult(TDEIO::Job *))); break; } } @@ -1264,10 +1264,10 @@ void KMFolderCachedImap::serverSyncInternal() ImapAccountBase::jobData jd( url.url(), folder() ); mAccount->insertJob(job, jd); - connect(job, TQT_SIGNAL(result(TDEIO::Job *)), - TQT_SLOT(slotMultiSetACLResult(TDEIO::Job *))); - connect(job, TQT_SIGNAL(aclChanged( const TQString&, int )), - TQT_SLOT(slotACLChanged( const TQString&, int )) ); + connect(job, TQ_SIGNAL(result(TDEIO::Job *)), + TQ_SLOT(slotMultiSetACLResult(TDEIO::Job *))); + connect(job, TQ_SIGNAL(aclChanged( const TQString&, int )), + TQ_SLOT(slotACLChanged( const TQString&, int )) ); break; } } @@ -1278,8 +1278,8 @@ void KMFolderCachedImap::serverSyncInternal() if( !mQuotaOnly && !noContent() && mAccount->hasACLSupport() ) { newState( mProgress, i18n( "Retrieving permissions" ) ); mAccount->getACL( folder(), mImapPath ); - connect( mAccount, TQT_SIGNAL(receivedACL( KMFolder*, TDEIO::Job*, const KMail::ACLList& )), - this, TQT_SLOT(slotReceivedACL( KMFolder*, TDEIO::Job*, const KMail::ACLList& )) ); + connect( mAccount, TQ_SIGNAL(receivedACL( KMFolder*, TDEIO::Job*, const KMail::ACLList& )), + this, TQ_SLOT(slotReceivedACL( KMFolder*, TDEIO::Job*, const KMail::ACLList& )) ); break; } case SYNC_STATE_FIND_SUBFOLDERS: @@ -1309,10 +1309,10 @@ void KMFolderCachedImap::serverSyncInternal() TDEIO::Job* job = KMail::QuotaJobs::getStorageQuota( mAccount->slave(), url ); ImapAccountBase::jobData jd( url.url(), folder() ); mAccount->insertJob(job, jd); - connect( job, TQT_SIGNAL( storageQuotaResult( const QuotaInfo& ) ), - TQT_SLOT( slotStorageQuotaResult( const QuotaInfo& ) ) ); - connect( job, TQT_SIGNAL(result(TDEIO::Job *)), - TQT_SLOT(slotQuotaResult(TDEIO::Job *)) ); + connect( job, TQ_SIGNAL( storageQuotaResult( const QuotaInfo& ) ), + TQ_SLOT( slotStorageQuotaResult( const QuotaInfo& ) ) ); + connect( job, TQ_SIGNAL(result(TDEIO::Job *)), + TQ_SLOT(slotQuotaResult(TDEIO::Job *)) ); break; } case SYNC_STATE_CLOSE: @@ -1365,10 +1365,10 @@ void KMFolderCachedImap::syncNextSubFolder( bool secondSync ) mCurrentSubfolder = mSubfoldersForSync.front(); mSubfoldersForSync.pop_front(); if ( mCurrentSubfolder ) { - connect( mCurrentSubfolder, TQT_SIGNAL( folderComplete(KMFolderCachedImap*, bool) ), - this, TQT_SLOT( slotSubFolderComplete(KMFolderCachedImap*, bool) ) ); - connect( mCurrentSubfolder, TQT_SIGNAL( closeToQuotaChanged() ), - this, TQT_SLOT( slotSubFolderCloseToQuotaChanged() ) ); + connect( mCurrentSubfolder, TQ_SIGNAL( folderComplete(KMFolderCachedImap*, bool) ), + this, TQ_SLOT( slotSubFolderComplete(KMFolderCachedImap*, bool) ) ); + connect( mCurrentSubfolder, TQ_SIGNAL( closeToQuotaChanged() ), + this, TQ_SLOT( slotSubFolderCloseToQuotaChanged() ) ); //kdDebug(5006) << "Sync'ing subfolder " << mCurrentSubfolder->imapPath() << endl; assert( !mCurrentSubfolder->imapPath().isEmpty() ); @@ -1416,10 +1416,10 @@ void KMFolderCachedImap::buildSubFolderList() void KMFolderCachedImap::disconnectSubFolderSignals() { - disconnect( mCurrentSubfolder, TQT_SIGNAL( folderComplete(KMFolderCachedImap*, bool) ), - this, TQT_SLOT( slotSubFolderComplete(KMFolderCachedImap*, bool) ) ); - disconnect( mCurrentSubfolder, TQT_SIGNAL( closeToQuotaChanged() ), - this, TQT_SLOT( slotSubFolderCloseToQuotaChanged() ) ); + disconnect( mCurrentSubfolder, TQ_SIGNAL( folderComplete(KMFolderCachedImap*, bool) ), + this, TQ_SLOT( slotSubFolderComplete(KMFolderCachedImap*, bool) ) ); + disconnect( mCurrentSubfolder, TQ_SIGNAL( closeToQuotaChanged() ), + this, TQ_SLOT( slotSubFolderCloseToQuotaChanged() ) ); mCurrentSubfolder = 0; } @@ -1428,8 +1428,8 @@ void KMFolderCachedImap::disconnectSubFolderSignals() */ void KMFolderCachedImap::slotConnectionResult( int errorCode, const TQString& errorMsg ) { - disconnect( mAccount, TQT_SIGNAL( connectionResult(int, const TQString&) ), - this, TQT_SLOT( slotConnectionResult(int, const TQString&) ) ); + disconnect( mAccount, TQ_SIGNAL( connectionResult(int, const TQString&) ), + this, TQ_SLOT( slotConnectionResult(int, const TQString&) ) ); if ( !errorCode ) { // Success mSyncState = SYNC_STATE_GET_USERRIGHTS; @@ -1463,15 +1463,15 @@ void KMFolderCachedImap::uploadNewMessages() if ( mUserRightsState != KMail::ACLJobs::Ok || ( mUserRights & ( KMail::ACLJobs::Insert ) ) ) { newState( mProgress, i18n("Uploading messages to server")); CachedImapJob *job = new CachedImapJob( newMsgs, CachedImapJob::tPutMessage, this ); - connect( job, TQT_SIGNAL( progress( unsigned long, unsigned long) ), - this, TQT_SLOT( slotPutProgress(unsigned long, unsigned long) ) ); - connect( job, TQT_SIGNAL( finished() ), this, TQT_SLOT( serverSyncInternal() ) ); + connect( job, TQ_SIGNAL( progress( unsigned long, unsigned long) ), + this, TQ_SLOT( slotPutProgress(unsigned long, unsigned long) ) ); + connect( job, TQ_SIGNAL( finished() ), this, TQ_SLOT( serverSyncInternal() ) ); job->start(); return; } else { KMCommand *command = rescueUnsyncedMessages(); - connect( command, TQT_SIGNAL( completed( KMCommand * ) ), - this, TQT_SLOT( serverSyncInternal() ) ); + connect( command, TQ_SIGNAL( completed( KMCommand * ) ), + this, TQ_SLOT( serverSyncInternal() ) ); } } else { // nothing to upload if ( mUserRights != mOldUserRights && (mOldUserRights & KMail::ACLJobs::Insert) @@ -1537,8 +1537,8 @@ void KMFolderCachedImap::uploadFlags() // FIXME END DUPLICATED FROM KMFOLDERIMAP if ( mStatusFlagsJobs ) { - connect( mAccount, TQT_SIGNAL( imapStatusChanged(KMFolder*, const TQString&, bool) ), - this, TQT_SLOT( slotImapStatusChanged(KMFolder*, const TQString&, bool) ) ); + connect( mAccount, TQ_SIGNAL( imapStatusChanged(KMFolder*, const TQString&, bool) ), + this, TQ_SLOT( slotImapStatusChanged(KMFolder*, const TQString&, bool) ) ); return; } } @@ -1588,8 +1588,8 @@ void KMFolderCachedImap::uploadSeenFlags() } if ( mStatusFlagsJobs ) { - connect( mAccount, TQT_SIGNAL( imapStatusChanged(KMFolder*, const TQString&, bool) ), - this, TQT_SLOT( slotImapStatusChanged(KMFolder*, const TQString&, bool) ) ); + connect( mAccount, TQ_SIGNAL( imapStatusChanged(KMFolder*, const TQString&, bool) ), + this, TQ_SLOT( slotImapStatusChanged(KMFolder*, const TQString&, bool) ) ); return; } } @@ -1607,8 +1607,8 @@ void KMFolderCachedImap::slotImapStatusChanged(KMFolder* folder, const TQString& if ( folder->storage() == this ) { --mStatusFlagsJobs; if ( mStatusFlagsJobs == 0 || !cont ) // done or aborting - disconnect( mAccount, TQT_SIGNAL( imapStatusChanged(KMFolder*, const TQString&, bool) ), - this, TQT_SLOT( slotImapStatusChanged(KMFolder*, const TQString&, bool) ) ); + disconnect( mAccount, TQ_SIGNAL( imapStatusChanged(KMFolder*, const TQString&, bool) ), + this, TQ_SLOT( slotImapStatusChanged(KMFolder*, const TQString&, bool) ) ); if ( mStatusFlagsJobs == 0 && cont ) { mProgress += 5; serverSyncInternal(); @@ -1646,8 +1646,8 @@ void KMFolderCachedImap::createNewFolders() if( !newFolders.isEmpty() ) { newState( mProgress, i18n("Creating subfolders on server")); CachedImapJob *job = new CachedImapJob( newFolders, CachedImapJob::tAddSubfolders, this ); - connect( job, TQT_SIGNAL( result(KMail::FolderJob *) ), this, TQT_SLOT( slotIncreaseProgress() ) ); - connect( job, TQT_SIGNAL( finished() ), this, TQT_SLOT( serverSyncInternal() ) ); + connect( job, TQ_SIGNAL( result(KMail::FolderJob *) ), this, TQ_SLOT( slotIncreaseProgress() ) ); + connect( job, TQ_SIGNAL( finished() ), this, TQ_SLOT( serverSyncInternal() ) ); job->start(); } else { serverSyncInternal(); @@ -1721,8 +1721,8 @@ bool KMFolderCachedImap::deleteMessages() uidsForDeletionOnServer.clear(); kdDebug(5006) << "Deleting " << sets.count() << " sets of messages from server folder " << imapPath() << endl; CachedImapJob *job = new CachedImapJob( sets, CachedImapJob::tDeleteMessage, this ); - connect( job, TQT_SIGNAL( result(KMail::FolderJob *) ), - this, TQT_SLOT( slotDeleteMessagesResult(KMail::FolderJob *) ) ); + connect( job, TQ_SIGNAL( result(KMail::FolderJob *) ), + this, TQ_SLOT( slotDeleteMessagesResult(KMail::FolderJob *) ) ); job->start(); return true; } else { @@ -1757,9 +1757,9 @@ void KMFolderCachedImap::checkUidValidity() { else { newState( mProgress, i18n("Checking folder validity")); CachedImapJob *job = new CachedImapJob( FolderJob::tCheckUidValidity, this ); - connect( job, TQT_SIGNAL(permanentFlags(int)), TQT_SLOT(slotPermanentFlags(int)) ); - connect( job, TQT_SIGNAL( result( KMail::FolderJob* ) ), - this, TQT_SLOT( slotCheckUidValidityResult( KMail::FolderJob* ) ) ); + connect( job, TQ_SIGNAL(permanentFlags(int)), TQ_SLOT(slotPermanentFlags(int)) ); + connect( job, TQ_SIGNAL( result( KMail::FolderJob* ) ), + this, TQ_SLOT( slotCheckUidValidityResult( KMail::FolderJob* ) ) ); job->start(); } } @@ -1808,8 +1808,8 @@ void KMFolderCachedImap::listMessages() { mFoundAnIMAPDigest = false; CachedImapJob* job = new CachedImapJob( FolderJob::tListMessages, this ); - connect( job, TQT_SIGNAL( result(KMail::FolderJob *) ), - this, TQT_SLOT( slotGetLastMessagesResult(KMail::FolderJob *) ) ); + connect( job, TQ_SIGNAL( result(KMail::FolderJob *) ), + this, TQ_SLOT( slotGetLastMessagesResult(KMail::FolderJob *) ) ); job->start(); } @@ -2038,9 +2038,9 @@ void KMFolderCachedImap::listNamespaces() } KMail::ListJob* job = new KMail::ListJob( mAccount, type, this, mAccount->addPathToNamespace( *it ) ); job->setHonorLocalSubscription( true ); - connect( job, TQT_SIGNAL(receivedFolders(const TQStringList&, const TQStringList&, + connect( job, TQ_SIGNAL(receivedFolders(const TQStringList&, const TQStringList&, const TQStringList&, const TQStringList&, const ImapAccountBase::jobData&)), - this, TQT_SLOT(slotCheckNamespace(const TQStringList&, const TQStringList&, + this, TQ_SLOT(slotCheckNamespace(const TQStringList&, const TQStringList&, const TQStringList&, const TQStringList&, const ImapAccountBase::jobData&))); job->start(); } @@ -2060,9 +2060,9 @@ void KMFolderCachedImap::listNamespaces() mAccount->addPathToNamespace( ns ) ); job->setNamespace( ns ); job->setHonorLocalSubscription( true ); - connect( job, TQT_SIGNAL(receivedFolders(const TQStringList&, const TQStringList&, + connect( job, TQ_SIGNAL(receivedFolders(const TQStringList&, const TQStringList&, const TQStringList&, const TQStringList&, const ImapAccountBase::jobData&)), - this, TQT_SLOT(slotListResult(const TQStringList&, const TQStringList&, + this, TQ_SLOT(slotListResult(const TQStringList&, const TQStringList&, const TQStringList&, const TQStringList&, const ImapAccountBase::jobData&))); job->start(); } @@ -2148,9 +2148,9 @@ bool KMFolderCachedImap::listDirectory() type = ImapAccountBase::ListSubscribed; KMail::ListJob* job = new KMail::ListJob( mAccount, type, this ); job->setHonorLocalSubscription( true ); - connect( job, TQT_SIGNAL(receivedFolders(const TQStringList&, const TQStringList&, + connect( job, TQ_SIGNAL(receivedFolders(const TQStringList&, const TQStringList&, const TQStringList&, const TQStringList&, const ImapAccountBase::jobData&)), - this, TQT_SLOT(slotListResult(const TQStringList&, const TQStringList&, + this, TQ_SLOT(slotListResult(const TQStringList&, const TQStringList&, const TQStringList&, const TQStringList&, const ImapAccountBase::jobData&))); job->start(); @@ -2347,8 +2347,8 @@ void KMFolderCachedImap::listDirectory2() ImapAccountBase::jobData jd( TQString(), folder() ); jd.cancellable = true; mAccount->insertJob(job, jd); - connect( job, TQT_SIGNAL(result(TDEIO::Job *)), - TQT_SLOT(slotMultiUrlGetAnnotationResult(TDEIO::Job *)) ); + connect( job, TQ_SIGNAL(result(TDEIO::Job *)), + TQ_SLOT(slotMultiUrlGetAnnotationResult(TDEIO::Job *)) ); } else { createFoldersNewOnServerAndFinishListing( foldersNewOnServer ); @@ -2493,8 +2493,8 @@ void KMFolderCachedImap::slotReceivedUserRights( KMFolder* folder ) { if ( folder->storage() == this ) { - disconnect( mAccount, TQT_SIGNAL( receivedUserRights( KMFolder* ) ), - this, TQT_SLOT( slotReceivedUserRights( KMFolder* ) ) ); + disconnect( mAccount, TQ_SIGNAL( receivedUserRights( KMFolder* ) ), + this, TQ_SLOT( slotReceivedUserRights( KMFolder* ) ) ); if ( mUserRightsState == KMail::ACLJobs::Ok ) { setReadOnly( ( mUserRights & KMail::ACLJobs::Insert ) == 0 ); } @@ -2516,8 +2516,8 @@ void KMFolderCachedImap::slotReceivedACL( KMFolder* folder, TDEIO::Job* job, const KMail::ACLList& aclList ) { if ( folder->storage() == this ) { - disconnect( mAccount, TQT_SIGNAL(receivedACL( KMFolder*, TDEIO::Job*, const KMail::ACLList& )), - this, TQT_SLOT(slotReceivedACL( KMFolder*, TDEIO::Job*, const KMail::ACLList& )) ); + disconnect( mAccount, TQ_SIGNAL(receivedACL( KMFolder*, TDEIO::Job*, const KMail::ACLList& )), + this, TQ_SLOT(slotReceivedACL( KMFolder*, TDEIO::Job*, const KMail::ACLList& )) ); mACLListState = job->error() ? KMail::ACLJobs::FetchFailed : KMail::ACLJobs::Ok; mACLList = aclList; serverSyncInternal(); @@ -2695,7 +2695,7 @@ void KMFolderCachedImap::updateAnnotationFolderType() if ( ( newType != oldType || newSubType != oldSubType ) && changingTypeAllowed ) { mAnnotationFolderType = newType + ( newSubType.isEmpty() ? TQString() : "."+newSubType ); mAnnotationFolderTypeChanged = true; // force a "set annotation" on next sync - kdDebug(5006) << mImapPath << ": updateAnnotationFolderType: '" << mAnnotationFolderType << "', was (" << oldType << " " << oldSubType << ") => mAnnotationFolderTypeChanged set to TRUE" << endl; + kdDebug(5006) << mImapPath << ": updateAnnotationFolderType: '" << mAnnotationFolderType << "', was (" << oldType << " " << oldSubType << ") => mAnnotationFolderTypeChanged set to true" << endl; } // Ensure that further readConfig()s don't lose mAnnotationFolderType writeConfigKeysWhichShouldNotGetOverwrittenByReadConfig(); @@ -3166,8 +3166,8 @@ void KMFolderCachedImap::rescueUnsyncedMessagesAndDeleteFolder( KMFolder *folder if ( storage ) { KMCommand *command = storage->rescueUnsyncedMessages(); if ( command ) { - connect( command, TQT_SIGNAL(completed(KMCommand*)), - TQT_SLOT(slotRescueDone(KMCommand*)) ); + connect( command, TQ_SIGNAL(completed(KMCommand*)), + TQ_SLOT(slotRescueDone(KMCommand*)) ); ++mRescueCommandCount; } else { // nothing to rescue, close folder diff --git a/kmail/kmfoldercachedimap.h b/kmail/kmfoldercachedimap.h index e82da6c3..56e3dc27 100644 --- a/kmail/kmfoldercachedimap.h +++ b/kmail/kmfoldercachedimap.h @@ -33,7 +33,7 @@ #define kmfoldercachedimap_h #include <kdialogbase.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tqvaluelist.h> #include <tqvaluevector.h> #include <tqptrlist.h> @@ -65,7 +65,7 @@ using KMail::AttachmentStrategy; class DImapTroubleShootDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: enum SelectedOperation { @@ -92,7 +92,7 @@ private: class KMFolderCachedImap : public KMFolderMaildir { - Q_OBJECT + TQ_OBJECT public: diff --git a/kmail/kmfoldercombobox.cpp b/kmail/kmfoldercombobox.cpp index 499d444f..4b722c75 100644 --- a/kmail/kmfoldercombobox.cpp +++ b/kmail/kmfoldercombobox.cpp @@ -32,15 +32,15 @@ void KMFolderComboBox::init() mOutboxShown = true; mImapShown = true; refreshFolders(); - connect( this, TQT_SIGNAL( activated(int) ), - this, TQT_SLOT( slotActivated(int) ) ); - connect( kmkernel->folderMgr(), TQT_SIGNAL(changed()), - this, TQT_SLOT(refreshFolders()) ); - connect( kmkernel->dimapFolderMgr(), TQT_SIGNAL(changed()), - this, TQT_SLOT(refreshFolders()) ); + connect( this, TQ_SIGNAL( activated(int) ), + this, TQ_SLOT( slotActivated(int) ) ); + connect( kmkernel->folderMgr(), TQ_SIGNAL(changed()), + this, TQ_SLOT(refreshFolders()) ); + connect( kmkernel->dimapFolderMgr(), TQ_SIGNAL(changed()), + this, TQ_SLOT(refreshFolders()) ); if (mImapShown) - connect( kmkernel->imapFolderMgr(), TQT_SIGNAL(changed()), - this, TQT_SLOT(refreshFolders()) ); + connect( kmkernel->imapFolderMgr(), TQ_SIGNAL(changed()), + this, TQ_SLOT(refreshFolders()) ); } @@ -59,11 +59,11 @@ void KMFolderComboBox::showImapFolders(bool shown) mImapShown = shown; refreshFolders(); if (shown) - connect( kmkernel->imapFolderMgr(), TQT_SIGNAL(changed()), - this, TQT_SLOT(refreshFolders()) ); + connect( kmkernel->imapFolderMgr(), TQ_SIGNAL(changed()), + this, TQ_SLOT(refreshFolders()) ); else - disconnect( kmkernel->imapFolderMgr(), TQT_SIGNAL(changed()), - this, TQT_SLOT(refreshFolders()) ); + disconnect( kmkernel->imapFolderMgr(), TQ_SIGNAL(changed()), + this, TQ_SLOT(refreshFolders()) ); } //----------------------------------------------------------------------------- diff --git a/kmail/kmfoldercombobox.h b/kmail/kmfoldercombobox.h index ae90497a..42461c0b 100644 --- a/kmail/kmfoldercombobox.h +++ b/kmail/kmfoldercombobox.h @@ -13,7 +13,7 @@ class KMFolderComboBox : public TQComboBox { - Q_OBJECT + TQ_OBJECT public: diff --git a/kmail/kmfolderdia.cpp b/kmail/kmfolderdia.cpp index da4671bf..ac008ee1 100644 --- a/kmail/kmfolderdia.cpp +++ b/kmail/kmfolderdia.cpp @@ -88,7 +88,7 @@ KMFolderDialog::KMFolderDialog(KMFolder *aFolder, KMFolderDir *aFolderDir, const TQString& aName): KDialogBase( KDialogBase::Tabbed, aCap, KDialogBase::Ok|KDialogBase::Cancel, - KDialogBase::Ok, aParent, "KMFolderDialog", TRUE ), + KDialogBase::Ok, aParent, "KMFolderDialog", true ), mFolder( aFolder ), mFolderDir( aFolderDir ), mParentFolder( 0 ), @@ -149,12 +149,12 @@ KMFolderDialog::KMFolderDialog(KMFolder *aFolder, KMFolderDir *aFolderDir, void KMFolderDialog::addTab( FolderDiaTab* tab ) { - connect( tab, TQT_SIGNAL( readyForAccept() ), - this, TQT_SLOT( slotReadyForAccept() ) ); - connect( tab, TQT_SIGNAL( cancelAccept() ), - this, TQT_SLOT( slotCancelAccept() ) ); - //connect( tab, TQT_SIGNAL(changed( bool )), - // this, TQT_SLOT(slotChanged( bool )) ); + connect( tab, TQ_SIGNAL( readyForAccept() ), + this, TQ_SLOT( slotReadyForAccept() ) ); + connect( tab, TQ_SIGNAL( cancelAccept() ), + this, TQ_SLOT( slotCancelAccept() ) ); + //connect( tab, TQ_SIGNAL(changed( bool )), + // this, TQ_SLOT(slotChanged( bool )) ); mTabs.append( tab ); } @@ -343,8 +343,8 @@ KMail::FolderDiaGeneralTab::FolderDiaGeneralTab( KMFolderDialog* dlg, } label->setBuddy( mNameEdit ); hl->addWidget( mNameEdit ); - connect( mNameEdit, TQT_SIGNAL( textChanged( const TQString & ) ), - this, TQT_SLOT( slotFolderNameChanged( const TQString & ) ) ); + connect( mNameEdit, TQ_SIGNAL( textChanged( const TQString & ) ), + this, TQ_SLOT( slotFolderNameChanged( const TQString & ) ) ); //start icons group @@ -388,17 +388,17 @@ KMail::FolderDiaGeneralTab::FolderDiaGeneralTab( KMFolderDialog* dlg, ihl->addWidget( mUnreadIconButton ); ihl->addStretch( 1 ); - connect( mIconsCheckBox, TQT_SIGNAL(toggled(bool)), - mNormalIconButton, TQT_SLOT(setEnabled(bool)) ); - connect( mIconsCheckBox, TQT_SIGNAL(toggled(bool)), - mUnreadIconButton, TQT_SLOT(setEnabled(bool)) ); - connect( mIconsCheckBox, TQT_SIGNAL(toggled(bool)), - mNormalIconLabel, TQT_SLOT(setEnabled(bool)) ); - connect( mIconsCheckBox, TQT_SIGNAL(toggled(bool)), - mUnreadIconLabel, TQT_SLOT(setEnabled(bool)) ); + connect( mIconsCheckBox, TQ_SIGNAL(toggled(bool)), + mNormalIconButton, TQ_SLOT(setEnabled(bool)) ); + connect( mIconsCheckBox, TQ_SIGNAL(toggled(bool)), + mUnreadIconButton, TQ_SLOT(setEnabled(bool)) ); + connect( mIconsCheckBox, TQ_SIGNAL(toggled(bool)), + mNormalIconLabel, TQ_SLOT(setEnabled(bool)) ); + connect( mIconsCheckBox, TQ_SIGNAL(toggled(bool)), + mUnreadIconLabel, TQ_SLOT(setEnabled(bool)) ); - connect( mNormalIconButton, TQT_SIGNAL(iconChanged(TQString)), - this, TQT_SLOT(slotChangeIcon(TQString)) ); + connect( mNormalIconButton, TQ_SIGNAL(iconChanged(TQString)), + this, TQ_SLOT(slotChangeIcon(TQString)) ); //end icons group addLine( this, topLayout); @@ -510,8 +510,8 @@ KMail::FolderDiaGeneralTab::FolderDiaGeneralTab( KMFolderDialog* dlg, mContentsComboBox->insertItem( i18n( "Journal" ) ); if ( mDlg->folder() ) mContentsComboBox->setCurrentItem( mDlg->folder()->storage()->contentsType() ); - connect ( mContentsComboBox, TQT_SIGNAL ( activated( int ) ), - this, TQT_SLOT( slotFolderContentsSelectionChanged( int ) ) ); + connect ( mContentsComboBox, TQ_SIGNAL ( activated( int ) ), + this, TQ_SLOT( slotFolderContentsSelectionChanged( int ) ) ); if ( mDlg->folder()->isReadOnly() || mIsResourceFolder ) mContentsComboBox->setEnabled( false ); } else { @@ -541,8 +541,8 @@ KMail::FolderDiaGeneralTab::FolderDiaGeneralTab( KMFolderDialog* dlg, "and should see the alarms for the events or tasks in this folder. " "The setting applies to Calendar and Task folders only " "(for tasks, this setting is only used for alarms).\n\n" - "Example use cases: if the boss shares a folder with his secretary, " - "only the boss should be marked as busy for his meetings, so he should " + "Example use cases: if the boss shares a folder with their secretary, " + "only the boss should be marked as busy for their meetings, so they should " "select \"Admins\", since the secretary has no admin rights on the folder.\n" "On the other hand if a working group shares a Calendar for " "group meetings, all readers of the folders should be marked " @@ -816,18 +816,18 @@ KMail::FolderDiaTemplatesTab::FolderDiaTemplatesTab( KMFolderDialog* dlg, mCopyGlobal->setEnabled( false ); btns->addWidget( mCopyGlobal ); - connect( mCustom, TQT_SIGNAL(toggled(bool)), - mWidget, TQT_SLOT(setEnabled(bool)) ); - connect( mCustom, TQT_SIGNAL(toggled(bool)), - mCopyGlobal, TQT_SLOT(setEnabled(bool)) ); + connect( mCustom, TQ_SIGNAL(toggled(bool)), + mWidget, TQ_SLOT(setEnabled(bool)) ); + connect( mCustom, TQ_SIGNAL(toggled(bool)), + mCopyGlobal, TQ_SLOT(setEnabled(bool)) ); - connect( mCopyGlobal, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotCopyGlobal()) ); + connect( mCopyGlobal, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotCopyGlobal()) ); initializeWithValuesFromFolder( mDlg->folder() ); - connect( mWidget, TQT_SIGNAL( changed() ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mWidget, TQ_SIGNAL( changed() ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); } void FolderDiaTemplatesTab::load() diff --git a/kmail/kmfolderdia.h b/kmail/kmfolderdia.h index e7c6b1d1..b1f41862 100644 --- a/kmail/kmfolderdia.h +++ b/kmail/kmfolderdia.h @@ -68,7 +68,7 @@ namespace KMail { */ class FolderDiaTab : public TQWidget { - Q_OBJECT + TQ_OBJECT public: FolderDiaTab( TQWidget *parent=0, const char* name=0 ) @@ -110,7 +110,7 @@ signals: */ class FolderDiaGeneralTab : public FolderDiaTab { - Q_OBJECT + TQ_OBJECT public: @@ -162,7 +162,7 @@ private: */ class FolderDiaTemplatesTab : public FolderDiaTab { - Q_OBJECT + TQ_OBJECT public: @@ -197,7 +197,7 @@ private: */ class KMFolderDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/kmail/kmfolderdir.cpp b/kmail/kmfolderdir.cpp index 6d673c4b..19baf48f 100644 --- a/kmail/kmfolderdir.cpp +++ b/kmail/kmfolderdir.cpp @@ -13,7 +13,7 @@ #include <tdelocale.h> #include <tdemessagebox.h> #include <kdebug.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> //============================================================================= @@ -204,11 +204,11 @@ bool KMFolderDir::reload(void) dir.setFilter(TQDir::Files | TQDir::Dirs | TQDir::Hidden); dir.setNameFilter("*"); - if (!dir.cd(fldPath, TRUE)) + if (!dir.cd(fldPath, true)) { TQString msg = i18n("<qt>Cannot enter folder <b>%1</b>.</qt>").arg(fldPath); KMessageBox::information(0, msg); - return FALSE; + return false; } TQFileInfoList* fiList=(TQFileInfoList*)dir.entryInfoList(); @@ -216,7 +216,7 @@ bool KMFolderDir::reload(void) { TQString msg = i18n("<qt>Folder <b>%1</b> is unreadable.</qt>").arg(fldPath); KMessageBox::information(0, msg); - return FALSE; + return false; } for (fileInfo=fiList->first(); fileInfo; fileInfo=fiList->next()) @@ -335,7 +335,7 @@ bool KMFolderDir::reload(void) addDirToParent( *it, folder ); } } - return TRUE; + return true; } diff --git a/kmail/kmfolderdir.h b/kmail/kmfolderdir.h index 7fe81689..18f1cbc5 100644 --- a/kmail/kmfolderdir.h +++ b/kmail/kmfolderdir.h @@ -14,7 +14,7 @@ class KMFolderMgr; */ class KMFolderDir: public KMFolderNode, public KMFolderNodeList { - Q_OBJECT + TQ_OBJECT public: @@ -42,7 +42,7 @@ public: /** URL of the node for visualization purposes. */ virtual TQString prettyURL() const; - /** Create a mail folder in this directory with given name. If sysFldr==TRUE + /** Create a mail folder in this directory with given name. If sysFldr==true the folder is marked as a (KMail) system folder. Returns Folder on success. */ virtual KMFolder* createFolder( const TQString& folderName, @@ -70,7 +70,7 @@ protected: class KMFolderRootDir: public KMFolderDir { - Q_OBJECT + TQ_OBJECT public: diff --git a/kmail/kmfolderimap.cpp b/kmail/kmfolderimap.cpp index b0686dbb..ee573c17 100644 --- a/kmail/kmfolderimap.cpp +++ b/kmail/kmfolderimap.cpp @@ -82,8 +82,8 @@ KMFolderImap::KMFolderImap(KMFolder* folder, const char* aName) mAddMessageProgressItem = 0; mReadOnly = false; - connect (this, TQT_SIGNAL( folderComplete( KMFolderImap*, bool ) ), - this, TQT_SLOT( slotCompleteMailCheckProgress()) ); + connect (this, TQ_SIGNAL( folderComplete( KMFolderImap*, bool ) ), + this, TQ_SLOT( slotCompleteMailCheckProgress()) ); } KMFolderImap::~KMFolderImap() @@ -249,8 +249,8 @@ void KMFolderImap::remove() false, account()->useSSL() || account()->useTLS() ); account()->insertJob(job, jd); - connect(job, TQT_SIGNAL(result(TDEIO::Job *)), - this, TQT_SLOT(slotRemoveFolderResult(TDEIO::Job *))); + connect(job, TQ_SIGNAL(result(TDEIO::Job *)), + this, TQ_SLOT(slotRemoveFolderResult(TDEIO::Job *))); } //----------------------------------------------------------------------------- @@ -417,10 +417,10 @@ int KMFolderImap::addMsg(TQPtrList<KMMessage>& msgList, TQValueList<int>& aIndex msg = msgParent->getMsg(idx); } imapJob = new ImapJob(msg, ImapJob::tPutMessage, this); - connect(imapJob, TQT_SIGNAL(messageStored(KMMessage*)), - TQT_SLOT(addMsgQuiet(KMMessage*))); - connect(imapJob, TQT_SIGNAL(result(KMail::FolderJob*)), - TQT_SLOT(slotCopyMsgResult(KMail::FolderJob*))); + connect(imapJob, TQ_SIGNAL(messageStored(KMMessage*)), + TQ_SLOT(addMsgQuiet(KMMessage*))); + connect(imapJob, TQ_SIGNAL(result(KMail::FolderJob*)), + TQ_SLOT(slotCopyMsgResult(KMail::FolderJob*))); imapJob->start(); } @@ -439,10 +439,10 @@ int KMFolderImap::addMsg(TQPtrList<KMMessage>& msgList, TQValueList<int>& aIndex TQPtrList<KMMessage> temp_msgs = splitMessageList(*it, msgList); if ( temp_msgs.isEmpty() ) kdDebug(5006) << "Wow! KMFolderImap::splitMessageList() returned an empty list!" << endl; imapJob = new ImapJob(temp_msgs, *it, ImapJob::tMoveMessage, this); - connect(imapJob, TQT_SIGNAL(messageCopied(TQPtrList<KMMessage>)), - TQT_SLOT(addMsgQuiet(TQPtrList<KMMessage>))); - connect(imapJob, TQT_SIGNAL(result(KMail::FolderJob*)), - TQT_SLOT(slotCopyMsgResult(KMail::FolderJob*))); + connect(imapJob, TQ_SIGNAL(messageCopied(TQPtrList<KMMessage>)), + TQ_SLOT(addMsgQuiet(TQPtrList<KMMessage>))); + connect(imapJob, TQ_SIGNAL(result(KMail::FolderJob*)), + TQ_SLOT(slotCopyMsgResult(KMail::FolderJob*))); imapJob->start(); } } @@ -492,14 +492,14 @@ int KMFolderImap::addMsg(TQPtrList<KMMessage>& msgList, TQValueList<int>& aIndex true, account()->useSSL() || account()->useTLS() ); mAddMessageProgressItem->setTotalItems( msgList.count() ); - connect ( mAddMessageProgressItem, TQT_SIGNAL( progressItemCanceled( KPIM::ProgressItem*)), - account(), TQT_SLOT( slotAbortRequested( KPIM::ProgressItem* ) ) ); + connect ( mAddMessageProgressItem, TQ_SIGNAL( progressItemCanceled( KPIM::ProgressItem*)), + account(), TQ_SLOT( slotAbortRequested( KPIM::ProgressItem* ) ) ); imapJob->setParentProgressItem( mAddMessageProgressItem ); } - connect( imapJob, TQT_SIGNAL( messageCopied(TQPtrList<KMMessage>) ), - TQT_SLOT( addMsgQuiet(TQPtrList<KMMessage>) ) ); - connect( imapJob, TQT_SIGNAL(result(KMail::FolderJob*)), - TQT_SLOT(slotCopyMsgResult(KMail::FolderJob*)) ); + connect( imapJob, TQ_SIGNAL( messageCopied(TQPtrList<KMMessage>) ), + TQ_SLOT( addMsgQuiet(TQPtrList<KMMessage>) ) ); + connect( imapJob, TQ_SIGNAL(result(KMail::FolderJob*)), + TQ_SLOT(slotCopyMsgResult(KMail::FolderJob*)) ); imapJob->start(); } @@ -534,8 +534,8 @@ void KMFolderImap::copyMsg(TQPtrList<KMMessage>& msgList) TQPtrList<KMMessage> temp_msgs = splitMessageList(*it, msgList); ImapJob *job = new ImapJob(temp_msgs, *it, ImapJob::tCopyMessage, this); - connect(job, TQT_SIGNAL(result(KMail::FolderJob*)), - TQT_SLOT(slotCopyMsgResult(KMail::FolderJob*))); + connect(job, TQ_SIGNAL(result(KMail::FolderJob*)), + TQ_SLOT(slotCopyMsgResult(KMail::FolderJob*))); job->start(); } } @@ -603,8 +603,8 @@ void KMFolderImap::take(TQPtrList<KMMessage> msgList) //----------------------------------------------------------------------------- void KMFolderImap::slotListNamespaces() { - disconnect( account(), TQT_SIGNAL( connectionResult(int, const TQString&) ), - this, TQT_SLOT( slotListNamespaces() ) ); + disconnect( account(), TQ_SIGNAL( connectionResult(int, const TQString&) ), + this, TQ_SLOT( slotListNamespaces() ) ); if ( account()->makeConnection() == ImapAccountBase::Error ) { kdWarning(5006) << "slotListNamespaces - got no connection" << endl; @@ -613,8 +613,8 @@ void KMFolderImap::slotListNamespaces() { // wait for the connectionResult kdDebug(5006) << "slotListNamespaces - waiting for connection" << endl; - connect( account(), TQT_SIGNAL( connectionResult(int, const TQString&) ), - this, TQT_SLOT( slotListNamespaces() ) ); + connect( account(), TQ_SIGNAL( connectionResult(int, const TQString&) ), + this, TQ_SLOT( slotListNamespaces() ) ); return; } kdDebug(5006) << "slotListNamespaces" << endl; @@ -636,9 +636,9 @@ void KMFolderImap::slotListNamespaces() account()->addPathToNamespace( *it ) ); job->setNamespace( *it ); job->setHonorLocalSubscription( true ); - connect( job, TQT_SIGNAL(receivedFolders(const TQStringList&, const TQStringList&, + connect( job, TQ_SIGNAL(receivedFolders(const TQStringList&, const TQStringList&, const TQStringList&, const TQStringList&, const ImapAccountBase::jobData&)), - this, TQT_SLOT(slotListResult(const TQStringList&, const TQStringList&, + this, TQ_SLOT(slotListResult(const TQStringList&, const TQStringList&, const TQStringList&, const TQStringList&, const ImapAccountBase::jobData&))); job->start(); } @@ -650,9 +650,9 @@ void KMFolderImap::slotListNamespaces() { KMail::ListJob* job = new KMail::ListJob( account(), type, this, account()->addPathToNamespace( *it ) ); job->setHonorLocalSubscription( true ); - connect( job, TQT_SIGNAL(receivedFolders(const TQStringList&, const TQStringList&, + connect( job, TQ_SIGNAL(receivedFolders(const TQStringList&, const TQStringList&, const TQStringList&, const TQStringList&, const ImapAccountBase::jobData&)), - this, TQT_SLOT(slotCheckNamespace(const TQStringList&, const TQStringList&, + this, TQ_SLOT(slotCheckNamespace(const TQStringList&, const TQStringList&, const TQStringList&, const TQStringList&, const ImapAccountBase::jobData&))); job->start(); } @@ -754,9 +754,9 @@ bool KMFolderImap::listDirectory() KMail::ListJob* job = new KMail::ListJob( account(), type, this ); job->setParentProgressItem( account()->listDirProgressItem() ); job->setHonorLocalSubscription( true ); - connect( job, TQT_SIGNAL(receivedFolders(const TQStringList&, const TQStringList&, + connect( job, TQ_SIGNAL(receivedFolders(const TQStringList&, const TQStringList&, const TQStringList&, const TQStringList&, const ImapAccountBase::jobData&)), - this, TQT_SLOT(slotListResult(const TQStringList&, const TQStringList&, + this, TQ_SLOT(slotListResult(const TQStringList&, const TQStringList&, const TQStringList&, const TQStringList&, const ImapAccountBase::jobData&))); job->start(); @@ -1034,8 +1034,8 @@ void KMFolderImap::checkValidity() kdDebug(5006) << "KMFolderImap::checkValidity of: " << imapPath() << endl; // Start with a clean slate - disconnect( account(), TQT_SIGNAL( connectionResult(int, const TQString&) ), - this, TQT_SLOT( checkValidity() ) ); + disconnect( account(), TQ_SIGNAL( connectionResult(int, const TQString&) ), + this, TQ_SLOT( checkValidity() ) ); KMAcctImap::ConnectionState connectionState = account()->makeConnection(); if ( connectionState == ImapAccountBase::Error ) { @@ -1048,8 +1048,8 @@ void KMFolderImap::checkValidity() // We'll wait for the connectionResult signal from the account. If it // errors, the above will catch it. kdDebug(5006) << "CheckValidity - waiting for connection" << endl; - connect( account(), TQT_SIGNAL( connectionResult(int, const TQString&) ), - this, TQT_SLOT( checkValidity() ) ); + connect( account(), TQ_SIGNAL( connectionResult(int, const TQString&) ), + this, TQ_SLOT( checkValidity() ) ); return; } // Only check once at a time. @@ -1079,10 +1079,10 @@ void KMFolderImap::checkValidity() TDEIO::SimpleJob *job = TDEIO::get(url, false, false); TDEIO::Scheduler::assignJobToSlave(account()->slave(), job); account()->insertJob(job, jd); - connect(job, TQT_SIGNAL(result(TDEIO::Job *)), - TQT_SLOT(slotCheckValidityResult(TDEIO::Job *))); - connect(job, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), - TQT_SLOT(slotSimpleData(TDEIO::Job *, const TQByteArray &))); + connect(job, TQ_SIGNAL(result(TDEIO::Job *)), + TQ_SLOT(slotCheckValidityResult(TDEIO::Job *))); + connect(job, TQ_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), + TQ_SLOT(slotSimpleData(TDEIO::Job *, const TQByteArray &))); // Only check once at a time. mCheckingValidity = true; } @@ -1238,10 +1238,10 @@ void KMFolderImap::reallyGetFolder(const TQString &startUid) ImapAccountBase::jobData jd( url.url(), folder() ); jd.cancellable = true; account()->insertJob(job, jd); - connect(job, TQT_SIGNAL(result(TDEIO::Job *)), - this, TQT_SLOT(slotListFolderResult(TDEIO::Job *))); - connect(job, TQT_SIGNAL(entries(TDEIO::Job *, const TDEIO::UDSEntryList &)), - this, TQT_SLOT(slotListFolderEntries(TDEIO::Job *, + connect(job, TQ_SIGNAL(result(TDEIO::Job *)), + this, TQ_SLOT(slotListFolderResult(TDEIO::Job *))); + connect(job, TQ_SIGNAL(entries(TDEIO::Job *, const TDEIO::UDSEntryList &)), + this, TQ_SLOT(slotListFolderEntries(TDEIO::Job *, const TDEIO::UDSEntryList &))); } else { mContentState = imapDownloadInProgress; @@ -1254,10 +1254,10 @@ void KMFolderImap::reallyGetFolder(const TQString &startUid) ImapAccountBase::jobData jd( url.url(), folder() ); jd.cancellable = true; account()->insertJob(newJob, jd); - connect(newJob, TQT_SIGNAL(result(TDEIO::Job *)), - this, TQT_SLOT(slotGetLastMessagesResult(TDEIO::Job *))); - connect(newJob, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), - this, TQT_SLOT(slotGetMessagesData(TDEIO::Job *, const TQByteArray &))); + connect(newJob, TQ_SIGNAL(result(TDEIO::Job *)), + this, TQ_SLOT(slotGetLastMessagesResult(TDEIO::Job *))); + connect(newJob, TQ_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), + this, TQ_SLOT(slotGetMessagesData(TDEIO::Job *, const TQByteArray &))); } } @@ -1360,12 +1360,12 @@ void KMFolderImap::slotListFolderResult(TDEIO::Job * job) jd.url = url.url(); TDEIO::Scheduler::assignJobToSlave(account()->slave(), newJob); account()->insertJob(newJob, jd); - connect(newJob, TQT_SIGNAL(result(TDEIO::Job *)), + connect(newJob, TQ_SIGNAL(result(TDEIO::Job *)), this, (i == sets.at(sets.count() - 1)) - ? TQT_SLOT(slotGetLastMessagesResult(TDEIO::Job *)) - : TQT_SLOT(slotGetMessagesResult(TDEIO::Job *))); - connect(newJob, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), - this, TQT_SLOT(slotGetMessagesData(TDEIO::Job *, const TQByteArray &))); + ? TQ_SLOT(slotGetLastMessagesResult(TDEIO::Job *)) + : TQ_SLOT(slotGetMessagesResult(TDEIO::Job *))); + connect(newJob, TQ_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), + this, TQ_SLOT(slotGetMessagesData(TDEIO::Job *, const TQByteArray &))); } } @@ -1740,8 +1740,8 @@ void KMFolderImap::createFolder(const TQString &name, const TQString& parentPath ImapAccountBase::jobData jd( url.url(), folder() ); jd.items = name; account()->insertJob(job, jd); - connect(job, TQT_SIGNAL(result(TDEIO::Job *)), - this, TQT_SLOT(slotCreateFolderResult(TDEIO::Job *))); + connect(job, TQ_SIGNAL(result(TDEIO::Job *)), + this, TQ_SLOT(slotCreateFolderResult(TDEIO::Job *))); } @@ -1841,8 +1841,8 @@ void KMFolderImap::deleteMessage(KMMessage * msg) TDEIO::Scheduler::assignJobToSlave(account()->slave(), job); ImapAccountBase::jobData jd( url.url(), 0 ); account()->insertJob(job, jd); - connect(job, TQT_SIGNAL(result(TDEIO::Job *)), - account(), TQT_SLOT(slotSimpleResult(TDEIO::Job *))); + connect(job, TQ_SIGNAL(result(TDEIO::Job *)), + account(), TQ_SLOT(slotSimpleResult(TDEIO::Job *))); } void KMFolderImap::deleteMessage(const TQPtrList<KMMessage>& msgList) @@ -1874,8 +1874,8 @@ void KMFolderImap::deleteMessage(const TQPtrList<KMMessage>& msgList) TDEIO::Scheduler::assignJobToSlave(account()->slave(), job); ImapAccountBase::jobData jd( url.url(), 0 ); account()->insertJob(job, jd); - connect(job, TQT_SIGNAL(result(TDEIO::Job *)), - account(), TQT_SLOT(slotSimpleResult(TDEIO::Job *))); + connect(job, TQ_SIGNAL(result(TDEIO::Job *)), + account(), TQ_SLOT(slotSimpleResult(TDEIO::Job *))); } } @@ -1968,7 +1968,7 @@ void KMFolderImap::setStatus(TQValueList<int>& _ids, KMMsgStatus status, bool to // to make sure that we get the latest flags abort the current listing and // create a new one kdDebug(5006) << "Set status during folder listing, restarting listing." << endl; - disconnect(this, TQT_SLOT(slotListFolderResult(TDEIO::Job *))); + disconnect(this, TQ_SLOT(slotListFolderResult(TDEIO::Job *))); quiet( false ); reallyGetFolder( TQString() ); } @@ -2075,16 +2075,16 @@ void KMFolderImap::expungeFolder(KMFolderImap * aFolder, bool quiet) ImapAccountBase::jobData jd( url.url(), 0 ); jd.quiet = quiet; account()->insertJob(job, jd); - connect(job, TQT_SIGNAL(result(TDEIO::Job *)), - account(), TQT_SLOT(slotSimpleResult(TDEIO::Job *))); + connect(job, TQ_SIGNAL(result(TDEIO::Job *)), + account(), TQ_SLOT(slotSimpleResult(TDEIO::Job *))); } //----------------------------------------------------------------------------- void KMFolderImap::slotProcessNewMail( int errorCode, const TQString &errorMsg ) { Q_UNUSED( errorMsg ); - disconnect( account(), TQT_SIGNAL( connectionResult(int, const TQString&) ), - this, TQT_SLOT( slotProcessNewMail(int, const TQString&) ) ); + disconnect( account(), TQ_SIGNAL( connectionResult(int, const TQString&) ), + this, TQ_SLOT( slotProcessNewMail(int, const TQString&) ) ); if ( !errorCode ) processNewMail( false ); else @@ -2114,8 +2114,8 @@ bool KMFolderImap::processNewMail(bool) { // wait kdDebug(5006) << "KMFolderImap::processNewMail - waiting for connection: " << label() << endl; - connect( account(), TQT_SIGNAL( connectionResult(int, const TQString&) ), - this, TQT_SLOT( slotProcessNewMail(int, const TQString&) ) ); + connect( account(), TQ_SIGNAL( connectionResult(int, const TQString&) ), + this, TQ_SLOT( slotProcessNewMail(int, const TQString&) ) ); return true; } KURL url = account()->getUrl(); @@ -2137,8 +2137,8 @@ bool KMFolderImap::processNewMail(bool) ImapAccountBase::jobData jd(url.url(), folder() ); jd.cancellable = true; account()->insertJob(job, jd); - connect(job, TQT_SIGNAL(result(TDEIO::Job *)), - TQT_SLOT(slotStatResult(TDEIO::Job *))); + connect(job, TQ_SIGNAL(result(TDEIO::Job *)), + TQ_SLOT(slotStatResult(TDEIO::Job *))); return true; } @@ -2247,8 +2247,8 @@ int KMFolderImap::expungeContents() ImapAccountBase::jobData jd( url.url(), 0 ); jd.quiet = true; account()->insertJob(job, jd); - connect(job, TQT_SIGNAL(result(TDEIO::Job *)), - account(), TQT_SLOT(slotSimpleResult(TDEIO::Job *))); + connect(job, TQ_SIGNAL(result(TDEIO::Job *)), + account(), TQ_SLOT(slotSimpleResult(TDEIO::Job *))); } /* Is the below correct? If we are expunging (in the folder sense, not the imap sense), why delete but not (imap-)expunge? Since the folder is not active there is no concept @@ -2328,8 +2328,8 @@ void KMFolderImap::setAlreadyRemoved( bool removed ) void KMFolderImap::slotCreatePendingFolders( int errorCode, const TQString& errorMsg ) { Q_UNUSED( errorMsg ); - disconnect( account(), TQT_SIGNAL( connectionResult( int, const TQString& ) ), - this, TQT_SLOT( slotCreatePendingFolders( int, const TQString& ) ) ); + disconnect( account(), TQ_SIGNAL( connectionResult( int, const TQString& ) ), + this, TQ_SLOT( slotCreatePendingFolders( int, const TQString& ) ) ); if ( !errorCode ) { TQStringList::Iterator it = mFoldersPendingCreation.begin(); for ( ; it != mFoldersPendingCreation.end(); ++it ) { @@ -2350,8 +2350,8 @@ void KMFolderImap::search( const KMSearchPattern* pattern ) return; } SearchJob* job = new SearchJob( this, account(), pattern ); - connect( job, TQT_SIGNAL( searchDone( TQValueList<TQ_UINT32>, const KMSearchPattern*, bool ) ), - this, TQT_SLOT( slotSearchDone( TQValueList<TQ_UINT32>, const KMSearchPattern*, bool ) ) ); + connect( job, TQ_SIGNAL( searchDone( TQValueList<TQ_UINT32>, const KMSearchPattern*, bool ) ), + this, TQ_SLOT( slotSearchDone( TQValueList<TQ_UINT32>, const KMSearchPattern*, bool ) ) ); job->start(); } @@ -2373,8 +2373,8 @@ void KMFolderImap::search( const KMSearchPattern* pattern, TQ_UINT32 serNum ) return; } SearchJob* job = new SearchJob( this, account(), pattern, serNum ); - connect( job, TQT_SIGNAL( searchDone( TQ_UINT32, const KMSearchPattern*, bool ) ), - this, TQT_SLOT( slotSearchDone( TQ_UINT32, const KMSearchPattern*, bool ) ) ); + connect( job, TQ_SIGNAL( searchDone( TQ_UINT32, const KMSearchPattern*, bool ) ), + this, TQ_SLOT( slotSearchDone( TQ_UINT32, const KMSearchPattern*, bool ) ) ); job->start(); } diff --git a/kmail/kmfolderimap.h b/kmail/kmfolderimap.h index 5f454c59..12f2928e 100644 --- a/kmail/kmfolderimap.h +++ b/kmail/kmfolderimap.h @@ -32,7 +32,7 @@ #include "tdeio/job.h" #include "tdeio/global.h" -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tqintdict.h> #include <tqdict.h> @@ -77,7 +77,7 @@ private: class KMFolderImap : public KMFolderMbox { - Q_OBJECT + TQ_OBJECT friend class ::KMail::ImapJob; public: @@ -125,8 +125,8 @@ public: KMAcctImap* account() const; /** Remove (first occurrence of) given message from the folder. */ - virtual void removeMsg(int i, bool quiet = FALSE); - virtual void removeMsg(const TQPtrList<KMMessage>& msgList, bool quiet = FALSE); + virtual void removeMsg(int i, bool quiet = false); + virtual void removeMsg(const TQPtrList<KMMessage>& msgList, bool quiet = false); virtual int rename( const TQString& newName, KMFolderDir *aParent = 0 ); @@ -152,12 +152,12 @@ public: /** * Retrieve all mails in a folder */ - void getFolder(bool force = FALSE); + void getFolder(bool force = false); /** * same as above but also checks for new mails */ - void getAndCheckFolder(bool force = FALSE); + void getAndCheckFolder(bool force = false); /** * Get the whole message @@ -380,7 +380,7 @@ public slots: * Convert IMAP flags to a message status * @param newMsg specifies whether unseen messages are new or unread */ - static void flagsToStatus(KMMsgBase *msg, int flags, bool newMsg = TRUE, int supportedFalgs = 31 ); + static void flagsToStatus(KMMsgBase *msg, int flags, bool newMsg = true, int supportedFalgs = 31 ); /** * Convert IMAP seen flag to a message status. diff --git a/kmail/kmfolderindex.cpp b/kmail/kmfolderindex.cpp index 9b60b25c..42b5d0c5 100644 --- a/kmail/kmfolderindex.cpp +++ b/kmail/kmfolderindex.cpp @@ -363,14 +363,14 @@ bool KMFolderIndex::readIndexHeader(int *gv) createIndexFromContents(); return false; } else if(indexVersion > INDEX_VERSION) { - kapp->setOverrideCursor(KCursor::arrowCursor()); + tdeApp->setOverrideCursor(KCursor::arrowCursor()); int r = KMessageBox::questionYesNo(0, i18n( "The mail index for '%1' is from an unknown version of KMail (%2).\n" "This index can be regenerated from your mail folder, but some " "information, including status flags, may be lost. Do you wish " "to downgrade your index file?") .arg(name()) .arg(indexVersion), TQString(), i18n("Downgrade"), i18n("Do Not Downgrade") ); - kapp->restoreOverrideCursor(); + tdeApp->restoreOverrideCursor(); if (r == KMessageBox::Yes) createIndexFromContents(); return false; @@ -524,11 +524,11 @@ KMMsgInfo* KMFolderIndex::setIndexEntry( int idx, KMMessage *msg ) void KMFolderIndex::recreateIndex( bool readIndexAfterwards ) { - kapp->setOverrideCursor(KCursor::arrowCursor()); + tdeApp->setOverrideCursor(KCursor::arrowCursor()); KMessageBox::information(0, i18n("The mail index for '%1' is corrupted and will be regenerated now, " "but some information, like status flags, might get lost.").arg(name())); - kapp->restoreOverrideCursor(); + tdeApp->restoreOverrideCursor(); createIndexFromContents(); if ( readIndexAfterwards ) { readIndex(); diff --git a/kmail/kmfolderindex.h b/kmail/kmfolderindex.h index ae67d7db..1f4fb1b5 100644 --- a/kmail/kmfolderindex.h +++ b/kmail/kmfolderindex.h @@ -36,7 +36,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 @@ -108,7 +108,7 @@ protected: failure. */ virtual int createIndexFromContents() = 0; - bool updateIndexStreamPtr(bool just_close=FALSE); + bool updateIndexStreamPtr(bool just_close=false); /** Inserts messages into the message dictionary by iterating over the * message list. The messages will get new serial numbers. This is only diff --git a/kmail/kmfoldermaildir.cpp b/kmail/kmfoldermaildir.cpp index 29f9aacc..62228190 100644 --- a/kmail/kmfoldermaildir.cpp +++ b/kmail/kmfoldermaildir.cpp @@ -1122,7 +1122,7 @@ TQ_INT64 KMFolderMaildir::doFolderSize() const item = new KFileItem( S_IFDIR, -1, location() + "/tmp" ); list.append( item ); s_DirSizeJobQueue.append( - tqMakePair( TQGuardedPtr<const KMFolderMaildir>( this ), list ) ); + qMakePair( TQGuardedPtr<const KMFolderMaildir>( this ), list ) ); // if there's only one entry in the queue then we can start // a dirSizeJob right away @@ -1131,8 +1131,8 @@ TQ_INT64 KMFolderMaildir::doFolderSize() const //kdDebug(5006) << k_funcinfo << "Starting dirSizeJob for folder " // << location() << endl; KDirSize* job = KDirSize::dirSizeJob( list ); - connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), - this, TQT_SLOT( slotDirSizeJobResult( TDEIO::Job* ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job* ) ), + this, TQ_SLOT( slotDirSizeJobResult( TDEIO::Job* ) ) ); } return -1; @@ -1163,8 +1163,8 @@ void KMFolderMaildir::slotDirSizeJobResult( TDEIO::Job* job ) //kdDebug(5006) << k_funcinfo << "Starting dirSizeJob for folder " // << entry.first->location() << endl; KDirSize* job = KDirSize::dirSizeJob( entry.second ); - connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), - entry.first, TQT_SLOT( slotDirSizeJobResult( TDEIO::Job* ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job* ) ), + entry.first, TQ_SLOT( slotDirSizeJobResult( TDEIO::Job* ) ) ); break; } else diff --git a/kmail/kmfoldermaildir.h b/kmail/kmfoldermaildir.h index b4bdb3c5..83aced18 100644 --- a/kmail/kmfoldermaildir.h +++ b/kmail/kmfoldermaildir.h @@ -23,7 +23,7 @@ using KMail::AttachmentStrategy; class KMFolderMaildir : public KMFolderIndex { - Q_OBJECT + TQ_OBJECT friend class ::KMail::MaildirJob; public: @@ -52,8 +52,8 @@ public: virtual int addMsg(KMMessage* msg, int* index_return = 0); /** Remove (first occurrence of) given message from the folder. */ - virtual void removeMsg(int i, bool imapQuiet = FALSE); - virtual void removeMsg(TQPtrList<KMMessage> msgList, bool imapQuiet = FALSE) + virtual void removeMsg(int i, bool imapQuiet = false); + virtual void removeMsg(TQPtrList<KMMessage> msgList, bool imapQuiet = false) { return KMFolderIndex::removeMsg(msgList, imapQuiet); } // Called by KMMsgBase::setStatus when status of a message has changed @@ -74,7 +74,7 @@ public: /** fsync buffers to disk */ virtual void sync(); - /** Close folder. If force is TRUE the files are closed even if + /** Close folder. If force is true the files are closed even if others still use it (e.g. other mail reader windows). */ virtual void reallyDoClose(const char *owner); diff --git a/kmail/kmfoldermbox.cpp b/kmail/kmfoldermbox.cpp index 43c9a913..7d1b9927 100644 --- a/kmail/kmfoldermbox.cpp +++ b/kmail/kmfoldermbox.cpp @@ -36,7 +36,7 @@ #include <tdelocale.h> #include <tdemessagebox.h> #include <knotifyclient.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <tdeconfig.h> #include <ctype.h> @@ -46,9 +46,7 @@ #include <ctype.h> #include <unistd.h> -#ifdef HAVE_FCNTL_H #include <fcntl.h> -#endif #include <stdlib.h> #include <sys/types.h> diff --git a/kmail/kmfoldermbox.h b/kmail/kmfoldermbox.h index d1993b17..38348a15 100644 --- a/kmail/kmfoldermbox.h +++ b/kmail/kmfoldermbox.h @@ -46,7 +46,7 @@ using KMail::AttachmentStrategy; class KMFolderMbox : public KMFolderIndex { - Q_OBJECT + TQ_OBJECT friend class ::KMail::MboxJob; public: @@ -149,7 +149,7 @@ protected: private: FILE *mStream; - bool mFilesLocked; // TRUE if the files of the folder are locked (writable) + bool mFilesLocked; // true if the files of the folder are locked (writable) bool mReadOnly; // true if locking failed LockType mLockType; TQString mProcmailLockFileName; diff --git a/kmail/kmfoldermgr.cpp b/kmail/kmfoldermgr.cpp index d270e710..3ff8f48b 100644 --- a/kmail/kmfoldermgr.cpp +++ b/kmail/kmfoldermgr.cpp @@ -44,7 +44,7 @@ KMFolderMgr::KMFolderMgr(const TQString& aBasePath, KMFolderDirType dirType): if ( dirType == KMStandardDir ) mDir.setBaseURL( I18N_NOOP("Local Folders") ); mQuiet = 0; - mChanged = FALSE; + mChanged = false; setBasePath(aBasePath); mRemoveOrig = 0; } @@ -361,8 +361,8 @@ void KMFolderMgr::remove(KMFolder* aFolder) void KMFolderMgr::removeFolder(KMFolder* aFolder) { - connect(aFolder, TQT_SIGNAL(removed(KMFolder*, bool)), - this, TQT_SLOT(removeFolderAux(KMFolder*, bool))); + connect(aFolder, TQ_SIGNAL(removed(KMFolder*, bool)), + this, TQ_SLOT(removeFolderAux(KMFolder*, bool))); aFolder->remove(); } @@ -439,7 +439,7 @@ KMFolderRootDir& KMFolderMgr::dir(void) //----------------------------------------------------------------------------- void KMFolderMgr::contentsChanged(void) { - if (mQuiet) mChanged = TRUE; + if (mQuiet) mChanged = true; else emit changed(); } @@ -535,7 +535,7 @@ void KMFolderMgr::quiet(bool beQuiet) { mQuiet = 0; if (mChanged) emit changed(); - mChanged = FALSE; + mChanged = false; } } } @@ -561,7 +561,7 @@ uint KMFolderMgr::createId() int newId; do { - newId = kapp->random(); + newId = tdeApp->random(); } while ( findById( newId ) != 0 ); return newId; @@ -578,10 +578,10 @@ void KMFolderMgr::renameFolder( KMFolder* folder, const TQString& newName, KMFolderDir *newParent ) { RenameJob* job = new RenameJob( folder->storage(), newName, newParent ); - connect( job, TQT_SIGNAL( renameDone( TQString, bool ) ), - this, TQT_SLOT( slotRenameDone( TQString, bool ) ) ); - connect( job, TQT_SIGNAL( renameDone( TQString, bool ) ), - this, TQT_SIGNAL( folderMoveOrCopyOperationFinished() ) ); + connect( job, TQ_SIGNAL( renameDone( TQString, bool ) ), + this, TQ_SLOT( slotRenameDone( TQString, bool ) ) ); + connect( job, TQ_SIGNAL( renameDone( TQString, bool ) ), + this, TQ_SIGNAL( folderMoveOrCopyOperationFinished() ) ); job->start(); } @@ -590,8 +590,8 @@ void KMFolderMgr::copyFolder( KMFolder* folder, KMFolderDir *newParent ) { kdDebug(5006) << "Copy folder: " << folder->prettyURL() << endl; CopyFolderJob* job = new CopyFolderJob( folder->storage(), newParent ); - connect( job, TQT_SIGNAL( folderCopyComplete( bool ) ), - this, TQT_SIGNAL( folderMoveOrCopyOperationFinished() ) ); + connect( job, TQ_SIGNAL( folderCopyComplete( bool ) ), + this, TQ_SIGNAL( folderMoveOrCopyOperationFinished() ) ); job->start(); } diff --git a/kmail/kmfoldermgr.h b/kmail/kmfoldermgr.h index b6b80ad9..02304ba2 100644 --- a/kmail/kmfoldermgr.h +++ b/kmail/kmfoldermgr.h @@ -15,7 +15,7 @@ class KMFolder; class KMFolderMgr: public TQObject { - Q_OBJECT + TQ_OBJECT public: @@ -32,8 +32,8 @@ public: KMFolderRootDir& dir(); /** Searches folder and returns it. Skips directories - (objects of type KMFolderDir) if foldersOnly is TRUE. */ - virtual KMFolder* find(const TQString& folderName, bool foldersOnly=TRUE); + (objects of type KMFolderDir) if foldersOnly is true. */ + virtual KMFolder* find(const TQString& folderName, bool foldersOnly=true); /** Searches for a folder with the given id, recurses into directories */ virtual KMFolder* findIdString(const TQString& folderId, @@ -43,7 +43,7 @@ public: * created. Directories are skipped. * If an id is passed this searches for it */ - virtual KMFolder* findOrCreate(const TQString& folderName, bool sysFldr=TRUE, + virtual KMFolder* findOrCreate(const TQString& folderName, bool sysFldr=true, const uint id = 0); /** Searches folder by id and returns it. Skips directories @@ -59,7 +59,7 @@ public: /** Create a mail folder in the root folder directory dir() with given name. Returns Folder on success. */ - virtual KMFolder* createFolder(const TQString& fName, bool sysFldr=FALSE, + virtual KMFolder* createFolder(const TQString& fName, bool sysFldr=false, KMFolderType aFolderType=KMFolderTypeMbox, KMFolderDir *aFolderDir = 0); @@ -83,7 +83,7 @@ public: TQValueList<TQGuardedPtr<KMFolder> > *folders, KMFolderDir *adir, const TQString& prefix, - bool i18nized=FALSE ); + bool i18nized=false ); /** Create a list of formatted formatted folder labels and corresponding folders. The system folder names are translated */ diff --git a/kmail/kmfoldernode.h b/kmail/kmfoldernode.h index b4542c96..925997b7 100644 --- a/kmail/kmfoldernode.h +++ b/kmail/kmfoldernode.h @@ -28,7 +28,7 @@ class KMFolderDir; class KMFolderNode: public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/kmail/kmfoldersearch.cpp b/kmail/kmfoldersearch.cpp index e2a72cb2..d5306b76 100644 --- a/kmail/kmfoldersearch.cpp +++ b/kmail/kmfoldersearch.cpp @@ -81,7 +81,7 @@ KMSearch::KMSearch(TQObject * parent, const char * name) mSearchCount = 0; mProcessNextBatchTimer = new TQTimer(0, "mProcessNextBatchTimer"); - connect(mProcessNextBatchTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotProcessNextBatch())); + connect(mProcessNextBatchTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotProcessNextBatch())); } KMSearch::~KMSearch() @@ -262,9 +262,9 @@ void KMSearch::slotProcessNextBatch() folder->open("kmsearch"); mOpenedFolders.append( folder ); connect( folder->storage(), - TQT_SIGNAL( searchResult( KMFolder*, TQValueList<TQ_UINT32>, const KMSearchPattern*, bool ) ), + TQ_SIGNAL( searchResult( KMFolder*, TQValueList<TQ_UINT32>, const KMSearchPattern*, bool ) ), this, - TQT_SLOT( slotSearchFolderResult( KMFolder*, TQValueList<TQ_UINT32>, const KMSearchPattern*, bool ) ) ); + TQ_SLOT( slotSearchFolderResult( KMFolder*, TQValueList<TQ_UINT32>, const KMSearchPattern*, bool ) ) ); folder->storage()->search( mSearchPattern ); } else --mRemainingFolders; @@ -291,10 +291,10 @@ void KMSearch::slotSearchFolderResult( KMFolder* folder, if ( complete ) { disconnect( folder->storage(), - TQT_SIGNAL( searchResult( KMFolder*, TQValueList<TQ_UINT32>, + TQ_SIGNAL( searchResult( KMFolder*, TQValueList<TQ_UINT32>, const KMSearchPattern*, bool ) ), this, - TQT_SLOT( slotSearchFolderResult( KMFolder*, TQValueList<TQ_UINT32>, + TQ_SLOT( slotSearchFolderResult( KMFolder*, TQValueList<TQ_UINT32>, const KMSearchPattern*, bool ) ) ); --mRemainingFolders; mSearchCount += folder->count(); @@ -325,54 +325,54 @@ KMFolderSearch::KMFolderSearch(KMFolder* folder, const char* name) //Hook up some slots for live updating of search folders //TODO: Optimize folderInvalidated, folderAdded, folderRemoved - connect(kmkernel->folderMgr(), TQT_SIGNAL(msgAdded(KMFolder*, TQ_UINT32)), - this, TQT_SLOT(examineAddedMessage(KMFolder*, TQ_UINT32))); - connect(kmkernel->folderMgr(), TQT_SIGNAL(msgRemoved(KMFolder*, TQ_UINT32)), - this, TQT_SLOT(examineRemovedMessage(KMFolder*, TQ_UINT32))); - connect(kmkernel->folderMgr(), TQT_SIGNAL(msgChanged(KMFolder*, TQ_UINT32, int)), - this, TQT_SLOT(examineChangedMessage(KMFolder*, TQ_UINT32, int))); - connect(kmkernel->folderMgr(), TQT_SIGNAL(folderInvalidated(KMFolder*)), - this, TQT_SLOT(examineInvalidatedFolder(KMFolder*))); - connect(kmkernel->folderMgr(), TQT_SIGNAL(folderAdded(KMFolder*)), - this, TQT_SLOT(examineInvalidatedFolder(KMFolder*))); - connect(kmkernel->folderMgr(), TQT_SIGNAL(folderRemoved(KMFolder*)), - this, TQT_SLOT(examineRemovedFolder(KMFolder*))); - connect(kmkernel->folderMgr(), TQT_SIGNAL(msgHeaderChanged(KMFolder*,int)), - this, TQT_SLOT(propagateHeaderChanged(KMFolder*,int))); - - connect(kmkernel->imapFolderMgr(), TQT_SIGNAL(msgAdded(KMFolder*, TQ_UINT32)), - this, TQT_SLOT(examineAddedMessage(KMFolder*, TQ_UINT32))); - connect(kmkernel->imapFolderMgr(), TQT_SIGNAL(msgRemoved(KMFolder*, TQ_UINT32)), - this, TQT_SLOT(examineRemovedMessage(KMFolder*, TQ_UINT32))); - connect(kmkernel->imapFolderMgr(), TQT_SIGNAL(msgChanged(KMFolder*, TQ_UINT32, int)), - this, TQT_SLOT(examineChangedMessage(KMFolder*, TQ_UINT32, int))); - connect(kmkernel->imapFolderMgr(), TQT_SIGNAL(folderInvalidated(KMFolder*)), - this, TQT_SLOT(examineInvalidatedFolder(KMFolder*))); - connect(kmkernel->imapFolderMgr(), TQT_SIGNAL(folderAdded(KMFolder*)), - this, TQT_SLOT(examineInvalidatedFolder(KMFolder*))); - connect(kmkernel->imapFolderMgr(), TQT_SIGNAL(folderRemoved(KMFolder*)), - this, TQT_SLOT(examineRemovedFolder(KMFolder*))); - connect(kmkernel->imapFolderMgr(), TQT_SIGNAL(msgHeaderChanged(KMFolder*,int)), - this, TQT_SLOT(propagateHeaderChanged(KMFolder*,int))); - - connect(kmkernel->dimapFolderMgr(), TQT_SIGNAL(msgAdded(KMFolder*, TQ_UINT32)), - this, TQT_SLOT(examineAddedMessage(KMFolder*, TQ_UINT32))); - connect(kmkernel->dimapFolderMgr(), TQT_SIGNAL(msgRemoved(KMFolder*, TQ_UINT32)), - this, TQT_SLOT(examineRemovedMessage(KMFolder*, TQ_UINT32))); - connect(kmkernel->dimapFolderMgr(), TQT_SIGNAL(msgChanged(KMFolder*, TQ_UINT32, int)), - this, TQT_SLOT(examineChangedMessage(KMFolder*, TQ_UINT32, int))); - connect(kmkernel->dimapFolderMgr(), TQT_SIGNAL(folderInvalidated(KMFolder*)), - this, TQT_SLOT(examineInvalidatedFolder(KMFolder*))); - connect(kmkernel->dimapFolderMgr(), TQT_SIGNAL(folderAdded(KMFolder*)), - this, TQT_SLOT(examineInvalidatedFolder(KMFolder*))); - connect(kmkernel->dimapFolderMgr(), TQT_SIGNAL(folderRemoved(KMFolder*)), - this, TQT_SLOT(examineRemovedFolder(KMFolder*))); - connect(kmkernel->dimapFolderMgr(), TQT_SIGNAL(msgHeaderChanged(KMFolder*,int)), - this, TQT_SLOT(propagateHeaderChanged(KMFolder*,int))); + connect(kmkernel->folderMgr(), TQ_SIGNAL(msgAdded(KMFolder*, TQ_UINT32)), + this, TQ_SLOT(examineAddedMessage(KMFolder*, TQ_UINT32))); + connect(kmkernel->folderMgr(), TQ_SIGNAL(msgRemoved(KMFolder*, TQ_UINT32)), + this, TQ_SLOT(examineRemovedMessage(KMFolder*, TQ_UINT32))); + connect(kmkernel->folderMgr(), TQ_SIGNAL(msgChanged(KMFolder*, TQ_UINT32, int)), + this, TQ_SLOT(examineChangedMessage(KMFolder*, TQ_UINT32, int))); + connect(kmkernel->folderMgr(), TQ_SIGNAL(folderInvalidated(KMFolder*)), + this, TQ_SLOT(examineInvalidatedFolder(KMFolder*))); + connect(kmkernel->folderMgr(), TQ_SIGNAL(folderAdded(KMFolder*)), + this, TQ_SLOT(examineInvalidatedFolder(KMFolder*))); + connect(kmkernel->folderMgr(), TQ_SIGNAL(folderRemoved(KMFolder*)), + this, TQ_SLOT(examineRemovedFolder(KMFolder*))); + connect(kmkernel->folderMgr(), TQ_SIGNAL(msgHeaderChanged(KMFolder*,int)), + this, TQ_SLOT(propagateHeaderChanged(KMFolder*,int))); + + connect(kmkernel->imapFolderMgr(), TQ_SIGNAL(msgAdded(KMFolder*, TQ_UINT32)), + this, TQ_SLOT(examineAddedMessage(KMFolder*, TQ_UINT32))); + connect(kmkernel->imapFolderMgr(), TQ_SIGNAL(msgRemoved(KMFolder*, TQ_UINT32)), + this, TQ_SLOT(examineRemovedMessage(KMFolder*, TQ_UINT32))); + connect(kmkernel->imapFolderMgr(), TQ_SIGNAL(msgChanged(KMFolder*, TQ_UINT32, int)), + this, TQ_SLOT(examineChangedMessage(KMFolder*, TQ_UINT32, int))); + connect(kmkernel->imapFolderMgr(), TQ_SIGNAL(folderInvalidated(KMFolder*)), + this, TQ_SLOT(examineInvalidatedFolder(KMFolder*))); + connect(kmkernel->imapFolderMgr(), TQ_SIGNAL(folderAdded(KMFolder*)), + this, TQ_SLOT(examineInvalidatedFolder(KMFolder*))); + connect(kmkernel->imapFolderMgr(), TQ_SIGNAL(folderRemoved(KMFolder*)), + this, TQ_SLOT(examineRemovedFolder(KMFolder*))); + connect(kmkernel->imapFolderMgr(), TQ_SIGNAL(msgHeaderChanged(KMFolder*,int)), + this, TQ_SLOT(propagateHeaderChanged(KMFolder*,int))); + + connect(kmkernel->dimapFolderMgr(), TQ_SIGNAL(msgAdded(KMFolder*, TQ_UINT32)), + this, TQ_SLOT(examineAddedMessage(KMFolder*, TQ_UINT32))); + connect(kmkernel->dimapFolderMgr(), TQ_SIGNAL(msgRemoved(KMFolder*, TQ_UINT32)), + this, TQ_SLOT(examineRemovedMessage(KMFolder*, TQ_UINT32))); + connect(kmkernel->dimapFolderMgr(), TQ_SIGNAL(msgChanged(KMFolder*, TQ_UINT32, int)), + this, TQ_SLOT(examineChangedMessage(KMFolder*, TQ_UINT32, int))); + connect(kmkernel->dimapFolderMgr(), TQ_SIGNAL(folderInvalidated(KMFolder*)), + this, TQ_SLOT(examineInvalidatedFolder(KMFolder*))); + connect(kmkernel->dimapFolderMgr(), TQ_SIGNAL(folderAdded(KMFolder*)), + this, TQ_SLOT(examineInvalidatedFolder(KMFolder*))); + connect(kmkernel->dimapFolderMgr(), TQ_SIGNAL(folderRemoved(KMFolder*)), + this, TQ_SLOT(examineRemovedFolder(KMFolder*))); + connect(kmkernel->dimapFolderMgr(), TQ_SIGNAL(msgHeaderChanged(KMFolder*,int)), + this, TQ_SLOT(propagateHeaderChanged(KMFolder*,int))); mExecuteSearchTimer = new TQTimer(0, "mExecuteSearchTimer"); - connect(mExecuteSearchTimer, TQT_SIGNAL(timeout()), - this, TQT_SLOT(executeSearch())); + connect(mExecuteSearchTimer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(executeSearch())); } KMFolderSearch::~KMFolderSearch() @@ -381,7 +381,7 @@ KMFolderSearch::~KMFolderSearch() delete mSearch; mSearch = 0; if (mOpenCount > 0) - close("~foldersearch", TRUE); + close("~foldersearch", true); } void KMFolderSearch::setSearch(KMSearch *search) @@ -399,10 +399,10 @@ void KMFolderSearch::setSearch(KMSearch *search) delete mSearch; mSearch = search; // take ownership if (mSearch) { - TQObject::connect(search, TQT_SIGNAL(found(TQ_UINT32)), - TQT_SLOT(addSerNum(TQ_UINT32))); - TQObject::connect(search, TQT_SIGNAL(finished(bool)), - TQT_SLOT(searchFinished(bool))); + TQObject::connect(search, TQ_SIGNAL(found(TQ_UINT32)), + TQ_SLOT(addSerNum(TQ_UINT32))); + TQObject::connect(search, TQ_SIGNAL(finished(bool)), + TQ_SLOT(searchFinished(bool))); } } if (mSearch) @@ -502,8 +502,8 @@ int KMFolderSearch::addMsg(KMMessage*, int* index_return) bool KMFolderSearch::readSearch() { mSearch = new KMSearch; - TQObject::connect(mSearch, TQT_SIGNAL(found(TQ_UINT32)), TQT_SLOT(addSerNum(TQ_UINT32))); - TQObject::connect(mSearch, TQT_SIGNAL(finished(bool)), TQT_SLOT(searchFinished(bool))); + TQObject::connect(mSearch, TQ_SIGNAL(found(TQ_UINT32)), TQ_SLOT(addSerNum(TQ_UINT32))); + TQObject::connect(mSearch, TQ_SIGNAL(finished(bool)), TQ_SLOT(searchFinished(bool))); return mSearch->read(location()); } @@ -566,7 +566,7 @@ void KMFolderSearch::reallyDoClose(const char* owner) } mFolders.clear(); - clearIndex(TRUE); + clearIndex(true); if (mIdsStream) fclose(mIdsStream); @@ -603,8 +603,8 @@ int KMFolderSearch::create() clearIndex(); if (!mSearch) { mSearch = new KMSearch(); - TQObject::connect(mSearch, TQT_SIGNAL(found(TQ_UINT32)), TQT_SLOT(addSerNum(TQ_UINT32))); - TQObject::connect(mSearch, TQT_SIGNAL(finished(bool)), TQT_SLOT(searchFinished(bool))); + TQObject::connect(mSearch, TQ_SIGNAL(found(TQ_UINT32)), TQ_SLOT(addSerNum(TQ_UINT32))); + TQObject::connect(mSearch, TQ_SIGNAL(finished(bool)), TQ_SLOT(searchFinished(bool))); } mSearch->write(location()); mOpenCount++; @@ -779,8 +779,8 @@ int KMFolderSearch::writeIndex( bool ) if (fclose(tmpIndexStream) != 0) return errno; ::rename(TQFile::encodeName(tempName), TQFile::encodeName(indexLocation())); - mDirty = FALSE; - mUnlinked = FALSE; + mDirty = false; + mUnlinked = false; return 0; } @@ -959,9 +959,9 @@ void KMFolderSearch::examineAddedMessage(KMFolder *aFolder, TQ_UINT32 serNum) mFoldersCurrentlyBeingSearched.replace( folder, count+1 ); } else { connect( folder->storage(), - TQT_SIGNAL( searchDone( KMFolder*, TQ_UINT32, const KMSearchPattern*, bool ) ), + TQ_SIGNAL( searchDone( KMFolder*, TQ_UINT32, const KMSearchPattern*, bool ) ), this, - TQT_SLOT( slotSearchExamineMsgDone( KMFolder*, TQ_UINT32, + TQ_SLOT( slotSearchExamineMsgDone( KMFolder*, TQ_UINT32, const KMSearchPattern*, bool ) ) ); mFoldersCurrentlyBeingSearched.insert( folder, 1 ); } @@ -983,10 +983,10 @@ void KMFolderSearch::slotSearchExamineMsgDone( KMFolder* folder, unsigned int count = mFoldersCurrentlyBeingSearched[folder]; if ( count == 1 ) { disconnect( folder->storage(), - TQT_SIGNAL( searchDone( KMFolder*, TQ_UINT32, + TQ_SIGNAL( searchDone( KMFolder*, TQ_UINT32, const KMSearchPattern*, bool ) ), this, - TQT_SLOT( slotSearchExamineMsgDone( KMFolder*, TQ_UINT32, + TQ_SLOT( slotSearchExamineMsgDone( KMFolder*, TQ_UINT32, const KMSearchPattern*, bool ) ) ); mFoldersCurrentlyBeingSearched.remove( folder ); } else { @@ -1120,9 +1120,9 @@ void KMFolderSearch::propagateHeaderChanged(KMFolder *aFolder, int idx) mFoldersCurrentlyBeingSearched.replace( aFolder, count+1 ); } else { connect( aFolder->storage(), - TQT_SIGNAL( searchDone( KMFolder*, TQ_UINT32, const KMSearchPattern*, bool ) ), + TQ_SIGNAL( searchDone( KMFolder*, TQ_UINT32, const KMSearchPattern*, bool ) ), this, - TQT_SLOT( slotSearchExamineMsgDone( KMFolder*, TQ_UINT32, + TQ_SLOT( slotSearchExamineMsgDone( KMFolder*, TQ_UINT32, const KMSearchPattern*, bool ) ) ); mFoldersCurrentlyBeingSearched.insert( aFolder, 1 ); } diff --git a/kmail/kmfoldersearch.h b/kmail/kmfoldersearch.h index a3fb9706..67c228cf 100644 --- a/kmail/kmfoldersearch.h +++ b/kmail/kmfoldersearch.h @@ -51,7 +51,7 @@ using KMail::AttachmentStrategy; class KMSearch: public TQObject { - Q_OBJECT + TQ_OBJECT public: @@ -109,7 +109,7 @@ private: class KMFolderSearch: public FolderStorage { - Q_OBJECT + TQ_OBJECT friend class ::KMFolderSearchJob; public: diff --git a/kmail/kmfolderseldlg.cpp b/kmail/kmfolderseldlg.cpp index b4c9842b..496af0f8 100644 --- a/kmail/kmfolderseldlg.cpp +++ b/kmail/kmfolderseldlg.cpp @@ -62,10 +62,10 @@ KMFolderSelDlg::KMFolderSelDlg( TQWidget * parent, KMFolderTree * tree, void KMFolderSelDlg::init() { mTreeView->setFocus(); - connect( mTreeView, TQT_SIGNAL( doubleClicked( TQListViewItem*, const TQPoint&, int ) ), - this, TQT_SLOT( slotSelect() ) ); - connect( mTreeView, TQT_SIGNAL( selectionChanged() ), - this, TQT_SLOT( slotUpdateBtnStatus() ) ); + connect( mTreeView, TQ_SIGNAL( doubleClicked( TQListViewItem*, const TQPoint&, int ) ), + this, TQ_SLOT( slotSelect() ) ); + connect( mTreeView, TQ_SIGNAL( selectionChanged() ), + this, TQ_SLOT( slotUpdateBtnStatus() ) ); readConfig(); } diff --git a/kmail/kmfolderseldlg.h b/kmail/kmfolderseldlg.h index 1a7f7508..b2b3502a 100644 --- a/kmail/kmfolderseldlg.h +++ b/kmail/kmfolderseldlg.h @@ -20,7 +20,7 @@ namespace KMail { //----------------------------------------------------------------------------- class KMFolderSelDlg: public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/kmail/kmfoldertree.cpp b/kmail/kmfoldertree.cpp index e73b69a7..00fcf6d4 100644 --- a/kmail/kmfoldertree.cpp +++ b/kmail/kmfoldertree.cpp @@ -281,7 +281,7 @@ void KMFolderTreeItem::slotNoContentChanged() { // reload the folder tree if the no content state changed, needed because // we hide no-content folders if their child nodes are hidden - TQTimer::singleShot( 0, static_cast<KMFolderTree*>( listView() ), TQT_SLOT(reload()) ); + TQTimer::singleShot( 0, static_cast<KMFolderTree*>( listView() ), TQ_SLOT(reload()) ); } //----------------------------------------------------------------------------- @@ -406,12 +406,12 @@ KMFolderTree::KMFolderTree( KMMainWidget *mainWidget, TQWidget *parent, mPopup = new TDEPopupMenu(this); mPopup->insertTitle(i18n("View Columns")); mPopup->setCheckable(true); - mUnreadPop = mPopup->insertItem(i18n("Unread Column"), this, TQT_SLOT(slotToggleUnreadColumn())); - mTotalPop = mPopup->insertItem(i18n("Total Column"), this, TQT_SLOT(slotToggleTotalColumn())); - mSizePop = mPopup->insertItem(i18n("Size Column"), this, TQT_SLOT(slotToggleSizeColumn())); + mUnreadPop = mPopup->insertItem(i18n("Unread Column"), this, TQ_SLOT(slotToggleUnreadColumn())); + mTotalPop = mPopup->insertItem(i18n("Total Column"), this, TQ_SLOT(slotToggleTotalColumn())); + mSizePop = mPopup->insertItem(i18n("Size Column"), this, TQ_SLOT(slotToggleSizeColumn())); - connect( this, TQT_SIGNAL( triggerRefresh() ), - this, TQT_SLOT( refresh() ) ); + connect( this, TQ_SIGNAL( triggerRefresh() ), + this, TQ_SLOT( refresh() ) ); new FolderViewToolTip( this ); } @@ -420,61 +420,61 @@ KMFolderTree::KMFolderTree( KMMainWidget *mainWidget, TQWidget *parent, // connects all needed signals to their slots void KMFolderTree::connectSignals() { - connect( mUpdateCountTimer, TQT_SIGNAL(timeout()), - this, TQT_SLOT(slotUpdateCountTimeout()) ); + connect( mUpdateCountTimer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(slotUpdateCountTimeout()) ); - connect(&mUpdateTimer, TQT_SIGNAL(timeout()), - this, TQT_SLOT(delayedUpdate())); + connect(&mUpdateTimer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(delayedUpdate())); - connect(kmkernel->folderMgr(), TQT_SIGNAL(changed()), - this, TQT_SLOT(doFolderListChanged())); + connect(kmkernel->folderMgr(), TQ_SIGNAL(changed()), + this, TQ_SLOT(doFolderListChanged())); - connect(kmkernel->folderMgr(), TQT_SIGNAL(folderRemoved(KMFolder*)), - this, TQT_SLOT(slotFolderRemoved(KMFolder*))); + connect(kmkernel->folderMgr(), TQ_SIGNAL(folderRemoved(KMFolder*)), + this, TQ_SLOT(slotFolderRemoved(KMFolder*))); - connect(kmkernel->folderMgr(), TQT_SIGNAL(folderMoveOrCopyOperationFinished()), - this, TQT_SLOT(slotFolderMoveOrCopyOperationFinished())); + connect(kmkernel->folderMgr(), TQ_SIGNAL(folderMoveOrCopyOperationFinished()), + this, TQ_SLOT(slotFolderMoveOrCopyOperationFinished())); - connect(kmkernel->imapFolderMgr(), TQT_SIGNAL(changed()), - this, TQT_SLOT(doFolderListChanged())); + connect(kmkernel->imapFolderMgr(), TQ_SIGNAL(changed()), + this, TQ_SLOT(doFolderListChanged())); - connect(kmkernel->imapFolderMgr(), TQT_SIGNAL(folderRemoved(KMFolder*)), - this, TQT_SLOT(slotFolderRemoved(KMFolder*))); + connect(kmkernel->imapFolderMgr(), TQ_SIGNAL(folderRemoved(KMFolder*)), + this, TQ_SLOT(slotFolderRemoved(KMFolder*))); - connect(kmkernel->dimapFolderMgr(), TQT_SIGNAL(changed()), - this, TQT_SLOT(doFolderListChanged())); + connect(kmkernel->dimapFolderMgr(), TQ_SIGNAL(changed()), + this, TQ_SLOT(doFolderListChanged())); - connect(kmkernel->dimapFolderMgr(), TQT_SIGNAL(folderRemoved(KMFolder*)), - this, TQT_SLOT(slotFolderRemoved(KMFolder*))); + connect(kmkernel->dimapFolderMgr(), TQ_SIGNAL(folderRemoved(KMFolder*)), + this, TQ_SLOT(slotFolderRemoved(KMFolder*))); - connect(kmkernel->searchFolderMgr(), TQT_SIGNAL(changed()), - this, TQT_SLOT(doFolderListChanged())); + connect(kmkernel->searchFolderMgr(), TQ_SIGNAL(changed()), + this, TQ_SLOT(doFolderListChanged())); - connect(kmkernel->acctMgr(), TQT_SIGNAL(accountRemoved(KMAccount*)), - this, TQT_SLOT(slotAccountRemoved(KMAccount*))); + connect(kmkernel->acctMgr(), TQ_SIGNAL(accountRemoved(KMAccount*)), + this, TQ_SLOT(slotAccountRemoved(KMAccount*))); - connect(kmkernel->acctMgr(), TQT_SIGNAL(accountAdded(KMAccount*)), - this, TQT_SLOT(slotUnhideLocalInbox())); + connect(kmkernel->acctMgr(), TQ_SIGNAL(accountAdded(KMAccount*)), + this, TQ_SLOT(slotUnhideLocalInbox())); - connect(kmkernel->searchFolderMgr(), TQT_SIGNAL(folderRemoved(KMFolder*)), - this, TQT_SLOT(slotFolderRemoved(KMFolder*))); + connect(kmkernel->searchFolderMgr(), TQ_SIGNAL(folderRemoved(KMFolder*)), + this, TQ_SLOT(slotFolderRemoved(KMFolder*))); - connect( &autoopen_timer, TQT_SIGNAL( timeout() ), - this, TQT_SLOT( openFolder() ) ); + connect( &autoopen_timer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( openFolder() ) ); - connect( this, TQT_SIGNAL( contextMenuRequested( TQListViewItem*, const TQPoint &, int ) ), - this, TQT_SLOT( slotContextMenuRequested( TQListViewItem*, const TQPoint & ) ) ); + connect( this, TQ_SIGNAL( contextMenuRequested( TQListViewItem*, const TQPoint &, int ) ), + this, TQ_SLOT( slotContextMenuRequested( TQListViewItem*, const TQPoint & ) ) ); - connect( this, TQT_SIGNAL( expanded( TQListViewItem* ) ), - this, TQT_SLOT( slotFolderExpanded( TQListViewItem* ) ) ); + connect( this, TQ_SIGNAL( expanded( TQListViewItem* ) ), + this, TQ_SLOT( slotFolderExpanded( TQListViewItem* ) ) ); - connect( this, TQT_SIGNAL( collapsed( TQListViewItem* ) ), - this, TQT_SLOT( slotFolderCollapsed( TQListViewItem* ) ) ); + connect( this, TQ_SIGNAL( collapsed( TQListViewItem* ) ), + this, TQ_SLOT( slotFolderCollapsed( TQListViewItem* ) ) ); - connect( this, TQT_SIGNAL( itemRenamed( TQListViewItem*, int, const TQString &)), - this, TQT_SLOT( slotRenameFolder( TQListViewItem*, int, const TQString &))); + connect( this, TQ_SIGNAL( itemRenamed( TQListViewItem*, int, const TQString &)), + this, TQ_SLOT( slotRenameFolder( TQListViewItem*, int, const TQString &))); - connect( this, TQT_SIGNAL(folderSelected(KMFolder*)), TQT_SLOT(updateCopyActions()) ); + connect( this, TQ_SIGNAL(folderSelected(KMFolder*)), TQ_SLOT(updateCopyActions()) ); } //----------------------------------------------------------------------------- @@ -598,7 +598,7 @@ void KMFolderTree::reload(bool openFolders) { // we open all folders to update the count mUpdateIterator = TQListViewItemIterator (this); - TQTimer::singleShot( 0, this, TQT_SLOT(slotUpdateOneCount()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(slotUpdateOneCount()) ); } for ( TQListViewItemIterator it( this ) ; it.current() ; ++it ) { @@ -606,53 +606,53 @@ void KMFolderTree::reload(bool openFolders) if ( !fti || !fti->folder() ) continue; - disconnect(fti->folder(),TQT_SIGNAL(iconsChanged()), - fti,TQT_SLOT(slotIconsChanged())); - connect(fti->folder(),TQT_SIGNAL(iconsChanged()), - fti,TQT_SLOT(slotIconsChanged())); + disconnect(fti->folder(),TQ_SIGNAL(iconsChanged()), + fti,TQ_SLOT(slotIconsChanged())); + connect(fti->folder(),TQ_SIGNAL(iconsChanged()), + fti,TQ_SLOT(slotIconsChanged())); - disconnect(fti->folder(),TQT_SIGNAL(nameChanged()), - fti,TQT_SLOT(slotNameChanged())); - connect(fti->folder(),TQT_SIGNAL(nameChanged()), - fti,TQT_SLOT(slotNameChanged())); + disconnect(fti->folder(),TQ_SIGNAL(nameChanged()), + fti,TQ_SLOT(slotNameChanged())); + connect(fti->folder(),TQ_SIGNAL(nameChanged()), + fti,TQ_SLOT(slotNameChanged())); - disconnect( fti->folder(), TQT_SIGNAL(noContentChanged()), - fti, TQT_SLOT(slotNoContentChanged()) ); - connect( fti->folder(), TQT_SIGNAL(noContentChanged()), - fti, TQT_SLOT(slotNoContentChanged()) ); + disconnect( fti->folder(), TQ_SIGNAL(noContentChanged()), + fti, TQ_SLOT(slotNoContentChanged()) ); + connect( fti->folder(), TQ_SIGNAL(noContentChanged()), + fti, TQ_SLOT(slotNoContentChanged()) ); - disconnect( fti->folder(), TQT_SIGNAL(syncStateChanged()), - this, TQT_SLOT(slotSyncStateChanged()) ); - connect( fti->folder(), TQT_SIGNAL(syncStateChanged()), - this, TQT_SLOT(slotSyncStateChanged()) ); + disconnect( fti->folder(), TQ_SIGNAL(syncStateChanged()), + this, TQ_SLOT(slotSyncStateChanged()) ); + connect( fti->folder(), TQ_SIGNAL(syncStateChanged()), + this, TQ_SLOT(slotSyncStateChanged()) ); // we want to be noticed of changes to update the unread/total columns - disconnect(fti->folder(), TQT_SIGNAL(msgAdded(KMFolder*,TQ_UINT32)), - this,TQT_SLOT(slotUpdateCountsDelayed(KMFolder*))); - connect(fti->folder(), TQT_SIGNAL(msgAdded(KMFolder*,TQ_UINT32)), - this,TQT_SLOT(slotUpdateCountsDelayed(KMFolder*))); + disconnect(fti->folder(), TQ_SIGNAL(msgAdded(KMFolder*,TQ_UINT32)), + this,TQ_SLOT(slotUpdateCountsDelayed(KMFolder*))); + connect(fti->folder(), TQ_SIGNAL(msgAdded(KMFolder*,TQ_UINT32)), + this,TQ_SLOT(slotUpdateCountsDelayed(KMFolder*))); //} - disconnect(fti->folder(), TQT_SIGNAL(numUnreadMsgsChanged(KMFolder*)), - this,TQT_SLOT(slotUpdateCountsDelayed(KMFolder*))); - connect(fti->folder(), TQT_SIGNAL(numUnreadMsgsChanged(KMFolder*)), - this,TQT_SLOT(slotUpdateCountsDelayed(KMFolder*))); - disconnect(fti->folder(), TQT_SIGNAL(msgRemoved(KMFolder*)), - this,TQT_SLOT(slotUpdateCountsDelayed(KMFolder*))); - connect(fti->folder(), TQT_SIGNAL(msgRemoved(KMFolder*)), - this,TQT_SLOT(slotUpdateCountsDelayed(KMFolder*))); + disconnect(fti->folder(), TQ_SIGNAL(numUnreadMsgsChanged(KMFolder*)), + this,TQ_SLOT(slotUpdateCountsDelayed(KMFolder*))); + connect(fti->folder(), TQ_SIGNAL(numUnreadMsgsChanged(KMFolder*)), + this,TQ_SLOT(slotUpdateCountsDelayed(KMFolder*))); + disconnect(fti->folder(), TQ_SIGNAL(msgRemoved(KMFolder*)), + this,TQ_SLOT(slotUpdateCountsDelayed(KMFolder*))); + connect(fti->folder(), TQ_SIGNAL(msgRemoved(KMFolder*)), + this,TQ_SLOT(slotUpdateCountsDelayed(KMFolder*))); - disconnect(fti->folder(), TQT_SIGNAL(folderSizeChanged( KMFolder* )), - this,TQT_SLOT(slotUpdateCountsDelayed(KMFolder*))); - connect(fti->folder(), TQT_SIGNAL(folderSizeChanged( KMFolder* )), - this,TQT_SLOT(slotUpdateCountsDelayed(KMFolder*))); + disconnect(fti->folder(), TQ_SIGNAL(folderSizeChanged( KMFolder* )), + this,TQ_SLOT(slotUpdateCountsDelayed(KMFolder*))); + connect(fti->folder(), TQ_SIGNAL(folderSizeChanged( KMFolder* )), + this,TQ_SLOT(slotUpdateCountsDelayed(KMFolder*))); - disconnect(fti->folder(), TQT_SIGNAL(shortcutChanged(KMFolder*)), - mMainWidget, TQT_SLOT( slotShortcutChanged(KMFolder*))); - connect(fti->folder(), TQT_SIGNAL(shortcutChanged(KMFolder*)), - mMainWidget, TQT_SLOT( slotShortcutChanged(KMFolder*))); + disconnect(fti->folder(), TQ_SIGNAL(shortcutChanged(KMFolder*)), + mMainWidget, TQ_SLOT( slotShortcutChanged(KMFolder*))); + connect(fti->folder(), TQ_SIGNAL(shortcutChanged(KMFolder*)), + mMainWidget, TQ_SLOT( slotShortcutChanged(KMFolder*))); if (!openFolders) @@ -696,7 +696,7 @@ void KMFolderTree::slotUpdateOneCount() ++mUpdateIterator; if ( !fti->folder() ) { // next one please - TQTimer::singleShot( 0, this, TQT_SLOT(slotUpdateOneCount()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(slotUpdateOneCount()) ); return; } @@ -707,7 +707,7 @@ void KMFolderTree::slotUpdateOneCount() // restore previous state if (!open) fti->folder()->close("updatecount"); - TQTimer::singleShot( 0, this, TQT_SLOT(slotUpdateOneCount()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(slotUpdateOneCount()) ); } //----------------------------------------------------------------------------- @@ -737,7 +737,7 @@ void KMFolderTree::addDirectory( KMFolderDir *fdir, KMFolderTreeItem* parent ) } else { // hide local inbox if unused if ( kmkernel->inboxFolder() == folder && hideLocalInbox() ) { - connect( kmkernel->inboxFolder(), TQT_SIGNAL(msgAdded(KMFolder*,TQ_UINT32)), TQT_SLOT(slotUnhideLocalInbox()) ); + connect( kmkernel->inboxFolder(), TQ_SIGNAL(msgAdded(KMFolder*,TQ_UINT32)), TQ_SLOT(slotUnhideLocalInbox()) ); continue; } @@ -765,14 +765,14 @@ void KMFolderTree::addDirectory( KMFolderDir *fdir, KMFolderTreeItem* parent ) removeFromFolderToItemMap( folder ); delete fti; // still, it might change in the future, so we better check the change signals - connect ( folder, TQT_SIGNAL(noContentChanged()), TQT_SLOT(delayedReload()) ); + connect ( folder, TQ_SIGNAL(noContentChanged()), TQ_SLOT(delayedReload()) ); continue; } - connect (fti, TQT_SIGNAL(iconChanged(KMFolderTreeItem*)), - this, TQT_SIGNAL(iconChanged(KMFolderTreeItem*))); - connect (fti, TQT_SIGNAL(nameChanged(KMFolderTreeItem*)), - this, TQT_SIGNAL(nameChanged(KMFolderTreeItem*))); + connect (fti, TQ_SIGNAL(iconChanged(KMFolderTreeItem*)), + this, TQ_SIGNAL(iconChanged(KMFolderTreeItem*))); + connect (fti, TQ_SIGNAL(nameChanged(KMFolderTreeItem*)), + this, TQ_SIGNAL(nameChanged(KMFolderTreeItem*))); } // restore last open-state fti->setOpen( readIsListViewItemOpen(fti) ); @@ -1094,7 +1094,7 @@ void KMFolderTree::slotContextMenuRequested( TQListViewItem *lvi, if ( ( fti->folder() || (fti->text(0) != i18n("Searches")) ) && !multiFolder) folderMenu->insertItem(SmallIconSet("folder-new"), createChild, this, - TQT_SLOT(addChildFolder())); + TQ_SLOT(addChildFolder())); if (!fti->folder()) { mMainWidget->action("compact_all_folders")->plug(folderMenu); @@ -1102,7 +1102,7 @@ void KMFolderTree::slotContextMenuRequested( TQListViewItem *lvi, } else if (fti->folder()->folderType() == KMFolderTypeImap) { folderMenu->insertItem(SmallIconSet("mail_get"), i18n("Check &Mail"), this, - TQT_SLOT(slotCheckMail())); + TQ_SLOT(slotCheckMail())); } } else { // regular folders @@ -1110,18 +1110,18 @@ void KMFolderTree::slotContextMenuRequested( TQListViewItem *lvi, if ( !fti->folder()->noChildren() && !multiFolder ) { folderMenu->insertItem(SmallIconSet("folder-new"), i18n("&New Subfolder..."), this, - TQT_SLOT(addChildFolder())); + TQ_SLOT(addChildFolder())); } // copy folder TQPopupMenu *copyMenu = new TQPopupMenu( folderMenu ); - folderToPopupMenu( CopyFolder, TQT_TQOBJECT(this), &mMenuToFolder, copyMenu ); + folderToPopupMenu( CopyFolder, this, &mMenuToFolder, copyMenu ); folderMenu->insertItem( i18n("&Copy Folder To"), copyMenu ); if ( fti->folder()->isMoveable() && fti->folder()->canDeleteMessages() ) { TQPopupMenu *moveMenu = new TQPopupMenu( folderMenu ); - folderToPopupMenu( MoveFolder, TQT_TQOBJECT(this), &mMenuToFolder, moveMenu ); + folderToPopupMenu( MoveFolder, this, &mMenuToFolder, moveMenu ); folderMenu->insertItem( i18n("&Move Folder To"), moveMenu ); } @@ -1139,7 +1139,7 @@ void KMFolderTree::slotContextMenuRequested( TQListViewItem *lvi, if ( GlobalSettings::self()->enableFavoriteFolderView() ) { folderMenu->insertItem( SmallIconSet("bookmark_add"), i18n("Add to Favorite Folders"), - this, TQT_SLOT(slotAddToFavorites()) ); + this, TQ_SLOT(slotAddToFavorites()) ); } folderMenu->insertSeparator(); @@ -1158,24 +1158,24 @@ void KMFolderTree::slotContextMenuRequested( TQListViewItem *lvi, { folderMenu->insertItem(SmallIconSet("bookmark_folder"), i18n("Serverside Subscription..."), mMainWidget, - TQT_SLOT(slotSubscriptionDialog())); + TQ_SLOT(slotSubscriptionDialog())); folderMenu->insertItem(SmallIcon("bookmark_folder"), i18n("Local Subscription..."), mMainWidget, - TQT_SLOT(slotLocalSubscriptionDialog())); + TQ_SLOT(slotLocalSubscriptionDialog())); if (!fti->folder()->noContent()) { mMainWidget->action("refresh_folder")->plug(folderMenu); if ( fti->folder()->folderType() == KMFolderTypeImap && !multiFolder ) { folderMenu->insertItem(SmallIconSet("reload"), i18n("Refresh Folder List"), this, - TQT_SLOT(slotResetFolderList())); + TQ_SLOT(slotResetFolderList())); } } if ( fti->folder()->folderType() == KMFolderTypeCachedImap && !multiFolder ) { KMFolderCachedImap * folder = static_cast<KMFolderCachedImap*>( fti->folder()->storage() ); folderMenu->insertItem( SmallIconSet("wizard"), i18n("&Troubleshoot IMAP Cache..."), - folder, TQT_SLOT(slotTroubleshoot()) ); + folder, TQ_SLOT(slotTroubleshoot()) ); } folderMenu->insertSeparator(); } @@ -1189,11 +1189,11 @@ void KMFolderTree::slotContextMenuRequested( TQListViewItem *lvi, folderMenu->insertItem(SmallIconSet("configure_shortcuts"), i18n("&Assign Shortcut..."), fti, - TQT_SLOT(assignShortcut())); + TQ_SLOT(assignShortcut())); if ( !fti->folder()->noContent() && fti->folder()->canDeleteMessages() ) { folderMenu->insertItem( i18n("Expire..."), fti, - TQT_SLOT( slotShowExpiryProperties() ) ); + TQ_SLOT( slotShowExpiryProperties() ) ); } mMainWidget->action("modify")->plug(folderMenu); } @@ -1230,7 +1230,7 @@ void KMFolderTree::contentsMouseReleaseEvent(TQMouseEvent* me) } // react on middle-button only - if (btn != Qt::MidButton) { + if (btn != TQt::MidButton) { KFolderTree::contentsMouseReleaseEvent(me); return; } @@ -1753,10 +1753,10 @@ void KMFolderTree::slotToggleSizeColumn() bool KMFolderTree::eventFilter( TQObject *o, TQEvent *e ) { if ( e->type() == TQEvent::MouseButtonPress && - TQT_TQMOUSEEVENT(e)->button() == Qt::RightButton && - o->isA(TQHEADER_OBJECT_NAME_STRING) ) + static_cast<TQMouseEvent*>(e)->button() == TQt::RightButton && + o->isA("TQHeader") ) { - mPopup->popup( TQT_TQMOUSEEVENT(e)->globalPos() ); + mPopup->popup( static_cast<TQMouseEvent*>(e)->globalPos() ); return true; } return KFolderTree::eventFilter(o, e); @@ -1860,15 +1860,15 @@ void KMFolderTree::folderToPopupMenu( MenuAction action, TQObject *receiver, // connect the signals if ( action == MoveMessage || action == MoveFolder ) { - disconnect( menu, TQT_SIGNAL(activated(int)), receiver, - TQT_SLOT(moveSelectedToFolder(int)) ); - connect( menu, TQT_SIGNAL(activated(int)), receiver, - TQT_SLOT(moveSelectedToFolder(int)) ); + disconnect( menu, TQ_SIGNAL(activated(int)), receiver, + TQ_SLOT(moveSelectedToFolder(int)) ); + connect( menu, TQ_SIGNAL(activated(int)), receiver, + TQ_SLOT(moveSelectedToFolder(int)) ); } else { - disconnect( menu, TQT_SIGNAL(activated(int)), receiver, - TQT_SLOT(copySelectedToFolder(int)) ); - connect( menu, TQT_SIGNAL(activated(int)), receiver, - TQT_SLOT(copySelectedToFolder(int)) ); + disconnect( menu, TQ_SIGNAL(activated(int)), receiver, + TQ_SLOT(copySelectedToFolder(int)) ); + connect( menu, TQ_SIGNAL(activated(int)), receiver, + TQ_SLOT(copySelectedToFolder(int)) ); } if ( !item ) { item = firstChild(); @@ -2176,14 +2176,14 @@ void KMFolderTree::slotAddToFavorites() void KMFolderTree::slotUnhideLocalInbox() { - disconnect( kmkernel->inboxFolder(), TQT_SIGNAL(msgAdded(KMFolder*,TQ_UINT32)), - this, TQT_SLOT(slotUnhideLocalInbox()) ); + disconnect( kmkernel->inboxFolder(), TQ_SIGNAL(msgAdded(KMFolder*,TQ_UINT32)), + this, TQ_SLOT(slotUnhideLocalInbox()) ); reload(); } void KMFolderTree::delayedReload() { - TQTimer::singleShot( 0, this, TQT_SLOT(reload()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(reload()) ); } #include "kmfoldertree.moc" diff --git a/kmail/kmfoldertree.h b/kmail/kmfoldertree.h index d5780a89..f6e5df11 100644 --- a/kmail/kmfoldertree.h +++ b/kmail/kmfoldertree.h @@ -21,7 +21,7 @@ #include "foldertreebase.h" #include <tdelocale.h> -#include <kdemacros.h> +#include <tdemacros.h> #include <tqguardedptr.h> #include <tqwidget.h> @@ -42,9 +42,9 @@ class KMAccount; typedef TQMap<int,KMFolder*> KMMenuToFolder; template <typename T> class TQGuardedPtr; -class KDE_EXPORT KMFolderTreeItem : public TQObject, public KFolderTreeItem +class TDE_EXPORT KMFolderTreeItem : public TQObject, public KFolderTreeItem { - Q_OBJECT + TQ_OBJECT public: /** Construct a root item _without_ folder */ @@ -108,7 +108,7 @@ private: class KMFolderTree : public KMail::FolderTreeBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/kmail/kmheaders.cpp b/kmail/kmheaders.cpp index 1b29fd29..06de88fb 100644 --- a/kmail/kmheaders.cpp +++ b/kmail/kmheaders.cpp @@ -140,10 +140,10 @@ KMHeaders::KMHeaders(KMMainWidget *aOwner, TQWidget *parent, mPopup->insertItem(i18n("Size"), KPaintInfo::COL_SIZE); mPopup->insertItem(i18n("Receiver"), KPaintInfo::COL_RECEIVER); - connect(mPopup, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotToggleColumn(int))); + connect(mPopup, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotToggleColumn(int))); setShowSortIndicator(true); - setFocusPolicy( TQ_WheelFocus ); + setFocusPolicy( TQWidget::WheelFocus ); if (!pixmapsLoaded) { @@ -203,18 +203,18 @@ KMHeaders::KMHeaders(KMMainWidget *aOwner, TQWidget *parent, header()->setResizeEnabled( true, mPaintInfo.senderCol ); header()->setResizeEnabled( true, mPaintInfo.dateCol ); - connect( this, TQT_SIGNAL( contextMenuRequested( TQListViewItem*, const TQPoint &, int )), - this, TQT_SLOT( rightButtonPressed( TQListViewItem*, const TQPoint &, int ))); - connect(this, TQT_SIGNAL(doubleClicked(TQListViewItem*)), - this,TQT_SLOT(selectMessage(TQListViewItem*))); - connect(this,TQT_SIGNAL(currentChanged(TQListViewItem*)), - this,TQT_SLOT(highlightMessage(TQListViewItem*))); + connect( this, TQ_SIGNAL( contextMenuRequested( TQListViewItem*, const TQPoint &, int )), + this, TQ_SLOT( rightButtonPressed( TQListViewItem*, const TQPoint &, int ))); + connect(this, TQ_SIGNAL(doubleClicked(TQListViewItem*)), + this,TQ_SLOT(selectMessage(TQListViewItem*))); + connect(this,TQ_SIGNAL(currentChanged(TQListViewItem*)), + this,TQ_SLOT(highlightMessage(TQListViewItem*))); resetCurrentTime(); mSubjectLists.setAutoDelete( true ); mMoveMessages = false; - connect( this, TQT_SIGNAL(selectionChanged()), TQT_SLOT(updateActions()) ); + connect( this, TQ_SIGNAL(selectionChanged()), TQ_SLOT(updateActions()) ); } @@ -235,8 +235,8 @@ KMHeaders::~KMHeaders () bool KMHeaders::eventFilter ( TQObject *o, TQEvent *e ) { if ( e->type() == TQEvent::MouseButtonPress && - TQT_TQMOUSEEVENT(e)->button() == Qt::RightButton && - o->isA(TQHEADER_OBJECT_NAME_STRING) ) + static_cast<TQMouseEvent*>(e)->button() == TQt::RightButton && + o->isA("TQHeader") ) { // if we currently only show one of either sender/receiver column // modify the popup text in the way, that it displays the text of the other of the two @@ -248,7 +248,7 @@ bool KMHeaders::eventFilter ( TQObject *o, TQEvent *e ) else mPopup->changeItem(KPaintInfo::COL_RECEIVER, i18n("Receiver")); - mPopup->popup( TQT_TQMOUSEEVENT(e)->globalPos() ); + mPopup->popup( static_cast<TQMouseEvent*>(e)->globalPos() ); return true; } return TDEListView::eventFilter(o, e); @@ -428,10 +428,10 @@ void KMHeaders::readColorConfig (void) TDEConfig* config = KMKernel::config(); // Custom/System colors TDEConfigGroupSaver saver(config, "Reader"); - TQColor c1=TQColor(kapp->palette().active().text()); + TQColor c1=TQColor(tdeApp->palette().active().text()); TQColor c2=TQColor("red"); TQColor c3=TQColor("blue"); - TQColor c4=TQColor(kapp->palette().active().base()); + TQColor c4=TQColor(tdeApp->palette().active().base()); TQColor c5=TQColor(0,0x7F,0); TQColor c6=TQColor(0,0x98,0); TQColor c7=TDEGlobalSettings::alternateBackgroundColor(); @@ -439,7 +439,7 @@ void KMHeaders::readColorConfig (void) if (!config->readBoolEntry("defaultColors",true)) { mPaintInfo.colFore = config->readColorEntry("ForegroundColor",&c1); mPaintInfo.colBack = config->readColorEntry("BackgroundColor",&c4); - TQPalette newPal = kapp->palette(); + TQPalette newPal = tdeApp->palette(); newPal.setColor( TQColorGroup::Base, mPaintInfo.colBack ); newPal.setColor( TQColorGroup::Text, mPaintInfo.colFore ); setPalette( newPal ); @@ -452,7 +452,7 @@ void KMHeaders::readColorConfig (void) else { mPaintInfo.colFore = c1; mPaintInfo.colBack = c4; - TQPalette newPal = kapp->palette(); + TQPalette newPal = tdeApp->palette(); newPal.setColor( TQColorGroup::Base, c4 ); newPal.setColor( TQColorGroup::Text, c1 ); setPalette( newPal ); @@ -698,28 +698,28 @@ void KMHeaders::setFolder( KMFolder *aFolder, bool forceJumpToUnread ) // from this folder, since it's msg's are about to be deleted. highlightMessage(0, false); - disconnect(mFolder, TQT_SIGNAL(numUnreadMsgsChanged(KMFolder*)), - this, TQT_SLOT(setFolderInfoStatus())); + disconnect(mFolder, TQ_SIGNAL(numUnreadMsgsChanged(KMFolder*)), + this, TQ_SLOT(setFolderInfoStatus())); mFolder->markNewAsUnread(); writeFolderConfig(); - disconnect(mFolder, TQT_SIGNAL(msgHeaderChanged(KMFolder*,int)), - this, TQT_SLOT(msgHeaderChanged(KMFolder*,int))); - disconnect(mFolder, TQT_SIGNAL(msgAdded(int)), - this, TQT_SLOT(msgAdded(int))); - disconnect(mFolder, TQT_SIGNAL( msgRemoved( int, TQString ) ), - this, TQT_SLOT( msgRemoved( int, TQString ) ) ); - disconnect(mFolder, TQT_SIGNAL(changed()), - this, TQT_SLOT(msgChanged())); - disconnect(mFolder, TQT_SIGNAL(cleared()), - this, TQT_SLOT(folderCleared())); - disconnect(mFolder, TQT_SIGNAL(expunged( KMFolder* )), - this, TQT_SLOT(folderCleared())); - disconnect(mFolder, TQT_SIGNAL(closed()), - this, TQT_SLOT(folderClosed())); - disconnect( mFolder, TQT_SIGNAL( statusMsg( const TQString& ) ), - BroadcastStatus::instance(), TQT_SLOT( setStatusMsg( const TQString& ) ) ); - disconnect(mFolder, TQT_SIGNAL(viewConfigChanged()), this, TQT_SLOT(reset())); + disconnect(mFolder, TQ_SIGNAL(msgHeaderChanged(KMFolder*,int)), + this, TQ_SLOT(msgHeaderChanged(KMFolder*,int))); + disconnect(mFolder, TQ_SIGNAL(msgAdded(int)), + this, TQ_SLOT(msgAdded(int))); + disconnect(mFolder, TQ_SIGNAL( msgRemoved( int, TQString ) ), + this, TQ_SLOT( msgRemoved( int, TQString ) ) ); + disconnect(mFolder, TQ_SIGNAL(changed()), + this, TQ_SLOT(msgChanged())); + disconnect(mFolder, TQ_SIGNAL(cleared()), + this, TQ_SLOT(folderCleared())); + disconnect(mFolder, TQ_SIGNAL(expunged( KMFolder* )), + this, TQ_SLOT(folderCleared())); + disconnect(mFolder, TQ_SIGNAL(closed()), + this, TQ_SLOT(folderClosed())); + disconnect( mFolder, TQ_SIGNAL( statusMsg( const TQString& ) ), + BroadcastStatus::instance(), TQ_SLOT( setStatusMsg( const TQString& ) ) ); + disconnect(mFolder, TQ_SIGNAL(viewConfigChanged()), this, TQ_SLOT(reset())); writeSortOrder(); mFolder->close("kmheaders"); // System folders remain open but we also should write the index from @@ -736,25 +736,25 @@ void KMHeaders::setFolder( KMFolder *aFolder, bool forceJumpToUnread ) mOwner->messageActions()->replyListAction()->setEnabled( mFolder ? mFolder->isMailingListEnabled() : false ); if ( mFolder ) { - connect(mFolder, TQT_SIGNAL(msgHeaderChanged(KMFolder*,int)), - this, TQT_SLOT(msgHeaderChanged(KMFolder*,int))); - connect(mFolder, TQT_SIGNAL(msgAdded(int)), - this, TQT_SLOT(msgAdded(int))); - connect(mFolder, TQT_SIGNAL(msgRemoved(int,TQString)), - this, TQT_SLOT(msgRemoved(int,TQString))); - connect(mFolder, TQT_SIGNAL(changed()), - this, TQT_SLOT(msgChanged())); - connect(mFolder, TQT_SIGNAL(cleared()), - this, TQT_SLOT(folderCleared())); - connect(mFolder, TQT_SIGNAL(expunged( KMFolder* )), - this, TQT_SLOT(folderCleared())); - connect(mFolder, TQT_SIGNAL(closed()), - this, TQT_SLOT(folderClosed())); - connect(mFolder, TQT_SIGNAL(statusMsg(const TQString&)), - BroadcastStatus::instance(), TQT_SLOT( setStatusMsg( const TQString& ) ) ); - connect(mFolder, TQT_SIGNAL(numUnreadMsgsChanged(KMFolder*)), - this, TQT_SLOT(setFolderInfoStatus())); - connect(mFolder, TQT_SIGNAL(viewConfigChanged()), this, TQT_SLOT(reset())); + connect(mFolder, TQ_SIGNAL(msgHeaderChanged(KMFolder*,int)), + this, TQ_SLOT(msgHeaderChanged(KMFolder*,int))); + connect(mFolder, TQ_SIGNAL(msgAdded(int)), + this, TQ_SLOT(msgAdded(int))); + connect(mFolder, TQ_SIGNAL(msgRemoved(int,TQString)), + this, TQ_SLOT(msgRemoved(int,TQString))); + connect(mFolder, TQ_SIGNAL(changed()), + this, TQ_SLOT(msgChanged())); + connect(mFolder, TQ_SIGNAL(cleared()), + this, TQ_SLOT(folderCleared())); + connect(mFolder, TQ_SIGNAL(expunged( KMFolder* )), + this, TQ_SLOT(folderCleared())); + connect(mFolder, TQ_SIGNAL(closed()), + this, TQ_SLOT(folderClosed())); + connect(mFolder, TQ_SIGNAL(statusMsg(const TQString&)), + BroadcastStatus::instance(), TQ_SLOT( setStatusMsg( const TQString& ) ) ); + connect(mFolder, TQ_SIGNAL(numUnreadMsgsChanged(KMFolder*)), + this, TQ_SLOT(setFolderInfoStatus())); + connect(mFolder, TQ_SIGNAL(viewConfigChanged()), this, TQ_SLOT(reset())); // Not very nice, but if we go from nested to non-nested // in the folderConfig below then we need to do this otherwise @@ -844,8 +844,8 @@ void KMHeaders::msgChanged() } // if (!isUpdatesEnabled()) return; // prevent IMAP messages from scrolling to top - disconnect(this,TQT_SIGNAL(currentChanged(TQListViewItem*)), - this,TQT_SLOT(highlightMessage(TQListViewItem*))); + disconnect(this,TQ_SIGNAL(currentChanged(TQListViewItem*)), + this,TQ_SLOT(highlightMessage(TQListViewItem*))); updateMessageList(); // do not change the selection @@ -866,8 +866,8 @@ void KMHeaders::msgChanged() } } - connect(this,TQT_SIGNAL(currentChanged(TQListViewItem*)), - this,TQT_SLOT(highlightMessage(TQListViewItem*))); + connect(this,TQ_SIGNAL(currentChanged(TQListViewItem*)), + this,TQ_SLOT(highlightMessage(TQListViewItem*))); // if the current message has changed then emit // the selected signal to force an update @@ -982,8 +982,8 @@ void KMHeaders::msgAdded(int id) /* In case the current item is taken during reparenting, prevent qlistview * from selecting some unrelated item as a result of take() emitting * currentChanged. */ - disconnect( this, TQT_SIGNAL(currentChanged(TQListViewItem*)), - this, TQT_SLOT(highlightMessage(TQListViewItem*))); + disconnect( this, TQ_SIGNAL(currentChanged(TQListViewItem*)), + this, TQ_SLOT(highlightMessage(TQListViewItem*))); if ( !msgId.isEmpty() ) { TQPtrListIterator<HeaderItem> it(mImperfectlyThreadedList); @@ -1052,7 +1052,7 @@ void KMHeaders::msgAdded(int id) sci->setItem(hi); } if (mSortInfo.fakeSort) { - TQObject::disconnect(header(), TQT_SIGNAL(clicked(int)), this, TQT_SLOT(dirtySortOrder(int))); + TQObject::disconnect(header(), TQ_SIGNAL(clicked(int)), this, TQ_SLOT(dirtySortOrder(int))); TDEListView::setSorting(mSortCol, !mSortDescending ); mSortInfo.fakeSort = 0; } @@ -1068,8 +1068,8 @@ void KMHeaders::msgAdded(int id) } /* restore signal */ - connect( this, TQT_SIGNAL(currentChanged(TQListViewItem*)), - this, TQT_SLOT(highlightMessage(TQListViewItem*))); + connect( this, TQ_SIGNAL(currentChanged(TQListViewItem*)), + this, TQ_SLOT(highlightMessage(TQListViewItem*))); emit msgAddedToListView( hi ); END_TIMER(msgAdded); @@ -1089,8 +1089,8 @@ void KMHeaders::msgRemoved(int id, TQString msgId ) * item once this one is removed. Sine we have already selected * something in prepare/finalizeMove that's counter productive */ - disconnect( this, TQT_SIGNAL(currentChanged(TQListViewItem*)), - this, TQT_SLOT(highlightMessage(TQListViewItem*))); + disconnect( this, TQ_SIGNAL(currentChanged(TQListViewItem*)), + this, TQ_SLOT(highlightMessage(TQListViewItem*))); HeaderItem *removedItem = mItems[id]; if (!removedItem) return; @@ -1137,7 +1137,7 @@ void KMHeaders::msgRemoved(int id, TQString msgId ) } item->setTempKey( key + item->key( mSortCol, !mSortDescending )); if (mSortInfo.fakeSort) { - TQObject::disconnect(header(), TQT_SIGNAL(clicked(int)), this, TQT_SLOT(dirtySortOrder(int))); + TQObject::disconnect(header(), TQ_SIGNAL(clicked(int)), this, TQ_SLOT(dirtySortOrder(int))); TDEListView::setSorting(mSortCol, !mSortDescending ); mSortInfo.fakeSort = 0; } @@ -1201,8 +1201,8 @@ void KMHeaders::msgRemoved(int id, TQString msgId ) } } /* restore signal */ - connect( this, TQT_SIGNAL(currentChanged(TQListViewItem*)), - this, TQT_SLOT(highlightMessage(TQListViewItem*))); + connect( this, TQ_SIGNAL(currentChanged(TQListViewItem*)), + this, TQ_SLOT(highlightMessage(TQListViewItem*))); } @@ -1452,7 +1452,7 @@ void KMHeaders::applyFiltersOnMsg() TQString statusMsg = i18n("Filtering message %1 of %2"); statusMsg = statusMsg.arg( msgCount ).arg( msgCountToFilter ); KPIM::BroadcastStatus::instance()->setStatusMsg( statusMsg ); - TDEApplication::kApplication()->eventLoop()->processEvents( TQEventLoop::ExcludeUserInput, 50 ); + tdeApp->eventLoop()->processEvents( TQEventLoop::ExcludeUserInput, 50 ); } KMFolder *folder = 0; @@ -1467,8 +1467,8 @@ void KMHeaders::applyFiltersOnMsg() msg->setTransferInProgress(true); if (!msg->isComplete()) { FolderJob *job = mFolder->createJob(msg); - connect(job, TQT_SIGNAL(messageRetrieved(KMMessage*)), - this, TQT_SLOT(slotFilterMsg(KMMessage*))); + connect(job, TQ_SIGNAL(messageRetrieved(KMMessage*)), + this, TQ_SLOT(slotFilterMsg(KMMessage*))); job->start(); } else { if (slotFilterMsg(msg) == 2) @@ -1518,8 +1518,8 @@ void KMHeaders::deleteMsg () finalizeMove( nextItem, contentX, contentY ); KMCommand *command = new KMDeleteMsgCommand( mFolder, msgList ); - connect( command, TQT_SIGNAL( completed( KMCommand * ) ), - this, TQT_SLOT( slotMoveCompleted( KMCommand * ) ) ); + connect( command, TQ_SIGNAL( completed( KMCommand * ) ), + this, TQ_SLOT( slotMoveCompleted( KMCommand * ) ) ); command->start(); BroadcastStatus::instance()->setStatusMsg(""); @@ -1540,8 +1540,8 @@ HeaderItem* KMHeaders::prepareMove( int *contentX, int *contentY ) HeaderItem *ret = 0; emit maybeDeleting(); - disconnect( this, TQT_SIGNAL(currentChanged(TQListViewItem*)), - this, TQT_SLOT(highlightMessage(TQListViewItem*))); + disconnect( this, TQ_SIGNAL(currentChanged(TQListViewItem*)), + this, TQ_SLOT(highlightMessage(TQListViewItem*))); TQListViewItem *curItem; HeaderItem *item; @@ -1577,8 +1577,8 @@ void KMHeaders::finalizeMove( HeaderItem *item, int contentX, int contentY ) setContentsPos( contentX, contentY ); makeHeaderVisible(); - connect( this, TQT_SIGNAL(currentChanged(TQListViewItem*)), - this, TQT_SLOT(highlightMessage(TQListViewItem*))); + connect( this, TQ_SIGNAL(currentChanged(TQListViewItem*)), + this, TQ_SLOT(highlightMessage(TQListViewItem*))); } @@ -1607,8 +1607,8 @@ void KMHeaders::moveMsgToFolder ( KMFolder* destFolder, bool askForConfirmation finalizeMove( nextItem, contentX, contentY ); KMCommand *command = new KMMoveCommand( destFolder, msgList ); - connect( command, TQT_SIGNAL( completed( KMCommand * ) ), - this, TQT_SLOT( slotMoveCompleted( KMCommand * ) ) ); + connect( command, TQ_SIGNAL( completed( KMCommand * ) ), + this, TQ_SLOT( slotMoveCompleted( KMCommand * ) ) ); command->start(); } @@ -1884,13 +1884,13 @@ void KMHeaders::incCurrentMessage() TQListViewItem *lvi = currentItem(); if ( lvi && lvi->itemBelow() ) { - disconnect(this,TQT_SIGNAL(currentChanged(TQListViewItem*)), - this,TQT_SLOT(highlightMessage(TQListViewItem*))); + disconnect(this,TQ_SIGNAL(currentChanged(TQListViewItem*)), + this,TQ_SLOT(highlightMessage(TQListViewItem*))); setCurrentItem( lvi->itemBelow() ); ensureCurrentItemVisible(); setFocus(); - connect(this,TQT_SIGNAL(currentChanged(TQListViewItem*)), - this,TQT_SLOT(highlightMessage(TQListViewItem*))); + connect(this,TQ_SIGNAL(currentChanged(TQListViewItem*)), + this,TQ_SLOT(highlightMessage(TQListViewItem*))); } } @@ -1901,13 +1901,13 @@ void KMHeaders::decCurrentMessage() return; TQListViewItem *lvi = currentItem(); if ( lvi && lvi->itemAbove() ) { - disconnect(this,TQT_SIGNAL(currentChanged(TQListViewItem*)), - this,TQT_SLOT(highlightMessage(TQListViewItem*))); + disconnect(this,TQ_SIGNAL(currentChanged(TQListViewItem*)), + this,TQ_SLOT(highlightMessage(TQListViewItem*))); setCurrentItem( lvi->itemAbove() ); ensureCurrentItemVisible(); setFocus(); - connect(this,TQT_SIGNAL(currentChanged(TQListViewItem*)), - this,TQT_SLOT(highlightMessage(TQListViewItem*))); + connect(this,TQ_SIGNAL(currentChanged(TQListViewItem*)), + this,TQ_SLOT(highlightMessage(TQListViewItem*))); } } @@ -2159,7 +2159,7 @@ void KMHeaders::resetCurrentTime() mDate.reset(); // only reset exactly during minute switch TQTimer::singleShot( ( 60-TQTime::currentTime().second() ) * 1000, - this, TQT_SLOT( resetCurrentTime() ) ); + this, TQ_SLOT( resetCurrentTime() ) ); } //----------------------------------------------------------------------------- @@ -2240,8 +2240,8 @@ void KMHeaders::keyPressEvent( TQKeyEvent * e ) if (cntrl) { if (!shft) - disconnect(this,TQT_SIGNAL(currentChanged(TQListViewItem*)), - this,TQT_SLOT(highlightMessage(TQListViewItem*))); + disconnect(this,TQ_SIGNAL(currentChanged(TQListViewItem*)), + this,TQ_SLOT(highlightMessage(TQListViewItem*))); switch (e->key()) { case Key_Down: case Key_Up: @@ -2253,8 +2253,8 @@ void KMHeaders::keyPressEvent( TQKeyEvent * e ) TDEListView::keyPressEvent( e ); } if (!shft) - connect(this,TQT_SIGNAL(currentChanged(TQListViewItem*)), - this,TQT_SLOT(highlightMessage(TQListViewItem*))); + connect(this,TQ_SIGNAL(currentChanged(TQListViewItem*)), + this,TQ_SLOT(highlightMessage(TQListViewItem*))); } } @@ -2332,12 +2332,12 @@ void KMHeaders::contentsMousePressEvent(TQMouseEvent* e) if ( e->state() & ControlButton ) setSelected( lvi, !wasSelected ); - if ((e->button() == Qt::LeftButton) ) + if ((e->button() == TQt::LeftButton) ) mMousePressed = true; } // check if we are on a status column and toggle it - if ( lvi && e->button() == Qt::LeftButton && !( e->state() & (ShiftButton | ControlButton | AltButton | MetaButton) ) ) { + if ( lvi && e->button() == TQt::LeftButton && !( e->state() & (ShiftButton | ControlButton | AltButton | MetaButton) ) ) { bool flagsToggleable = GlobalSettings::self()->allowLocalFlags() || !(mFolder ? mFolder->isReadOnly() : true); int section = header()->sectionAt( e->pos().x() ); HeaderItem *item = static_cast<HeaderItem*>( lvi ); @@ -2365,7 +2365,7 @@ void KMHeaders::contentsMousePressEvent(TQMouseEvent* e) //----------------------------------------------------------------------------- void KMHeaders::contentsMouseReleaseEvent(TQMouseEvent* e) { - if (e->button() != Qt::RightButton) + if (e->button() != TQt::RightButton) TDEListView::contentsMouseReleaseEvent(e); mMousePressed = false; @@ -2464,7 +2464,7 @@ void KMHeaders::slotRMB() menu->insertSeparator(); TQPopupMenu *msgCopyMenu = new TQPopupMenu(menu); - mOwner->folderTree()->folderToPopupMenu( KMFolderTree::CopyMessage, TQT_TQOBJECT(this), + mOwner->folderTree()->folderToPopupMenu( KMFolderTree::CopyMessage, this, &mMenuToFolder, msgCopyMenu ); menu->insertItem(i18n("&Copy To"), msgCopyMenu); @@ -2473,7 +2473,7 @@ void KMHeaders::slotRMB() menu->setItemEnabled( id, false ); } else { TQPopupMenu *msgMoveMenu = new TQPopupMenu(menu); - mOwner->folderTree()->folderToPopupMenu( KMFolderTree::MoveMessage, TQT_TQOBJECT(this), + mOwner->folderTree()->folderToPopupMenu( KMFolderTree::MoveMessage, this, &mMenuToFolder, msgMoveMenu ); menu->insertItem(i18n("&Move To"), msgMoveMenu); } @@ -2623,7 +2623,7 @@ void KMHeaders::setSorting( int column, bool ascending ) // if (column != mSortCol) // setColumnText( mSortCol, TQIconSet( TQPixmap()), columnText( mSortCol )); if(mSortInfo.dirty || column != mSortInfo.column || ascending != mSortInfo.ascending) { //dirtied - TQObject::disconnect(header(), TQT_SIGNAL(clicked(int)), this, TQT_SLOT(dirtySortOrder(int))); + TQObject::disconnect(header(), TQ_SIGNAL(clicked(int)), this, TQ_SLOT(dirtySortOrder(int))); mSortInfo.dirty = true; } @@ -2865,7 +2865,7 @@ void KMHeaders::appendItemToSortFile(HeaderItem *khi) void KMHeaders::dirtySortOrder(int column) { mSortInfo.dirty = true; - TQObject::disconnect(header(), TQT_SIGNAL(clicked(int)), this, TQT_SLOT(dirtySortOrder(int))); + TQObject::disconnect(header(), TQ_SIGNAL(clicked(int)), this, TQ_SLOT(dirtySortOrder(int))); setSorting(column, mSortInfo.column == column ? !mSortInfo.ascending : true); } @@ -3109,7 +3109,7 @@ bool KMHeaders::readSortOrder( bool set_selection, bool forceJumpToUnread ) //Hackyness to work around qlistview problems TDEListView::setSorting(-1); header()->setSortIndicator(column, ascending); - TQObject::connect(header(), TQT_SIGNAL(clicked(int)), this, TQT_SLOT(dirtySortOrder(int))); + TQObject::connect(header(), TQ_SIGNAL(clicked(int)), this, TQ_SLOT(dirtySortOrder(int))); //setup mSortInfo here now, as above may change it mSortInfo.dirty = false; mSortInfo.column = (short)column; @@ -3556,7 +3556,7 @@ void KMHeaders::cutMessages() void KMHeaders::pasteMessages() { - new MessageCopyHelper( mCopiedMessages, folder(), mMoveMessages, TQT_TQOBJECT(this) ); + new MessageCopyHelper( mCopiedMessages, folder(), mMoveMessages, this ); if ( mMoveMessages ) { mCopiedMessages.clear(); updateActions(); diff --git a/kmail/kmheaders.h b/kmail/kmheaders.h index 112b1cde..ab3abf09 100644 --- a/kmail/kmheaders.h +++ b/kmail/kmheaders.h @@ -45,7 +45,7 @@ enum NestingPolicy { AlwaysOpen = 0, DefaultOpen, DefaultClosed, OpenUnread }; /** The widget that shows the contents of folders */ class KMHeaders : public TDEListView { - Q_OBJECT + TQ_OBJECT friend class ::KMail::HeaderItem; // For easy access to the pixmaps diff --git a/kmail/kmkernel.cpp b/kmail/kmkernel.cpp index cfb28ab2..962271e6 100644 --- a/kmail/kmkernel.cpp +++ b/kmail/kmkernel.cpp @@ -60,7 +60,7 @@ using KMail::FolderIface; #include <tdemessagebox.h> #include <knotifyclient.h> #include <kstaticdeleter.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeconfig.h> #include <kprogress.h> #include <kpassivepopup.h> @@ -173,8 +173,8 @@ KMKernel::KMKernel (TQObject *parent, const char *name) : #ifdef __TDE_HAVE_TDEHWLIB mNetworkManager = TDEGlobal::networkManager(); if (mNetworkManager) { - connect( mNetworkManager, TQT_SIGNAL( networkDeviceStateChanged( TDENetworkConnectionStatus::TDENetworkConnectionStatus, TDENetworkConnectionStatus::TDENetworkConnectionStatus, TQString ) ), - this, TQT_SLOT( slotNetworkStateChanged( TDENetworkConnectionStatus::TDENetworkConnectionStatus, TDENetworkConnectionStatus::TDENetworkConnectionStatus, TQString ) ) ); + connect( mNetworkManager, TQ_SIGNAL( networkDeviceStateChanged( TDENetworkConnectionStatus::TDENetworkConnectionStatus, TDENetworkConnectionStatus::TDENetworkConnectionStatus, TQString ) ), + this, TQ_SLOT( slotNetworkStateChanged( TDENetworkConnectionStatus::TDENetworkConnectionStatus, TDENetworkConnectionStatus::TDENetworkConnectionStatus, TQString ) ) ); if (networkStateConnected()) { resumeNetworkJobs(); } @@ -390,7 +390,7 @@ void KMKernel::openReader( bool onlyCheck ) // Activate window - doing this instead of KWin::activateWindow(mWin->winId()); // so that it also works when called from KMailApplication::newInstance() #if defined TQ_WS_X11 && ! defined K_WS_TQTONLY - TDEStartupInfo::setNewStartupId( mWin, kapp->startupId() ); + TDEStartupInfo::setNewStartupId( mWin, tdeApp->startupId() ); #endif } } @@ -460,7 +460,7 @@ int KMKernel::openComposer (const TQString &to, const TQString &cc, // Activate window - doing this instead of KWin::activateWindow(cWin->winId()); // so that it also works when called from KMailApplication::newInstance() #if defined TQ_WS_X11 && ! defined K_WS_TQTONLY - TDEStartupInfo::setNewStartupId( cWin, kapp->startupId() ); + TDEStartupInfo::setNewStartupId( cWin, tdeApp->startupId() ); #endif } return 1; @@ -607,7 +607,7 @@ int KMKernel::openComposer (const TQString &to, const TQString &cc, // Activate window - doing this instead of KWin::activateWindow(cWin->winId()); // so that it also works when called from KMailApplication::newInstance() #if defined TQ_WS_X11 && ! defined K_WS_TQTONLY - TDEStartupInfo::setNewStartupId( cWin, kapp->startupId() ); + TDEStartupInfo::setNewStartupId( cWin, tdeApp->startupId() ); #endif } else { cWin->setAutoDeleteWindow( true ); @@ -653,7 +653,7 @@ DCOPRef KMKernel::openComposer(const TQString &to, const TQString &cc, // Activate window - doing this instead of KWin::activateWindow(cWin->winId()); // so that it also works when called from KMailApplication::newInstance() #if defined TQ_WS_X11 && ! defined K_WS_TQTONLY - TDEStartupInfo::setNewStartupId( cWin, kapp->startupId() ); + TDEStartupInfo::setNewStartupId( cWin, tdeApp->startupId() ); #endif } @@ -1357,7 +1357,7 @@ void KMKernel::slotSenderFinished() good, Folder manager go compact sent-mail and outbox clean up stage1 (release folders and config, unregister from dcop) -- another kmail may start now --- - kapp->quit(); + tdeApp->quit(); } */ @@ -1582,17 +1582,17 @@ void KMKernel::init() the_weaverLogger->attach (the_weaver); //#endif - connect( the_folderMgr, TQT_SIGNAL( folderRemoved(KMFolder*) ), - this, TQT_SIGNAL( folderRemoved(KMFolder*) ) ); - connect( the_dimapFolderMgr, TQT_SIGNAL( folderRemoved(KMFolder*) ), - this, TQT_SIGNAL( folderRemoved(KMFolder*) ) ); - connect( the_imapFolderMgr, TQT_SIGNAL( folderRemoved(KMFolder*) ), - this, TQT_SIGNAL( folderRemoved(KMFolder*) ) ); - connect( the_searchFolderMgr, TQT_SIGNAL( folderRemoved(KMFolder*) ), - this, TQT_SIGNAL( folderRemoved(KMFolder*) ) ); + connect( the_folderMgr, TQ_SIGNAL( folderRemoved(KMFolder*) ), + this, TQ_SIGNAL( folderRemoved(KMFolder*) ) ); + connect( the_dimapFolderMgr, TQ_SIGNAL( folderRemoved(KMFolder*) ), + this, TQ_SIGNAL( folderRemoved(KMFolder*) ) ); + connect( the_imapFolderMgr, TQ_SIGNAL( folderRemoved(KMFolder*) ), + this, TQ_SIGNAL( folderRemoved(KMFolder*) ) ); + connect( the_searchFolderMgr, TQ_SIGNAL( folderRemoved(KMFolder*) ), + this, TQ_SIGNAL( folderRemoved(KMFolder*) ) ); mBackgroundTasksTimer = new TQTimer( this, "mBackgroundTasksTimer" ); - connect( mBackgroundTasksTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotRunBackgroundTasks() ) ); + connect( mBackgroundTasksTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( slotRunBackgroundTasks() ) ); #ifdef DEBUG_SCHEDULER // for debugging, see jobscheduler.h mBackgroundTasksTimer->start( 10000, true ); // 10s, singleshot #else @@ -1744,7 +1744,7 @@ bool KMKernel::doSessionManagement() { // Do session management - if (kapp->isRestored()){ + if (tdeApp->isRestored()){ int n = 1; while (KMMainWin::canBeRestored(n)){ //only restore main windows! (Matthias); @@ -1884,7 +1884,7 @@ bool KMKernel::transferMail( TQString & destinationDir ) #if 0 // disabled for now since moving fails in certain cases (e.g. if symbolic links are involved) - const TQString kmailName = kapp->aboutData()->programName(); + const TQString kmailName = tdeApp->aboutData()->programName(); TQString msg; if ( TDEIO::NetAccess::exists( destinationDir, true, 0 ) ) { // if destinationDir exists, we need to warn about possible @@ -1962,7 +1962,7 @@ void KMKernel::kmailMsgHandler(TQtMsgType aType, const char* aMsg) case TQtFatalMsg: // Hm, what about using kdFatal() here? ungrabPtrKb(); - kdDebug(5006) << kapp->caption() << " fatal error " + kdDebug(5006) << tdeApp->caption() << " fatal error " << aMsg << endl; KMessageBox::error(0, aMsg); abort(); @@ -1982,7 +1982,7 @@ void KMKernel::dumpDeadLetters() return; for ( TQPtrListIterator<TDEMainWindow> it(*TDEMainWindow::memberList) ; it.current() != 0; ++it ) { - if ( KMail::Composer * win = ::tqqt_cast<KMail::Composer*>( it.current() ) ) { + if ( KMail::Composer * win = ::tqt_cast<KMail::Composer*>( it.current() ) ) { win->autoSaveMessage(); // saving the message has to be finished right here, we are called from a dtor, // therefore we have no chance to finish this later @@ -2020,10 +2020,10 @@ void KMKernel::byteArrayToRemoteFile(const TQByteArray &aData, const KURL &aURL, TDEIO::Job *job = TDEIO::put(aURL, -1, overwrite, false); putData pd; pd.url = aURL; pd.data = aData; pd.offset = 0; mPutJobs.insert(job, pd); - connect(job, TQT_SIGNAL(dataReq(TDEIO::Job*,TQByteArray&)), - TQT_SLOT(slotDataReq(TDEIO::Job*,TQByteArray&))); - connect(job, TQT_SIGNAL(result(TDEIO::Job*)), - TQT_SLOT(slotResult(TDEIO::Job*))); + connect(job, TQ_SIGNAL(dataReq(TDEIO::Job*,TQByteArray&)), + TQ_SLOT(slotDataReq(TDEIO::Job*,TQByteArray&))); + connect(job, TQ_SIGNAL(result(TDEIO::Job*)), + TQ_SLOT(slotResult(TDEIO::Job*))); } void KMKernel::slotDataReq(TDEIO::Job *job, TQByteArray &data) @@ -2079,8 +2079,8 @@ void KMKernel::slotShowConfigurationDialog() { if( !mConfigureDialog ) { mConfigureDialog = new ConfigureDialog( 0, "configure", false ); - connect( mConfigureDialog, TQT_SIGNAL( configChanged() ), - this, TQT_SLOT( slotConfigChanged() ) ); + connect( mConfigureDialog, TQ_SIGNAL( configChanged() ), + this, TQ_SLOT( slotConfigChanged() ) ); } if( KMKernel::getKMMainWidget() == 0 ) @@ -2344,7 +2344,7 @@ void KMKernel::selectFolder( TQString folderPath ) KMMainWidget *KMKernel::getKMMainWidget() { //This could definitely use a speadup - TQWidgetList *l = kapp->topLevelWidgets(); + TQWidgetList *l = tdeApp->topLevelWidgets(); TQWidgetListIt it( *l ); TQWidget *wid; @@ -2420,7 +2420,7 @@ KMFolder* KMKernel::findFolderById( const TQString& idString ) ::KIMProxy* KMKernel::imProxy() { - return KIMProxy::instance( kapp->dcopClient() ); + return KIMProxy::instance( tdeApp->dcopClient() ); } void KMKernel::enableMailCheck() diff --git a/kmail/kmkernel.h b/kmail/kmkernel.h index b8055340..ea3610bb 100644 --- a/kmail/kmkernel.h +++ b/kmail/kmkernel.h @@ -7,11 +7,11 @@ #include <weaver.h> #include <weaverlogger.h> -#include <kdemacros.h> +#include <tdemacros.h> #include <tdeconfig.h> #include <tdeversion.h> #include <tdeimproxy.h> -#include <kdemacros.h> +#include <tdemacros.h> #ifdef __TDE_HAVE_TDEHWLIB # include <tdenetworkconnections.h> @@ -88,9 +88,9 @@ class ConfigureDialog; * (singleton) objects such as the UndoStack, the folder managers and filter * manager, etc. */ -class KDE_EXPORT KMKernel : public TQObject, virtual public KMailIface +class TDE_EXPORT KMKernel : public TQObject, virtual public KMailIface { - Q_OBJECT + TQ_OBJECT public: @@ -285,7 +285,7 @@ public: const KURL &messageFile, const KURL::List &attach, const QCStringList &customHeaders); void byteArrayToRemoteFile(const TQByteArray&, const KURL&, - bool overwrite = FALSE); + bool overwrite = false); bool folderIsDraftOrOutbox( const KMFolder * ); bool folderIsDrafts( const KMFolder * ); bool folderIsTemplates( const KMFolder * ); @@ -486,7 +486,7 @@ private: TQString the_previousVersion; /** is this the first start? read from config */ bool the_firstStart; - /** are we starting up? set in main.cpp directly before kapp->exec() */ + /** are we starting up? set in main.cpp directly before tdeApp->exec() */ bool the_startingUp; /** are we going down? set from here */ bool the_shuttingDown; diff --git a/kmail/kmlineeditspell.cpp b/kmail/kmlineeditspell.cpp index 45585147..92cc4f7f 100644 --- a/kmail/kmlineeditspell.cpp +++ b/kmail/kmlineeditspell.cpp @@ -156,7 +156,7 @@ TQPopupMenu *KMLineEdit::createPopupMenu() menu->insertSeparator(); menu->insertItem( i18n( "Edit Recent Addresses..." ), - this, TQT_SLOT( editRecentAddresses() ) ); + this, TQ_SLOT( editRecentAddresses() ) ); return menu; } diff --git a/kmail/kmlineeditspell.h b/kmail/kmlineeditspell.h index 06bfce5e..98b8ba76 100644 --- a/kmail/kmlineeditspell.h +++ b/kmail/kmlineeditspell.h @@ -11,7 +11,7 @@ class TQPopupMenu; class KMLineEdit : public KPIM::AddresseeLineEdit { - Q_OBJECT + TQ_OBJECT public: KMLineEdit(bool useCompletion, TQWidget *parent = 0, @@ -40,7 +40,7 @@ private: class KMLineEditSpell : public KMLineEdit { - Q_OBJECT + TQ_OBJECT public: KMLineEditSpell(bool useCompletion, TQWidget *parent = 0, diff --git a/kmail/kmmainwidget.cpp b/kmail/kmmainwidget.cpp index d5ba1f31..b1b1a5bb 100644 --- a/kmail/kmmainwidget.cpp +++ b/kmail/kmmainwidget.cpp @@ -36,7 +36,7 @@ #include <tdefiledialog.h> #include <ktip.h> #include <knotifydialog.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <dcopclient.h> #include <kaddrbook.h> #include <tdeaccel.h> @@ -203,41 +203,41 @@ KMMainWidget::KMMainWidget(TQWidget *parent, const char *name, activatePanners(); - TQTimer::singleShot( 0, TQT_TQOBJECT(this), TQT_SLOT( slotShowStartupFolder() )); + TQTimer::singleShot( 0, this, TQ_SLOT( slotShowStartupFolder() )); - connect( kmkernel->acctMgr(), TQT_SIGNAL( checkedMail( bool, bool, const TQMap<TQString, int> & ) ), - this, TQT_SLOT( slotMailChecked( bool, bool, const TQMap<TQString, int> & ) ) ); + connect( kmkernel->acctMgr(), TQ_SIGNAL( checkedMail( bool, bool, const TQMap<TQString, int> & ) ), + this, TQ_SLOT( slotMailChecked( bool, bool, const TQMap<TQString, int> & ) ) ); - connect( kmkernel->acctMgr(), TQT_SIGNAL( accountAdded( KMAccount* ) ), - this, TQT_SLOT( initializeIMAPActions() ) ); - connect( kmkernel->acctMgr(), TQT_SIGNAL( accountRemoved( KMAccount* ) ), - this, TQT_SLOT( initializeIMAPActions() ) ); + connect( kmkernel->acctMgr(), TQ_SIGNAL( accountAdded( KMAccount* ) ), + this, TQ_SLOT( initializeIMAPActions() ) ); + connect( kmkernel->acctMgr(), TQ_SIGNAL( accountRemoved( KMAccount* ) ), + this, TQ_SLOT( initializeIMAPActions() ) ); - connect(kmkernel, TQT_SIGNAL( configChanged() ), - this, TQT_SLOT( slotConfigChanged() )); + connect(kmkernel, TQ_SIGNAL( configChanged() ), + this, TQ_SLOT( slotConfigChanged() )); // display the full path to the folder in the caption - connect(mFolderTree, TQT_SIGNAL(currentChanged(TQListViewItem*)), - this, TQT_SLOT(slotChangeCaption(TQListViewItem*))); - connect(mFolderTree, TQT_SIGNAL(selectionChanged()), - TQT_SLOT(updateFolderMenu()) ); - connect( mFolderTree, TQT_SIGNAL(syncStateChanged()), - TQT_SLOT(updateFolderMenu()) ); + connect(mFolderTree, TQ_SIGNAL(currentChanged(TQListViewItem*)), + this, TQ_SLOT(slotChangeCaption(TQListViewItem*))); + connect(mFolderTree, TQ_SIGNAL(selectionChanged()), + TQ_SLOT(updateFolderMenu()) ); + connect( mFolderTree, TQ_SIGNAL(syncStateChanged()), + TQ_SLOT(updateFolderMenu()) ); - connect(kmkernel->folderMgr(), TQT_SIGNAL(folderRemoved(KMFolder*)), - this, TQT_SLOT(slotFolderRemoved(KMFolder*))); + connect(kmkernel->folderMgr(), TQ_SIGNAL(folderRemoved(KMFolder*)), + this, TQ_SLOT(slotFolderRemoved(KMFolder*))); - connect(kmkernel->imapFolderMgr(), TQT_SIGNAL(folderRemoved(KMFolder*)), - this, TQT_SLOT(slotFolderRemoved(KMFolder*))); + connect(kmkernel->imapFolderMgr(), TQ_SIGNAL(folderRemoved(KMFolder*)), + this, TQ_SLOT(slotFolderRemoved(KMFolder*))); - connect(kmkernel->dimapFolderMgr(), TQT_SIGNAL(folderRemoved(KMFolder*)), - this, TQT_SLOT(slotFolderRemoved(KMFolder*))); + connect(kmkernel->dimapFolderMgr(), TQ_SIGNAL(folderRemoved(KMFolder*)), + this, TQ_SLOT(slotFolderRemoved(KMFolder*))); - connect(kmkernel->searchFolderMgr(), TQT_SIGNAL(folderRemoved(KMFolder*)), - this, TQT_SLOT(slotFolderRemoved(KMFolder*))); + connect(kmkernel->searchFolderMgr(), TQ_SIGNAL(folderRemoved(KMFolder*)), + this, TQ_SLOT(slotFolderRemoved(KMFolder*))); - connect( kmkernel, TQT_SIGNAL( onlineStatusChanged( GlobalSettings::EnumNetworkState::type ) ), - this, TQT_SLOT( slotUpdateOnlineStatus( GlobalSettings::EnumNetworkState::type ) ) ); + connect( kmkernel, TQ_SIGNAL( onlineStatusChanged( GlobalSettings::EnumNetworkState::type ) ), + this, TQ_SLOT( slotUpdateOnlineStatus( GlobalSettings::EnumNetworkState::type ) ) ); toggleSystemTray(); @@ -249,9 +249,9 @@ KMMainWidget::KMMainWidget(TQWidget *parent, const char *name, KStatusBar *sb = mainWin ? mainWin->statusBar() : 0; mVacationScriptIndicator = new KStatusBarLabel( TQString(), 0, sb ); mVacationScriptIndicator->hide(); - connect( mVacationScriptIndicator, TQT_SIGNAL(itemReleased(int)), TQT_SLOT(slotEditVacation()) ); + connect( mVacationScriptIndicator, TQ_SIGNAL(itemReleased(int)), TQ_SLOT(slotEditVacation()) ); if ( GlobalSettings::checkOutOfOfficeOnStartup() ) - TQTimer::singleShot( 0, TQT_TQOBJECT(this), TQT_SLOT(slotCheckVacation()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(slotCheckVacation()) ); } @@ -468,7 +468,7 @@ void KMMainWidget::readConfig(void) bool check = config->readBoolEntry("checkmail-startup", false); if (check) // do it after building the kmmainwin, so that the progressdialog is available - TQTimer::singleShot( 0, TQT_TQOBJECT(this), TQT_SLOT( slotCheckMail() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( slotCheckMail() ) ); } } @@ -558,9 +558,9 @@ void KMMainWidget::createWidgets(void) if ( mLongFolderList ) { // superior splitter: folder tree vs. rest // inferior splitter: headers vs. message vs. mime tree - mPanner1 = new TQSplitter( Qt::Horizontal, this, "panner 1" ); + mPanner1 = new TQSplitter( TQt::Horizontal, this, "panner 1" ); mPanner1->setOpaqueResize( opaqueResize ); - Qt::Orientation orientation = mReaderWindowBelow ? Qt::Vertical : Qt::Horizontal; + TQt::Orientation orientation = mReaderWindowBelow ? TQt::Vertical : TQt::Horizontal; mPanner2 = new TQSplitter( orientation, mPanner1, "panner 2" ); mPanner2->setOpaqueResize( opaqueResize ); mPanner2->setChildrenCollapsible( false ); @@ -569,10 +569,10 @@ void KMMainWidget::createWidgets(void) } else /* !mLongFolderList */ { // superior splitter: ( folder tree + headers ) vs. message vs. mime // inferior splitter: folder tree vs. headers - mPanner1 = new TQSplitter( Qt::Vertical, this, "panner 1" ); + mPanner1 = new TQSplitter( TQt::Vertical, this, "panner 1" ); mPanner1->setOpaqueResize( opaqueResize ); mPanner1->setChildrenCollapsible( false ); - mPanner2 = new TQSplitter( Qt::Horizontal, mPanner1, "panner 2" ); + mPanner2 = new TQSplitter( TQt::Horizontal, mPanner1, "panner 2" ); mPanner2->setOpaqueResize( opaqueResize ); headerParent = mFolderViewParent = mPanner2; mimeParent = messageParent = mPanner1; @@ -609,78 +609,78 @@ void KMMainWidget::createWidgets(void) actionCollection(), "headers quick search line" ); #endif label->setBuddy( mQuickSearchLine ); - connect( mQuickSearchLine, TQT_SIGNAL( requestFullSearch() ), - this, TQT_SLOT( slotRequestFullSearchFromQuickSearch() ) ); + connect( mQuickSearchLine, TQ_SIGNAL( requestFullSearch() ), + this, TQ_SLOT( slotRequestFullSearchFromQuickSearch() ) ); mSearchToolBar->setStretchableWidget( mQuickSearchLine ); - connect( mHeaders, TQT_SIGNAL( messageListUpdated() ), - mQuickSearchLine, TQT_SLOT( updateSearch() ) ); + connect( mHeaders, TQ_SIGNAL( messageListUpdated() ), + mQuickSearchLine, TQ_SLOT( updateSearch() ) ); if ( !GlobalSettings::self()->quickSearchActive() ) mSearchToolBar->hide(); if (mReaderWindowActive) { - connect(mHeaders, TQT_SIGNAL(selected(KMMessage*)), - this, TQT_SLOT(slotMsgSelected(KMMessage*))); + connect(mHeaders, TQ_SIGNAL(selected(KMMessage*)), + this, TQ_SLOT(slotMsgSelected(KMMessage*))); } - connect(mHeaders, TQT_SIGNAL(activated(KMMessage*)), - this, TQT_SLOT(slotMsgActivated(KMMessage*))); - connect( mHeaders, TQT_SIGNAL( selectionChanged() ), - TQT_SLOT( startUpdateMessageActionsTimer() ) ); + connect(mHeaders, TQ_SIGNAL(activated(KMMessage*)), + this, TQ_SLOT(slotMsgActivated(KMMessage*))); + connect( mHeaders, TQ_SIGNAL( selectionChanged() ), + TQ_SLOT( startUpdateMessageActionsTimer() ) ); TQAccel *accel = actionCollection()->tdeaccel(); accel->connectItem(accel->insertItem(SHIFT+Key_Left), - mHeaders, TQT_SLOT(selectPrevMessage())); + mHeaders, TQ_SLOT(selectPrevMessage())); accel->connectItem(accel->insertItem(SHIFT+Key_Right), - mHeaders, TQT_SLOT(selectNextMessage())); + mHeaders, TQ_SLOT(selectNextMessage())); if (mReaderWindowActive) { - mMsgView = new KMReaderWin(messageParent, TQT_TQWIDGET(this), actionCollection(), 0 ); + mMsgView = new KMReaderWin(messageParent, this, actionCollection(), 0 ); if ( mMsgActions ) { mMsgActions->setMessageView( mMsgView ); } - connect(mMsgView, TQT_SIGNAL(replaceMsgByUnencryptedVersion()), - this, TQT_SLOT(slotReplaceMsgByUnencryptedVersion())); - connect(mMsgView, TQT_SIGNAL(popupMenu(KMMessage&,const KURL&,const TQPoint&)), - this, TQT_SLOT(slotMsgPopup(KMMessage&,const KURL&,const TQPoint&))); - connect(mMsgView, TQT_SIGNAL(urlClicked(const KURL&,int)), - mMsgView, TQT_SLOT(slotUrlClicked())); - connect(mHeaders, TQT_SIGNAL(maybeDeleting()), - mMsgView, TQT_SLOT(clearCache())); - connect(mMsgView, TQT_SIGNAL(noDrag()), - mHeaders, TQT_SLOT(slotNoDrag())); + connect(mMsgView, TQ_SIGNAL(replaceMsgByUnencryptedVersion()), + this, TQ_SLOT(slotReplaceMsgByUnencryptedVersion())); + connect(mMsgView, TQ_SIGNAL(popupMenu(KMMessage&,const KURL&,const TQPoint&)), + this, TQ_SLOT(slotMsgPopup(KMMessage&,const KURL&,const TQPoint&))); + connect(mMsgView, TQ_SIGNAL(urlClicked(const KURL&,int)), + mMsgView, TQ_SLOT(slotUrlClicked())); + connect(mHeaders, TQ_SIGNAL(maybeDeleting()), + mMsgView, TQ_SLOT(clearCache())); + connect(mMsgView, TQ_SIGNAL(noDrag()), + mHeaders, TQ_SLOT(slotNoDrag())); accel->connectItem(accel->insertItem(Key_Up), - mMsgView, TQT_SLOT(slotScrollUp())); + mMsgView, TQ_SLOT(slotScrollUp())); accel->connectItem(accel->insertItem(Key_Down), - mMsgView, TQT_SLOT(slotScrollDown())); + mMsgView, TQ_SLOT(slotScrollDown())); accel->connectItem(accel->insertItem(Key_Prior), - mMsgView, TQT_SLOT(slotScrollPrior())); + mMsgView, TQ_SLOT(slotScrollPrior())); accel->connectItem(accel->insertItem(Key_Next), - mMsgView, TQT_SLOT(slotScrollNext())); + mMsgView, TQ_SLOT(slotScrollNext())); } else { mMsgView = NULL; } TDEAction *action; - mMoveMsgToFolderAction = new TDEAction( i18n("Move Message to Folder"), Key_M, TQT_TQOBJECT(this), - TQT_SLOT(slotMoveMsg()), actionCollection(), + mMoveMsgToFolderAction = new TDEAction( i18n("Move Message to Folder"), Key_M, this, + TQ_SLOT(slotMoveMsg()), actionCollection(), "move_message_to_folder" ); mMoveMsgToFolderAction->plugAccel( actionCollection()->tdeaccel() ); - action = new TDEAction( i18n("Copy Message to Folder"), Key_C, TQT_TQOBJECT(this), - TQT_SLOT(slotCopyMsg()), actionCollection(), + action = new TDEAction( i18n("Copy Message to Folder"), Key_C, this, + TQ_SLOT(slotCopyMsg()), actionCollection(), "copy_message_to_folder" ); action->plugAccel( actionCollection()->tdeaccel() ); - action = new TDEAction( i18n("Jump to Folder"), Key_J, TQT_TQOBJECT(this), - TQT_SLOT(slotJumpToFolder()), actionCollection(), + action = new TDEAction( i18n("Jump to Folder"), Key_J, this, + TQ_SLOT(slotJumpToFolder()), actionCollection(), "jump_to_folder" ); action->plugAccel( actionCollection()->tdeaccel() ); // create list of folders - mFolderViewSplitter = new TQSplitter( Qt::Vertical, mFolderViewParent ); + mFolderViewSplitter = new TQSplitter( TQt::Vertical, mFolderViewParent ); mFolderViewSplitter->setOpaqueResize( TDEGlobalSettings::opaqueResize() ); mFavoriteFolderView = new KMail::FavoriteFolderView( this, mFolderViewSplitter ); if ( mFavoritesCheckMailAction ) - connect( mFavoritesCheckMailAction, TQT_SIGNAL(activated()), mFavoriteFolderView, TQT_SLOT(checkMail()) ); + connect( mFavoritesCheckMailAction, TQ_SIGNAL(activated()), mFavoriteFolderView, TQ_SLOT(checkMail()) ); TQWidget *folderTreeParent = mFolderViewParent; if ( GlobalSettings::enableFavoriteFolderView() ) { folderTreeParent = mFolderViewSplitter; @@ -690,72 +690,72 @@ void KMMainWidget::createWidgets(void) if ( !GlobalSettings::enableFavoriteFolderView() ) { mFolderView = mFolderTree; } - connect( mFolderTree, TQT_SIGNAL(folderSelected(KMFolder*)), - mFavoriteFolderView, TQT_SLOT(folderTreeSelectionChanged(KMFolder*)) ); - - connect(mFolderTree, TQT_SIGNAL(folderSelected(KMFolder*)), - this, TQT_SLOT(folderSelected(KMFolder*))); - connect( mFolderTree, TQT_SIGNAL( folderSelected( KMFolder* ) ), - mQuickSearchLine, TQT_SLOT( reset() ) ); - connect(mFolderTree, TQT_SIGNAL(folderSelectedUnread(KMFolder*)), - this, TQT_SLOT(folderSelectedUnread(KMFolder*))); - connect(mFolderTree, TQT_SIGNAL(folderDrop(KMFolder*)), - this, TQT_SLOT(slotMoveMsgToFolder(KMFolder*))); - connect(mFolderTree, TQT_SIGNAL(folderDropCopy(KMFolder*)), - this, TQT_SLOT(slotCopyMsgToFolder(KMFolder*))); - connect(mFolderTree, TQT_SIGNAL(columnsChanged()), - this, TQT_SLOT(slotFolderTreeColumnsChanged())); + connect( mFolderTree, TQ_SIGNAL(folderSelected(KMFolder*)), + mFavoriteFolderView, TQ_SLOT(folderTreeSelectionChanged(KMFolder*)) ); + + connect(mFolderTree, TQ_SIGNAL(folderSelected(KMFolder*)), + this, TQ_SLOT(folderSelected(KMFolder*))); + connect( mFolderTree, TQ_SIGNAL( folderSelected( KMFolder* ) ), + mQuickSearchLine, TQ_SLOT( reset() ) ); + connect(mFolderTree, TQ_SIGNAL(folderSelectedUnread(KMFolder*)), + this, TQ_SLOT(folderSelectedUnread(KMFolder*))); + connect(mFolderTree, TQ_SIGNAL(folderDrop(KMFolder*)), + this, TQ_SLOT(slotMoveMsgToFolder(KMFolder*))); + connect(mFolderTree, TQ_SIGNAL(folderDropCopy(KMFolder*)), + this, TQ_SLOT(slotCopyMsgToFolder(KMFolder*))); + connect(mFolderTree, TQ_SIGNAL(columnsChanged()), + this, TQ_SLOT(slotFolderTreeColumnsChanged())); if ( mFavoriteFolderView ) { - connect( mFavoriteFolderView, TQT_SIGNAL(folderDrop(KMFolder*)), TQT_SLOT(slotMoveMsgToFolder(KMFolder*)) ); - connect( mFavoriteFolderView, TQT_SIGNAL(folderDropCopy(KMFolder*)), TQT_SLOT(slotCopyMsgToFolder(KMFolder*)) ); + connect( mFavoriteFolderView, TQ_SIGNAL(folderDrop(KMFolder*)), TQ_SLOT(slotMoveMsgToFolder(KMFolder*)) ); + connect( mFavoriteFolderView, TQ_SIGNAL(folderDropCopy(KMFolder*)), TQ_SLOT(slotCopyMsgToFolder(KMFolder*)) ); } //Commands not worthy of menu items, but that deserve configurable keybindings mRemoveDuplicatesAction = new TDEAction( - i18n("Remove Duplicate Messages"), CTRL+Key_Asterisk, TQT_TQOBJECT(this), - TQT_SLOT(removeDuplicates()), actionCollection(), "remove_duplicate_messages"); + i18n("Remove Duplicate Messages"), CTRL+Key_Asterisk, this, + TQ_SLOT(removeDuplicates()), actionCollection(), "remove_duplicate_messages"); action->plugAccel( actionCollection()->tdeaccel() ); action = new TDEAction( i18n("Abort Current Operation"), Key_Escape, ProgressManager::instance(), - TQT_SLOT(slotAbortAll()), actionCollection(), "cancel" ); + TQ_SLOT(slotAbortAll()), actionCollection(), "cancel" ); action->plugAccel( actionCollection()->tdeaccel() ); action = new TDEAction( - i18n("Focus on Next Folder"), CTRL+Key_Right, TQT_TQOBJECT(mFolderTree), - TQT_SLOT(incCurrentFolder()), actionCollection(), "inc_current_folder"); + i18n("Focus on Next Folder"), CTRL+Key_Right, mFolderTree, + TQ_SLOT(incCurrentFolder()), actionCollection(), "inc_current_folder"); action->plugAccel( actionCollection()->tdeaccel() ); action = new TDEAction( - i18n("Focus on Previous Folder"), CTRL+Key_Left, TQT_TQOBJECT(mFolderTree), - TQT_SLOT(decCurrentFolder()), actionCollection(), "dec_current_folder"); + i18n("Focus on Previous Folder"), CTRL+Key_Left, mFolderTree, + TQ_SLOT(decCurrentFolder()), actionCollection(), "dec_current_folder"); action->plugAccel( actionCollection()->tdeaccel() ); action = new TDEAction( - i18n("Select Folder with Focus"), CTRL+Key_Space, TQT_TQOBJECT(mFolderTree), - TQT_SLOT(selectCurrentFolder()), actionCollection(), "select_current_folder"); + i18n("Select Folder with Focus"), CTRL+Key_Space, mFolderTree, + TQ_SLOT(selectCurrentFolder()), actionCollection(), "select_current_folder"); action->plugAccel( actionCollection()->tdeaccel() ); action = new TDEAction( - i18n("Focus on Next Message"), ALT+Key_Right, TQT_TQOBJECT(mHeaders), - TQT_SLOT(incCurrentMessage()), actionCollection(), "inc_current_message"); + i18n("Focus on Next Message"), ALT+Key_Right, mHeaders, + TQ_SLOT(incCurrentMessage()), actionCollection(), "inc_current_message"); action->plugAccel( actionCollection()->tdeaccel() ); action = new TDEAction( - i18n("Focus on Previous Message"), ALT+Key_Left, TQT_TQOBJECT(mHeaders), - TQT_SLOT(decCurrentMessage()), actionCollection(), "dec_current_message"); + i18n("Focus on Previous Message"), ALT+Key_Left, mHeaders, + TQ_SLOT(decCurrentMessage()), actionCollection(), "dec_current_message"); action->plugAccel( actionCollection()->tdeaccel() ); action = new TDEAction( - i18n("Select Message with Focus"), ALT+Key_Space, TQT_TQOBJECT(mHeaders), - TQT_SLOT( selectCurrentMessage() ), actionCollection(), "select_current_message"); + i18n("Select Message with Focus"), ALT+Key_Space, mHeaders, + TQ_SLOT( selectCurrentMessage() ), actionCollection(), "select_current_message"); action->plugAccel( actionCollection()->tdeaccel() ); - connect( kmkernel->outboxFolder(), TQT_SIGNAL( msgRemoved(int, TQString) ), - TQT_SLOT( startUpdateMessageActionsTimer() ) ); - connect( kmkernel->outboxFolder(), TQT_SIGNAL( msgAdded(int) ), - TQT_SLOT( startUpdateMessageActionsTimer() ) ); + connect( kmkernel->outboxFolder(), TQ_SIGNAL( msgRemoved(int, TQString) ), + TQ_SLOT( startUpdateMessageActionsTimer() ) ); + connect( kmkernel->outboxFolder(), TQ_SIGNAL( msgAdded(int) ), + TQ_SLOT( startUpdateMessageActionsTimer() ) ); } @@ -764,8 +764,8 @@ void KMMainWidget::activatePanners(void) { if (mMsgView) { TQObject::disconnect( mMsgView->copyAction(), - TQT_SIGNAL( activated() ), - mMsgView, TQT_SLOT( slotCopySelectedText() )); + TQ_SIGNAL( activated() ), + mMsgView, TQ_SLOT( slotCopySelectedText() )); } setupFolderView(); @@ -800,8 +800,8 @@ void KMMainWidget::activatePanners(void) if (mMsgView) { TQObject::connect( mMsgView->copyAction(), - TQT_SIGNAL( activated() ), - mMsgView, TQT_SLOT( slotCopySelectedText() )); + TQ_SIGNAL( activated() ), + mMsgView, TQ_SLOT( slotCopySelectedText() )); } } @@ -825,8 +825,8 @@ void KMMainWidget::slotSearch() if(!mSearchWin) { mSearchWin = new SearchWindow(this, "Search", mFolder, false); - connect(mSearchWin, TQT_SIGNAL(destroyed()), - this, TQT_SLOT(slotSearchClosed())); + connect(mSearchWin, TQ_SIGNAL(destroyed()), + this, TQ_SLOT(slotSearchClosed())); } else { @@ -856,7 +856,7 @@ void KMMainWidget::slotFind() //----------------------------------------------------------------------------- void KMMainWidget::slotHelp() { - kapp->invokeHelp(); + tdeApp->invokeHelp(); } @@ -928,7 +928,7 @@ void KMMainWidget::slotMailChecked( bool newMail, bool sendOnCheck, if ( !newMail || newInFolder.isEmpty() ) return; - kapp->dcopClient()->emitDCOPSignal( "unreadCountChanged()", TQByteArray() ); + tdeApp->dcopClient()->emitDCOPSignal( "unreadCountChanged()", TQByteArray() ); // build summary for new mail message bool showNotification = false; @@ -1386,7 +1386,7 @@ void KMMainWidget::slotOverrideHtmlLoadExt() } mFolderHtmlLoadExtPref = !mFolderHtmlLoadExtPref; if (mMsgView) { - mMsgView->setHtmlLoadExtOverride(mFolderHtmlLoadExtPref); + mMsgView->setHtmlLoadExtDefault(mFolderHtmlLoadExtPref); mMsgView->update( true ); } } @@ -1716,8 +1716,8 @@ void KMMainWidget::slotCheckVacation() if ( !kmkernel->askToGoOnline() ) return; - Vacation *vac = new Vacation( TQT_TQOBJECT(this), true /* check only */ ); - connect( vac, TQT_SIGNAL(scriptActive(bool)), TQT_SLOT(updateVactionScripStatus(bool)) ); + Vacation *vac = new Vacation( this, true /* check only */ ); + connect( vac, TQ_SIGNAL(scriptActive(bool)), TQ_SLOT(updateVactionScripStatus(bool)) ); } void KMMainWidget::slotEditVacation() @@ -1729,10 +1729,10 @@ void KMMainWidget::slotEditVacation() if ( mVacation ) return; - mVacation = new Vacation( TQT_TQOBJECT(this) ); - connect( mVacation, TQT_SIGNAL(scriptActive(bool)), TQT_SLOT(updateVactionScripStatus(bool)) ); + mVacation = new Vacation( this ); + connect( mVacation, TQ_SIGNAL(scriptActive(bool)), TQ_SLOT(updateVactionScripStatus(bool)) ); if ( mVacation->isUsable() ) { - connect( mVacation, TQT_SIGNAL(result(bool)), mVacation, TQT_SLOT(deleteLater()) ); + connect( mVacation, TQ_SIGNAL(result(bool)), mVacation, TQ_SLOT(deleteLater()) ); } else { TQString msg = i18n("KMail's Out of Office Reply functionality relies on " "server-side filtering. You have not yet configured an " @@ -1838,7 +1838,7 @@ void KMMainWidget::slotPrintMsg() //----------------------------------------------------------------------------- void KMMainWidget::setupForwardActions() { - disconnect( mForwardActionMenu, TQT_SIGNAL( activated() ), 0, 0 ); + disconnect( mForwardActionMenu, TQ_SIGNAL( activated() ), 0, 0 ); mForwardActionMenu->remove( mForwardInlineAction ); mForwardActionMenu->remove( mForwardAttachedAction ); @@ -1847,16 +1847,16 @@ void KMMainWidget::setupForwardActions() mForwardActionMenu->insert( mForwardAttachedAction, 1 ); mForwardInlineAction->setShortcut( Key_F ); mForwardAttachedAction->setShortcut( SHIFT+Key_F ); - connect( mForwardActionMenu, TQT_SIGNAL(activated()), TQT_TQOBJECT(this), - TQT_SLOT(slotForwardInlineMsg()) ); + connect( mForwardActionMenu, TQ_SIGNAL(activated()), this, + TQ_SLOT(slotForwardInlineMsg()) ); } else { mForwardActionMenu->insert( mForwardAttachedAction, 0 ); mForwardActionMenu->insert( mForwardInlineAction, 1 ); mForwardInlineAction->setShortcut( SHIFT+Key_F ); mForwardAttachedAction->setShortcut( Key_F ); - connect( mForwardActionMenu, TQT_SIGNAL(activated()), TQT_TQOBJECT(this), - TQT_SLOT(slotForwardAttachedMsg()) ); + connect( mForwardActionMenu, TQ_SIGNAL(activated()), this, + TQ_SLOT(slotForwardAttachedMsg()) ); } } @@ -2025,14 +2025,14 @@ void KMMainWidget::folderSelected( KMFolder* aFolder, bool forceJumpToUnread ) if ( newFolder ) writeFolderConfig(); if ( mFolder ) { - disconnect( mFolder, TQT_SIGNAL( changed() ), - this, TQT_SLOT( updateMarkAsReadAction() ) ); - disconnect( mFolder, TQT_SIGNAL( msgHeaderChanged( KMFolder*, int ) ), - this, TQT_SLOT( updateMarkAsReadAction() ) ); - disconnect( mFolder, TQT_SIGNAL( msgAdded( int ) ), - this, TQT_SLOT( updateMarkAsReadAction() ) ); - disconnect( mFolder, TQT_SIGNAL( msgRemoved( KMFolder * ) ), - this, TQT_SLOT( updateMarkAsReadAction() ) ); + disconnect( mFolder, TQ_SIGNAL( changed() ), + this, TQ_SLOT( updateMarkAsReadAction() ) ); + disconnect( mFolder, TQ_SIGNAL( msgHeaderChanged( KMFolder*, int ) ), + this, TQ_SLOT( updateMarkAsReadAction() ) ); + disconnect( mFolder, TQ_SIGNAL( msgAdded( int ) ), + this, TQ_SLOT( updateMarkAsReadAction() ) ); + disconnect( mFolder, TQ_SIGNAL( msgRemoved( KMFolder * ) ), + this, TQ_SLOT( updateMarkAsReadAction() ) ); } mFolder = aFolder; @@ -2049,8 +2049,8 @@ void KMMainWidget::folderSelected( KMFolder* aFolder, bool forceJumpToUnread ) imap->open("mainwidget"); // will be closed in the folderSelected slot // first get new headers before we select the folder imap->setSelected( true ); - connect( imap, TQT_SIGNAL( folderComplete( KMFolderImap*, bool ) ), - this, TQT_SLOT( folderSelected() ) ); + connect( imap, TQ_SIGNAL( folderComplete( KMFolderImap*, bool ) ), + this, TQ_SLOT( folderSelected() ) ); imap->getAndCheckFolder(); mHeaders->setFolder( 0 ); updateFolderMenu(); @@ -2059,32 +2059,32 @@ void KMMainWidget::folderSelected( KMFolder* aFolder, bool forceJumpToUnread ) // Set a timer to show a splash screen if fetching folder contents // takes more than the amount of seconds configured in the kmailrc (default 1000 msec) mShowBusySplashTimer = new TQTimer( this ); - connect( mShowBusySplashTimer, TQT_SIGNAL( timeout() ), TQT_TQOBJECT(this), TQT_SLOT( slotShowBusySplash() ) ); + connect( mShowBusySplashTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( slotShowBusySplash() ) ); mShowBusySplashTimer->start( GlobalSettings::self()->folderLoadingTimeout(), true ); return; } else { // the folder is complete now - so go ahead - disconnect( imap, TQT_SIGNAL( folderComplete( KMFolderImap*, bool ) ), - this, TQT_SLOT( folderSelected() ) ); + disconnect( imap, TQ_SIGNAL( folderComplete( KMFolderImap*, bool ) ), + this, TQ_SLOT( folderSelected() ) ); forceJumpToUnread = mForceJumpToUnread; } } if ( mFolder ) { // == 0 -> pointing to toplevel ("Welcome to KMail") folder - connect( mFolder, TQT_SIGNAL( changed() ), - this, TQT_SLOT( updateMarkAsReadAction() ) ); - connect( mFolder, TQT_SIGNAL( msgHeaderChanged( KMFolder*, int ) ), - this, TQT_SLOT( updateMarkAsReadAction() ) ); - connect( mFolder, TQT_SIGNAL( msgAdded( int ) ), - this, TQT_SLOT( updateMarkAsReadAction() ) ); - connect( mFolder, TQT_SIGNAL( msgRemoved(KMFolder *) ), - this, TQT_SLOT( updateMarkAsReadAction() ) ); + connect( mFolder, TQ_SIGNAL( changed() ), + this, TQ_SLOT( updateMarkAsReadAction() ) ); + connect( mFolder, TQ_SIGNAL( msgHeaderChanged( KMFolder*, int ) ), + this, TQ_SLOT( updateMarkAsReadAction() ) ); + connect( mFolder, TQ_SIGNAL( msgAdded( int ) ), + this, TQ_SLOT( updateMarkAsReadAction() ) ); + connect( mFolder, TQ_SIGNAL( msgRemoved(KMFolder *) ), + this, TQ_SLOT( updateMarkAsReadAction() ) ); } readFolderConfig(); if (mMsgView) { mMsgView->setHtmlOverride(mFolderHtmlPref); - mMsgView->setHtmlLoadExtOverride(mFolderHtmlLoadExtPref); + mMsgView->setHtmlLoadExtDefault(mFolderHtmlLoadExtPref); } mHeaders->setFolder( mFolder, forceJumpToUnread ); updateMessageActions(); @@ -2132,15 +2132,16 @@ void KMMainWidget::slotMsgSelected(KMMessage *msg) } mJob = msg->parent()->createJob( msg, FolderJob::tGetMessage, 0, "STRUCTURE", mMsgView->attachmentStrategy() ); - connect(mJob, TQT_SIGNAL(messageRetrieved(KMMessage*)), - mMsgView, TQT_SLOT(slotMessageArrived(KMMessage*))); + connect(mJob, TQ_SIGNAL(messageRetrieved(KMMessage*)), + mMsgView, TQ_SLOT(slotMessageArrived(KMMessage*))); mJob->start(); } else { mMsgView->setMsg(msg); } // reset HTML override to the folder setting mMsgView->setHtmlOverride(mFolderHtmlPref); - mMsgView->setHtmlLoadExtOverride(mFolderHtmlLoadExtPref); + mMsgView->setHtmlLoadExtDefault(mFolderHtmlLoadExtPref); + mMsgView->setHtmlLoadExtOverride(false); mMsgView->setDecryptMessageOverwrite( false ); mMsgView->setShowSignatureDetails( false ); } @@ -2317,8 +2318,8 @@ void KMMainWidget::slotMsgActivated(KMMessage *msg) if ( !msg ) return; if ( msg->parent() && !msg->isComplete() ) { FolderJob *job = msg->parent()->createJob( msg ); - connect( job, TQT_SIGNAL( messageRetrieved( KMMessage* ) ), - TQT_SLOT( slotMsgActivated( KMMessage* ) ) ); + connect( job, TQ_SIGNAL( messageRetrieved( KMMessage* ) ), + TQ_SLOT( slotMsgActivated( KMMessage* ) ) ); job->start(); return; } @@ -2508,26 +2509,26 @@ void KMMainWidget::updateCustomTemplateMenus() new TDEActionMenu( i18n("Forward With Custom Template"), "mail_custom_forward", actionCollection(), "custom_forward" ); - TQSignalMapper *mCustomForwardMapper = new TQSignalMapper( TQT_TQOBJECT(this) ); - connect( mCustomForwardMapper, TQT_SIGNAL( mapped( int ) ), - TQT_TQOBJECT(this), TQT_SLOT( slotCustomForwardMsg( int ) ) ); + TQSignalMapper *mCustomForwardMapper = new TQSignalMapper( this ); + connect( mCustomForwardMapper, TQ_SIGNAL( mapped( int ) ), + this, TQ_SLOT( slotCustomForwardMsg( int ) ) ); mForwardActionMenu->insert( mCustomForwardActionMenu ); mCustomReplyActionMenu = new TDEActionMenu( i18n("Reply With Custom Template"), "mail_custom_reply", actionCollection(), "custom_reply" ); - TQSignalMapper *mCustomReplyMapper = new TQSignalMapper( TQT_TQOBJECT(this) ); - connect( mCustomReplyMapper, TQT_SIGNAL( mapped( int ) ), - TQT_TQOBJECT(this), TQT_SLOT( slotCustomReplyToMsg( int ) ) ); + TQSignalMapper *mCustomReplyMapper = new TQSignalMapper( this ); + connect( mCustomReplyMapper, TQ_SIGNAL( mapped( int ) ), + this, TQ_SLOT( slotCustomReplyToMsg( int ) ) ); mMsgActions->replyMenu()->insert( mCustomReplyActionMenu ); mCustomReplyAllActionMenu = new TDEActionMenu( i18n("Reply to All With Custom Template"), "mail_custom_reply_all", actionCollection(), "custom_reply_all" ); - TQSignalMapper *mCustomReplyAllMapper = new TQSignalMapper( TQT_TQOBJECT(this) ); - connect( mCustomReplyAllMapper, TQT_SIGNAL( mapped( int ) ), - TQT_TQOBJECT(this), TQT_SLOT( slotCustomReplyAllToMsg( int ) ) ); + TQSignalMapper *mCustomReplyAllMapper = new TQSignalMapper( this ); + connect( mCustomReplyAllMapper, TQ_SIGNAL( mapped( int ) ), + this, TQ_SLOT( slotCustomReplyAllToMsg( int ) ) ); mMsgActions->replyMenu()->insert( mCustomReplyAllActionMenu ); mCustomTemplates.clear(); @@ -2548,7 +2549,7 @@ void KMMainWidget::updateCustomTemplateMenus() action = new TDEAction( (*it).replace( "&", "&&" ), TDEShortcut( t.shortcut() ), mCustomReplyMapper, - TQT_SLOT( map() ), + TQ_SLOT( map() ), actionCollection(), (*it).utf8() ); mCustomReplyMapper->setMapping( action, idx ); @@ -2560,7 +2561,7 @@ void KMMainWidget::updateCustomTemplateMenus() action = new TDEAction( (*it).replace( "&", "&&" ), TDEShortcut( t.shortcut() ), mCustomReplyAllMapper, - TQT_SLOT( map() ), + TQ_SLOT( map() ), actionCollection(), (*it).utf8() ); mCustomReplyAllMapper->setMapping( action, idx ); @@ -2572,7 +2573,7 @@ void KMMainWidget::updateCustomTemplateMenus() action = new TDEAction( (*it).replace( "&", "&&" ), TDEShortcut( t.shortcut() ), mCustomForwardMapper, - TQT_SLOT( map() ), + TQ_SLOT( map() ), actionCollection(), (*it).utf8() ); mCustomForwardMapper->setMapping( action, idx ); @@ -2584,7 +2585,7 @@ void KMMainWidget::updateCustomTemplateMenus() action = new TDEAction( (*it).replace( "&", "&&" ), TDEShortcut::null(), mCustomReplyMapper, - TQT_SLOT( map() ), + TQ_SLOT( map() ), actionCollection(), (*it).utf8() ); mCustomReplyMapper->setMapping( action, idx ); @@ -2594,7 +2595,7 @@ void KMMainWidget::updateCustomTemplateMenus() action = new TDEAction( (*it).replace( "&", "&&" ), TDEShortcut::null(), mCustomReplyAllMapper, - TQT_SLOT( map() ), + TQ_SLOT( map() ), actionCollection(), (*it).utf8() ); mCustomReplyAllMapper->setMapping( action, idx ); @@ -2604,7 +2605,7 @@ void KMMainWidget::updateCustomTemplateMenus() action = new TDEAction( (*it).replace( "&", "&&" ), TDEShortcut::null(), mCustomForwardMapper, - TQT_SLOT( map() ), + TQ_SLOT( map() ), actionCollection(), (*it).utf8() ); mCustomForwardMapper->setMapping( action, idx ); @@ -2644,53 +2645,53 @@ void KMMainWidget::setupActions() //----- File Menu mSaveAsAction = new TDEAction( i18n("Save &As..."), "document-save", TDEStdAccel::shortcut(TDEStdAccel::Save), - TQT_TQOBJECT(this), TQT_SLOT(slotSaveMsg()), actionCollection(), "file_save_as" ); + this, TQ_SLOT(slotSaveMsg()), actionCollection(), "file_save_as" ); - mOpenAction = KStdAction::open( TQT_TQOBJECT(this), TQT_SLOT( slotOpenMsg() ), + mOpenAction = KStdAction::open( this, TQ_SLOT( slotOpenMsg() ), actionCollection() ); (void) new TDEAction( i18n("&Compact All Folders"), 0, - TQT_TQOBJECT(this), TQT_SLOT(slotCompactAll()), + this, TQ_SLOT(slotCompactAll()), actionCollection(), "compact_all_folders" ); (void) new TDEAction( i18n("&Expire All Folders"), 0, - TQT_TQOBJECT(this), TQT_SLOT(slotExpireAll()), + this, TQ_SLOT(slotExpireAll()), actionCollection(), "expire_all_folders" ); (void) new TDEAction( i18n("&Refresh Local IMAP Cache"), "refresh", - TQT_TQOBJECT(this), TQT_SLOT(slotInvalidateIMAPFolders()), + this, TQ_SLOT(slotInvalidateIMAPFolders()), actionCollection(), "file_invalidate_imap_cache" ); (void) new TDEAction( i18n("Empty All &Trash Folders"), 0, - KMKernel::self(), TQT_SLOT(slotEmptyTrash()), + KMKernel::self(), TQ_SLOT(slotEmptyTrash()), actionCollection(), "empty_trash" ); (void) new TDEAction( i18n("Check &Mail"), "mail_get", CTRL+Key_L, - TQT_TQOBJECT(this), TQT_SLOT(slotCheckMail()), + this, TQ_SLOT(slotCheckMail()), actionCollection(), "check_mail" ); mFavoritesCheckMailAction = new TDEAction( i18n("Check Mail in Favorite Folders"), "mail_get", CTRL+SHIFT+Key_L, 0, 0, actionCollection(), "favorite_check_mail" ); if ( mFavoriteFolderView ) - connect( mFavoritesCheckMailAction, TQT_SIGNAL(activated()), mFavoriteFolderView, TQT_SLOT(checkMail()) ); + connect( mFavoritesCheckMailAction, TQ_SIGNAL(activated()), mFavoriteFolderView, TQ_SLOT(checkMail()) ); TDEActionMenu *actActionMenu = new TDEActionMenu( i18n("Check Mail &In"), "mail_get", actionCollection(), "check_mail_in" ); actActionMenu->setDelayed(true); //needed for checking "all accounts" - connect(actActionMenu,TQT_SIGNAL(activated()),this,TQT_SLOT(slotCheckMail())); + connect(actActionMenu,TQ_SIGNAL(activated()),this,TQ_SLOT(slotCheckMail())); mActMenu = actActionMenu->popupMenu(); - connect(mActMenu,TQT_SIGNAL(activated(int)),this,TQT_SLOT(slotCheckOneAccount(int))); - connect(mActMenu,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(getAccountMenu())); + connect(mActMenu,TQ_SIGNAL(activated(int)),this,TQ_SLOT(slotCheckOneAccount(int))); + connect(mActMenu,TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(getAccountMenu())); - (void) new TDEAction( i18n("&Send Queued Messages"), "mail-send", 0, TQT_TQOBJECT(this), - TQT_SLOT(slotSendQueued()), actionCollection(), "send_queued"); + (void) new TDEAction( i18n("&Send Queued Messages"), "mail-send", 0, this, + TQ_SLOT(slotSendQueued()), actionCollection(), "send_queued"); - (void) new TDEAction( i18n("Online Status (unknown)"), "online_status", 0, TQT_TQOBJECT(this), - TQT_SLOT(slotOnlineStatus()), actionCollection(), "online_status"); + (void) new TDEAction( i18n("Online Status (unknown)"), "online_status", 0, this, + TQ_SLOT(slotOnlineStatus()), actionCollection(), "online_status"); TDEActionMenu *sendActionMenu = new TDEActionMenu( i18n("Send Queued Messages Via"), "mail_send_via", actionCollection(), @@ -2698,166 +2699,166 @@ void KMMainWidget::setupActions() sendActionMenu->setDelayed(true); mSendMenu = sendActionMenu->popupMenu(); - connect(mSendMenu,TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(slotSendQueuedVia(int))); - connect(mSendMenu,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(getTransportMenu())); + connect(mSendMenu,TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotSendQueuedVia(int))); + connect(mSendMenu,TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(getTransportMenu())); TDEAction *act; //----- Tools menu if (parent()->inherits("KMMainWin")) { - act = new TDEAction( i18n("&Address Book..."), "contents", 0, TQT_TQOBJECT(this), - TQT_SLOT(slotAddrBook()), actionCollection(), "addressbook" ); + act = new TDEAction( i18n("&Address Book..."), "contents", 0, this, + TQ_SLOT(slotAddrBook()), actionCollection(), "addressbook" ); if (TDEStandardDirs::findExe("kaddressbook").isEmpty()) act->setEnabled(false); } - act = new TDEAction( i18n("Certificate Manager..."), "pgp-keys", 0, TQT_TQOBJECT(this), - TQT_SLOT(slotStartCertManager()), actionCollection(), "tools_start_certman"); + act = new TDEAction( i18n("Certificate Manager..."), "pgp-keys", 0, this, + TQ_SLOT(slotStartCertManager()), actionCollection(), "tools_start_certman"); // disable action if no certman binary is around if (TDEStandardDirs::findExe("kleopatra").isEmpty()) act->setEnabled(false); - act = new TDEAction( i18n("GnuPG Log Viewer..."), "pgp-keys", 0, TQT_TQOBJECT(this), - TQT_SLOT(slotStartWatchGnuPG()), actionCollection(), "tools_start_kwatchgnupg"); + act = new TDEAction( i18n("GnuPG Log Viewer..."), "pgp-keys", 0, this, + TQ_SLOT(slotStartWatchGnuPG()), actionCollection(), "tools_start_kwatchgnupg"); // disable action if no kwatchgnupg binary is around if (TDEStandardDirs::findExe("kwatchgnupg").isEmpty()) act->setEnabled(false); - act = new TDEAction( i18n("&Import Messages..."), "document-open", 0, TQT_TQOBJECT(this), - TQT_SLOT(slotImport()), actionCollection(), "import" ); + act = new TDEAction( i18n("&Import Messages..."), "document-open", 0, this, + TQ_SLOT(slotImport()), actionCollection(), "import" ); if (TDEStandardDirs::findExe("kmailcvt").isEmpty()) act->setEnabled(false); #if !defined(NDEBUG) (void) new TDEAction( i18n("&Debug Sieve..."), - "idea", 0, TQT_TQOBJECT(this), TQT_SLOT(slotDebugSieve()), + "idea", 0, this, TQ_SLOT(slotDebugSieve()), actionCollection(), "tools_debug_sieve" ); #endif if ( GlobalSettings::allowOutOfOfficeSettings() ) { (void) new TDEAction( i18n("Edit \"Out of Office\" Replies..."), - "configure", 0, TQT_TQOBJECT(this), TQT_SLOT(slotEditVacation()), + "configure", 0, this, TQ_SLOT(slotEditVacation()), actionCollection(), "tools_edit_vacation" ); } - (void) new TDEAction( i18n("Filter &Log Viewer..."), 0, TQT_TQOBJECT(this), - TQT_SLOT(slotFilterLogViewer()), actionCollection(), "filter_log_viewer" ); + (void) new TDEAction( i18n("Filter &Log Viewer..."), 0, this, + TQ_SLOT(slotFilterLogViewer()), actionCollection(), "filter_log_viewer" ); - (void) new TDEAction( i18n("&Anti-Spam Wizard..."), 0, TQT_TQOBJECT(this), - TQT_SLOT(slotAntiSpamWizard()), actionCollection(), "antiSpamWizard" ); - (void) new TDEAction( i18n("&Anti-Virus Wizard..."), 0, TQT_TQOBJECT(this), - TQT_SLOT(slotAntiVirusWizard()), actionCollection(), "antiVirusWizard" ); + (void) new TDEAction( i18n("&Anti-Spam Wizard..."), 0, this, + TQ_SLOT(slotAntiSpamWizard()), actionCollection(), "antiSpamWizard" ); + (void) new TDEAction( i18n("&Anti-Virus Wizard..."), 0, this, + TQ_SLOT(slotAntiVirusWizard()), actionCollection(), "antiVirusWizard" ); //----- Edit Menu mTrashAction = new TDEAction( KGuiItem( i18n("&Move to Trash"), "edittrash", i18n("Move message to trashcan") ), - Key_Delete, TQT_TQOBJECT(this), TQT_SLOT(slotTrashMsg()), + Key_Delete, this, TQ_SLOT(slotTrashMsg()), actionCollection(), "move_to_trash" ); /* The delete action is nowhere in the gui, by default, so we need to make * sure it is plugged into the TDEAccel now, since that won't happen on * XMLGui construction or manual ->plug(). This is only a problem when run * as a part, though. */ - mDeleteAction = new TDEAction( i18n("&Delete"), "edit-delete", SHIFT+Key_Delete, TQT_TQOBJECT(this), - TQT_SLOT(slotDeleteMsg()), actionCollection(), "delete" ); + mDeleteAction = new TDEAction( i18n("&Delete"), "edit-delete", SHIFT+Key_Delete, this, + TQ_SLOT(slotDeleteMsg()), actionCollection(), "delete" ); mDeleteAction->plugAccel( actionCollection()->tdeaccel() ); mTrashThreadAction = new TDEAction( KGuiItem( i18n("M&ove Thread to Trash"), "edittrash", i18n("Move thread to trashcan") ), - CTRL+Key_Delete, TQT_TQOBJECT(this), TQT_SLOT(slotTrashThread()), + CTRL+Key_Delete, this, TQ_SLOT(slotTrashThread()), actionCollection(), "move_thread_to_trash" ); - mDeleteThreadAction = new TDEAction( i18n("Delete T&hread"), "edit-delete", CTRL+SHIFT+Key_Delete, TQT_TQOBJECT(this), - TQT_SLOT(slotDeleteThread()), actionCollection(), "delete_thread" ); + mDeleteThreadAction = new TDEAction( i18n("Delete T&hread"), "edit-delete", CTRL+SHIFT+Key_Delete, this, + TQ_SLOT(slotDeleteThread()), actionCollection(), "delete_thread" ); - (void) new TDEAction( i18n("&Find Messages..."), "mail_find", Key_S, TQT_TQOBJECT(this), - TQT_SLOT(slotRequestFullSearchFromQuickSearch()), actionCollection(), "search_messages" ); + (void) new TDEAction( i18n("&Find Messages..."), "mail_find", Key_S, this, + TQ_SLOT(slotRequestFullSearchFromQuickSearch()), actionCollection(), "search_messages" ); - mFindInMessageAction = new TDEAction( i18n("&Find in Message..."), "edit-find", TDEStdAccel::shortcut(TDEStdAccel::Find), TQT_TQOBJECT(this), - TQT_SLOT(slotFind()), actionCollection(), "find_in_messages" ); + mFindInMessageAction = new TDEAction( i18n("&Find in Message..."), "edit-find", TDEStdAccel::shortcut(TDEStdAccel::Find), this, + TQ_SLOT(slotFind()), actionCollection(), "find_in_messages" ); - (void) new TDEAction( i18n("Select &All Messages"), TDEStdAccel::selectAll(), TQT_TQOBJECT(this), - TQT_SLOT(slotMarkAll()), actionCollection(), "mark_all_messages" ); + (void) new TDEAction( i18n("Select &All Messages"), TDEStdAccel::selectAll(), this, + TQ_SLOT(slotMarkAll()), actionCollection(), "mark_all_messages" ); //----- Folder Menu - mNewFolderAction = new TDEAction( i18n("&New Folder..."), "folder-new", 0, TQT_TQOBJECT(mFolderTree), - TQT_SLOT(addChildFolder()), actionCollection(), "new_folder" ); + mNewFolderAction = new TDEAction( i18n("&New Folder..."), "folder-new", 0, mFolderTree, + TQ_SLOT(addChildFolder()), actionCollection(), "new_folder" ); - mModifyFolderAction = new TDEAction( i18n("&Properties"), "configure", 0, TQT_TQOBJECT(this), - TQT_SLOT(slotModifyFolder()), actionCollection(), "modify" ); + mModifyFolderAction = new TDEAction( i18n("&Properties"), "configure", 0, this, + TQ_SLOT(slotModifyFolder()), actionCollection(), "modify" ); mFolderMailingListPropertiesAction = new TDEAction( i18n("&Mailing List Management..."), - /*"folder_mailinglist_properties",*/ 0, TQT_TQOBJECT(this), TQT_SLOT( slotFolderMailingListProperties() ), + /*"folder_mailinglist_properties",*/ 0, this, TQ_SLOT( slotFolderMailingListProperties() ), actionCollection(), "folder_mailinglist_properties" ); mFolderShortCutCommandAction = new TDEAction( i18n("&Assign Shortcut..."), "configure_shortcuts", - 0, TQT_TQOBJECT(this), TQT_SLOT( slotFolderShortcutCommand() ), actionCollection(), + 0, this, TQ_SLOT( slotFolderShortcutCommand() ), actionCollection(), "folder_shortcut_command" ); - mMarkAllAsReadAction = new TDEAction( i18n("Mark All Messages as &Read"), "goto", 0, TQT_TQOBJECT(this), - TQT_SLOT(slotMarkAllAsRead()), actionCollection(), "mark_all_as_read" ); + mMarkAllAsReadAction = new TDEAction( i18n("Mark All Messages as &Read"), "goto", 0, this, + TQ_SLOT(slotMarkAllAsRead()), actionCollection(), "mark_all_as_read" ); - mExpireFolderAction = new TDEAction(i18n("&Expiration Settings"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotExpireFolder()), + mExpireFolderAction = new TDEAction(i18n("&Expiration Settings"), 0, this, TQ_SLOT(slotExpireFolder()), actionCollection(), "expire"); - mCompactFolderAction = new TDEAction( i18n("&Compact Folder"), 0, TQT_TQOBJECT(this), - TQT_SLOT(slotCompactFolder()), actionCollection(), "compact" ); + mCompactFolderAction = new TDEAction( i18n("&Compact Folder"), 0, this, + TQ_SLOT(slotCompactFolder()), actionCollection(), "compact" ); mRefreshFolderAction = new TDEAction( i18n("Check Mail &in This Folder"), "reload", - TDEStdAccel::shortcut( TDEStdAccel::Reload ), TQT_TQOBJECT(this), - TQT_SLOT(slotRefreshFolder()), + TDEStdAccel::shortcut( TDEStdAccel::Reload ), this, + TQ_SLOT(slotRefreshFolder()), actionCollection(), "refresh_folder" ); mTroubleshootFolderAction = 0; // set in initializeIMAPActions - mEmptyFolderAction = new TDEAction( "foo" /*set in updateFolderMenu*/, "edittrash", 0, TQT_TQOBJECT(this), - TQT_SLOT(slotEmptyFolder()), actionCollection(), "empty" ); + mEmptyFolderAction = new TDEAction( "foo" /*set in updateFolderMenu*/, "edittrash", 0, this, + TQ_SLOT(slotEmptyFolder()), actionCollection(), "empty" ); - mRemoveFolderAction = new TDEAction( "foo" /*set in updateFolderMenu*/, "edit-delete", 0, TQT_TQOBJECT(this), - TQT_SLOT(slotRemoveFolder()), actionCollection(), "delete_folder" ); + mRemoveFolderAction = new TDEAction( "foo" /*set in updateFolderMenu*/, "edit-delete", 0, this, + TQ_SLOT(slotRemoveFolder()), actionCollection(), "delete_folder" ); - mArchiveFolderAction = new TDEAction( i18n( "&Archive Folder..." ), "document-save", 0, TQT_TQOBJECT(this), - TQT_SLOT( slotArchiveFolder() ), actionCollection(), + mArchiveFolderAction = new TDEAction( i18n( "&Archive Folder..." ), "document-save", 0, this, + TQ_SLOT( slotArchiveFolder() ), actionCollection(), "archive_folder" ); - mPreferHtmlAction = new TDEToggleAction( i18n("Prefer &HTML to Plain Text"), 0, TQT_TQOBJECT(this), - TQT_SLOT(slotOverrideHtml()), actionCollection(), "prefer_html" ); + mPreferHtmlAction = new TDEToggleAction( i18n("Prefer &HTML to Plain Text"), 0, this, + TQ_SLOT(slotOverrideHtml()), actionCollection(), "prefer_html" ); - mPreferHtmlLoadExtAction = new TDEToggleAction( i18n("Load E&xternal References"), 0, TQT_TQOBJECT(this), - TQT_SLOT(slotOverrideHtmlLoadExt()), actionCollection(), "prefer_html_external_refs" ); + mPreferHtmlLoadExtAction = new TDEToggleAction( i18n("Load E&xternal References"), 0, this, + TQ_SLOT(slotOverrideHtmlLoadExt()), actionCollection(), "prefer_html_external_refs" ); - mThreadMessagesAction = new TDEToggleAction( i18n("&Thread Messages"), 0, TQT_TQOBJECT(this), - TQT_SLOT(slotOverrideThread()), actionCollection(), "thread_messages" ); + mThreadMessagesAction = new TDEToggleAction( i18n("&Thread Messages"), 0, this, + TQ_SLOT(slotOverrideThread()), actionCollection(), "thread_messages" ); - mThreadBySubjectAction = new TDEToggleAction( i18n("Thread Messages also by &Subject"), 0, TQT_TQOBJECT(this), - TQT_SLOT(slotToggleSubjectThreading()), actionCollection(), "thread_messages_by_subject" ); + mThreadBySubjectAction = new TDEToggleAction( i18n("Thread Messages also by &Subject"), 0, this, + TQ_SLOT(slotToggleSubjectThreading()), actionCollection(), "thread_messages_by_subject" ); - new TDEAction( i18n("Copy Folder"), "edit-copy", SHIFT+CTRL+Key_C, TQT_TQOBJECT(folderTree()), - TQT_SLOT(copyFolder()), actionCollection(), "copy_folder" ); - new TDEAction( i18n("Cut Folder"), "edit-cut", SHIFT+CTRL+Key_X, TQT_TQOBJECT(folderTree()), - TQT_SLOT(cutFolder()), actionCollection(), "cut_folder" ); - new TDEAction( i18n("Paste Folder"), "edit-paste", SHIFT+CTRL+Key_V, TQT_TQOBJECT(folderTree()), - TQT_SLOT(pasteFolder()), actionCollection(), "paste_folder" ); + new TDEAction( i18n("Copy Folder"), "edit-copy", SHIFT+CTRL+Key_C, folderTree(), + TQ_SLOT(copyFolder()), actionCollection(), "copy_folder" ); + new TDEAction( i18n("Cut Folder"), "edit-cut", SHIFT+CTRL+Key_X, folderTree(), + TQ_SLOT(cutFolder()), actionCollection(), "cut_folder" ); + new TDEAction( i18n("Paste Folder"), "edit-paste", SHIFT+CTRL+Key_V, folderTree(), + TQ_SLOT(pasteFolder()), actionCollection(), "paste_folder" ); - new TDEAction( i18n("Copy Messages"), "edit-copy", ALT+CTRL+Key_C, TQT_TQOBJECT(headers()), - TQT_SLOT(copyMessages()), actionCollection(), "copy_messages" ); - new TDEAction( i18n("Cut Messages"), "edit-cut", ALT+CTRL+Key_X, TQT_TQOBJECT(headers()), - TQT_SLOT(cutMessages()), actionCollection(), "cut_messages" ); - new TDEAction( i18n("Paste Messages"), "edit-paste", ALT+CTRL+Key_V, TQT_TQOBJECT(headers()), - TQT_SLOT(pasteMessages()), actionCollection(), "paste_messages" ); + new TDEAction( i18n("Copy Messages"), "edit-copy", ALT+CTRL+Key_C, headers(), + TQ_SLOT(copyMessages()), actionCollection(), "copy_messages" ); + new TDEAction( i18n("Cut Messages"), "edit-cut", ALT+CTRL+Key_X, headers(), + TQ_SLOT(cutMessages()), actionCollection(), "cut_messages" ); + new TDEAction( i18n("Paste Messages"), "edit-paste", ALT+CTRL+Key_V, headers(), + TQ_SLOT(pasteMessages()), actionCollection(), "paste_messages" ); //----- Message Menu - (void) new TDEAction( i18n("&New Message..."), "mail-message-new", TDEStdAccel::shortcut(TDEStdAccel::New), TQT_TQOBJECT(this), - TQT_SLOT(slotCompose()), actionCollection(), "new_message" ); + (void) new TDEAction( i18n("&New Message..."), "mail-message-new", TDEStdAccel::shortcut(TDEStdAccel::New), this, + TQ_SLOT(slotCompose()), actionCollection(), "new_message" ); mTemplateMenu = new TDEActionMenu( i18n("New Message From &Template"), "document-new", actionCollection(), "new_from_template" ); mTemplateMenu->setDelayed( true ); - connect( mTemplateMenu->popupMenu(), TQT_SIGNAL( aboutToShow() ), TQT_TQOBJECT(this), - TQT_SLOT( slotShowNewFromTemplate() ) ); - connect( mTemplateMenu->popupMenu(), TQT_SIGNAL( activated(int) ), TQT_TQOBJECT(this), - TQT_SLOT( slotNewFromTemplate(int) ) ); + connect( mTemplateMenu->popupMenu(), TQ_SIGNAL( aboutToShow() ), this, + TQ_SLOT( slotShowNewFromTemplate() ) ); + connect( mTemplateMenu->popupMenu(), TQ_SIGNAL( activated(int) ), this, + TQ_SLOT( slotNewFromTemplate(int) ) ); TDEAction* newToML = new TDEAction( i18n("New Message t&o Mailing-List..."), "mail_post_to", - CTRL+SHIFT+Key_N, TQT_TQOBJECT(this), - TQT_SLOT(slotPostToML()), actionCollection(), "post_message" ); + CTRL+SHIFT+Key_N, this, + TQ_SLOT(slotPostToML()), actionCollection(), "post_message" ); newToML->plugAccel( actionCollection()->tdeaccel() ); mForwardActionMenu = new TDEActionMenu( i18n("Message->","&Forward"), @@ -2865,26 +2866,26 @@ void KMMainWidget::setupActions() "message_forward" ); mForwardInlineAction = new TDEAction( i18n("&Inline..."), - "mail-forward", 0, TQT_TQOBJECT(this), - TQT_SLOT(slotForwardInlineMsg()), + "mail-forward", 0, this, + TQ_SLOT(slotForwardInlineMsg()), actionCollection(), "message_forward_inline" ); mForwardAttachedAction = new TDEAction( i18n("Message->Forward->","As &Attachment..."), - "mail-forward", 0, TQT_TQOBJECT(this), - TQT_SLOT(slotForwardAttachedMsg()), + "mail-forward", 0, this, + TQ_SLOT(slotForwardAttachedMsg()), actionCollection(), "message_forward_as_attachment" ); mForwardDigestAction = new TDEAction( i18n("Message->Forward->","As Di&gest..."), - "mail-forward", 0, TQT_TQOBJECT(this), - TQT_SLOT(slotForwardDigestMsg()), + "mail-forward", 0, this, + TQ_SLOT(slotForwardDigestMsg()), actionCollection(), "message_forward_as_digest" ); mRedirectAction = new TDEAction( i18n("Message->Forward->","&Redirect..."), - "mail-forward", Key_E, TQT_TQOBJECT(this), - TQT_SLOT(slotRedirectMsg()), + "mail-forward", Key_E, this, + TQ_SLOT(slotRedirectMsg()), actionCollection(), "message_forward_redirect" ); @@ -2894,38 +2895,38 @@ void KMMainWidget::setupActions() mForwardActionMenu->insert( mForwardDigestAction ); mForwardActionMenu->insert( mRedirectAction ); - mSendAgainAction = new TDEAction( i18n("Send A&gain..."), 0, TQT_TQOBJECT(this), - TQT_SLOT(slotResendMsg()), actionCollection(), "send_again" ); + mSendAgainAction = new TDEAction( i18n("Send A&gain..."), 0, this, + TQ_SLOT(slotResendMsg()), actionCollection(), "send_again" ); //----- Create filter actions mFilterMenu = new TDEActionMenu( i18n("&Create Filter"), "filter", actionCollection(), "create_filter" ); - connect( mFilterMenu, TQT_SIGNAL(activated()), TQT_TQOBJECT(this), - TQT_SLOT(slotFilter()) ); - mSubjectFilterAction = new TDEAction( i18n("Filter on &Subject..."), 0, TQT_TQOBJECT(this), - TQT_SLOT(slotSubjectFilter()), + connect( mFilterMenu, TQ_SIGNAL(activated()), this, + TQ_SLOT(slotFilter()) ); + mSubjectFilterAction = new TDEAction( i18n("Filter on &Subject..."), 0, this, + TQ_SLOT(slotSubjectFilter()), actionCollection(), "subject_filter"); mFilterMenu->insert( mSubjectFilterAction ); - mFromFilterAction = new TDEAction( i18n("Filter on &From..."), 0, TQT_TQOBJECT(this), - TQT_SLOT(slotFromFilter()), + mFromFilterAction = new TDEAction( i18n("Filter on &From..."), 0, this, + TQ_SLOT(slotFromFilter()), actionCollection(), "from_filter"); mFilterMenu->insert( mFromFilterAction ); - mToFilterAction = new TDEAction( i18n("Filter on &To..."), 0, TQT_TQOBJECT(this), - TQT_SLOT(slotToFilter()), + mToFilterAction = new TDEAction( i18n("Filter on &To..."), 0, this, + TQ_SLOT(slotToFilter()), actionCollection(), "to_filter"); mFilterMenu->insert( mToFilterAction ); - mListFilterAction = new TDEAction( i18n("Filter on Mailing-&List..."), 0, TQT_TQOBJECT(this), - TQT_SLOT(slotMailingListFilter()), actionCollection(), + mListFilterAction = new TDEAction( i18n("Filter on Mailing-&List..."), 0, this, + TQ_SLOT(slotMailingListFilter()), actionCollection(), "mlist_filter"); mFilterMenu->insert( mListFilterAction ); - mPrintAction = KStdAction::print (TQT_TQOBJECT(this), TQT_SLOT(slotPrintMsg()), actionCollection()); + mPrintAction = KStdAction::print (this, TQ_SLOT(slotPrintMsg()), actionCollection()); mUseAction = new TDEAction( i18n("New Message From &Template"), "document-new", - Key_N, TQT_TQOBJECT(this), TQT_SLOT( slotUseTemplate() ), + Key_N, this, TQ_SLOT( slotUseTemplate() ), actionCollection(), "use_template" ); mUseAction->plugAccel( actionCollection()->tdeaccel() ); @@ -2935,52 +2936,52 @@ void KMMainWidget::setupActions() mMarkThreadAsReadAction = new TDEAction(KGuiItem(i18n("Mark Thread as &Read"), "kmmsgread", i18n("Mark all messages in the selected thread as read")), - 0, TQT_TQOBJECT(this), TQT_SLOT(slotSetThreadStatusRead()), + 0, this, TQ_SLOT(slotSetThreadStatusRead()), actionCollection(), "thread_read"); mThreadStatusMenu->insert( mMarkThreadAsReadAction ); mMarkThreadAsNewAction = new TDEAction(KGuiItem(i18n("Mark Thread as &New"), "kmmsgnew", i18n("Mark all messages in the selected thread as new")), - 0, TQT_TQOBJECT(this), TQT_SLOT(slotSetThreadStatusNew()), + 0, this, TQ_SLOT(slotSetThreadStatusNew()), actionCollection(), "thread_new"); mThreadStatusMenu->insert( mMarkThreadAsNewAction ); mMarkThreadAsUnreadAction = new TDEAction(KGuiItem(i18n("Mark Thread as &Unread"), "kmmsgunseen", i18n("Mark all messages in the selected thread as unread")), - 0, TQT_TQOBJECT(this), TQT_SLOT(slotSetThreadStatusUnread()), + 0, this, TQ_SLOT(slotSetThreadStatusUnread()), actionCollection(), "thread_unread"); mThreadStatusMenu->insert( mMarkThreadAsUnreadAction ); - mThreadStatusMenu->insert( new TDEActionSeparator( TQT_TQOBJECT(this) ) ); + mThreadStatusMenu->insert( new TDEActionSeparator( this ) ); //----- "Mark Thread" toggle actions mToggleThreadFlagAction = new TDEToggleAction(i18n("Mark Thread as &Important"), "mail_flag", - 0, TQT_TQOBJECT(this), TQT_SLOT(slotSetThreadStatusFlag()), + 0, this, TQ_SLOT(slotSetThreadStatusFlag()), actionCollection(), "thread_flag"); mToggleThreadFlagAction->setCheckedState( i18n("Remove &Important Thread Mark") ); mThreadStatusMenu->insert( mToggleThreadFlagAction ); mToggleThreadTodoAction = new TDEToggleAction(i18n("Mark Thread as &Action Item"), "mail_todo", - 0, TQT_TQOBJECT(this), TQT_SLOT(slotSetThreadStatusTodo()), + 0, this, TQ_SLOT(slotSetThreadStatusTodo()), actionCollection(), "thread_todo"); mToggleThreadTodoAction->setCheckedState( i18n("Remove &Action Item Thread Mark") ); mThreadStatusMenu->insert( mToggleThreadTodoAction ); //------- "Watch and ignore thread" actions mWatchThreadAction = new TDEToggleAction(i18n("&Watch Thread"), "kmmsgwatched", - 0, TQT_TQOBJECT(this), TQT_SLOT(slotSetThreadStatusWatched()), + 0, this, TQ_SLOT(slotSetThreadStatusWatched()), actionCollection(), "thread_watched"); mIgnoreThreadAction = new TDEToggleAction(i18n("&Ignore Thread"), "mail_ignore", - 0, TQT_TQOBJECT(this), TQT_SLOT(slotSetThreadStatusIgnored()), + 0, this, TQ_SLOT(slotSetThreadStatusIgnored()), actionCollection(), "thread_ignored"); - mThreadStatusMenu->insert( new TDEActionSeparator( TQT_TQOBJECT(this) ) ); + mThreadStatusMenu->insert( new TDEActionSeparator( this ) ); mThreadStatusMenu->insert( mWatchThreadAction ); mThreadStatusMenu->insert( mIgnoreThreadAction ); mSaveAttachmentsAction = new TDEAction( i18n("Save A&ttachments..."), "attach", - 0, TQT_TQOBJECT(this), TQT_SLOT(slotSaveAttachments()), + 0, this, TQ_SLOT(slotSaveAttachments()), actionCollection(), "file_save_attachments" ); mMoveActionMenu = new TDEActionMenu( i18n("&Move To" ), @@ -2990,8 +2991,8 @@ void KMMainWidget::setupActions() actionCollection(), "copy_to" ); mApplyAllFiltersAction = new TDEAction( i18n("Appl&y All Filters"), "filter", - CTRL+Key_J, TQT_TQOBJECT(this), - TQT_SLOT(slotApplyFilters()), + CTRL+Key_J, this, + TQ_SLOT(slotApplyFilters()), actionCollection(), "apply_filters" ); mApplyFilterActionsMenu = new TDEActionMenu( i18n("A&pply Filter" ), @@ -3005,104 +3006,104 @@ void KMMainWidget::setupActions() actionCollection(), "view_unread" ); unreadMenu->setToolTip( i18n("Choose how to display the count of unread messages") ); - mUnreadColumnToggle = new TDERadioAction( i18n("View->Unread Count", "View in &Separate Column"), 0, TQT_TQOBJECT(this), - TQT_SLOT(slotToggleUnread()), + mUnreadColumnToggle = new TDERadioAction( i18n("View->Unread Count", "View in &Separate Column"), 0, this, + TQ_SLOT(slotToggleUnread()), actionCollection(), "view_unread_column" ); mUnreadColumnToggle->setExclusiveGroup( "view_unread_group" ); unreadMenu->insert( mUnreadColumnToggle ); - mUnreadTextToggle = new TDERadioAction( i18n("View->Unread Count", "View After &Folder Name"), 0, TQT_TQOBJECT(this), - TQT_SLOT(slotToggleUnread()), + mUnreadTextToggle = new TDERadioAction( i18n("View->Unread Count", "View After &Folder Name"), 0, this, + TQ_SLOT(slotToggleUnread()), actionCollection(), "view_unread_text" ); mUnreadTextToggle->setExclusiveGroup( "view_unread_group" ); unreadMenu->insert( mUnreadTextToggle ); // toggle for total column - mTotalColumnToggle = new TDEToggleAction( i18n("View->", "&Total Column"), 0, TQT_TQOBJECT(this), - TQT_SLOT(slotToggleTotalColumn()), + mTotalColumnToggle = new TDEToggleAction( i18n("View->", "&Total Column"), 0, this, + TQ_SLOT(slotToggleTotalColumn()), actionCollection(), "view_columns_total" ); mTotalColumnToggle->setToolTip( i18n("Toggle display of column showing the " "total number of messages in folders.") ); - mSizeColumnToggle = new TDEToggleAction( i18n("View->", "&Size Column"), 0, TQT_TQOBJECT(this), - TQT_SLOT(slotToggleSizeColumn()), + mSizeColumnToggle = new TDEToggleAction( i18n("View->", "&Size Column"), 0, this, + TQ_SLOT(slotToggleSizeColumn()), actionCollection(), "view_columns_size" ); mSizeColumnToggle->setToolTip( i18n("Toggle display of column showing the " "total size of messages in folders.") ); (void)new TDEAction( KGuiItem( i18n("View->","&Expand Thread"), TQString(), i18n("Expand the current thread") ), - Key_Period, TQT_TQOBJECT(this), - TQT_SLOT(slotExpandThread()), + Key_Period, this, + TQ_SLOT(slotExpandThread()), actionCollection(), "expand_thread" ); (void)new TDEAction( KGuiItem( i18n("View->","&Collapse Thread"), TQString(), i18n("Collapse the current thread") ), - Key_Comma, TQT_TQOBJECT(this), - TQT_SLOT(slotCollapseThread()), + Key_Comma, this, + TQ_SLOT(slotCollapseThread()), actionCollection(), "collapse_thread" ); (void)new TDEAction( KGuiItem( i18n("View->","Ex&pand All Threads"), TQString(), i18n("Expand all threads in the current folder") ), - CTRL+Key_Period, TQT_TQOBJECT(this), - TQT_SLOT(slotExpandAllThreads()), + CTRL+Key_Period, this, + TQ_SLOT(slotExpandAllThreads()), actionCollection(), "expand_all_threads" ); (void)new TDEAction( KGuiItem( i18n("View->","C&ollapse All Threads"), TQString(), i18n("Collapse all threads in the current folder") ), - CTRL+Key_Comma, TQT_TQOBJECT(this), - TQT_SLOT(slotCollapseAllThreads()), + CTRL+Key_Comma, this, + TQ_SLOT(slotCollapseAllThreads()), actionCollection(), "collapse_all_threads" ); - mViewSourceAction = new TDEAction( i18n("&View Source"), Key_V, TQT_TQOBJECT(this), - TQT_SLOT(slotShowMsgSrc()), actionCollection(), + mViewSourceAction = new TDEAction( i18n("&View Source"), Key_V, this, + TQ_SLOT(slotShowMsgSrc()), actionCollection(), "view_source" ); - TDEAction* dukeOfMonmoth = new TDEAction( i18n("&Display Message"), Key_Return, TQT_TQOBJECT(this), - TQT_SLOT( slotDisplayCurrentMessage() ), actionCollection(), + TDEAction* dukeOfMonmoth = new TDEAction( i18n("&Display Message"), Key_Return, this, + TQ_SLOT( slotDisplayCurrentMessage() ), actionCollection(), "display_message" ); dukeOfMonmoth->plugAccel( actionCollection()->tdeaccel() ); //----- Go Menu new TDEAction( KGuiItem( i18n("&Next Message"), TQString(), i18n("Go to the next message") ), - "N;Right", TQT_TQOBJECT(this), TQT_SLOT(slotNextMessage()), + "N;Right", this, TQ_SLOT(slotNextMessage()), actionCollection(), "go_next_message" ); new TDEAction( KGuiItem( i18n("Next &Unread Message"), TQApplication::reverseLayout() ? "go-previous" : "go-next", i18n("Go to the next unread message") ), - Key_Plus, TQT_TQOBJECT(this), TQT_SLOT(slotNextUnreadMessage()), + Key_Plus, this, TQ_SLOT(slotNextUnreadMessage()), actionCollection(), "go_next_unread_message" ); /* ### needs better support from folders: new TDEAction( KGuiItem( i18n("Next &Important Message"), TQString(), i18n("Go to the next important message") ), - 0, TQT_TQOBJECT(this), TQT_SLOT(slotNextImportantMessage()), + 0, this, TQ_SLOT(slotNextImportantMessage()), actionCollection(), "go_next_important_message" ); */ new TDEAction( KGuiItem( i18n("&Previous Message"), TQString(), i18n("Go to the previous message") ), - "P;Left", TQT_TQOBJECT(this), TQT_SLOT(slotPrevMessage()), + "P;Left", this, TQ_SLOT(slotPrevMessage()), actionCollection(), "go_prev_message" ); new TDEAction( KGuiItem( i18n("Previous Unread &Message"), TQApplication::reverseLayout() ? "go-next" : "go-previous", i18n("Go to the previous unread message") ), - Key_Minus, TQT_TQOBJECT(this), TQT_SLOT(slotPrevUnreadMessage()), + Key_Minus, this, TQ_SLOT(slotPrevUnreadMessage()), actionCollection(), "go_prev_unread_message" ); /* needs better support from folders: new TDEAction( KGuiItem( i18n("Previous I&mportant Message"), TQString(), i18n("Go to the previous important message") ), - 0, TQT_TQOBJECT(this), TQT_SLOT(slotPrevImportantMessage()), + 0, this, TQ_SLOT(slotPrevImportantMessage()), actionCollection(), "go_prev_important_message" ); */ TDEAction *action = new TDEAction( KGuiItem( i18n("Next Unread &Folder"), TQString(), i18n("Go to the next folder with unread messages") ), - ALT+Key_Plus, TQT_TQOBJECT(this), TQT_SLOT(slotNextUnreadFolder()), + ALT+Key_Plus, this, TQ_SLOT(slotNextUnreadFolder()), actionCollection(), "go_next_unread_folder" ); TDEShortcut shortcut = action->shortcut(); shortcut.append( KKey( CTRL+Key_Plus ) ); @@ -3111,7 +3112,7 @@ void KMMainWidget::setupActions() action = new TDEAction( KGuiItem( i18n("Previous Unread F&older"), TQString(), i18n("Go to the previous folder with unread messages") ), - ALT+Key_Minus, TQT_TQOBJECT(this), TQT_SLOT(slotPrevUnreadFolder()), + ALT+Key_Minus, this, TQ_SLOT(slotPrevUnreadFolder()), actionCollection(), "go_prev_unread_folder" ); shortcut = action->shortcut(); shortcut.append( KKey( CTRL+Key_Minus ) ); @@ -3122,49 +3123,49 @@ void KMMainWidget::setupActions() i18n("Scroll down current message. " "If at end of current message, " "go to next unread message.") ), - Key_Space, TQT_TQOBJECT(this), TQT_SLOT(slotReadOn()), + Key_Space, this, TQ_SLOT(slotReadOn()), actionCollection(), "go_next_unread_text" ); //----- Settings Menu mToggleShowQuickSearchAction = new TDEToggleAction(i18n("Show Quick Search"), TQString(), - 0, TQT_TQOBJECT(this), TQT_SLOT(slotToggleShowQuickSearch()), + 0, this, TQ_SLOT(slotToggleShowQuickSearch()), actionCollection(), "show_quick_search"); mToggleShowQuickSearchAction->setChecked( GlobalSettings::self()->quickSearchActive() ); mToggleShowQuickSearchAction->setWhatsThis( i18n( GlobalSettings::self()->quickSearchActiveItem()->whatsThis().utf8() ) ); - (void) new TDEAction( i18n("Configure &Filters..."), 0, TQT_TQOBJECT(this), - TQT_SLOT(slotFilter()), actionCollection(), "filter" ); - (void) new TDEAction( i18n("Configure &POP Filters..."), 0, TQT_TQOBJECT(this), - TQT_SLOT(slotPopFilter()), actionCollection(), "popFilter" ); - (void) new TDEAction( i18n("Manage &Sieve Scripts..."), 0, TQT_TQOBJECT(this), - TQT_SLOT(slotManageSieveScripts()), actionCollection(), "sieveFilters" ); + (void) new TDEAction( i18n("Configure &Filters..."), 0, this, + TQ_SLOT(slotFilter()), actionCollection(), "filter" ); + (void) new TDEAction( i18n("Configure &POP Filters..."), 0, this, + TQ_SLOT(slotPopFilter()), actionCollection(), "popFilter" ); + (void) new TDEAction( i18n("Manage &Sieve Scripts..."), 0, this, + TQ_SLOT(slotManageSieveScripts()), actionCollection(), "sieveFilters" ); (void) new TDEAction( KGuiItem( i18n("KMail &Introduction"), 0, i18n("Display KMail's Welcome Page") ), - 0, TQT_TQOBJECT(this), TQT_SLOT(slotIntro()), + 0, this, TQ_SLOT(slotIntro()), actionCollection(), "help_kmail_welcomepage" ); // ----- Standard Actions -// KStdAction::configureNotifications(this, TQT_SLOT(slotEditNotifications()), actionCollection()); +// KStdAction::configureNotifications(this, TQ_SLOT(slotEditNotifications()), actionCollection()); (void) new TDEAction( i18n("Configure &Notifications..."), - "knotify", 0, TQT_TQOBJECT(this), - TQT_SLOT(slotEditNotifications()), actionCollection(), + "knotify", 0, this, + TQ_SLOT(slotEditNotifications()), actionCollection(), "kmail_configure_notifications" ); -// KStdAction::preferences(this, TQT_SLOT(slotSettings()), actionCollection()); +// KStdAction::preferences(this, TQ_SLOT(slotSettings()), actionCollection()); (void) new TDEAction( i18n("&Configure KMail..."), "configure", 0, kmkernel, - TQT_SLOT(slotShowConfigurationDialog()), actionCollection(), + TQ_SLOT(slotShowConfigurationDialog()), actionCollection(), "kmail_configure_kmail" ); - KStdAction::undo(TQT_TQOBJECT(this), TQT_SLOT(slotUndo()), actionCollection(), "kmail_undo"); + KStdAction::undo(this, TQ_SLOT(slotUndo()), actionCollection(), "kmail_undo"); - KStdAction::tipOfDay( TQT_TQOBJECT(this), TQT_SLOT( slotShowTip() ), actionCollection() ); + KStdAction::tipOfDay( this, TQ_SLOT( slotShowTip() ), actionCollection() ); menutimer = new TQTimer( this, "menutimer" ); - connect( menutimer, TQT_SIGNAL( timeout() ), TQT_SLOT( updateMessageActions() ) ); + connect( menutimer, TQ_SIGNAL( timeout() ), TQ_SLOT( updateMessageActions() ) ); connect( kmkernel->undoStack(), - TQT_SIGNAL( undoStackChanged() ), TQT_TQOBJECT(this), TQT_SLOT( slotUpdateUndo() )); + TQ_SIGNAL( undoStackChanged() ), this, TQ_SLOT( slotUpdateUndo() )); initializeIMAPActions( false ); // don't set state, config not read yet updateMessageActions(); @@ -3287,9 +3288,9 @@ void KMMainWidget::copySelectedToFolder(int menuId ) void KMMainWidget::updateMessageMenu() { mMenuToFolder.clear(); - folderTree()->folderToPopupMenu( KMFolderTree::MoveMessage, TQT_TQOBJECT(this), + folderTree()->folderToPopupMenu( KMFolderTree::MoveMessage, this, &mMenuToFolder, mMoveActionMenu->popupMenu() ); - folderTree()->folderToPopupMenu( KMFolderTree::CopyMessage, TQT_TQOBJECT(this), + folderTree()->folderToPopupMenu( KMFolderTree::CopyMessage, this, &mMenuToFolder, mCopyActionMenu->popupMenu() ); updateMessageActions(); } @@ -3546,8 +3547,8 @@ void KMMainWidget::slotShowStartupFolder() mFolderTree->cleanupConfigFile(); } - connect( kmkernel->filterMgr(), TQT_SIGNAL( filterListUpdated() ), - this, TQT_SLOT( initializeFilterActions() )); + connect( kmkernel->filterMgr(), TQ_SIGNAL( filterListUpdated() ), + this, TQ_SLOT( initializeFilterActions() )); // plug shortcut filter actions now initializeFilterActions(); @@ -3723,7 +3724,7 @@ void KMMainWidget::initializeFilterActions() if ( icon.isEmpty() ) icon = "gear"; filterAction = new TDEAction(as, icon, (*it)->shortcut(), filterCommand, - TQT_SLOT(start()), actionCollection(), + TQ_SLOT(start()), actionCollection(), normalizedName.local8Bit()); if(!addedSeparator) { mApplyFilterActionsMenu->popupMenu()->insertSeparator(); @@ -3769,7 +3770,7 @@ void KMMainWidget::initializeIMAPActions( bool setState /* false the first time, if ( !mTroubleshootFolderAction ) { mTroubleshootFolderAction = new TDEAction( i18n("&Troubleshoot IMAP Cache..."), "wizard", 0, - TQT_TQOBJECT(this), TQT_SLOT(slotTroubleshootFolder()), actionCollection(), "troubleshoot_folder" ); + this, TQ_SLOT(slotTroubleshootFolder()), actionCollection(), "troubleshoot_folder" ); if ( setState ) updateFolderMenu(); // set initial state of the action } else { @@ -3805,7 +3806,7 @@ void KMMainWidget::slotShortcutChanged( KMFolder *folder ) TQString actionname = TQString( "FolderShortcut %1").arg( folder->idString() ); TQString normalizedName = actionname.replace(" ", "_"); TDEAction* action = - new TDEAction(actionlabel, folder->shortcut(), c, TQT_SLOT(start()), + new TDEAction(actionlabel, folder->shortcut(), c, TQ_SLOT(start()), actionCollection(), normalizedName.local8Bit()); action->setIcon( folder->unreadIconPath() ); c->setAction( action ); // will be deleted along with the command diff --git a/kmail/kmmainwidget.h b/kmail/kmmainwidget.h index d90dda24..dc620fc1 100644 --- a/kmail/kmmainwidget.h +++ b/kmail/kmmainwidget.h @@ -79,9 +79,9 @@ namespace KMail { typedef TQMap<int,KMFolder*> KMMenuToFolder; -class KDE_EXPORT KMMainWidget : public TQWidget +class TDE_EXPORT KMMainWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/kmail/kmmainwin.cpp b/kmail/kmmainwin.cpp index bfc0be0c..120b1606 100644 --- a/kmail/kmmainwin.cpp +++ b/kmail/kmmainwin.cpp @@ -33,13 +33,13 @@ KMMainWin::KMMainWin(TQWidget *) // modal subdialogs will only affect this dialog, not the other windows setWFlags( getWFlags() | WGroupLeader ); - kapp->ref(); + tdeApp->ref(); (void) new TDEAction( i18n("New &Window"), "window-new", 0, - TQT_TQOBJECT(this), TQT_SLOT(slotNewMailReader()), + this, TQ_SLOT(slotNewMailReader()), actionCollection(), "new_mail_client" ); - mKMMainWidget = new KMMainWidget( TQT_TQWIDGET(this), "KMMainWidget", this, actionCollection() ); + mKMMainWidget = new KMMainWidget( this, "KMMainWidget", this, actionCollection() ); mKMMainWidget->resize( 450, 600 ); setCentralWidget(mKMMainWidget); setupStatusBar(); @@ -47,17 +47,17 @@ KMMainWin::KMMainWin(TQWidget *) setInstance( kmkernel->xmlGuiInstance() ); if ( kmkernel->firstInstance() ) - TQTimer::singleShot( 200, this, TQT_SLOT(slotShowTipOnStart()) ); + TQTimer::singleShot( 200, this, TQ_SLOT(slotShowTipOnStart()) ); setStandardToolBarMenuEnabled(true); - KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(slotEditToolbars()), + KStdAction::configureToolbars(this, TQ_SLOT(slotEditToolbars()), actionCollection()); - KStdAction::keyBindings(TQT_TQOBJECT(mKMMainWidget), TQT_SLOT(slotEditKeys()), + KStdAction::keyBindings(mKMMainWidget, TQ_SLOT(slotEditKeys()), actionCollection()); - KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT(slotQuit()), actionCollection()); + KStdAction::quit( this, TQ_SLOT(slotQuit()), actionCollection()); createGUI( "kmmainwin.rc", false ); // Don't use conserveMemory() because this renders dynamic plugging // of actions unusable! @@ -66,14 +66,14 @@ KMMainWin::KMMainWin(TQWidget *) applyMainWindowSettings(KMKernel::config(), "Main Window"); - connect( KPIM::BroadcastStatus::instance(), TQT_SIGNAL( statusMsg( const TQString& ) ), - this, TQT_SLOT( displayStatusMsg(const TQString&) ) ); + connect( KPIM::BroadcastStatus::instance(), TQ_SIGNAL( statusMsg( const TQString& ) ), + this, TQ_SLOT( displayStatusMsg(const TQString&) ) ); - connect(kmkernel, TQT_SIGNAL(configChanged()), - this, TQT_SLOT(slotConfigChanged())); + connect(kmkernel, TQ_SIGNAL(configChanged()), + this, TQ_SLOT(slotConfigChanged())); - connect(mKMMainWidget, TQT_SIGNAL(captionChangeRequest(const TQString&)), - TQT_SLOT(setCaption(const TQString&)) ); + connect(mKMMainWidget, TQ_SIGNAL(captionChangeRequest(const TQString&)), + TQ_SLOT(setCaption(const TQString&)) ); // Enable mail checks again (see destructor) kmkernel->enableMailCheck(); @@ -86,7 +86,7 @@ KMMainWin::~KMMainWin() { saveMainWindowSettings(KMKernel::config(), "Main Window"); KMKernel::config()->sync(); - kapp->deref(); + tdeApp->deref(); if ( !kmkernel->haveSystemTrayApplet() ) { // Check if this was the last KMMainWin @@ -96,14 +96,14 @@ KMMainWin::~KMMainWin() if ( !it.current()->isHidden() && it.current()->isTopLevel() && it.current() != this && - ::tqqt_cast<KMMainWin *>( it.current() ) + ::tqt_cast<KMMainWin *>( it.current() ) ) not_withdrawn++; } if ( not_withdrawn == 0 ) { kdDebug(5006) << "Closing last KMMainWin: stopping mail check" << endl; - // Running TDEIO jobs prevent kapp from exiting, so we need to kill them + // Running TDEIO jobs prevent tdeApp from exiting, so we need to kill them // if they are only about checking mail (not important stuff like moving messages) kmkernel->abortMailCheck(); kmkernel->acctMgr()->cancelMailCheck(); @@ -145,8 +145,8 @@ void KMMainWin::slotEditToolbars() saveMainWindowSettings(KMKernel::config(), "Main Window"); KEditToolbar dlg(actionCollection(), "kmmainwin.rc"); - connect( &dlg, TQT_SIGNAL(newToolbarConfig()), - TQT_SLOT(slotUpdateToolbars()) ); + connect( &dlg, TQ_SIGNAL(newToolbarConfig()), + TQ_SLOT(slotUpdateToolbars()) ); dlg.exec(); } @@ -206,10 +206,10 @@ void KMMainWin::slotConfigChanged() //----------------------------------------------------------------------------- bool KMMainWin::queryClose() { - if ( kapp->sessionSaving() ) + if ( tdeApp->sessionSaving() ) writeConfig(); - if ( kmkernel->shuttingDown() || kapp->sessionSaving() || mReallyClose ) + if ( kmkernel->shuttingDown() || tdeApp->sessionSaving() || mReallyClose ) return true; return kmkernel->canQueryClose(); } diff --git a/kmail/kmmainwin.h b/kmail/kmmainwin.h index 2de06c26..9e12e71c 100644 --- a/kmail/kmmainwin.h +++ b/kmail/kmmainwin.h @@ -34,7 +34,7 @@ using KPIM::ProgressDialog; class KMMainWin : public TDEMainWindow { - Q_OBJECT + TQ_OBJECT public: diff --git a/kmail/kmmessage.cpp b/kmail/kmmessage.cpp index f9a7f388..b12ae65c 100644 --- a/kmail/kmmessage.cpp +++ b/kmail/kmmessage.cpp @@ -28,19 +28,17 @@ using KMail::HeaderStrategy; #include <libkpimidentities/identitymanager.h> #include <libemailfunctions/email.h> -#include <kasciistringtools.h> - #include <kpgpblock.h> #include <kaddrbook.h> #include <tdeapplication.h> +#include <tdeglobal.h> #include <tdeglobalsettings.h> #include <kdebug.h> #include <tdeconfig.h> #include <tdehtml_part.h> #include <kuser.h> #include <kidna.h> -#include <kasciistricmp.h> #include <tqcursor.h> #include <tqtextcodec.h> @@ -4083,7 +4081,7 @@ TQCString KMMessage::defaultCharset() if (retval.isEmpty() || (retval == "locale")) { retval = TQCString(kmkernel->networkCodec()->mimeName()); - KPIM::kAsciiToLower( retval.data() ); + kasciitolower( retval.data() ); } if (retval == "jisx0208.1983-0") retval = "iso-2022-jp"; @@ -4145,7 +4143,7 @@ void KMMessage::setCharset( const TQCString &charset, DwEntity *entity ) mType.SetModified(); TQCString lowerCharset = charset; - KPIM::kAsciiToLower( lowerCharset.data() ); + kasciitolower( lowerCharset.data() ); param->SetValue( DwString( lowerCharset ) ); mType.Assemble(); } diff --git a/kmail/kmmessage.h b/kmail/kmmessage.h index dfe96116..a96470df 100644 --- a/kmail/kmmessage.h +++ b/kmail/kmmessage.h @@ -114,7 +114,7 @@ public: KMMsgBase & toMsgBase() { return *this; } const KMMsgBase & toMsgBase() const { return *this; } - /** Returns TRUE if object is a real message (not KMMsgInfo or KMMsgBase) */ + /** Returns true if object is a real message (not KMMsgInfo or KMMsgBase) */ bool isMessage() const; /** @return whether the priority: or x-priority headers indicate @@ -130,7 +130,7 @@ public: */ void setUnencryptedMsg( KMMessage* unencrypted ); - /** Returns TRUE if the message contains an unencrypted copy of itself. */ + /** Returns true if the message contains an unencrypted copy of itself. */ bool hasUnencryptedMsg() const { return 0 != mUnencryptedMsg; } /** Returns an unencrypted copy of this message or 0 if none exists. */ @@ -713,7 +713,7 @@ public: bool removeLineBreaks = false ); /** Converts the email address(es) to (a) nice HTML mailto: anchor(s). - * If stripped is TRUE then the visible part of the anchor contains + * If stripped is true then the visible part of the anchor contains * only the name part and not the given emailAddr. */ static TQString emailAddrAsAnchor(const TQString& emailAddr, diff --git a/kmail/kmmimeparttree.cpp b/kmail/kmmimeparttree.cpp index 779fffd4..56910cb2 100644 --- a/kmail/kmmimeparttree.cpp +++ b/kmail/kmmimeparttree.cpp @@ -68,11 +68,11 @@ KMMimePartTree::KMMimePartTree( KMReaderWin* readerWin, setColumnAlignment( 3, TQt::AlignRight ); restoreLayoutIfPresent(); - connect( this, TQT_SIGNAL( clicked( TQListViewItem* ) ), - this, TQT_SLOT( itemClicked( TQListViewItem* ) ) ); - connect( this, TQT_SIGNAL( contextMenuRequested( TQListViewItem*, + connect( this, TQ_SIGNAL( clicked( TQListViewItem* ) ), + this, TQ_SLOT( itemClicked( TQListViewItem* ) ) ); + connect( this, TQ_SIGNAL( contextMenuRequested( TQListViewItem*, const TQPoint&, int ) ), - this, TQT_SLOT( itemRightClicked( TQListViewItem*, const TQPoint& ) ) ); + this, TQ_SLOT( itemRightClicked( TQListViewItem*, const TQPoint& ) ) ); setSelectionMode( TQListView::Extended ); setRootIsDecorated( false ); setAllColumnsShowFocus( true ); @@ -131,32 +131,33 @@ void KMMimePartTree::itemRightClicked( TQListViewItem* item, else { TQPopupMenu* popup = new TQPopupMenu; if ( mCurrentContextMenuItem->node()->nodeId() > 2 && - mCurrentContextMenuItem->node()->typeString() != "Multipart" ) { - popup->insertItem( SmallIcon("document-open"), i18n("to open", "Open"), this, TQT_SLOT(slotOpen()) ); - popup->insertItem( i18n("Open With..."), this, TQT_SLOT(slotOpenWith()) ); - popup->insertItem( i18n("to view something", "View"), this, TQT_SLOT(slotView()) ); + mCurrentContextMenuItem->node()->typeString() != "Multipart" || + mCurrentContextMenuItem->node()->subTypeString() == "HTML" ) { + popup->insertItem( SmallIcon("document-open"), i18n("to open", "Open"), this, TQ_SLOT(slotOpen()) ); + popup->insertItem( i18n("Open With..."), this, TQ_SLOT(slotOpenWith()) ); + popup->insertItem( i18n("to view something", "View"), this, TQ_SLOT(slotView()) ); } - popup->insertItem( SmallIcon("document-save-as"),i18n( "Save &As..." ), this, TQT_SLOT( slotSaveAs() ) ); + popup->insertItem( SmallIcon("document-save-as"),i18n( "Save &As..." ), this, TQ_SLOT( slotSaveAs() ) ); /* * FIXME mkae optional? popup->insertItem( i18n( "Save as &Encoded..." ), this, - TQT_SLOT( slotSaveAsEncoded() ) ); + TQ_SLOT( slotSaveAsEncoded() ) ); */ popup->insertItem( i18n( "Save All Attachments..." ), this, - TQT_SLOT( slotSaveAll() ) ); + TQ_SLOT( slotSaveAll() ) ); // edit + delete only for attachments if ( mCurrentContextMenuItem->node()->nodeId() > 2 && mCurrentContextMenuItem->node()->typeString() != "Multipart" ) { - popup->insertItem( SmallIcon("edit-copy"), i18n("Copy"), this, TQT_SLOT(slotCopy()) ); + popup->insertItem( SmallIcon("edit-copy"), i18n("Copy"), this, TQ_SLOT(slotCopy()) ); if ( GlobalSettings::self()->allowAttachmentDeletion() ) popup->insertItem( SmallIcon("edit-delete"), i18n( "Delete Attachment" ), - this, TQT_SLOT( slotDelete() ) ); + this, TQ_SLOT( slotDelete() ) ); if ( GlobalSettings::self()->allowAttachmentEditing() ) popup->insertItem( SmallIcon( "edit" ), i18n( "Edit Attachment" ), - this, TQT_SLOT( slotEdit() ) ); + this, TQ_SLOT( slotEdit() ) ); } if ( mCurrentContextMenuItem->node()->nodeId() > 0 ) - popup->insertItem( i18n("Properties"), this, TQT_SLOT(slotProperties()) ); + popup->insertItem( i18n("Properties"), this, TQ_SLOT(slotProperties()) ); popup->exec( point ); delete popup; mCurrentContextMenuItem = 0; @@ -295,8 +296,8 @@ void KMMimePartTree::startHandleAttachmentCommand(int type) KMHandleAttachmentCommand* command = new KMHandleAttachmentCommand( node, mReaderWin->message(), node->nodeId(), name, KMHandleAttachmentCommand::AttachmentAction( type ), 0, this ); - connect( command, TQT_SIGNAL( showAttachment( int, const TQString& ) ), - mReaderWin, TQT_SLOT( slotAtmView( int, const TQString& ) ) ); + connect( command, TQ_SIGNAL( showAttachment( int, const TQString& ) ), + mReaderWin, TQ_SLOT( slotAtmView( int, const TQString& ) ) ); command->start(); } diff --git a/kmail/kmmimeparttree.h b/kmail/kmmimeparttree.h index 1b4fc4f5..84da01cf 100644 --- a/kmail/kmmimeparttree.h +++ b/kmail/kmmimeparttree.h @@ -42,7 +42,7 @@ class KMMimePartTreeItem; class KMMimePartTree : public TDEListView { - Q_OBJECT + TQ_OBJECT friend class ::KMReaderWin; diff --git a/kmail/kmmsgbase.cpp b/kmail/kmmsgbase.cpp index abf1ade7..61952a00 100644 --- a/kmail/kmmsgbase.cpp +++ b/kmail/kmmsgbase.cpp @@ -15,13 +15,13 @@ using KMail::MessageProperty; #include <kdebug.h> #include <tdeglobal.h> #include <kcharsets.h> -#include <kasciistringtools.h> #include <kmdcodec.h> #include <krfcdate.h> #include <mimelib/mimepp.h> #include <kmime_codecs.h> +#include <tqglobal.h> #include <tqtextcodec.h> #include <tqdeepcopy.h> #include <tqregexp.h> @@ -575,7 +575,7 @@ const TQTextCodec* KMMsgBase::codecForName(const TQCString& _str) { if (_str.isEmpty()) return 0; TQCString codec = _str; - KPIM::kAsciiToLower(codec.data()); + kasciitolower(codec.data()); return TDEGlobal::charsets()->codecForName(codec); } @@ -790,7 +790,7 @@ TQCString KMMsgBase::encodeRFC2047String(const TQString& _str, if (charset.isEmpty()) { cset = kmkernel->networkCodec()->mimeName(); - KPIM::kAsciiToLower(cset.data()); + kasciitolower(cset.data()); } else cset = charset; @@ -881,7 +881,7 @@ TQCString KMMsgBase::encodeRFC2231String( const TQString& _str, if ( charset.isEmpty() ) { cset = kmkernel->networkCodec()->mimeName(); - KPIM::kAsciiToLower( cset.data() ); + kasciitolower( cset.data() ); } else cset = charset; @@ -1049,7 +1049,7 @@ TQCString KMMsgBase::autoDetectCharset(const TQCString &_encoding, const TQStrin if (encoding == "locale") { encoding = kmkernel->networkCodec()->mimeName(); - KPIM::kAsciiToLower(encoding.data()); + kasciitolower(encoding.data()); } if (text.isEmpty()) return encoding; diff --git a/kmail/kmmsgbase.h b/kmail/kmmsgbase.h index 1137bb6e..9ed08445 100644 --- a/kmail/kmmsgbase.h +++ b/kmail/kmmsgbase.h @@ -163,55 +163,55 @@ public: /** Convert the given message status to a string. */ TQString statusToSortRank(); - /** Returns TRUE if object is a real message (not KMMsgInfo or KMMsgBase) */ + /** Returns true if object is a real message (not KMMsgInfo or KMMsgBase) */ virtual bool isMessage(void) const; - /** Returns TRUE if status unread. Note that new messages are not unread.*/ + /** Returns true if status unread. Note that new messages are not unread.*/ virtual bool isUnread(void) const; - /** Returns TRUE if status is new. */ + /** Returns true if status is new. */ virtual bool isNew(void) const; - /** Returns TRUE if status is unknown. */ + /** Returns true if status is unknown. */ virtual bool isOfUnknownStatus(void) const; - /** Returns TRUE if status is old. */ + /** Returns true if status is old. */ virtual bool isOld(void) const; - /** Returns TRUE if status is read. */ + /** Returns true if status is read. */ virtual bool isRead(void) const; - /** Returns TRUE if status is deleted. */ + /** Returns true if status is deleted. */ virtual bool isDeleted(void) const; - /** Returns TRUE if status is replied. */ + /** Returns true if status is replied. */ virtual bool isReplied(void) const; - /** Returns TRUE if status is forwarded. */ + /** Returns true if status is forwarded. */ virtual bool isForwarded(void) const; - /** Returns TRUE if status is queued. */ + /** Returns true if status is queued. */ virtual bool isQueued(void) const; - /** Returns TRUE if status is todo flaged. */ + /** Returns true if status is todo flaged. */ virtual bool isTodo(void) const; - /** Returns TRUE if status is sent. */ + /** Returns true if status is sent. */ virtual bool isSent(void) const; - /** Returns TRUE if status is important. */ + /** Returns true if status is important. */ virtual bool isImportant(void) const; - /** Returns TRUE if status is watched. */ + /** Returns true if status is watched. */ virtual bool isWatched(void) const; - /** Returns TRUE if status is ignored. */ + /** Returns true if status is ignored. */ virtual bool isIgnored(void) const; - /** Returns TRUE if status is spam. */ + /** Returns true if status is spam. */ virtual bool isSpam(void) const; - /** Returns TRUE if status is not spam. */ + /** Returns true if status is not spam. */ virtual bool isHam(void) const; @@ -275,7 +275,7 @@ public: virtual void setDate(const TQCString &aStrDate); virtual void setDate(time_t aUnixTime) = 0; - /** Returns TRUE if changed since last folder-sync. */ + /** Returns true if changed since last folder-sync. */ virtual bool dirty(void) const { return mDirty; } /** Change dirty flag. */ @@ -321,8 +321,8 @@ public: /** Skip leading keyword if keyword has given character at it's end * (e.g. ':' or ',') and skip the then following blanks (if any) too. - * If keywordFound is specified it will be TRUE if a keyword was skipped - * and FALSE otherwise. */ + * If keywordFound is specified it will be true if a keyword was skipped + * and false otherwise. */ static TQString skipKeyword(const TQString& str, TQChar sepChar=':', bool* keywordFound=0); diff --git a/kmail/kmmsgdict.h b/kmail/kmmsgdict.h index 60fabf6c..5598489c 100644 --- a/kmail/kmmsgdict.h +++ b/kmail/kmmsgdict.h @@ -115,7 +115,7 @@ private: /** Returns the name of the .folder.index.ids file. */ static TQString getFolderIdsLocation( const FolderStorage &folder ); - /** Returns TRUE if the .folder.index.ids file should not be read. */ + /** Returns true if the .folder.index.ids file should not be read. */ bool isFolderIdsOutdated( const FolderStorage &folder ); /** Reads the .folder.index.ids file. Returns 0 on success. */ diff --git a/kmail/kmmsginfo.h b/kmail/kmmsginfo.h index 8f557f25..2a4a54fb 100644 --- a/kmail/kmmsginfo.h +++ b/kmail/kmmsginfo.h @@ -36,7 +36,7 @@ public: void compat_fromOldIndexString(const TQCString& str, bool toUtf8); - /** Initialize with given values and set dirty flag to FALSE. */ + /** Initialize with given values and set dirty flag to false. */ virtual void init(const TQCString& subject, const TQCString& from, const TQCString& to, time_t date, KMMsgStatus status, const TQCString& xmark, @@ -50,7 +50,7 @@ public: off_t folderOffset=0, size_t msgSize=0, size_t msgSizeServer = 0, ulong UID = 0); - /** Initialize with given values and set dirty flag to FALSE. */ + /** Initialize with given values and set dirty flag to false. */ virtual void init(const TQCString& subject, const TQCString& from, const TQCString& to, time_t date, KMMsgStatus status, const TQCString& xmark, diff --git a/kmail/kmmsglist.cpp b/kmail/kmmsglist.cpp index 9689467b..c7781148 100644 --- a/kmail/kmmsglist.cpp +++ b/kmail/kmmsglist.cpp @@ -24,7 +24,7 @@ KMMsgList::KMMsgList(int initSize) //----------------------------------------------------------------------------- KMMsgList::~KMMsgList() { - clear(TRUE); + clear(true); } @@ -69,22 +69,22 @@ bool KMMsgList::resize(unsigned int aSize) } // do the resizing - if (!TQMemArray<KMMsgBase*>::resize(aSize)) return FALSE; + if (!TQMemArray<KMMsgBase*>::resize(aSize)) return false; // initialize new elements for (i=oldSize; i<aSize; i++) at(i) = 0; - return TRUE; + return true; } //----------------------------------------------------------------------------- bool KMMsgList::reset(unsigned int aSize) { - if (!resize(aSize)) return FALSE; + if (!resize(aSize)) return false; clear(); - return TRUE; + return true; } diff --git a/kmail/kmmsglist.h b/kmail/kmmsglist.h index 83d9e8db..04ff3176 100644 --- a/kmail/kmmsglist.h +++ b/kmail/kmmsglist.h @@ -64,13 +64,13 @@ public: /** Clear messages. If autoDelete is set (default) the messages are deleted. The array is not resized. If @p syncDict, also updates the message dictionary. */ - void clear(bool autoDelete=TRUE, bool syncDict = false); + void clear(bool autoDelete=true, bool syncDict = false); /** Resize array and initialize new elements if any. Returns - FALSE if memory cannot be allocated. */ + false if memory cannot be allocated. */ bool resize(unsigned int size); - /** Clear the array and resize it to given size. Returns FALSE + /** Clear the array and resize it to given size. Returns false if memory cannot be allocated. */ bool reset(unsigned int size); diff --git a/kmail/kmmsgpart.cpp b/kmail/kmmsgpart.cpp index 596828e2..c7fa30d8 100644 --- a/kmail/kmmsgpart.cpp +++ b/kmail/kmmsgpart.cpp @@ -12,7 +12,6 @@ #include "globalsettings.h" #include "util.h" -#include <kasciistringtools.h> #include <kmime_charfreq.h> #include <kmime_codecs.h> #include <mimelib/enum.h> @@ -21,6 +20,7 @@ #include <kiconloader.h> #include <tqtextcodec.h> +#include <tqglobal.h> #include <assert.h> @@ -41,8 +41,8 @@ KMMessagePart::KMMessagePart( TQDataStream & stream ) stream >> mOriginalContentTypeStr >> mName >> mContentDescription >> mContentDisposition >> mCte >> size >> mPartSpecifier; - KPIM::kAsciiToLower( mContentDisposition.data() ); - KPIM::kAsciiToUpper( mOriginalContentTypeStr.data() ); + kasciitolower( mContentDisposition.data() ); + kasciitoupper( mOriginalContentTypeStr.data() ); // set the type int sep = mOriginalContentTypeStr.find('/'); @@ -435,7 +435,7 @@ void KMMessagePart::magicSetType(bool aAutoDecode) TQString KMMessagePart::iconName( int size ) const { TQCString mimeType( mType + "/" + mSubtype ); - KPIM::kAsciiToLower( mimeType.data() ); + kasciitolower( mimeType.data() ); TQString fileName = KMimeType::mimeType( mimeType )->icon( TQString(), false ); diff --git a/kmail/kmmsgpart.h b/kmail/kmmsgpart.h index 452114d4..34939e51 100644 --- a/kmail/kmmsgpart.h +++ b/kmail/kmmsgpart.h @@ -137,9 +137,9 @@ public: void setContentId( const TQCString & aStr ) { mContentId = aStr; } /** Set the 'Content-Type' by mime-magic from the contents of the body. - If autoDecode is TRUE the decoded body will be used for mime type + If autoDecode is true the decoded body will be used for mime type determination (this does not change the body itself). */ - void magicSetType(bool autoDecode=TRUE); + void magicSetType(bool autoDecode=true); /** Get or set a custom content type parameter, consisting of an attribute name and a corresponding value. */ diff --git a/kmail/kmmsgpartdlg.cpp b/kmail/kmmsgpartdlg.cpp index 869ee015..3b63badc 100644 --- a/kmail/kmmsgpartdlg.cpp +++ b/kmail/kmmsgpartdlg.cpp @@ -71,7 +71,7 @@ KMMsgPartDialog::KMMsgPartDialog( const TQString & caption, // row 0: Type combobox: mMimeType = new KComboBox( true, plainPage() ); mMimeType->setInsertionPolicy( TQComboBox::NoInsertion ); - mMimeType->setValidator( new KMimeTypeValidator( TQT_TQOBJECT(mMimeType) ) ); + mMimeType->setValidator( new KMimeTypeValidator( mMimeType ) ); mMimeType->insertStringList( TQStringList() << TQString::fromLatin1("text/html") << TQString::fromLatin1("text/plain") @@ -81,15 +81,15 @@ KMMsgPartDialog::KMMsgPartDialog( const TQString & caption, << TQString::fromLatin1("application/octet-stream") << TQString::fromLatin1("application/x-gunzip") << TQString::fromLatin1("application/zip") ); - connect( mMimeType, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(slotMimeTypeChanged(const TQString&)) ); + connect( mMimeType, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(slotMimeTypeChanged(const TQString&)) ); glay->addWidget( mMimeType, 0, 1 ); msg = i18n("<qt><p>The <em>MIME type</em> of the file:</p>" "<p>normally, you do not need to touch this setting, since the " "type of the file is automatically checked; but, sometimes, %1 " "may not detect the type correctly -- here is where you can fix " - "that.</p></qt>").arg( kapp->aboutData()->programName() ); + "that.</p></qt>").arg( tdeApp->aboutData()->programName() ); TQWhatsThis::add( mMimeType, msg ); // row 1: Size label: @@ -102,7 +102,7 @@ KMMsgPartDialog::KMMsgPartDialog( const TQString & caption, "because calculating the exact size would take too much time; " "when this is the case, it will be made visible by adding " "\"(est.)\" to the size displayed.</p></qt>") - .arg( kapp->aboutData()->programName() ); + .arg( tdeApp->aboutData()->programName() ); TQWhatsThis::add( mSize, msg ); // row 2: "Name" lineedit and label: @@ -148,7 +148,7 @@ KMMsgPartDialog::KMMsgPartDialog( const TQString & caption, "binary data, but consists of pure text -- in this case, choosing " "\"quoted-printable\" over the default \"base64\" will save up " "to 25% in resulting message size.</p></qt>") - .arg( kapp->aboutData()->programName() ); + .arg( tdeApp->aboutData()->programName() ); TQWhatsThis::add( label, msg ); TQWhatsThis::add( mEncoding, msg ); diff --git a/kmail/kmmsgpartdlg.h b/kmail/kmmsgpartdlg.h index 0132be01..29ccd318 100644 --- a/kmail/kmmsgpartdlg.h +++ b/kmail/kmmsgpartdlg.h @@ -38,7 +38,7 @@ class TQLineEdit; */ class KMMsgPartDialog: public KDialogBase { - Q_OBJECT + TQ_OBJECT public: @@ -139,10 +139,10 @@ protected: @author Marc Mutz <mutz@kde.org> */ class KMMsgPartDialogCompat : public KMMsgPartDialog { - Q_OBJECT + TQ_OBJECT public: - KMMsgPartDialogCompat( TQWidget * parent=0, const char * caption=0, bool=FALSE ); + KMMsgPartDialogCompat( TQWidget * parent=0, const char * caption=0, bool=false ); virtual ~KMMsgPartDialogCompat(); /** Display information about this message part. */ diff --git a/kmail/kmpopfiltercnfrmdlg.cpp b/kmail/kmpopfiltercnfrmdlg.cpp index 3689e663..9e18532d 100644 --- a/kmail/kmpopfiltercnfrmdlg.cpp +++ b/kmail/kmpopfiltercnfrmdlg.cpp @@ -61,8 +61,8 @@ KMPopHeadersView::KMPopHeadersView(TQWidget *aParent, KMPopFilterCnfrmDlg *aDial //we rely on fixed column order, so we forbid this header()->setMovingEnabled(false); - connect(this, TQT_SIGNAL(pressed(TQListViewItem*, const TQPoint&, int)), - TQT_SLOT(slotPressed(TQListViewItem*, const TQPoint&, int))); + connect(this, TQ_SIGNAL(pressed(TQListViewItem*, const TQPoint&, int)), + TQ_SLOT(slotPressed(TQListViewItem*, const TQPoint&, int))); } KMPopHeadersView::~KMPopHeadersView() @@ -363,15 +363,15 @@ KMPopFilterCnfrmDlg::KMPopFilterCnfrmDlg(TQPtrList<KMPopHeaders> *aHeaders, cons lowerBox->setTitle(i18n("Ruleset Filtered Messages: %1").arg(rulesetCount)); // connect signals and slots - connect(lv, TQT_SIGNAL(pressed(TQListViewItem*, const TQPoint&, int)), - this, TQT_SLOT(slotPressed(TQListViewItem*, const TQPoint&, int))); - connect(mFilteredHeaders, TQT_SIGNAL(pressed(TQListViewItem*, const TQPoint&, int)), - this, TQT_SLOT(slotPressed(TQListViewItem*, const TQPoint&, int))); - connect(cb, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(slotToggled(bool))); + connect(lv, TQ_SIGNAL(pressed(TQListViewItem*, const TQPoint&, int)), + this, TQ_SLOT(slotPressed(TQListViewItem*, const TQPoint&, int))); + connect(mFilteredHeaders, TQ_SIGNAL(pressed(TQListViewItem*, const TQPoint&, int)), + this, TQ_SLOT(slotPressed(TQListViewItem*, const TQPoint&, int))); + connect(cb, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(slotToggled(bool))); adjustSize(); - TQTimer::singleShot(0, this, TQT_SLOT(slotUpdateMinimumSize())); + TQTimer::singleShot(0, this, TQ_SLOT(slotUpdateMinimumSize())); } KMPopFilterCnfrmDlg::~KMPopFilterCnfrmDlg() @@ -459,7 +459,7 @@ void KMPopFilterCnfrmDlg::slotToggled(bool aOn) mFilteredHeaders->hide(); } } - TQTimer::singleShot(0, this, TQT_SLOT(slotUpdateMinimumSize())); + TQTimer::singleShot(0, this, TQ_SLOT(slotUpdateMinimumSize())); } void KMPopFilterCnfrmDlg::slotUpdateMinimumSize() diff --git a/kmail/kmpopfiltercnfrmdlg.h b/kmail/kmpopfiltercnfrmdlg.h index bb545305..f2fc4f80 100644 --- a/kmail/kmpopfiltercnfrmdlg.h +++ b/kmail/kmpopfiltercnfrmdlg.h @@ -35,7 +35,7 @@ class KMPopFilterCnfrmDlg; */ class KMPopHeadersView : public TDEListView { - Q_OBJECT + TQ_OBJECT public: @@ -78,7 +78,7 @@ protected: class KMPopFilterCnfrmDlg : public KDialogBase { friend class ::KMPopHeadersView; - Q_OBJECT + TQ_OBJECT protected: KMPopFilterCnfrmDlg() { }; diff --git a/kmail/kmreadermainwin.cpp b/kmail/kmreadermainwin.cpp index 336d4c16..db42f3fa 100644 --- a/kmail/kmreadermainwin.cpp +++ b/kmail/kmreadermainwin.cpp @@ -50,7 +50,7 @@ #include "kmreadermainwin.h" -KMReaderMainWin::KMReaderMainWin( bool htmlOverride, bool htmlLoadExtOverride, +KMReaderMainWin::KMReaderMainWin( bool htmlOverride, bool htmlLoadExtDefault, char *name ) : KMail::SecondaryWindow( name ? name : "readerwindow#" ), mMsg( 0 ) @@ -59,7 +59,7 @@ KMReaderMainWin::KMReaderMainWin( bool htmlOverride, bool htmlLoadExtOverride, //mReaderWin->setShowCompleteMessage( true ); mReaderWin->setAutoDelete( true ); mReaderWin->setHtmlOverride( htmlOverride ); - mReaderWin->setHtmlLoadExtOverride( htmlLoadExtOverride ); + mReaderWin->setHtmlLoadExtDefault( htmlLoadExtDefault ); mReaderWin->setDecryptMessageOverwrite( true ); mReaderWin->setShowSignatureDetails( false ); initKMReaderMainWin(); @@ -103,8 +103,8 @@ void KMReaderMainWin::initKMReaderMainWin() { toolBar( "mainToolBar" )->hide(); } - connect( kmkernel, TQT_SIGNAL( configChanged() ), - this, TQT_SLOT( slotConfigChanged() ) ); + connect( kmkernel, TQ_SIGNAL( configChanged() ), + this, TQ_SLOT( slotConfigChanged() ) ); } void KMReaderMainWin::setupForwardingActionsList() @@ -156,7 +156,7 @@ void KMReaderMainWin::showMsg( const TQString & encoding, KMMessage *msg, menuBar()->show(); toolBar( "mainToolBar" )->show(); - connect ( msg->parent(), TQT_SIGNAL( destroyed( TQObject* ) ), this, TQT_SLOT( slotFolderRemoved( TQObject* ) ) ); + connect ( msg->parent(), TQ_SIGNAL( destroyed( TQObject* ) ), this, TQ_SLOT( slotFolderRemoved( TQObject* ) ) ); } @@ -241,8 +241,8 @@ void KMReaderMainWin::slotForwardInlineMsg() } else { command = new KMForwardInlineCommand( this, mReaderWin->message() ); } - connect( command, TQT_SIGNAL( completed( KMCommand * ) ), - this, TQT_SLOT( slotReplyOrForwardFinished() ) ); + connect( command, TQ_SIGNAL( completed( KMCommand * ) ), + this, TQ_SLOT( slotReplyOrForwardFinished() ) ); command->start(); } @@ -256,8 +256,8 @@ void KMReaderMainWin::slotForwardAttachedMsg() } else { command = new KMForwardAttachedCommand( this, mReaderWin->message() ); } - connect( command, TQT_SIGNAL( completed( KMCommand * ) ), - this, TQT_SLOT( slotReplyOrForwardFinished() ) ); + connect( command, TQ_SIGNAL( completed( KMCommand * ) ), + this, TQ_SLOT( slotReplyOrForwardFinished() ) ); command->start(); } @@ -271,8 +271,8 @@ void KMReaderMainWin::slotForwardDigestMsg() } else { command = new KMForwardDigestCommand( this, mReaderWin->message() ); } - connect( command, TQT_SIGNAL( completed( KMCommand * ) ), - this, TQT_SLOT( slotReplyOrForwardFinished() ) ); + connect( command, TQ_SIGNAL( completed( KMCommand * ) ), + this, TQ_SLOT( slotReplyOrForwardFinished() ) ); command->start(); } @@ -280,8 +280,8 @@ void KMReaderMainWin::slotForwardDigestMsg() void KMReaderMainWin::slotRedirectMsg() { KMCommand *command = new KMRedirectCommand( this, mReaderWin->message() ); - connect( command, TQT_SIGNAL( completed( KMCommand * ) ), - this, TQT_SLOT( slotReplyOrForwardFinished() ) ); + connect( command, TQ_SIGNAL( completed( KMCommand * ) ), + this, TQ_SLOT( slotReplyOrForwardFinished() ) ); command->start(); } @@ -299,7 +299,7 @@ void KMReaderMainWin::slotShowMsgSrc() //----------------------------------------------------------------------------- void KMReaderMainWin::setupForwardActions() { - disconnect( mForwardActionMenu, TQT_SIGNAL( activated() ), 0, 0 ); + disconnect( mForwardActionMenu, TQ_SIGNAL( activated() ), 0, 0 ); mForwardActionMenu->remove( mForwardInlineAction ); mForwardActionMenu->remove( mForwardAttachedAction ); @@ -308,16 +308,16 @@ void KMReaderMainWin::setupForwardActions() mForwardActionMenu->insert( mForwardAttachedAction, 1 ); mForwardInlineAction->setShortcut( Key_F ); mForwardAttachedAction->setShortcut( SHIFT+Key_F ); - connect( mForwardActionMenu, TQT_SIGNAL(activated()), this, - TQT_SLOT(slotForwardInlineMsg()) ); + connect( mForwardActionMenu, TQ_SIGNAL(activated()), this, + TQ_SLOT(slotForwardInlineMsg()) ); } else { mForwardActionMenu->insert( mForwardAttachedAction, 0 ); mForwardActionMenu->insert( mForwardInlineAction, 1 ); mForwardInlineAction->setShortcut( SHIFT+Key_F ); mForwardAttachedAction->setShortcut( Key_F ); - connect( mForwardActionMenu, TQT_SIGNAL(activated()), this, - TQT_SLOT(slotForwardAttachedMsg()) ); + connect( mForwardActionMenu, TQ_SIGNAL(activated()), this, + TQ_SLOT(slotForwardAttachedMsg()) ); } } @@ -336,42 +336,42 @@ void KMReaderMainWin::setupAccel() mMsgActions = new KMail::MessageActions( actionCollection(), this ); mMsgActions->setMessageView( mReaderWin ); - connect( mMsgActions, TQT_SIGNAL( replyActionFinished() ), - this, TQT_SLOT( slotReplyOrForwardFinished() ) ); + connect( mMsgActions, TQ_SIGNAL( replyActionFinished() ), + this, TQ_SLOT( slotReplyOrForwardFinished() ) ); //----- File Menu - //mOpenAction = KStdAction::open( this, TQT_SLOT( slotOpenMsg() ), + //mOpenAction = KStdAction::open( this, TQ_SLOT( slotOpenMsg() ), // actionCollection() ); //mSaveAsAction = new TDEAction( i18n("Save &As..."), "document-save", // TDEStdAccel::shortcut( TDEStdAccel::Save ), - // this, TQT_SLOT( slotSaveMsg() ), + // this, TQ_SLOT( slotSaveMsg() ), // actionCollection(), "file_save_as" ); - mSaveAsAction = KStdAction::saveAs( TQT_TQOBJECT(mReaderWin), TQT_SLOT( slotSaveMsg() ), + mSaveAsAction = KStdAction::saveAs( mReaderWin, TQ_SLOT( slotSaveMsg() ), actionCollection() ); mSaveAsAction->setShortcut( TDEStdAccel::shortcut( TDEStdAccel::Save ) ); - mPrintAction = KStdAction::print( TQT_TQOBJECT(this), TQT_SLOT( slotPrintMsg() ), + mPrintAction = KStdAction::print( this, TQ_SLOT( slotPrintMsg() ), actionCollection() ); - TDEAction *closeAction = KStdAction::close( TQT_TQOBJECT(this), TQT_SLOT( close() ), actionCollection() ); + TDEAction *closeAction = KStdAction::close( this, TQ_SLOT( close() ), actionCollection() ); TDEShortcut closeShortcut = closeAction->shortcut(); closeShortcut.append( KKey(Key_Escape)); closeAction->setShortcut(closeShortcut); //----- Edit Menu - KStdAction::copy( TQT_TQOBJECT(this), TQT_SLOT( slotCopy() ), actionCollection() ); - KStdAction::selectAll( TQT_TQOBJECT(this), TQT_SLOT( slotMarkAll() ), actionCollection() ); - KStdAction::find( TQT_TQOBJECT(this), TQT_SLOT(slotFind()), actionCollection() ); - KStdAction::findNext( TQT_TQOBJECT(this), TQT_SLOT( slotFindNext() ), actionCollection() ); + KStdAction::copy( this, TQ_SLOT( slotCopy() ), actionCollection() ); + KStdAction::selectAll( this, TQ_SLOT( slotMarkAll() ), actionCollection() ); + KStdAction::find( this, TQ_SLOT(slotFind()), actionCollection() ); + KStdAction::findNext( this, TQ_SLOT( slotFindNext() ), actionCollection() ); mTrashAction = new TDEAction( KGuiItem( i18n( "&Move to Trash" ), "edittrash", i18n( "Move message to trashcan" ) ), - Key_Delete, TQT_TQOBJECT(this), TQT_SLOT( slotTrashMsg() ), + Key_Delete, this, TQ_SLOT( slotTrashMsg() ), actionCollection(), "move_to_trash" ); //----- View Menu - mViewSourceAction = new TDEAction( i18n("&View Source"), Key_V, TQT_TQOBJECT(this), - TQT_SLOT(slotShowMsgSrc()), actionCollection(), + mViewSourceAction = new TDEAction( i18n("&View Source"), Key_V, this, + TQ_SLOT(slotShowMsgSrc()), actionCollection(), "view_source" ); @@ -379,26 +379,26 @@ void KMReaderMainWin::setupAccel() "mail-forward", actionCollection(), "message_forward" ); mForwardInlineAction = new TDEAction( i18n("&Inline..."), - "mail-forward", SHIFT+Key_F, TQT_TQOBJECT(this), - TQT_SLOT(slotForwardInlineMsg()), + "mail-forward", SHIFT+Key_F, this, + TQ_SLOT(slotForwardInlineMsg()), actionCollection(), "message_forward_inline" ); mForwardAttachedAction = new TDEAction( i18n("Message->Forward->","As &Attachment..."), - "mail-forward", Key_F, TQT_TQOBJECT(this), - TQT_SLOT(slotForwardAttachedMsg()), + "mail-forward", Key_F, this, + TQ_SLOT(slotForwardAttachedMsg()), actionCollection(), "message_forward_as_attachment" ); mForwardDigestAction = new TDEAction( i18n("Message->Forward->","As Di&gest..."), - "mail-forward", 0, TQT_TQOBJECT(this), - TQT_SLOT(slotForwardDigestMsg()), + "mail-forward", 0, this, + TQ_SLOT(slotForwardDigestMsg()), actionCollection(), "message_forward_as_digest" ); mRedirectAction = new TDEAction( i18n("Message->Forward->","&Redirect..."), - "mail-forward", Key_E, TQT_TQOBJECT(this), - TQT_SLOT(slotRedirectMsg()), + "mail-forward", Key_E, this, + TQ_SLOT(slotRedirectMsg()), actionCollection(), "message_forward_redirect" ); @@ -410,32 +410,32 @@ void KMReaderMainWin::setupAccel() fontAction = new TDEFontAction( "Select Font", 0, actionCollection(), "text_font" ); fontAction->setFont( mReaderWin->cssHelper()->bodyFont().family() ); - connect( fontAction, TQT_SIGNAL( activated( const TQString& ) ), - TQT_SLOT( slotFontAction( const TQString& ) ) ); + connect( fontAction, TQ_SIGNAL( activated( const TQString& ) ), + TQ_SLOT( slotFontAction( const TQString& ) ) ); fontSizeAction = new TDEFontSizeAction( "Select Size", 0, actionCollection(), "text_size" ); fontSizeAction->setFontSize( mReaderWin->cssHelper()->bodyFont().pointSize() ); - connect( fontSizeAction, TQT_SIGNAL( fontSizeChanged( int ) ), - TQT_SLOT( slotSizeAction( int ) ) ); + connect( fontSizeAction, TQ_SIGNAL( fontSizeChanged( int ) ), + TQ_SLOT( slotSizeAction( int ) ) ); TQAccel *accel = new TQAccel(mReaderWin, "showMsg()"); accel->connectItem(accel->insertItem(Key_Up), - mReaderWin, TQT_SLOT(slotScrollUp())); + mReaderWin, TQ_SLOT(slotScrollUp())); accel->connectItem(accel->insertItem(Key_Down), - mReaderWin, TQT_SLOT(slotScrollDown())); + mReaderWin, TQ_SLOT(slotScrollDown())); accel->connectItem(accel->insertItem(Key_Prior), - mReaderWin, TQT_SLOT(slotScrollPrior())); + mReaderWin, TQ_SLOT(slotScrollPrior())); accel->connectItem(accel->insertItem(Key_Next), - mReaderWin, TQT_SLOT(slotScrollNext())); + mReaderWin, TQ_SLOT(slotScrollNext())); accel->connectItem(accel->insertItem(TDEStdAccel::shortcut(TDEStdAccel::Copy)), - mReaderWin, TQT_SLOT(slotCopySelectedText())); - connect( mReaderWin, TQT_SIGNAL(popupMenu(KMMessage&,const KURL&,const TQPoint&)), - this, TQT_SLOT(slotMsgPopup(KMMessage&,const KURL&,const TQPoint&))); - connect(mReaderWin, TQT_SIGNAL(urlClicked(const KURL&,int)), - mReaderWin, TQT_SLOT(slotUrlClicked())); + mReaderWin, TQ_SLOT(slotCopySelectedText())); + connect( mReaderWin, TQ_SIGNAL(popupMenu(KMMessage&,const KURL&,const TQPoint&)), + this, TQ_SLOT(slotMsgPopup(KMMessage&,const KURL&,const TQPoint&))); + connect(mReaderWin, TQ_SIGNAL(urlClicked(const KURL&,int)), + mReaderWin, TQ_SLOT(slotUrlClicked())); setStandardToolBarMenuEnabled(true); - KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(slotEditToolbars()), actionCollection()); + KStdAction::configureToolbars(this, TQ_SLOT(slotEditToolbars()), actionCollection()); } @@ -503,7 +503,7 @@ void KMReaderMainWin::slotMsgPopup(KMMessage &aMsg, const KURL &aUrl, const TQPo TQPopupMenu* copyMenu = new TQPopupMenu(menu); KMMainWidget* mainwin = kmkernel->getKMMainWidget(); if ( mainwin ) - mainwin->folderTree()->folderToPopupMenu( KMFolderTree::CopyMessage, TQT_TQOBJECT(this), + mainwin->folderTree()->folderToPopupMenu( KMFolderTree::CopyMessage, this, &mMenuToFolder, copyMenu ); menu->insertItem( i18n("&Copy To" ), copyMenu ); menu->insertSeparator(); @@ -513,7 +513,7 @@ void KMReaderMainWin::slotMsgPopup(KMMessage &aMsg, const KURL &aUrl, const TQPo menu->insertSeparator(); mPrintAction->plug( menu ); mSaveAsAction->plug( menu ); - menu->insertItem( i18n("Save Attachments..."), mReaderWin, TQT_SLOT(slotSaveAttachments()) ); + menu->insertItem( i18n("Save Attachments..."), mReaderWin, TQ_SLOT(slotSaveAttachments()) ); mMsgActions->createTodoAction()->plug( menu ); } menu->exec(aPoint, 0); @@ -561,7 +561,7 @@ void KMReaderMainWin::slotEditToolbars() { saveMainWindowSettings( KMKernel::config(), "ReaderWindow" ); KEditToolbar dlg( guiFactory(), this ); - connect( &dlg, TQT_SIGNAL(newToolbarConfig()), TQT_SLOT(slotUpdateToolbars()) ); + connect( &dlg, TQ_SIGNAL(newToolbarConfig()), TQ_SLOT(slotUpdateToolbars()) ); dlg.exec(); } diff --git a/kmail/kmreadermainwin.h b/kmail/kmreadermainwin.h index 2101fcb5..2a753b95 100644 --- a/kmail/kmreadermainwin.h +++ b/kmail/kmreadermainwin.h @@ -22,11 +22,11 @@ class MessageActions; class KMReaderMainWin : public KMail::SecondaryWindow { - Q_OBJECT + TQ_OBJECT public: - KMReaderMainWin( bool htmlOverride, bool htmlLoadExtOverride, char *name = 0 ); + KMReaderMainWin( bool htmlOverride, bool htmlLoadExtDefault, char *name = 0 ); KMReaderMainWin( char *name = 0 ); KMReaderMainWin(KMMessagePart* aMsgPart, bool aHTML, const TQString& aFileName, const TQString& pname, diff --git a/kmail/kmreaderwin.cpp b/kmail/kmreaderwin.cpp index 184167b0..6a73b261 100644 --- a/kmail/kmreaderwin.cpp +++ b/kmail/kmreaderwin.cpp @@ -64,7 +64,6 @@ using KMail::FileHtmlWriter; using KMail::TeeHtmlWriter; #endif -#include <kasciistringtools.h> #include <kstringhandler.h> #include <mimelib/mimepp.h> @@ -93,21 +92,21 @@ using KMail::TeeHtmlWriter; #include <kuserprofile.h> #include <kcharsets.h> #include <tdepopupmenu.h> -#include <kstandarddirs.h> // Sven's : for access and getpid +#include <tdestandarddirs.h> // Sven's : for access and getpid #include <kcursor.h> #include <kdebug.h> #include <tdefiledialog.h> #include <tdelocale.h> #include <tdemessagebox.h> +#include <tdeglobal.h> #include <tdeglobalsettings.h> #include <krun.h> #include <tdetempfile.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <kdialog.h> #include <tdeaction.h> #include <kiconloader.h> #include <kmdcodec.h> -#include <kasciistricmp.h> #include <kurldrag.h> #include <tqclipboard.h> @@ -385,7 +384,7 @@ kdDebug(5006) << " Root node will NOT be replaced." << endl void KMReaderWin::createWidgets() { TQVBoxLayout * vlay = new TQVBoxLayout( this ); - mSplitter = new TQSplitter( Qt::Vertical, this, "mSplitter" ); + mSplitter = new TQSplitter( TQt::Vertical, this, "mSplitter" ); vlay->addWidget( mSplitter ); mMimePartTree = new KMMimePartTree( this, mSplitter, "mMimePartTree" ); mBox = new TQHBox( mSplitter, "mBox" ); @@ -464,18 +463,19 @@ KMReaderWin::KMReaderWin(TQWidget *aParent, readConfig(); mHtmlOverride = false; + mHtmlLoadExtDefault = false; mHtmlLoadExtOverride = false; mLevelQuote = GlobalSettings::self()->collapseQuoteLevelSpin() - 1; - connect( &mUpdateReaderWinTimer, TQT_SIGNAL(timeout()), - TQT_TQOBJECT(this), TQT_SLOT(updateReaderWin()) ); - connect( &mResizeTimer, TQT_SIGNAL(timeout()), - TQT_TQOBJECT(this), TQT_SLOT(slotDelayedResize()) ); - connect( &mDelayedMarkTimer, TQT_SIGNAL(timeout()), - TQT_TQOBJECT(this), TQT_SLOT(slotTouchMessage()) ); - connect( &mHeaderRefreshTimer, TQT_SIGNAL(timeout()), - TQT_TQOBJECT(this), TQT_SLOT(updateHeader()) ); + connect( &mUpdateReaderWinTimer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(updateReaderWin()) ); + connect( &mResizeTimer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(slotDelayedResize()) ); + connect( &mDelayedMarkTimer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(slotTouchMessage()) ); + connect( &mHeaderRefreshTimer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(updateHeader()) ); } @@ -490,46 +490,46 @@ void KMReaderWin::createActions( TDEActionCollection * ac ) { new TDEActionMenu( i18n("View->", "&Headers"), ac, "view_headers" ); headerMenu->setToolTip( i18n("Choose display style of message headers") ); - connect( headerMenu, TQT_SIGNAL(activated()), - TQT_TQOBJECT(this), TQT_SLOT(slotCycleHeaderStyles()) ); + connect( headerMenu, TQ_SIGNAL(activated()), + this, TQ_SLOT(slotCycleHeaderStyles()) ); raction = new TDERadioAction( i18n("View->headers->", "&Enterprise Headers"), 0, - TQT_TQOBJECT(this), TQT_SLOT(slotEnterpriseHeaders()), + this, TQ_SLOT(slotEnterpriseHeaders()), ac, "view_headers_enterprise" ); raction->setToolTip( i18n("Show the list of headers in Enterprise style") ); raction->setExclusiveGroup( "view_headers_group" ); headerMenu->insert(raction); raction = new TDERadioAction( i18n("View->headers->", "&Fancy Headers"), 0, - TQT_TQOBJECT(this), TQT_SLOT(slotFancyHeaders()), + this, TQ_SLOT(slotFancyHeaders()), ac, "view_headers_fancy" ); raction->setToolTip( i18n("Show the list of headers in a fancy format") ); raction->setExclusiveGroup( "view_headers_group" ); headerMenu->insert( raction ); raction = new TDERadioAction( i18n("View->headers->", "&Brief Headers"), 0, - TQT_TQOBJECT(this), TQT_SLOT(slotBriefHeaders()), + this, TQ_SLOT(slotBriefHeaders()), ac, "view_headers_brief" ); raction->setToolTip( i18n("Show brief list of message headers") ); raction->setExclusiveGroup( "view_headers_group" ); headerMenu->insert( raction ); raction = new TDERadioAction( i18n("View->headers->", "&Standard Headers"), 0, - TQT_TQOBJECT(this), TQT_SLOT(slotStandardHeaders()), + this, TQ_SLOT(slotStandardHeaders()), ac, "view_headers_standard" ); raction->setToolTip( i18n("Show standard list of message headers") ); raction->setExclusiveGroup( "view_headers_group" ); headerMenu->insert( raction ); raction = new TDERadioAction( i18n("View->headers->", "&Long Headers"), 0, - TQT_TQOBJECT(this), TQT_SLOT(slotLongHeaders()), + this, TQ_SLOT(slotLongHeaders()), ac, "view_headers_long" ); raction->setToolTip( i18n("Show long list of message headers") ); raction->setExclusiveGroup( "view_headers_group" ); headerMenu->insert( raction ); raction = new TDERadioAction( i18n("View->headers->", "&All Headers"), 0, - TQT_TQOBJECT(this), TQT_SLOT(slotAllHeaders()), + this, TQ_SLOT(slotAllHeaders()), ac, "view_headers_all" ); raction->setToolTip( i18n("Show all message headers") ); raction->setExclusiveGroup( "view_headers_group" ); @@ -539,39 +539,39 @@ void KMReaderWin::createActions( TDEActionCollection * ac ) { TDEActionMenu *attachmentMenu = new TDEActionMenu( i18n("View->", "&Attachments"), ac, "view_attachments" ); attachmentMenu->setToolTip( i18n("Choose display style of attachments") ); - connect( attachmentMenu, TQT_SIGNAL(activated()), - TQT_TQOBJECT(this), TQT_SLOT(slotCycleAttachmentStrategy()) ); + connect( attachmentMenu, TQ_SIGNAL(activated()), + this, TQ_SLOT(slotCycleAttachmentStrategy()) ); raction = new TDERadioAction( i18n("View->attachments->", "&As Icons"), 0, - TQT_TQOBJECT(this), TQT_SLOT(slotIconicAttachments()), + this, TQ_SLOT(slotIconicAttachments()), ac, "view_attachments_as_icons" ); raction->setToolTip( i18n("Show all attachments as icons. Click to see them.") ); raction->setExclusiveGroup( "view_attachments_group" ); attachmentMenu->insert( raction ); raction = new TDERadioAction( i18n("View->attachments->", "&Smart"), 0, - TQT_TQOBJECT(this), TQT_SLOT(slotSmartAttachments()), + this, TQ_SLOT(slotSmartAttachments()), ac, "view_attachments_smart" ); raction->setToolTip( i18n("Show attachments as suggested by sender.") ); raction->setExclusiveGroup( "view_attachments_group" ); attachmentMenu->insert( raction ); raction = new TDERadioAction( i18n("View->attachments->", "&Inline"), 0, - TQT_TQOBJECT(this), TQT_SLOT(slotInlineAttachments()), + this, TQ_SLOT(slotInlineAttachments()), ac, "view_attachments_inline" ); raction->setToolTip( i18n("Show all attachments inline (if possible)") ); raction->setExclusiveGroup( "view_attachments_group" ); attachmentMenu->insert( raction ); raction = new TDERadioAction( i18n("View->attachments->", "&Hide"), 0, - TQT_TQOBJECT(this), TQT_SLOT(slotHideAttachments()), + this, TQ_SLOT(slotHideAttachments()), ac, "view_attachments_hide" ); raction->setToolTip( i18n("Do not show attachments in the message viewer") ); raction->setExclusiveGroup( "view_attachments_group" ); attachmentMenu->insert( raction ); mHeaderOnlyAttachmentsAction = new TDERadioAction( i18n( "View->attachments->", "In Header &Only" ), 0, - TQT_TQOBJECT(this), TQT_SLOT( slotHeaderOnlyAttachments() ), + this, TQ_SLOT( slotHeaderOnlyAttachments() ), ac, "view_attachments_headeronly" ); mHeaderOnlyAttachmentsAction->setToolTip( i18n( "Show Attachments only in the header of the mail" ) ); mHeaderOnlyAttachmentsAction->setExclusiveGroup( "view_attachments_group" ); @@ -579,7 +579,7 @@ void KMReaderWin::createActions( TDEActionCollection * ac ) { // Set Encoding submenu mSelectEncodingAction = new TDESelectAction( i18n( "&Set Encoding" ), "charset", 0, - TQT_TQOBJECT(this), TQT_SLOT( slotSetEncoding() ), + this, TQ_SLOT( slotSetEncoding() ), ac, "encoding" ); TQStringList encodings = KMMsgBase::supportedEncodings( false ); encodings.prepend( i18n( "Auto" ) ); @@ -587,45 +587,45 @@ void KMReaderWin::createActions( TDEActionCollection * ac ) { mSelectEncodingAction->setCurrentItem( 0 ); mMailToComposeAction = new TDEAction( i18n("New Message To..."), "mail-message-new", - 0, TQT_TQOBJECT(this), TQT_SLOT(slotMailtoCompose()), ac, + 0, this, TQ_SLOT(slotMailtoCompose()), ac, "mailto_compose" ); mMailToReplyAction = new TDEAction( i18n("Reply To..."), "mail-reply-sender", - 0, TQT_TQOBJECT(this), TQT_SLOT(slotMailtoReply()), ac, + 0, this, TQ_SLOT(slotMailtoReply()), ac, "mailto_reply" ); mMailToForwardAction = new TDEAction( i18n("Forward To..."), "mail-forward", - 0, TQT_TQOBJECT(this), TQT_SLOT(slotMailtoForward()), ac, + 0, this, TQ_SLOT(slotMailtoForward()), ac, "mailto_forward" ); mAddAddrBookAction = new TDEAction( i18n("Add to Address Book"), - 0, TQT_TQOBJECT(this), TQT_SLOT(slotMailtoAddAddrBook()), + 0, this, TQ_SLOT(slotMailtoAddAddrBook()), ac, "add_addr_book" ); mOpenAddrBookAction = new TDEAction( i18n("Open in Address Book"), - 0, TQT_TQOBJECT(this), TQT_SLOT(slotMailtoOpenAddrBook()), + 0, this, TQ_SLOT(slotMailtoOpenAddrBook()), ac, "openin_addr_book" ); - mCopyAction = KStdAction::copy( TQT_TQOBJECT(this), TQT_SLOT(slotCopySelectedText()), ac, "kmail_copy"); - mSelectAllAction = new TDEAction( i18n("Select All Text"), CTRL+SHIFT+Key_A, TQT_TQOBJECT(this), - TQT_SLOT(selectAll()), ac, "mark_all_text" ); - mCopyURLAction = new TDEAction( i18n("Copy Link Address"), 0, TQT_TQOBJECT(this), - TQT_SLOT(slotUrlCopy()), ac, "copy_url" ); - mUrlOpenAction = new TDEAction( i18n("Open URL"), 0, TQT_TQOBJECT(this), - TQT_SLOT(slotUrlOpen()), ac, "open_url" ); + mCopyAction = KStdAction::copy( this, TQ_SLOT(slotCopySelectedText()), ac, "kmail_copy"); + mSelectAllAction = new TDEAction( i18n("Select All Text"), CTRL+SHIFT+Key_A, this, + TQ_SLOT(selectAll()), ac, "mark_all_text" ); + mCopyURLAction = new TDEAction( i18n("Copy Link Address"), 0, this, + TQ_SLOT(slotUrlCopy()), ac, "copy_url" ); + mUrlOpenAction = new TDEAction( i18n("Open URL"), 0, this, + TQ_SLOT(slotUrlOpen()), ac, "open_url" ); mAddBookmarksAction = new TDEAction( i18n("Bookmark This Link"), "bookmark_add", - 0, TQT_TQOBJECT(this), TQT_SLOT(slotAddBookmarks()), + 0, this, TQ_SLOT(slotAddBookmarks()), ac, "add_bookmarks" ); - mUrlSaveAsAction = new TDEAction( i18n("Save Link As..."), 0, TQT_TQOBJECT(this), - TQT_SLOT(slotUrlSave()), ac, "saveas_url" ); + mUrlSaveAsAction = new TDEAction( i18n("Save Link As..."), 0, this, + TQ_SLOT(slotUrlSave()), ac, "saveas_url" ); mToggleFixFontAction = new TDEToggleAction( i18n("Use Fi&xed Font"), - Key_X, TQT_TQOBJECT(this), TQT_SLOT(slotToggleFixedFont()), + Key_X, this, TQ_SLOT(slotToggleFixedFont()), ac, "toggle_fixedfont" ); mToggleMimePartTreeAction = new TDEToggleAction( i18n("Show Message Structure"), 0, ac, "toggle_mimeparttree" ); - connect(mToggleMimePartTreeAction, TQT_SIGNAL(toggled(bool)), - TQT_TQOBJECT(this), TQT_SLOT(slotToggleMimePartTree())); + connect(mToggleMimePartTreeAction, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(slotToggleMimePartTree())); - mStartIMChatAction = new TDEAction( i18n("Chat &With..."), 0, TQT_TQOBJECT(this), - TQT_SLOT(slotIMChat()), ac, "start_im_chat" ); + mStartIMChatAction = new TDEAction( i18n("Chat &With..."), 0, this, + TQ_SLOT(slotIMChat()), ac, "start_im_chat" ); } // little helper function @@ -902,7 +902,6 @@ void KMReaderWin::readConfig(void) mToggleFixFontAction->setChecked( mUseFixedFont ); mHtmlMail = reader.readBoolEntry( "htmlMail", false ); - mHtmlLoadExternal = reader.readBoolEntry( "htmlLoadExternal", false ); setHeaderStyleAndStrategy( HeaderStyle::create( reader.readEntry( "header-style", "fancy" ) ), HeaderStrategy::create( reader.readEntry( "header-set-displayed", "rich" ) ) ); @@ -1000,7 +999,7 @@ void KMReaderWin::writeConfig( bool sync ) const { //----------------------------------------------------------------------------- void KMReaderWin::initHtmlWidget(void) { - mViewer->widget()->setFocusPolicy(TQ_WheelFocus); + mViewer->widget()->setFocusPolicy(TQWidget::WheelFocus); // Let's better be paranoid and disable plugins (it defaults to enabled): mViewer->setPluginsEnabled(false); mViewer->setJScriptEnabled(false); // just make this explicit @@ -1021,17 +1020,17 @@ void KMReaderWin::initHtmlWidget(void) #endif connect(mViewer->browserExtension(), - TQT_SIGNAL(openURLRequest(const KURL &, const KParts::URLArgs &)),this, - TQT_SLOT(slotUrlOpen(const KURL &))); + TQ_SIGNAL(openURLRequest(const KURL &, const KParts::URLArgs &)),this, + TQ_SLOT(slotUrlOpen(const KURL &))); connect(mViewer->browserExtension(), - TQT_SIGNAL(createNewWindow(const KURL &, const KParts::URLArgs &)),this, - TQT_SLOT(slotUrlOpen(const KURL &))); - connect(mViewer,TQT_SIGNAL(popupMenu(const TQString &, const TQPoint &)), - TQT_SLOT(slotUrlPopup(const TQString &, const TQPoint &))); - connect( kmkernel->imProxy(), TQT_SIGNAL( sigContactPresenceChanged( const TQString & ) ), - TQT_TQOBJECT(this), TQT_SLOT( contactStatusChanged( const TQString & ) ) ); - connect( kmkernel->imProxy(), TQT_SIGNAL( sigPresenceInfoExpired() ), - TQT_TQOBJECT(this), TQT_SLOT( updateReaderWin() ) ); + TQ_SIGNAL(createNewWindow(const KURL &, const KParts::URLArgs &)),this, + TQ_SLOT(slotUrlOpen(const KURL &))); + connect(mViewer,TQ_SIGNAL(popupMenu(const TQString &, const TQPoint &)), + TQ_SLOT(slotUrlPopup(const TQString &, const TQPoint &))); + connect( kmkernel->imProxy(), TQ_SIGNAL( sigContactPresenceChanged( const TQString & ) ), + this, TQ_SLOT( contactStatusChanged( const TQString & ) ) ); + connect( kmkernel->imProxy(), TQ_SIGNAL( sigPresenceInfoExpired() ), + this, TQ_SLOT( updateReaderWin() ) ); } void KMReaderWin::contactStatusChanged( const TQString &uid) @@ -1298,7 +1297,7 @@ void KMReaderWin::displaySplashPage( const TQString &info ) TQString location = locate("data", "kmail/about/main.html"); TQString content = KPIM::kFileToString(location); content = content.arg( locate( "data", "libtdepim/about/kde_infopage.css" ) ); - if ( kapp->reverseLayout() ) + if ( tdeApp->reverseLayout() ) content = content.arg( "@import \"%1\";" ).arg( locate( "data", "libtdepim/about/kde_infopage_rtl.css" ) ); else content = content.arg( "" ); @@ -1408,8 +1407,6 @@ void KMReaderWin::updateReaderWin() { if (!mMsgDisplay) return; - mViewer->setOnlyLocalReferences(!htmlLoadExternal()); - htmlWriter()->reset(); KMFolder* folder = 0; @@ -1499,7 +1496,7 @@ void KMReaderWin::displayMessage() { htmlWriter()->queue("</body></html>"); htmlWriter()->flush(); - TQTimer::singleShot( 1, TQT_TQOBJECT(this), TQT_SLOT(injectAttachments()) ); + TQTimer::singleShot( 1, this, TQ_SLOT(injectAttachments()) ); } static bool message_was_saved_decrypted_before( const KMMessage * msg ) { @@ -1579,6 +1576,7 @@ void KMReaderWin::parseMsg(KMMessage* aMsg) // - this can only be done *after* calling parseObjectTree() KMMsgEncryptionState encryptionState = mRootNode->overallEncryptionState(); KMMsgSignatureState signatureState = mRootNode->overallSignatureState(); + mViewer->setOnlyLocalReferences(!htmlLoadExternal()); // Don't crash when switching message while GPG passphrase entry dialog is shown #53185 if (aMsg != message()) { displayMessage(); @@ -1776,8 +1774,12 @@ TQString KMReaderWin::writeMessagePartToTempFile( KMMessagePart* aMsgPart, int slashPos = fileName.findRev( '/' ); if( -1 != slashPos ) fileName = fileName.mid( slashPos + 1 ); - if( fileName.isEmpty() ) + if( fileName.isEmpty() ) { fileName = "unnamed"; + // Save html emails with extension + if ( aMsgPart->subtype() == DwMime::kSubtypeHtml ) + fileName += ".html"; + } fname += "/" + fileName; TQByteArray data = aMsgPart->bodyDecodedBinary(); @@ -1995,7 +1997,7 @@ void KMReaderWin::slotUrlOpen(const KURL &aUrl, const KParts::URLArgs &) return; kdWarning( 5006 ) << "KMReaderWin::slotOpenUrl(): Unhandled URL click!" << endl; - emit urlClicked( aUrl, Qt::LeftButton ); + emit urlClicked( aUrl, TQt::LeftButton ); } //----------------------------------------------------------------------------- @@ -2066,7 +2068,7 @@ void KMReaderWin::showAttachmentPopup( int id, const TQString & name, const TQPo menu->insertItem( i18n("Scroll To"), 10 ); } - connect(menu, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(slotHandleAttachment(int))); + connect(menu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotHandleAttachment(int))); menu->exec( p ,0 ); delete menu; } @@ -2106,8 +2108,8 @@ void KMReaderWin::slotHandleAttachment( int choice ) KMHandleAttachmentCommand* command = new KMHandleAttachmentCommand( node, message(), mAtmCurrent, mAtmCurrentName, KMHandleAttachmentCommand::AttachmentAction( choice ), 0, this ); - connect( command, TQT_SIGNAL( showAttachment( int, const TQString& ) ), - TQT_TQOBJECT(this), TQT_SLOT( slotAtmView( int, const TQString& ) ) ); + connect( command, TQ_SIGNAL( showAttachment( int, const TQString& ) ), + this, TQ_SLOT( slotAtmView( int, const TQString& ) ) ); command->start(); } else if ( choice == 7 ) { slotDeleteAttachment( node ); @@ -2161,7 +2163,7 @@ void KMReaderWin::slotToggleMimePartTree() //----------------------------------------------------------------------------- void KMReaderWin::slotCopySelectedText() { - kapp->clipboard()->setText( mViewer->selectedText() ); + tdeApp->clipboard()->setText( mViewer->selectedText() ); } @@ -2347,7 +2349,7 @@ void KMReaderWin::openAttachment( int id, const TQString & name ) } TQCString contentTypeStr( msgPart.typeStr() + '/' + msgPart.subtypeStr() ); - KPIM::kAsciiToLower( contentTypeStr.data() ); + kasciitolower( contentTypeStr.data() ); if ( qstrcmp( contentTypeStr, "text/x-vcard" ) == 0 ) { showVCard( &msgPart ); @@ -2394,8 +2396,8 @@ void KMReaderWin::openAttachment( int id, const TQString & name ) KMHandleAttachmentCommand* command = new KMHandleAttachmentCommand( node, message(), mAtmCurrent, mAtmCurrentName, KMHandleAttachmentCommand::Save, offer, this ); - connect( command, TQT_SIGNAL( showAttachment( int, const TQString& ) ), - TQT_TQOBJECT(this), TQT_SLOT( slotAtmView( int, const TQString& ) ) ); + connect( command, TQ_SIGNAL( showAttachment( int, const TQString& ) ), + this, TQ_SLOT( slotAtmView( int, const TQString& ) ) ); command->start(); } else if( choice == KMessageBox::No ) { // Open @@ -2404,8 +2406,8 @@ void KMReaderWin::openAttachment( int id, const TQString & name ) mAtmUpdate = true; KMHandleAttachmentCommand* command = new KMHandleAttachmentCommand( node, message(), mAtmCurrent, mAtmCurrentName, action, offer, this ); - connect( command, TQT_SIGNAL( showAttachment( int, const TQString& ) ), - TQT_TQOBJECT(this), TQT_SLOT( slotAtmView( int, const TQString& ) ) ); + connect( command, TQ_SIGNAL( showAttachment( int, const TQString& ) ), + this, TQ_SLOT( slotAtmView( int, const TQString& ) ) ); command->start(); } else { // Cancel kdDebug(5006) << "Canceled opening attachment" << endl; @@ -2463,7 +2465,7 @@ void KMReaderWin::slotDocumentChanged() void KMReaderWin::slotTextSelected(bool) { TQString temp = mViewer->selectedText(); - kapp->clipboard()->setText(temp); + tdeApp->clipboard()->setText(temp); } //----------------------------------------------------------------------------- @@ -2497,11 +2499,14 @@ void KMReaderWin::setHtmlOverride(bool override) //----------------------------------------------------------------------------- -void KMReaderWin::setHtmlLoadExtOverride(bool override) +void KMReaderWin::setHtmlLoadExtDefault(bool loadExtDefault) +{ + mHtmlLoadExtDefault = loadExtDefault; +} + +void KMReaderWin::setHtmlLoadExtOverride(bool loadExtOverride) { - mHtmlLoadExtOverride = override; - //if (message()) - // message()->setDecodeHTML(htmlMail()); + mHtmlLoadExtOverride = loadExtOverride; } @@ -2515,8 +2520,19 @@ bool KMReaderWin::htmlMail() //----------------------------------------------------------------------------- bool KMReaderWin::htmlLoadExternal() { - return ((mHtmlLoadExternal && !mHtmlLoadExtOverride) || - (!mHtmlLoadExternal && mHtmlLoadExtOverride)); + if (!mRootNode) + { + return mHtmlLoadExtOverride; + } + + // when displaying an encrypted message, only load external resources on explicit request + if (mRootNode->overallEncryptionState() != KMMsgNotEncrypted) + { + return mHtmlLoadExtOverride; + } + + return ((mHtmlLoadExtDefault && !mHtmlLoadExtOverride) || + (!mHtmlLoadExtDefault && mHtmlLoadExtOverride)); } @@ -2673,7 +2689,7 @@ KURL KMReaderWin::tempFileUrlFromPartNode( const partNode * node ) bool ok; int res = path.mid(left + 1, right - left - 1).toInt(&ok); if ( res == node->nodeId() ) - return KURL( path ); + return KURL::fromPathOrURL( path ); } return KURL(); } @@ -2741,14 +2757,14 @@ static TQString linkForNode( const DOM::Node &node ) bool KMReaderWin::eventFilter( TQObject *, TQEvent *e ) { if ( e->type() == TQEvent::MouseButtonPress ) { - TQMouseEvent* me = TQT_TQMOUSEEVENT(e); - if ( me->button() == Qt::LeftButton && ( me->state() & ShiftButton ) ) { + TQMouseEvent* me = static_cast<TQMouseEvent*>(e); + if ( me->button() == TQt::LeftButton && ( me->state() & ShiftButton ) ) { // special processing for shift+click URLHandlerManager::instance()->handleShiftClick( mHoveredUrl, this ); return true; } - if ( me->button() == Qt::LeftButton ) { + if ( me->button() == TQt::LeftButton ) { TQString imagePath; const DOM::Node nodeUnderMouse = mViewer->nodeUnderMouse(); @@ -2773,7 +2789,7 @@ bool KMReaderWin::eventFilter( TQObject *, TQEvent *e ) } if ( e->type() == TQEvent::MouseMove ) { - TQMouseEvent* me = TQT_TQMOUSEEVENT( e ); + TQMouseEvent* me = static_cast<TQMouseEvent*>( e ); // Handle this ourselves instead of connecting to mViewer::onURL(), since TDEHTML misses some // notifications in case we started a drag ourselves @@ -2788,8 +2804,8 @@ bool KMReaderWin::eventFilter( TQObject *, TQEvent *e ) // HACK: Send a mouse release event to the TDEHTMLView, as otherwise that will be missed in // case we started a drag. If the event is missed, the HTML view gets into a wrong // state, in which funny things like unsolicited drags start to happen. - TQMouseEvent mouseEvent( TQEvent::MouseButtonRelease, me->pos(), Qt::NoButton, Qt::NoButton ); - TQT_TQOBJECT( mViewer->view() )->eventFilter( mViewer->view()->viewport(), + TQMouseEvent mouseEvent( TQEvent::MouseButtonRelease, me->pos(), TQt::NoButton, TQt::NoButton ); + static_cast<TQObject*>(mViewer->view())->eventFilter( mViewer->view()->viewport(), &mouseEvent ); return true; } @@ -2840,10 +2856,10 @@ void KMReaderWin::slotDeleteAttachment(partNode * node) if ( msg && nodeId != -1 ) { KMDeleteAttachmentCommand* command = new KMDeleteAttachmentCommand( nodeId, msg, this ); command->start(); - connect( command, TQT_SIGNAL( completed( KMCommand * ) ), - TQT_TQOBJECT(this), TQT_SLOT( updateReaderWin() ) ); - connect( command, TQT_SIGNAL( completed( KMCommand * ) ), - TQT_TQOBJECT(this), TQT_SLOT( disconnectMsgAdded() ) ); + connect( command, TQ_SIGNAL( completed( KMCommand * ) ), + this, TQ_SLOT( updateReaderWin() ) ); + connect( command, TQ_SIGNAL( completed( KMCommand * ) ), + this, TQ_SLOT( disconnectMsgAdded() ) ); // ### HACK: Since the command will do delete + add, a new message will arrive. However, we don't // want the selection to change. Therefore, as soon as a new message arrives, select it, and then @@ -2851,8 +2867,8 @@ void KMReaderWin::slotDeleteAttachment(partNode * node) // Of course the are races, another message can arrive before ours, but we take the risk. // And it won't work properly with multiple main windows const KMHeaders * const headers = KMKernel::self()->getKMMainWidget()->headers(); - connect( headers, TQT_SIGNAL( msgAddedToListView( TQListViewItem* ) ), - TQT_TQOBJECT(this), TQT_SLOT( msgAdded( TQListViewItem* ) ) ); + connect( headers, TQ_SIGNAL( msgAddedToListView( TQListViewItem* ) ), + this, TQ_SLOT( msgAdded( TQListViewItem* ) ) ); } // If we are operating on a copy of parts of the message, make sure to update the copy as well. @@ -2877,8 +2893,8 @@ void KMReaderWin::msgAdded( TQListViewItem *item ) void KMReaderWin::disconnectMsgAdded() { const KMHeaders *const headers = KMKernel::self()->getKMMainWidget()->headers(); - disconnect( headers, TQT_SIGNAL( msgAddedToListView( TQListViewItem* ) ), - TQT_TQOBJECT(this), TQT_SLOT( msgAdded( TQListViewItem* ) ) ); + disconnect( headers, TQ_SIGNAL( msgAddedToListView( TQListViewItem* ) ), + this, TQ_SLOT( msgAdded( TQListViewItem* ) ) ); } void KMReaderWin::slotEditAttachment(partNode * node) @@ -3029,10 +3045,15 @@ TQString KMReaderWin::renderAttachments(partNode * node, const TQColor &bgColor } } else { partNode::AttachmentDisplayInfo info = node->attachmentDisplayInfo(); + + // Write HTML parts and attachments to disk to allow them to be opened + bool writePartToDisk = info.displayInHeader || node->msgPart().subtype() == DwMime::kSubtypeHtml; + if ( writePartToDisk ) + TQString fileName = writeMessagePartToTempFile( &node->msgPart(), node->nodeId() ); + if ( info.displayInHeader ) { html += "<div style=\"float:left;\">"; html += TQString::fromLatin1( "<span style=\"white-space:nowrap; border-width: 0px; border-left-width: 5px; border-color: %1; 2px; border-left-style: solid;\">" ).arg( bgColor.name() ); - TQString fileName = writeMessagePartToTempFile( &node->msgPart(), node->nodeId() ); TQString href = node->asHREF( "header" ); html += TQString::fromLatin1( "<a href=\"" ) + href + TQString::fromLatin1( "\">" ); diff --git a/kmail/kmreaderwin.h b/kmail/kmreaderwin.h index dfc4490c..df4d8845 100644 --- a/kmail/kmreaderwin.h +++ b/kmail/kmreaderwin.h @@ -73,7 +73,7 @@ namespace KParts { */ class KMReaderWin: public TQWidget, public KMail::Interface::Observer { - Q_OBJECT + TQ_OBJECT friend void KMMimePartTree::itemClicked( TQListViewItem* item ); @@ -101,7 +101,7 @@ public: /** Read settings from app's config file. */ void readConfig(); - /** Write settings to app's config file. Calls sync() if withSync is TRUE. */ + /** Write settings to app's config file. Calls sync() if withSync is true. */ void writeConfig( bool withSync=true ) const; const KMail::HeaderStyle * headerStyle() const { @@ -199,9 +199,22 @@ public: bool htmlOverride() const { return mHtmlOverride; } void setHtmlOverride( bool override ); - /** Override default load external references setting */ + /** Get the load external references override setting */ bool htmlLoadExtOverride() const { return mHtmlLoadExtOverride; } - void setHtmlLoadExtOverride( bool override ); + + /** Default behavior for loading external references. + * Use this for specifying the external reference loading behavior as + * specified in the user settings. + * @see setHtmlLoadExtOverride + */ + void setHtmlLoadExtDefault(bool loadExtDefault); + + /** Override default load external references setting + * @warning This must only be called when the user has explicitly + * been asked to retrieve external references! + * @see setHtmlLoadExtDefault + */ + void setHtmlLoadExtOverride(bool loadExtOverride); /** Is html mail to be supported? Takes into account override */ bool htmlMail(); @@ -544,7 +557,7 @@ private: TQString renderAttachments( partNode *node, const TQColor &bgColor ); private: - bool mHtmlMail, mHtmlLoadExternal, mHtmlOverride, mHtmlLoadExtOverride; + bool mHtmlMail, mHtmlLoadExtDefault, mHtmlOverride, mHtmlLoadExtOverride; int mAtmCurrent; TQString mAtmCurrentName; KMMessage *mMessage; diff --git a/kmail/kmsearchpattern.h b/kmail/kmsearchpattern.h index 9d517fdf..62058936 100644 --- a/kmail/kmsearchpattern.h +++ b/kmail/kmsearchpattern.h @@ -74,14 +74,14 @@ public: virtual ~KMSearchRule() {}; /** Tries to match the rule against the given KMMessage. - @return TRUE if the rule matched, FALSE otherwise. Must be + @return true if the rule matched, false otherwise. Must be implemented by subclasses. */ virtual bool matches( const KMMessage * msg ) const = 0; /** Optimized version tries to match the rule against the given @see DwString. - @return TRUE if the rule matched, FALSE otherwise. + @return true if the rule matched, false otherwise. */ virtual bool matches( const DwString & str, KMMessage & msg, const DwBoyerMoore * headerField=0, @@ -170,7 +170,7 @@ public: virtual bool matches( const KMMessage * msg ) const; /** Optimized version tries to match the rule against the given DwString. - @return TRUE if the rule matched, FALSE otherwise. + @return true if the rule matched, false otherwise. */ virtual bool matches( const DwString & str, KMMessage & msg, const DwBoyerMoore * headerField=0, @@ -334,7 +334,7 @@ public: own result or else most functionality is lacking, or has to be reimplemented, since the rules are private to this class. - @return TRUE if the match was successful, FALSE otherwise. + @return true if the match was successful, false otherwise. */ bool matches( const KMMessage * msg, bool ignoreBody = false ) const; bool matches( const DwString & str, bool ignoreBody = false ) const; diff --git a/kmail/kmsearchpatternedit.cpp b/kmail/kmsearchpatternedit.cpp index 21ade7b2..43f56e95 100644 --- a/kmail/kmsearchpatternedit.cpp +++ b/kmail/kmsearchpatternedit.cpp @@ -116,17 +116,17 @@ void KMSearchRuleWidget::initWidget() RuleWidgetHandlerManager::instance()->createWidgets( mFunctionStack, mValueStack, - TQT_TQOBJECT(this) ); + this ); // redirect focus to the header field combo box setFocusProxy( mRuleField ); - connect( mRuleField, TQT_SIGNAL( activated( const TQString & ) ), - this, TQT_SLOT( slotRuleFieldChanged( const TQString & ) ) ); - connect( mRuleField, TQT_SIGNAL( textChanged( const TQString & ) ), - this, TQT_SLOT( slotRuleFieldChanged( const TQString & ) ) ); - connect( mRuleField, TQT_SIGNAL( textChanged( const TQString & ) ), - this, TQT_SIGNAL( fieldChanged( const TQString & ) ) ); + connect( mRuleField, TQ_SIGNAL( activated( const TQString & ) ), + this, TQ_SLOT( slotRuleFieldChanged( const TQString & ) ) ); + connect( mRuleField, TQ_SIGNAL( textChanged( const TQString & ) ), + this, TQ_SLOT( slotRuleFieldChanged( const TQString & ) ) ); + connect( mRuleField, TQ_SIGNAL( textChanged( const TQString & ) ), + this, TQ_SIGNAL( fieldChanged( const TQString & ) ) ); } void KMSearchRuleWidget::setRule( KMSearchRule *aRule ) @@ -391,14 +391,14 @@ void KMSearchRuleWidgetLister::regenerateRuleListFromWidgets() //============================================================================= KMSearchPatternEdit::KMSearchPatternEdit(TQWidget *parent, const char *name, bool headersOnly, bool absoluteDates ) - : TQGroupBox( 1/*columns*/, Qt::Horizontal, parent, name ) + : TQGroupBox( 1/*columns*/, TQt::Horizontal, parent, name ) { setTitle( i18n("Search Criteria") ); initLayout( headersOnly, absoluteDates ); } KMSearchPatternEdit::KMSearchPatternEdit(const TQString & title, TQWidget *parent, const char *name, bool headersOnly, bool absoluteDates) - : TQGroupBox( 1/*column*/, Qt::Horizontal, title, parent, name ) + : TQGroupBox( 1/*column*/, TQt::Horizontal, title, parent, name ) { initLayout( headersOnly, absoluteDates ); } @@ -426,15 +426,15 @@ void KMSearchPatternEdit::initLayout(bool headersOnly, bool absoluteDates) mRuleLister->slotClear(); //------------connect a few signals - connect( bg, TQT_SIGNAL(clicked(int)), - this, TQT_SLOT(slotRadioClicked(int)) ); + connect( bg, TQ_SIGNAL(clicked(int)), + this, TQ_SLOT(slotRadioClicked(int)) ); KMSearchRuleWidget *srw = (KMSearchRuleWidget*)mRuleLister->mWidgetList.first(); if ( srw ) { - connect( srw, TQT_SIGNAL(fieldChanged(const TQString &)), - this, TQT_SLOT(slotAutoNameHack()) ); - connect( srw, TQT_SIGNAL(contentsChanged(const TQString &)), - this, TQT_SLOT(slotAutoNameHack()) ); + connect( srw, TQ_SIGNAL(fieldChanged(const TQString &)), + this, TQ_SLOT(slotAutoNameHack()) ); + connect( srw, TQ_SIGNAL(contentsChanged(const TQString &)), + this, TQ_SLOT(slotAutoNameHack()) ); } else kdDebug(5006) << "KMSearchPatternEdit: no first KMSearchRuleWidget, though slotClear() has been called!" << endl; } diff --git a/kmail/kmsearchpatternedit.h b/kmail/kmsearchpatternedit.h index 86d890bb..ebb2498c 100644 --- a/kmail/kmsearchpatternedit.h +++ b/kmail/kmsearchpatternedit.h @@ -38,7 +38,7 @@ class KMSearchPatternEdit; class KMSearchRuleWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: /** Constructor. You can give a KMSearchRule as parameter, which will @@ -104,7 +104,7 @@ private: class KMSearchRuleWidgetLister : public KWidgetLister { - Q_OBJECT + TQ_OBJECT friend class ::KMSearchPatternEdit; @@ -165,7 +165,7 @@ private: */ class KMSearchPatternEdit : public TQGroupBox { - Q_OBJECT + TQ_OBJECT public: /** Constructor. The parent and name parameters are passed to the underlying diff --git a/kmail/kmsender.cpp b/kmail/kmsender.cpp index e63add04..cf1e7272 100644 --- a/kmail/kmsender.cpp +++ b/kmail/kmsender.cpp @@ -231,8 +231,8 @@ bool KMSender::doSendQueued( const TQString &customTransport ) for( int i = 0 ; i<mTotalMessages ; ++i ) mTotalBytes += mOutboxFolder->getMsgBase(i)->msgSize(); - connect( mOutboxFolder, TQT_SIGNAL(msgAdded(int)), - this, TQT_SLOT(outboxMsgAdded(int)) ); + connect( mOutboxFolder, TQ_SIGNAL(msgAdded(int)), + this, TQ_SLOT(outboxMsgAdded(int)) ); mCurrentMsg = 0; mSentFolder = kmkernel->sentFolder(); @@ -472,9 +472,9 @@ void KMSender::doSendMsg() i18n( "Sending messages" ), i18n("Initiating sender process..."), true ); - connect( mProgressItem, TQT_SIGNAL(progressItemCanceled(KPIM::ProgressItem*)), - this, TQT_SLOT( slotAbortSend() ) ); - kapp->ref(); + connect( mProgressItem, TQ_SIGNAL(progressItemCanceled(KPIM::ProgressItem*)), + this, TQ_SLOT( slotAbortSend() ) ); + tdeApp->ref(); mSendInProgress = true; } @@ -520,8 +520,8 @@ void KMSender::doSendMsg() if (!mSendProc) sendProcStarted(false); else { - connect(mSendProc, TQT_SIGNAL(idle()), TQT_SLOT(slotIdle())); - connect(mSendProc, TQT_SIGNAL(started(bool)), TQT_SLOT(sendProcStarted(bool))); + connect(mSendProc, TQ_SIGNAL(idle()), TQ_SLOT(slotIdle())); + connect(mSendProc, TQ_SIGNAL(started(bool)), TQ_SLOT(sendProcStarted(bool))); // Run the precommand if there is one if ( !mTransportInfo->precommand.isEmpty() ) { @@ -541,8 +541,8 @@ void KMSender::doSendMsg() bool KMSender::runPrecommand( const TQString & cmd ) { setStatusMsg( i18n("Executing precommand %1").arg( cmd ) ); mPrecommand = new KMPrecommand( cmd ); - connect( mPrecommand, TQT_SIGNAL(finished(bool)), - TQT_SLOT(slotPrecommandFinished(bool)) ); + connect( mPrecommand, TQ_SIGNAL(finished(bool)), + TQ_SLOT(slotPrecommandFinished(bool)) ); if ( !mPrecommand->start() ) { delete mPrecommand; mPrecommand = 0; return false; @@ -632,7 +632,7 @@ void KMSender::cleanup(void) if (mSendProc && mSendProcStarted) mSendProc->finish(); mSendProc = 0; mSendProcStarted = false; - if (mSendInProgress) kapp->deref(); + if (mSendInProgress) tdeApp->deref(); mSendInProgress = false; if (mCurrentMsg) { @@ -644,8 +644,8 @@ void KMSender::cleanup(void) mSentFolder = 0; } if ( mOutboxFolder ) { - disconnect( mOutboxFolder, TQT_SIGNAL(msgAdded(int)), - this, TQT_SLOT(outboxMsgAdded(int)) ); + disconnect( mOutboxFolder, TQ_SIGNAL(msgAdded(int)), + this, TQ_SLOT(outboxMsgAdded(int)) ); mOutboxFolder->close("dosendoutbox"); if ( mOutboxFolder->count( true ) == 0 ) { mOutboxFolder->expunge(); @@ -947,12 +947,12 @@ bool KMSendSendmail::doStart() { { mMailerProc = new TDEProcess; assert(mMailerProc != 0); - connect(mMailerProc,TQT_SIGNAL(processExited(TDEProcess*)), - this, TQT_SLOT(sendmailExited(TDEProcess*))); - connect(mMailerProc,TQT_SIGNAL(wroteStdin(TDEProcess*)), - this, TQT_SLOT(wroteStdin(TDEProcess*))); - connect(mMailerProc,TQT_SIGNAL(receivedStderr(TDEProcess*,char*,int)), - this, TQT_SLOT(receivedStderr(TDEProcess*, char*, int))); + connect(mMailerProc,TQ_SIGNAL(processExited(TDEProcess*)), + this, TQ_SLOT(sendmailExited(TDEProcess*))); + connect(mMailerProc,TQ_SIGNAL(wroteStdin(TDEProcess*)), + this, TQ_SLOT(wroteStdin(TDEProcess*))); + connect(mMailerProc,TQ_SIGNAL(receivedStderr(TDEProcess*,char*,int)), + this, TQ_SLOT(receivedStderr(TDEProcess*, char*, int))); } return true; } @@ -1046,8 +1046,8 @@ KMSendSMTP::KMSendSMTP(KMSender *sender) mJob(0), mSlave(0) { - TDEIO::Scheduler::connect(TQT_SIGNAL(slaveError(TDEIO::Slave *, int, - const TQString &)), this, TQT_SLOT(slaveError(TDEIO::Slave *, int, + TDEIO::Scheduler::connect(TQ_SIGNAL(slaveError(TDEIO::Slave *, int, + const TQString &)), this, TQ_SLOT(slaveError(TDEIO::Slave *, int, const TQString &))); } @@ -1154,9 +1154,9 @@ bool KMSendSMTP::doSend( const TQString & sender, const TQStringList & to, const } mJob->addMetaData( "lf2crlf+dotstuff", "slave" ); TDEIO::Scheduler::assignJobToSlave(mSlave, mJob); - connect(mJob, TQT_SIGNAL(result(TDEIO::Job *)), this, TQT_SLOT(result(TDEIO::Job *))); - connect(mJob, TQT_SIGNAL(dataReq(TDEIO::Job *, TQByteArray &)), - this, TQT_SLOT(dataReq(TDEIO::Job *, TQByteArray &))); + connect(mJob, TQ_SIGNAL(result(TDEIO::Job *)), this, TQ_SLOT(result(TDEIO::Job *))); + connect(mJob, TQ_SIGNAL(dataReq(TDEIO::Job *, TQByteArray &)), + this, TQ_SLOT(dataReq(TDEIO::Job *, TQByteArray &))); mSendOk = true; mInProcess = true; return true; diff --git a/kmail/kmsender.h b/kmail/kmsender.h index 8ae577b0..7e2cbf4e 100644 --- a/kmail/kmsender.h +++ b/kmail/kmsender.h @@ -52,7 +52,7 @@ namespace KPIM { class KMSender: public TQObject, public KMail::MessageSender { - Q_OBJECT + TQ_OBJECT friend class ::KMSendProc; friend class ::KMSendSendmail; @@ -66,10 +66,10 @@ protected: /** Send given message. The message is either queued or sent immediately. The default behaviour, as selected with setSendImmediate(), can be overwritten with the parameter - sendNow (by specifying TRUE or FALSE). + sendNow (by specifying true or false). The sender takes ownership of the given message on success, so DO NOT DELETE OR MODIFY the message further. - Returns TRUE on success. */ + Returns true on success. */ bool doSend(KMMessage* msg, short sendNow); /** Send queued messages, using the specified transport or the @@ -78,11 +78,11 @@ protected: bool doSendQueued( const TQString& transport ); private: - /** Returns TRUE if sending is in progress. */ + /** Returns true if sending is in progress. */ bool sending() const { return mSendInProgress; } public: - /** Shall messages be sent immediately (TRUE), or shall they be + /** Shall messages be sent immediately (true), or shall they be queued and sent later upon call of sendQueued() ? */ bool sendImmediate() const { return mSendImmediate; } void setSendImmediate(bool); @@ -139,8 +139,8 @@ private: void cleanup(); /** Test if all required settings are set. - Reports problems to user via dialogs and returns FALSE. - Returns TRUE if everything is Ok. */ + Reports problems to user via dialogs and returns false. + Returns true if everything is Ok. */ bool settingsOk() const; /** Parse protocol '://' (host port? | mailer) string and diff --git a/kmail/kmsender_p.h b/kmail/kmsender_p.h index d07dcf34..da2a2cbd 100644 --- a/kmail/kmsender_p.h +++ b/kmail/kmsender_p.h @@ -22,7 +22,7 @@ namespace TDEIO { class KMSendProc: public TQObject { - Q_OBJECT + TQ_OBJECT public: @@ -43,8 +43,8 @@ public: /** Abort sending the current message. Sets mSending to false */ virtual void abort() = 0; - /** Returns TRUE if send was successful, and FALSE otherwise. - Returns FALSE if sending is still in progress. */ + /** Returns true if send was successful, and false otherwise. + Returns false if sending is still in progress. */ bool sendOk() const { return mSendOk; } /** Returns error message of last call of failed(). */ @@ -61,7 +61,7 @@ signals: protected: /** Called to signal a transmission error. The sender then calls finish() and terminates sending of messages. - Sets mSending to FALSE. */ + Sets mSending to false. */ void failed(const TQString &msg); /** Informs the user about what is going on. */ @@ -86,7 +86,7 @@ protected: //----------------------------------------------------------------------------- class KMSendSendmail: public KMSendProc { - Q_OBJECT + TQ_OBJECT public: KMSendSendmail(KMSender*); @@ -117,7 +117,7 @@ private: //----------------------------------------------------------------------------- class KMSendSMTP : public KMSendProc { -Q_OBJECT +TQ_OBJECT public: KMSendSMTP(KMSender *sender); diff --git a/kmail/kmservertest.cpp b/kmail/kmservertest.cpp index 5c11f075..1ef59a3f 100644 --- a/kmail/kmservertest.cpp +++ b/kmail/kmservertest.cpp @@ -51,8 +51,8 @@ KMServerTest::KMServerTest( const TQString & protocol, const TQString & host, in mSSL( false ), mJob( 0 ), mSlave( 0 ), mConnectionErrorCount( 0 ) { TDEIO::Scheduler::connect( - TQT_SIGNAL(slaveError(TDEIO::Slave *, int, const TQString &)), - this, TQT_SLOT(slotSlaveResult(TDEIO::Slave *, int, const TQString &))); + TQ_SIGNAL(slaveError(TDEIO::Slave *, int, const TQString &)), + this, TQ_SLOT(slotSlaveResult(TDEIO::Slave *, int, const TQString &))); if ( port == 993 || port == 995 || port == 465 ) port = 0; @@ -63,7 +63,7 @@ KMServerTest::KMServerTest( const TQString & protocol, const TQString & host, in //----------------------------------------------------------------------------- KMServerTest::~KMServerTest() { - if (mJob) mJob->kill(TRUE); + if (mJob) mJob->kill(true); } @@ -85,8 +85,8 @@ void KMServerTest::startOffSlave( int port ) { slotSlaveResult( 0, 1 ); return; } - connect( mSlave, TQT_SIGNAL(metaData(const TDEIO::MetaData&)), - TQT_SLOT(slotMetaData(const TDEIO::MetaData&)) ); + connect( mSlave, TQ_SIGNAL(metaData(const TDEIO::MetaData&)), + TQ_SLOT(slotMetaData(const TDEIO::MetaData&)) ); TQByteArray packedArgs; TQDataStream stream( packedArgs, IO_WriteOnly ); @@ -95,9 +95,9 @@ void KMServerTest::startOffSlave( int port ) { mJob = TDEIO::special( url, packedArgs, false ); TDEIO::Scheduler::assignJobToSlave( mSlave, mJob ); - connect( mJob, TQT_SIGNAL(result(TDEIO::Job*)), TQT_SLOT(slotResult(TDEIO::Job*)) ); - connect( mJob, TQT_SIGNAL(infoMessage(TDEIO::Job*,const TQString&)), - TQT_SLOT(slotData(TDEIO::Job*,const TQString&)) ); + connect( mJob, TQ_SIGNAL(result(TDEIO::Job*)), TQ_SLOT(slotResult(TDEIO::Job*)) ); + connect( mJob, TQ_SIGNAL(infoMessage(TDEIO::Job*,const TQString&)), + TQ_SLOT(slotData(TDEIO::Job*,const TQString&)) ); } @@ -166,7 +166,7 @@ void KMServerTest::slotSlaveResult(TDEIO::Slave *aSlave, int error, if ( error ) { mJob = 0; - KMessageBox::error( TQT_TQWIDGET(kapp->activeWindow()), + KMessageBox::error( tdeApp->activeWindow(), TDEIO::buildErrorString( error, errorText ), i18n("Error") ); emit capabilities( mListNormal, mListSSL ); diff --git a/kmail/kmservertest.h b/kmail/kmservertest.h index db8535a0..0a32491a 100644 --- a/kmail/kmservertest.h +++ b/kmail/kmservertest.h @@ -46,7 +46,7 @@ namespace TDEIO { class KMServerTest : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/kmail/kmstartup.cpp b/kmail/kmstartup.cpp index c1eb6ccb..7fd0ba4f 100644 --- a/kmail/kmstartup.cpp +++ b/kmail/kmstartup.cpp @@ -24,11 +24,11 @@ #include "kcursorsaver.h" #include <tdelocale.h> -#include <ksimpleconfig.h> -#include <kstandarddirs.h> +#include <tdesimpleconfig.h> +#include <tdestandarddirs.h> #include <tdemessagebox.h> #include <dcopclient.h> -#include <kcrash.h> +#include <tdecrash.h> #include <tdeglobal.h> #include <tdeapplication.h> #include <tdeaboutdata.h> @@ -137,19 +137,19 @@ void checkConfigUpdates() { void lockOrDie() { // Check and create a lock file to prevent concurrent access to kmail files - TQString appName = kapp->instanceName(); + TQString appName = tdeApp->instanceName(); if ( appName.isEmpty() ) appName = "kmail"; TQString programName; - const TDEAboutData *about = kapp->aboutData(); + const TDEAboutData *about = tdeApp->aboutData(); if ( about ) programName = about->programName(); if ( programName.isEmpty() ) programName = i18n("KMail"); TQString lockLocation = locateLocal("data", "kmail/lock"); - KSimpleConfig config(lockLocation); + TDESimpleConfig config(lockLocation); int oldPid = config.readNumEntry("pid", -1); const TQString oldHostName = config.readEntry("hostname"); const TQString oldAppName = config.readEntry( "appName", appName ); @@ -193,7 +193,7 @@ void lockOrDie() { if ( oldHostName == hostName ) { // this can only happen if the user is running this application on // different displays on the same machine. All other cases will be - // taken care of by KUniqueApplication() + // taken care of by TDEUniqueApplication() if ( oldAppName == appName ) msg = i18n("%1 already seems to be running on another display on " "this machine. Running %2 more than once " @@ -262,7 +262,7 @@ void insertLibraryCataloguesAndIcons() { void cleanup() { const TQString lockLocation = locateLocal("data", "kmail/lock"); - KSimpleConfig config(lockLocation); + TDESimpleConfig config(lockLocation); config.writeEntry("pid", -1); config.sync(); } diff --git a/kmail/kmstartup.h b/kmail/kmstartup.h index 11c840e6..e6208bc7 100644 --- a/kmail/kmstartup.h +++ b/kmail/kmstartup.h @@ -18,22 +18,22 @@ #ifndef KMSTARTUP #define KMSTARTUP -#include <kdemacros.h> +#include <tdemacros.h> extern "C" { -KDE_EXPORT void kmsetSignalHandler(void (*handler)(int)); -KDE_EXPORT void kmsignalHandler(int sigId); -KDE_EXPORT void kmcrashHandler(int sigId); +TDE_EXPORT void kmsetSignalHandler(void (*handler)(int)); +TDE_EXPORT void kmsignalHandler(int sigId); +TDE_EXPORT void kmcrashHandler(int sigId); } namespace KMail { - KDE_EXPORT void checkConfigUpdates(); - KDE_EXPORT void lockOrDie(); - KDE_EXPORT void insertLibraryCataloguesAndIcons(); - KDE_EXPORT void cleanup(); + TDE_EXPORT void checkConfigUpdates(); + TDE_EXPORT void lockOrDie(); + TDE_EXPORT void insertLibraryCataloguesAndIcons(); + TDE_EXPORT void cleanup(); } #endif diff --git a/kmail/kmsystemtray.cpp b/kmail/kmsystemtray.cpp index 1d1ce933..45d8bfc9 100644 --- a/kmail/kmsystemtray.cpp +++ b/kmail/kmsystemtray.cpp @@ -71,7 +71,7 @@ KMSystemTray::KMSystemTray(TQWidget *parent, const char *name) mLastUpdate = time( 0 ); mUpdateTimer = new TQTimer( this, "systraytimer" ); - connect( mUpdateTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( updateNewMessages() ) ); + connect( mUpdateTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( updateNewMessages() ) ); mDefaultIcon = loadIcon( "kmail" ); mLightIconImage = loadIcon( "kmaillight" ).convertToImage(); @@ -94,15 +94,15 @@ KMSystemTray::KMSystemTray(TQWidget *parent, const char *name) /** Initiate connections between folders and this object */ foldersChanged(); - connect( kmkernel->folderMgr(), TQT_SIGNAL(changed()), TQT_SLOT(foldersChanged())); - connect( kmkernel->imapFolderMgr(), TQT_SIGNAL(changed()), TQT_SLOT(foldersChanged())); - connect( kmkernel->dimapFolderMgr(), TQT_SIGNAL(changed()), TQT_SLOT(foldersChanged())); - connect( kmkernel->searchFolderMgr(), TQT_SIGNAL(changed()), TQT_SLOT(foldersChanged())); + connect( kmkernel->folderMgr(), TQ_SIGNAL(changed()), TQ_SLOT(foldersChanged())); + connect( kmkernel->imapFolderMgr(), TQ_SIGNAL(changed()), TQ_SLOT(foldersChanged())); + connect( kmkernel->dimapFolderMgr(), TQ_SIGNAL(changed()), TQ_SLOT(foldersChanged())); + connect( kmkernel->searchFolderMgr(), TQ_SIGNAL(changed()), TQ_SLOT(foldersChanged())); - connect( kmkernel->acctMgr(), TQT_SIGNAL( checkedMail( bool, bool, const TQMap<TQString, int> & ) ), - TQT_SLOT( updateNewMessages() ) ); + connect( kmkernel->acctMgr(), TQ_SIGNAL( checkedMail( bool, bool, const TQMap<TQString, int> & ) ), + TQ_SLOT( updateNewMessages() ) ); - connect( this, TQT_SIGNAL( quitSelected() ), TQT_SLOT( tray_quit() ) ); + connect( this, TQ_SIGNAL( quitSelected() ), TQ_SLOT( tray_quit() ) ); } void KMSystemTray::buildPopupMenu() @@ -132,13 +132,13 @@ void KMSystemTray::buildPopupMenu() action->plug( mPopupMenu ); mPopupMenu->insertSeparator(); - mPopupMenu->insertItem( SmallIcon("system-log-out"), i18n("&Quit"), this, TQT_SLOT(maybeQuit()) ); + mPopupMenu->insertItem( SmallIcon("system-log-out"), i18n("&Quit"), this, TQ_SLOT(maybeQuit()) ); } void KMSystemTray::tray_quit() { // Quit all of KMail - kapp->quit(); + tdeApp->quit(); } KMSystemTray::~KMSystemTray() @@ -275,7 +275,7 @@ void KMSystemTray::foldersChanged() } /** Disconnect all previous connections */ - disconnect(this, TQT_SLOT(updateNewMessageNotification(KMFolder *))); + disconnect(this, TQ_SLOT(updateNewMessageNotification(KMFolder *))); TQStringList folderNames; TQValueList<TQGuardedPtr<KMFolder> > folderList; @@ -297,14 +297,14 @@ void KMSystemTray::foldersChanged() !currentFolder->ignoreNewMail() ) { /** If this is a new folder, start listening for messages */ - connect(currentFolder, TQT_SIGNAL(numUnreadMsgsChanged(KMFolder *)), - this, TQT_SLOT(updateNewMessageNotification(KMFolder *))); + connect(currentFolder, TQ_SIGNAL(numUnreadMsgsChanged(KMFolder *)), + this, TQ_SLOT(updateNewMessageNotification(KMFolder *))); /** Check all new folders to see if we started with any new messages */ updateNewMessageNotification(currentFolder); } else { - disconnect(currentFolder, TQT_SIGNAL(numUnreadMsgsChanged(KMFolder *)), this, TQT_SLOT(updateNewMessageNotification(KMFolder *)) ); + disconnect(currentFolder, TQ_SIGNAL(numUnreadMsgsChanged(KMFolder *)), this, TQ_SLOT(updateNewMessageNotification(KMFolder *)) ); } } } @@ -316,7 +316,7 @@ void KMSystemTray::foldersChanged() void KMSystemTray::mousePressEvent(TQMouseEvent *e) { // switch to kmail on left mouse button - if( e->button() == Qt::LeftButton ) + if( e->button() == TQt::LeftButton ) { if( mParentVisible && mainWindowIsOnCurrentDesktop() ) hideKMail(); @@ -325,7 +325,7 @@ void KMSystemTray::mousePressEvent(TQMouseEvent *e) } // open popup menu on right mouse button - if( e->button() == Qt::RightButton ) + if( e->button() == TQt::RightButton ) { mPopupFolders.clear(); mPopupFolders.reserve( mFoldersWithUnread.count() ); @@ -349,7 +349,7 @@ void KMSystemTray::mousePressEvent(TQMouseEvent *e) kdDebug(5006) << "Adding folder" << endl; mPopupFolders.append( it.key() ); TQString item = prettyName(it.key()) + " (" + TQString::number(it.data()) + ")"; - newMessagesPopup->insertItem(item, this, TQT_SLOT(selectedAccount(int)), 0, i); + newMessagesPopup->insertItem(item, this, TQ_SLOT(selectedAccount(int)), 0, i); ++it; } @@ -545,7 +545,7 @@ void KMSystemTray::updateNewMessages() if(mFoldersWithUnread.count() == 0) { mPopupFolders.clear(); - disconnect(this, TQT_SLOT(selectedAccount(int))); + disconnect(this, TQ_SLOT(selectedAccount(int))); mCount = 0; diff --git a/kmail/kmsystemtray.h b/kmail/kmsystemtray.h index b689def5..0472a98c 100644 --- a/kmail/kmsystemtray.h +++ b/kmail/kmsystemtray.h @@ -40,7 +40,7 @@ class TQPoint; */ class KMSystemTray : public KSystemTray { - Q_OBJECT + TQ_OBJECT public: /** construtor */ diff --git a/kmail/kmtransport.cpp b/kmail/kmtransport.cpp index 4f991f94..44c8b3f0 100644 --- a/kmail/kmtransport.cpp +++ b/kmail/kmtransport.cpp @@ -251,7 +251,7 @@ KMTransportSelDlg::KMTransportSelDlg( TQWidget *parent, const char *name, TQVBoxLayout *topLayout = new TQVBoxLayout( page, 0, spacingHint() ); TQButtonGroup *group = new TQButtonGroup( i18n("Transport"), page ); - connect(group, TQT_SIGNAL(clicked(int)), TQT_SLOT(buttonClicked(int)) ); + connect(group, TQ_SIGNAL(clicked(int)), TQ_SLOT(buttonClicked(int)) ); topLayout->addWidget( group, 10 ); TQVBoxLayout *vlay = new TQVBoxLayout( group, spacingHint()*2, spacingHint() ); @@ -339,11 +339,11 @@ void KMTransportDialog::makeSendmailPage() grid->addWidget( mSendmail.locationEdit, 1, 1 ); mSendmail.chooseButton = new TQPushButton( i18n("Choos&e..."), page ); - connect( mSendmail.chooseButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotSendmailChooser()) ); + connect( mSendmail.chooseButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotSendmailChooser()) ); - connect( mSendmail.locationEdit, TQT_SIGNAL(textChanged ( const TQString & )), - this, TQT_SLOT(slotSendmailEditPath(const TQString &)) ); + connect( mSendmail.locationEdit, TQ_SIGNAL(textChanged ( const TQString & )), + this, TQ_SLOT(slotSendmailEditPath(const TQString &)) ); mSendmail.chooseButton->setAutoDefault( false ); grid->addWidget( mSendmail.chooseButton, 1, 2 ); @@ -401,7 +401,7 @@ void KMTransportDialog::makeSmtpPage() label = new TQLabel( i18n("&Port:"), page1 ); grid->addWidget( label, 4, 0 ); mSmtp.portEdit = new KLineEdit( page1 ); - mSmtp.portEdit->setValidator( new TQIntValidator(TQT_TQOBJECT(this)) ); + mSmtp.portEdit->setValidator( new TQIntValidator(this) ); TQWhatsThis::add(mSmtp.portEdit, i18n("The port number that the SMTP server " "is listening on. The default port is 25.")); @@ -430,8 +430,8 @@ void KMTransportDialog::makeSmtpPage() "requires authentication before accepting " "mail. This is known as " "'Authenticated SMTP' or simply ASMTP.")); - connect(mSmtp.authCheck, TQT_SIGNAL(clicked()), - TQT_SLOT(slotRequiresAuthClicked())); + connect(mSmtp.authCheck, TQ_SIGNAL(clicked()), + TQ_SLOT(slotRequiresAuthClicked())); grid->addMultiCellWidget( mSmtp.authCheck, 7, 7, 0, 1 ); mSmtp.loginLabel = new TQLabel( i18n("&Login:"), page1 ); @@ -490,27 +490,27 @@ void KMTransportDialog::makeSmtpPage() "identifying itself to the server.")); mSmtp.localHostnameLabel->setBuddy( mSmtp.localHostnameEdit ); grid->addWidget( mSmtp.localHostnameEdit, 13, 1 ); - connect( mSmtp.specifyHostnameCheck, TQT_SIGNAL(toggled(bool)), - mSmtp.localHostnameEdit, TQT_SLOT(setEnabled(bool))); - connect( mSmtp.specifyHostnameCheck, TQT_SIGNAL(toggled(bool)), - mSmtp.localHostnameLabel, TQT_SLOT(setEnabled(bool))); + connect( mSmtp.specifyHostnameCheck, TQ_SIGNAL(toggled(bool)), + mSmtp.localHostnameEdit, TQ_SLOT(setEnabled(bool))); + connect( mSmtp.specifyHostnameCheck, TQ_SIGNAL(toggled(bool)), + mSmtp.localHostnameLabel, TQ_SLOT(setEnabled(bool))); TQWidget *page2 = new TQWidget( tabWidget ); tabWidget->addTab( page2, i18n("S&ecurity") ); TQVBoxLayout *vlay = new TQVBoxLayout( page2, spacingHint() ); - mSmtp.encryptionGroup = new TQButtonGroup( 1, Qt::Horizontal, + mSmtp.encryptionGroup = new TQButtonGroup( 1, TQt::Horizontal, i18n("Encryption"), page2 ); mSmtp.encryptionNone = new TQRadioButton( i18n("&None"), mSmtp.encryptionGroup ); - mSmtp.encryptionSSL = - new TQRadioButton( i18n("&SSL"), mSmtp.encryptionGroup ); mSmtp.encryptionTLS = - new TQRadioButton( i18n("&TLS"), mSmtp.encryptionGroup ); - connect(mSmtp.encryptionGroup, TQT_SIGNAL(clicked(int)), - TQT_SLOT(slotSmtpEncryptionChanged(int))); + new TQRadioButton( i18n("Use &StartTLS"), mSmtp.encryptionGroup ); + mSmtp.encryptionSSL = + new TQRadioButton( i18n("Enforce SSL/&TLS"), mSmtp.encryptionGroup ); + connect(mSmtp.encryptionGroup, TQ_SIGNAL(clicked(int)), + TQ_SLOT(slotSmtpEncryptionChanged(int))); vlay->addWidget( mSmtp.encryptionGroup ); - mSmtp.authGroup = new TQButtonGroup( 1, Qt::Horizontal, + mSmtp.authGroup = new TQButtonGroup( 1, TQt::Horizontal, i18n("Authentication Method"), page2 ); mSmtp.authLogin = new TQRadioButton( i18n("Please translate this " "authentication method only if you have a good reason", "&LOGIN"), @@ -533,8 +533,8 @@ void KMTransportDialog::makeSmtpPage() TQHBoxLayout *buttonLay = new TQHBoxLayout( vlay ); mSmtp.checkCapabilities = new TQPushButton( i18n("Check &What the Server Supports"), page2 ); - connect(mSmtp.checkCapabilities, TQT_SIGNAL(clicked()), - TQT_SLOT(slotCheckSmtpCapabilities())); + connect(mSmtp.checkCapabilities, TQ_SIGNAL(clicked()), + TQ_SLOT(slotCheckSmtpCapabilities())); buttonLay->addStretch(); buttonLay->addWidget( mSmtp.checkCapabilities ); } @@ -652,13 +652,13 @@ void KMTransportDialog::slotRequiresAuthClicked() void KMTransportDialog::slotSmtpEncryptionChanged(int id) { kdDebug(5006) << "KMTransportDialog::slotSmtpEncryptionChanged( " << id << " )" << endl; - // adjust SSL port: - if (id == SSL || mSmtp.portEdit->text() == "465") - mSmtp.portEdit->setText((id == SSL) ? "465" : "25"); + // adjust SSL/TLS port: + if (id == EnforceSSL || mSmtp.portEdit->text() == "465") + mSmtp.portEdit->setText((id == EnforceSSL) ? "465" : "25"); // switch supported auth methods: TQButton * old = mSmtp.authGroup->selected(); - int authMethods = id == TLS ? mAuthTLS : id == SSL ? mAuthSSL : mAuthNone ; + int authMethods = id == StartTLS ? mAuthTLS : id == EnforceSSL ? mAuthSSL : mAuthNone ; enableAuthMethods( authMethods ); if ( !old->isEnabled() ) checkHighest( mSmtp.authGroup ); @@ -720,11 +720,11 @@ void KMTransportDialog::slotCheckSmtpCapabilities() mServerTest = new KMServerTest(SMTP_PROTOCOL, mSmtp.hostEdit->text(), mSmtp.portEdit->text().toInt()); connect( mServerTest, - TQT_SIGNAL( capabilities( const TQStringList &, const TQStringList &, + TQ_SIGNAL( capabilities( const TQStringList &, const TQStringList &, const TQString &, const TQString &, const TQString & )), this, - TQT_SLOT( slotSmtpCapabilities( const TQStringList &, + TQ_SLOT( slotSmtpCapabilities( const TQStringList &, const TQStringList &, const TQString &, const TQString &, const TQString & ) ) ); mSmtp.checkCapabilities->setEnabled(false); diff --git a/kmail/kmtransport.h b/kmail/kmtransport.h index e4dd6f1e..5f0efdee 100644 --- a/kmail/kmtransport.h +++ b/kmail/kmtransport.h @@ -63,11 +63,11 @@ public: class KMTransportSelDlg : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: - KMTransportSelDlg( TQWidget *parent=0, const char *name=0, bool modal=TRUE ); + KMTransportSelDlg( TQWidget *parent=0, const char *name=0, bool modal=true ); int selected() const; private slots: @@ -79,12 +79,12 @@ private: class KMTransportDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: KMTransportDialog( const TQString & caption, KMTransportInfo *transportInfo, - TQWidget *parent=0, const char *name=0, bool modal=TRUE ); + TQWidget *parent=0, const char *name=0, bool modal=true ); virtual ~KMTransportDialog(); private slots: @@ -151,8 +151,8 @@ private: KMTransportInfo *mTransportInfo; enum EncryptionMethods { NoEncryption = 0, - SSL = 1, - TLS = 2 + StartTLS = 1, + EnforceSSL = 2 }; enum AuthMethods { NoAuth = 0, diff --git a/kmail/korghelper.cpp b/kmail/korghelper.cpp index 17097126..a33e02be 100644 --- a/kmail/korghelper.cpp +++ b/kmail/korghelper.cpp @@ -35,12 +35,12 @@ void KMail::KorgHelper::ensureRunning() // [that's not the case when kontact was already running, but korganizer not loaded into it...] static const char* const dcopObjectId = "KOrganizerIface"; TQCString dummy; - if ( !kapp->dcopClient()->findObject( dcopService, dcopObjectId, "", TQByteArray(), dummy, dummy ) ) { - DCOPRef ref( dcopService, dcopService ); // talk to the KUniqueApplication or its kontact wrapper + if ( !tdeApp->dcopClient()->findObject( dcopService, dcopObjectId, "", TQByteArray(), dummy, dummy ) ) { + DCOPRef ref( dcopService, dcopService ); // talk to the TDEUniqueApplication or its kontact wrapper DCOPReply reply = ref.call( "load()" ); if ( reply.isValid() && (bool)reply ) { kdDebug() << "Loaded " << dcopService << " successfully" << endl; - Q_ASSERT( kapp->dcopClient()->findObject( dcopService, dcopObjectId, "", TQByteArray(), dummy, dummy ) ); + Q_ASSERT( tdeApp->dcopClient()->findObject( dcopService, dcopObjectId, "", TQByteArray(), dummy, dummy ) ); } else kdWarning() << "Error loading " << dcopService << endl; } diff --git a/kmail/listjob.cpp b/kmail/listjob.cpp index 75e4dee5..6c189293 100644 --- a/kmail/listjob.cpp +++ b/kmail/listjob.cpp @@ -76,8 +76,8 @@ void ListJob::execute() { // We'll wait for the connectionResult signal from the account. kdDebug(5006) << "ListJob - waiting for connection" << endl; - connect( mAccount, TQT_SIGNAL( connectionResult(int, const TQString&) ), - this, TQT_SLOT( slotConnectionResult(int, const TQString&) ) ); + connect( mAccount, TQ_SIGNAL( connectionResult(int, const TQString&) ), + this, TQ_SLOT( slotConnectionResult(int, const TQString&) ) ); return; } // this is needed until we have a common base class for d(imap) @@ -145,10 +145,10 @@ void ListJob::execute() TDEIO::SimpleJob *job = TDEIO::listDir( url, false ); TDEIO::Scheduler::assignJobToSlave( mAccount->slave(), job ); mAccount->insertJob( job, jd ); - connect( job, TQT_SIGNAL(result(TDEIO::Job *)), - this, TQT_SLOT(slotListResult(TDEIO::Job *)) ); - connect( job, TQT_SIGNAL(entries(TDEIO::Job *, const TDEIO::UDSEntryList &)), - this, TQT_SLOT(slotListEntries(TDEIO::Job *, const TDEIO::UDSEntryList &)) ); + connect( job, TQ_SIGNAL(result(TDEIO::Job *)), + this, TQ_SLOT(slotListResult(TDEIO::Job *)) ); + connect( job, TQ_SIGNAL(entries(TDEIO::Job *, const TDEIO::UDSEntryList &)), + this, TQ_SLOT(slotListEntries(TDEIO::Job *, const TDEIO::UDSEntryList &)) ); } void ListJob::slotConnectionResult( int errorCode, const TQString& errorMsg ) diff --git a/kmail/listjob.h b/kmail/listjob.h index 3b53ea61..54cb535d 100644 --- a/kmail/listjob.h +++ b/kmail/listjob.h @@ -53,7 +53,7 @@ namespace KMail { */ class ListJob : public FolderJob { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/kmail/localsubscriptiondialog.cpp b/kmail/localsubscriptiondialog.cpp index 2f6e839e..166cd406 100644 --- a/kmail/localsubscriptiondialog.cpp +++ b/kmail/localsubscriptiondialog.cpp @@ -76,7 +76,7 @@ void LocalSubscriptionDialog::processFolderListing() if (done == 1000) { emit listChanged(); - TQTimer::singleShot(0, this, TQT_SLOT(processItems())); + TQTimer::singleShot(0, this, TQ_SLOT(processItems())); return; } ++mCount; diff --git a/kmail/localsubscriptiondialog.h b/kmail/localsubscriptiondialog.h index eb977908..f181ab7e 100644 --- a/kmail/localsubscriptiondialog.h +++ b/kmail/localsubscriptiondialog.h @@ -39,7 +39,7 @@ namespace KMail { class LocalSubscriptionDialog: public SubscriptionDialog { - Q_OBJECT + TQ_OBJECT public: diff --git a/kmail/maildirjob.cpp b/kmail/maildirjob.cpp index 4c3b520c..11f6edfb 100644 --- a/kmail/maildirjob.cpp +++ b/kmail/maildirjob.cpp @@ -74,7 +74,7 @@ void MaildirJob::setParentFolder( const KMFolderMaildir* parent ) //----------------------------------------------------------------------------- void MaildirJob::execute() { - TQTimer::singleShot( 0, this, TQT_SLOT(startJob()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(startJob()) ); } //----------------------------------------------------------------------------- diff --git a/kmail/maildirjob.h b/kmail/maildirjob.h index 878c5d78..1c21833b 100644 --- a/kmail/maildirjob.h +++ b/kmail/maildirjob.h @@ -40,7 +40,7 @@ namespace KMail { class MaildirJob : public FolderJob { - Q_OBJECT + TQ_OBJECT public: MaildirJob( KMMessage *msg, JobType jt = tGetMessage, KMFolder *folder = 0 ); diff --git a/kmail/mailinglistpropertiesdialog.cpp b/kmail/mailinglistpropertiesdialog.cpp index 0bfb2cc1..ab984161 100644 --- a/kmail/mailinglistpropertiesdialog.cpp +++ b/kmail/mailinglistpropertiesdialog.cpp @@ -59,29 +59,29 @@ MailingListFolderPropertiesDialog::MailingListFolderPropertiesDialog( TQWidget* "topLayout" ); TQGroupBox *mlGroup = new TQGroupBox( i18n("Associated Mailing List" ), this ); - mlGroup->setColumnLayout( 0, Qt::Vertical ); + mlGroup->setColumnLayout( 0, TQt::Vertical ); TQGridLayout *groupLayout = new TQGridLayout( mlGroup->layout(), 6, 3, spacingHint() ); topLayout->addWidget( mlGroup ); setMainWidget( mlGroup ); mHoldsMailingList = new TQCheckBox( i18n("&Folder holds a mailing list"), mlGroup ); - connect( mHoldsMailingList, TQT_SIGNAL(toggled(bool)), - TQT_SLOT(slotHoldsML(bool)) ); + connect( mHoldsMailingList, TQ_SIGNAL(toggled(bool)), + TQ_SLOT(slotHoldsML(bool)) ); groupLayout->addMultiCellWidget( mHoldsMailingList, 0, 0, 0, 2 ); groupLayout->addItem( new TQSpacerItem( 0, 10 ), 1, 0 ); mDetectButton = new TQPushButton( i18n("Detect Automatically"), mlGroup ); mDetectButton->setEnabled( false ); - connect( mDetectButton, TQT_SIGNAL(pressed()), TQT_SLOT(slotDetectMailingList()) ); + connect( mDetectButton, TQ_SIGNAL(pressed()), TQ_SLOT(slotDetectMailingList()) ); groupLayout->addWidget( mDetectButton, 2, 1 ); groupLayout->addItem( new TQSpacerItem( 0, 10 ), 3, 0 ); label = new TQLabel( i18n("Mailing list description:"), mlGroup ); label->setEnabled( false ); - connect( mHoldsMailingList, TQT_SIGNAL(toggled(bool)), - label, TQT_SLOT(setEnabled(bool)) ); + connect( mHoldsMailingList, TQ_SIGNAL(toggled(bool)), + label, TQ_SLOT(setEnabled(bool)) ); groupLayout->addWidget( label, 4, 0 ); mMLId = new TQLabel( label, "", mlGroup ); groupLayout->addMultiCellWidget( mMLId, 4, 4, 1, 2 ); @@ -90,22 +90,22 @@ MailingListFolderPropertiesDialog::MailingListFolderPropertiesDialog( TQWidget* //FIXME: add TQWhatsThis label = new TQLabel( i18n("Preferred handler:"), mlGroup ); label->setEnabled(false); - connect( mHoldsMailingList, TQT_SIGNAL(toggled(bool)), - label, TQT_SLOT(setEnabled(bool)) ); + connect( mHoldsMailingList, TQ_SIGNAL(toggled(bool)), + label, TQ_SLOT(setEnabled(bool)) ); groupLayout->addWidget( label, 5, 0 ); mMLHandlerCombo = new TQComboBox( mlGroup ); mMLHandlerCombo->insertItem( i18n("KMail"), MailingList::KMail ); mMLHandlerCombo->insertItem( i18n("Browser"), MailingList::Browser ); mMLHandlerCombo->setEnabled( false ); groupLayout->addMultiCellWidget( mMLHandlerCombo, 5, 5, 1, 2 ); - connect( mMLHandlerCombo, TQT_SIGNAL(activated(int)), - TQT_SLOT(slotMLHandling(int)) ); + connect( mMLHandlerCombo, TQ_SIGNAL(activated(int)), + TQ_SLOT(slotMLHandling(int)) ); label->setBuddy( mMLHandlerCombo ); label = new TQLabel( i18n("&Address type:"), mlGroup ); label->setEnabled(false); - connect( mHoldsMailingList, TQT_SIGNAL(toggled(bool)), - label, TQT_SLOT(setEnabled(bool)) ); + connect( mHoldsMailingList, TQ_SIGNAL(toggled(bool)), + label, TQ_SLOT(setEnabled(bool)) ); groupLayout->addWidget( label, 6, 0 ); mAddressCombo = new TQComboBox( mlGroup ); label->setBuddy( mAddressCombo ); @@ -119,10 +119,10 @@ MailingListFolderPropertiesDialog::MailingListFolderPropertiesDialog( TQWidget* handleButton->setEnabled( false ); if( mFolder) { - connect( mHoldsMailingList, TQT_SIGNAL(toggled(bool)), - handleButton, TQT_SLOT(setEnabled(bool)) ); - connect( handleButton, TQT_SIGNAL(clicked()), - TQT_SLOT(slotInvokeHandler()) ); + connect( mHoldsMailingList, TQ_SIGNAL(toggled(bool)), + handleButton, TQ_SLOT(setEnabled(bool)) ); + connect( handleButton, TQ_SIGNAL(clicked()), + TQ_SLOT(slotInvokeHandler()) ); } groupLayout->addWidget( handleButton, 6, 2 ); @@ -140,8 +140,8 @@ MailingListFolderPropertiesDialog::MailingListFolderPropertiesDialog( TQWidget* << i18n( "List Archives" ) << i18n( "List Help" ); mAddressCombo->insertStringList( el ); - connect( mAddressCombo, TQT_SIGNAL(activated(int)), - TQT_SLOT(slotAddressChanged(int)) ); + connect( mAddressCombo, TQ_SIGNAL(activated(int)), + TQ_SLOT(slotAddressChanged(int)) ); load(); resize( TQSize(295, 204).expandedTo(minimumSizeHint()) ); diff --git a/kmail/mailinglistpropertiesdialog.h b/kmail/mailinglistpropertiesdialog.h index e527a5ae..90d5f543 100644 --- a/kmail/mailinglistpropertiesdialog.h +++ b/kmail/mailinglistpropertiesdialog.h @@ -44,7 +44,7 @@ namespace KMail class MailingListFolderPropertiesDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: MailingListFolderPropertiesDialog( TQWidget *parent, KMFolder *folder ); diff --git a/kmail/mailserviceimpl.cpp b/kmail/mailserviceimpl.cpp index 79af5eaf..cfd5a4a9 100644 --- a/kmail/mailserviceimpl.cpp +++ b/kmail/mailserviceimpl.cpp @@ -73,7 +73,7 @@ bool MailServiceImpl::sendMessage( const TQString& from, const TQString& to, if ( !body.isEmpty() ) msg->setBody( body.utf8() ); KMail::Composer * cWin = KMail::makeComposer( msg ); - cWin->setCharset("", TRUE); + cWin->setCharset("", true); cWin->addAttachmentsAndSend(attachments, "", 1);//send now return true; @@ -116,7 +116,7 @@ bool MailServiceImpl::sendMessage( const TQString& from, const TQString& to, msg->addBodyPart( part ); KMail::Composer * cWin = KMail::makeComposer( msg ); - cWin->setCharset("", TRUE); + cWin->setCharset("", true); return true; } diff --git a/kmail/mailsourceviewer.cpp b/kmail/mailsourceviewer.cpp index 7a06f970..ac6d60bc 100644 --- a/kmail/mailsourceviewer.cpp +++ b/kmail/mailsourceviewer.cpp @@ -58,10 +58,10 @@ MailSourceViewer::MailSourceViewer( TQWidget *parent, const char *name ) { setWFlags( WDestructiveClose ); TQAccel *accel = new TQAccel( this, "browser close-accel" ); - accel->connectItem( accel->insertItem( TQt::Key_Escape ), this , TQT_SLOT( close() )); - accel->connectItem( accel->insertItem( TQt::Key_W+CTRL ), this , TQT_SLOT( close() )); + accel->connectItem( accel->insertItem( TQt::Key_Escape ), this , TQ_SLOT( close() )); + accel->connectItem( accel->insertItem( TQt::Key_W+CTRL ), this , TQ_SLOT( close() )); setWordWrap( KTextBrowser::NoWrap ); - KWin::setIcons(winId(), kapp->icon(), kapp->miniIcon()); + KWin::setIcons(winId(), tdeApp->icon(), tdeApp->miniIcon()); } MailSourceViewer::~MailSourceViewer() diff --git a/kmail/main.cpp b/kmail/main.cpp index 8b40e555..24de19cd 100644 --- a/kmail/main.cpp +++ b/kmail/main.cpp @@ -19,7 +19,7 @@ */ #include <config.h> -#include <kuniqueapplication.h> +#include <tdeuniqueapplication.h> #include <tdeglobal.h> #include <knotifyclient.h> #include <dcopclient.h> @@ -36,10 +36,10 @@ //----------------------------------------------------------------------------- -class KMailApplication : public KUniqueApplication +class KMailApplication : public TDEUniqueApplication { public: - KMailApplication() : KUniqueApplication() { }; + KMailApplication() : TDEUniqueApplication() { }; virtual int newInstance(); void commitData(TQSessionManager& sm); @@ -58,15 +58,15 @@ int KMailApplication::newInstance() if (!kmkernel) return 0; - if (!kmkernel->firstInstance() || !kapp->isRestored()) + if (!kmkernel->firstInstance() || !tdeApp->isRestored()) kmkernel->handleCommandLine( true ); - kmkernel->setFirstInstance(FALSE); + kmkernel->setFirstInstance(false); return 0; } int main(int argc, char *argv[]) { - // WABA: KMail is a KUniqueApplication. Unfortunately this makes debugging + // WABA: KMail is a TDEUniqueApplication. Unfortunately this makes debugging // a bit harder: You should pass --nofork as commandline argument when using // a debugger. In gdb you can do this by typing "set args --nofork" before // typing "run". @@ -87,14 +87,14 @@ int main(int argc, char *argv[]) // using KMail without KDE) KNotifyClient::startDaemon(); - kapp->dcopClient()->suspend(); // Don't handle DCOP requests yet + tdeApp->dcopClient()->suspend(); // Don't handle DCOP requests yet KMail::lockOrDie(); //local, do the init KMKernel kmailKernel; kmailKernel.init(); - kapp->dcopClient()->setDefaultObject( kmailKernel.objId() ); + tdeApp->dcopClient()->setDefaultObject( kmailKernel.objId() ); // and session management kmailKernel.doSessionManagement(); @@ -104,10 +104,10 @@ int main(int argc, char *argv[]) kmsetSignalHandler(kmsignalHandler); - kapp->dcopClient()->resume(); // Ok. We are ready for DCOP requests. + tdeApp->dcopClient()->resume(); // Ok. We are ready for DCOP requests. kmailKernel.setStartingUp( false ); // Starting up is finished // Go! - int ret = kapp->exec(); + int ret = tdeApp->exec(); // clean up kmailKernel.cleanup(); diff --git a/kmail/managesievescriptsdialog.cpp b/kmail/managesievescriptsdialog.cpp index 560fac90..509a39b5 100644 --- a/kmail/managesievescriptsdialog.cpp +++ b/kmail/managesievescriptsdialog.cpp @@ -37,7 +37,7 @@ KMail::ManageSieveScriptsDialog::ManageSieveScriptsDialog( TQWidget * parent, co mWasActive( false ) { setWFlags( WGroupLeader|WDestructiveClose ); - KWin::setIcons( winId(), kapp->icon(), kapp->miniIcon() ); + KWin::setIcons( winId(), tdeApp->icon(), tdeApp->miniIcon() ); TQVBoxLayout * vlay = new TQVBoxLayout( plainPage(), 0, 0 ); @@ -46,12 +46,12 @@ KMail::ManageSieveScriptsDialog::ManageSieveScriptsDialog( TQWidget * parent, co mListView->setResizeMode( TQListView::LastColumn ); mListView->setRootIsDecorated( true ); mListView->setSelectionMode( TQListView::Single ); - connect( mListView, TQT_SIGNAL(contextMenuRequested(TQListViewItem*,const TQPoint&,int)), - this, TQT_SLOT(slotContextMenuRequested(TQListViewItem*, const TQPoint&)) ); - connect( mListView, TQT_SIGNAL(doubleClicked(TQListViewItem*,const TQPoint&,int)), - this, TQT_SLOT(slotDoubleClicked(TQListViewItem*)) ); - connect( mListView, TQT_SIGNAL(selectionChanged(TQListViewItem*)), - this, TQT_SLOT(slotSelectionChanged(TQListViewItem*)) ); + connect( mListView, TQ_SIGNAL(contextMenuRequested(TQListViewItem*,const TQPoint&,int)), + this, TQ_SLOT(slotContextMenuRequested(TQListViewItem*, const TQPoint&)) ); + connect( mListView, TQ_SIGNAL(doubleClicked(TQListViewItem*,const TQPoint&,int)), + this, TQ_SLOT(slotDoubleClicked(TQListViewItem*)) ); + connect( mListView, TQ_SIGNAL(selectionChanged(TQListViewItem*)), + this, TQ_SLOT(slotSelectionChanged(TQListViewItem*)) ); vlay->addWidget( mListView ); resize( 2 * sizeHint().width(), sizeHint().height() ); @@ -111,10 +111,10 @@ void KMail::ManageSieveScriptsDialog::slotRefresh() { if ( u.isEmpty() ) continue; SieveJob * job = SieveJob::list( u ); - connect( job, TQT_SIGNAL(item(KMail::SieveJob*,const TQString&,bool)), - this, TQT_SLOT(slotItem(KMail::SieveJob*,const TQString&,bool)) ); - connect( job, TQT_SIGNAL(result(KMail::SieveJob*,bool,const TQString&,bool)), - this, TQT_SLOT(slotResult(KMail::SieveJob*,bool,const TQString&,bool)) ); + connect( job, TQ_SIGNAL(item(KMail::SieveJob*,const TQString&,bool)), + this, TQ_SLOT(slotItem(KMail::SieveJob*,const TQString&,bool)) ); + connect( job, TQ_SIGNAL(result(KMail::SieveJob*,bool,const TQString&,bool)), + this, TQ_SLOT(slotResult(KMail::SieveJob*,bool,const TQString&,bool)) ); mJobs.insert( job, last ); mUrls.insert( last, u ); } else { @@ -162,12 +162,12 @@ void KMail::ManageSieveScriptsDialog::slotContextMenuRequested( TQListViewItem * mContextMenuItem = item; if ( item->depth() ) { // script items: - menu.insertItem( i18n( "Delete Script" ), this, TQT_SLOT(slotDeleteScript()) ); - menu.insertItem( i18n( "Edit Script..." ), this, TQT_SLOT(slotEditScript()) ); - menu.insertItem( i18n( "Deactivate Script" ), this, TQT_SLOT(slotDeactivateScript()) ); + menu.insertItem( i18n( "Delete Script" ), this, TQ_SLOT(slotDeleteScript()) ); + menu.insertItem( i18n( "Edit Script..." ), this, TQ_SLOT(slotEditScript()) ); + menu.insertItem( i18n( "Deactivate Script" ), this, TQ_SLOT(slotDeactivateScript()) ); } else { // top-levels: - menu.insertItem( i18n( "New Script..." ), this, TQT_SLOT(slotNewScript()) ); + menu.insertItem( i18n( "New Script..." ), this, TQ_SLOT(slotNewScript()) ); } menu.exec( p ); mContextMenuItem = 0; @@ -219,8 +219,8 @@ void KMail::ManageSieveScriptsDialog::changeActiveScript( TQCheckListItem * item job = SieveJob::activate( u ); else job = SieveJob::desactivate( u ); - connect( job, TQT_SIGNAL(result(KMail::SieveJob*,bool,const TQString&,bool)), - this, TQT_SLOT(slotRefresh()) ); + connect( job, TQ_SIGNAL(result(KMail::SieveJob*,bool,const TQString&,bool)), + this, TQ_SLOT(slotRefresh()) ); } void KMail::ManageSieveScriptsDialog::slotDoubleClicked( TQListViewItem * i ) { @@ -259,8 +259,8 @@ void KMail::ManageSieveScriptsDialog::slotDeleteScript() { != KMessageBox::Continue ) return; SieveJob * job = SieveJob::del( u ); - connect( job, TQT_SIGNAL(result(KMail::SieveJob*,bool,const TQString&,bool)), - this, TQT_SLOT(slotRefresh()) ); + connect( job, TQ_SIGNAL(result(KMail::SieveJob*,bool,const TQString&,bool)), + this, TQ_SLOT(slotRefresh()) ); } void KMail::ManageSieveScriptsDialog::slotEditScript() { @@ -277,8 +277,8 @@ void KMail::ManageSieveScriptsDialog::slotEditScript() { url.setFileName( mContextMenuItem->text( 0 ) ); mCurrentURL = url; SieveJob * job = SieveJob::get( url ); - connect( job, TQT_SIGNAL(result(KMail::SieveJob*,bool,const TQString&,bool)), - this, TQT_SLOT(slotGetResult(KMail::SieveJob*,bool,const TQString&,bool)) ); + connect( job, TQ_SIGNAL(result(KMail::SieveJob*,bool,const TQString&,bool)), + this, TQ_SLOT(slotGetResult(KMail::SieveJob*,bool,const TQString&,bool)) ); } void KMail::ManageSieveScriptsDialog::slotNewScript() { @@ -321,7 +321,7 @@ KMail::SieveEditor::SieveEditor( TQWidget * parent, const char * name ) mTextEdit->setTextFormat( TQTextEdit::PlainText ); mTextEdit->setWordWrap( TQTextEdit::NoWrap ); mTextEdit->setFont( TDEGlobalSettings::fixedFont() ); - connect( mTextEdit, TQT_SIGNAL( textChanged () ), TQT_SLOT( slotTextChanged() ) ); + connect( mTextEdit, TQ_SIGNAL( textChanged () ), TQ_SLOT( slotTextChanged() ) ); resize( 3 * sizeHint() ); } @@ -342,8 +342,8 @@ void KMail::ManageSieveScriptsDialog::slotGetResult( KMail::SieveJob *, bool suc mSieveEditor = new SieveEditor( this ); mSieveEditor->setScript( script ); - connect( mSieveEditor, TQT_SIGNAL(okClicked()), this, TQT_SLOT(slotSieveEditorOkClicked()) ); - connect( mSieveEditor, TQT_SIGNAL(cancelClicked()), this, TQT_SLOT(slotSieveEditorCancelClicked()) ); + connect( mSieveEditor, TQ_SIGNAL(okClicked()), this, TQ_SLOT(slotSieveEditorOkClicked()) ); + connect( mSieveEditor, TQ_SIGNAL(cancelClicked()), this, TQ_SLOT(slotSieveEditorCancelClicked()) ); mSieveEditor->show(); mWasActive = isActive; } @@ -352,8 +352,8 @@ void KMail::ManageSieveScriptsDialog::slotSieveEditorOkClicked() { if ( !mSieveEditor ) return; SieveJob * job = SieveJob::put( mCurrentURL,mSieveEditor->script(), mWasActive, mWasActive ); - connect( job, TQT_SIGNAL(result(KMail::SieveJob*,bool,const TQString&,bool)), - this, TQT_SLOT(slotPutResult(KMail::SieveJob*,bool)) ); + connect( job, TQ_SIGNAL(result(KMail::SieveJob*,bool,const TQString&,bool)), + this, TQ_SLOT(slotPutResult(KMail::SieveJob*,bool)) ); } void KMail::ManageSieveScriptsDialog::slotSieveEditorCancelClicked() { diff --git a/kmail/managesievescriptsdialog.h b/kmail/managesievescriptsdialog.h index 25a53dad..b3a6848c 100644 --- a/kmail/managesievescriptsdialog.h +++ b/kmail/managesievescriptsdialog.h @@ -14,7 +14,7 @@ class SieveJob; class SieveEditor; class ManageSieveScriptsDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: ManageSieveScriptsDialog( TQWidget * parent=0, const char * name=0 ); diff --git a/kmail/managesievescriptsdialog_p.h b/kmail/managesievescriptsdialog_p.h index 584d011b..d3b84e69 100644 --- a/kmail/managesievescriptsdialog_p.h +++ b/kmail/managesievescriptsdialog_p.h @@ -8,7 +8,7 @@ namespace KMail { class SieveEditor : public KDialogBase { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY( TQString script READ script WRITE setScript ) public: diff --git a/kmail/mboxjob.cpp b/kmail/mboxjob.cpp index df25a8ad..b591108f 100644 --- a/kmail/mboxjob.cpp +++ b/kmail/mboxjob.cpp @@ -67,7 +67,7 @@ MboxJob::~MboxJob() void MboxJob::execute() { - TQTimer::singleShot( 0, this, TQT_SLOT(startJob()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(startJob()) ); } //----------------------------------------------------------------------------- diff --git a/kmail/mboxjob.h b/kmail/mboxjob.h index c9b1e37c..8c65e181 100644 --- a/kmail/mboxjob.h +++ b/kmail/mboxjob.h @@ -40,7 +40,7 @@ namespace KMail { class MboxJob : public FolderJob { - Q_OBJECT + TQ_OBJECT friend class ::KMFolderMbox; public: diff --git a/kmail/messageactions.cpp b/kmail/messageactions.cpp index be2d4c9d..e7233d3e 100644 --- a/kmail/messageactions.cpp +++ b/kmail/messageactions.cpp @@ -42,36 +42,36 @@ MessageActions::MessageActions( TDEActionCollection *ac, TQWidget * parent ) : mReplyActionMenu = new TDEActionMenu( i18n("Message->","&Reply"), "mail-reply-sender", mActionCollection, "message_reply_menu" ); - connect( mReplyActionMenu, TQT_SIGNAL(activated()), this, - TQT_SLOT(slotReplyToMsg()) ); + connect( mReplyActionMenu, TQ_SIGNAL(activated()), this, + TQ_SLOT(slotReplyToMsg()) ); mReplyAction = new TDEAction( i18n("&Reply..."), "mail-reply-sender", Key_R, this, - TQT_SLOT(slotReplyToMsg()), mActionCollection, "reply" ); + TQ_SLOT(slotReplyToMsg()), mActionCollection, "reply" ); mReplyActionMenu->insert( mReplyAction ); mReplyAuthorAction = new TDEAction( i18n("Reply to A&uthor..."), "mail-reply-sender", SHIFT+Key_A, this, - TQT_SLOT(slotReplyAuthorToMsg()), + TQ_SLOT(slotReplyAuthorToMsg()), mActionCollection, "reply_author" ); mReplyActionMenu->insert( mReplyAuthorAction ); mReplyAllAction = new TDEAction( i18n("Reply to &All..."), "mail-reply-all", - Key_A, this, TQT_SLOT(slotReplyAllToMsg()), + Key_A, this, TQ_SLOT(slotReplyAllToMsg()), mActionCollection, "reply_all" ); mReplyActionMenu->insert( mReplyAllAction ); mReplyListAction = new TDEAction( i18n("Reply to Mailing-&List..."), "mail_replylist", Key_L, this, - TQT_SLOT(slotReplyListToMsg()), mActionCollection, + TQ_SLOT(slotReplyListToMsg()), mActionCollection, "reply_list" ); mReplyActionMenu->insert( mReplyListAction ); mNoQuoteReplyAction = new TDEAction( i18n("Reply Without &Quote..."), SHIFT+Key_R, - this, TQT_SLOT(slotNoQuoteReplyToMsg()), mActionCollection, "noquotereply" ); + this, TQ_SLOT(slotNoQuoteReplyToMsg()), mActionCollection, "noquotereply" ); mCreateTodoAction = new TDEAction( i18n("Create Task/Reminder..."), "mail_todo", - 0, this, TQT_SLOT(slotCreateTodo()), mActionCollection, + 0, this, TQ_SLOT(slotCreateTodo()), mActionCollection, "create_todo" ); @@ -80,35 +80,35 @@ MessageActions::MessageActions( TDEActionCollection *ac, TQWidget * parent ) : mStatusMenu->insert(new TDEAction(KGuiItem(i18n("Mark Message as &Read"), "kmmsgread", i18n("Mark selected messages as read")), - 0, this, TQT_SLOT(slotSetMsgStatusRead()), + 0, this, TQ_SLOT(slotSetMsgStatusRead()), mActionCollection, "status_read")); mStatusMenu->insert(new TDEAction(KGuiItem(i18n("Mark Message as &New"), "kmmsgnew", i18n("Mark selected messages as new")), - 0, this, TQT_SLOT(slotSetMsgStatusNew()), + 0, this, TQ_SLOT(slotSetMsgStatusNew()), mActionCollection, "status_new" )); mStatusMenu->insert(new TDEAction(KGuiItem(i18n("Mark Message as &Unread"), "kmmsgunseen", i18n("Mark selected messages as unread")), - 0, this, TQT_SLOT(slotSetMsgStatusUnread()), + 0, this, TQ_SLOT(slotSetMsgStatusUnread()), mActionCollection, "status_unread")); mStatusMenu->insert( new TDEActionSeparator( this ) ); mToggleFlagAction = new TDEToggleAction(i18n("Mark Message as &Important"), "mail_flag", - 0, this, TQT_SLOT(slotSetMsgStatusFlag()), + 0, this, TQ_SLOT(slotSetMsgStatusFlag()), mActionCollection, "status_flag"); mToggleFlagAction->setCheckedState( i18n("Remove &Important Message Mark") ); mStatusMenu->insert( mToggleFlagAction ); mToggleTodoAction = new TDEToggleAction(i18n("Mark Message as &Action Item"), "mail_todo", - 0, this, TQT_SLOT(slotSetMsgStatusTodo()), + 0, this, TQ_SLOT(slotSetMsgStatusTodo()), mActionCollection, "status_todo"); mToggleTodoAction->setCheckedState( i18n("Remove &Action Item Message Mark") ); mStatusMenu->insert( mToggleTodoAction ); mEditAction = new TDEAction( i18n("&Edit Message"), "edit", Key_T, this, - TQT_SLOT(editCurrentMessage()), mActionCollection, "edit" ); + TQ_SLOT(editCurrentMessage()), mActionCollection, "edit" ); mEditAction->plugAccel( mActionCollection->tdeaccel() ); updateActions(); @@ -174,8 +174,8 @@ template<typename T> void MessageActions::replyCommand() return; const TQString text = mMessageView ? mMessageView->copyText() : ""; KMCommand *command = new T( mParent, mCurrentMessage, text ); - connect( command, TQT_SIGNAL( completed( KMCommand * ) ), - this, TQT_SIGNAL( replyActionFinished() ) ); + connect( command, TQ_SIGNAL( completed( KMCommand * ) ), + this, TQ_SIGNAL( replyActionFinished() ) ); command->start(); } diff --git a/kmail/messageactions.h b/kmail/messageactions.h index 5e46489b..4c81a798 100644 --- a/kmail/messageactions.h +++ b/kmail/messageactions.h @@ -38,7 +38,7 @@ namespace KMail { */ class MessageActions : public TQObject { - Q_OBJECT + TQ_OBJECT public: MessageActions( TDEActionCollection* ac, TQWidget *parent ); diff --git a/kmail/messagecomposer.cpp b/kmail/messagecomposer.cpp index 60ceed94..1cc0cd33 100644 --- a/kmail/messagecomposer.cpp +++ b/kmail/messagecomposer.cpp @@ -373,7 +373,7 @@ void MessageComposer::doNextJob() } // We have more jobs to do, but allow others to come first - TQTimer::singleShot( 0, this, TQT_SLOT( slotDoNextJob() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( slotDoNextJob() ) ); } void MessageComposer::emitDone( bool b ) @@ -552,8 +552,8 @@ bool MessageComposer::encryptWithChiasmus( const Kleo::CryptoBackend::Protocol * const TQByteArray& body, TQByteArray& resultData ) { - std::auto_ptr<Kleo::SpecialJob> job( chiasmus->specialJob( "x-encrypt", TQStringVariantMap() ) ); - if ( !job.get() ) { + std::unique_ptr<Kleo::SpecialJob> job( chiasmus->specialJob( "x-encrypt", TQStringVariantMap() ) ); + if ( !job ) { const TQString msg = i18n( "Chiasmus backend does not offer the " "\"x-encrypt\" function. Please report this bug." ); KMessageBox::error( mComposeWin, msg, i18n( "Chiasmus Backend Error" ) ); @@ -2162,10 +2162,10 @@ void MessageComposer::pgpSignedMsg( const TQByteArray& cText, Kleo::CryptoMessag = isSMIME( format ) ? cpf->smime() : cpf->openpgp() ; assert( proto ); /// hmmm.....? - std::auto_ptr<Kleo::SignJob> job( proto->signJob( armor( format ), + std::unique_ptr<Kleo::SignJob> job( proto->signJob( armor( format ), textMode( format ) ) ); - if ( !job.get() ) { + if ( !job ) { KMessageBox::sorry( mComposeWin, i18n("This message could not be signed, " "since the chosen backend does not seem to support " @@ -2218,9 +2218,9 @@ Kpgp::Result MessageComposer::pgpEncryptedMsg( TQByteArray & encryptedBody, = isSMIME( format ) ? cpf->smime() : cpf->openpgp() ; assert( proto ); // hmmmm....? - std::auto_ptr<Kleo::EncryptJob> job( proto->encryptJob( armor( format ), + std::unique_ptr<Kleo::EncryptJob> job( proto->encryptJob( armor( format ), textMode( format ) ) ); - if ( !job.get() ) { + if ( !job ) { KMessageBox::sorry( mComposeWin, i18n("This message could not be encrypted, " "since the chosen backend does not seem to support " @@ -2266,9 +2266,9 @@ Kpgp::Result MessageComposer::pgpSignedAndEncryptedMsg( TQByteArray & encryptedB = isSMIME( format ) ? cpf->smime() : cpf->openpgp() ; assert( proto ); // hmmmm....? - std::auto_ptr<Kleo::SignEncryptJob> job( proto->signEncryptJob( armor( format ), + std::unique_ptr<Kleo::SignEncryptJob> job( proto->signEncryptJob( armor( format ), textMode( format ) ) ); - if ( !job.get() ) { + if ( !job ) { KMessageBox::sorry( mComposeWin, i18n("This message could not be signed and encrypted, " "since the chosen backend does not seem to support " diff --git a/kmail/messagecomposer.h b/kmail/messagecomposer.h index 11290cc2..24123759 100644 --- a/kmail/messagecomposer.h +++ b/kmail/messagecomposer.h @@ -63,7 +63,7 @@ namespace KPIM { } class MessageComposer : public TQObject { - Q_OBJECT + TQ_OBJECT friend class ::MessageComposerJob; friend class ::EncryptMessageJob; @@ -77,7 +77,7 @@ public: /** * Applies the user changes to the message object of the composer - * and signs/encrypts the message if activated. Returns FALSE in + * and signs/encrypts the message if activated. Returns false in * case of an error (e.g. if PGP encryption fails). * If backgroundMode is true then no functions which might require * user interaction (like signing/encrypting) are performed diff --git a/kmail/messagecopyhelper.cpp b/kmail/messagecopyhelper.cpp index 0257aa0b..4b46141f 100644 --- a/kmail/messagecopyhelper.cpp +++ b/kmail/messagecopyhelper.cpp @@ -62,7 +62,7 @@ MessageCopyHelper::MessageCopyHelper( const TQValueList< TQ_UINT32 > & msgs, command = new KMCopyCommand( dest, list ); } - connect( command, TQT_SIGNAL(completed(KMCommand*)), TQT_SLOT(copyCompleted(KMCommand*)) ); + connect( command, TQ_SIGNAL(completed(KMCommand*)), TQ_SLOT(copyCompleted(KMCommand*)) ); command->start(); } diff --git a/kmail/messagecopyhelper.h b/kmail/messagecopyhelper.h index 6d38d7b5..a097d4b8 100644 --- a/kmail/messagecopyhelper.h +++ b/kmail/messagecopyhelper.h @@ -38,7 +38,7 @@ namespace KMail { */ class MessageCopyHelper : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/kmail/messageproperty.h b/kmail/messageproperty.h index fdd3f35d..00da0655 100644 --- a/kmail/messageproperty.h +++ b/kmail/messageproperty.h @@ -56,7 +56,7 @@ class ActionScheduler; */ class MessageProperty : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/kmail/networkaccount.h b/kmail/networkaccount.h index 2ed8e452..832f6805 100644 --- a/kmail/networkaccount.h +++ b/kmail/networkaccount.h @@ -46,7 +46,7 @@ namespace TDEIO { namespace KMail { class NetworkAccount : public KMAccount { - Q_OBJECT + TQ_OBJECT protected: NetworkAccount( AccountManager * parent, const TQString & name, uint id ); diff --git a/kmail/newfolderdialog.cpp b/kmail/newfolderdialog.cpp index 0643cbbc..862833f0 100644 --- a/kmail/newfolderdialog.cpp +++ b/kmail/newfolderdialog.cpp @@ -86,7 +86,7 @@ NewFolderDialog::NewFolderDialog( TQWidget* parent, KMFolder *folder ) mNameLineEdit->setFocus(); mNameHBox->addWidget( mNameLineEdit ); mTopLevelLayout->addLayout( mNameHBox ); - connect( mNameLineEdit, TQT_SIGNAL( textChanged ( const TQString & ) ), this, TQT_SLOT( slotFolderNameChanged( const TQString & ) ) ); + connect( mNameLineEdit, TQ_SIGNAL( textChanged ( const TQString & ) ), this, TQ_SLOT( slotFolderNameChanged( const TQString & ) ) ); if ( !mFolder || ( mFolder->folderType() != KMFolderTypeImap && diff --git a/kmail/newfolderdialog.h b/kmail/newfolderdialog.h index 96cfc277..b6d0f929 100644 --- a/kmail/newfolderdialog.h +++ b/kmail/newfolderdialog.h @@ -46,7 +46,7 @@ namespace KMail { class NewFolderDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/kmail/objecttreeparser.cpp b/kmail/objecttreeparser.cpp index 39b7ac00..de0faee2 100644 --- a/kmail/objecttreeparser.cpp +++ b/kmail/objecttreeparser.cpp @@ -91,7 +91,7 @@ #include <tdeglobal.h> #include <tdehtml_part.h> #include <tdetempfile.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeapplication.h> #include <tdemessagebox.h> #include <kiconloader.h> @@ -609,7 +609,7 @@ namespace KMail { if ( key.numUserIDs() > 0 && key.userID( 0 ).id() ) messagePart.signer = Kleo::DN( key.userID( 0 ).id() ).prettyDN(); for ( uint iMail = 0; iMail < key.numUserIDs(); ++iMail ) { - // The following if /should/ always result in TRUE but we + // The following if /should/ always result in true but we // won't trust implicitely the plugin that gave us these data. if ( key.userID( iMail ).email() ) { TQString email = TQString::fromUtf8( key.userID( iMail ).email() ); @@ -1652,7 +1652,7 @@ namespace KMail { const TQByteArray certData = node->msgPart().bodyDecodedBinary(); - const STD_NAMESPACE_PREFIX auto_ptr<Kleo::ImportJob> import( smimeCrypto->importJob() ); + const STD_NAMESPACE_PREFIX unique_ptr<Kleo::ImportJob> import( smimeCrypto->importJob() ); const GpgME::ImportResult res = import->exec( certData ); if ( res.error() ) { htmlWriter()->queue( i18n( "Sorry, certificate could not be imported.<br>" @@ -1853,8 +1853,8 @@ bool ObjectTreeParser::decryptChiasmus( const TQByteArray& data, TQByteArray& bo if ( !chiasmus ) return false; - const STD_NAMESPACE_PREFIX auto_ptr<Kleo::SpecialJob> listjob( chiasmus->specialJob( "x-obtain-keys", TQStringVariantMap() ) ); - if ( !listjob.get() ) { + const STD_NAMESPACE_PREFIX unique_ptr<Kleo::SpecialJob> listjob( chiasmus->specialJob( "x-obtain-keys", TQStringVariantMap() ) ); + if ( !listjob ) { errorText = i18n( "Chiasmus backend does not offer the " "\"x-obtain-keys\" function. Please report this bug." ); return false; @@ -1892,8 +1892,8 @@ bool ObjectTreeParser::decryptChiasmus( const TQByteArray& data, TQByteArray& bo GlobalSettings::setChiasmusDecryptionKey( selectorDlg.key() ); assert( !GlobalSettings::chiasmusDecryptionKey().isEmpty() ); - const STD_NAMESPACE_PREFIX auto_ptr<Kleo::SpecialJob> job( chiasmus->specialJob( "x-decrypt", TQStringVariantMap() ) ); - if ( !job.get() ) { + const STD_NAMESPACE_PREFIX unique_ptr<Kleo::SpecialJob> job( chiasmus->specialJob( "x-decrypt", TQStringVariantMap() ) ); + if ( !job ) { errorText = i18n( "Chiasmus backend does not offer the " "\"x-decrypt\" function. Please report this bug." ); return false; @@ -2982,7 +2982,7 @@ TQString ObjectTreeParser::quotedHTML( const TQString& s, bool decorate ) TQString line; /* search next occurrence of '\n' */ - pos = s.find('\n', beg, FALSE); + pos = s.find('\n', beg, false); if (pos == (unsigned int)(-1)) pos = length; diff --git a/kmail/objecttreeparser_p.cpp b/kmail/objecttreeparser_p.cpp index 683d3c4c..fbd2b4df 100644 --- a/kmail/objecttreeparser_p.cpp +++ b/kmail/objecttreeparser_p.cpp @@ -89,8 +89,8 @@ bool DecryptVerifyBodyPartMemento::start() { m_dr = DecryptionResult( err ); return false; } - connect( m_job, TQT_SIGNAL(result(const GpgME::DecryptionResult&,const GpgME::VerificationResult&,const TQByteArray&)), - this, TQT_SLOT(slotResult(const GpgME::DecryptionResult&,const GpgME::VerificationResult&,const TQByteArray&)) ); + connect( m_job, TQ_SIGNAL(result(const GpgME::DecryptionResult&,const GpgME::VerificationResult&,const TQByteArray&)), + this, TQ_SLOT(slotResult(const GpgME::DecryptionResult&,const GpgME::VerificationResult&,const TQByteArray&)) ); setRunning( true ); return true; } @@ -155,8 +155,8 @@ bool VerifyDetachedBodyPartMemento::start() { m_vr = VerificationResult( err ); return false; } - connect( m_job, TQT_SIGNAL(result(const GpgME::VerificationResult&)), - this, TQT_SLOT(slotResult(const GpgME::VerificationResult&)) ); + connect( m_job, TQ_SIGNAL(result(const GpgME::VerificationResult&)), + this, TQ_SLOT(slotResult(const GpgME::VerificationResult&)) ); setRunning( true ); return true; } @@ -218,9 +218,9 @@ bool VerifyDetachedBodyPartMemento::startKeyListJob() assert( canStartKeyListJob() ); if ( const GpgME::Error err = m_keylistjob->start( keyListPattern() ) ) return false; - connect( m_keylistjob, TQT_SIGNAL(done()), this, TQT_SLOT(slotKeyListJobDone()) ); - connect( m_keylistjob, TQT_SIGNAL(nextKey(const GpgME::Key&)), - this, TQT_SLOT(slotNextKey(const GpgME::Key&)) ); + connect( m_keylistjob, TQ_SIGNAL(done()), this, TQ_SLOT(slotKeyListJobDone()) ); + connect( m_keylistjob, TQ_SIGNAL(nextKey(const GpgME::Key&)), + this, TQ_SLOT(slotNextKey(const GpgME::Key&)) ); return true; } @@ -261,8 +261,8 @@ bool VerifyOpaqueBodyPartMemento::start() { m_vr = VerificationResult( err ); return false; } - connect( m_job, TQT_SIGNAL(result(const GpgME::VerificationResult&,const TQByteArray&)), - this, TQT_SLOT(slotResult(const GpgME::VerificationResult&,const TQByteArray&)) ); + connect( m_job, TQ_SIGNAL(result(const GpgME::VerificationResult&,const TQByteArray&)), + this, TQ_SLOT(slotResult(const GpgME::VerificationResult&,const TQByteArray&)) ); setRunning( true ); return true; } @@ -328,9 +328,9 @@ bool VerifyOpaqueBodyPartMemento::startKeyListJob() assert( canStartKeyListJob() ); if ( const GpgME::Error err = m_keylistjob->start( keyListPattern() ) ) return false; - connect( m_keylistjob, TQT_SIGNAL(done()), this, TQT_SLOT(slotKeyListJobDone()) ); - connect( m_keylistjob, TQT_SIGNAL(nextKey(const GpgME::Key&)), - this, TQT_SLOT(slotNextKey(const GpgME::Key&)) ); + connect( m_keylistjob, TQ_SIGNAL(done()), this, TQ_SLOT(slotKeyListJobDone()) ); + connect( m_keylistjob, TQ_SIGNAL(nextKey(const GpgME::Key&)), + this, TQ_SLOT(slotNextKey(const GpgME::Key&)) ); return true; } diff --git a/kmail/objecttreeparser_p.h b/kmail/objecttreeparser_p.h index 04e1c2c3..961fbfdf 100644 --- a/kmail/objecttreeparser_p.h +++ b/kmail/objecttreeparser_p.h @@ -60,7 +60,7 @@ namespace KMail { public KMail::Interface::BodyPartMemento, public KMail::ISubject { - Q_OBJECT + TQ_OBJECT public: CryptoBodyPartMemento(); @@ -87,7 +87,7 @@ namespace KMail { class DecryptVerifyBodyPartMemento : public CryptoBodyPartMemento { - Q_OBJECT + TQ_OBJECT public: DecryptVerifyBodyPartMemento( Kleo::DecryptVerifyJob * job, const TQByteArray & cipherText ); @@ -123,7 +123,7 @@ namespace KMail { class VerifyDetachedBodyPartMemento : public CryptoBodyPartMemento { - Q_OBJECT + TQ_OBJECT public: VerifyDetachedBodyPartMemento( Kleo::VerifyDetachedJob * job, @@ -163,7 +163,7 @@ namespace KMail { class VerifyOpaqueBodyPartMemento : public CryptoBodyPartMemento { - Q_OBJECT + TQ_OBJECT public: VerifyOpaqueBodyPartMemento( Kleo::VerifyOpaqueJob * job, diff --git a/kmail/partNode.cpp b/kmail/partNode.cpp index b39bc65f..31b94d68 100644 --- a/kmail/partNode.cpp +++ b/kmail/partNode.cpp @@ -39,7 +39,6 @@ #include "kmmimeparttree.h" #include <mimelib/utility.h> #include <tqregexp.h> -#include <kasciistricmp.h> #include "util.h" /* diff --git a/kmail/popaccount.cpp b/kmail/popaccount.cpp index b455cc54..12af2bdc 100644 --- a/kmail/popaccount.cpp +++ b/kmail/popaccount.cpp @@ -38,7 +38,7 @@ using KPIM::BroadcastStatus; #include "accountmanager.h" #include <kdebug.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdelocale.h> #include <tdemessagebox.h> #include <tdemainwindow.h> @@ -72,10 +72,10 @@ PopAccount::PopAccount(AccountManager* aOwner, const TQString& aAccountName, uin mUidsOfNextSeenMsgsDict.setAutoDelete( false ); headersOnServer.setAutoDelete(true); - connect(&processMsgsTimer,TQT_SIGNAL(timeout()),TQT_SLOT(slotProcessPendingMsgs())); + connect(&processMsgsTimer,TQ_SIGNAL(timeout()),TQ_SLOT(slotProcessPendingMsgs())); TDEIO::Scheduler::connect( - TQT_SIGNAL(slaveError(TDEIO::Slave *, int, const TQString &)), - this, TQT_SLOT(slotSlaveError(TDEIO::Slave *, int, const TQString &))); + TQ_SIGNAL(slaveError(TDEIO::Slave *, int, const TQString &)), + this, TQ_SLOT(slotSlaveError(TDEIO::Slave *, int, const TQString &))); mHeaderDeleteUids.clear(); mHeaderDownUids.clear(); @@ -286,12 +286,12 @@ void PopAccount::setFilterOnServerCheckSize(unsigned int aSize) //----------------------------------------------------------------------------- void PopAccount::connectJob() { TDEIO::Scheduler::assignJobToSlave(mSlave, job); - connect(job, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray &)), - TQT_SLOT( slotData( TDEIO::Job*, const TQByteArray &))); - connect(job, TQT_SIGNAL( result( TDEIO::Job * ) ), - TQT_SLOT( slotResult( TDEIO::Job * ) ) ); - connect(job, TQT_SIGNAL(infoMessage( TDEIO::Job*, const TQString & )), - TQT_SLOT( slotMsgRetrieved(TDEIO::Job*, const TQString &))); + connect(job, TQ_SIGNAL( data( TDEIO::Job*, const TQByteArray &)), + TQ_SLOT( slotData( TDEIO::Job*, const TQByteArray &))); + connect(job, TQ_SIGNAL( result( TDEIO::Job * ) ), + TQ_SLOT( slotResult( TDEIO::Job * ) ) ); + connect(job, TQ_SIGNAL(infoMessage( TDEIO::Job*, const TQString & )), + TQ_SLOT( slotMsgRetrieved(TDEIO::Job*, const TQString &))); } @@ -353,8 +353,8 @@ void PopAccount::slotAbortRequested() { if (stage == Idle) return; if ( mMailCheckProgressItem ) - disconnect( mMailCheckProgressItem, TQT_SIGNAL( progressItemCanceled( KPIM::ProgressItem* ) ), - this, TQT_SLOT( slotAbortRequested() ) ); + disconnect( mMailCheckProgressItem, TQ_SIGNAL( progressItemCanceled( KPIM::ProgressItem* ) ), + this, TQ_SLOT( slotAbortRequested() ) ); stage = Quit; if (job) job->kill(); job = 0; @@ -404,8 +404,8 @@ void PopAccount::startJob() i18n("Preparing transmission from \"%1\"...").arg( escapedName ), true, // can be canceled useSSL() || useTLS() ); - connect( mMailCheckProgressItem, TQT_SIGNAL( progressItemCanceled( KPIM::ProgressItem* ) ), - this, TQT_SLOT( slotAbortRequested() ) ); + connect( mMailCheckProgressItem, TQ_SIGNAL( progressItemCanceled( KPIM::ProgressItem* ) ), + this, TQ_SLOT( slotAbortRequested() ) ); numBytes = 0; numBytesRead = 0; @@ -1064,7 +1064,7 @@ void PopAccount::slotSlaveError(TDEIO::Slave *aSlave, int error, /* We need a timer, otherwise slotSlaveError of the next account is also executed, if it reuses the slave, because the slave member variable is changed too early */ - TQTimer::singleShot(0, this, TQT_SLOT(slotCancel())); + TQTimer::singleShot(0, this, TQ_SLOT(slotCancel())); } //----------------------------------------------------------------------------- diff --git a/kmail/popaccount.h b/kmail/popaccount.h index f6acfee7..cb68ab38 100644 --- a/kmail/popaccount.h +++ b/kmail/popaccount.h @@ -25,7 +25,7 @@ namespace KMail { * KMail account for pop mail account */ class PopAccount: public NetworkAccount { - Q_OBJECT + TQ_OBJECT public: @@ -47,8 +47,8 @@ public: virtual void setUsePipelining(bool); /** - * Shall messages be left on the server upon retreival (TRUE) - * or deleted (FALSE). + * Shall messages be left on the server upon retreival (true) + * or deleted (false). */ bool leaveOnServer(void) const { return mLeaveOnServer; } virtual void setLeaveOnServer(bool); @@ -72,8 +72,8 @@ public: virtual void setLeaveOnServerSize(int); /** - * Shall messages be filter on the server (TRUE) - * or not (FALSE). + * Shall messages be filter on the server (true) + * or not (false). */ bool filterOnServer(void) const { return mFilterOnServer; } virtual void setFilterOnServer(bool); diff --git a/kmail/quotajobs.cpp b/kmail/quotajobs.cpp index f8272cac..215a657c 100644 --- a/kmail/quotajobs.cpp +++ b/kmail/quotajobs.cpp @@ -51,8 +51,8 @@ QuotaJobs::GetQuotarootJob::GetQuotarootJob( const KURL& url, bool showProgressInfo ) : TDEIO::SimpleJob( url, TDEIO::CMD_SPECIAL, packedArgs, showProgressInfo ) { - connect( this, TQT_SIGNAL(infoMessage(TDEIO::Job*,const TQString&)), - TQT_SLOT(slotInfoMessage(TDEIO::Job*,const TQString&)) ); + connect( this, TQ_SIGNAL(infoMessage(TDEIO::Job*,const TQString&)), + TQ_SLOT(slotInfoMessage(TDEIO::Job*,const TQString&)) ); } void QuotaJobs::GetQuotarootJob::slotInfoMessage( TDEIO::Job*, const TQString& str ) @@ -106,10 +106,10 @@ QuotaJobs::GetStorageQuotaJob::GetStorageQuotaJob( TDEIO::Slave* slave, const KU QuotaJobs::GetQuotarootJob *job = new QuotaJobs::GetQuotarootJob( url, packedArgs, false ); - connect(job, TQT_SIGNAL(quotaInfoReceived(const QuotaInfoList&)), - TQT_SLOT(slotQuotaInfoReceived(const QuotaInfoList&))); - connect(job, TQT_SIGNAL(quotaRootResult(const TQStringList&)), - TQT_SLOT(slotQuotarootResult(const TQStringList&))); + connect(job, TQ_SIGNAL(quotaInfoReceived(const QuotaInfoList&)), + TQ_SLOT(slotQuotaInfoReceived(const QuotaInfoList&))); + connect(job, TQ_SIGNAL(quotaRootResult(const TQStringList&)), + TQ_SLOT(slotQuotarootResult(const TQStringList&))); TDEIO::Scheduler::assignJobToSlave( slave, job ); addSubjob( job ); } diff --git a/kmail/quotajobs.h b/kmail/quotajobs.h index 4eb7ea0e..9681fb76 100644 --- a/kmail/quotajobs.h +++ b/kmail/quotajobs.h @@ -136,7 +136,7 @@ GetStorageQuotaJob* getStorageQuota( TDEIO::Slave* slave, const KURL& url ); /// for getQuotaroot() class GetQuotarootJob : public TDEIO::SimpleJob { - Q_OBJECT + TQ_OBJECT public: GetQuotarootJob( const KURL& url, const TQByteArray &packedArgs, bool showProgressInfo ); @@ -163,7 +163,7 @@ protected slots: /// for getStorageQuota() class GetStorageQuotaJob : public TDEIO::Job { - Q_OBJECT + TQ_OBJECT public: GetStorageQuotaJob( TDEIO::Slave* slave, const KURL& url ); diff --git a/kmail/recipientseditor.cpp b/kmail/recipientseditor.cpp index 7497a460..4525bb97 100644 --- a/kmail/recipientseditor.cpp +++ b/kmail/recipientseditor.cpp @@ -162,24 +162,24 @@ RecipientLine::RecipientLine( TQWidget *parent ) TQToolTip::add( mEdit, i18n( "Set the list of email addresses to receive this message" ) ); topLayout->addWidget( mEdit ); - connect( mEdit, TQT_SIGNAL( returnPressed() ), TQT_SLOT( slotReturnPressed() ) ); - connect( mEdit, TQT_SIGNAL( deleteMe() ), TQT_SLOT( slotPropagateDeletion() ) ); - connect( mEdit, TQT_SIGNAL( textChanged( const TQString & ) ), - TQT_SLOT( analyzeLine( const TQString & ) ) ); - connect( mEdit, TQT_SIGNAL( focusUp() ), TQT_SLOT( slotFocusUp() ) ); - connect( mEdit, TQT_SIGNAL( focusDown() ), TQT_SLOT( slotFocusDown() ) ); - connect( mEdit, TQT_SIGNAL( rightPressed() ), TQT_SIGNAL( rightPressed() ) ); + connect( mEdit, TQ_SIGNAL( returnPressed() ), TQ_SLOT( slotReturnPressed() ) ); + connect( mEdit, TQ_SIGNAL( deleteMe() ), TQ_SLOT( slotPropagateDeletion() ) ); + connect( mEdit, TQ_SIGNAL( textChanged( const TQString & ) ), + TQ_SLOT( analyzeLine( const TQString & ) ) ); + connect( mEdit, TQ_SIGNAL( focusUp() ), TQ_SLOT( slotFocusUp() ) ); + connect( mEdit, TQ_SIGNAL( focusDown() ), TQ_SLOT( slotFocusDown() ) ); + connect( mEdit, TQ_SIGNAL( rightPressed() ), TQ_SIGNAL( rightPressed() ) ); - connect( mEdit, TQT_SIGNAL( leftPressed() ), mCombo, TQT_SLOT( setFocus() ) ); - connect( mCombo, TQT_SIGNAL( rightPressed() ), mEdit, TQT_SLOT( setFocus() ) ); + connect( mEdit, TQ_SIGNAL( leftPressed() ), mCombo, TQ_SLOT( setFocus() ) ); + connect( mCombo, TQ_SIGNAL( rightPressed() ), mEdit, TQ_SLOT( setFocus() ) ); - connect( mCombo, TQT_SIGNAL( activated ( int ) ), - this, TQT_SLOT( slotTypeModified() ) ); + connect( mCombo, TQ_SIGNAL( activated ( int ) ), + this, TQ_SLOT( slotTypeModified() ) ); mRemoveButton = new TQPushButton( this ); mRemoveButton->setIconSet( TDEApplication::reverseLayout() ? SmallIconSet("locationbar_erase") : SmallIconSet( "clear_left" ) ); topLayout->addWidget( mRemoveButton ); - connect( mRemoveButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotPropagateDeletion() ) ); + connect( mRemoveButton, TQ_SIGNAL( clicked() ), TQ_SLOT( slotPropagateDeletion() ) ); TQToolTip::add( mRemoveButton, i18n("Remove recipient line") ); } @@ -357,20 +357,20 @@ RecipientLine *RecipientsView::addLine() addChild( line, 0, mLines.count() * mLineHeight ); line->mEdit->setCompletionMode( mCompletionMode ); line->show(); - connect( line, TQT_SIGNAL( returnPressed( RecipientLine * ) ), - TQT_SLOT( slotReturnPressed( RecipientLine * ) ) ); - connect( line, TQT_SIGNAL( upPressed( RecipientLine * ) ), - TQT_SLOT( slotUpPressed( RecipientLine * ) ) ); - connect( line, TQT_SIGNAL( downPressed( RecipientLine * ) ), - TQT_SLOT( slotDownPressed( RecipientLine * ) ) ); - connect( line, TQT_SIGNAL( rightPressed() ), TQT_SIGNAL( focusRight() ) ); - connect( line, TQT_SIGNAL( deleteLine( RecipientLine * ) ), - TQT_SLOT( slotDecideLineDeletion( RecipientLine * ) ) ); - connect( line, TQT_SIGNAL( countChanged() ), TQT_SLOT( calculateTotal() ) ); - connect( line, TQT_SIGNAL( typeModified( RecipientLine * ) ), - TQT_SLOT( slotTypeModified( RecipientLine * ) ) ); - connect( line->mEdit, TQT_SIGNAL( completionModeChanged( TDEGlobalSettings::Completion ) ), - TQT_SLOT( setCompletionMode( TDEGlobalSettings::Completion ) ) ); + connect( line, TQ_SIGNAL( returnPressed( RecipientLine * ) ), + TQ_SLOT( slotReturnPressed( RecipientLine * ) ) ); + connect( line, TQ_SIGNAL( upPressed( RecipientLine * ) ), + TQ_SLOT( slotUpPressed( RecipientLine * ) ) ); + connect( line, TQ_SIGNAL( downPressed( RecipientLine * ) ), + TQ_SLOT( slotDownPressed( RecipientLine * ) ) ); + connect( line, TQ_SIGNAL( rightPressed() ), TQ_SIGNAL( focusRight() ) ); + connect( line, TQ_SIGNAL( deleteLine( RecipientLine * ) ), + TQ_SLOT( slotDecideLineDeletion( RecipientLine * ) ) ); + connect( line, TQ_SIGNAL( countChanged() ), TQ_SLOT( calculateTotal() ) ); + connect( line, TQ_SIGNAL( typeModified( RecipientLine * ) ), + TQ_SLOT( slotTypeModified( RecipientLine * ) ) ); + connect( line->mEdit, TQ_SIGNAL( completionModeChanged( TDEGlobalSettings::Completion ) ), + TQ_SLOT( setCompletionMode( TDEGlobalSettings::Completion ) ) ); if ( mLines.last() ) { if ( mLines.count() == 1 ) { @@ -482,7 +482,7 @@ void RecipientsView::slotDecideLineDeletion( RecipientLine *line ) line->clear(); } else { mCurDelLine = line; - TQTimer::singleShot( 0, this, TQT_SLOT( slotDeleteLine( ) ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( slotDeleteLine( ) ) ); } } @@ -538,7 +538,7 @@ void RecipientsView::resizeView() parentWidget()->layout()->activate(); emit sizeHintChanged(); - TQTimer::singleShot( 0, this, TQT_SLOT(moveCompletionPopup()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(moveCompletionPopup()) ); } void RecipientsView::activateLine( RecipientLine *line ) @@ -768,14 +768,14 @@ SideWidget::SideWidget( RecipientsView *view, TQWidget *parent ) mDistributionListButton = new TQPushButton( i18n("Save List..."), this ); topLayout->addWidget( mDistributionListButton ); mDistributionListButton->hide(); - connect( mDistributionListButton, TQT_SIGNAL( clicked() ), - TQT_SIGNAL( saveDistributionList() ) ); + connect( mDistributionListButton, TQ_SIGNAL( clicked() ), + TQ_SIGNAL( saveDistributionList() ) ); TQToolTip::add( mDistributionListButton, i18n("Save recipients as distribution list") ); mSelectButton = new TQPushButton( i18n("Se&lect..."), this ); topLayout->addWidget( mSelectButton ); - connect( mSelectButton, TQT_SIGNAL( clicked() ), TQT_SLOT( pickRecipient() ) ); + connect( mSelectButton, TQ_SIGNAL( clicked() ), TQ_SLOT( pickRecipient() ) ); TQToolTip::add( mSelectButton, i18n("Select recipients from address book") ); } @@ -789,8 +789,8 @@ RecipientsPicker* SideWidget::picker() const // hacks to allow picker() to be const in the presence of lazy loading SideWidget *non_const_this = const_cast<SideWidget*>( this ); mRecipientPicker = new RecipientsPicker( non_const_this ); - connect( mRecipientPicker, TQT_SIGNAL( pickedRecipient( const Recipient & ) ), - non_const_this, TQT_SIGNAL( pickedRecipient( const Recipient & ) ) ); + connect( mRecipientPicker, TQ_SIGNAL( pickedRecipient( const Recipient & ) ), + non_const_this, TQ_SIGNAL( pickedRecipient( const Recipient & ) ) ); mPickerPositioner = new KWindowPositioner( non_const_this, mRecipientPicker ); } return mRecipientPicker; @@ -845,25 +845,25 @@ RecipientsEditor::RecipientsEditor( TQWidget *parent ) mRecipientsView = new RecipientsView( this ); topLayout->addWidget( mRecipientsView ); - connect( mRecipientsView, TQT_SIGNAL( focusUp() ), TQT_SIGNAL( focusUp() ) ); - connect( mRecipientsView, TQT_SIGNAL( focusDown() ), TQT_SIGNAL( focusDown() ) ); - connect( mRecipientsView, TQT_SIGNAL( completionModeChanged( TDEGlobalSettings::Completion ) ), - TQT_SIGNAL( completionModeChanged( TDEGlobalSettings::Completion ) ) ); + connect( mRecipientsView, TQ_SIGNAL( focusUp() ), TQ_SIGNAL( focusUp() ) ); + connect( mRecipientsView, TQ_SIGNAL( focusDown() ), TQ_SIGNAL( focusDown() ) ); + connect( mRecipientsView, TQ_SIGNAL( completionModeChanged( TDEGlobalSettings::Completion ) ), + TQ_SIGNAL( completionModeChanged( TDEGlobalSettings::Completion ) ) ); mSideWidget = new SideWidget( mRecipientsView, this ); topLayout->addWidget( mSideWidget ); - connect( mSideWidget, TQT_SIGNAL( pickedRecipient( const Recipient & ) ), - TQT_SLOT( slotPickedRecipient( const Recipient & ) ) ); - connect( mSideWidget, TQT_SIGNAL( saveDistributionList() ), - TQT_SLOT( saveDistributionList() ) ); - - connect( mRecipientsView, TQT_SIGNAL( totalChanged( int, int ) ), - mSideWidget, TQT_SLOT( setTotal( int, int ) ) ); - connect( mRecipientsView, TQT_SIGNAL( focusRight() ), - mSideWidget, TQT_SLOT( setFocus() ) ); - - connect( mRecipientsView, TQT_SIGNAL(sizeHintChanged()), - TQT_SIGNAL(sizeHintChanged()) ); + connect( mSideWidget, TQ_SIGNAL( pickedRecipient( const Recipient & ) ), + TQ_SLOT( slotPickedRecipient( const Recipient & ) ) ); + connect( mSideWidget, TQ_SIGNAL( saveDistributionList() ), + TQ_SLOT( saveDistributionList() ) ); + + connect( mRecipientsView, TQ_SIGNAL( totalChanged( int, int ) ), + mSideWidget, TQ_SLOT( setTotal( int, int ) ) ); + connect( mRecipientsView, TQ_SIGNAL( focusRight() ), + mSideWidget, TQ_SLOT( setFocus() ) ); + + connect( mRecipientsView, TQ_SIGNAL(sizeHintChanged()), + TQ_SIGNAL(sizeHintChanged()) ); } RecipientsEditor::~RecipientsEditor() diff --git a/kmail/recipientseditor.h b/kmail/recipientseditor.h index d02a1be5..f53ef48c 100644 --- a/kmail/recipientseditor.h +++ b/kmail/recipientseditor.h @@ -71,7 +71,7 @@ class Recipient class RecipientComboBox : public TQComboBox { - Q_OBJECT + TQ_OBJECT public: RecipientComboBox( TQWidget *parent ); @@ -85,7 +85,7 @@ class RecipientComboBox : public TQComboBox class RecipientLineEdit : public KMLineEdit { - Q_OBJECT + TQ_OBJECT public: RecipientLineEdit( TQWidget * parent ) : @@ -102,7 +102,7 @@ class RecipientLineEdit : public KMLineEdit class RecipientLine : public TQWidget { - Q_OBJECT + TQ_OBJECT public: RecipientLine( TQWidget *parent ); @@ -172,7 +172,7 @@ class RecipientLine : public TQWidget class RecipientsView : public TQScrollView { - Q_OBJECT + TQ_OBJECT public: RecipientsView( TQWidget *parent ); @@ -266,7 +266,7 @@ class RecipientsToolTip : public TQToolTip class SideWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: SideWidget( RecipientsView *view, TQWidget *parent ); @@ -298,7 +298,7 @@ class SideWidget : public TQWidget class RecipientsEditor : public TQWidget { - Q_OBJECT + TQ_OBJECT public: RecipientsEditor( TQWidget *parent ); diff --git a/kmail/recipientseditortest.cpp b/kmail/recipientseditortest.cpp index 50ea58a2..8c3a4d64 100644 --- a/kmail/recipientseditortest.cpp +++ b/kmail/recipientseditortest.cpp @@ -64,7 +64,7 @@ Composer::Composer( TQWidget *parent ) TQPushButton *button = new TQPushButton( "&Close", this ); topLayout->addMultiCellWidget( button, 3, 3, 0, 1 ); - connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( slotClose() ) ); + connect( button, TQ_SIGNAL( clicked() ), TQ_SLOT( slotClose() ) ); } void Composer::slotClose() @@ -96,7 +96,7 @@ int main( int argc, char **argv ) TDEApplication app; - TQObject::connect( &app, TQT_SIGNAL( lastWindowClosed() ), &app, TQT_SLOT( quit() ) ); + TQObject::connect( &app, TQ_SIGNAL( lastWindowClosed() ), &app, TQ_SLOT( quit() ) ); TQWidget *wid = new Composer( 0 ); diff --git a/kmail/recipientseditortest.h b/kmail/recipientseditortest.h index 12d0c2fc..68a050bb 100644 --- a/kmail/recipientseditortest.h +++ b/kmail/recipientseditortest.h @@ -30,7 +30,7 @@ class RecipientsEditor; class Composer : public TQWidget { - Q_OBJECT + TQ_OBJECT public: Composer( TQWidget *parent ); diff --git a/kmail/recipientspicker.cpp b/kmail/recipientspicker.cpp index be47b022..24679d8e 100644 --- a/kmail/recipientspicker.cpp +++ b/kmail/recipientspicker.cpp @@ -103,7 +103,7 @@ void RecipientItem::setAddressee( const TDEABC::Addressee &a, TQImage img = a.photo().data(); if ( !img.isNull() ) - mIcon = img.smoothScale( 20, 20, TQ_ScaleMin ); + mIcon = img.smoothScale( 20, 20, TQImage::ScaleMin ); else mIcon = TDEGlobal::iconLoader()->loadIcon( "preferences-desktop-personal", TDEIcon::Small ); @@ -364,10 +364,10 @@ RecipientsPicker::RecipientsPicker( TQWidget *parent ) resLayout->addWidget( mCollectionCombo ); resLayout->addItem(new TQSpacerItem(1, 1, TQSizePolicy::Expanding)); -// connect( mCollectionCombo, TQT_SIGNAL( highlighted( int ) ), -// TQT_SLOT( updateList() ) ); - connect( mCollectionCombo, TQT_SIGNAL( activated( int ) ), - TQT_SLOT( updateList() ) ); +// connect( mCollectionCombo, TQ_SIGNAL( highlighted( int ) ), +// TQ_SLOT( updateList() ) ); + connect( mCollectionCombo, TQ_SIGNAL( activated( int ) ), + TQ_SLOT( updateList() ) ); TQBoxLayout *searchLayout = new TQHBoxLayout( topLayout ); @@ -375,7 +375,7 @@ RecipientsPicker::RecipientsPicker( TQWidget *parent ) button->setIconSet( TDEGlobal::iconLoader()->loadIconSet( TDEApplication::reverseLayout() ? "clear_left":"locationbar_erase", TDEIcon::Small, 0 ) ); searchLayout->addWidget( button ); - connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( resetSearch() ) ); + connect( button, TQ_SIGNAL( clicked() ), TQ_SLOT( resetSearch() ) ); label = new TQLabel( i18n("&Search:"), this ); searchLayout->addWidget( label ); @@ -388,21 +388,21 @@ RecipientsPicker::RecipientsPicker( TQWidget *parent ) mRecipientList->addColumn( i18n("->") ); mRecipientList->addColumn( i18n("Name") ); mRecipientList->addColumn( i18n("Email") ); - connect( mRecipientList, TQT_SIGNAL( doubleClicked( TQListViewItem *, - const TQPoint &, int ) ), TQT_SLOT( slotPicked() ) ); - connect( mRecipientList, TQT_SIGNAL( returnPressed( TQListViewItem * ) ), - TQT_SLOT( slotPicked() ) ); + connect( mRecipientList, TQ_SIGNAL( doubleClicked( TQListViewItem *, + const TQPoint &, int ) ), TQ_SLOT( slotPicked() ) ); + connect( mRecipientList, TQ_SIGNAL( returnPressed( TQListViewItem * ) ), + TQ_SLOT( slotPicked() ) ); new RecipientsListToolTip( mRecipientList->viewport(), mRecipientList ); mSearchLine = new SearchLine( this, mRecipientList ); searchLayout->addWidget( mSearchLine ); label->setBuddy( label ); - connect( mSearchLine, TQT_SIGNAL( downPressed() ), TQT_SLOT( setFocusList() ) ); + connect( mSearchLine, TQ_SIGNAL( downPressed() ), TQ_SLOT( setFocusList() ) ); mSearchLDAPButton = new TQPushButton( i18n("Search &Directory Service"), this ); searchLayout->addWidget( mSearchLDAPButton ); - connect( mSearchLDAPButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotSearchLDAP() ) ); + connect( mSearchLDAPButton, TQ_SIGNAL( clicked() ), TQ_SLOT( slotSearchLDAP() ) ); TQBoxLayout *buttonLayout = new TQHBoxLayout( topLayout ); @@ -410,27 +410,27 @@ RecipientsPicker::RecipientsPicker( TQWidget *parent ) mToButton = new TQPushButton( i18n("Add as To"), this ); buttonLayout->addWidget( mToButton ); - connect( mToButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotToClicked() ) ); + connect( mToButton, TQ_SIGNAL( clicked() ), TQ_SLOT( slotToClicked() ) ); mCcButton = new TQPushButton( i18n("Add as CC"), this ); buttonLayout->addWidget( mCcButton ); - connect( mCcButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotCcClicked() ) ); + connect( mCcButton, TQ_SIGNAL( clicked() ), TQ_SLOT( slotCcClicked() ) ); mBccButton = new TQPushButton( i18n("Add as BCC"), this ); buttonLayout->addWidget( mBccButton ); - connect( mBccButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotBccClicked() ) ); + connect( mBccButton, TQ_SIGNAL( clicked() ), TQ_SLOT( slotBccClicked() ) ); // BCC isn't commonly used, so hide it for now //mBccButton->hide(); TQPushButton *closeButton = new TQPushButton( i18n("&Cancel"), this ); buttonLayout->addWidget( closeButton ); - connect( closeButton, TQT_SIGNAL( clicked() ), TQT_SLOT( close() ) ); + connect( closeButton, TQ_SIGNAL( clicked() ), TQ_SLOT( close() ) ); { using namespace TDEABC; mAddressBook = TDEABC::StdAddressBook::self( true ); - connect( mAddressBook, TQT_SIGNAL( addressBookChanged( AddressBook * ) ), - this, TQT_SLOT( insertAddressBook( AddressBook * ) ) ); + connect( mAddressBook, TQ_SIGNAL( addressBookChanged( AddressBook * ) ), + this, TQ_SLOT( insertAddressBook( AddressBook * ) ) ); } initCollections(); @@ -845,8 +845,8 @@ void RecipientsPicker::slotSearchLDAP() { if ( !mLdapSearchDialog ) { mLdapSearchDialog = new KPIM::LDAPSearchDialog( this ); - connect( mLdapSearchDialog, TQT_SIGNAL( addresseesAdded() ), - TQT_SLOT(ldapSearchResult() ) ); + connect( mLdapSearchDialog, TQ_SIGNAL( addresseesAdded() ), + TQ_SLOT(ldapSearchResult() ) ); } mLdapSearchDialog->setSearchText( mSearchLine->text() ); mLdapSearchDialog->show(); diff --git a/kmail/recipientspicker.h b/kmail/recipientspicker.h index d9dc2293..3de8eb6d 100644 --- a/kmail/recipientspicker.h +++ b/kmail/recipientspicker.h @@ -162,7 +162,7 @@ class RecipientsCollection class SearchLine : public TDEListViewSearchLine { - Q_OBJECT + TQ_OBJECT public: SearchLine( TQWidget *parent, TDEListView *listView ); @@ -178,7 +178,7 @@ using namespace TDEABC; class RecipientsPicker : public TQDialog { - Q_OBJECT + TQ_OBJECT public: RecipientsPicker( TQWidget *parent ); diff --git a/kmail/redirectdialog.cpp b/kmail/redirectdialog.cpp index 0426bf15..371f8b76 100644 --- a/kmail/redirectdialog.cpp +++ b/kmail/redirectdialog.cpp @@ -74,9 +74,9 @@ RedirectDialog::RedirectDialog( TQWidget *parent, const char *name, "where you can select recipients out " "of all available addresses." ) ); - connect( mBtnTo, TQT_SIGNAL(clicked()), TQT_SLOT(slotAddrBook()) ); + connect( mBtnTo, TQ_SIGNAL(clicked()), TQ_SLOT(slotAddrBook()) ); - connect( mEditTo, TQT_SIGNAL( textChanged ( const TQString & ) ), TQT_SLOT( slotEmailChanged( const TQString & ) ) ); + connect( mEditTo, TQ_SIGNAL( textChanged ( const TQString & ) ), TQ_SLOT( slotEmailChanged( const TQString & ) ) ); mLabelTo->setBuddy( mBtnTo ); mEditTo->setFocus(); diff --git a/kmail/redirectdialog.h b/kmail/redirectdialog.h index b4893298..7b0b2601 100644 --- a/kmail/redirectdialog.h +++ b/kmail/redirectdialog.h @@ -49,7 +49,7 @@ namespace KMail { */ class RedirectDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/kmail/regexplineedit.cpp b/kmail/regexplineedit.cpp index 1ce0237b..e99528a9 100644 --- a/kmail/regexplineedit.cpp +++ b/kmail/regexplineedit.cpp @@ -76,8 +76,8 @@ namespace KMail { setFocusProxy( mLineEdit ); hlay->addWidget( mLineEdit ); - connect( mLineEdit, TQT_SIGNAL( textChanged( const TQString & ) ), - this, TQT_SIGNAL( textChanged( const TQString & ) ) ); + connect( mLineEdit, TQ_SIGNAL( textChanged( const TQString & ) ), + this, TQ_SIGNAL( textChanged( const TQString & ) ) ); if( !TDETrader::self()->query("KRegExpEditor/KRegExpEditor").isEmpty() ) { mRegExpEditButton = new TQPushButton( i18n("Edit..."), this, @@ -86,8 +86,8 @@ namespace KMail { TQSizePolicy::Fixed ); hlay->addWidget( mRegExpEditButton ); - connect( mRegExpEditButton, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( slotEditRegExp() ) ); + connect( mRegExpEditButton, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( slotEditRegExp() ) ); } } @@ -120,7 +120,7 @@ namespace KMail { void RegExpLineEdit::slotEditRegExp() { if ( !mRegExpEditDialog ) - mRegExpEditDialog = KParts::ComponentFactory::createInstanceFromQuery<TQDialog>( "KRegExpEditor/KRegExpEditor", TQString(), TQT_TQOBJECT(this) ); + mRegExpEditDialog = KParts::ComponentFactory::createInstanceFromQuery<TQDialog>( "KRegExpEditor/KRegExpEditor", TQString(), this ); KRegExpEditorInterface *iface = static_cast<KRegExpEditorInterface *>( mRegExpEditDialog->tqt_cast( "KRegExpEditorInterface" ) ); diff --git a/kmail/regexplineedit.h b/kmail/regexplineedit.h index 732f5449..22dd69ff 100644 --- a/kmail/regexplineedit.h +++ b/kmail/regexplineedit.h @@ -46,7 +46,7 @@ namespace KMail { class RegExpLineEdit : public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/kmail/renamejob.cpp b/kmail/renamejob.cpp index 15c2778f..1c3cbef0 100644 --- a/kmail/renamejob.cpp +++ b/kmail/renamejob.cpp @@ -110,7 +110,7 @@ void RenameJob::execute() } // copy to the new folder mCopyFolderJob = new CopyFolderJob( mStorage, mNewParent ); - connect( mCopyFolderJob, TQT_SIGNAL(folderCopyComplete(bool)), TQT_SLOT(folderCopyComplete(bool)) ); + connect( mCopyFolderJob, TQ_SIGNAL(folderCopyComplete(bool)), TQ_SLOT(folderCopyComplete(bool)) ); mCopyFolderJob->execute(); } else @@ -149,8 +149,8 @@ void RenameJob::execute() ImapAccountBase::jobData jd( src.url() ); account->insertJob( job, jd ); TDEIO::Scheduler::assignJobToSlave( account->slave(), job ); - connect( job, TQT_SIGNAL(result(TDEIO::Job*)), - TQT_SLOT(slotRenameResult(TDEIO::Job*)) ); + connect( job, TQ_SIGNAL(result(TDEIO::Job*)), + TQ_SLOT(slotRenameResult(TDEIO::Job*)) ); } } diff --git a/kmail/renamejob.h b/kmail/renamejob.h index 9e3cea43..f0a54db6 100644 --- a/kmail/renamejob.h +++ b/kmail/renamejob.h @@ -50,7 +50,7 @@ class CopyFolderJob; */ class RenameJob : public FolderJob { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/kmail/rulewidgethandlermanager.cpp b/kmail/rulewidgethandlermanager.cpp index ae04af88..27aa68bc 100644 --- a/kmail/rulewidgethandlermanager.cpp +++ b/kmail/rulewidgethandlermanager.cpp @@ -251,7 +251,7 @@ void KMail::RuleWidgetHandlerManager::createWidgets( TQWidgetStack *functionStac for ( int i = 0; ( w = (*it)->createFunctionWidget( i, functionStack, receiver ) ); ++i ) { - if ( childCount( TQT_TQOBJECT(functionStack), w->name() ) < 2 ) { + if ( childCount( functionStack, w->name() ) < 2 ) { // there wasn't already a widget with this name, so add this widget functionStack->addWidget( w ); } @@ -266,7 +266,7 @@ void KMail::RuleWidgetHandlerManager::createWidgets( TQWidgetStack *functionStac for ( int i = 0; ( w = (*it)->createValueWidget( i, valueStack, receiver ) ); ++i ) { - if ( childCount( TQT_TQOBJECT(valueStack), w->name() ) < 2 ) { + if ( childCount( valueStack, w->name() ) < 2 ) { // there wasn't already a widget with this name, so add this widget valueStack->addWidget( w ); } @@ -368,7 +368,7 @@ namespace { TQObject *obj; while ( ( obj = it.current() ) ) { ++it; - if ( !objName || tqstrcmp( objName, obj->name() ) == 0 ) + if ( !objName || qstrcmp( objName, obj->name() ) == 0 ) break; } return obj; @@ -431,8 +431,8 @@ namespace { funcCombo->insertItem( i18n( TextFunctions[i].displayName ) ); } funcCombo->adjustSize(); - TQObject::connect( funcCombo, TQT_SIGNAL( activated( int ) ), - receiver, TQT_SLOT( slotFunctionChanged() ) ); + TQObject::connect( funcCombo, TQ_SIGNAL( activated( int ) ), + receiver, TQ_SLOT( slotFunctionChanged() ) ); return funcCombo; } @@ -445,8 +445,8 @@ namespace { if ( number == 0 ) { RegExpLineEdit *lineEdit = new RegExpLineEdit( valueStack, "regExpLineEdit" ); - TQObject::connect( lineEdit, TQT_SIGNAL( textChanged( const TQString & ) ), - receiver, TQT_SLOT( slotValueChanged() ) ); + TQObject::connect( lineEdit, TQ_SIGNAL( textChanged( const TQString & ) ), + receiver, TQ_SLOT( slotValueChanged() ) ); return lineEdit; } @@ -459,8 +459,8 @@ namespace { TQComboBox *combo = new TQComboBox( valueStack, "categoryCombo" ); TQStringList categories = KabcBridge::categories(); combo->insertStringList( categories ); - TQObject::connect( combo, TQT_SIGNAL( activated( int ) ), - receiver, TQT_SLOT( slotValueChanged() ) ); + TQObject::connect( combo, TQ_SIGNAL( activated( int ) ), + receiver, TQ_SLOT( slotValueChanged() ) ); return combo; } @@ -472,7 +472,7 @@ namespace { KMSearchRule::Function TextRuleWidgetHandler::currentFunction( const TQWidgetStack *functionStack ) const { const TQComboBox *funcCombo = - dynamic_cast<TQComboBox*>( TQObject_child_const( TQT_TQOBJECT_CONST(functionStack), + dynamic_cast<TQComboBox*>( TQObject_child_const( functionStack, "textRuleFuncCombo" ) ); // FIXME (TQt >= 4.0): Use the following when TQObject::child() is const. // dynamic_cast<TQComboBox*>( functionStack->child( "textRuleFuncCombo", @@ -503,7 +503,7 @@ namespace { if ( func == KMSearchRule::FuncIsInCategory || func == KMSearchRule::FuncIsNotInCategory ) { const TQComboBox *combo= - dynamic_cast<TQComboBox*>( TQObject_child_const( TQT_TQOBJECT_CONST(valueStack), + dynamic_cast<TQComboBox*>( TQObject_child_const( valueStack, "categoryCombo" ) ); // FIXME (TQt >= 4.0): Use the following when TQObject::child() is const. // dynamic_cast<TQComboBox*>( valueStack->child( "categoryCombo", @@ -520,7 +520,7 @@ namespace { //in other cases of func it is a lineedit const RegExpLineEdit *lineEdit = - dynamic_cast<RegExpLineEdit*>( TQObject_child_const( TQT_TQOBJECT_CONST(valueStack), + dynamic_cast<RegExpLineEdit*>( TQObject_child_const( valueStack, "regExpLineEdit" ) ); // FIXME (TQt >= 4.0): Use the following when TQObject::child() is const. // dynamic_cast<RegExpLineEdit*>( valueStack->child( "regExpLineEdit", @@ -646,14 +646,14 @@ namespace { if ( func == KMSearchRule::FuncIsInAddressbook || func == KMSearchRule::FuncIsNotInAddressbook ) { TQWidget *w = - TQT_TQWIDGET( valueStack->child( "textRuleValueHider", + static_cast<TQWidget*>( valueStack->child( "textRuleValueHider", 0, false ) ); valueStack->raiseWidget( w ); } else if ( func == KMSearchRule::FuncIsInCategory || func == KMSearchRule::FuncIsNotInCategory) { TQComboBox *combo = - static_cast<TQComboBox*>( TQT_TQWIDGET(valueStack->child( "categoryCombo", + static_cast<TQComboBox*>( static_cast<TQWidget*>(valueStack->child( "categoryCombo", 0, false )) ); combo->blockSignals( true ); for ( i = 0; i < combo->count(); ++i ) @@ -692,7 +692,7 @@ namespace { { // raise the correct function widget functionStack->raiseWidget( - TQT_TQWIDGET( functionStack->child( "textRuleFuncCombo", + static_cast<TQWidget*>( functionStack->child( "textRuleFuncCombo", 0, false ) ) ); // raise the correct value widget @@ -700,13 +700,13 @@ namespace { if ( func == KMSearchRule::FuncIsInAddressbook || func == KMSearchRule::FuncIsNotInAddressbook ) { valueStack->raiseWidget( - TQT_TQWIDGET( valueStack->child( "textRuleValueHider", + static_cast<TQWidget*>( valueStack->child( "textRuleValueHider", 0, false ) ) ); } else if ( func == KMSearchRule::FuncIsInCategory || func == KMSearchRule::FuncIsNotInCategory) { valueStack->raiseWidget( - TQT_TQWIDGET( valueStack->child( "categoryCombo", + static_cast<TQWidget*>( valueStack->child( "categoryCombo", 0, false ) ) ); } else { @@ -762,8 +762,8 @@ namespace { funcCombo->insertItem( i18n( MessageFunctions[i].displayName ) ); } funcCombo->adjustSize(); - TQObject::connect( funcCombo, TQT_SIGNAL( activated( int ) ), - receiver, TQT_SLOT( slotFunctionChanged() ) ); + TQObject::connect( funcCombo, TQ_SIGNAL( activated( int ) ), + receiver, TQ_SLOT( slotFunctionChanged() ) ); return funcCombo; } @@ -776,8 +776,8 @@ namespace { if ( number == 0 ) { RegExpLineEdit *lineEdit = new RegExpLineEdit( valueStack, "regExpLineEdit" ); - TQObject::connect( lineEdit, TQT_SIGNAL( textChanged( const TQString & ) ), - receiver, TQT_SLOT( slotValueChanged() ) ); + TQObject::connect( lineEdit, TQ_SIGNAL( textChanged( const TQString & ) ), + receiver, TQ_SLOT( slotValueChanged() ) ); return lineEdit; } @@ -794,7 +794,7 @@ namespace { KMSearchRule::Function MessageRuleWidgetHandler::currentFunction( const TQWidgetStack *functionStack ) const { const TQComboBox *funcCombo = - dynamic_cast<TQComboBox*>( TQObject_child_const( TQT_TQOBJECT_CONST(functionStack), + dynamic_cast<TQComboBox*>( TQObject_child_const( functionStack, "messageRuleFuncCombo" ) ); // FIXME (TQt >= 4.0): Use the following when TQObject::child() is const. // dynamic_cast<TQComboBox*>( functionStack->child( "messageRuleFuncCombo", @@ -825,7 +825,7 @@ namespace { KMSearchRule::Function ) const { const RegExpLineEdit *lineEdit = - dynamic_cast<RegExpLineEdit*>( TQObject_child_const( TQT_TQOBJECT_CONST(valueStack), + dynamic_cast<RegExpLineEdit*>( TQObject_child_const( valueStack, "regExpLineEdit" ) ); // FIXME (TQt >= 4.0): Use the following when TQObject::child() is const. // dynamic_cast<RegExpLineEdit*>( valueStack->child( "regExpLineEdit", @@ -947,7 +947,7 @@ namespace { if ( func == KMSearchRule::FuncHasAttachment || func == KMSearchRule::FuncHasNoAttachment ) { TQWidget *w = - TQT_TQWIDGET( valueStack->child( "textRuleValueHider", + static_cast<TQWidget*>( valueStack->child( "textRuleValueHider", 0, false ) ); valueStack->raiseWidget( w ); } @@ -978,7 +978,7 @@ namespace { return false; // raise the correct function widget functionStack->raiseWidget( - TQT_TQWIDGET( functionStack->child( "messageRuleFuncCombo", + static_cast<TQWidget*>( functionStack->child( "messageRuleFuncCombo", 0, false ) ) ); // raise the correct value widget @@ -986,7 +986,7 @@ namespace { if ( func == KMSearchRule::FuncHasAttachment || func == KMSearchRule::FuncHasNoAttachment ) { TQWidget *w = - TQT_TQWIDGET( valueStack->child( "textRuleValueHider", + static_cast<TQWidget*>( valueStack->child( "textRuleValueHider", 0, false ) ); valueStack->raiseWidget( w ); } @@ -1038,8 +1038,8 @@ namespace { funcCombo->insertItem( i18n( StatusFunctions[i].displayName ) ); } funcCombo->adjustSize(); - TQObject::connect( funcCombo, TQT_SIGNAL( activated( int ) ), - receiver, TQT_SLOT( slotFunctionChanged() ) ); + TQObject::connect( funcCombo, TQ_SIGNAL( activated( int ) ), + receiver, TQ_SLOT( slotFunctionChanged() ) ); return funcCombo; } @@ -1058,8 +1058,8 @@ namespace { statusCombo->insertItem( UserIcon( KMail::StatusValues[ i ].icon ), i18n( KMail::StatusValues[ i ].text ) ); } statusCombo->adjustSize(); - TQObject::connect( statusCombo, TQT_SIGNAL( activated( int ) ), - receiver, TQT_SLOT( slotValueChanged() ) ); + TQObject::connect( statusCombo, TQ_SIGNAL( activated( int ) ), + receiver, TQ_SLOT( slotValueChanged() ) ); return statusCombo; } @@ -1068,7 +1068,7 @@ namespace { KMSearchRule::Function StatusRuleWidgetHandler::currentFunction( const TQWidgetStack *functionStack ) const { const TQComboBox *funcCombo = - dynamic_cast<TQComboBox*>( TQObject_child_const( TQT_TQOBJECT_CONST(functionStack), + dynamic_cast<TQComboBox*>( TQObject_child_const( functionStack, "statusRuleFuncCombo" ) ); // FIXME (TQt >= 4.0): Use the following when TQObject::child() is const. // dynamic_cast<TQComboBox*>( functionStack->child( "statusRuleFuncCombo", @@ -1098,7 +1098,7 @@ namespace { int StatusRuleWidgetHandler::currenStatusValue( const TQWidgetStack *valueStack ) const { const TQComboBox *statusCombo = - dynamic_cast<TQComboBox*>( TQObject_child_const( TQT_TQOBJECT_CONST(valueStack), + dynamic_cast<TQComboBox*>( TQObject_child_const( valueStack, "statusRuleValueCombo" ) ); // FIXME (TQt >= 4.0): Use the following when TQObject::child() is const. // dynamic_cast<TQComboBox*>( valueStack->child( "statusRuleValueCombo", @@ -1249,12 +1249,12 @@ namespace { // raise the correct function widget functionStack->raiseWidget( - TQT_TQWIDGET( functionStack->child( "statusRuleFuncCombo", + static_cast<TQWidget*>( functionStack->child( "statusRuleFuncCombo", 0, false ) ) ); // raise the correct value widget valueStack->raiseWidget( - TQT_TQWIDGET( valueStack->child( "statusRuleValueCombo", + static_cast<TQWidget*>( valueStack->child( "statusRuleValueCombo", 0, false ) ) ); return true; } @@ -1298,8 +1298,8 @@ namespace { funcCombo->insertItem( i18n( NumericFunctions[i].displayName ) ); } funcCombo->adjustSize(); - TQObject::connect( funcCombo, TQT_SIGNAL( activated( int ) ), - receiver, TQT_SLOT( slotFunctionChanged() ) ); + TQObject::connect( funcCombo, TQ_SIGNAL( activated( int ) ), + receiver, TQ_SLOT( slotFunctionChanged() ) ); return funcCombo; } @@ -1313,8 +1313,8 @@ namespace { return 0; KIntNumInput *numInput = new KIntNumInput( valueStack, "KIntNumInput" ); - TQObject::connect( numInput, TQT_SIGNAL( valueChanged( int ) ), - receiver, TQT_SLOT( slotValueChanged() ) ); + TQObject::connect( numInput, TQ_SIGNAL( valueChanged( int ) ), + receiver, TQ_SLOT( slotValueChanged() ) ); return numInput; } @@ -1323,7 +1323,7 @@ namespace { KMSearchRule::Function NumericRuleWidgetHandler::currentFunction( const TQWidgetStack *functionStack ) const { const TQComboBox *funcCombo = - dynamic_cast<TQComboBox*>( TQObject_child_const( TQT_TQOBJECT_CONST(functionStack), + dynamic_cast<TQComboBox*>( TQObject_child_const( functionStack, "numericRuleFuncCombo" ) ); // FIXME (TQt >= 4.0): Use the following when TQObject::child() is const. // dynamic_cast<TQComboBox*>( functionStack->child( "numericRuleFuncCombo", @@ -1353,7 +1353,7 @@ namespace { TQString NumericRuleWidgetHandler::currentValue( const TQWidgetStack *valueStack ) const { const KIntNumInput *numInput = - dynamic_cast<KIntNumInput*>( TQObject_child_const( TQT_TQOBJECT_CONST(valueStack), + dynamic_cast<KIntNumInput*>( TQObject_child_const( valueStack, "KIntNumInput" ) ); // FIXME (TQt >= 4.0): Use the following when TQObject::child() is const. // dynamic_cast<KIntNumInput*>( valueStack->child( "KIntNumInput", @@ -1502,7 +1502,7 @@ namespace { // raise the correct function widget functionStack->raiseWidget( - TQT_TQWIDGET( functionStack->child( "numericRuleFuncCombo", + static_cast<TQWidget*>( functionStack->child( "numericRuleFuncCombo", 0, false ) ) ); // raise the correct value widget diff --git a/kmail/searchjob.cpp b/kmail/searchjob.cpp index b0b1d9de..7b0b5558 100644 --- a/kmail/searchjob.cpp +++ b/kmail/searchjob.cpp @@ -92,10 +92,10 @@ void SearchJob::searchCompleteFolder() if ( mFolder->imapPath() != TQString( "/" ) ) { TDEIO::Scheduler::assignJobToSlave( mAccount->slave(), job ); - connect( job, TQT_SIGNAL( infoMessage( TDEIO::Job*, const TQString& ) ), - TQT_SLOT( slotSearchData( TDEIO::Job*, const TQString& ) ) ); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), - TQT_SLOT( slotSearchResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( infoMessage( TDEIO::Job*, const TQString& ) ), + TQ_SLOT( slotSearchData( TDEIO::Job*, const TQString& ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), + TQ_SLOT( slotSearchResult( TDEIO::Job * ) ) ); } else { // for the "/ folder" of an imap account, searching blocks the tdeioslave @@ -199,8 +199,8 @@ void SearchJob::slotSearchData( TDEIO::Job* job, const TQString& data ) } else { // get the folder to make sure we have all messages - connect ( mFolder, TQT_SIGNAL( folderComplete( KMFolderImap*, bool ) ), - this, TQT_SLOT( slotSearchFolder()) ); + connect ( mFolder, TQ_SIGNAL( folderComplete( KMFolderImap*, bool ) ), + this, TQ_SLOT( slotSearchFolder()) ); mFolder->getFolder(); } } @@ -221,8 +221,8 @@ bool SearchJob::canMapAllUIDs() //----------------------------------------------------------------------------- void SearchJob::slotSearchFolder() { - disconnect ( mFolder, TQT_SIGNAL( folderComplete( KMFolderImap*, bool ) ), - this, TQT_SLOT( slotSearchFolder()) ); + disconnect ( mFolder, TQ_SIGNAL( folderComplete( KMFolderImap*, bool ) ), + this, TQ_SLOT( slotSearchFolder()) ); if ( mLocalSearchPattern->isEmpty() ) { // pure imap search - now get the serial number for the UIDs @@ -271,8 +271,8 @@ void SearchJob::slotSearchFolder() true, mAccount->useSSL() || mAccount->useTLS() ); mProgress->setTotalItems( numMsgs ); - connect ( mProgress, TQT_SIGNAL( progressItemCanceled( KPIM::ProgressItem*)), - this, TQT_SLOT( slotAbortSearch( KPIM::ProgressItem* ) ) ); + connect ( mProgress, TQ_SIGNAL( progressItemCanceled( KPIM::ProgressItem*)), + this, TQ_SLOT( slotAbortSearch( KPIM::ProgressItem* ) ) ); for ( unsigned int i = 0; i < numMsgs ; ++i ) { KMMessage * msg = mFolder->getMsg( i ); @@ -280,8 +280,8 @@ void SearchJob::slotSearchFolder() ImapJob *job = new ImapJob( msg ); job->setParentFolder( mFolder ); job->setParentProgressItem( mProgress ); - connect( job, TQT_SIGNAL(messageRetrieved(KMMessage*)), - this, TQT_SLOT(slotSearchMessageArrived(KMMessage*)) ); + connect( job, TQ_SIGNAL(messageRetrieved(KMMessage*)), + this, TQ_SLOT(slotSearchMessageArrived(KMMessage*)) ); job->start(); } else { slotSearchMessageArrived( msg ); @@ -387,10 +387,10 @@ void SearchJob::searchSingleMessage() stream << (int) 'E' << url; TDEIO::SimpleJob *job = TDEIO::special( url, packedArgs, false ); TDEIO::Scheduler::assignJobToSlave(mAccount->slave(), job); - connect( job, TQT_SIGNAL(infoMessage(TDEIO::Job*,const TQString&)), - TQT_SLOT(slotSearchDataSingleMessage(TDEIO::Job*,const TQString&)) ); - connect( job, TQT_SIGNAL(result(TDEIO::Job *)), - TQT_SLOT(slotSearchResult(TDEIO::Job *)) ); + connect( job, TQ_SIGNAL(infoMessage(TDEIO::Job*,const TQString&)), + TQ_SLOT(slotSearchDataSingleMessage(TDEIO::Job*,const TQString&)) ); + connect( job, TQ_SIGNAL(result(TDEIO::Job *)), + TQ_SLOT(slotSearchResult(TDEIO::Job *)) ); } } @@ -420,8 +420,8 @@ void SearchJob::slotSearchDataSingleMessage( TDEIO::Job* job, const TQString& da if ( needsDownload() ) { ImapJob *job = new ImapJob( msg ); job->setParentFolder( mFolder ); - connect( job, TQT_SIGNAL(messageRetrieved(KMMessage*)), - this, TQT_SLOT(slotSearchMessageArrived(KMMessage*)) ); + connect( job, TQ_SIGNAL(messageRetrieved(KMMessage*)), + this, TQ_SLOT(slotSearchMessageArrived(KMMessage*)) ); job->start(); } else { slotSearchMessageArrived( msg ); diff --git a/kmail/searchjob.h b/kmail/searchjob.h index 85fd5c2a..2408669c 100644 --- a/kmail/searchjob.h +++ b/kmail/searchjob.h @@ -52,7 +52,7 @@ class ImapAccountBase; */ class SearchJob : public FolderJob { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/kmail/searchwindow.cpp b/kmail/searchwindow.cpp index 68d64a82..84f0d385 100644 --- a/kmail/searchwindow.cpp +++ b/kmail/searchwindow.cpp @@ -127,7 +127,7 @@ SearchWindow::SearchWindow(KMMainWidget* w, const char* name, // proper fix in KWin (l.lunak@kde.org) XDeleteProperty( tqt_xdisplay(), winId(), XA_WM_TRANSIENT_FOR ); #endif - KWin::setIcons(winId(), kapp->icon(), kapp->miniIcon()); + KWin::setIcons(winId(), tdeApp->icon(), tdeApp->miniIcon()); TDEConfig* config = KMKernel::config(); config->setGroup("SearchDialog"); @@ -188,18 +188,18 @@ SearchWindow::SearchWindow(KMMainWidget* w, const char* name, if ( list ) object = list->first(); delete list; - if (!searchFolder && object && ::tqqt_cast<TQComboBox*>(object)) - static_cast<TQComboBox*>(TQT_TQWIDGET(object))->setCurrentText(i18n("Subject")); + if (!searchFolder && object && ::tqt_cast<TQComboBox*>(object)) + static_cast<TQComboBox*>(object)->setCurrentText(i18n("Subject")); vbl->addWidget( mPatternEdit ); // enable/disable widgets depending on radio buttons: - connect( mChkbxSpecificFolders, TQT_SIGNAL(toggled(bool)), - mCbxFolders, TQT_SLOT(setEnabled(bool)) ); - connect( mChkbxSpecificFolders, TQT_SIGNAL(toggled(bool)), - mChkSubFolders, TQT_SLOT(setEnabled(bool)) ); - connect( mChkbxAllFolders, TQT_SIGNAL(toggled(bool)), - TQT_TQOBJECT(this), TQT_SLOT(setEnabledSearchButton(bool)) ); + connect( mChkbxSpecificFolders, TQ_SIGNAL(toggled(bool)), + mCbxFolders, TQ_SLOT(setEnabled(bool)) ); + connect( mChkbxSpecificFolders, TQ_SIGNAL(toggled(bool)), + mChkSubFolders, TQ_SLOT(setEnabled(bool)) ); + connect( mChkbxAllFolders, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(setEnabledSearchButton(bool)) ); mLbxMatches = new MatchListView(searchWidget, this, "Find Messages"); @@ -236,14 +236,14 @@ SearchWindow::SearchWindow(KMMainWidget* w, const char* name, mLbxMatches->setDragEnabled( true ); - connect( mLbxMatches, TQT_SIGNAL(clicked(TQListViewItem *)), - TQT_TQOBJECT(this), TQT_SLOT(slotShowMsg(TQListViewItem *)) ); - connect( mLbxMatches, TQT_SIGNAL(doubleClicked(TQListViewItem *)), - TQT_TQOBJECT(this), TQT_SLOT(slotViewMsg(TQListViewItem *)) ); - connect( mLbxMatches, TQT_SIGNAL(currentChanged(TQListViewItem *)), - TQT_TQOBJECT(this), TQT_SLOT(slotCurrentChanged(TQListViewItem *)) ); - connect( mLbxMatches, TQT_SIGNAL(contextMenuRequested(TQListViewItem *,const TQPoint &,int)), - TQT_TQOBJECT(this), TQT_SLOT(slotContextMenuRequested(TQListViewItem *,const TQPoint &,int)) ); + connect( mLbxMatches, TQ_SIGNAL(clicked(TQListViewItem *)), + this, TQ_SLOT(slotShowMsg(TQListViewItem *)) ); + connect( mLbxMatches, TQ_SIGNAL(doubleClicked(TQListViewItem *)), + this, TQ_SLOT(slotViewMsg(TQListViewItem *)) ); + connect( mLbxMatches, TQ_SIGNAL(currentChanged(TQListViewItem *)), + this, TQ_SLOT(slotCurrentChanged(TQListViewItem *)) ); + connect( mLbxMatches, TQ_SIGNAL(contextMenuRequested(TQListViewItem *,const TQPoint &,int)), + this, TQ_SLOT(slotContextMenuRequested(TQListViewItem *,const TQPoint &,int)) ); vbl->addWidget( mLbxMatches ); TQHBoxLayout *hbl2 = new TQHBoxLayout( vbl, spacingHint(), "kmfs_hbl2" ); @@ -260,17 +260,17 @@ SearchWindow::SearchWindow(KMMainWidget* w, const char* name, mSearchFolderOpenBtn = new TQPushButton(i18n("Op&en Search Folder"), searchWidget); mSearchFolderOpenBtn->setEnabled(false); hbl2->addWidget(mSearchFolderOpenBtn); - connect( mSearchFolderEdt, TQT_SIGNAL( textChanged( const TQString &)), - TQT_TQOBJECT(this), TQT_SLOT( scheduleRename( const TQString & ))); - connect( &mRenameTimer, TQT_SIGNAL( timeout() ), - TQT_TQOBJECT(this), TQT_SLOT( renameSearchFolder() )); - connect( mSearchFolderOpenBtn, TQT_SIGNAL( clicked() ), - TQT_TQOBJECT(this), TQT_SLOT( openSearchFolder() )); + connect( mSearchFolderEdt, TQ_SIGNAL( textChanged( const TQString &)), + this, TQ_SLOT( scheduleRename( const TQString & ))); + connect( &mRenameTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( renameSearchFolder() )); + connect( mSearchFolderOpenBtn, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( openSearchFolder() )); mSearchResultOpenBtn = new TQPushButton(i18n("Open &Message"), searchWidget); mSearchResultOpenBtn->setEnabled(false); hbl2->addWidget(mSearchResultOpenBtn); - connect( mSearchResultOpenBtn, TQT_SIGNAL( clicked() ), - TQT_TQOBJECT(this), TQT_SLOT( slotViewSelectedMsg() )); + connect( mSearchResultOpenBtn, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( slotViewSelectedMsg() )); mStatusBar = new KStatusBar(searchWidget); mStatusBar->insertFixedItem(i18n("AMiddleLengthText..."), 0, true); mStatusBar->changeItem(i18n("Ready."), 0); @@ -286,20 +286,20 @@ SearchWindow::SearchWindow(KMMainWidget* w, const char* name, resize(mainWidth, mainHeight); setMainWidget(searchWidget); - setButtonBoxOrientation(Qt::Vertical); + setButtonBoxOrientation(TQt::Vertical); mBtnSearch = actionButton(KDialogBase::User1); mBtnStop = actionButton(KDialogBase::User2); mBtnStop->setEnabled(false); - connect(this, TQT_SIGNAL(user1Clicked()), TQT_SLOT(slotSearch())); - connect(this, TQT_SIGNAL(user2Clicked()), TQT_SLOT(slotStop())); - connect(this, TQT_SIGNAL(finished()), TQT_TQOBJECT(this), TQT_SLOT(deleteLater())); + connect(this, TQ_SIGNAL(user1Clicked()), TQ_SLOT(slotSearch())); + connect(this, TQ_SIGNAL(user2Clicked()), TQ_SLOT(slotStop())); + connect(this, TQ_SIGNAL(finished()), this, TQ_SLOT(deleteLater())); // give focus to the value field of the first search rule object = mPatternEdit->child( "regExpLineEdit" ); if ( object && object->isWidgetType() ) { - TQT_TQWIDGET(object)->setFocus(); + static_cast<TQWidget*>(object)->setFocus(); //kdDebug(5006) << "SearchWindow: focus has been given to widget " // << object->name() << endl; } @@ -309,27 +309,27 @@ SearchWindow::SearchWindow(KMMainWidget* w, const char* name, //set up actions TDEActionCollection *ac = actionCollection(); ac->setWidget( this ); - mReplyAction = new TDEAction( i18n("&Reply..."), "mail-reply-sender", 0, TQT_TQOBJECT(this), - TQT_SLOT(slotReplyToMsg()), ac, "search_reply" ); + mReplyAction = new TDEAction( i18n("&Reply..."), "mail-reply-sender", 0, this, + TQ_SLOT(slotReplyToMsg()), ac, "search_reply" ); mReplyAllAction = new TDEAction( i18n("Reply to &All..."), "mail-reply-all", - 0, TQT_TQOBJECT(this), TQT_SLOT(slotReplyAllToMsg()), + 0, this, TQ_SLOT(slotReplyAllToMsg()), ac, "search_reply_all" ); mReplyListAction = new TDEAction( i18n("Reply to Mailing-&List..."), - "mail_replylist", 0, TQT_TQOBJECT(this), - TQT_SLOT(slotReplyListToMsg()), ac, + "mail_replylist", 0, this, + TQ_SLOT(slotReplyListToMsg()), ac, "search_reply_list" ); mForwardActionMenu = new TDEActionMenu( i18n("Message->","&Forward"), "mail-forward", ac, "search_message_forward" ); - connect( mForwardActionMenu, TQT_SIGNAL(activated()), this, - TQT_SLOT(slotForwardInlineMsg()) ); + connect( mForwardActionMenu, TQ_SIGNAL(activated()), this, + TQ_SLOT(slotForwardInlineMsg()) ); mForwardAttachedAction = new TDEAction( i18n("Message->Forward->","As &Attachment..."), - "mail-forward", 0, TQT_TQOBJECT(this), - TQT_SLOT(slotForwardAttachedMsg()), ac, + "mail-forward", 0, this, + TQ_SLOT(slotForwardAttachedMsg()), ac, "search_message_forward_as_attachment" ); mForwardInlineAction = new TDEAction( i18n("&Inline..."), - "mail-forward", 0, TQT_TQOBJECT(this), - TQT_SLOT(slotForwardInlineMsg()), ac, + "mail-forward", 0, this, + TQ_SLOT(slotForwardInlineMsg()), ac, "search_message_forward_inline" ); if ( GlobalSettings::self()->forwardingInlineByDefault() ) { mForwardActionMenu->insert( mForwardInlineAction ); @@ -340,32 +340,32 @@ SearchWindow::SearchWindow(KMMainWidget* w, const char* name, } mForwardDigestAction = new TDEAction( i18n("Message->Forward->","As Di&gest..."), - "mail-forward", 0, TQT_TQOBJECT(this), - TQT_SLOT(slotForwardDigestMsg()), ac, + "mail-forward", 0, this, + TQ_SLOT(slotForwardDigestMsg()), ac, "search_message_forward_as_digest" ); mForwardActionMenu->insert( mForwardDigestAction ); mRedirectAction = new TDEAction( i18n("Message->Forward->","&Redirect..."), - "mail-forward", 0, TQT_TQOBJECT(this), - TQT_SLOT(slotRedirectMsg()), ac, + "mail-forward", 0, this, + TQ_SLOT(slotRedirectMsg()), ac, "search_message_forward_redirect" ); mForwardActionMenu->insert( mRedirectAction ); - mSaveAsAction = KStdAction::saveAs( TQT_TQOBJECT(this), TQT_SLOT(slotSaveMsg()), ac, "search_file_save_as" ); + mSaveAsAction = KStdAction::saveAs( this, TQ_SLOT(slotSaveMsg()), ac, "search_file_save_as" ); mSaveAtchAction = new TDEAction( i18n("Save Attachments..."), "attach", 0, - TQT_TQOBJECT(this), TQT_SLOT(slotSaveAttachments()), ac, "search_save_attachments" ); + this, TQ_SLOT(slotSaveAttachments()), ac, "search_save_attachments" ); - mPrintAction = KStdAction::print( TQT_TQOBJECT(this), TQT_SLOT(slotPrintMsg()), ac, "search_print" ); - mClearAction = new TDEAction( i18n("Clear Selection"), 0, 0, TQT_TQOBJECT(this), - TQT_SLOT(slotClearSelection()), ac, "search_clear_selection" ); + mPrintAction = KStdAction::print( this, TQ_SLOT(slotPrintMsg()), ac, "search_print" ); + mClearAction = new TDEAction( i18n("Clear Selection"), 0, 0, this, + TQ_SLOT(slotClearSelection()), ac, "search_clear_selection" ); - mCopyAction = KStdAction::copy( TQT_TQOBJECT(this), TQT_SLOT(slotCopyMsgs()), ac, "search_copy_messages" ); - mCutAction = KStdAction::cut( TQT_TQOBJECT(this), TQT_SLOT(slotCutMsgs()), ac, "search_cut_messages" ); + mCopyAction = KStdAction::copy( this, TQ_SLOT(slotCopyMsgs()), ac, "search_copy_messages" ); + mCutAction = KStdAction::cut( this, TQ_SLOT(slotCutMsgs()), ac, "search_cut_messages" ); - connect(mTimer, TQT_SIGNAL(timeout()), TQT_TQOBJECT(this), TQT_SLOT(updStatus())); - connect(kmkernel->searchFolderMgr(), TQT_SIGNAL(folderInvalidated(KMFolder*)), - TQT_TQOBJECT(this), TQT_SLOT(folderInvalidated(KMFolder*))); + connect(mTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(updStatus())); + connect(kmkernel->searchFolderMgr(), TQ_SIGNAL(folderInvalidated(KMFolder*)), + this, TQ_SLOT(folderInvalidated(KMFolder*))); - connect(mCbxFolders, TQT_SIGNAL(folderChanged(KMFolder*)), - TQT_TQOBJECT(this), TQT_SLOT(slotFolderActivated())); + connect(mCbxFolders, TQ_SIGNAL(folderChanged(KMFolder*)), + this, TQ_SLOT(slotFolderActivated())); } @@ -507,18 +507,18 @@ void SearchWindow::slotSearch() mFolder = dynamic_cast<KMFolderSearch*>( folder->storage() ); } mFolder->stopSearch(); - disconnect(mFolder, TQT_SIGNAL(msgAdded(int)), - TQT_TQOBJECT(this), TQT_SLOT(slotAddMsg(int))); - disconnect(mFolder, TQT_SIGNAL(msgRemoved(KMFolder*, TQ_UINT32)), - TQT_TQOBJECT(this), TQT_SLOT(slotRemoveMsg(KMFolder*, TQ_UINT32))); - connect(mFolder, TQT_SIGNAL(msgAdded(int)), - TQT_TQOBJECT(this), TQT_SLOT(slotAddMsg(int))); - connect(mFolder, TQT_SIGNAL(msgRemoved(KMFolder*, TQ_UINT32)), - TQT_TQOBJECT(this), TQT_SLOT(slotRemoveMsg(KMFolder*, TQ_UINT32))); + disconnect(mFolder, TQ_SIGNAL(msgAdded(int)), + this, TQ_SLOT(slotAddMsg(int))); + disconnect(mFolder, TQ_SIGNAL(msgRemoved(KMFolder*, TQ_UINT32)), + this, TQ_SLOT(slotRemoveMsg(KMFolder*, TQ_UINT32))); + connect(mFolder, TQ_SIGNAL(msgAdded(int)), + this, TQ_SLOT(slotAddMsg(int))); + connect(mFolder, TQ_SIGNAL(msgRemoved(KMFolder*, TQ_UINT32)), + this, TQ_SLOT(slotRemoveMsg(KMFolder*, TQ_UINT32))); mSearchFolderEdt->setEnabled(false); KMSearch *search = new KMSearch(); - connect(search, TQT_SIGNAL(finished(bool)), - TQT_TQOBJECT(this), TQT_SLOT(searchDone())); + connect(search, TQ_SIGNAL(finished(bool)), + this, TQ_SLOT(searchDone())); if (mChkbxAllFolders->isChecked()) { search->setRecursive(true); } else { @@ -543,7 +543,7 @@ void SearchWindow::searchDone() mTimer->stop(); updStatus(); - TQTimer::singleShot(0, TQT_TQOBJECT(this), TQT_SLOT(enableGUI())); + TQTimer::singleShot(0, this, TQ_SLOT(enableGUI())); if(mLastFocus) mLastFocus->setFocus(); if (mCloseRequested) @@ -623,7 +623,7 @@ void SearchWindow::closeEvent(TQCloseEvent *e) //Cancel search in progress by setting the search folder search to //the null search mFolder->setSearch(new KMSearch()); - TQTimer::singleShot(0, TQT_TQOBJECT(this), TQT_SLOT(slotClose())); + TQTimer::singleShot(0, this, TQ_SLOT(slotClose())); } else { KDialogBase::closeEvent(e); } @@ -676,8 +676,8 @@ void SearchWindow::folderInvalidated(KMFolder *folder) if (folder->storage() == mFolder) { mLbxMatches->clear(); if (mFolder->search()) - connect(mFolder->search(), TQT_SIGNAL(finished(bool)), - TQT_TQOBJECT(this), TQT_SLOT(searchDone())); + connect(mFolder->search(), TQ_SIGNAL(finished(bool)), + this, TQ_SLOT(searchDone())); mTimer->start(200); enableGUI(); } @@ -840,10 +840,10 @@ void SearchWindow::slotContextMenuRequested( TQListViewItem *lvi, const TQPoint mMenuToFolder.clear(); TQPopupMenu *msgMoveMenu = new TQPopupMenu(menu); mKMMainWidget->folderTree()->folderToPopupMenu( KMFolderTree::MoveMessage, - TQT_TQOBJECT(this), &mMenuToFolder, msgMoveMenu ); + this, &mMenuToFolder, msgMoveMenu ); TQPopupMenu *msgCopyMenu = new TQPopupMenu(menu); mKMMainWidget->folderTree()->folderToPopupMenu( KMFolderTree::CopyMessage, - TQT_TQOBJECT(this), &mMenuToFolder, msgCopyMenu ); + this, &mMenuToFolder, msgCopyMenu ); // show most used actions mReplyAction->plug(menu); diff --git a/kmail/searchwindow.h b/kmail/searchwindow.h index 84684c84..2bc71593 100644 --- a/kmail/searchwindow.h +++ b/kmail/searchwindow.h @@ -67,7 +67,7 @@ namespace KMail { */ class SearchWindow: public KDialogBase, virtual public KXMLGUIClient { - Q_OBJECT + TQ_OBJECT public: diff --git a/kmail/secondarywindow.cpp b/kmail/secondarywindow.cpp index a421209a..cd4a9162 100644 --- a/kmail/secondarywindow.cpp +++ b/kmail/secondarywindow.cpp @@ -45,14 +45,14 @@ namespace KMail { // modal subdialogs will only affect this window, not the other windows setWFlags( getWFlags() | WGroupLeader ); - kapp->ref(); + tdeApp->ref(); } //--------------------------------------------------------------------------- SecondaryWindow::~SecondaryWindow() { - kapp->deref(); + tdeApp->deref(); } diff --git a/kmail/secondarywindow.h b/kmail/secondarywindow.h index cd7e6f45..335524dd 100644 --- a/kmail/secondarywindow.h +++ b/kmail/secondarywindow.h @@ -43,7 +43,7 @@ namespace KMail { */ class SecondaryWindow : public TDEMainWindow { - Q_OBJECT + TQ_OBJECT public: diff --git a/kmail/sieveconfig.cpp b/kmail/sieveconfig.cpp index a787e06a..9bd137bb 100644 --- a/kmail/sieveconfig.cpp +++ b/kmail/sieveconfig.cpp @@ -70,7 +70,7 @@ namespace KMail { mManagesieveCheck = new TQCheckBox( i18n("&Server supports Sieve"), this ); glay->addMultiCellWidget( mManagesieveCheck, row, row, 0, 1 ); - connect( mManagesieveCheck, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotEnableWidgets()) ); + connect( mManagesieveCheck, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotEnableWidgets()) ); // "reuse host and login config" checkbox: ++row; @@ -79,7 +79,7 @@ namespace KMail { mSameConfigCheck->setEnabled( false ); glay->addMultiCellWidget( mSameConfigCheck, row, row, 0, 1 ); - connect( mSameConfigCheck, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotEnableWidgets()) ); + connect( mSameConfigCheck, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotEnableWidgets()) ); // "Managesieve port" spinbox and label: ++row; diff --git a/kmail/sieveconfig.h b/kmail/sieveconfig.h index d7b9b8dc..41c1beac 100644 --- a/kmail/sieveconfig.h +++ b/kmail/sieveconfig.h @@ -86,7 +86,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.cpp b/kmail/sievedebugdialog.cpp index cd3ebdfc..09d7d3fa 100644 --- a/kmail/sievedebugdialog.cpp +++ b/kmail/sievedebugdialog.cpp @@ -206,7 +206,7 @@ SieveDebugDialog::SieveDebugDialog( TQWidget *parent, const char *name ) setInitialSize( TQSize( 640, 480 ) ); if ( !mAccountList.isEmpty() ) - TQTimer::singleShot( 0, this, TQT_SLOT( slotDiagNextAccount() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( slotDiagNextAccount() ) ); } SieveDebugDialog::~SieveDebugDialog() @@ -268,8 +268,8 @@ void SieveDebugDialog::slotDiagNextAccount() mSieveJob = SieveJob::list( mUrl ); - connect( mSieveJob, TQT_SIGNAL( gotList( KMail::SieveJob *, bool, const TQStringList &, const TQString & ) ), - TQT_SLOT( slotGetScriptList( KMail::SieveJob *, bool, const TQStringList &, const TQString & ) ) ); + connect( mSieveJob, TQ_SIGNAL( gotList( KMail::SieveJob *, bool, const TQStringList &, const TQString & ) ), + TQ_SLOT( slotGetScriptList( KMail::SieveJob *, bool, const TQStringList &, const TQString & ) ) ); // Bypass the singleShot timer -- it's fired when we get our data return; @@ -279,7 +279,7 @@ void SieveDebugDialog::slotDiagNextAccount() } // Handle next account async - TQTimer::singleShot( 0, this, TQT_SLOT( slotDiagNextAccount() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( slotDiagNextAccount() ) ); } void SieveDebugDialog::slotDiagNextScript() @@ -288,7 +288,7 @@ void SieveDebugDialog::slotDiagNextScript() { // Continue handling accounts instead mScriptList.clear(); - TQTimer::singleShot( 0, this, TQT_SLOT( slotDiagNextAccount() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( slotDiagNextAccount() ) ); return; } @@ -302,8 +302,8 @@ void SieveDebugDialog::slotDiagNextScript() mSieveJob = SieveJob::get( mUrl ); - connect( mSieveJob, TQT_SIGNAL( gotScript( KMail::SieveJob *, bool, const TQString &, bool ) ), - TQT_SLOT( slotGetScript( KMail::SieveJob *, bool, const TQString &, bool ) ) ); + connect( mSieveJob, TQ_SIGNAL( gotScript( KMail::SieveJob *, bool, const TQString &, bool ) ), + TQ_SLOT( slotGetScript( KMail::SieveJob *, bool, const TQString &, bool ) ) ); } void SieveDebugDialog::slotGetScript( SieveJob * /* job */, bool success, @@ -328,7 +328,7 @@ void SieveDebugDialog::slotGetScript( SieveJob * /* job */, bool success, } // Fetch next script - TQTimer::singleShot( 0, this, TQT_SLOT( slotDiagNextScript() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( slotDiagNextScript() ) ); } void SieveDebugDialog::slotGetScriptList( SieveJob *job, bool success, @@ -367,7 +367,7 @@ void SieveDebugDialog::slotGetScriptList( SieveJob *job, bool success, } // Handle next job: dump scripts for this server - TQTimer::singleShot( 0, this, TQT_SLOT( slotDiagNextScript() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( slotDiagNextScript() ) ); } void SieveDebugDialog::slotDialogOk() diff --git a/kmail/sievedebugdialog.h b/kmail/sievedebugdialog.h index 7eacab62..e565cd6e 100644 --- a/kmail/sievedebugdialog.h +++ b/kmail/sievedebugdialog.h @@ -49,7 +49,7 @@ class SieveJob; */ class SieveDebugDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/kmail/sievejob.cpp b/kmail/sievejob.cpp index 290e2d71..fc7b92cf 100644 --- a/kmail/sievejob.cpp +++ b/kmail/sievejob.cpp @@ -72,14 +72,14 @@ namespace KMail { case Get: kdDebug(5006) << "SieveJob::schedule: get( " << mUrl.prettyURL() << " )" << endl; mJob = TDEIO::get( mUrl, false /*reload*/, showProgressInfo ); - connect( mJob, TQT_SIGNAL(data(TDEIO::Job*,const TQByteArray&)), - TQT_SLOT(slotData(TDEIO::Job*,const TQByteArray&)) ); + connect( mJob, TQ_SIGNAL(data(TDEIO::Job*,const TQByteArray&)), + TQ_SLOT(slotData(TDEIO::Job*,const TQByteArray&)) ); break; case Put: kdDebug(5006) << "SieveJob::schedule: put( " << mUrl.prettyURL() << " )" << endl; mJob = TDEIO::put( mUrl, 0600, true /*overwrite*/, false /*resume*/, showProgressInfo ); - connect( mJob, TQT_SIGNAL(dataReq(TDEIO::Job*,TQByteArray&)), - TQT_SLOT(slotDataReq(TDEIO::Job*,TQByteArray&)) ); + connect( mJob, TQ_SIGNAL(dataReq(TDEIO::Job*,TQByteArray&)), + TQ_SLOT(slotDataReq(TDEIO::Job*,TQByteArray&)) ); break; case Activate: kdDebug(5006) << "SieveJob::schedule: chmod( " << mUrl.prettyURL() << ", 0700 )" @@ -102,16 +102,16 @@ namespace KMail { kdDebug(5006) << "SieveJob::schedule: listDir's real URL: " << url.prettyURL() << endl; mJob = TDEIO::listDir( url, showProgressInfo ); - connect( mJob, TQT_SIGNAL(entries(TDEIO::Job*,const TDEIO::UDSEntryList&)), - TQT_SLOT(slotEntries(TDEIO::Job*,const TDEIO::UDSEntryList&)) ); + connect( mJob, TQ_SIGNAL(entries(TDEIO::Job*,const TDEIO::UDSEntryList&)), + TQ_SLOT(slotEntries(TDEIO::Job*,const TDEIO::UDSEntryList&)) ); break; } case List: kdDebug(5006) << "SieveJob::schedule: listDir( " << mUrl.prettyURL() << " )" << endl; { mJob = TDEIO::listDir( mUrl, showProgressInfo ); - connect( mJob, TQT_SIGNAL( entries(TDEIO::Job *, const TDEIO::UDSEntryList & ) ), - TQT_SLOT( slotEntries( TDEIO::Job *, const TDEIO::UDSEntryList & ) ) ); + connect( mJob, TQ_SIGNAL( entries(TDEIO::Job *, const TDEIO::UDSEntryList & ) ), + TQ_SLOT( slotEntries( TDEIO::Job *, const TDEIO::UDSEntryList & ) ) ); break; } case Delete: @@ -123,7 +123,7 @@ namespace KMail { } mJob->setInteractive(showProgressInfo); // common to all jobs: - connect( mJob, TQT_SIGNAL(result(TDEIO::Job*)), TQT_SLOT(slotResult(TDEIO::Job*)) ); + connect( mJob, TQ_SIGNAL(result(TDEIO::Job*)), TQ_SLOT(slotResult(TDEIO::Job*)) ); } void SieveJob::slotData( Job *, const TQByteArray & data ) { diff --git a/kmail/sievejob.h b/kmail/sievejob.h index d57e7176..8a9a2bff 100644 --- a/kmail/sievejob.h +++ b/kmail/sievejob.h @@ -32,7 +32,7 @@ namespace TDEIO { namespace KMail { class SieveJob : public TQObject { - Q_OBJECT + TQ_OBJECT protected: enum Command { Get, Put, Activate, Deactivate, SearchActive, List, Delete }; diff --git a/kmail/signatureconfigurator.cpp b/kmail/signatureconfigurator.cpp index 209e18c1..4b7faca3 100644 --- a/kmail/signatureconfigurator.cpp +++ b/kmail/signatureconfigurator.cpp @@ -85,19 +85,19 @@ namespace KMail { TQWidgetStack * widgetStack = new TQWidgetStack( this ); widgetStack->setEnabled( false ); // since !mEnableCheck->isChecked() vlay->addWidget( widgetStack, 1 ); - connect( mSourceCombo, TQT_SIGNAL(highlighted(int)), - widgetStack, TQT_SLOT(raiseWidget(int)) ); + connect( mSourceCombo, TQ_SIGNAL(highlighted(int)), + widgetStack, TQ_SLOT(raiseWidget(int)) ); // connects for the enabling of the widgets depending on // signatureEnabled: - connect( mEnableCheck, TQT_SIGNAL(toggled(bool)), - mSourceCombo, TQT_SLOT(setEnabled(bool)) ); - connect( mEnableCheck, TQT_SIGNAL(toggled(bool)), - widgetStack, TQT_SLOT(setEnabled(bool)) ); - connect( mEnableCheck, TQT_SIGNAL(toggled(bool)), - label, TQT_SLOT(setEnabled(bool)) ); + connect( mEnableCheck, TQ_SIGNAL(toggled(bool)), + mSourceCombo, TQ_SLOT(setEnabled(bool)) ); + connect( mEnableCheck, TQ_SIGNAL(toggled(bool)), + widgetStack, TQ_SLOT(setEnabled(bool)) ); + connect( mEnableCheck, TQ_SIGNAL(toggled(bool)), + label, TQ_SLOT(setEnabled(bool)) ); // The focus might be still in the widget that is disabled - connect( mEnableCheck, TQT_SIGNAL(clicked()), - mEnableCheck, TQT_SLOT(setFocus()) ); + connect( mEnableCheck, TQ_SIGNAL(clicked()), + mEnableCheck, TQ_SLOT(setFocus()) ); int pageno = 0; // page 0: input field for direct entering: @@ -126,11 +126,11 @@ namespace KMail { i18n("S&pecify file:"), page ) ); hlay->addWidget( mFileRequester, 1 ); mFileRequester->button()->setAutoDefault( false ); - connect( mFileRequester, TQT_SIGNAL(textChanged(const TQString &)), - this, TQT_SLOT(slotEnableEditButton(const TQString &)) ); + connect( mFileRequester, TQ_SIGNAL(textChanged(const TQString &)), + this, TQ_SLOT(slotEnableEditButton(const TQString &)) ); mEditButton = new TQPushButton( i18n("Edit &File"), page ); TQWhatsThis::add(mEditButton, i18n("Opens the specified file in a text editor.")); - connect( mEditButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotEdit()) ); + connect( mEditButton, TQ_SIGNAL(clicked()), TQ_SLOT(slotEdit()) ); mEditButton->setAutoDefault( false ); mEditButton->setEnabled( false ); // initially nothing to edit hlay->addWidget( mEditButton ); diff --git a/kmail/signatureconfigurator.h b/kmail/signatureconfigurator.h index 222a2a98..2027110a 100644 --- a/kmail/signatureconfigurator.h +++ b/kmail/signatureconfigurator.h @@ -32,7 +32,7 @@ class TQTextEdit; namespace KMail { class SignatureConfigurator : public TQWidget { - Q_OBJECT + TQ_OBJECT public: SignatureConfigurator( TQWidget * parent=0, const char * name=0 ); diff --git a/kmail/simplestringlisteditor.cpp b/kmail/simplestringlisteditor.cpp index c37ea13f..c62b73ae 100644 --- a/kmail/simplestringlisteditor.cpp +++ b/kmail/simplestringlisteditor.cpp @@ -87,8 +87,8 @@ SimpleStringListEditor::SimpleStringListEditor( TQWidget * parent, mAddButton = new TQPushButton( addLabel, this ); mAddButton->setAutoDefault( false ); vlay->addWidget( mAddButton ); - connect( mAddButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotAdd()) ); + connect( mAddButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotAdd()) ); } if ( buttons & Remove ) { @@ -99,8 +99,8 @@ SimpleStringListEditor::SimpleStringListEditor( TQWidget * parent, mRemoveButton->setAutoDefault( false ); mRemoveButton->setEnabled( false ); // no selection yet vlay->addWidget( mRemoveButton ); - connect( mRemoveButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotRemove()) ); + connect( mRemoveButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotRemove()) ); } if ( buttons & Modify ) { @@ -111,10 +111,10 @@ SimpleStringListEditor::SimpleStringListEditor( TQWidget * parent, mModifyButton->setAutoDefault( false ); mModifyButton->setEnabled( false ); // no selection yet vlay->addWidget( mModifyButton ); - connect( mModifyButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotModify()) ); - connect( mListBox, TQT_SIGNAL( doubleClicked( TQListBoxItem* ) ), - this, TQT_SLOT( slotModify() ) ); + connect( mModifyButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotModify()) ); + connect( mListBox, TQ_SIGNAL( doubleClicked( TQListBoxItem* ) ), + this, TQ_SLOT( slotModify() ) ); } if ( buttons & Up ) { @@ -126,8 +126,8 @@ SimpleStringListEditor::SimpleStringListEditor( TQWidget * parent, mUpButton->setAutoDefault( false ); mUpButton->setEnabled( false ); // no selection yet vlay->addWidget( mUpButton ); - connect( mUpButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotUp()) ); + connect( mUpButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotUp()) ); } if ( buttons & Down ) { @@ -139,14 +139,14 @@ SimpleStringListEditor::SimpleStringListEditor( TQWidget * parent, mDownButton->setAutoDefault( false ); mDownButton->setEnabled( false ); // no selection yet vlay->addWidget( mDownButton ); - connect( mDownButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotDown()) ); + connect( mDownButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotDown()) ); } vlay->addStretch( 1 ); // spacer - connect( mListBox, TQT_SIGNAL(selectionChanged()), - this, TQT_SLOT(slotSelectionChanged()) ); + connect( mListBox, TQ_SIGNAL(selectionChanged()), + this, TQ_SLOT(slotSelectionChanged()) ); } void SimpleStringListEditor::setStringList( const TQStringList & strings ) { diff --git a/kmail/simplestringlisteditor.h b/kmail/simplestringlisteditor.h index a2361c32..a86afeff 100644 --- a/kmail/simplestringlisteditor.h +++ b/kmail/simplestringlisteditor.h @@ -46,7 +46,7 @@ class TQPushButton; // class SimpleStringListEditor : public TQWidget { - Q_OBJECT + TQ_OBJECT public: enum ButtonCode { diff --git a/kmail/snippetdlg.cpp b/kmail/snippetdlg.cpp index 60bf689e..7e1df3b7 100644 --- a/kmail/snippetdlg.cpp +++ b/kmail/snippetdlg.cpp @@ -30,7 +30,7 @@ * name 'name' and widget flags set to 'f'. * * The dialog will by default be modeless, unless you set 'modal' to - * TRUE to construct a modal dialog. + * true to construct a modal dialog. */ SnippetDlg::SnippetDlg( TDEActionCollection* ac, TQWidget* parent, const char* name, bool modal, WFlags fl ) : SnippetDlgBase( parent, name, modal, fl ), actionCollection( ac ) @@ -40,14 +40,14 @@ SnippetDlg::SnippetDlg( TDEActionCollection* ac, TQWidget* parent, const char* n textLabel3 = new TQLabel( this, "textLabel3" ); keyButton = new KKeyButton( this ); - connect( keyButton, TQT_SIGNAL( capturedShortcut( const TDEShortcut& ) ), - this, TQT_SLOT( slotCapturedShortcut( const TDEShortcut& ) ) ); + connect( keyButton, TQ_SIGNAL( capturedShortcut( const TDEShortcut& ) ), + this, TQ_SLOT( slotCapturedShortcut( const TDEShortcut& ) ) ); btnAdd->setEnabled( false ); - connect( snippetName, TQT_SIGNAL(textChanged(const TQString &)), - this, TQT_SLOT(slotTextChanged(const TQString &)) ); - connect( snippetName, TQT_SIGNAL(returnPressed()), - this, TQT_SLOT(slotReturnPressed()) ); + connect( snippetName, TQ_SIGNAL(textChanged(const TQString &)), + this, TQ_SLOT(slotTextChanged(const TQString &)) ); + connect( snippetName, TQ_SIGNAL(returnPressed()), + this, TQ_SLOT(slotReturnPressed()) ); layout3->addWidget( textLabel3, 7, 0 ); layout3->addWidget( keyButton, 7, 1 ); diff --git a/kmail/snippetdlg.h b/kmail/snippetdlg.h index c46e2399..8ae34df4 100644 --- a/kmail/snippetdlg.h +++ b/kmail/snippetdlg.h @@ -18,11 +18,11 @@ class TDEShortcut; class SnippetDlg : public SnippetDlgBase { - Q_OBJECT + TQ_OBJECT public: - SnippetDlg( TDEActionCollection* ac, TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); + SnippetDlg( TDEActionCollection* ac, TQWidget* parent = 0, const char* name = 0, bool modal = false, WFlags fl = 0 ); ~SnippetDlg(); void setShowShortcut( bool show ); diff --git a/kmail/snippetitem.h b/kmail/snippetitem.h index cbc3c4eb..927d817c 100644 --- a/kmail/snippetitem.h +++ b/kmail/snippetitem.h @@ -32,7 +32,7 @@ It also holds the needed data for one snippet. 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 706de5af..23f628ed 100644 --- a/kmail/snippetsettings.h +++ b/kmail/snippetsettings.h @@ -28,7 +28,7 @@ same named .ui file */ class SnippetSettings : public SnippetSettingsBase { -Q_OBJECT +TQ_OBJECT public: SnippetSettings(TQWidget *parent = 0, const char *name = 0); diff --git a/kmail/snippetsettingsbase.ui b/kmail/snippetsettingsbase.ui index 14be08e9..2034ebe4 100644 --- a/kmail/snippetsettingsbase.ui +++ b/kmail/snippetsettingsbase.ui @@ -92,9 +92,6 @@ <property name="text"> <string>Single dialog for each variable within a snippet</string> </property> - <property name="accel"> - <string></string> - </property> <property name="checked"> <bool>true</bool> </property> @@ -109,9 +106,6 @@ <property name="text"> <string>One dialog for all variables within a snippet</string> </property> - <property name="accel"> - <string></string> - </property> <property name="checked"> <bool>false</bool> </property> diff --git a/kmail/snippetwidget.cpp b/kmail/snippetwidget.cpp index e16b4884..406632b6 100644 --- a/kmail/snippetwidget.cpp +++ b/kmail/snippetwidget.cpp @@ -49,7 +49,7 @@ SnippetWidget::SnippetWidget(KMEdit* editor, TDEActionCollection* actionCollecti mEditor( editor ), mActionCollection( actionCollection ) { // init the TQPtrList - _list.setAutoDelete(TRUE); + _list.setAutoDelete(true); // init the TDEListView setSorting( -1 ); @@ -62,22 +62,22 @@ SnippetWidget::SnippetWidget(KMEdit* editor, TDEActionCollection* actionCollecti setRootIsDecorated(true); //connect the signals - connect( this, TQT_SIGNAL( contextMenuRequested ( TQListViewItem *, const TQPoint & , int ) ), - this, TQT_SLOT( showPopupMenu(TQListViewItem *, const TQPoint & , int ) ) ); + connect( this, TQ_SIGNAL( contextMenuRequested ( TQListViewItem *, const TQPoint & , int ) ), + this, TQ_SLOT( showPopupMenu(TQListViewItem *, const TQPoint & , int ) ) ); - connect( this, TQT_SIGNAL( doubleClicked (TQListViewItem *) ), - this, TQT_SLOT( slotEdit( TQListViewItem *) ) ); - connect( this, TQT_SIGNAL( returnPressed (TQListViewItem *) ), - this, TQT_SLOT( slotExecuted( TQListViewItem *) ) ); + connect( this, TQ_SIGNAL( doubleClicked (TQListViewItem *) ), + this, TQ_SLOT( slotEdit( TQListViewItem *) ) ); + connect( this, TQ_SIGNAL( returnPressed (TQListViewItem *) ), + this, TQ_SLOT( slotExecuted( TQListViewItem *) ) ); - connect( this, TQT_SIGNAL( dropped(TQDropEvent *, TQListViewItem *) ), - this, TQT_SLOT( slotDropped(TQDropEvent *, TQListViewItem *) ) ); + connect( this, TQ_SIGNAL( dropped(TQDropEvent *, TQListViewItem *) ), + this, TQ_SLOT( slotDropped(TQDropEvent *, TQListViewItem *) ) ); - connect( editor, TQT_SIGNAL( insertSnippet() ), this, TQT_SLOT( slotExecute() )); + connect( editor, TQ_SIGNAL( insertSnippet() ), this, TQ_SLOT( slotExecute() )); _cfg = 0; - TQTimer::singleShot(0, this, TQT_SLOT(initConfig())); + TQTimer::singleShot(0, this, TQ_SLOT(initConfig())); } SnippetWidget::~SnippetWidget() @@ -149,11 +149,11 @@ SnippetItem* SnippetWidget::makeItem( SnippetItem* parent, const TQString& name, const TQString normalizedName = TQString(actionName).replace(" ", "_"); if ( !mActionCollection->action(normalizedName.utf8().data() ) ) { TDEAction * action = new TDEAction( actionName, shortcut, item, - TQT_SLOT( slotExecute() ), mActionCollection, + TQ_SLOT( slotExecute() ), mActionCollection, normalizedName.utf8() ); item->setAction(action); - connect( item, TQT_SIGNAL( execute( TQListViewItem* ) ), - this, TQT_SLOT( slotExecuted( TQListViewItem* ) ) ); + connect( item, TQ_SIGNAL( execute( TQListViewItem* ) ), + this, TQ_SLOT( slotExecuted( TQListViewItem* ) ) ); } return item; } @@ -263,7 +263,7 @@ void SnippetWidget::slotEdit( TQListViewItem* item ) pSnippet->resetParent(); } - setSelected(item, TRUE); + setSelected(item, true); } } @@ -286,7 +286,7 @@ void SnippetWidget::slotEditGroup() dlg.snippetName->setText(pGroup->getName()); dlg.snippetText->setText(pGroup->getText()); dlg.btnAdd->setText(i18n("&Apply")); - dlg.snippetText->setEnabled(FALSE); + dlg.snippetText->setEnabled(false); dlg.setCaption(i18n("Edit Group")); dlg.cbGroup->insertItem(i18n("All")); @@ -295,7 +295,7 @@ void SnippetWidget::slotEditGroup() item->setText( 0, dlg.snippetName->text() ); pGroup->setName( dlg.snippetName->text() ); - setSelected(item, TRUE); + setSelected(item, true); } } @@ -542,18 +542,18 @@ void SnippetWidget::showPopupMenu( TQListViewItem * item, const TQPoint & p, int if ( item ) { popup.insertTitle( selectedItem->getName() ); if (dynamic_cast<SnippetGroup*>(item)) { - popup.insertItem( i18n("Edit &group..."), this, TQT_SLOT( slotEditGroup() ) ); + popup.insertItem( i18n("Edit &group..."), this, TQ_SLOT( slotEditGroup() ) ); } else { - popup.insertItem( SmallIconSet("edit-paste"), i18n("&Paste"), this, TQT_SLOT( slotExecuted() ) ); - popup.insertItem( SmallIconSet("edit"), i18n("&Edit..."), this, TQT_SLOT( slotEdit() ) ); + popup.insertItem( SmallIconSet("edit-paste"), i18n("&Paste"), this, TQ_SLOT( slotExecuted() ) ); + popup.insertItem( SmallIconSet("edit"), i18n("&Edit..."), this, TQ_SLOT( slotEdit() ) ); } - popup.insertItem( SmallIconSet("edit-delete"), i18n("&Remove"), this, TQT_SLOT( slotRemove() ) ); + popup.insertItem( SmallIconSet("edit-delete"), i18n("&Remove"), this, TQ_SLOT( slotRemove() ) ); popup.insertSeparator(); } else { popup.insertTitle(i18n("Text Snippets")); } - popup.insertItem( i18n("&Add Snippet..."), this, TQT_SLOT( slotAdd() ) ); - popup.insertItem( i18n("Add G&roup..."), this, TQT_SLOT( slotAddGroup() ) ); + popup.insertItem( i18n("&Add Snippet..."), this, TQ_SLOT( slotAdd() ) ); + popup.insertItem( i18n("Add G&roup..."), this, TQ_SLOT( slotAddGroup() ) ); popup.exec(p); } @@ -683,7 +683,7 @@ bool SnippetWidget::showMultiVarDialog(TQMap<TQString, TQString> * map, TQMap<TQ continue; cb = new TQCheckBox( &dlg, "cbVar" ); - cb->setChecked( FALSE ); + cb->setChecked( false ); cb->setText(it.key()); layoutVar->addWidget( cb, i ,0, TQt::AlignTop ); @@ -691,7 +691,7 @@ bool SnippetWidget::showMultiVarDialog(TQMap<TQString, TQString> * map, TQMap<TQ layoutVar->addWidget( te, i, 1, TQt::AlignTop ); if ((*mapSave)[it.key()].length() > 0) { - cb->setChecked( TRUE ); + cb->setChecked( true ); te->setText((*mapSave)[it.key()]); } @@ -713,7 +713,7 @@ bool SnippetWidget::showMultiVarDialog(TQMap<TQString, TQString> * map, TQMap<TQ layoutBtn->addWidget( btn1, 0, 0 ); KPushButton * btn2 = new KPushButton( KStdGuiItem::apply(), &dlg, "pushButton2" ); - btn2->setDefault( TRUE ); + btn2->setDefault( true ); btn2->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, btn2->sizePolicy().hasHeightForWidth() ) ); layoutBtn->addWidget( btn2, 0, 1 ); @@ -722,8 +722,8 @@ bool SnippetWidget::showMultiVarDialog(TQMap<TQString, TQString> * map, TQMap<TQ // --END-- building a dynamic dialog //connect the buttons to the TQDialog default slots - connect(btn1, TQT_SIGNAL(clicked()), &dlg, TQT_SLOT(reject()) ); - connect(btn2, TQT_SIGNAL(clicked()), &dlg, TQT_SLOT(accept()) ); + connect(btn1, TQ_SIGNAL(clicked()), &dlg, TQ_SLOT(reject()) ); + connect(btn2, TQ_SIGNAL(clicked()), &dlg, TQ_SLOT(accept()) ); //prepare to execute the dialog bool bReturn = false; @@ -804,14 +804,14 @@ TQString SnippetWidget::showSingleVarDialog(TQString var, TQMap<TQString, TQStri cb = new TQCheckBox( &dlg, "cbVar" ); - cb->setChecked( FALSE ); + cb->setChecked( false ); cb->setText(i18n( "Make value &default" )); te = new KTextEdit( &dlg, "teVar" ); layoutVar->addWidget( te, 0, 1, TQt::AlignTop); layoutVar->addWidget( cb, 1, 1, TQt::AlignTop); if ((*mapSave)[var].length() > 0) { - cb->setChecked( TRUE ); + cb->setChecked( true ); te->setText((*mapSave)[var]); } @@ -826,7 +826,7 @@ TQString SnippetWidget::showSingleVarDialog(TQString var, TQMap<TQString, TQStri layoutBtn->addWidget( btn1, 0, 0 ); KPushButton * btn2 = new KPushButton( KStdGuiItem::apply(), &dlg, "pushButton2" ); - btn2->setDefault( TRUE ); + btn2->setDefault( true ); layoutBtn->addWidget( btn2, 0, 1 ); layout->addMultiCellLayout( layoutBtn, 2, 2, 0, 1 ); @@ -834,8 +834,8 @@ TQString SnippetWidget::showSingleVarDialog(TQString var, TQMap<TQString, TQStri // --END-- building a dynamic dialog //connect the buttons to the TQDialog default slots - connect(btn1, TQT_SIGNAL(clicked()), &dlg, TQT_SLOT(reject()) ); - connect(btn2, TQT_SIGNAL(clicked()), &dlg, TQT_SLOT(accept()) ); + connect(btn1, TQ_SIGNAL(clicked()), &dlg, TQ_SLOT(reject()) ); + connect(btn2, TQ_SIGNAL(clicked()), &dlg, TQ_SLOT(accept()) ); //execute the dialog TQString strReturn = ""; @@ -882,18 +882,18 @@ bool SnippetWidget::acceptDrag (TQDropEvent *event) const if (item && TQString(event->format()).startsWith("text/plain") && static_cast<SnippetWidget *>(event->source()) != this) { - ///kdDebug(5006) << "returning TRUE " << endl; - return TRUE; + ///kdDebug(5006) << "returning true " << endl; + return true; } else if(item && TQString(event->format()).startsWith("x-kmailsnippet") && static_cast<SnippetWidget *>(event->source()) != this) { - //kdDebug(5006) << "returning TRUE " << endl; - return TRUE; + //kdDebug(5006) << "returning true " << endl; + return true; } else { - //kdDebug(5006) << "returning FALSE" << endl; - event->acceptAction(FALSE); - return FALSE; + //kdDebug(5006) << "returning false" << endl; + event->acceptAction(false); + return false; } } diff --git a/kmail/snippetwidget.h b/kmail/snippetwidget.h index 90ee8895..ea9f5d24 100644 --- a/kmail/snippetwidget.h +++ b/kmail/snippetwidget.h @@ -44,7 +44,7 @@ tooltips which contains the text of the snippet */ class SnippetWidget : public TDEListView, public TQToolTip { - Q_OBJECT + TQ_OBJECT public: diff --git a/kmail/subscriptiondialog.cpp b/kmail/subscriptiondialog.cpp index 93f92a79..8687096c 100644 --- a/kmail/subscriptiondialog.cpp +++ b/kmail/subscriptiondialog.cpp @@ -55,14 +55,14 @@ SubscriptionDialogBase::SubscriptionDialogBase( TQWidget *parent, const TQString hideNewOnlyCheckbox(); // ok-button - connect(this, TQT_SIGNAL(okClicked()), TQT_SLOT(slotSave())); + connect(this, TQ_SIGNAL(okClicked()), TQ_SLOT(slotSave())); // reload-list button - connect(this, TQT_SIGNAL(user1Clicked()), TQT_SLOT(slotLoadFolders())); + connect(this, TQ_SIGNAL(user1Clicked()), TQ_SLOT(slotLoadFolders())); // get the folders, delayed execution style, otherwise there's bother // with virtuals from ctors and whatnot - TQTimer::singleShot(0, this, TQT_SLOT(slotLoadFolders())); + TQTimer::singleShot(0, this, TQ_SLOT(slotLoadFolders())); } //------------------------------------------------------------------------------ @@ -234,8 +234,8 @@ void SubscriptionDialogBase::slotLoadFolders() { // We'll wait for the connectionResult signal from the account. kdDebug(5006) << "SubscriptionDialog - waiting for connection" << endl; - connect( ai, TQT_SIGNAL( connectionResult(int, const TQString&) ), - this, TQT_SLOT( slotConnectionResult(int, const TQString&) ) ); + connect( ai, TQ_SIGNAL( connectionResult(int, const TQString&) ), + this, TQ_SLOT( slotConnectionResult(int, const TQString&) ) ); return; } // clear the views @@ -286,9 +286,9 @@ void SubscriptionDialogBase::processNext() // kdDebug(5006) << "process " << mCurrentNamespace << ",subscribed=" << mSubscribed << endl; ListJob* job = new ListJob( ai, type, 0, ai->addPathToNamespace( mCurrentNamespace ), completeListing ); - connect( job, TQT_SIGNAL(receivedFolders(const TQStringList&, const TQStringList&, + connect( job, TQ_SIGNAL(receivedFolders(const TQStringList&, const TQStringList&, const TQStringList&, const TQStringList&, const ImapAccountBase::jobData&)), - this, TQT_SLOT(slotListDirectory(const TQStringList&, const TQStringList&, + this, TQ_SLOT(slotListDirectory(const TQStringList&, const TQStringList&, const TQStringList&, const TQStringList&, const ImapAccountBase::jobData&))); job->start(); } @@ -418,7 +418,7 @@ void SubscriptionDialog::processItems() if (done == 1000) { emit listChanged(); - TQTimer::singleShot(0, this, TQT_SLOT(processItems())); + TQTimer::singleShot(0, this, TQ_SLOT(processItems())); return; } ++mCount; diff --git a/kmail/subscriptiondialog.h b/kmail/subscriptiondialog.h index bfae617c..dd84faec 100644 --- a/kmail/subscriptiondialog.h +++ b/kmail/subscriptiondialog.h @@ -46,7 +46,7 @@ namespace KMail { // (More Effective C++, Item 33) class SubscriptionDialogBase : public KSubscription { - Q_OBJECT + TQ_OBJECT public: @@ -127,7 +127,7 @@ namespace KMail { class SubscriptionDialog : public SubscriptionDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/kmail/tdehtmlparthtmlwriter.cpp b/kmail/tdehtmlparthtmlwriter.cpp index 2fcf29ba..f75e17bf 100644 --- a/kmail/tdehtmlparthtmlwriter.cpp +++ b/kmail/tdehtmlparthtmlwriter.cpp @@ -52,7 +52,7 @@ namespace KMail { mHtmlPart( part ), mHtmlTimer( 0, "mHtmlTimer" ), mState( Ended ) { assert( part ); - connect( &mHtmlTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotWriteNextHtmlChunk()) ); + connect( &mHtmlTimer, TQ_SIGNAL(timeout()), TQ_SLOT(slotWriteNextHtmlChunk()) ); } KHtmlPartHtmlWriter::~KHtmlPartHtmlWriter() { diff --git a/kmail/tdehtmlparthtmlwriter.h b/kmail/tdehtmlparthtmlwriter.h index dc07b578..dfbddea2 100644 --- a/kmail/tdehtmlparthtmlwriter.h +++ b/kmail/tdehtmlparthtmlwriter.h @@ -44,7 +44,7 @@ class TDEHTMLPart; namespace KMail { class KHtmlPartHtmlWriter : public TQObject, public HtmlWriter { - Q_OBJECT + TQ_OBJECT public: // Key is Content-Id, value is URL diff --git a/kmail/tdelistboxdialog.cpp b/kmail/tdelistboxdialog.cpp index 89fd0093..d6aabce7 100644 --- a/kmail/tdelistboxdialog.cpp +++ b/kmail/tdelistboxdialog.cpp @@ -39,10 +39,10 @@ TDEListBoxDialog::TDEListBoxDialog( TQString& _selectedString, commentBelowLA->hide(); // signals and slots connections - connect( entriesLB, TQT_SIGNAL( highlighted( const TQString& ) ), - this, TQT_SLOT( highlighted( const TQString& ) ) ); - connect( entriesLB, TQT_SIGNAL( selected(int) ), - TQT_SLOT( slotOk() ) ); + connect( entriesLB, TQ_SIGNAL( highlighted( const TQString& ) ), + this, TQ_SLOT( highlighted( const TQString& ) ) ); + connect( entriesLB, TQ_SIGNAL( selected(int) ), + TQ_SLOT( slotOk() ) ); // buddies labelAboveLA->setBuddy( entriesLB ); } diff --git a/kmail/tdelistboxdialog.h b/kmail/tdelistboxdialog.h index a9e949ac..5a7e47f9 100644 --- a/kmail/tdelistboxdialog.h +++ b/kmail/tdelistboxdialog.h @@ -8,7 +8,7 @@ class TQListBox; class TDEListBoxDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/kmail/tdelistviewindexedsearchline.h b/kmail/tdelistviewindexedsearchline.h index 73d5d6f3..b1d49457 100644 --- a/kmail/tdelistviewindexedsearchline.h +++ b/kmail/tdelistviewindexedsearchline.h @@ -48,7 +48,7 @@ class TDEListViewSearchLine; class TDEUI_EXPORT TDEListViewIndexedSearchLine: public KMail::HeaderListQuickSearch { - Q_OBJECT + TQ_OBJECT public: diff --git a/kmail/templateparser.cpp b/kmail/templateparser.cpp index d2dbd318..0094b13b 100644 --- a/kmail/templateparser.cpp +++ b/kmail/templateparser.cpp @@ -26,7 +26,7 @@ #include <kcalendarsystem.h> #include <kmime_util.h> #include <tdeglobal.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <tqregexp.h> #include <tqfile.h> #include <tdemessagebox.h> @@ -1125,12 +1125,12 @@ TQString TemplateParser::pipe( const TQString &cmd, const TQString &buf ) proc << KShell::splitArgs( cmd, KShell::TildeExpand ); proc.setUseShell( true ); - connect( &proc, TQT_SIGNAL( receivedStdout( TDEProcess *, char *, int ) ), - this, TQT_SLOT( onReceivedStdout( TDEProcess *, char *, int ) ) ); - connect( &proc, TQT_SIGNAL( receivedStderr( TDEProcess *, char *, int ) ), - this, TQT_SLOT( onReceivedStderr( TDEProcess *, char *, int ) ) ); - connect( &proc, TQT_SIGNAL( wroteStdin( TDEProcess * ) ), - this, TQT_SLOT( onWroteStdin( TDEProcess * ) ) ); + connect( &proc, TQ_SIGNAL( receivedStdout( TDEProcess *, char *, int ) ), + this, TQ_SLOT( onReceivedStdout( TDEProcess *, char *, int ) ) ); + connect( &proc, TQ_SIGNAL( receivedStderr( TDEProcess *, char *, int ) ), + this, TQ_SLOT( onReceivedStderr( TDEProcess *, char *, int ) ) ); + connect( &proc, TQ_SIGNAL( wroteStdin( TDEProcess * ) ), + this, TQ_SLOT( onWroteStdin( TDEProcess * ) ) ); if ( proc.start( TDEProcess::NotifyOnExit, TDEProcess::All ) ) { diff --git a/kmail/templateparser.h b/kmail/templateparser.h index ae0f9f84..ae5560ec 100644 --- a/kmail/templateparser.h +++ b/kmail/templateparser.h @@ -53,7 +53,7 @@ class TDEProcess; */ class TemplateParser : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/kmail/templatesconfiguration.cpp b/kmail/templatesconfiguration.cpp index 1b79c521..3dc2d189 100644 --- a/kmail/templatesconfiguration.cpp +++ b/kmail/templatesconfiguration.cpp @@ -50,19 +50,19 @@ TemplatesConfiguration::TemplatesConfiguration( TQWidget *parent, const char *na setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ); sizeHint(); - connect( textEdit_new, TQT_SIGNAL( textChanged() ), - this, TQT_SLOT( slotTextChanged( void ) ) ); - connect( textEdit_reply, TQT_SIGNAL( textChanged() ), - this, TQT_SLOT( slotTextChanged( void ) ) ); - connect( textEdit_reply_all, TQT_SIGNAL( textChanged() ), - this, TQT_SLOT( slotTextChanged( void ) ) ); - connect( textEdit_forward, TQT_SIGNAL( textChanged() ), - this, TQT_SLOT( slotTextChanged( void ) ) ); - connect( lineEdit_quote, TQT_SIGNAL( textChanged( const TQString & ) ), - this, TQT_SLOT( slotTextChanged( void ) ) ); - - connect( mInsertCommand, TQT_SIGNAL( insertCommand(TQString, int) ), - this, TQT_SLOT( slotInsertCommand(TQString, int) ) ); + connect( textEdit_new, TQ_SIGNAL( textChanged() ), + this, TQ_SLOT( slotTextChanged( void ) ) ); + connect( textEdit_reply, TQ_SIGNAL( textChanged() ), + this, TQ_SLOT( slotTextChanged( void ) ) ); + connect( textEdit_reply_all, TQ_SIGNAL( textChanged() ), + this, TQ_SLOT( slotTextChanged( void ) ) ); + connect( textEdit_forward, TQ_SIGNAL( textChanged() ), + this, TQ_SLOT( slotTextChanged( void ) ) ); + connect( lineEdit_quote, TQ_SIGNAL( textChanged( const TQString & ) ), + this, TQ_SLOT( slotTextChanged( void ) ) ); + + connect( mInsertCommand, TQ_SIGNAL( insertCommand(TQString, int) ), + this, TQ_SLOT( slotInsertCommand(TQString, int) ) ); TQString help; if ( TQString( name ) == "folder-templates" ) { diff --git a/kmail/templatesconfiguration.h b/kmail/templatesconfiguration.h index 6a268c60..0fd8c6ef 100644 --- a/kmail/templatesconfiguration.h +++ b/kmail/templatesconfiguration.h @@ -28,7 +28,7 @@ class TemplatesConfiguration : public TemplatesConfigurationBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/kmail/templatesinsertcommand.cpp b/kmail/templatesinsertcommand.cpp index 2b195c6d..8817711c 100644 --- a/kmail/templatesinsertcommand.cpp +++ b/kmail/templatesinsertcommand.cpp @@ -35,127 +35,127 @@ TemplatesInsertCommand::TemplatesInsertCommand( TQWidget *parent, : TQPushButton( parent, name ) { setText( i18n( "&Insert Command..." ) ); - connect( this, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( slotClicked() ) ); + connect( this, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( slotClicked() ) ); TDEAction *action; TDEActionMenu *menu; - TQSignalMapper *mapper = new TQSignalMapper( TQT_TQOBJECT(this) ); - connect( mapper, TQT_SIGNAL( mapped(int) ), - this, TQT_SLOT( slotMapped(int) ) ); + TQSignalMapper *mapper = new TQSignalMapper( this ); + connect( mapper, TQ_SIGNAL( mapped(int) ), + this, TQ_SLOT( slotMapped(int) ) ); - mMenu = new TDEActionMenu( i18n( "Insert Command..." ), TQT_TQOBJECT(this) ); + mMenu = new TDEActionMenu( i18n( "Insert Command..." ), this ); // ****************************************************** menu = new TDEActionMenu( i18n( "Original Message" ), mMenu ); mMenu->insert( menu ); action = new TDEAction( i18n("Quoted Message"), - 0, mapper, TQT_SLOT( map() ), menu ); + 0, mapper, TQ_SLOT( map() ), menu ); mapper->setMapping( action, CQuote ); menu->insert( action ); action = new TDEAction( i18n("Message Text as Is"), - 0, mapper, TQT_SLOT( map() ), menu ); + 0, mapper, TQ_SLOT( map() ), menu ); mapper->setMapping( action, CText ); menu->insert( action ); action = new TDEAction( i18n("Message Id"), - 0, mapper, TQT_SLOT( map() ), menu ); + 0, mapper, TQ_SLOT( map() ), menu ); mapper->setMapping( action, COMsgId ); menu->insert( action ); action = new TDEAction( i18n("Date"), - 0, mapper, TQT_SLOT( map() ), menu ); + 0, mapper, TQ_SLOT( map() ), menu ); mapper->setMapping( action, CODate ); menu->insert( action ); action = new TDEAction( i18n("Date in Short Format"), - 0, mapper, TQT_SLOT( map() ), menu ); + 0, mapper, TQ_SLOT( map() ), menu ); mapper->setMapping( action, CODateShort ); menu->insert( action ); action = new TDEAction( i18n("Date in C Locale"), - 0, mapper, TQT_SLOT( map() ), menu ); + 0, mapper, TQ_SLOT( map() ), menu ); mapper->setMapping( action, CODateEn ); menu->insert( action ); action = new TDEAction( i18n("Day of Week"), - 0, mapper, TQT_SLOT( map() ), menu ); + 0, mapper, TQ_SLOT( map() ), menu ); mapper->setMapping( action, CODow ); menu->insert( action ); action = new TDEAction( i18n("Time"), - 0, mapper, TQT_SLOT( map() ), menu ); + 0, mapper, TQ_SLOT( map() ), menu ); mapper->setMapping( action, COTime ); menu->insert( action ); action = new TDEAction( i18n("Time in Long Format"), - 0, mapper, TQT_SLOT( map() ), menu ); + 0, mapper, TQ_SLOT( map() ), menu ); mapper->setMapping( action, COTimeLong ); menu->insert( action ); action = new TDEAction( i18n("Time in C Locale"), - 0, mapper, TQT_SLOT( map() ), menu ); + 0, mapper, TQ_SLOT( map() ), menu ); mapper->setMapping( action, COTimeLongEn ); menu->insert( action ); action = new TDEAction( i18n("To Field Address"), - 0, mapper, TQT_SLOT( map() ), menu ); + 0, mapper, TQ_SLOT( map() ), menu ); mapper->setMapping( action, COToAddr ); menu->insert( action ); action = new TDEAction( i18n("To Field Name"), - 0, mapper, TQT_SLOT( map() ), menu ); + 0, mapper, TQ_SLOT( map() ), menu ); mapper->setMapping( action, COToName ); menu->insert( action ); action = new TDEAction( i18n("To Field First Name"), - 0, mapper, TQT_SLOT( map() ), menu ); + 0, mapper, TQ_SLOT( map() ), menu ); mapper->setMapping( action, COToFName ); menu->insert( action ); action = new TDEAction( i18n("To Field Last Name"), - 0, mapper, TQT_SLOT( map() ), menu ); + 0, mapper, TQ_SLOT( map() ), menu ); mapper->setMapping( action, COToLName ); menu->insert( action ); action = new TDEAction( i18n( "CC Field Address" ), - 0, mapper, TQT_SLOT( map() ), menu ); + 0, mapper, TQ_SLOT( map() ), menu ); mapper->setMapping( action, COCCAddr ); menu->insert( action ); action = new TDEAction( i18n( "CC Field Name" ), - 0, mapper, TQT_SLOT( map() ), menu ); + 0, mapper, TQ_SLOT( map() ), menu ); mapper->setMapping( action, COCCName ); menu->insert( action ); action = new TDEAction( i18n( "CC Field First Name" ), - 0, mapper, TQT_SLOT( map() ), menu ); + 0, mapper, TQ_SLOT( map() ), menu ); mapper->setMapping( action, COCCFName ); menu->insert( action ); action = new TDEAction( i18n( "CC Field Last Name" ), - 0, mapper, TQT_SLOT( map() ), menu ); + 0, mapper, TQ_SLOT( map() ), menu ); mapper->setMapping( action, COCCLName ); menu->insert( action ); action = new TDEAction( i18n( "From Field Address" ), - 0, mapper, TQT_SLOT( map() ), menu ); + 0, mapper, TQ_SLOT( map() ), menu ); mapper->setMapping( action, COFromAddr ); menu->insert( action ); action = new TDEAction( i18n( "From Field Name" ), - 0, mapper, TQT_SLOT( map() ), menu ); + 0, mapper, TQ_SLOT( map() ), menu ); mapper->setMapping( action, COFromName ); menu->insert( action ); action = new TDEAction( i18n( "From Field First Name" ), - 0, mapper, TQT_SLOT( map() ), menu ); + 0, mapper, TQ_SLOT( map() ), menu ); mapper->setMapping( action, COFromFName ); menu->insert( action ); action = new TDEAction( i18n( "From Field Last Name" ), - 0, mapper, TQT_SLOT( map() ), menu ); + 0, mapper, TQ_SLOT( map() ), menu ); mapper->setMapping( action, COFromLName ); menu->insert( action ); action = new TDEAction( i18n( "Addresses of all original recipients" ), - 0, mapper, TQT_SLOT( map() ), menu ); + 0, mapper, TQ_SLOT( map() ), menu ); mapper->setMapping( action, COAddresseesAddr ); action = new TDEAction( i18n( "Subject" ), - 0, mapper, TQT_SLOT( map() ), menu ); + 0, mapper, TQ_SLOT( map() ), menu ); mapper->setMapping( action, COFullSubject ); menu->insert( action ); action = new TDEAction( i18n( "Quoted Headers" ), - 0, mapper, TQT_SLOT( map() ), menu ); + 0, mapper, TQ_SLOT( map() ), menu ); mapper->setMapping( action, CTQHeaders ); menu->insert( action ); action = new TDEAction( i18n( "Headers as Is" ), - 0, mapper, TQT_SLOT( map() ), menu ); + 0, mapper, TQ_SLOT( map() ), menu ); mapper->setMapping( action, CHeaders ); menu->insert( action ); action = new TDEAction( i18n( "Header Content" ), - 0, mapper, TQT_SLOT( map() ), menu ); + 0, mapper, TQ_SLOT( map() ), menu ); mapper->setMapping( action, COHeader ); menu->insert( action ); @@ -164,91 +164,91 @@ TemplatesInsertCommand::TemplatesInsertCommand( TQWidget *parent, mMenu->insert( menu ); action = new TDEAction( i18n( "Message Id" ), - 0, mapper, TQT_SLOT( map() ), menu ); + 0, mapper, TQ_SLOT( map() ), menu ); mapper->setMapping( action, CMsgId ); menu->insert( action ); action = new TDEAction( i18n( "Date" ), - 0, mapper, TQT_SLOT( map() ), menu ); + 0, mapper, TQ_SLOT( map() ), menu ); mapper->setMapping( action, CDate ); menu->insert( action ); action = new TDEAction( i18n( "Date in Short Format" ), - 0, mapper, TQT_SLOT( map() ), menu ); + 0, mapper, TQ_SLOT( map() ), menu ); mapper->setMapping( action, CDateShort ); menu->insert( action ); action = new TDEAction( i18n( "Date in C Locale" ), - 0, mapper, TQT_SLOT( map() ), menu ); + 0, mapper, TQ_SLOT( map() ), menu ); mapper->setMapping( action, CDateEn ); menu->insert( action ); action = new TDEAction( i18n( "Day of Week" ), - 0, mapper, TQT_SLOT( map() ), menu ); + 0, mapper, TQ_SLOT( map() ), menu ); mapper->setMapping( action, CDow ); menu->insert( action ); action = new TDEAction( i18n( "Time" ), - 0, mapper, TQT_SLOT( map() ), menu ); + 0, mapper, TQ_SLOT( map() ), menu ); mapper->setMapping( action, CTime ); menu->insert( action ); action = new TDEAction( i18n( "Time in Long Format" ), - 0, mapper, TQT_SLOT( map() ), menu ); + 0, mapper, TQ_SLOT( map() ), menu ); mapper->setMapping( action, CTimeLong ); menu->insert( action ); action = new TDEAction( i18n( "Time in C Locale" ), - 0, mapper, TQT_SLOT( map() ), menu ); + 0, mapper, TQ_SLOT( map() ), menu ); mapper->setMapping( action, CTimeLongEn ); menu->insert( action ); action = new TDEAction( i18n( "To Field Address" ), - 0, mapper, TQT_SLOT( map() ), menu ); + 0, mapper, TQ_SLOT( map() ), menu ); mapper->setMapping( action, CToAddr ); menu->insert( action ); action = new TDEAction( i18n( "To Field Name" ), - 0, mapper, TQT_SLOT( map() ), menu ); + 0, mapper, TQ_SLOT( map() ), menu ); mapper->setMapping( action, CToName ); menu->insert( action ); action = new TDEAction( i18n( "To Field First Name" ), - 0, mapper, TQT_SLOT( map() ), menu ); + 0, mapper, TQ_SLOT( map() ), menu ); mapper->setMapping( action, CToFName ); menu->insert( action ); action = new TDEAction( i18n( "To Field Last Name" ), - 0, mapper, TQT_SLOT( map() ), menu ); + 0, mapper, TQ_SLOT( map() ), menu ); mapper->setMapping( action, CToLName ); menu->insert( action ); action = new TDEAction( i18n( "CC Field Address" ), - 0, mapper, TQT_SLOT( map() ), menu ); + 0, mapper, TQ_SLOT( map() ), menu ); mapper->setMapping( action, CCCAddr ); menu->insert( action ); action = new TDEAction( i18n( "CC Field Name" ), - 0, mapper, TQT_SLOT( map() ), menu ); + 0, mapper, TQ_SLOT( map() ), menu ); mapper->setMapping( action, CCCName ); menu->insert( action ); action = new TDEAction( i18n( "CC Field First Name" ), - 0, mapper, TQT_SLOT( map() ), menu ); + 0, mapper, TQ_SLOT( map() ), menu ); mapper->setMapping( action, CCCFName ); menu->insert( action ); action = new TDEAction( i18n( "CC Field Last Name" ), - 0, mapper, TQT_SLOT( map() ), menu ); + 0, mapper, TQ_SLOT( map() ), menu ); mapper->setMapping( action, CCCLName ); menu->insert( action ); action = new TDEAction( i18n( "From Field Address" ), - 0, mapper, TQT_SLOT( map() ), menu ); + 0, mapper, TQ_SLOT( map() ), menu ); mapper->setMapping( action, CFromAddr ); menu->insert( action ); action = new TDEAction( i18n( "From Field Name" ), - 0, mapper, TQT_SLOT( map() ), menu ); + 0, mapper, TQ_SLOT( map() ), menu ); mapper->setMapping( action, CFromName ); menu->insert( action ); action = new TDEAction( i18n( "From Field First Name" ), - 0, mapper, TQT_SLOT( map() ), menu ); + 0, mapper, TQ_SLOT( map() ), menu ); mapper->setMapping( action, CFromFName ); menu->insert( action ); action = new TDEAction( i18n( "From Field Last Name" ), - 0, mapper, TQT_SLOT( map() ), menu ); + 0, mapper, TQ_SLOT( map() ), menu ); mapper->setMapping( action, CFromLName ); menu->insert( action ); action = new TDEAction( i18n( "Subject" ), - 0, mapper, TQT_SLOT( map() ), menu ); + 0, mapper, TQ_SLOT( map() ), menu ); mapper->setMapping( action, CFullSubject ); menu->insert( action ); action = new TDEAction( i18n( "Header Content" ), - 0, mapper, TQT_SLOT( map() ), menu ); + 0, mapper, TQ_SLOT( map() ), menu ); mapper->setMapping( action, CHeader ); menu->insert( action ); @@ -257,27 +257,27 @@ TemplatesInsertCommand::TemplatesInsertCommand( TQWidget *parent, mMenu->insert( menu ); action = new TDEAction( i18n( "Insert Result of Command" ), - 0, mapper, TQT_SLOT( map() ), menu ); + 0, mapper, TQ_SLOT( map() ), menu ); mapper->setMapping( action, CSystem ); menu->insert( action ); action = new TDEAction( i18n( "Pipe Original Message Body and Insert Result as Quoted Text" ), - 0, mapper, TQT_SLOT( map() ), menu ); + 0, mapper, TQ_SLOT( map() ), menu ); mapper->setMapping( action, CQuotePipe ); menu->insert( action ); action = new TDEAction( i18n( "Pipe Original Message Body and Insert Result as Is" ), - 0, mapper, TQT_SLOT( map() ), menu ); + 0, mapper, TQ_SLOT( map() ), menu ); mapper->setMapping( action, CTextPipe ); menu->insert( action ); action = new TDEAction( i18n( "Pipe Original Message with Headers and Insert Result as Is" ), - 0, mapper, TQT_SLOT( map() ), menu ); + 0, mapper, TQ_SLOT( map() ), menu ); mapper->setMapping( action, CMsgPipe ); menu->insert( action ); action = new TDEAction( i18n( "Pipe Current Message Body and Insert Result as Is" ), - 0, mapper, TQT_SLOT( map() ), menu ); + 0, mapper, TQ_SLOT( map() ), menu ); mapper->setMapping( action, CBodyPipe ); menu->insert( action ); action = new TDEAction( i18n( "Pipe Current Message Body and Replace with Result" ), - 0, mapper, TQT_SLOT( map() ), menu ); + 0, mapper, TQ_SLOT( map() ), menu ); mapper->setMapping( action, CClearPipe ); menu->insert( action ); @@ -286,35 +286,35 @@ TemplatesInsertCommand::TemplatesInsertCommand( TQWidget *parent, mMenu->insert( menu ); action = new TDEAction( i18n( "Set Cursor Position" ), - 0, mapper, TQT_SLOT( map() ), menu ); + 0, mapper, TQ_SLOT( map() ), menu ); mapper->setMapping( action, CCursor ); menu->insert( action ); action = new TDEAction( i18n( "Insert File Content" ), - 0, mapper, TQT_SLOT( map() ), menu ); + 0, mapper, TQ_SLOT( map() ), menu ); mapper->setMapping( action, CInsert ); menu->insert( action ); action = new TDEAction( i18n( "DNL" ), - 0, mapper, TQT_SLOT( map() ), menu ); + 0, mapper, TQ_SLOT( map() ), menu ); mapper->setMapping( action, CDnl ); menu->insert( action ); action = new TDEAction( i18n( "Template Comment" ), - 0, mapper, TQT_SLOT( map() ), menu ); + 0, mapper, TQ_SLOT( map() ), menu ); mapper->setMapping( action, CRem ); menu->insert( action ); action = new TDEAction( i18n( "No Operation" ), - 0, mapper, TQT_SLOT( map() ), menu ); + 0, mapper, TQ_SLOT( map() ), menu ); mapper->setMapping( action, CNop ); menu->insert( action ); action = new TDEAction( i18n( "Clear Generated Message" ), - 0, mapper, TQT_SLOT( map() ), menu ); + 0, mapper, TQ_SLOT( map() ), menu ); mapper->setMapping( action, CClear ); menu->insert( action ); action = new TDEAction( i18n( "Turn Debug On" ), - 0, mapper, TQT_SLOT( map() ), menu ); + 0, mapper, TQ_SLOT( map() ), menu ); mapper->setMapping( action, CDebug ); menu->insert( action ); action = new TDEAction( i18n( "Turn Debug Off" ), - 0, mapper, TQT_SLOT( map() ), menu ); + 0, mapper, TQ_SLOT( map() ), menu ); mapper->setMapping( action, CDebugOff ); menu->insert( action ); } diff --git a/kmail/templatesinsertcommand.h b/kmail/templatesinsertcommand.h index c928dd67..257064b8 100644 --- a/kmail/templatesinsertcommand.h +++ b/kmail/templatesinsertcommand.h @@ -29,7 +29,7 @@ class TDEActionMenu; class TemplatesInsertCommand : public TQPushButton { - Q_OBJECT + TQ_OBJECT public: diff --git a/kmail/tests/messagedicttests.h b/kmail/tests/messagedicttests.h index f60a3b2f..42bed1ab 100644 --- a/kmail/tests/messagedicttests.h +++ b/kmail/tests/messagedicttests.h @@ -13,7 +13,7 @@ class KMDict; class MessageDictTester : public KUnitTest::SlotTester { - Q_OBJECT + TQ_OBJECT public slots: diff --git a/kmail/tests/mimelibtests.h b/kmail/tests/mimelibtests.h index 8fd06124..0d66b967 100644 --- a/kmail/tests/mimelibtests.h +++ b/kmail/tests/mimelibtests.h @@ -25,7 +25,7 @@ class DwString; class MimeLibTester : public KUnitTest::SlotTester { - Q_OBJECT + TQ_OBJECT public slots: diff --git a/kmail/tests/utiltests.h b/kmail/tests/utiltests.h index 0bcbcdf1..a88a01e9 100644 --- a/kmail/tests/utiltests.h +++ b/kmail/tests/utiltests.h @@ -11,7 +11,7 @@ class UtilTester : public KUnitTest::SlotTester { - Q_OBJECT + TQ_OBJECT public slots: diff --git a/kmail/transportmanager.cpp b/kmail/transportmanager.cpp index 7cb9d9ac..cd42388f 100644 --- a/kmail/transportmanager.cpp +++ b/kmail/transportmanager.cpp @@ -59,7 +59,7 @@ namespace KMail { int newId; do { - newId = kapp->random(); + newId = tdeApp->random(); } while ( usedIds.find(newId) != usedIds.end() ); return newId; diff --git a/kmail/treebase.cpp b/kmail/treebase.cpp index 1e23a007..f9b88c82 100644 --- a/kmail/treebase.cpp +++ b/kmail/treebase.cpp @@ -35,10 +35,10 @@ TreeBase::TreeBase( TQWidget *parent, KMFolderTree *folderTree, Q_UNUSED( mustBeReadWrite ); kdDebug(5006) << k_funcinfo << endl; - connect(this, TQT_SIGNAL(collapsed(TQListViewItem*)), TQT_SLOT(recolorRows())); - connect(this, TQT_SIGNAL(expanded(TQListViewItem*)), TQT_SLOT(recolorRows())); - connect( this, TQT_SIGNAL( contextMenuRequested( TQListViewItem*, const TQPoint &, int ) ), - this, TQT_SLOT( slotContextMenuRequested( TQListViewItem*, const TQPoint & ) ) ); + connect(this, TQ_SIGNAL(collapsed(TQListViewItem*)), TQ_SLOT(recolorRows())); + connect(this, TQ_SIGNAL(expanded(TQListViewItem*)), TQ_SLOT(recolorRows())); + connect( this, TQ_SIGNAL( contextMenuRequested( TQListViewItem*, const TQPoint &, int ) ), + this, TQ_SLOT( slotContextMenuRequested( TQListViewItem*, const TQPoint & ) ) ); } @@ -86,7 +86,7 @@ void TreeBase::slotContextMenuRequested( TQListViewItem *lvi, const TQPoint &p if (!lvi) return; setCurrentItem( lvi ); - setSelected( lvi, TRUE ); + setSelected( lvi, true ); const KMFolder * folder = dynamic_cast<TreeItemBase*>( lvi )->folder(); if ( !folder || folder->noContent() || folder->noChildren() ) @@ -97,7 +97,7 @@ void TreeBase::slotContextMenuRequested( TQListViewItem *lvi, const TQPoint &p folderMenu->insertSeparator(); folderMenu->insertItem(SmallIconSet("folder-new"), i18n("&New Subfolder..."), this, - TQT_SLOT(addChildFolder())); + TQ_SLOT(addChildFolder())); kmkernel->setContextMenuShown( true ); folderMenu->exec (p, 0); kmkernel->setContextMenuShown( false ); diff --git a/kmail/treebase.h b/kmail/treebase.h index 23b2bd3d..48a614df 100644 --- a/kmail/treebase.h +++ b/kmail/treebase.h @@ -32,7 +32,7 @@ class TreeItemBase; class TreeBase : public TDEListView { - Q_OBJECT + TQ_OBJECT public: TreeBase( TQWidget * parent, KMFolderTree *folderTree, diff --git a/kmail/twindowpositioner.h b/kmail/twindowpositioner.h index 88fab3f8..6825ad38 100644 --- a/kmail/twindowpositioner.h +++ b/kmail/twindowpositioner.h @@ -27,7 +27,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 1debbf10..6bb6c29a 100644 --- a/kmail/undostack.h +++ b/kmail/undostack.h @@ -43,7 +43,7 @@ public: class UndoStack : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/kmail/urlhandlermanager.cpp b/kmail/urlhandlermanager.cpp index 32469118..927f6a2e 100644 --- a/kmail/urlhandlermanager.cpp +++ b/kmail/urlhandlermanager.cpp @@ -45,7 +45,7 @@ #include "callback.h" #include "stl_util.h" -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kurldrag.h> #include <tdeimproxy.h> #include <kurl.h> @@ -397,7 +397,7 @@ TQString KMail::URLHandlerManager::statusBarMessage( const KURL & url, KMReaderW #include <ui/messagebox.h> #include <tdelocale.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <tdemessagebox.h> #include <tdehtml_part.h> @@ -752,7 +752,7 @@ namespace { namespace { bool FallBackURLHandler::handleClick( const KURL & url, KMReaderWin * w ) const { if ( w ) - w->emitUrlClicked( url, Qt::LeftButton ); + w->emitUrlClicked( url, TQt::LeftButton ); return true; } diff --git a/kmail/vacation.cpp b/kmail/vacation.cpp index 383daa94..7ad0728c 100644 --- a/kmail/vacation.cpp +++ b/kmail/vacation.cpp @@ -436,8 +436,8 @@ namespace KMail { if ( mUrl.isEmpty() ) // nothing to do... return; mSieveJob = SieveJob::get( mUrl, !checkOnly ); - connect( mSieveJob, TQT_SIGNAL(gotScript(KMail::SieveJob*,bool,const TQString&,bool)), - TQT_SLOT(slotGetResult(KMail::SieveJob*,bool,const TQString&,bool)) ); + connect( mSieveJob, TQ_SIGNAL(gotScript(KMail::SieveJob*,bool,const TQString&,bool)), + TQ_SLOT(slotGetResult(KMail::SieveJob*,bool,const TQString&,bool)) ); } Vacation::~Vacation() { @@ -645,9 +645,9 @@ namespace KMail { mDialog->setDomainName( domainName ); mDialog->enableDomainAndSendForSpam( !GlobalSettings::allowOutOfOfficeUploadButNoSettings() ); - connect( mDialog, TQT_SIGNAL(okClicked()), TQT_SLOT(slotDialogOk()) ); - connect( mDialog, TQT_SIGNAL(cancelClicked()), TQT_SLOT(slotDialogCancel()) ); - connect( mDialog, TQT_SIGNAL(defaultClicked()), TQT_SLOT(slotDialogDefaults()) ); + connect( mDialog, TQ_SIGNAL(okClicked()), TQ_SLOT(slotDialogOk()) ); + connect( mDialog, TQ_SIGNAL(cancelClicked()), TQ_SLOT(slotDialogCancel()) ); + connect( mDialog, TQ_SIGNAL(defaultClicked()), TQ_SLOT(slotDialogDefaults()) ); mDialog->show(); } @@ -690,10 +690,10 @@ namespace KMail { // and commit the dialog's settings to the server: mSieveJob = SieveJob::put( mUrl, script, active, mWasActive ); - connect( mSieveJob, TQT_SIGNAL(gotScript(KMail::SieveJob*,bool,const TQString&,bool)), + connect( mSieveJob, TQ_SIGNAL(gotScript(KMail::SieveJob*,bool,const TQString&,bool)), active - ? TQT_SLOT(slotPutActiveResult(KMail::SieveJob*,bool)) - : TQT_SLOT(slotPutInactiveResult(KMail::SieveJob*,bool)) ); + ? TQ_SLOT(slotPutActiveResult(KMail::SieveJob*,bool)) + : TQ_SLOT(slotPutInactiveResult(KMail::SieveJob*,bool)) ); // destroy the dialog: mDialog->delayedDestruct(); diff --git a/kmail/vacation.h b/kmail/vacation.h index 2bf55d3e..3581eff3 100644 --- a/kmail/vacation.h +++ b/kmail/vacation.h @@ -36,7 +36,7 @@ namespace KMime { namespace KMail { class Vacation : public TQObject { - Q_OBJECT + TQ_OBJECT public: Vacation( TQObject * parent=0, bool checkOnly = false, const char * name=0 ); diff --git a/kmail/vacationdialog.cpp b/kmail/vacationdialog.cpp index 6e74ab5b..3b1c4932 100644 --- a/kmail/vacationdialog.cpp +++ b/kmail/vacationdialog.cpp @@ -43,7 +43,7 @@ namespace KMail { const char * name, bool modal ) : KDialogBase( Plain, caption, Ok|Cancel|Default, Ok, parent, name, modal ) { - KWin::setIcons( winId(), kapp->icon(), kapp->miniIcon() ); + KWin::setIcons( winId(), tdeApp->icon(), tdeApp->miniIcon() ); static const int rows = 7; int row = -1; @@ -74,7 +74,7 @@ namespace KMail { int defDayInterval = 7; //default day interval mIntervalSpin = new KIntSpinBox( 1, 356, 1, defDayInterval, 10, plainPage(), "mIntervalSpin" ); mIntervalSpin->setSuffix( i18n(" day", " days", defDayInterval) ); - connect(mIntervalSpin, TQT_SIGNAL( valueChanged( int )), TQT_SLOT( slotIntervalSpinChanged( int ) ) ); + connect(mIntervalSpin, TQ_SIGNAL( valueChanged( int )), TQ_SLOT( slotIntervalSpinChanged( int ) ) ); glay->addWidget( new TQLabel( mIntervalSpin, i18n("&Resend notification only after:"), plainPage() ), row, 0 ); glay->addWidget( mIntervalSpin, row, 1 ); @@ -96,11 +96,11 @@ namespace KMail { mDomainCheck->setChecked( false ); mDomainEdit = new TQLineEdit( plainPage(), "mDomainEdit" ); mDomainEdit->setEnabled( false ); - mDomainEdit->setValidator( new TQRegExpValidator( TQRegExp( "[a-zA-Z0-9+-]+(?:\\.[a-zA-Z0-9+-]+)*" ), TQT_TQOBJECT(mDomainEdit) ) ); + mDomainEdit->setValidator( new TQRegExpValidator( TQRegExp( "[a-zA-Z0-9+-]+(?:\\.[a-zA-Z0-9+-]+)*" ), mDomainEdit ) ); glay->addWidget( mDomainCheck, row, 0 ); glay->addWidget( mDomainEdit, row, 1 ); - connect( mDomainCheck, TQT_SIGNAL(toggled(bool)), - mDomainEdit, TQT_SLOT(setEnabled(bool)) ); + connect( mDomainCheck, TQ_SIGNAL(toggled(bool)), + mDomainEdit, TQ_SLOT(setEnabled(bool)) ); Q_ASSERT( row == rows - 1 ); } diff --git a/kmail/vacationdialog.h b/kmail/vacationdialog.h index 9d80e5f7..c97e164f 100644 --- a/kmail/vacationdialog.h +++ b/kmail/vacationdialog.h @@ -35,7 +35,7 @@ namespace KMime { namespace KMail { class VacationDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: VacationDialog( const TQString & caption, TQWidget * parent=0, diff --git a/kmail/vcardviewer.h b/kmail/vcardviewer.h index abd88820..904bd479 100644 --- a/kmail/vcardviewer.h +++ b/kmail/vcardviewer.h @@ -36,7 +36,7 @@ namespace KMail { class VCardViewer : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: #if defined(KABC_VCARD_ENCODING_FIX) diff --git a/kmail/xfaceconfigurator.cpp b/kmail/xfaceconfigurator.cpp index 593e86ed..bc77041a 100644 --- a/kmail/xfaceconfigurator.cpp +++ b/kmail/xfaceconfigurator.cpp @@ -126,17 +126,17 @@ namespace KMail { TQWidgetStack * widgetStack = new TQWidgetStack( this ); widgetStack->setEnabled( false ); // since !mEnableCheck->isChecked() vlay->addWidget( widgetStack, 1 ); - connect( mSourceCombo, TQT_SIGNAL(highlighted(int)), - widgetStack, TQT_SLOT(raiseWidget(int)) ); - connect( mEnableCheck, TQT_SIGNAL(toggled(bool)), - mSourceCombo, TQT_SLOT(setEnabled(bool)) ); - connect( mEnableCheck, TQT_SIGNAL(toggled(bool)), - widgetStack, TQT_SLOT(setEnabled(bool)) ); - connect( mEnableCheck, TQT_SIGNAL(toggled(bool)), - label, TQT_SLOT(setEnabled(bool)) ); + connect( mSourceCombo, TQ_SIGNAL(highlighted(int)), + widgetStack, TQ_SLOT(raiseWidget(int)) ); + connect( mEnableCheck, TQ_SIGNAL(toggled(bool)), + mSourceCombo, TQ_SLOT(setEnabled(bool)) ); + connect( mEnableCheck, TQ_SIGNAL(toggled(bool)), + widgetStack, TQ_SLOT(setEnabled(bool)) ); + connect( mEnableCheck, TQ_SIGNAL(toggled(bool)), + label, TQ_SLOT(setEnabled(bool)) ); // The focus might be still in the widget that is disabled - connect( mEnableCheck, TQT_SIGNAL(clicked()), - mEnableCheck, TQT_SLOT(setFocus()) ); + connect( mEnableCheck, TQ_SIGNAL(clicked()), + mEnableCheck, TQ_SLOT(setFocus()) ); int pageno = 0; // page 0: create X-Face from image file or address book entry @@ -151,16 +151,16 @@ namespace KMail { "A light background helps improve the result." ) ); mFromFileBtn->setAutoDefault( false ); page_vlay->addWidget( mFromFileBtn, 1 ); - connect( mFromFileBtn, TQT_SIGNAL(released()), - this, TQT_SLOT(slotSelectFile()) ); + connect( mFromFileBtn, TQ_SIGNAL(released()), + this, TQ_SLOT(slotSelectFile()) ); mFromAddrbkBtn = new TQPushButton( i18n("Set From Address Book"), page ); TQWhatsThis::add( mFromAddrbkBtn, i18n( "You can use a scaled-down version of the picture " "you have set in your address book entry." ) ); mFromAddrbkBtn->setAutoDefault( false ); page_vlay->addWidget( mFromAddrbkBtn, 1 ); - connect( mFromAddrbkBtn, TQT_SIGNAL(released()), - this, TQT_SLOT(slotSelectFromAddressbook()) ); + connect( mFromAddrbkBtn, TQ_SIGNAL(released()), + this, TQ_SLOT(slotSelectFromAddressbook()) ); label1 = new TQLabel( i18n("<qt>KMail can send a small (48x48 pixels), low-quality, " "monochrome picture with every message. " "For example, this could be a picture of you or a glyph. " @@ -185,7 +185,7 @@ namespace KMail { page_vlay->addWidget( label2 ); - connect(mTextEdit, TQT_SIGNAL(textChanged()), this, TQT_SLOT(slotUpdateXFace())); + connect(mTextEdit, TQ_SIGNAL(textChanged()), this, TQ_SLOT(slotUpdateXFace())); } XFaceConfigurator::~XFaceConfigurator() { diff --git a/kmail/xfaceconfigurator.h b/kmail/xfaceconfigurator.h index c107299f..2589400d 100644 --- a/kmail/xfaceconfigurator.h +++ b/kmail/xfaceconfigurator.h @@ -30,7 +30,7 @@ class TQComboBox; namespace KMail { class XFaceConfigurator : public TQWidget { - Q_OBJECT + TQ_OBJECT public: XFaceConfigurator( TQWidget * parent=0, const char * name=0 ); |
