summaryrefslogtreecommitdiffstats
path: root/tdeioslave/smtp
diff options
context:
space:
mode:
Diffstat (limited to 'tdeioslave/smtp')
-rw-r--r--tdeioslave/smtp/CMakeLists.txt2
-rw-r--r--tdeioslave/smtp/Makefile.am12
-rw-r--r--tdeioslave/smtp/capabilities.cpp (renamed from tdeioslave/smtp/capabilities.cc)2
-rw-r--r--tdeioslave/smtp/command.cpp (renamed from tdeioslave/smtp/command.cc)2
-rw-r--r--tdeioslave/smtp/interactivesmtpserver.cpp (renamed from tdeioslave/smtp/interactivesmtpserver.cc)18
-rw-r--r--tdeioslave/smtp/interactivesmtpserver.h4
-rw-r--r--tdeioslave/smtp/request.cpp (renamed from tdeioslave/smtp/request.cc)2
-rw-r--r--tdeioslave/smtp/response.cpp (renamed from tdeioslave/smtp/response.cc)2
-rw-r--r--tdeioslave/smtp/smtp.cpp (renamed from tdeioslave/smtp/smtp.cc)5
-rw-r--r--tdeioslave/smtp/smtp.h2
-rw-r--r--tdeioslave/smtp/test_commands.cpp (renamed from tdeioslave/smtp/test_commands.cc)6
-rw-r--r--tdeioslave/smtp/test_headergeneration.cpp (renamed from tdeioslave/smtp/test_headergeneration.cc)2
-rw-r--r--tdeioslave/smtp/test_responseparser.cpp (renamed from tdeioslave/smtp/test_responseparser.cc)2
-rw-r--r--tdeioslave/smtp/transactionstate.cpp (renamed from tdeioslave/smtp/transactionstate.cc)2
14 files changed, 30 insertions, 33 deletions
diff --git a/tdeioslave/smtp/CMakeLists.txt b/tdeioslave/smtp/CMakeLists.txt
index 89ef650ca..d3d476ec4 100644
--- a/tdeioslave/smtp/CMakeLists.txt
+++ b/tdeioslave/smtp/CMakeLists.txt
@@ -35,7 +35,7 @@ tde_create_translated_desktop(
set( target tdeio_smtp )
tde_add_kpart( ${target} AUTOMOC
- SOURCES smtp.cc request.cc response.cc capabilities.cc command.cc transactionstate.cc
+ SOURCES smtp.cpp request.cpp response.cpp capabilities.cpp command.cpp transactionstate.cpp
LINK tdeio-shared ${SASL_LIBRARIES}
DESTINATION ${PLUGIN_INSTALL_DIR}
)
diff --git a/tdeioslave/smtp/Makefile.am b/tdeioslave/smtp/Makefile.am
index 9859048b1..22cf859a1 100644
--- a/tdeioslave/smtp/Makefile.am
+++ b/tdeioslave/smtp/Makefile.am
@@ -3,7 +3,7 @@ INCLUDES= -I$(srcdir)/../.. -I$(srcdir)/.. $(SSL_INCLUDES) $(all_includes)
kde_module_LTLIBRARIES = tdeio_smtp.la
-tdeio_smtp_la_SOURCES = smtp.cc request.cc response.cc capabilities.cc command.cc transactionstate.cc
+tdeio_smtp_la_SOURCES = smtp.cpp request.cpp response.cpp capabilities.cpp command.cpp transactionstate.cpp
tdeio_smtp_la_LIBADD = $(LIB_TDEIO) $(SASL2_LIBS)
tdeio_smtp_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
@@ -16,22 +16,22 @@ TESTS = test_headergeneration test_responseparser test_commands
check_PROGRAMS = $(TESTS) interactivesmtpserver
-test_headergeneration_SOURCES = test_headergeneration.cc
+test_headergeneration_SOURCES = test_headergeneration.cpp
test_headergeneration_LDADD = $(LIB_TDECORE)
test_headergeneration_LDFLAGS = $(all_libraries)
-test_responseparser_SOURCES = test_responseparser.cc
+test_responseparser_SOURCES = test_responseparser.cpp
test_responseparser_LDADD = $(LIB_TDECORE)
test_responseparser_LDFLAGS = $(all_libraries)
-test_commands_SOURCES = test_commands.cc
+test_commands_SOURCES = test_commands.cpp
test_commands_LDADD = $(tdeio_smtp_la_LIBADD)
test_commands_LDFLAGS = $(all_libraries)
-interactivesmtpserver_SOURCES = interactivesmtpserver.cc
+interactivesmtpserver_SOURCES = interactivesmtpserver.cpp
interactivesmtpserver_LDADD = $(LIB_TQT)
interactivesmtpserver_LDFLAGS = $(all_libraries)
interactivesmtpserver_METASOURCES = AUTO
messages:
- $(XGETTEXT) *.cc -o $(podir)/tdeio_smtp.pot
+ $(XGETTEXT) *.cpp -o $(podir)/tdeio_smtp.pot
diff --git a/tdeioslave/smtp/capabilities.cc b/tdeioslave/smtp/capabilities.cpp
index f56d7739b..f0815c73e 100644
--- a/tdeioslave/smtp/capabilities.cc
+++ b/tdeioslave/smtp/capabilities.cpp
@@ -1,5 +1,5 @@
/*
- capabilities.cc
+ capabilities.cpp
This file is part of tdeio_smtp, the KDE SMTP tdeioslave.
Copyright (c) 2003 Marc Mutz <mutz@kde.org>
diff --git a/tdeioslave/smtp/command.cc b/tdeioslave/smtp/command.cpp
index 4d58a1522..461cf520e 100644
--- a/tdeioslave/smtp/command.cc
+++ b/tdeioslave/smtp/command.cpp
@@ -1,5 +1,5 @@
/*
- command.cc
+ command.cpp
This file is part of tdeio_smtp, the KDE SMTP tdeioslave.
Copyright (c) 2003 Marc Mutz <mutz@kde.org>
diff --git a/tdeioslave/smtp/interactivesmtpserver.cc b/tdeioslave/smtp/interactivesmtpserver.cpp
index 337299d26..ed13d7253 100644
--- a/tdeioslave/smtp/interactivesmtpserver.cc
+++ b/tdeioslave/smtp/interactivesmtpserver.cpp
@@ -1,5 +1,5 @@
/*
- interactivesmtpserver.cc
+ interactivesmtpserver.cpp
Code based on the serverSocket example by Jesper Pedersen.
@@ -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/request.cc b/tdeioslave/smtp/request.cpp
index 4e4e2bf84..6d38fdd6e 100644
--- a/tdeioslave/smtp/request.cc
+++ b/tdeioslave/smtp/request.cpp
@@ -1,5 +1,5 @@
/*
- request.cc
+ request.cpp
This file is part of tdeio_smtp, the KDE SMTP tdeioslave.
Copyright (c) 2003 Marc Mutz <mutz@kde.org>
diff --git a/tdeioslave/smtp/response.cc b/tdeioslave/smtp/response.cpp
index 3ae5d8aa0..de6b98868 100644
--- a/tdeioslave/smtp/response.cc
+++ b/tdeioslave/smtp/response.cpp
@@ -1,5 +1,5 @@
/*
- response.cc
+ response.cpp
This file is part of tdeio_smtp, the KDE SMTP tdeioslave.
Copyright (c) 2003 Marc Mutz <mutz@kde.org>
diff --git a/tdeioslave/smtp/smtp.cc b/tdeioslave/smtp/smtp.cpp
index 00dff3684..ba009c1c5 100644
--- a/tdeioslave/smtp/smtp.cc
+++ 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>
@@ -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;
diff --git a/tdeioslave/smtp/test_commands.cc b/tdeioslave/smtp/test_commands.cpp
index d8a5f0d4e..61181bc35 100644
--- a/tdeioslave/smtp/test_commands.cc
+++ b/tdeioslave/smtp/test_commands.cpp
@@ -723,6 +723,6 @@ void checkSuccessfulTransferCommand( bool error, bool preload, bool ungetLast,
#define NDEBUG
-#include "command.cc"
-#include "response.cc"
-#include "transactionstate.cc"
+#include "command.cpp"
+#include "response.cpp"
+#include "transactionstate.cpp"
diff --git a/tdeioslave/smtp/test_headergeneration.cc b/tdeioslave/smtp/test_headergeneration.cpp
index 83d999c4a..9e4cb971f 100644
--- a/tdeioslave/smtp/test_headergeneration.cc
+++ b/tdeioslave/smtp/test_headergeneration.cpp
@@ -82,5 +82,5 @@ int main( int , char ** ) {
return result == expected ? 0 : 1 ;
}
-#include "request.cc"
+#include "request.cpp"
diff --git a/tdeioslave/smtp/test_responseparser.cc b/tdeioslave/smtp/test_responseparser.cpp
index e251aa291..4786bc717 100644
--- a/tdeioslave/smtp/test_responseparser.cc
+++ b/tdeioslave/smtp/test_responseparser.cpp
@@ -104,4 +104,4 @@ int main ( int, char** ) {
return 0;
}
-#include "response.cc"
+#include "response.cpp"
diff --git a/tdeioslave/smtp/transactionstate.cc b/tdeioslave/smtp/transactionstate.cpp
index c33d6b639..1d96e44b7 100644
--- a/tdeioslave/smtp/transactionstate.cc
+++ b/tdeioslave/smtp/transactionstate.cpp
@@ -1,5 +1,5 @@
/*
- transactionstate.cc
+ transactionstate.cpp
This file is part of tdeio_smtp, the KDE SMTP tdeioslave.
Copyright (c) 2003 Marc Mutz <mutz@kde.org>
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-26 14:25:31 +0000