4 files changed, 9 insertions, 12 deletions
diff --git a/tdeio/tdeio/kservice.cpp b/tdeio/tdeio/kservice.cpp
index b059d2375..c097146a3 100644
--- a/tdeio/tdeio/kservice.cpp
+++ b/tdeio/tdeio/kservice.cpp
@@ -593,7 +593,7 @@ TQVariant KService::property( const TQString& _name, TQVariant::Type t ) const
 
   // Then we use a homebuild class based on TDEConfigBase to convert the TQString.
   // For some often used property types we do the conversion ourselves.
-  TQMap<TQString,TQVariant>::ConstIterator it = m_mapProps.find( _name );
+  TQStringVariantMap::ConstIterator it = m_mapProps.find( _name );
   if ( (it == m_mapProps.end()) || (!it.data().isValid()))
   {
      //kdDebug(7012) << "Property not found " << _name << endl;
@@ -635,7 +635,7 @@ TQStringList KService::propertyNames() const
 {
   TQStringList res;
 
-  TQMap<TQString,TQVariant>::ConstIterator it = m_mapProps.begin();
+  TQStringVariantMap::ConstIterator it = m_mapProps.begin();
   for( ; it != m_mapProps.end(); ++it )
     res.append( it.key() );
 
@@ -750,7 +750,7 @@ TQString KService::username() const {
 }
 
 bool KService::noDisplay() const {
-  TQMap<TQString,TQVariant>::ConstIterator it = m_mapProps.find( "NoDisplay" );
+  TQStringVariantMap::ConstIterator it = m_mapProps.find( "NoDisplay" );
   if ( (it != m_mapProps.end()) && (it.data().isValid()))
   {
      TQString aValue = it.data().toString().lower();
@@ -798,7 +798,7 @@ TQString KService::untranslatedGenericName() const {
 }
 
 bool KService::SuSEunimportant() const {
-  TQMap<TQString,TQVariant>::ConstIterator it = m_mapProps.find( "X-SuSE-Unimportant" );
+  TQStringVariantMap::ConstIterator it = m_mapProps.find( "X-SuSE-Unimportant" );
   if ( (it == m_mapProps.end()) || (!it.data().isValid()))
   {
      return false;
@@ -812,7 +812,7 @@ bool KService::SuSEunimportant() const {
 }
 
 TQString KService::parentApp() const {
-  TQMap<TQString,TQVariant>::ConstIterator it = m_mapProps.find( "X-TDE-ParentApp" );
+  TQStringVariantMap::ConstIterator it = m_mapProps.find( "X-TDE-ParentApp" );
   if ( (it == m_mapProps.end()) || (!it.data().isValid()))
   {
      return TQString::null;
diff --git a/tdeio/tdeio/kservice.h b/tdeio/tdeio/kservice.h
index 02519c1e8..bd42f9b0d 100644
--- a/tdeio/tdeio/kservice.h
+++ b/tdeio/tdeio/kservice.h
@@ -548,7 +548,7 @@ private:
   //TQString m_docPath;
   //bool m_bHideFromPanel;
   DCOPServiceType_t m_DCOPServiceType;
-  TQMap<TQString,TQVariant> m_mapProps;
+  TQStringVariantMap m_mapProps;
   bool m_bValid;
   TQStringList m_lstKeywords;
   TQString m_strInit;
diff --git a/tdeio/tdeio/kservicetype.cpp b/tdeio/tdeio/kservicetype.cpp
index 8565029ee..66d12698b 100644
--- a/tdeio/tdeio/kservicetype.cpp
+++ b/tdeio/tdeio/kservicetype.cpp
@@ -27,9 +27,6 @@
 #include <kdebug.h>
 #include <kdesktopfile.h>
 
-template TQDataStream& operator>> <TQString, TQVariant>(TQDataStream&, TQMap<TQString, TQVariant>&);
-template TQDataStream& operator<< <TQString, TQVariant>(TQDataStream&, const TQMap<TQString, TQVariant>&);
-
 class KServiceType::KServiceTypePrivate
 {
 public:
@@ -182,7 +179,7 @@ KServiceType::property( const TQString& _name ) const
   else if ( _name == "Comment" )
     v = TQVariant( m_strComment );
   else {
-    TQMap<TQString,TQVariant>::ConstIterator it = m_mapProps.find( _name );
+    TQStringVariantMap::ConstIterator it = m_mapProps.find( _name );
     if ( it != m_mapProps.end() )
       v = it.data();
   }
@@ -195,7 +192,7 @@ KServiceType::propertyNames() const
 {
   TQStringList res;
 
-  TQMap<TQString,TQVariant>::ConstIterator it = m_mapProps.begin();
+  TQStringVariantMap::ConstIterator it = m_mapProps.begin();
   for( ; it != m_mapProps.end(); ++it )
     res.append( it.key() );
 
diff --git a/tdeio/tdeio/kservicetype.h b/tdeio/tdeio/kservicetype.h
index 9b59b39b4..d333188c1 100644
--- a/tdeio/tdeio/kservicetype.h
+++ b/tdeio/tdeio/kservicetype.h
@@ -233,7 +233,7 @@ protected:
   TQString m_strName;
   TQString m_strIcon;
   TQString m_strComment;
-  TQMap<TQString,TQVariant> m_mapProps;
+  TQStringVariantMap m_mapProps;
   TQMap<TQString,TQVariant::Type> m_mapPropDefs;
 
   bool m_bValid:1;