TQt4 port kdeedu

This enables compilation under both Qt3 and Qt4


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdeedu@1236073 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

5 files changed, 14 insertions, 12 deletions

diff --git a/kig/kfile/Makefile.am b/kig/kfile/Makefile.am
index b8de2d3d..f2cc337f 100644
--- a/kig/kfile/Makefile.am
+++ b/kig/kfile/Makefile.am
@@ -9,11 +9,11 @@ kde_module_LTLIBRARIES = \
 	kfile_kig.la
 
 kfile_drgeo_la_SOURCES = kfile_drgeo.cpp
-kfile_drgeo_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+kfile_drgeo_la_LDFLAGS = $(all_libraries) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KIO) -module $(KDE_PLUGIN)
 kfile_drgeo_la_LIBADD = $(LIB_KIO)
 
 kfile_kig_la_SOURCES = kfile_kig.cpp
-kfile_kig_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+kfile_kig_la_LDFLAGS = $(all_libraries) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KIO) -module $(KDE_PLUGIN)
 kfile_kig_la_LIBADD = $(LIB_KIO)
 
 METASOURCES = AUTO
diff --git a/kig/kfile/kfile_drgeo.cpp b/kig/kfile/kfile_drgeo.cpp
index b921131b..bbdc6869 100644
--- a/kig/kfile/kfile_drgeo.cpp
+++ b/kig/kfile/kfile_drgeo.cpp
@@ -29,8 +29,8 @@ typedef KGenericFactory<DrgeoPlugin> drgeoFactory;
 
 K_EXPORT_COMPONENT_FACTORY( kfile_drgeo, drgeoFactory( "kfile_drgeo" ) )
 
-DrgeoPlugin::DrgeoPlugin( TQObject *parent, const char *name, const TQStringList &args )
-    : KFilePlugin( parent, name, args )
+DrgeoPlugin::DrgeoPlugin( TQObject *tqparent, const char *name, const TQStringList &args )
+    : KFilePlugin( tqparent, name, args )
 {
   info = addMimeTypeInfo( "application/x-drgeo" );
 
@@ -41,7 +41,7 @@ DrgeoPlugin::DrgeoPlugin( TQObject *parent, const char *name, const TQStringList
   item = addItemInfo( group, "NumOfMacros", i18n( "Macros" ), TQVariant::Int );
   
   group_contents = addGroupInfo( info, "DrgeoContents", i18n( "Translators: what this drgeo "
-                                                              "file contains", "Contents" ) );
+                                                              "file tqcontains", "Contents" ) );
 }
 
 bool DrgeoPlugin::readInfo( KFileMetaInfo& metainfo, uint /*what*/ )
diff --git a/kig/kfile/kfile_drgeo.h b/kig/kfile/kfile_drgeo.h
index 4495cd17..19b28e5b 100644
--- a/kig/kfile/kfile_drgeo.h
+++ b/kig/kfile/kfile_drgeo.h
@@ -28,9 +28,10 @@ class TQStringList;
 class DrgeoPlugin: public KFilePlugin
 {
     Q_OBJECT
+  TQ_OBJECT
     
 public:
-    DrgeoPlugin( TQObject *parent, const char *name, const TQStringList& args );
+    DrgeoPlugin( TQObject *tqparent, const char *name, const TQStringList& args );
 
     virtual bool readInfo( KFileMetaInfo& metainfo, uint what);
 protected:
diff --git a/kig/kfile/kfile_kig.cpp b/kig/kfile/kfile_kig.cpp
index bd54a036..defae8c2 100644
--- a/kig/kfile/kfile_kig.cpp
+++ b/kig/kfile/kfile_kig.cpp
@@ -35,8 +35,8 @@ typedef KGenericFactory<KigPlugin> kigFactory;
 
 K_EXPORT_COMPONENT_FACTORY( kfile_kig, kigFactory( "kfile_kig" ) )
 
-KigPlugin::KigPlugin( TQObject *parent, const char *name, const TQStringList &args )
-    : KFilePlugin( parent, name, args )
+KigPlugin::KigPlugin( TQObject *tqparent, const char *name, const TQStringList &args )
+    : KFilePlugin( tqparent, name, args )
 {
   KFileMimeTypeInfo::ItemInfo* item;
   
@@ -58,7 +58,7 @@ bool KigPlugin::readInfo( KFileMetaInfo& metainfo, uint /*what*/ )
   TQString sfile =  metainfo.path();
   bool iscompressed = false;
   TQFile f( sfile );
-  if ( !sfile.endsWith( ".kig", false ) )
+  if ( !sfile.tqendsWith( ".kig", false ) )
   {
     iscompressed = true;
 
@@ -67,7 +67,7 @@ bool KigPlugin::readInfo( KFileMetaInfo& metainfo, uint /*what*/ )
       return false;
 
     TQString tempname = sfile.section( '/', -1 );
-    if ( sfile.endsWith( ".kigz", false ) )
+    if ( sfile.tqendsWith( ".kigz", false ) )
     {
       tempname.remove( TQRegExp( "\\.[Kk][Ii][Gg][Zz]$" ) );
     }
@@ -114,7 +114,7 @@ bool KigPlugin::readInfo( KFileMetaInfo& metainfo, uint /*what*/ )
   TQString compatversion = main.attribute( "CompatibilityVersion" );
   if ( compatversion.isEmpty() )
     compatversion = i18n( "%1 represents Kig version",
-                          "%1 (as the version)" ).arg( version );
+                          "%1 (as the version)" ).tqarg( version );
   appendItem( metagroup, "CompatVersion", compatversion );
 
   // reading the Coordinate System...
diff --git a/kig/kfile/kfile_kig.h b/kig/kfile/kfile_kig.h
index d5238a4f..7c0512be 100644
--- a/kig/kfile/kfile_kig.h
+++ b/kig/kfile/kfile_kig.h
@@ -28,9 +28,10 @@ class TQStringList;
 class KigPlugin: public KFilePlugin
 {
     Q_OBJECT
+  TQ_OBJECT
     
 public:
-    KigPlugin( TQObject *parent, const char *name, const TQStringList& args );
+    KigPlugin( TQObject *tqparent, const char *name, const TQStringList& args );
 
     virtual bool readInfo( KFileMetaInfo& metainfo, uint what);
 protected: