Conversion KDE3→TDE

Signed-off-by: Mavridis Philippe <[email protected]>

4 files changed, 78 insertions, 78 deletions

diff --git a/src/config/Makefile.am b/src/config/Makefile.am
index 57d3bb8..c418cb3 100644
--- a/src/config/Makefile.am
+++ b/src/config/Makefile.am
@@ -1,9 +1,9 @@
 INCLUDES = $(all_includes)
 
-kde_module_LTLIBRARIES = kwin_SUSE2_config.la
+kde_module_LTLIBRARIES = twin_SUSE2_config.la
 
-kwin_SUSE2_config_la_SOURCES = config.cpp configdialog.ui
-kwin_SUSE2_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
-kwin_SUSE2_config_la_LIBADD = $(LIB_KDEUI) $(LIB_KIO)
+twin_SUSE2_config_la_SOURCES = config.cpp configdialog.ui
+twin_SUSE2_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
+twin_SUSE2_config_la_LIBADD = $(LIB_TDEUI) $(LIB_TDEIO)
 
 METASOURCES = AUTO
diff --git a/src/config/Makefile.in b/src/config/Makefile.in
index bce9800..3a3f44d 100644
--- a/src/config/Makefile.in
+++ b/src/config/Makefile.in
@@ -58,15 +58,15 @@ am__installdirs = "$(DESTDIR)$(kde_moduledir)"
 kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(kde_module_LTLIBRARIES)
 am__DEPENDENCIES_1 =
-kwin_SUSE2_config_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+twin_SUSE2_config_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1)
-am_kwin_SUSE2_config_la_OBJECTS = config.lo
-#>- kwin_SUSE2_config_la_OBJECTS = $(am_kwin_SUSE2_config_la_OBJECTS)
+am_twin_SUSE2_config_la_OBJECTS = config.lo
+#>- twin_SUSE2_config_la_OBJECTS = $(am_twin_SUSE2_config_la_OBJECTS)
 #>+ 4
-kwin_SUSE2_config_la_final_OBJECTS = kwin_SUSE2_config_la.all_cpp.lo 
-kwin_SUSE2_config_la_nofinal_OBJECTS = config.lo configdialog.lo
-@KDE_USE_FINAL_FALSE@kwin_SUSE2_config_la_OBJECTS = $(kwin_SUSE2_config_la_nofinal_OBJECTS)
-@KDE_USE_FINAL_TRUE@kwin_SUSE2_config_la_OBJECTS = $(kwin_SUSE2_config_la_final_OBJECTS)
+twin_SUSE2_config_la_final_OBJECTS = twin_SUSE2_config_la.all_cpp.lo 
+twin_SUSE2_config_la_nofinal_OBJECTS = config.lo configdialog.lo
+@KDE_USE_FINAL_FALSE@twin_SUSE2_config_la_OBJECTS = $(twin_SUSE2_config_la_nofinal_OBJECTS)
+@KDE_USE_FINAL_TRUE@twin_SUSE2_config_la_OBJECTS = $(twin_SUSE2_config_la_final_OBJECTS)
 DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
 am__depfiles_maybe = depfiles
@@ -88,8 +88,8 @@ CXXLD = $(CXX)
 #>+ 2
 CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-SOURCES = $(kwin_SUSE2_config_la_SOURCES)
-DIST_SOURCES = $(kwin_SUSE2_config_la_SOURCES)
+SOURCES = $(twin_SUSE2_config_la_SOURCES)
+DIST_SOURCES = $(twin_SUSE2_config_la_SOURCES)
 ETAGS = etags
 CTAGS = ctags
 #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -181,24 +181,24 @@ LIBUTIL = @LIBUTIL@
 LIBZ = @LIBZ@
 LIB_KAB = @LIB_KAB@
 LIB_KABC = @LIB_KABC@
-LIB_KDECORE = @LIB_KDECORE@
+LIB_TDECORE = @LIB_TDECORE@
 LIB_KDED = @LIB_KDED@
-LIB_KDEPIM = @LIB_KDEPIM@
-LIB_KDEPRINT = @LIB_KDEPRINT@
-LIB_KDEUI = @LIB_KDEUI@
-LIB_KDNSSD = @LIB_KDNSSD@
+LIB_TDEPIM = @LIB_TDEPIM@
+LIB_TDEPRINT = @LIB_TDEPRINT@
+LIB_TDEUI = @LIB_TDEUI@
+LIB_TDEDNSSD = @LIB_TDEDNSSD@
 LIB_KFILE = @LIB_KFILE@
 LIB_KFM = @LIB_KFM@
-LIB_KHTML = @LIB_KHTML@
-LIB_KIMPROXY = @LIB_KIMPROXY@
-LIB_KIO = @LIB_KIO@
+LIB_TDEHTML = @LIB_TDEHTML@
+LIB_TDEIMPROXY = @LIB_TDEIMPROXY@
+LIB_TDEIO = @LIB_TDEIO@
 LIB_KJS = @LIB_KJS@
 LIB_KNEWSTUFF = @LIB_KNEWSTUFF@
-LIB_KPARTS = @LIB_KPARTS@
-LIB_KSPELL = @LIB_KSPELL@
-LIB_KSYCOCA = @LIB_KSYCOCA@
-LIB_KUNITTEST = @LIB_KUNITTEST@
-LIB_KUTILS = @LIB_KUTILS@
+LIB_TDEPARTS = @LIB_TDEPARTS@
+LIB_TDESPELL = @LIB_TDESPELL@
+LIB_TDESYCOCA = @LIB_TDESYCOCA@
+LIB_TDEUNITTEST = @LIB_TDEUNITTEST@
+LIB_TDEUTILS = @LIB_TDEUTILS@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
@@ -209,7 +209,7 @@ LIB_XRENDER = @LIB_XRENDER@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
-MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+MAKETDEWIDGETS = @MAKETDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MEINPROC = @MEINPROC@
 MOC = @MOC@
@@ -310,7 +310,7 @@ kde_styledir = @kde_styledir@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdeinitdir = @kdeinitdir@
+tdeinitdir = @tdeinitdir@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
@@ -340,12 +340,12 @@ xdg_appsdir = @xdg_appsdir@
 xdg_directorydir = @xdg_directorydir@
 xdg_menudir = @xdg_menudir@
 INCLUDES = $(all_includes)
-kde_module_LTLIBRARIES = kwin_SUSE2_config.la
-#>- kwin_SUSE2_config_la_SOURCES = config.cpp configdialog.ui
+kde_module_LTLIBRARIES = twin_SUSE2_config.la
+#>- twin_SUSE2_config_la_SOURCES = config.cpp configdialog.ui
 #>+ 1
-kwin_SUSE2_config_la_SOURCES=config.cpp  configdialog.cpp
-kwin_SUSE2_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
-kwin_SUSE2_config_la_LIBADD = $(LIB_KDEUI) $(LIB_KIO)
+twin_SUSE2_config_la_SOURCES=config.cpp  configdialog.cpp
+twin_SUSE2_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
+twin_SUSE2_config_la_LIBADD = $(LIB_TDEUI) $(LIB_TDEIO)
 #>- METASOURCES = AUTO
 #>- all: all-am
 #>+ 1
@@ -422,11 +422,11 @@ clean-kde_moduleLTLIBRARIES:
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
-#>- kwin_SUSE2_config.la: $(kwin_SUSE2_config_la_OBJECTS) $(kwin_SUSE2_config_la_DEPENDENCIES) 
+#>- twin_SUSE2_config.la: $(twin_SUSE2_config_la_OBJECTS) $(twin_SUSE2_config_la_DEPENDENCIES) 
 #>+ 2
-@KDE_USE_CLOSURE_TRUE@kwin_SUSE2_config.la: kwin_SUSE2_config.la.closure $(kwin_SUSE2_config_la_OBJECTS) $(kwin_SUSE2_config_la_DEPENDENCIES) 
-@KDE_USE_CLOSURE_FALSE@kwin_SUSE2_config.la: $(kwin_SUSE2_config_la_OBJECTS) $(kwin_SUSE2_config_la_DEPENDENCIES) 
-	$(CXXLINK) -rpath $(kde_moduledir) $(kwin_SUSE2_config_la_LDFLAGS) $(kwin_SUSE2_config_la_OBJECTS) $(kwin_SUSE2_config_la_LIBADD) $(LIBS)
+@KDE_USE_CLOSURE_TRUE@twin_SUSE2_config.la: twin_SUSE2_config.la.closure $(twin_SUSE2_config_la_OBJECTS) $(twin_SUSE2_config_la_DEPENDENCIES) 
+@KDE_USE_CLOSURE_FALSE@twin_SUSE2_config.la: $(twin_SUSE2_config_la_OBJECTS) $(twin_SUSE2_config_la_DEPENDENCIES) 
+	$(CXXLINK) -rpath $(kde_moduledir) $(twin_SUSE2_config_la_LDFLAGS) $(twin_SUSE2_config_la_OBJECTS) $(twin_SUSE2_config_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -651,12 +651,12 @@ uninstall-am: uninstall-info-am uninstall-kde_moduleLTLIBRARIES
 .NOEXPORT:
 
 #>+ 8
-kwin_SUSE2_config.la.closure: $(kwin_SUSE2_config_la_OBJECTS) $(kwin_SUSE2_config_la_DEPENDENCIES)
-	@echo "int main() {return 0;}" > kwin_SUSE2_config_la_closure.cpp
-	@$(LTCXXCOMPILE) -c kwin_SUSE2_config_la_closure.cpp
-	$(CXXLINK) kwin_SUSE2_config_la_closure.lo $(kwin_SUSE2_config_la_LDFLAGS) $(kwin_SUSE2_config_la_OBJECTS) $(kwin_SUSE2_config_la_LIBADD) $(LIBS)
-	@rm -f kwin_SUSE2_config_la_closure.* kwin_SUSE2_config.la.closure
-	@echo "timestamp" > kwin_SUSE2_config.la.closure
+twin_SUSE2_config.la.closure: $(twin_SUSE2_config_la_OBJECTS) $(twin_SUSE2_config_la_DEPENDENCIES)
+	@echo "int main() {return 0;}" > twin_SUSE2_config_la_closure.cpp
+	@$(LTCXXCOMPILE) -c twin_SUSE2_config_la_closure.cpp
+	$(CXXLINK) twin_SUSE2_config_la_closure.lo $(twin_SUSE2_config_la_LDFLAGS) $(twin_SUSE2_config_la_OBJECTS) $(twin_SUSE2_config_la_LIBADD) $(LIBS)
+	@rm -f twin_SUSE2_config_la_closure.* twin_SUSE2_config.la.closure
+	@echo "timestamp" > twin_SUSE2_config.la.closure
 
 
 #>+ 3
@@ -680,7 +680,7 @@ clean-ui:
 
 #>+ 3
 clean-closures:
-	-rm -f  kwin_SUSE2_config.la.closure
+	-rm -f  twin_SUSE2_config.la.closure
 
 #>+ 2
 docs-am:
@@ -724,36 +724,36 @@ bcheck-am:
 
 
 #>+ 11
-kwin_SUSE2_config_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/config.cpp $(srcdir)/configdialog.cpp  configdialog.moc config.moc
-	@echo 'creating kwin_SUSE2_config_la.all_cpp.cpp ...'; \
-	rm -f kwin_SUSE2_config_la.all_cpp.files kwin_SUSE2_config_la.all_cpp.final; \
-	echo "#define KDE_USE_FINAL 1" >> kwin_SUSE2_config_la.all_cpp.final; \
+twin_SUSE2_config_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/config.cpp $(srcdir)/configdialog.cpp  configdialog.moc config.moc
+	@echo 'creating twin_SUSE2_config_la.all_cpp.cpp ...'; \
+	rm -f twin_SUSE2_config_la.all_cpp.files twin_SUSE2_config_la.all_cpp.final; \
+	echo "#define KDE_USE_FINAL 1" >> twin_SUSE2_config_la.all_cpp.final; \
 	for file in config.cpp configdialog.cpp ; do \
-	  echo "#include \"$$file\"" >> kwin_SUSE2_config_la.all_cpp.files; \
-	  test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kwin_SUSE2_config_la.all_cpp.final; \
+	  echo "#include \"$$file\"" >> twin_SUSE2_config_la.all_cpp.files; \
+	  test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> twin_SUSE2_config_la.all_cpp.final; \
 	done; \
-	cat kwin_SUSE2_config_la.all_cpp.final kwin_SUSE2_config_la.all_cpp.files > kwin_SUSE2_config_la.all_cpp.cpp; \
-	rm -f kwin_SUSE2_config_la.all_cpp.final kwin_SUSE2_config_la.all_cpp.files
+	cat twin_SUSE2_config_la.all_cpp.final twin_SUSE2_config_la.all_cpp.files > twin_SUSE2_config_la.all_cpp.cpp; \
+	rm -f twin_SUSE2_config_la.all_cpp.final twin_SUSE2_config_la.all_cpp.files
 
 #>+ 3
 clean-final:
-	-rm -f kwin_SUSE2_config_la.all_cpp.cpp
+	-rm -f twin_SUSE2_config_la.all_cpp.cpp
 
 #>+ 3
 final:
-	$(MAKE) kwin_SUSE2_config_la_OBJECTS="$(kwin_SUSE2_config_la_final_OBJECTS)" all-am
+	$(MAKE) twin_SUSE2_config_la_OBJECTS="$(twin_SUSE2_config_la_final_OBJECTS)" all-am
 
 #>+ 3
 final-install:
-	$(MAKE) kwin_SUSE2_config_la_OBJECTS="$(kwin_SUSE2_config_la_final_OBJECTS)" install-am
+	$(MAKE) twin_SUSE2_config_la_OBJECTS="$(twin_SUSE2_config_la_final_OBJECTS)" install-am
 
 #>+ 3
 no-final:
-	$(MAKE) kwin_SUSE2_config_la_OBJECTS="$(kwin_SUSE2_config_la_nofinal_OBJECTS)" all-am
+	$(MAKE) twin_SUSE2_config_la_OBJECTS="$(twin_SUSE2_config_la_nofinal_OBJECTS)" all-am
 
 #>+ 3
 no-final-install:
-	$(MAKE) kwin_SUSE2_config_la_OBJECTS="$(kwin_SUSE2_config_la_nofinal_OBJECTS)" install-am
+	$(MAKE) twin_SUSE2_config_la_OBJECTS="$(twin_SUSE2_config_la_nofinal_OBJECTS)" install-am
 
 #>+ 3
 kde-rpo-clean:
@@ -770,7 +770,7 @@ config.o: config.moc
 configdialog.cpp: $(srcdir)/configdialog.ui configdialog.h configdialog.moc
 	rm -f configdialog.cpp
 	echo '#include <kdialog.h>' > configdialog.cpp
-	echo '#include <klocale.h>' >> configdialog.cpp
+	echo '#include <tdelocale.h>' >> configdialog.cpp
 	$(UIC) -tr ${UIC_TR} -i configdialog.h $(srcdir)/configdialog.ui > configdialog.cpp.temp ; ret=$$?; \
 	$(PERL) -pe "s,${UIC_TR}( \"\" ),QString::null,g" configdialog.cpp.temp | $(PERL) -pe "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | $(PERL) -pe "s,image([0-9][0-9]*)_data,img\$$1_configdialog,g" | $(PERL) -pe "s,: QWizard\(,: KWizard(,g" >> configdialog.cpp ;\
 	rm -f configdialog.cpp.temp ;\
diff --git a/src/config/config.cpp b/src/config/config.cpp
index 7ff53f7..d0a72bf 100644
--- a/src/config/config.cpp
+++ b/src/config/config.cpp
@@ -35,29 +35,29 @@
 #include <tqlabel.h>
 #include <tqcombobox.h>
 
-#include <kdeversion.h>
-#include <kconfig.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdeversion.h>
+#include <tdeconfig.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <kurlrequester.h>
 #include <kstandarddirs.h>
 #include <kurl.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <knuminput.h>
-#include <kfileitem.h>
+#include <tdefileitem.h>
 #include <kcolorbutton.h>
 
 #include "config.h"
 #include "configdialog.h"
 
-SUSE2Config::SUSE2Config(KConfig *config, TQWidget *parent)
+SUSE2Config::SUSE2Config(TDEConfig *config, TQWidget *parent)
     : TQObject(parent), m_config(0), m_dialog(0)
 {
     m_parent = parent;
     // create the configuration object
-    m_config = new KConfig("kwinSUSE2rc");
-    KGlobal::locale()->insertCatalogue("kwin_clients");
-    KGlobal::locale()->insertCatalogue("kwin_SUSE2");
+    m_config = new TDEConfig("twinSUSE2rc");
+    TDEGlobal::locale()->insertCatalogue("twin_clients");
+    TDEGlobal::locale()->insertCatalogue("twin_SUSE2");
 
     // create and show the configuration dialog
     m_dialog = new ConfigDialog(parent);
@@ -102,7 +102,7 @@ SUSE2Config::~SUSE2Config()
     if (m_config) delete m_config;
 }
 
-void SUSE2Config::load(KConfig *)
+void SUSE2Config::load(TDEConfig *)
 {
     m_config->setGroup("General");
 
@@ -172,14 +172,14 @@ void SUSE2Config::load(KConfig *)
     int titleBarLogoOffset = m_config->readNumEntry("TitleBarLogoOffset", 3);
     m_dialog->titleBarLogoOffset->setValue(titleBarLogoOffset);
 
-    TQString titleBarImage = locate("data", "kwin/pics/titlebar_decor.png");
+    TQString titleBarImage = locate("data", "twin/pics/titlebar_decor.png");
     titlebarLogoURL = m_config->readEntry("TitleBarLogoURL", titleBarImage);
     TQImage tmpLogo = TQImage::TQImage(titlebarLogoURL);
     m_dialog->logoImage->setPixmap(TQPixmap(tmpLogo.smoothScale(120, 20, TQImage::ScaleMin)));
 
 }
 
-void SUSE2Config::save(KConfig *) const
+void SUSE2Config::save(TDEConfig *) const
 {
     m_config->setGroup("General");
 
@@ -237,7 +237,7 @@ void SUSE2Config::defaults()
 
     m_dialog->titleBarLogo->setChecked(false);
     m_dialog->titleBarLogoOffset->setValue(3);
-    titlebarLogoURL = locate("data", "kwin/pics/titlebar_decor.png");
+    titlebarLogoURL = locate("data", "twin/pics/titlebar_decor.png");
     TQImage tmpLogo = TQImage::TQImage(titlebarLogoURL);
     m_dialog->logoImage->setPixmap(TQPixmap(tmpLogo.smoothScale(120, 20, TQImage::ScaleMin)));
 }
@@ -274,7 +274,7 @@ void SUSE2Config::selectImage()
 
 extern "C"
 {
-    KDE_EXPORT TQObject *allocate_config(KConfig *config, TQWidget *parent) {
+    KDE_EXPORT TQObject *allocate_config(TDEConfig *config, TQWidget *parent) {
         return (new SUSE2Config(config, parent));
     }
 }
diff --git a/src/config/config.h b/src/config/config.h
index 704f38e..8863792 100644
--- a/src/config/config.h
+++ b/src/config/config.h
@@ -28,7 +28,7 @@
 
 class TQButtonGroup;
 class TQGroupBox;
-class KConfig;
+class TDEConfig;
 class ConfigDialog;
 
 class SUSE2Config : public TQObject
@@ -36,20 +36,20 @@ class SUSE2Config : public TQObject
     Q_OBJECT
 
 public:
-    SUSE2Config(KConfig *config, TQWidget *parent);
+    SUSE2Config(TDEConfig *config, TQWidget *parent);
     ~SUSE2Config();
 
 signals:
     void changed();
 
 public slots:
-    void load(KConfig *config);
-    void save(KConfig *config) const;
+    void load(TDEConfig *config);
+    void save(TDEConfig *config) const;
     void defaults();
 
 private:
     TQWidget *m_parent;
-    KConfig *m_config;
+    TDEConfig *m_config;
     ConfigDialog *m_dialog;
     TQString titlebarLogoURL;