summaryrefslogtreecommitdiffstats
path: root/wizards
diff options
context:
space:
mode:
Diffstat (limited to 'wizards')
-rw-r--r--wizards/egroupwarewizard.h4
-rw-r--r--wizards/exchangewizard.h4
-rw-r--r--wizards/groupwarewizard.cpp4
-rw-r--r--wizards/groupwarewizard.h2
-rw-r--r--wizards/groupwisewizard.cpp10
-rw-r--r--wizards/groupwisewizard.h6
-rw-r--r--wizards/kmailchanges.cpp6
-rw-r--r--wizards/kolabwizard.h4
-rw-r--r--wizards/overviewpage.cpp10
-rw-r--r--wizards/overviewpage.h2
-rw-r--r--wizards/scalixwizard.h4
-rw-r--r--wizards/servertypemanager.h2
-rw-r--r--wizards/sloxwizard.h4
13 files changed, 31 insertions, 31 deletions
diff --git a/wizards/egroupwarewizard.h b/wizards/egroupwarewizard.h
index 431c61d3..c0e12db2 100644
--- a/wizards/egroupwarewizard.h
+++ b/wizards/egroupwarewizard.h
@@ -22,12 +22,12 @@
#define EGROUPWAREWIZARD_H
#include <tdeconfigwizard.h>
-#include <tdepimmacros.h>
+#include <tdemacros.h>
class KLineEdit;
class TQCheckBox;
-class KDE_EXPORT EGroupwareWizard : public TDEConfigWizard
+class TDE_EXPORT EGroupwareWizard : public TDEConfigWizard
{
public:
EGroupwareWizard();
diff --git a/wizards/exchangewizard.h b/wizards/exchangewizard.h
index ffa35d02..a6b400a1 100644
--- a/wizards/exchangewizard.h
+++ b/wizards/exchangewizard.h
@@ -21,13 +21,13 @@
#define EXCHANGEWIZARD_H
#include <tdeconfigwizard.h>
-#include <tdepimmacros.h>
+#include <tdemacros.h>
class KLineEdit;
class TQCheckBox;
class TQSpinBox;
-class KDE_EXPORT ExchangeWizard : public TDEConfigWizard
+class TDE_EXPORT ExchangeWizard : public TDEConfigWizard
{
public:
ExchangeWizard();
diff --git a/wizards/groupwarewizard.cpp b/wizards/groupwarewizard.cpp
index 1f520ce5..3df995ce 100644
--- a/wizards/groupwarewizard.cpp
+++ b/wizards/groupwarewizard.cpp
@@ -39,8 +39,8 @@ GroupwareWizard::GroupwareWizard( TQWidget *parent, const char *name )
layout->addWidget( mOverViewPage );
- connect( mOverViewPage, TQT_SIGNAL( cancel() ),
- tqApp, TQT_SLOT( quit() ) );
+ connect( mOverViewPage, TQ_SIGNAL( cancel() ),
+ tqApp, TQ_SLOT( quit() ) );
resize( 400, 200 );
}
diff --git a/wizards/groupwarewizard.h b/wizards/groupwarewizard.h
index 5f0deee8..03923ac3 100644
--- a/wizards/groupwarewizard.h
+++ b/wizards/groupwarewizard.h
@@ -28,7 +28,7 @@ class OverViewPage;
class GroupwareWizard : public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/wizards/groupwisewizard.cpp b/wizards/groupwisewizard.cpp
index 4e828291..f6b019ef 100644
--- a/wizards/groupwisewizard.cpp
+++ b/wizards/groupwisewizard.cpp
@@ -314,14 +314,14 @@ GroupwiseWizard::GroupwiseWizard() : TDEConfigWizard( new GroupwisePropagator )
topLayout = new TQGridLayout( mEmailPage );
topLayout->setSpacing( spacingHint() );
- mEmailBox = new TQGroupBox( 1, Qt::Horizontal,
+ mEmailBox = new TQGroupBox( 1, TQt::Horizontal,
i18n("Create Mail Account"), mEmailPage );
mEmailBox->setCheckable( true );
topLayout->addWidget( mEmailBox, 0, 0 );
mEmailWidget = new TQWidget( mEmailBox );
- connect( mEmailBox, TQT_SIGNAL( toggled( bool ) ), mEmailWidget,
- TQT_SLOT( setEnabled( bool ) ) );
+ connect( mEmailBox, TQ_SIGNAL( toggled( bool ) ), mEmailWidget,
+ TQ_SLOT( setEnabled( bool ) ) );
TQGridLayout *accountLayout= new TQGridLayout( mEmailWidget );
accountLayout->setSpacing( spacingHint() );
@@ -340,8 +340,8 @@ GroupwiseWizard::GroupwiseWizard() : TDEConfigWizard( new GroupwisePropagator )
accountLayout->setRowStretch( 2, 1 );
- connect( this, TQT_SIGNAL( aboutToShowPage( TQWidget * ) ),
- TQT_SLOT( slotAboutToShowPage( TQWidget * ) ) );
+ connect( this, TQ_SIGNAL( aboutToShowPage( TQWidget * ) ),
+ TQ_SLOT( slotAboutToShowPage( TQWidget * ) ) );
setupRulesPage();
diff --git a/wizards/groupwisewizard.h b/wizards/groupwisewizard.h
index 7960a39b..ecfccb4c 100644
--- a/wizards/groupwisewizard.h
+++ b/wizards/groupwisewizard.h
@@ -21,16 +21,16 @@
#define GROUPWISEWIZARD_H
#include <tdeconfigwizard.h>
-#include <tdepimmacros.h>
+#include <tdemacros.h>
class KLineEdit;
class TQCheckBox;
class TQSpinBox;
class TQGroupBox;
-class KDE_EXPORT GroupwiseWizard : public TDEConfigWizard
+class TDE_EXPORT GroupwiseWizard : public TDEConfigWizard
{
- Q_OBJECT
+ TQ_OBJECT
public:
GroupwiseWizard();
diff --git a/wizards/kmailchanges.cpp b/wizards/kmailchanges.cpp
index cc6bb565..b3e9297d 100644
--- a/wizards/kmailchanges.cpp
+++ b/wizards/kmailchanges.cpp
@@ -24,7 +24,7 @@
#include <tdeapplication.h>
#include <tdelocale.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdeemailsettings.h>
#include <identitymanager.h>
#include <identity.h>
@@ -179,7 +179,7 @@ void CreateDisconnectedImapAccount::apply()
c.setGroup( TQString("Account %1").arg( accountId ) );
int uid;
if ( mExistingAccountId < 0 ) {
- uid = kapp->random();
+ uid = tdeApp->random();
c.writeEntry( "Folder", uid );
} else {
uid = c.readNumEntry( "Folder" );
@@ -319,7 +319,7 @@ void CreateOnlineImapAccount::apply()
c.writeEntry( "accounts", accCnt+1 );
c.setGroup( TQString("Account %1").arg(accCnt+1) );
- int uid = kapp->random();
+ int uid = tdeApp->random();
c.writeEntry( "Folder", uid );
c.writeEntry( "Id", uid );
c.writeEntry( "Type", "imap" );
diff --git a/wizards/kolabwizard.h b/wizards/kolabwizard.h
index 99fd0c0d..1d8cd120 100644
--- a/wizards/kolabwizard.h
+++ b/wizards/kolabwizard.h
@@ -23,13 +23,13 @@
#define KOLABWIZARD_H
#include <tdeconfigwizard.h>
-#include <tdepimmacros.h>
+#include <tdemacros.h>
class KLineEdit;
class TQCheckBox;
class TQRadioButton;
-class KDE_EXPORT KolabWizard : public TDEConfigWizard
+class TDE_EXPORT KolabWizard : public TDEConfigWizard
{
public:
KolabWizard();
diff --git a/wizards/overviewpage.cpp b/wizards/overviewpage.cpp
index e9f6596a..9e4aba5d 100644
--- a/wizards/overviewpage.cpp
+++ b/wizards/overviewpage.cpp
@@ -66,7 +66,7 @@ OverViewPage::OverViewPage( TQWidget *parent, const char *name )
#ifdef WITH_EGROUPWARE
button = new TQPushButton( i18n("eGroupware"), this );
layout->addMultiCellWidget( button, 3, 3, 0, 3 );
- connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( showWizardEGroupware() ) );
+ connect( button, TQ_SIGNAL( clicked() ), TQ_SLOT( showWizardEGroupware() ) );
#endif
// FIXME: Maybe hyperlinks would be better than buttons.
@@ -74,20 +74,20 @@ OverViewPage::OverViewPage( TQWidget *parent, const char *name )
#ifdef WITH_KOLAB
button = new TQPushButton( i18n("Kolab"), this );
layout->addMultiCellWidget( button, 4, 4, 0, 3 );
- connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( showWizardKolab() ) );
+ connect( button, TQ_SIGNAL( clicked() ), TQ_SLOT( showWizardKolab() ) );
#endif
#ifdef WITH_SLOX
button = new TQPushButton( i18n("SUSE Linux Openexchange (SLOX)"), this );
layout->addMultiCellWidget( button, 5, 5, 0, 3 );
- connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( showWizardSlox() ) );
+ connect( button, TQ_SIGNAL( clicked() ), TQ_SLOT( showWizardSlox() ) );
#endif
#ifdef WITH_NEWEXCHANGE
button = new TQPushButton( i18n("Microsoft Exchange"), this );
button->hide(); // not quite ready yet
layout->addMultiCellWidget( button, 6, 6, 0, 3 );
- connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( showWizardExchange() ) );
+ connect( button, TQ_SIGNAL( clicked() ), TQ_SLOT( showWizardExchange() ) );
#endif
TQFrame *frame = new TQFrame( this );
@@ -97,7 +97,7 @@ OverViewPage::OverViewPage( TQWidget *parent, const char *name )
TQPushButton *cancelButton = new KPushButton( KStdGuiItem::close(), this );
layout->addWidget( cancelButton, 8, 3 );
- connect( cancelButton, TQT_SIGNAL( clicked() ), this, TQT_SIGNAL( cancel() ) );
+ connect( cancelButton, TQ_SIGNAL( clicked() ), this, TQ_SIGNAL( cancel() ) );
layout->setRowStretch( 7, 1 );
diff --git a/wizards/overviewpage.h b/wizards/overviewpage.h
index 6120d739..6701d9c1 100644
--- a/wizards/overviewpage.h
+++ b/wizards/overviewpage.h
@@ -26,7 +26,7 @@
class OverViewPage : public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/wizards/scalixwizard.h b/wizards/scalixwizard.h
index 273f6c4a..379cd51d 100644
--- a/wizards/scalixwizard.h
+++ b/wizards/scalixwizard.h
@@ -23,13 +23,13 @@
#define SCALIXWIZARD_H
#include <tdeconfigwizard.h>
-#include <tdepimmacros.h>
+#include <tdemacros.h>
class KComboBox;
class KLineEdit;
class TQCheckBox;
-class KDE_EXPORT ScalixWizard : public TDEConfigWizard
+class TDE_EXPORT ScalixWizard : public TDEConfigWizard
{
public:
ScalixWizard();
diff --git a/wizards/servertypemanager.h b/wizards/servertypemanager.h
index 4f4591a1..a44da492 100644
--- a/wizards/servertypemanager.h
+++ b/wizards/servertypemanager.h
@@ -28,7 +28,7 @@
class ServerTypeManager : public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/wizards/sloxwizard.h b/wizards/sloxwizard.h
index d9b24c60..3d543e49 100644
--- a/wizards/sloxwizard.h
+++ b/wizards/sloxwizard.h
@@ -21,12 +21,12 @@
#define SLOXWIZARD_H
#include <tdeconfigwizard.h>
-#include <tdepimmacros.h>
+#include <tdemacros.h>
class KLineEdit;
class TQCheckBox;
-class KDE_EXPORT SloxWizard : public TDEConfigWizard
+class TDE_EXPORT SloxWizard : public TDEConfigWizard
{
public:
SloxWizard();