summaryrefslogtreecommitdiffstats
path: root/libksieve
diff options
context:
space:
mode:
Diffstat (limited to 'libksieve')
-rw-r--r--libksieve/CMakeLists.txt2
-rw-r--r--libksieve/impl/lexer.h2
-rw-r--r--libksieve/impl/parser.h2
-rw-r--r--libksieve/impl/utf8validator.h2
-rw-r--r--libksieve/ksieve/error.h6
-rw-r--r--libksieve/ksieve/lexer.h2
-rw-r--r--libksieve/ksieve/parser.h6
-rw-r--r--libksieve/ksieve/scriptbuilder.h2
-rw-r--r--libksieve/parser/lexer.cpp8
-rw-r--r--libksieve/parser/parser.cpp2
-rw-r--r--libksieve/parser/utf8validator.cpp2
-rw-r--r--libksieve/shared/error.cpp2
-rw-r--r--libksieve/tests/lexertest.cpp2
-rw-r--r--libksieve/tests/parsertest.cpp2
14 files changed, 21 insertions, 21 deletions
diff --git a/libksieve/CMakeLists.txt b/libksieve/CMakeLists.txt
index 352dadb0..5e3c8a5d 100644
--- a/libksieve/CMakeLists.txt
+++ b/libksieve/CMakeLists.txt
@@ -26,7 +26,7 @@ link_directories(
##### ksieve (shared) ###########################
-configure_file( ${CMAKE_SOURCE_DIR}/cmake/modules/template_dummy_cpp.cmake dummy.cpp COPYONLY )
+configure_file( ${TDE_CMAKE_TEMPLATES}/tde_dummy_cpp.cmake dummy.cpp COPYONLY )
tde_add_library( ksieve SHARED
SOURCES dummy.cpp
diff --git a/libksieve/impl/lexer.h b/libksieve/impl/lexer.h
index f25abdd5..ee64745b 100644
--- a/libksieve/impl/lexer.h
+++ b/libksieve/impl/lexer.h
@@ -1,4 +1,4 @@
-/* -*- c++ -*-
+/*
impl/lexer.h
Internal header file. Subject to change without notice. DO NOT USE.
diff --git a/libksieve/impl/parser.h b/libksieve/impl/parser.h
index dd8b8228..3fdb8b72 100644
--- a/libksieve/impl/parser.h
+++ b/libksieve/impl/parser.h
@@ -1,4 +1,4 @@
-/* -*- c++ -*-
+/*
impl/parser.h
Internal header file. Subject to change without notice. DO NOT USE.
diff --git a/libksieve/impl/utf8validator.h b/libksieve/impl/utf8validator.h
index e0f11222..c193b56b 100644
--- a/libksieve/impl/utf8validator.h
+++ b/libksieve/impl/utf8validator.h
@@ -1,4 +1,4 @@
-/* -*- c++ -*-
+/*
impl/utf8validator.h
This file is part of KSieve,
diff --git a/libksieve/ksieve/error.h b/libksieve/ksieve/error.h
index d2adcd8b..8b9c3d16 100644
--- a/libksieve/ksieve/error.h
+++ b/libksieve/ksieve/error.h
@@ -1,4 +1,4 @@
-/* -*- c++ -*-
+/*
ksieve/error.h
This file is part of KSieve,
@@ -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/lexer.h b/libksieve/ksieve/lexer.h
index d4dc7a97..4fce631c 100644
--- a/libksieve/ksieve/lexer.h
+++ b/libksieve/ksieve/lexer.h
@@ -1,4 +1,4 @@
-/* -*- c++ -*-
+/*
ksieve/lexer.h
This file is part of KSieve,
diff --git a/libksieve/ksieve/parser.h b/libksieve/ksieve/parser.h
index 88bb9418..0a848d0c 100644
--- a/libksieve/ksieve/parser.h
+++ b/libksieve/ksieve/parser.h
@@ -1,4 +1,4 @@
-/* -*- c++ -*-
+/*
ksieve/parser.h
This file is part of KSieve,
@@ -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/ksieve/scriptbuilder.h b/libksieve/ksieve/scriptbuilder.h
index f365adfa..9da7ce78 100644
--- a/libksieve/ksieve/scriptbuilder.h
+++ b/libksieve/ksieve/scriptbuilder.h
@@ -1,4 +1,4 @@
-/* -*- c++ -*-
+/*
ksieve/interfaces/scriptbuilder.h
This file is part of KSieve,
diff --git a/libksieve/parser/lexer.cpp b/libksieve/parser/lexer.cpp
index 93c5732a..0213f7d7 100644
--- a/libksieve/parser/lexer.cpp
+++ b/libksieve/parser/lexer.cpp
@@ -1,4 +1,4 @@
-/* -*- c++ -*-
+/*
parser/lexer.cpp
This file is part of KSieve,
@@ -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 ) {
diff --git a/libksieve/parser/parser.cpp b/libksieve/parser/parser.cpp
index c0459975..68718c32 100644
--- a/libksieve/parser/parser.cpp
+++ b/libksieve/parser/parser.cpp
@@ -1,4 +1,4 @@
-/* -*- c++ -*-
+/*
parser/parser.cpp
This file is part of KSieve,
diff --git a/libksieve/parser/utf8validator.cpp b/libksieve/parser/utf8validator.cpp
index b8600e7b..5204383a 100644
--- a/libksieve/parser/utf8validator.cpp
+++ b/libksieve/parser/utf8validator.cpp
@@ -1,4 +1,4 @@
-/* -*- c++ -*-
+/*
utf8validator.cpp
This file is part of KSieve,
diff --git a/libksieve/shared/error.cpp b/libksieve/shared/error.cpp
index 400587c3..a39e7de9 100644
--- a/libksieve/shared/error.cpp
+++ b/libksieve/shared/error.cpp
@@ -1,4 +1,4 @@
-/* -*- c++ -*-
+/*
error.cpp
This file is part of KSieve,
diff --git a/libksieve/tests/lexertest.cpp b/libksieve/tests/lexertest.cpp
index 43d641fc..d3e54ba6 100644
--- a/libksieve/tests/lexertest.cpp
+++ b/libksieve/tests/lexertest.cpp
@@ -1,4 +1,4 @@
-/* -*- c++ -*-
+/*
tests/lexertest.cpp
This file is part of the testsuite of KSieve,
diff --git a/libksieve/tests/parsertest.cpp b/libksieve/tests/parsertest.cpp
index ea718e4d..a671b821 100644
--- a/libksieve/tests/parsertest.cpp
+++ b/libksieve/tests/parsertest.cpp
@@ -1,4 +1,4 @@
-/* -*- c++ -*-
+/*
tests/parsertest.cpp
This file is part of the testsuite of KSieve,
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-18 22:02:59 +0000