4 files changed, 13 insertions, 16 deletions
diff --git a/tdeioslave/smtp/interactivesmtpserver.cpp b/tdeioslave/smtp/interactivesmtpserver.cpp
index 4055a47a4..ed13d7253 100644
--- a/tdeioslave/smtp/interactivesmtpserver.cpp
+++ b/tdeioslave/smtp/interactivesmtpserver.cpp
@@ -55,8 +55,8 @@ InteractiveSMTPServerWindow::~InteractiveSMTPServerWindow() {
     if ( mSocket ) {
         mSocket->close();
         if ( mSocket->state() == TQSocket::Closing )
-            connect( mSocket, TQT_SIGNAL(delayedCloseFinished()),
-                     mSocket, TQT_SLOT(deleteLater()) );
+            connect( mSocket, TQ_SIGNAL(delayedCloseFinished()),
+                     mSocket, TQ_SLOT(deleteLater()) );
         else
             mSocket->deleteLater();
         mSocket = 0;
@@ -108,17 +108,17 @@ InteractiveSMTPServerWindow::InteractiveSMTPServerWindow( TQSocket * socket, TQW
   hlay->addWidget( mLineEdit, 1 );
   hlay->addWidget( but );
 
-  connect( mLineEdit, TQT_SIGNAL(returnPressed()), TQT_SLOT(slotSendResponse()) );
-  connect( but, TQT_SIGNAL(clicked()), TQT_SLOT(slotSendResponse()) );
+  connect( mLineEdit, TQ_SIGNAL(returnPressed()), TQ_SLOT(slotSendResponse()) );
+  connect( but, TQ_SIGNAL(clicked()), TQ_SLOT(slotSendResponse()) );
 
   but = new TQPushButton( "&Close Connection", this );
   vlay->addWidget( but );
 
-  connect( but, TQT_SIGNAL(clicked()), TQT_SLOT(slotConnectionClosed()) );
+  connect( but, TQ_SIGNAL(clicked()), TQ_SLOT(slotConnectionClosed()) );
 
-  connect( socket, TQT_SIGNAL(connectionClosed()), TQT_SLOT(slotConnectionClosed()) );
-  connect( socket, TQT_SIGNAL(error(int)), TQT_SLOT(slotError(int)) );
-  connect( socket, TQT_SIGNAL(readyRead()), TQT_SLOT(slotReadyRead()) );
+  connect( socket, TQ_SIGNAL(connectionClosed()), TQ_SLOT(slotConnectionClosed()) );
+  connect( socket, TQ_SIGNAL(error(int)), TQ_SLOT(slotError(int)) );
+  connect( socket, TQ_SIGNAL(readyRead()), TQ_SLOT(slotReadyRead()) );
 
   mLineEdit->setText( "220 hi there" );
   mLineEdit->setFocus();
diff --git a/tdeioslave/smtp/interactivesmtpserver.h b/tdeioslave/smtp/interactivesmtpserver.h
index 62eb9a7a7..c45a7cf56 100644
--- a/tdeioslave/smtp/interactivesmtpserver.h
+++ b/tdeioslave/smtp/interactivesmtpserver.h
@@ -66,7 +66,7 @@ static TQString trim( const TQString & s ) {
 
 
 class InteractiveSMTPServerWindow : public TQWidget {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   InteractiveSMTPServerWindow( TQSocket * socket, TQWidget * parent=0, const char * name=0, WFlags f=0 );
   ~InteractiveSMTPServerWindow();
@@ -102,7 +102,7 @@ private:
 };
 
 class InteractiveSMTPServer : public TQServerSocket {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   InteractiveSMTPServer( TQObject * parent=0 );
   ~InteractiveSMTPServer() {}
diff --git a/tdeioslave/smtp/smtp.cpp b/tdeioslave/smtp/smtp.cpp
index 00dff3684..76e79f8a5 100644
--- a/tdeioslave/smtp/smtp.cpp
+++ b/tdeioslave/smtp/smtp.cpp
@@ -71,7 +71,6 @@ using KioSMTP::TransactionState;
 #include <tqcstring.h>
 
 #include <memory>
-using std::auto_ptr;
 
 #include <ctype.h>
 #include <stdlib.h>
@@ -91,7 +90,7 @@ using std::auto_ptr;
 
 
 extern "C" {
-  KDE_EXPORT int kdemain(int argc, char **argv);
+  TDE_EXPORT int kdemain(int argc, char **argv);
 } 
 
 int kdemain(int argc, char **argv)
@@ -446,8 +445,8 @@ void SMTPProtocol::queueCommand( int type ) {
 }
 
 bool SMTPProtocol::execute( int type, TransactionState * ts ) {
-  auto_ptr<Command> cmd( Command::createSimpleCommand( type, this ) );
-  kdFatal( !cmd.get(), 7112 ) << "Command::createSimpleCommand( " << type << " ) returned null!" << endl;
+  std::unique_ptr<Command> cmd( Command::createSimpleCommand( type, this ) );
+  kdFatal( !cmd, 7112 ) << "Command::createSimpleCommand( " << type << " ) returned null!" << endl;
   return execute( cmd.get(), ts );
 }
 
diff --git a/tdeioslave/smtp/smtp.h b/tdeioslave/smtp/smtp.h
index 853ff3ec6..9d324fe0c 100644
--- a/tdeioslave/smtp/smtp.h
+++ b/tdeioslave/smtp/smtp.h
@@ -39,9 +39,7 @@
 class KURL;
 class TQCString;
 template <typename T> class TQMemArray;
-#ifdef USE_QT3
 typedef TQMemArray<char> TQByteArray;
-#endif // USE_QT3
 
 namespace KioSMTP {
   class Response;