Conversion KDE3→TDE

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

11 files changed, 190 insertions, 190 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index 425cbeb..990bc68 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,26 +2,26 @@ INCLUDES = -I$(top_srcdir) $(all_includes)
 
 SUBDIRS = config
 
-kde_module_LTLIBRARIES = kwin3_SUSE2.la
+kde_module_LTLIBRARIES = twin3_SUSE2.la
 
-kwin3_SUSE2_la_SOURCES = SUSE2.cpp SUSE2client.cpp SUSE2button.cpp misc.cpp shadow.cpp
+twin3_SUSE2_la_SOURCES = SUSE2.cpp SUSE2client.cpp SUSE2button.cpp misc.cpp shadow.cpp
 
-kwin3_SUSE2_la_LIBADD = $(LIB_KDEUI) -lkdecorations
-kwin3_SUSE2_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
+twin3_SUSE2_la_LIBADD = $(LIB_TDEUI) -ltdecorations
+twin3_SUSE2_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
 METASOURCES = AUTO
 
 messages: rc.cpp
 	$(EXTRACTRC) config/*.ui >> rc.cpp
-	$(XGETTEXT) *.cpp config/*.cpp -o $(podir)/kwin_SUSE2.pot
+	$(XGETTEXT) *.cpp config/*.cpp -o $(podir)/twin_SUSE2.pot
 
-linkdir = $(kde_datadir)/kwin/
+linkdir = $(kde_datadir)/twin/
 link_DATA = SUSE2.desktop
 
-kwin_pics_data_DATA = titlebar_decor.png
-kwin_pics_datadir = $(kde_datadir)/kwin/pics
+twin_pics_data_DATA = titlebar_decor.png
+twin_pics_datadir = $(kde_datadir)/twin/pics
 
-kdisplay_colorscheme_DATA = SUSE2.kcsrc
-kdisplay_colorschemedir = $(kde_datadir)/kdisplay/color-schemes
+tdedisplay_colorscheme_DATA = SUSE2.kcsrc
+tdedisplay_colorschemedir = $(kde_datadir)/tdedisplay/color-schemes
 
-EXTRA_DIST = $(kwin_pics_data_DATA) $(link_DATA) $(kdisplay_colorscheme_DATA)
+EXTRA_DIST = $(twin_pics_data_DATA) $(link_DATA) $(tdedisplay_colorscheme_DATA)
 
diff --git a/src/Makefile.in b/src/Makefile.in
index 6127792..152591d 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -56,21 +56,21 @@ am__vpath_adj = case $$p in \
   esac;
 am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
 am__installdirs = "$(DESTDIR)$(kde_moduledir)" \
-	"$(DESTDIR)$(kdisplay_colorschemedir)" \
-	"$(DESTDIR)$(kwin_pics_datadir)" "$(DESTDIR)$(linkdir)"
+	"$(DESTDIR)$(tdedisplay_colorschemedir)" \
+	"$(DESTDIR)$(twin_pics_datadir)" "$(DESTDIR)$(linkdir)"
 kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(kde_module_LTLIBRARIES)
 am__DEPENDENCIES_1 =
-kwin3_SUSE2_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
-am_kwin3_SUSE2_la_OBJECTS = SUSE2.lo SUSE2client.lo SUSE2button.lo \
+twin3_SUSE2_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+am_twin3_SUSE2_la_OBJECTS = SUSE2.lo SUSE2client.lo SUSE2button.lo \
 	misc.lo shadow.lo
-#>- kwin3_SUSE2_la_OBJECTS = $(am_kwin3_SUSE2_la_OBJECTS)
+#>- twin3_SUSE2_la_OBJECTS = $(am_twin3_SUSE2_la_OBJECTS)
 #>+ 5
-kwin3_SUSE2_la_final_OBJECTS = kwin3_SUSE2_la.all_cpp.lo 
-kwin3_SUSE2_la_nofinal_OBJECTS = SUSE2.lo SUSE2client.lo SUSE2button.lo \
+twin3_SUSE2_la_final_OBJECTS = twin3_SUSE2_la.all_cpp.lo 
+twin3_SUSE2_la_nofinal_OBJECTS = SUSE2.lo SUSE2client.lo SUSE2button.lo \
 	misc.lo shadow.lo
-@KDE_USE_FINAL_FALSE@kwin3_SUSE2_la_OBJECTS = $(kwin3_SUSE2_la_nofinal_OBJECTS)
-@KDE_USE_FINAL_TRUE@kwin3_SUSE2_la_OBJECTS = $(kwin3_SUSE2_la_final_OBJECTS)
+@KDE_USE_FINAL_FALSE@twin3_SUSE2_la_OBJECTS = $(twin3_SUSE2_la_nofinal_OBJECTS)
+@KDE_USE_FINAL_TRUE@twin3_SUSE2_la_OBJECTS = $(twin3_SUSE2_la_final_OBJECTS)
 DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
 am__depfiles_maybe = depfiles
@@ -92,8 +92,8 @@ CXXLD = $(CXX)
 #>+ 2
 CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-SOURCES = $(kwin3_SUSE2_la_SOURCES)
-DIST_SOURCES = $(kwin3_SUSE2_la_SOURCES)
+SOURCES = $(twin3_SUSE2_la_SOURCES)
+DIST_SOURCES = $(twin3_SUSE2_la_SOURCES)
 #>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 #>- 	html-recursive info-recursive install-data-recursive \
 #>- 	install-exec-recursive install-info-recursive \
@@ -107,10 +107,10 @@ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 	install-recursive installcheck-recursive installdirs-recursive \
 	pdf-recursive ps-recursive uninstall-info-recursive \
 	uninstall-recursive nmcheck-recursive bcheck-recursive
-kdisplay_colorschemeDATA_INSTALL = $(INSTALL_DATA)
-kwin_pics_dataDATA_INSTALL = $(INSTALL_DATA)
+tdedisplay_colorschemeDATA_INSTALL = $(INSTALL_DATA)
+twin_pics_dataDATA_INSTALL = $(INSTALL_DATA)
 linkDATA_INSTALL = $(INSTALL_DATA)
-DATA = $(kdisplay_colorscheme_DATA) $(kwin_pics_data_DATA) \
+DATA = $(tdedisplay_colorscheme_DATA) $(twin_pics_data_DATA) \
 	$(link_DATA)
 ETAGS = etags
 CTAGS = ctags
@@ -204,24 +204,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@
@@ -232,7 +232,7 @@ LIB_XRENDER = @LIB_XRENDER@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
-MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+MAKETDEWIDGETS = @MAKETDEWIDGETS@
 MCOPIDL = @MCOPIDL@
 MEINPROC = @MEINPROC@
 MOC = @MOC@
@@ -333,7 +333,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@
@@ -364,18 +364,18 @@ xdg_directorydir = @xdg_directorydir@
 xdg_menudir = @xdg_menudir@
 INCLUDES = -I$(top_srcdir) $(all_includes)
 SUBDIRS = config
-kde_module_LTLIBRARIES = kwin3_SUSE2.la
-kwin3_SUSE2_la_SOURCES = SUSE2.cpp SUSE2client.cpp SUSE2button.cpp misc.cpp shadow.cpp
-kwin3_SUSE2_la_LIBADD = $(LIB_KDEUI) -lkdecorations
-kwin3_SUSE2_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
+kde_module_LTLIBRARIES = twin3_SUSE2.la
+twin3_SUSE2_la_SOURCES = SUSE2.cpp SUSE2client.cpp SUSE2button.cpp misc.cpp shadow.cpp
+twin3_SUSE2_la_LIBADD = $(LIB_TDEUI) -ltdecorations
+twin3_SUSE2_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
 #>- METASOURCES = AUTO
-linkdir = $(kde_datadir)/kwin/
+linkdir = $(kde_datadir)/twin/
 link_DATA = SUSE2.desktop
-kwin_pics_data_DATA = titlebar_decor.png
-kwin_pics_datadir = $(kde_datadir)/kwin/pics
-kdisplay_colorscheme_DATA = SUSE2.kcsrc
-kdisplay_colorschemedir = $(kde_datadir)/kdisplay/color-schemes
-EXTRA_DIST = $(kwin_pics_data_DATA) $(link_DATA) $(kdisplay_colorscheme_DATA)
+twin_pics_data_DATA = titlebar_decor.png
+twin_pics_datadir = $(kde_datadir)/twin/pics
+tdedisplay_colorscheme_DATA = SUSE2.kcsrc
+tdedisplay_colorschemedir = $(kde_datadir)/tdedisplay/color-schemes
+EXTRA_DIST = $(twin_pics_data_DATA) $(link_DATA) $(tdedisplay_colorscheme_DATA)
 #>- all: all-recursive
 #>+ 1
 all: docs-am  all-recursive
@@ -451,11 +451,11 @@ clean-kde_moduleLTLIBRARIES:
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
-#>- kwin3_SUSE2.la: $(kwin3_SUSE2_la_OBJECTS) $(kwin3_SUSE2_la_DEPENDENCIES) 
+#>- twin3_SUSE2.la: $(twin3_SUSE2_la_OBJECTS) $(twin3_SUSE2_la_DEPENDENCIES) 
 #>+ 2
-@KDE_USE_CLOSURE_TRUE@kwin3_SUSE2.la: kwin3_SUSE2.la.closure $(kwin3_SUSE2_la_OBJECTS) $(kwin3_SUSE2_la_DEPENDENCIES) 
-@KDE_USE_CLOSURE_FALSE@kwin3_SUSE2.la: $(kwin3_SUSE2_la_OBJECTS) $(kwin3_SUSE2_la_DEPENDENCIES) 
-	$(CXXLINK) -rpath $(kde_moduledir) $(kwin3_SUSE2_la_LDFLAGS) $(kwin3_SUSE2_la_OBJECTS) $(kwin3_SUSE2_la_LIBADD) $(LIBS)
+@KDE_USE_CLOSURE_TRUE@twin3_SUSE2.la: twin3_SUSE2.la.closure $(twin3_SUSE2_la_OBJECTS) $(twin3_SUSE2_la_DEPENDENCIES) 
+@KDE_USE_CLOSURE_FALSE@twin3_SUSE2.la: $(twin3_SUSE2_la_OBJECTS) $(twin3_SUSE2_la_DEPENDENCIES) 
+	$(CXXLINK) -rpath $(kde_moduledir) $(twin3_SUSE2_la_LDFLAGS) $(twin3_SUSE2_la_OBJECTS) $(twin3_SUSE2_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -499,39 +499,39 @@ clean-libtool:
 distclean-libtool:
 	-rm -f libtool
 uninstall-info-am:
-install-kdisplay_colorschemeDATA: $(kdisplay_colorscheme_DATA)
+install-tdedisplay_colorschemeDATA: $(tdedisplay_colorscheme_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(kdisplay_colorschemedir)" || $(mkdir_p) "$(DESTDIR)$(kdisplay_colorschemedir)"
-	@list='$(kdisplay_colorscheme_DATA)'; for p in $$list; do \
+	test -z "$(tdedisplay_colorschemedir)" || $(mkdir_p) "$(DESTDIR)$(tdedisplay_colorschemedir)"
+	@list='$(tdedisplay_colorscheme_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
-	  echo " $(kdisplay_colorschemeDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(kdisplay_colorschemedir)/$$f'"; \
-	  $(kdisplay_colorschemeDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(kdisplay_colorschemedir)/$$f"; \
+	  echo " $(tdedisplay_colorschemeDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(tdedisplay_colorschemedir)/$$f'"; \
+	  $(tdedisplay_colorschemeDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(tdedisplay_colorschemedir)/$$f"; \
 	done
 
-uninstall-kdisplay_colorschemeDATA:
+uninstall-tdedisplay_colorschemeDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(kdisplay_colorscheme_DATA)'; for p in $$list; do \
+	@list='$(tdedisplay_colorscheme_DATA)'; for p in $$list; do \
 	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(kdisplay_colorschemedir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(kdisplay_colorschemedir)/$$f"; \
+	  echo " rm -f '$(DESTDIR)$(tdedisplay_colorschemedir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(tdedisplay_colorschemedir)/$$f"; \
 	done
-install-kwin_pics_dataDATA: $(kwin_pics_data_DATA)
+install-twin_pics_dataDATA: $(twin_pics_data_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(kwin_pics_datadir)" || $(mkdir_p) "$(DESTDIR)$(kwin_pics_datadir)"
-	@list='$(kwin_pics_data_DATA)'; for p in $$list; do \
+	test -z "$(twin_pics_datadir)" || $(mkdir_p) "$(DESTDIR)$(twin_pics_datadir)"
+	@list='$(twin_pics_data_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
-	  echo " $(kwin_pics_dataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(kwin_pics_datadir)/$$f'"; \
-	  $(kwin_pics_dataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(kwin_pics_datadir)/$$f"; \
+	  echo " $(twin_pics_dataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(twin_pics_datadir)/$$f'"; \
+	  $(twin_pics_dataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(twin_pics_datadir)/$$f"; \
 	done
 
-uninstall-kwin_pics_dataDATA:
+uninstall-twin_pics_dataDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(kwin_pics_data_DATA)'; for p in $$list; do \
+	@list='$(twin_pics_data_DATA)'; for p in $$list; do \
 	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(kwin_pics_datadir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(kwin_pics_datadir)/$$f"; \
+	  echo " rm -f '$(DESTDIR)$(twin_pics_datadir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(twin_pics_datadir)/$$f"; \
 	done
 install-linkDATA: $(link_DATA)
 	@$(NORMAL_INSTALL)
@@ -730,7 +730,7 @@ check: check-recursive
 all-am: Makefile $(LTLIBRARIES) $(DATA)
 installdirs: installdirs-recursive
 installdirs-am:
-	for dir in "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(kdisplay_colorschemedir)" "$(DESTDIR)$(kwin_pics_datadir)" "$(DESTDIR)$(linkdir)"; do \
+	for dir in "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(tdedisplay_colorschemedir)" "$(DESTDIR)$(twin_pics_datadir)" "$(DESTDIR)$(linkdir)"; do \
 	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
 	done
 install: install-recursive
@@ -784,11 +784,11 @@ info: info-recursive
 info-am:
 
 #>- install-data-am: install-kde_moduleLTLIBRARIES \
-#>- 	install-kdisplay_colorschemeDATA install-kwin_pics_dataDATA \
+#>- 	install-tdedisplay_colorschemeDATA install-twin_pics_dataDATA \
 #>- 	install-linkDATA
 #>+ 3
 install-data-am:   \
-	install-kdisplay_colorschemeDATA install-kwin_pics_dataDATA \
+	install-tdedisplay_colorschemeDATA install-twin_pics_dataDATA \
 	install-linkDATA
 
 #>- install-exec-am:
@@ -820,8 +820,8 @@ ps: ps-recursive
 ps-am:
 
 uninstall-am: uninstall-info-am uninstall-kde_moduleLTLIBRARIES \
-	uninstall-kdisplay_colorschemeDATA \
-	uninstall-kwin_pics_dataDATA uninstall-linkDATA
+	uninstall-tdedisplay_colorschemeDATA \
+	uninstall-twin_pics_dataDATA uninstall-linkDATA
 
 uninstall-info: uninstall-info-recursive
 
@@ -833,7 +833,7 @@ uninstall-info: uninstall-info-recursive
 	html-am info info-am install install-am install-data \
 	install-data-am install-exec install-exec-am install-info \
 	install-info-am install-kde_moduleLTLIBRARIES \
-	install-kdisplay_colorschemeDATA install-kwin_pics_dataDATA \
+	install-tdedisplay_colorschemeDATA install-twin_pics_dataDATA \
 	install-linkDATA install-man install-strip installcheck \
 	installcheck-am installdirs installdirs-am maintainer-clean \
 	maintainer-clean-generic maintainer-clean-recursive \
@@ -841,24 +841,24 @@ uninstall-info: uninstall-info-recursive
 	mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
 	tags tags-recursive uninstall uninstall-am uninstall-info-am \
 	uninstall-kde_moduleLTLIBRARIES \
-	uninstall-kdisplay_colorschemeDATA \
-	uninstall-kwin_pics_dataDATA uninstall-linkDATA
+	uninstall-tdedisplay_colorschemeDATA \
+	uninstall-twin_pics_dataDATA uninstall-linkDATA
 
 
 messages: rc.cpp
 	$(EXTRACTRC) config/*.ui >> rc.cpp
-	$(XGETTEXT) *.cpp config/*.cpp -o $(podir)/kwin_SUSE2.pot
+	$(XGETTEXT) *.cpp config/*.cpp -o $(podir)/twin_SUSE2.pot
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
 #>+ 8
-kwin3_SUSE2.la.closure: $(kwin3_SUSE2_la_OBJECTS) $(kwin3_SUSE2_la_DEPENDENCIES)
-	@echo "int main() {return 0;}" > kwin3_SUSE2_la_closure.cpp
-	@$(LTCXXCOMPILE) -c kwin3_SUSE2_la_closure.cpp
-	$(CXXLINK) kwin3_SUSE2_la_closure.lo $(kwin3_SUSE2_la_LDFLAGS) $(kwin3_SUSE2_la_OBJECTS) $(kwin3_SUSE2_la_LIBADD) $(LIBS)
-	@rm -f kwin3_SUSE2_la_closure.* kwin3_SUSE2.la.closure
-	@echo "timestamp" > kwin3_SUSE2.la.closure
+twin3_SUSE2.la.closure: $(twin3_SUSE2_la_OBJECTS) $(twin3_SUSE2_la_DEPENDENCIES)
+	@echo "int main() {return 0;}" > twin3_SUSE2_la_closure.cpp
+	@$(LTCXXCOMPILE) -c twin3_SUSE2_la_closure.cpp
+	$(CXXLINK) twin3_SUSE2_la_closure.lo $(twin3_SUSE2_la_LDFLAGS) $(twin3_SUSE2_la_OBJECTS) $(twin3_SUSE2_la_LIBADD) $(LIBS)
+	@rm -f twin3_SUSE2_la_closure.* twin3_SUSE2.la.closure
+	@echo "timestamp" > twin3_SUSE2.la.closure
 
 
 #>+ 3
@@ -884,7 +884,7 @@ KDE_DIST=shadow.h SUSE2button.h misc.h SUSE2client.h SUSE2.kcsrc titlebar_decor.
 
 #>+ 3
 clean-closures:
-	-rm -f  kwin3_SUSE2.la.closure
+	-rm -f  twin3_SUSE2.la.closure
 
 #>+ 2
 docs-am:
@@ -928,36 +928,36 @@ bcheck-am:
 
 
 #>+ 11
-kwin3_SUSE2_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/SUSE2.cpp $(srcdir)/SUSE2client.cpp $(srcdir)/SUSE2button.cpp $(srcdir)/misc.cpp $(srcdir)/shadow.cpp  SUSE2button.moc SUSE2.moc
-	@echo 'creating kwin3_SUSE2_la.all_cpp.cpp ...'; \
-	rm -f kwin3_SUSE2_la.all_cpp.files kwin3_SUSE2_la.all_cpp.final; \
-	echo "#define KDE_USE_FINAL 1" >> kwin3_SUSE2_la.all_cpp.final; \
+twin3_SUSE2_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/SUSE2.cpp $(srcdir)/SUSE2client.cpp $(srcdir)/SUSE2button.cpp $(srcdir)/misc.cpp $(srcdir)/shadow.cpp  SUSE2button.moc SUSE2.moc
+	@echo 'creating twin3_SUSE2_la.all_cpp.cpp ...'; \
+	rm -f twin3_SUSE2_la.all_cpp.files twin3_SUSE2_la.all_cpp.final; \
+	echo "#define KDE_USE_FINAL 1" >> twin3_SUSE2_la.all_cpp.final; \
 	for file in SUSE2.cpp SUSE2client.cpp SUSE2button.cpp misc.cpp shadow.cpp ; do \
-	  echo "#include \"$$file\"" >> kwin3_SUSE2_la.all_cpp.files; \
-	  test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kwin3_SUSE2_la.all_cpp.final; \
+	  echo "#include \"$$file\"" >> twin3_SUSE2_la.all_cpp.files; \
+	  test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> twin3_SUSE2_la.all_cpp.final; \
 	done; \
-	cat kwin3_SUSE2_la.all_cpp.final kwin3_SUSE2_la.all_cpp.files > kwin3_SUSE2_la.all_cpp.cpp; \
-	rm -f kwin3_SUSE2_la.all_cpp.final kwin3_SUSE2_la.all_cpp.files
+	cat twin3_SUSE2_la.all_cpp.final twin3_SUSE2_la.all_cpp.files > twin3_SUSE2_la.all_cpp.cpp; \
+	rm -f twin3_SUSE2_la.all_cpp.final twin3_SUSE2_la.all_cpp.files
 
 #>+ 3
 clean-final:
-	-rm -f kwin3_SUSE2_la.all_cpp.cpp
+	-rm -f twin3_SUSE2_la.all_cpp.cpp
 
 #>+ 3
 final:
-	$(MAKE) kwin3_SUSE2_la_OBJECTS="$(kwin3_SUSE2_la_final_OBJECTS)" all-am
+	$(MAKE) twin3_SUSE2_la_OBJECTS="$(twin3_SUSE2_la_final_OBJECTS)" all-am
 
 #>+ 3
 final-install:
-	$(MAKE) kwin3_SUSE2_la_OBJECTS="$(kwin3_SUSE2_la_final_OBJECTS)" install-am
+	$(MAKE) twin3_SUSE2_la_OBJECTS="$(twin3_SUSE2_la_final_OBJECTS)" install-am
 
 #>+ 3
 no-final:
-	$(MAKE) kwin3_SUSE2_la_OBJECTS="$(kwin3_SUSE2_la_nofinal_OBJECTS)" all-am
+	$(MAKE) twin3_SUSE2_la_OBJECTS="$(twin3_SUSE2_la_nofinal_OBJECTS)" all-am
 
 #>+ 3
 no-final-install:
-	$(MAKE) kwin3_SUSE2_la_OBJECTS="$(kwin3_SUSE2_la_nofinal_OBJECTS)" install-am
+	$(MAKE) twin3_SUSE2_la_OBJECTS="$(twin3_SUSE2_la_nofinal_OBJECTS)" install-am
 
 #>+ 3
 kde-rpo-clean:
diff --git a/src/SUSE2.cpp b/src/SUSE2.cpp
index 570309b..f336167 100644
--- a/src/SUSE2.cpp
+++ b/src/SUSE2.cpp
@@ -27,9 +27,9 @@
 #include <tqpainter.h>
 #include <tqbitmap.h>
 
-#include <kconfig.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdeconfig.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 #include <kpixmap.h>
 
@@ -47,8 +47,8 @@ SUSE2Handler::SUSE2Handler()
 {
     memset(m_pixmaps, 0, sizeof(TQPixmap *) * NumButtonStatus * NumButtonIcons); // set elements to 0
 
-    KGlobal::locale()->insertCatalogue("kwin_clients");
-    KGlobal::locale()->insertCatalogue("kwin_SUSE2");
+    TDEGlobal::locale()->insertCatalogue("twin_clients");
+    TDEGlobal::locale()->insertCatalogue("twin_SUSE2");
 
     reset(0);
 }
@@ -140,7 +140,7 @@ bool SUSE2Handler::supports( Ability ability ) const
 void SUSE2Handler::readConfig()
 {
     // create a config object
-    KConfig config("kwinSUSE2rc");
+    TDEConfig config("twinSUSE2rc");
     config.setGroup("General");
 
     // grab settings
@@ -186,7 +186,7 @@ void SUSE2Handler::readConfig()
 
     m_titleLogo      = config.readBoolEntry("TitleBarLogo", true);
     m_titleLogoOffset = config.readNumEntry("TitleBarLogoOffset", 3);
-    m_titleLogoURL   = config.readEntry("TitleBarLogoURL", locate("data", "kwin/pics/titlebar_decor.png"));
+    m_titleLogoURL   = config.readEntry("TitleBarLogoURL", locate("data", "twin/pics/titlebar_decor.png"));
 }
 
 TQColor SUSE2Handler::getColor(KWinSUSE2::ColorType type, const bool active) const
diff --git a/src/SUSE2.desktop b/src/SUSE2.desktop
index 906eadd..723004a 100644
--- a/src/SUSE2.desktop
+++ b/src/SUSE2.desktop
@@ -1,4 +1,4 @@
 [Desktop Entry]
 Name=SUSE2
 Name[xx]=xxSUSE2xx
-X-KDE-Library=kwin3_SUSE2
+X-TDE-Library=twin3_SUSE2
diff --git a/src/SUSE2client.cpp b/src/SUSE2client.cpp
index ee443c5..a3a7f87 100644
--- a/src/SUSE2client.cpp
+++ b/src/SUSE2client.cpp
@@ -22,7 +22,7 @@
   Boston, MA  02110-1301  USA.
 */
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kpixmap.h>
 #include <kimageeffect.h>
 #include <kpixmapeffect.h>
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;
 
diff --git a/src/shadow.cpp b/src/shadow.cpp
index 99a424f..ef97c39 100644
--- a/src/shadow.cpp
+++ b/src/shadow.cpp
@@ -1,7 +1,7 @@
 /* Copyright (C) 2005 Gerd Fleischer <[email protected]>
  * Copyright (C) 2003 by Sandro Giessl
  * based on the nice CVS KDesktop KShadowEngine class. thanks!
- * looking forward to see KShadowEngine in kdefx somewhen btw.. :)
+ * looking forward to see KShadowEngine in tdefx somewhen btw.. :)
  * ------------------------------------------------------------------------
  * these are the original copyright notes:
  * This file is proposed to be part of the KDE libraries.
diff --git a/src/shadow.h b/src/shadow.h
index d8814ff..c2e7966 100644
--- a/src/shadow.h
+++ b/src/shadow.h
@@ -1,7 +1,7 @@
 /* Copyright (C) 2005 Gerd Fleischer <[email protected]>
  * Copyright (C) 2003 by Sandro Giessl
  * based on the nice CVS KDesktop KShadowEngine class. thanks!
- * looking forward to see KShadowEngine in kdefx somewhen btw.. :)
+ * looking forward to see KShadowEngine in tdefx somewhen btw.. :)
  * ------------------------------------------------------------------------
  * these are the original copyright notes:
  * This file is proposed to be part of the KDE libraries.