Fix FTBFS

6 files changed, 7 insertions, 7 deletions

diff --git a/ksquirrel/Makefile.am b/ksquirrel/Makefile.am
index 27d9a19..b378e3a 100644
--- a/ksquirrel/Makefile.am
+++ b/ksquirrel/Makefile.am
@@ -4,7 +4,7 @@ bin_PROGRAMS = ksquirrel
 ## INCLUDES were found outside tdevelop specific part
 
 ksquirrel_SOURCES = sq_slideshowwidget.cpp sq_slideshow.ui sq_slideshowlisting.ui fmt_filters.cpp sq_glwidget_stuff.cpp sq_tabopendialog.ui sq_dragprovider.cpp sq_utils_scale.cpp sq_utils.cpp sq_thumbnailsunused.cpp sq_dirthumbs.cpp sq_downloader.cpp sq_glselectionpainter.cpp sq_glwidget.cpp sq_glparts.cpp sq_codecsettings.cpp sq_filedialog.cpp sq_codecsettingsskeleton.ui sq_kipimanager.cpp sq_kipiinterface.cpp sq_progressbox.cpp sq_thumbnailloadjob.cpp sq_splashscreen.cpp sq_popupmenu.cpp sq_glinfo.ui sq_glwidget_helpers.cpp sq_imageloader.cpp sq_pluginsinfo.ui sq_iconloader.cpp sq_selectdeselectgroup.ui sq_thumbnailcachemaster.ui sq_errorstring.cpp sq_navigatordropmenu.cpp sq_fileiconviewbase.cpp sq_helpwidget.ui sq_glview.cpp sq_viewcache.ui sq_filethumbviewitem.cpp sq_progress.cpp sq_thumbnailsize.cpp sq_pixmapcache.cpp sq_filethumbview.cpp sq_dir.cpp sq_iconlistbox.cpp sq_iconlistitem.cpp sq_widgetstack.cpp sq_options.ui sq_libraryhandler.cpp sq_imageproperties.ui sq_hloptions.cpp sq_glu.cpp sq_filters.ui sq_fileiconview.cpp sq_filedetailview.cpp sq_externaltools.ui sq_externaltool.cpp sq_diroperator.cpp sq_config.cpp sq_bookmarkowner.cpp sq_archivehandler.cpp ksquirrel.cpp main.cpp 
-ksquirrel_LDADD   = ./sidebar/libsidebar.a ./imageedit/libimageedit.a $(KDE_LDFLAGS) $(QT_LDFLAGS) $(LIB_TDEPRINT) $(LIB_KUTILS) $(LIB_KIO) $(ksquirrellibs_LIBS) -lkonq -lqui $(LIB_KFILE) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT) $(LIBSOCKET) -lDCOP -ltdefx
+ksquirrel_LDADD   = ./sidebar/libsidebar.a ./imageedit/libimageedit.a $(KDE_LDFLAGS) $(QT_LDFLAGS) $(LIB_TDEPRINT) $(LIB_KUTILS) $(LIB_KIO) $(ksquirrellibs_LIBS) -lkonq $(LIB_QUI) $(LIB_KFILE) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT) $(LIBSOCKET) -lDCOP -ltdefx
 
 SUBDIRS = sidebar imageedit mime 
 
diff --git a/ksquirrel/imageedit/sq_imagebcg.ui b/ksquirrel/imageedit/sq_imagebcg.ui
index f431374..cad344f 100644
--- a/ksquirrel/imageedit/sq_imagebcg.ui
+++ b/ksquirrel/imageedit/sq_imagebcg.ui
@@ -951,7 +951,7 @@
 <variables>
     <variable access="private">int id;</variable>
     <variable access="private">TQImage sample, sample_saved;</variable>
-    <variable access="private">QStringList strings;</variable>
+    <variable access="private">TQStringList strings;</variable>
     <variable access="private">static SQ_ImageBCG *m_inst;</variable>
 </variables>
 <Q_SIGNALS>
diff --git a/ksquirrel/ksquirrelpart/Makefile.am b/ksquirrel/ksquirrelpart/Makefile.am
index 919d1f0..e124de9 100644
--- a/ksquirrel/ksquirrelpart/Makefile.am
+++ b/ksquirrel/ksquirrelpart/Makefile.am
@@ -14,7 +14,7 @@ AM_CCASFLAGS = -I$(srcdir) $(KSQUIRREL_ASM_DEFS)
 
 libksquirrelpart_la_SOURCES = ksquirrelpart.cpp sq_glparts.cpp sq_glu.cpp sq_glwidget.cpp sq_glwidget_stuff.cpp sq_libraryhandler.cpp sq_downloader.cpp sq_iconloader.cpp fmt_filters.cpp sq_externaltool.cpp sq_config.cpp sq_filedialog.cpp sq_imagefilter.ui sq_imagebcg.ui sq_glselectionpainter.cpp sq_glwidget_helpers.cpp sq_label.cpp sq_bcglabel.cpp sq_popupmenu.cpp sq_codecsettingsskeleton.ui sq_codecsettings.cpp sq_imageproperties.ui sq_utils.cpp sq_helpwidget.ui sq_utils_asm_scale.S sq_utils_scale.cpp sq_diroperator.cpp sq_glview.cpp sq_errorstring.cpp
 libksquirrelpart_la_LIBADD = $(LIB_KPARTS)
-libksquirrelpart_la_LDFLAGS = $(all_libraries) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KIO) $(LIB_TDEFX) $(KDE_PLUGIN) $(ksquirrellibs_LIBS) $(LIB_TDEPRINT) -lqui -lkonq -ltdefx
+libksquirrelpart_la_LDFLAGS = $(all_libraries) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KIO) $(LIB_TDEFX) $(KDE_PLUGIN) $(ksquirrellibs_LIBS) $(LIB_TDEPRINT) -lkonq -ltdefx $(LIB_QUI)
 
 if SQ_HAVE_KEXIF
 libksquirrelpart_la_LDFLAGS += $(libkexif_LIBS)
diff --git a/ksquirrel/ksquirrelpart/sq_imagebcg.ui b/ksquirrel/ksquirrelpart/sq_imagebcg.ui
index f431374..cad344f 100644
--- a/ksquirrel/ksquirrelpart/sq_imagebcg.ui
+++ b/ksquirrel/ksquirrelpart/sq_imagebcg.ui
@@ -951,7 +951,7 @@
 <variables>
     <variable access="private">int id;</variable>
     <variable access="private">TQImage sample, sample_saved;</variable>
-    <variable access="private">QStringList strings;</variable>
+    <variable access="private">TQStringList strings;</variable>
     <variable access="private">static SQ_ImageBCG *m_inst;</variable>
 </variables>
 <Q_SIGNALS>
diff --git a/ksquirrel/ksquirrelpart/sq_imageproperties.ui b/ksquirrel/ksquirrelpart/sq_imageproperties.ui
index 85b262f..345fa76 100644
--- a/ksquirrel/ksquirrelpart/sq_imageproperties.ui
+++ b/ksquirrel/ksquirrelpart/sq_imageproperties.ui
@@ -941,7 +941,7 @@
 <variables>
     <variable access="private">KURL url;</variable>
     <variable access="private">QWidget *kew;</variable>
-    <variable access="private">QPixmap ok, error;</variable>
+    <variable access="private">TQPixmap ok, error;</variable>
     <variable access="private">KPopupMenu *menu;</variable>
     <variable access="private">TQListViewItem *data;</variable>
     <variable access="private">int z, exifMode;</variable>
diff --git a/ksquirrel/sq_imageproperties.ui b/ksquirrel/sq_imageproperties.ui
index 85b262f..caee756 100644
--- a/ksquirrel/sq_imageproperties.ui
+++ b/ksquirrel/sq_imageproperties.ui
@@ -940,8 +940,8 @@
 </forwards>
 <variables>
     <variable access="private">KURL url;</variable>
-    <variable access="private">QWidget *kew;</variable>
-    <variable access="private">QPixmap ok, error;</variable>
+    <variable access="private">TQWidget *kew;</variable>
+    <variable access="private">TQPixmap ok, error;</variable>
     <variable access="private">KPopupMenu *menu;</variable>
     <variable access="private">TQListViewItem *data;</variable>
     <variable access="private">int z, exifMode;</variable>