19 files changed, 24 insertions, 24 deletions
diff --git a/certmanager/lib/ui/backendconfigwidget.cpp b/certmanager/lib/ui/backendconfigwidget.cpp
index a97b0020..9d8f4d40 100644
--- a/certmanager/lib/ui/backendconfigwidget.cpp
+++ b/certmanager/lib/ui/backendconfigwidget.cpp
@@ -1,4 +1,4 @@
-/*  -*- c++ -*-
+/*
     backendconfigwidget.cpp
 
     This file is part of libkleopatra, the KDE keymanagement library
diff --git a/certmanager/lib/ui/backendconfigwidget.h b/certmanager/lib/ui/backendconfigwidget.h
index f0131547..ad60654b 100644
--- a/certmanager/lib/ui/backendconfigwidget.h
+++ b/certmanager/lib/ui/backendconfigwidget.h
@@ -1,4 +1,4 @@
-/*  -*- c++ -*-
+/*
     backendconfigwidget.h
 
     This file is part of libkleopatra, the KDE keymanagement library
@@ -35,7 +35,7 @@
 #define __KLEO_UI_BACKENDCONFIGWIDGET_H__
 
 #include <tqwidget.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 namespace Kleo {
   class CryptoBackendFactory;
diff --git a/certmanager/lib/ui/cryptoconfigdialog.h b/certmanager/lib/ui/cryptoconfigdialog.h
index 3f6ba328..0ef8009c 100644
--- a/certmanager/lib/ui/cryptoconfigdialog.h
+++ b/certmanager/lib/ui/cryptoconfigdialog.h
@@ -33,7 +33,7 @@
 #define CRYPTOCONFIGDIALOG_H
 
 #include <kdialogbase.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 namespace Kleo {
 
diff --git a/certmanager/lib/ui/directoryserviceswidget.h b/certmanager/lib/ui/directoryserviceswidget.h
index a98bc5fe..950a87e9 100644
--- a/certmanager/lib/ui/directoryserviceswidget.h
+++ b/certmanager/lib/ui/directoryserviceswidget.h
@@ -34,7 +34,7 @@
 #define DIRECTORYSERVICESWIDGET_H
 #include "directoryserviceswidgetbase.h"
 #include <kurl.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 class CryptPlugWrapper;
 namespace Kleo {
diff --git a/certmanager/lib/ui/dnattributeorderconfigwidget.cpp b/certmanager/lib/ui/dnattributeorderconfigwidget.cpp
index b2f1343a..874ba0fa 100644
--- a/certmanager/lib/ui/dnattributeorderconfigwidget.cpp
+++ b/certmanager/lib/ui/dnattributeorderconfigwidget.cpp
@@ -1,4 +1,4 @@
-/*  -*- c++ -*-
+/*
     dnattributeorderconfigwidget.cpp
 
     This file is part of libkleopatra, the KDE keymanagement library
diff --git a/certmanager/lib/ui/dnattributeorderconfigwidget.h b/certmanager/lib/ui/dnattributeorderconfigwidget.h
index b7ba1330..d39220ac 100644
--- a/certmanager/lib/ui/dnattributeorderconfigwidget.h
+++ b/certmanager/lib/ui/dnattributeorderconfigwidget.h
@@ -1,4 +1,4 @@
-/*  -*- c++ -*-
+/*
     dnattributeorderconfigwidget.h
 
     This file is part of libkleopatra, the KDE keymanagement library
@@ -34,7 +34,7 @@
 #define __KLEO_UI_DNATTRIBUTEORDERCONFIGWIDGET_H__
 
 #include <tqwidget.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 namespace Kleo {
   class DNAttributeMapper;
 }
diff --git a/certmanager/lib/ui/kdhorizontalline.cpp b/certmanager/lib/ui/kdhorizontalline.cpp
index 118b6b10..2892a05e 100644
--- a/certmanager/lib/ui/kdhorizontalline.cpp
+++ b/certmanager/lib/ui/kdhorizontalline.cpp
@@ -1,4 +1,4 @@
-/* -*- Mode: C++ -*-
+/*
    KD Tools - a set of useful widgets for TQt
 */
 
diff --git a/certmanager/lib/ui/kdhorizontalline.h b/certmanager/lib/ui/kdhorizontalline.h
index 71c1c928..4cae46b1 100644
--- a/certmanager/lib/ui/kdhorizontalline.h
+++ b/certmanager/lib/ui/kdhorizontalline.h
@@ -1,4 +1,4 @@
-/* -*- Mode: C++ -*-
+/*
    KD Tools - a set of useful widgets for TQt
 */
 
diff --git a/certmanager/lib/ui/keyapprovaldialog.cpp b/certmanager/lib/ui/keyapprovaldialog.cpp
index 0ee6d865..900605ae 100644
--- a/certmanager/lib/ui/keyapprovaldialog.cpp
+++ b/certmanager/lib/ui/keyapprovaldialog.cpp
@@ -1,4 +1,4 @@
-/*  -*- c++ -*-
+/*
     keyapprovaldialog.h
 
     This file is part of libkleopatra, the KDE keymanagement library
diff --git a/certmanager/lib/ui/keyapprovaldialog.h b/certmanager/lib/ui/keyapprovaldialog.h
index bd953fa3..a83e124b 100644
--- a/certmanager/lib/ui/keyapprovaldialog.h
+++ b/certmanager/lib/ui/keyapprovaldialog.h
@@ -1,4 +1,4 @@
-/*  -*- c++ -*-
+/*
     keyselectiondialog.h
 
     This file is part of libkleopatra, the KDE keymanagement library
@@ -40,7 +40,7 @@
 #include <kleo/enum.h>
 
 #include <kdialogbase.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 #include <kpgpkey.h> // for EncryptPref
 #include <gpgmepp/key.h>
diff --git a/certmanager/lib/ui/keylistview.h b/certmanager/lib/ui/keylistview.h
index 4149cb41..6eeef5d8 100644
--- a/certmanager/lib/ui/keylistview.h
+++ b/certmanager/lib/ui/keylistview.h
@@ -36,7 +36,7 @@
 #include <tdelistview.h>
 
 #include <gpgmepp/key.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 class TQPainter;
 class TQColorGroup;
diff --git a/certmanager/lib/ui/keyrequester.cpp b/certmanager/lib/ui/keyrequester.cpp
index c9516a2b..e245898e 100644
--- a/certmanager/lib/ui/keyrequester.cpp
+++ b/certmanager/lib/ui/keyrequester.cpp
@@ -1,4 +1,4 @@
-/*  -*- c++ -*-
+/*
     keyrequester.cpp
 
     This file is part of libkleopatra, the KDE keymanagement library
diff --git a/certmanager/lib/ui/keyrequester.h b/certmanager/lib/ui/keyrequester.h
index 899d3cde..30fba80d 100644
--- a/certmanager/lib/ui/keyrequester.h
+++ b/certmanager/lib/ui/keyrequester.h
@@ -1,4 +1,4 @@
-/*  -*- c++ -*-
+/*
     keyrequester.h
 
     This file is part of libkleopatra, the KDE keymanagement library
@@ -53,7 +53,7 @@
 #include <kleo/cryptobackend.h>
 
 #include <vector>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 namespace Kleo {
   class KeyListView;
diff --git a/certmanager/lib/ui/keyselectiondialog.cpp b/certmanager/lib/ui/keyselectiondialog.cpp
index c46228a4..25a1a225 100644
--- a/certmanager/lib/ui/keyselectiondialog.cpp
+++ b/certmanager/lib/ui/keyselectiondialog.cpp
@@ -1,4 +1,4 @@
-/*  -*- c++ -*-
+/*
     keyselectiondialog.cpp
 
     This file is part of libkleopatra, the KDE keymanagement library
diff --git a/certmanager/lib/ui/keyselectiondialog.h b/certmanager/lib/ui/keyselectiondialog.h
index 630255c1..126baa73 100644
--- a/certmanager/lib/ui/keyselectiondialog.h
+++ b/certmanager/lib/ui/keyselectiondialog.h
@@ -1,4 +1,4 @@
-/*  -*- c++ -*-
+/*
     keyselectiondialog.h
 
     This file is part of libkleopatra, the KDE keymanagement library
@@ -41,7 +41,7 @@
 
 #include <kleo/cryptobackend.h>
 #include <gpgmepp/key.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 #include <vector>
 
 class TQVBoxLayout;
diff --git a/certmanager/lib/ui/passphrasedialog.cpp b/certmanager/lib/ui/passphrasedialog.cpp
index a2d0e7c3..5fce3838 100644
--- a/certmanager/lib/ui/passphrasedialog.cpp
+++ b/certmanager/lib/ui/passphrasedialog.cpp
@@ -1,4 +1,4 @@
-/*  -*- c++ -*-
+/*
     passphrasedialog.cpp
 
     This file is part of libkleopatra, the KDE keymanagement library
diff --git a/certmanager/lib/ui/passphrasedialog.h b/certmanager/lib/ui/passphrasedialog.h
index e83eca42..48fc4716 100644
--- a/certmanager/lib/ui/passphrasedialog.h
+++ b/certmanager/lib/ui/passphrasedialog.h
@@ -1,4 +1,4 @@
-/*  -*- c++ -*-
+/*
     passphrasedialog.h
 
     This file is part of libkleopatra, the KDE keymanagement library
diff --git a/certmanager/lib/ui/progressbar.h b/certmanager/lib/ui/progressbar.h
index 51f86dad..c5495d39 100644
--- a/certmanager/lib/ui/progressbar.h
+++ b/certmanager/lib/ui/progressbar.h
@@ -34,7 +34,7 @@
 #define __KLEO_PROGRESSBAR_H__
 
 #include <tqprogressbar.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 class TQTimer;
 
 namespace Kleo {
diff --git a/certmanager/lib/ui/progressdialog.h b/certmanager/lib/ui/progressdialog.h
index dadfd769..eb1b95b7 100644
--- a/certmanager/lib/ui/progressdialog.h
+++ b/certmanager/lib/ui/progressdialog.h
@@ -35,7 +35,7 @@
 
 #include <tqprogressdialog.h>
 #include <tqstring.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 namespace Kleo {
 
   class Job;