diff options
Diffstat (limited to 'libksieve')
| -rw-r--r-- | libksieve/ksieve/error.h | 4 | ||||
| -rw-r--r-- | libksieve/ksieve/parser.h | 4 | ||||
| -rw-r--r-- | libksieve/parser/lexer.cpp | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/libksieve/ksieve/error.h b/libksieve/ksieve/error.h index def7e014..8b9c3d16 100644 --- a/libksieve/ksieve/error.h +++ b/libksieve/ksieve/error.h @@ -35,7 +35,7 @@ #include <tqstring.h> -#include <tdepimmacros.h> +#include <kdemacros.h> #ifdef None // X headers # undef None @@ -43,7 +43,7 @@ namespace KSieve { - class KDE_EXPORT Error { + class TDE_EXPORT Error { public: enum Type { None = 0, diff --git a/libksieve/ksieve/parser.h b/libksieve/ksieve/parser.h index 72db2935..0a848d0c 100644 --- a/libksieve/ksieve/parser.h +++ b/libksieve/ksieve/parser.h @@ -33,7 +33,7 @@ #ifndef __KSIEVE_PARSING_H__ #define __KSIEVE_PARSING_H__ -#include <tdepimmacros.h> +#include <kdemacros.h> class TQString; @@ -45,7 +45,7 @@ namespace KSieve { /** @short Parser for the Sieve grammar. @author Marc Mutz <mutz@kde.org> **/ - class KDE_EXPORT Parser { + class TDE_EXPORT Parser { public: Parser( const char * scursor, const char * const send, int options=0 ); diff --git a/libksieve/parser/lexer.cpp b/libksieve/parser/lexer.cpp index 4b0ebf4f..0213f7d7 100644 --- a/libksieve/parser/lexer.cpp +++ b/libksieve/parser/lexer.cpp @@ -42,7 +42,7 @@ #include <tqstringlist.h> #include <tqtextcodec.h> -#include <memory> // std::auto_ptr +#include <memory> #include <assert.h> #include <ctype.h> // isdigit @@ -618,8 +618,8 @@ namespace KSieve { const TQTextCodec * const codec = TQTextCodec::codecForMib( 106 ); // UTF-8 assert( codec ); - const std::auto_ptr<TQTextDecoder> dec( codec->makeDecoder() ); - assert( dec.get() ); + const std::unique_ptr<TQTextDecoder> dec( codec->makeDecoder() ); + assert( dec ); while ( !atEnd() ) switch ( *mState.cursor ) { |