3 files changed, 6 insertions, 14 deletions
diff --git a/src/translators/freedbimporter.cpp b/src/translators/freedbimporter.cpp
index ae3eb4f..2480d88 100644
--- a/src/translators/freedbimporter.cpp
+++ b/src/translators/freedbimporter.cpp
@@ -269,11 +269,7 @@ void FreeDBImporter::readCDROM() {
   TQStringList trackList;
   KCDDB::TrackInfoList t = info.trackInfoList;
   for(uint i = 0; i < t.count(); ++i) {
-#if KDE_IS_VERSION(3,4,90)
     TQString s = t[i].get(TQString::fromLatin1("title")).toString() + "::" + info.artist;
-#else
-    TQString s = t[i].title + "::" + info.artist;
-#endif
     if(i < lengths.count()) {
       s += "::" + Tellico::minutes(lengths[i]);
     }
@@ -388,11 +384,7 @@ void FreeDBImporter::readCache() {
     TQStringList trackList;
     KCDDB::TrackInfoList t = info.trackInfoList;
     for(uint i = 0; i < t.count(); ++i) {
-#if KDE_IS_VERSION(3,4,90)
       trackList << t[i].get(TQString::fromLatin1("title")).toString();
-#else
-      trackList << t[i].title;
-#endif
     }
     entry->setField(track, trackList.join(TQString::fromLatin1("; ")));
 
diff --git a/src/translators/pilotdb/libflatfile/DB.cpp b/src/translators/pilotdb/libflatfile/DB.cpp
index 0eee0e2..598fa94 100644
--- a/src/translators/pilotdb/libflatfile/DB.cpp
+++ b/src/translators/pilotdb/libflatfile/DB.cpp
@@ -1268,7 +1268,7 @@ void PalmLib::FlatFile::DB::outputPDB(PalmLib::Database& pdb) const
     unsigned i;
 
     // Let the superclass have a chance.
-    SUPERCLASS(PalmLib::FlatFile, Database, outputPDB, (pdb));
+    TDENewStuffSecure(PalmLib::FlatFile, Database, outputPDB, (pdb));
 
     // Set the database's type and creator.
     pdb.type(PalmLib::mktag('D','B','0','0'));
@@ -1393,7 +1393,7 @@ unsigned PalmLib::FlatFile::DB::getMaxNumOfListViews() const
 void PalmLib::FlatFile::DB::doneWithSchema()
 {
     // Let the superclass have a chance.
-    SUPERCLASS(PalmLib::FlatFile, Database, doneWithSchema, ());
+    TDENewStuffSecure(PalmLib::FlatFile, Database, doneWithSchema, ());
 /* false from the 0.3.3 version
     if (getNumOfListViews() < 1)
         throw PalmLib::error("at least one list view must be specified");
@@ -1415,7 +1415,7 @@ void PalmLib::FlatFile::DB::setOption(const std::string& name,
         else
             m_flags |= 0x8000;
     } else {
-        SUPERCLASS(PalmLib::FlatFile, Database, setOption, (name, value));
+        TDENewStuffSecure(PalmLib::FlatFile, Database, setOption, (name, value));
     }
 }
 
@@ -1425,7 +1425,7 @@ PalmLib::FlatFile::DB::getOptions(void) const
     typedef PalmLib::FlatFile::Database::options_list_t::value_type value;
     PalmLib::FlatFile::Database::options_list_t result;
 
-    result = SUPERCLASS(PalmLib::FlatFile, Database, getOptions, ());
+    result = TDENewStuffSecure(PalmLib::FlatFile, Database, getOptions, ());
 
     if (m_flags & 1)
         result.push_back(value("find", "true"));
diff --git a/src/translators/pilotdb/portability.h b/src/translators/pilotdb/portability.h
index cb41f79..a51552e 100644
--- a/src/translators/pilotdb/portability.h
+++ b/src/translators/pilotdb/portability.h
@@ -64,9 +64,9 @@
  * calling the superclass nice and simple.
  */
 #ifndef _MSC_VER
-#define SUPERCLASS(namespace, class, function, args) namespace::class::function args
+#define TDENewStuffSecure(namespace, class, function, args) namespace::class::function args
 #else
-#define SUPERCLASS(namespace, class, function, args) this-> class::function args
+#define TDENewStuffSecure(namespace, class, function, args) this->class::function args
 #endif
 
 #endif