5 files changed, 9 insertions, 30 deletions
diff --git a/libtdenetwork/qgpgme/dataprovider.cpp b/libtdenetwork/qgpgme/dataprovider.cpp
index 308fbc12..af3bc715 100644
--- a/libtdenetwork/qgpgme/dataprovider.cpp
+++ b/libtdenetwork/qgpgme/dataprovider.cpp
@@ -16,9 +16,6 @@
    You should have received a copy of the GNU General Public License
    along with TQGPGME; if not, write to the Free Software Foundation,
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.  */
-
-// -*- c++ -*-
-
 #include <config.h>
 
 #include <qgpgme/dataprovider.h>
diff --git a/libtdenetwork/qgpgme/dataprovider.h b/libtdenetwork/qgpgme/dataprovider.h
index 58c097d1..235998f7 100644
--- a/libtdenetwork/qgpgme/dataprovider.h
+++ b/libtdenetwork/qgpgme/dataprovider.h
@@ -16,19 +16,17 @@
    You should have received a copy of the GNU General Public License
    along with TQGPGME; if not, write to the Free Software Foundation,
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.  */
-
-// -*- c++ -*-
 #ifndef __TQGPGME_DATAPROVIDER_H__
 #define __TQGPGME_DATAPROVIDER_H__
 
 #include <gpgmepp/interfaces/dataprovider.h>
 
 #include <tqcstring.h>
-#include <tdepimmacros.h>
+#include <tdemacros.h>
 
 namespace QGpgME {
 
-  class KDE_EXPORT TQByteArrayDataProvider : public GpgME::DataProvider {
+  class TDE_EXPORT TQByteArrayDataProvider : public GpgME::DataProvider {
   public:
     TQByteArrayDataProvider();
     TQByteArrayDataProvider( const TQByteArray & initialData );
diff --git a/libtdenetwork/qgpgme/eventloopinteractor.cpp b/libtdenetwork/qgpgme/eventloopinteractor.cpp
index b6d9830d..c9a4764a 100644
--- a/libtdenetwork/qgpgme/eventloopinteractor.cpp
+++ b/libtdenetwork/qgpgme/eventloopinteractor.cpp
@@ -16,9 +16,6 @@
    You should have received a copy of the GNU General Public License
    along with TQGPGME; if not, write to the Free Software Foundation,
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.  */
-
-// -*- c++ -*-
-
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
@@ -42,8 +39,8 @@ QGpgME::EventLoopInteractor::EventLoopInteractor( TQObject * parent, const char
 {
   if ( !parent )
     if ( tqApp ) {
-      connect( tqApp, TQT_SIGNAL(aboutToQuit()), TQT_SLOT(deleteLater()) );
-      connect( tqApp, TQT_SIGNAL(aboutToQuit()), TQT_SIGNAL(aboutToDestroy()) );
+      connect( tqApp, TQ_SIGNAL(aboutToQuit()), TQ_SLOT(deleteLater()) );
+      connect( tqApp, TQ_SIGNAL(aboutToQuit()), TQ_SIGNAL(aboutToDestroy()) );
     }
   mSelf = this;
 }
@@ -70,9 +67,9 @@ void * QGpgME::EventLoopInteractor::registerWatcher( int fd, Direction dir, bool
   TQSocketNotifier * sn = new TQSocketNotifier( fd, 
       dir == Read ? TQSocketNotifier::Read : TQSocketNotifier::Write );
   if ( dir == Read )
-    connect( sn, TQT_SIGNAL(activated(int)), TQT_SLOT(slotReadActivity(int)) );
+    connect( sn, TQ_SIGNAL(activated(int)), TQ_SLOT(slotReadActivity(int)) );
   else
-    connect( sn, TQT_SIGNAL(activated(int)), TQT_SLOT(slotWriteActivity(int)) );
+    connect( sn, TQ_SIGNAL(activated(int)), TQ_SLOT(slotWriteActivity(int)) );
   ok = true; // Can above operations fails?
   return sn;
 }
@@ -99,10 +96,6 @@ void QGpgME::EventLoopInteractor::slotReadActivity( int socket ) {
   readActivity.remove(socket);
 }
 
-void QGpgME::EventLoopInteractor::nextTrustItemEvent( GpgME::Context * context, const GpgME::TrustItem & item ) {
-  emit nextTrustItemEventSignal( context, item );
-}
-
 void QGpgME::EventLoopInteractor::nextKeyEvent( GpgME::Context * context, const GpgME::Key & key ) {
   emit nextKeyEventSignal( context, key );
 }
diff --git a/libtdenetwork/qgpgme/eventloopinteractor.h b/libtdenetwork/qgpgme/eventloopinteractor.h
index b89b1841..b28d1f30 100644
--- a/libtdenetwork/qgpgme/eventloopinteractor.h
+++ b/libtdenetwork/qgpgme/eventloopinteractor.h
@@ -16,27 +16,24 @@
    You should have received a copy of the GNU General Public License
    along with TQGPGME; if not, write to the Free Software Foundation,
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.  */
-
-// -*- c++ -*-
 #ifndef __TQGPGME_EVENTLOOPINTERACTOR_H__
 #define __TQGPGME_EVENTLOOPINTERACTOR_H__
 
 #include <gpgmepp/eventloopinteractor.h>
 
 #include <tqobject.h>
-#include <tdepimmacros.h>
+#include <tdemacros.h>
 
 namespace GpgME {
   class Context;
   class Error;
-  class TrustItem;
   class Key;
 } // namespace GpgME
   
 namespace QGpgME {
 
-  class KDE_EXPORT EventLoopInteractor : public TQObject, public GpgME::EventLoopInteractor {
-    Q_OBJECT
+  class TDE_EXPORT EventLoopInteractor : public TQObject, public GpgME::EventLoopInteractor {
+    TQ_OBJECT
   
   protected:
     EventLoopInteractor( TQObject * parent, const char * name=0 );
@@ -46,7 +43,6 @@ namespace QGpgME {
     static EventLoopInteractor * instance();
 
   signals:
-    void nextTrustItemEventSignal( GpgME::Context * context, const GpgME::TrustItem & item  );
     void nextKeyEventSignal( GpgME::Context * context, const GpgME::Key & key );
     void operationDoneEventSignal( GpgME::Context * context, const GpgME::Error & e );
 
@@ -71,8 +67,6 @@ namespace QGpgME {
     //
 
     /*! \reimp */
-    void nextTrustItemEvent( GpgME::Context * context, const GpgME::TrustItem & item );
-    /*! \reimp */
     void nextKeyEvent( GpgME::Context * context, const GpgME::Key & key );
     /*! \reimp */
     void operationDoneEvent( GpgME::Context * context, const GpgME::Error & e );
diff --git a/libtdenetwork/qgpgme/tests/dataprovidertest.cpp b/libtdenetwork/qgpgme/tests/dataprovidertest.cpp
index 675c85ea..c72ac36c 100644
--- a/libtdenetwork/qgpgme/tests/dataprovidertest.cpp
+++ b/libtdenetwork/qgpgme/tests/dataprovidertest.cpp
@@ -16,9 +16,6 @@
    You should have received a copy of the GNU General Public License
    along with TQGPGME; if not, write to the Free Software Foundation,
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.  */
-
-// -*- c++ -*-
-
 #ifdef NDEBUG
 #undef NDEBUG
 #endif