[Kst] branches/work/kst/portto4/kst/src/libkst

[Adam Treat]

SVN commit 682906 by treat:

* international


 M  +0 -22     kst_export.h  
 M  +3 -7      kstdatasource.cpp  


--- branches/work/kst/portto4/kst/src/libkst/kst_export.h #682905:682906
@@ -18,29 +18,7 @@
 #ifndef KST_EXPORT_H
 #define KST_EXPORT_H
 
-#include <kdeversion.h>
-#if KDE_VERSION >= KDE_MAKE_VERSION(3,2,0)
-#include <kdemacros.h>
-
-#if KDE_IS_VERSION( 3,3,90 )
-/* life is great */
-#else
-/* workaround typo that breaks compilation with newer gcc */
-#undef KDE_EXPORT
-#define KDE_EXPORT
-#undef KDE_NO_EXPORT
-#define KDE_NO_EXPORT
-#endif
-
-#define KST_EXPORT KDE_EXPORT
-#define KSTMDI_EXPORT KDE_EXPORT
-#define KJSEMBED_EXPORT KDE_EXPORT
-#else
-/* no kdemacros */
 #define KST_EXPORT
-#define KSTMDI_EXPORT
-#define KJSEMBED_EXPORT
-#endif
 
 #endif
 
--- branches/work/kst/portto4/kst/src/libkst/kstdatasource.cpp #682905:682906
@@ -21,10 +21,6 @@
 
 #include <qdebug.h>
 #include <kio/netaccess.h>
-#include <klibloader.h>
-#include <klocale.h>
-#include <kservicetype.h>
-#include <kservicetypetrader.h>
 
 #include <qfile.h>
 #include <qfileinfo.h>
@@ -98,7 +94,7 @@
 static void scanPlugins() {
   KstPluginList tmpList;
 
-  KstDebug::self()->log(i18n("Scanning for data-source plugins."));
+  KstDebug::self()->log(QObject::tr("Scanning for data-source plugins."));
 
   //const QDir pluginsDir = QDir(qApp->applicationDirPath());
   const QDir pluginsDir = QDir("/home/kde/build/home/kde/branches/work/kst/portto4/lib");
@@ -297,7 +293,7 @@
     return w;
   }
 
-  KstDebug::self()->log(i18n("Could not find a datasource for '%1'(%2), but we found one just prior.  Something is wrong with Kst.", filename, type), KstDebug::Error);
+  KstDebug::self()->log(QString("Could not find a datasource for '%1'(%2), but we found one just prior.  Something is wrong with Kst.").arg(filename, type), KstDebug::Error);
   return 0L;
 }
 
@@ -422,7 +418,7 @@
     shortFilename.truncate(shortFilename.length() - 1);
   }
   shortFilename = shortFilename.section('/', -1);
-  QString tn = i18n("DS-%1", shortFilename);
+  QString tn = QString("DS-%1").arg(shortFilename);
   int count = 1;
 
   KstObject::setTagName(KstObjectTag(tn, KstObjectTag::globalTagContext));  // are DataSources always top-level?