diff options
author | Mavridis Philippe <mavridisf@gmail.com> | 2021-06-26 16:07:50 +0300 |
---|---|---|
committer | Mavridis Philippe <mavridisf@gmail.com> | 2021-06-26 16:35:30 +0300 |
commit | ed38fe03463d5de3c7b0ebd4034ad93eabdd2fde (patch) | |
tree | 87a9c58300ae14cd987015b3f7506c65b03715d5 /client | |
parent | 2bc11f9dc783f26bf99f44515e92e49e8d2348fc (diff) | |
download | twin-style-dekorator-ed38fe03463d5de3c7b0ebd4034ad93eabdd2fde.tar.gz twin-style-dekorator-ed38fe03463d5de3c7b0ebd4034ad93eabdd2fde.zip |
Conversion KDE3→TDE
Signed-off-by: Mavridis Philippe <mavridisf@gmail.com>
Diffstat (limited to 'client')
-rw-r--r-- | client/Makefile.am | 20 | ||||
-rw-r--r-- | client/Makefile.in | 134 | ||||
-rw-r--r-- | client/config/Makefile.am | 14 | ||||
-rw-r--r-- | client/config/Makefile.in | 116 | ||||
-rw-r--r-- | client/config/configdialog.ui | 8 | ||||
-rw-r--r-- | client/config/deKoratorconfig.cc | 20 | ||||
-rw-r--r-- | client/config/deKoratorconfig.h | 10 | ||||
-rw-r--r-- | client/config/themes.cpp | 28 | ||||
-rw-r--r-- | client/config/themes.h | 8 | ||||
-rw-r--r-- | client/config/themes.moc.cc | 10 | ||||
-rw-r--r-- | client/deKorator.desktop | 2 | ||||
-rw-r--r-- | client/deKoratorclient.cc | 14 | ||||
-rw-r--r-- | client/deKoratorclient.h | 10 | ||||
-rw-r--r-- | client/themes.moc.cc | 10 |
14 files changed, 202 insertions, 202 deletions
diff --git a/client/Makefile.am b/client/Makefile.am index 931162a..e566ed1 100644 --- a/client/Makefile.am +++ b/client/Makefile.am @@ -4,20 +4,20 @@ SUBDIRS = config KDE_CXXFLAGS = -DQT_PLUGIN -INCLUDES = $(all_includes) -I$(kde_includes)/kwin +INCLUDES = $(all_includes) -I$(kde_includes)/twin -kwindir = $(kde_datadir)/kwin/ -kwin_DATA = deKorator.desktop +twindir = $(kde_datadir)/twin/ +twin_DATA = deKorator.desktop noinst_HEADERS = deKoratorclient.h shadow.h -kde_module_LTLIBRARIES = kwin3_deKorator.la -kwin3_deKorator_la_SOURCES = deKoratorclient.cc shadow.cpp -kwin3_deKorator_la_LIBADD = $(kde_libraries)/libkdecorations.la -kwin3_deKorator_la_LDFLAGS = -module $(all_libraries) $(KDE_PLUGIN) -lkdecore -kwin3_deKorator_la_METASOURCES = AUTO +kde_module_LTLIBRARIES = twin3_deKorator.la +twin3_deKorator_la_SOURCES = deKoratorclient.cc shadow.cpp +twin3_deKorator_la_LIBADD = $(kde_libraries)/libtdecorations.la +twin3_deKorator_la_LDFLAGS = -module $(all_libraries) $(KDE_PLUGIN) -ltdecore +twin3_deKorator_la_METASOURCES = AUTO -DISTCLEANFILES = $(kwin3_deKorator_la_METASOURCES) +DISTCLEANFILES = $(twin3_deKorator_la_METASOURCES) messages: - $(XGETTEXT) *.cpp -o $(podir)/kwin_deKorator.po + $(XGETTEXT) *.cpp -o $(podir)/twin_deKorator.po diff --git a/client/Makefile.in b/client/Makefile.in index 4abd438..05b4b81 100644 --- a/client/Makefile.in +++ b/client/Makefile.in @@ -57,17 +57,17 @@ am__vpath_adj = case $$p in \ *) f=$$p;; \ esac; am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; -am__installdirs = "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(kwindir)" +am__installdirs = "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(twindir)" kde_moduleLTLIBRARIES_INSTALL = $(INSTALL) LTLIBRARIES = $(kde_module_LTLIBRARIES) -kwin3_deKorator_la_DEPENDENCIES = $(kde_libraries)/libkdecorations.la -am_kwin3_deKorator_la_OBJECTS = deKoratorclient.lo shadow.lo -#>- kwin3_deKorator_la_OBJECTS = $(am_kwin3_deKorator_la_OBJECTS) +twin3_deKorator_la_DEPENDENCIES = $(kde_libraries)/libtdecorations.la +am_twin3_deKorator_la_OBJECTS = deKoratorclient.lo shadow.lo +#>- twin3_deKorator_la_OBJECTS = $(am_twin3_deKorator_la_OBJECTS) #>+ 4 -kwin3_deKorator_la_final_OBJECTS = deKoratorclient.lo shadow.lo -kwin3_deKorator_la_nofinal_OBJECTS = deKoratorclient.lo shadow.lo -@KDE_USE_FINAL_FALSE@kwin3_deKorator_la_OBJECTS = $(kwin3_deKorator_la_nofinal_OBJECTS) -@KDE_USE_FINAL_TRUE@kwin3_deKorator_la_OBJECTS = $(kwin3_deKorator_la_final_OBJECTS) +twin3_deKorator_la_final_OBJECTS = deKoratorclient.lo shadow.lo +twin3_deKorator_la_nofinal_OBJECTS = deKoratorclient.lo shadow.lo +@KDE_USE_FINAL_FALSE@twin3_deKorator_la_OBJECTS = $(twin3_deKorator_la_nofinal_OBJECTS) +@KDE_USE_FINAL_TRUE@twin3_deKorator_la_OBJECTS = $(twin3_deKorator_la_final_OBJECTS) DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/admin/depcomp am__depfiles_maybe = depfiles @@ -89,8 +89,8 @@ CXXLD = $(CXX) #>+ 2 CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \ $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -SOURCES = $(kwin3_deKorator_la_SOURCES) -DIST_SOURCES = $(kwin3_deKorator_la_SOURCES) +SOURCES = $(twin3_deKorator_la_SOURCES) +DIST_SOURCES = $(twin3_deKorator_la_SOURCES) #>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ #>- html-recursive info-recursive install-data-recursive \ #>- install-exec-recursive install-info-recursive \ @@ -104,8 +104,8 @@ 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 -kwinDATA_INSTALL = $(INSTALL_DATA) -DATA = $(kwin_DATA) +twinDATA_INSTALL = $(INSTALL_DATA) +DATA = $(twin_DATA) HEADERS = $(noinst_HEADERS) ETAGS = etags CTAGS = ctags @@ -198,24 +198,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@ @@ -226,7 +226,7 @@ LIB_XRENDER = @LIB_XRENDER@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ -MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ +MAKETDEWIDGETS = @MAKETDEWIDGETS@ MCOPIDL = @MCOPIDL@ MEINPROC = @MEINPROC@ MOC = @MOC@ @@ -325,7 +325,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@ localstatedir = @localstatedir@ @@ -354,16 +354,16 @@ xdg_menudir = @xdg_menudir@ AUTOMAKE_OPTIONS = foreign SUBDIRS = config KDE_CXXFLAGS = -DQT_PLUGIN -INCLUDES = $(all_includes) -I$(kde_includes)/kwin -kwindir = $(kde_datadir)/kwin/ -kwin_DATA = deKorator.desktop +INCLUDES = $(all_includes) -I$(kde_includes)/twin +twindir = $(kde_datadir)/twin/ +twin_DATA = deKorator.desktop noinst_HEADERS = deKoratorclient.h shadow.h -kde_module_LTLIBRARIES = kwin3_deKorator.la -kwin3_deKorator_la_SOURCES = deKoratorclient.cc shadow.cpp -kwin3_deKorator_la_LIBADD = $(kde_libraries)/libkdecorations.la -kwin3_deKorator_la_LDFLAGS = -module $(all_libraries) $(KDE_PLUGIN) -lkdecore -#>- kwin3_deKorator_la_METASOURCES = AUTO -DISTCLEANFILES = $(kwin3_deKorator_la_METASOURCES) +kde_module_LTLIBRARIES = twin3_deKorator.la +twin3_deKorator_la_SOURCES = deKoratorclient.cc shadow.cpp +twin3_deKorator_la_LIBADD = $(kde_libraries)/libtdecorations.la +twin3_deKorator_la_LDFLAGS = -module $(all_libraries) $(KDE_PLUGIN) -ltdecore +#>- twin3_deKorator_la_METASOURCES = AUTO +DISTCLEANFILES = $(twin3_deKorator_la_METASOURCES) #>- all: all-recursive #>+ 1 all: docs-am all-recursive @@ -439,11 +439,11 @@ clean-kde_moduleLTLIBRARIES: echo "rm -f \"$${dir}/so_locations\""; \ rm -f "$${dir}/so_locations"; \ done -#>- kwin3_deKorator.la: $(kwin3_deKorator_la_OBJECTS) $(kwin3_deKorator_la_DEPENDENCIES) +#>- twin3_deKorator.la: $(twin3_deKorator_la_OBJECTS) $(twin3_deKorator_la_DEPENDENCIES) #>+ 2 -@KDE_USE_CLOSURE_TRUE@kwin3_deKorator.la: kwin3_deKorator.la.closure $(kwin3_deKorator_la_OBJECTS) $(kwin3_deKorator_la_DEPENDENCIES) -@KDE_USE_CLOSURE_FALSE@kwin3_deKorator.la: $(kwin3_deKorator_la_OBJECTS) $(kwin3_deKorator_la_DEPENDENCIES) - $(CXXLINK) -rpath $(kde_moduledir) $(kwin3_deKorator_la_LDFLAGS) $(kwin3_deKorator_la_OBJECTS) $(kwin3_deKorator_la_LIBADD) $(LIBS) +@KDE_USE_CLOSURE_TRUE@twin3_deKorator.la: twin3_deKorator.la.closure $(twin3_deKorator_la_OBJECTS) $(twin3_deKorator_la_DEPENDENCIES) +@KDE_USE_CLOSURE_FALSE@twin3_deKorator.la: $(twin3_deKorator_la_OBJECTS) $(twin3_deKorator_la_DEPENDENCIES) + $(CXXLINK) -rpath $(kde_moduledir) $(twin3_deKorator_la_LDFLAGS) $(twin3_deKorator_la_OBJECTS) $(twin3_deKorator_la_LIBADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -505,22 +505,22 @@ clean-libtool: distclean-libtool: -rm -f libtool uninstall-info-am: -install-kwinDATA: $(kwin_DATA) +install-twinDATA: $(twin_DATA) @$(NORMAL_INSTALL) - test -z "$(kwindir)" || $(mkdir_p) "$(DESTDIR)$(kwindir)" - @list='$(kwin_DATA)'; for p in $$list; do \ + test -z "$(twindir)" || $(mkdir_p) "$(DESTDIR)$(twindir)" + @list='$(twin_DATA)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ f=$(am__strip_dir) \ - echo " $(kwinDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(kwindir)/$$f'"; \ - $(kwinDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(kwindir)/$$f"; \ + echo " $(twinDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(twindir)/$$f'"; \ + $(twinDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(twindir)/$$f"; \ done -uninstall-kwinDATA: +uninstall-twinDATA: @$(NORMAL_UNINSTALL) - @list='$(kwin_DATA)'; for p in $$list; do \ + @list='$(twin_DATA)'; for p in $$list; do \ f=$(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(kwindir)/$$f'"; \ - rm -f "$(DESTDIR)$(kwindir)/$$f"; \ + echo " rm -f '$(DESTDIR)$(twindir)/$$f'"; \ + rm -f "$(DESTDIR)$(twindir)/$$f"; \ done # This directory's subdirectories are mostly independent; you can cd @@ -702,7 +702,7 @@ check: check-recursive all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS) installdirs: installdirs-recursive installdirs-am: - for dir in "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(kwindir)"; do \ + for dir in "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(twindir)"; do \ test -z "$$dir" || $(mkdir_p) "$$dir"; \ done install: install-recursive @@ -756,9 +756,9 @@ info: info-recursive info-am: -#>- install-data-am: install-kde_moduleLTLIBRARIES install-kwinDATA +#>- install-data-am: install-kde_moduleLTLIBRARIES install-twinDATA #>+ 1 -install-data-am: install-kwinDATA +install-data-am: install-twinDATA #>- install-exec-am: #>+ 1 @@ -789,7 +789,7 @@ ps: ps-recursive ps-am: uninstall-am: uninstall-info-am uninstall-kde_moduleLTLIBRARIES \ - uninstall-kwinDATA + uninstall-twinDATA uninstall-info: uninstall-info-recursive @@ -800,29 +800,29 @@ uninstall-info: uninstall-info-recursive distclean-recursive distclean-tags distdir dvi dvi-am html \ 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-kwinDATA \ + install-info-am install-kde_moduleLTLIBRARIES install-twinDATA \ install-man install-strip installcheck installcheck-am \ installdirs installdirs-am maintainer-clean \ maintainer-clean-generic maintainer-clean-recursive \ mostlyclean mostlyclean-compile mostlyclean-generic \ mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \ tags tags-recursive uninstall uninstall-am uninstall-info-am \ - uninstall-kde_moduleLTLIBRARIES uninstall-kwinDATA + uninstall-kde_moduleLTLIBRARIES uninstall-twinDATA messages: - $(XGETTEXT) *.cpp -o $(podir)/kwin_deKorator.po + $(XGETTEXT) *.cpp -o $(podir)/twin_deKorator.po # 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_deKorator.la.closure: $(kwin3_deKorator_la_OBJECTS) $(kwin3_deKorator_la_DEPENDENCIES) - @echo "int main() {return 0;}" > kwin3_deKorator_la_closure.cc - @$(LTCXXCOMPILE) -c kwin3_deKorator_la_closure.cc - $(CXXLINK) kwin3_deKorator_la_closure.lo $(kwin3_deKorator_la_LDFLAGS) $(kwin3_deKorator_la_OBJECTS) $(kwin3_deKorator_la_LIBADD) $(LIBS) - @rm -f kwin3_deKorator_la_closure.* kwin3_deKorator.la.closure - @echo "timestamp" > kwin3_deKorator.la.closure +twin3_deKorator.la.closure: $(twin3_deKorator_la_OBJECTS) $(twin3_deKorator_la_DEPENDENCIES) + @echo "int main() {return 0;}" > twin3_deKorator_la_closure.cc + @$(LTCXXCOMPILE) -c twin3_deKorator_la_closure.cc + $(CXXLINK) twin3_deKorator_la_closure.lo $(twin3_deKorator_la_LDFLAGS) $(twin3_deKorator_la_OBJECTS) $(twin3_deKorator_la_LIBADD) $(LIBS) + @rm -f twin3_deKorator_la_closure.* twin3_deKorator.la.closure + @echo "timestamp" > twin3_deKorator.la.closure #>+ 3 @@ -841,7 +841,7 @@ KDE_DIST=Makefile.in deKorator.desktop Makefile.am #>+ 3 clean-closures: - -rm -f kwin3_deKorator.la.closure + -rm -f twin3_deKorator.la.closure #>+ 2 docs-am: @@ -886,19 +886,19 @@ bcheck-am: #>+ 3 final: - $(MAKE) kwin3_deKorator_la_OBJECTS="$(kwin3_deKorator_la_final_OBJECTS)" all-am + $(MAKE) twin3_deKorator_la_OBJECTS="$(twin3_deKorator_la_final_OBJECTS)" all-am #>+ 3 final-install: - $(MAKE) kwin3_deKorator_la_OBJECTS="$(kwin3_deKorator_la_final_OBJECTS)" install-am + $(MAKE) twin3_deKorator_la_OBJECTS="$(twin3_deKorator_la_final_OBJECTS)" install-am #>+ 3 no-final: - $(MAKE) kwin3_deKorator_la_OBJECTS="$(kwin3_deKorator_la_nofinal_OBJECTS)" all-am + $(MAKE) twin3_deKorator_la_OBJECTS="$(twin3_deKorator_la_nofinal_OBJECTS)" all-am #>+ 3 no-final-install: - $(MAKE) kwin3_deKorator_la_OBJECTS="$(kwin3_deKorator_la_nofinal_OBJECTS)" install-am + $(MAKE) twin3_deKorator_la_OBJECTS="$(twin3_deKorator_la_nofinal_OBJECTS)" install-am #>+ 3 kde-rpo-clean: diff --git a/client/config/Makefile.am b/client/config/Makefile.am index de690eb..82f48dc 100644 --- a/client/config/Makefile.am +++ b/client/config/Makefile.am @@ -6,14 +6,14 @@ INCLUDES = $(all_includes) noinst_HEADERS = deKoratorconfig.h themes.h -kde_module_LTLIBRARIES = kwin_deKorator_config.la -kwin_deKorator_config_la_SOURCES = deKoratorconfig.cc configdialog.ui \ +kde_module_LTLIBRARIES = twin_deKorator_config.la +twin_deKorator_config_la_SOURCES = deKoratorconfig.cc configdialog.ui \ themes.cpp -kwin_deKorator_config_la_LDFLAGS = -module $(all_libraries) $(KDE_PLUGIN) -kwin_deKorator_config_la_LIBADD = $(LIB_KIO) $(LIB_KDEUI) -kwin_deKorator_config_la_METASOURCES = AUTO +twin_deKorator_config_la_LDFLAGS = -module $(all_libraries) $(KDE_PLUGIN) +twin_deKorator_config_la_LIBADD = $(LIB_TDEIO) $(LIB_TDEUI) +twin_deKorator_config_la_METASOURCES = AUTO -DISTCLEANFILES = $(kwin_deKorator_config_la_METASOURCES) +DISTCLEANFILES = $(twin_deKorator_config_la_METASOURCES) messages: - $(XGETTEXT) *.cpp -o $(podir)/kwin_deKorator_config.pot + $(XGETTEXT) *.cpp -o $(podir)/twin_deKorator_config.pot diff --git a/client/config/Makefile.in b/client/config/Makefile.in index ab4cbac..c1fbfeb 100644 --- a/client/config/Makefile.in +++ b/client/config/Makefile.in @@ -60,16 +60,16 @@ am__installdirs = "$(DESTDIR)$(kde_moduledir)" kde_moduleLTLIBRARIES_INSTALL = $(INSTALL) LTLIBRARIES = $(kde_module_LTLIBRARIES) am__DEPENDENCIES_1 = -kwin_deKorator_config_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \ +twin_deKorator_config_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) -am_kwin_deKorator_config_la_OBJECTS = deKoratorconfig.lo themes.lo -#>- kwin_deKorator_config_la_OBJECTS = \ -#>- $(am_kwin_deKorator_config_la_OBJECTS) +am_twin_deKorator_config_la_OBJECTS = deKoratorconfig.lo themes.lo +#>- twin_deKorator_config_la_OBJECTS = \ +#>- $(am_twin_deKorator_config_la_OBJECTS) #>+ 4 -kwin_deKorator_config_la_final_OBJECTS = kwin_deKorator_config_la.all_cc.lo themes.lo -kwin_deKorator_config_la_nofinal_OBJECTS = deKoratorconfig.lo themes.lo configdialog.lo -@KDE_USE_FINAL_FALSE@kwin_deKorator_config_la_OBJECTS = $(kwin_deKorator_config_la_nofinal_OBJECTS) -@KDE_USE_FINAL_TRUE@kwin_deKorator_config_la_OBJECTS = $(kwin_deKorator_config_la_final_OBJECTS) +twin_deKorator_config_la_final_OBJECTS = twin_deKorator_config_la.all_cc.lo themes.lo +twin_deKorator_config_la_nofinal_OBJECTS = deKoratorconfig.lo themes.lo configdialog.lo +@KDE_USE_FINAL_FALSE@twin_deKorator_config_la_OBJECTS = $(twin_deKorator_config_la_nofinal_OBJECTS) +@KDE_USE_FINAL_TRUE@twin_deKorator_config_la_OBJECTS = $(twin_deKorator_config_la_final_OBJECTS) DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/admin/depcomp am__depfiles_maybe = depfiles @@ -91,8 +91,8 @@ CXXLD = $(CXX) #>+ 2 CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \ $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -SOURCES = $(kwin_deKorator_config_la_SOURCES) -DIST_SOURCES = $(kwin_deKorator_config_la_SOURCES) +SOURCES = $(twin_deKorator_config_la_SOURCES) +DIST_SOURCES = $(twin_deKorator_config_la_SOURCES) HEADERS = $(noinst_HEADERS) ETAGS = etags CTAGS = ctags @@ -184,24 +184,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@ @@ -212,7 +212,7 @@ LIB_XRENDER = @LIB_XRENDER@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ -MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ +MAKETDEWIDGETS = @MAKETDEWIDGETS@ MCOPIDL = @MCOPIDL@ MEINPROC = @MEINPROC@ MOC = @MOC@ @@ -311,7 +311,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@ localstatedir = @localstatedir@ @@ -341,17 +341,17 @@ AUTOMAKE_OPTIONS = foreign KDE_CXXFLAGS = -DQT_PLUGIN INCLUDES = $(all_includes) noinst_HEADERS = deKoratorconfig.h themes.h -kde_module_LTLIBRARIES = kwin_deKorator_config.la -#>- kwin_deKorator_config_la_SOURCES = deKoratorconfig.cc configdialog.ui \ +kde_module_LTLIBRARIES = twin_deKorator_config.la +#>- twin_deKorator_config_la_SOURCES = deKoratorconfig.cc configdialog.ui \ #>- themes.cpp #>+ 2 -kwin_deKorator_config_la_SOURCES=deKoratorconfig.cc \ +twin_deKorator_config_la_SOURCES=deKoratorconfig.cc \ themes.cpp configdialog.cc -kwin_deKorator_config_la_LDFLAGS = -module $(all_libraries) $(KDE_PLUGIN) -kwin_deKorator_config_la_LIBADD = $(LIB_KIO) $(LIB_KDEUI) -#>- kwin_deKorator_config_la_METASOURCES = AUTO -DISTCLEANFILES = $(kwin_deKorator_config_la_METASOURCES) +twin_deKorator_config_la_LDFLAGS = -module $(all_libraries) $(KDE_PLUGIN) +twin_deKorator_config_la_LIBADD = $(LIB_TDEIO) $(LIB_TDEUI) +#>- twin_deKorator_config_la_METASOURCES = AUTO +DISTCLEANFILES = $(twin_deKorator_config_la_METASOURCES) #>- all: all-am #>+ 1 all: docs-am all-am @@ -427,11 +427,11 @@ clean-kde_moduleLTLIBRARIES: echo "rm -f \"$${dir}/so_locations\""; \ rm -f "$${dir}/so_locations"; \ done -#>- kwin_deKorator_config.la: $(kwin_deKorator_config_la_OBJECTS) $(kwin_deKorator_config_la_DEPENDENCIES) +#>- twin_deKorator_config.la: $(twin_deKorator_config_la_OBJECTS) $(twin_deKorator_config_la_DEPENDENCIES) #>+ 2 -@KDE_USE_CLOSURE_TRUE@kwin_deKorator_config.la: kwin_deKorator_config.la.closure $(kwin_deKorator_config_la_OBJECTS) $(kwin_deKorator_config_la_DEPENDENCIES) -@KDE_USE_CLOSURE_FALSE@kwin_deKorator_config.la: $(kwin_deKorator_config_la_OBJECTS) $(kwin_deKorator_config_la_DEPENDENCIES) - $(CXXLINK) -rpath $(kde_moduledir) $(kwin_deKorator_config_la_LDFLAGS) $(kwin_deKorator_config_la_OBJECTS) $(kwin_deKorator_config_la_LIBADD) $(LIBS) +@KDE_USE_CLOSURE_TRUE@twin_deKorator_config.la: twin_deKorator_config.la.closure $(twin_deKorator_config_la_OBJECTS) $(twin_deKorator_config_la_DEPENDENCIES) +@KDE_USE_CLOSURE_FALSE@twin_deKorator_config.la: $(twin_deKorator_config_la_OBJECTS) $(twin_deKorator_config_la_DEPENDENCIES) + $(CXXLINK) -rpath $(kde_moduledir) $(twin_deKorator_config_la_LDFLAGS) $(twin_deKorator_config_la_OBJECTS) $(twin_deKorator_config_la_LIBADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -676,18 +676,18 @@ uninstall-am: uninstall-info-am uninstall-kde_moduleLTLIBRARIES messages: - $(XGETTEXT) *.cpp -o $(podir)/kwin_deKorator_config.pot + $(XGETTEXT) *.cpp -o $(podir)/twin_deKorator_config.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 -kwin_deKorator_config.la.closure: $(kwin_deKorator_config_la_OBJECTS) $(kwin_deKorator_config_la_DEPENDENCIES) - @echo "int main() {return 0;}" > kwin_deKorator_config_la_closure.cc - @$(LTCXXCOMPILE) -c kwin_deKorator_config_la_closure.cc - $(CXXLINK) kwin_deKorator_config_la_closure.lo $(kwin_deKorator_config_la_LDFLAGS) $(kwin_deKorator_config_la_OBJECTS) $(kwin_deKorator_config_la_LIBADD) $(LIBS) - @rm -f kwin_deKorator_config_la_closure.* kwin_deKorator_config.la.closure - @echo "timestamp" > kwin_deKorator_config.la.closure +twin_deKorator_config.la.closure: $(twin_deKorator_config_la_OBJECTS) $(twin_deKorator_config_la_DEPENDENCIES) + @echo "int main() {return 0;}" > twin_deKorator_config_la_closure.cc + @$(LTCXXCOMPILE) -c twin_deKorator_config_la_closure.cc + $(CXXLINK) twin_deKorator_config_la_closure.lo $(twin_deKorator_config_la_LDFLAGS) $(twin_deKorator_config_la_OBJECTS) $(twin_deKorator_config_la_LIBADD) $(LIBS) + @rm -f twin_deKorator_config_la_closure.* twin_deKorator_config.la.closure + @echo "timestamp" > twin_deKorator_config.la.closure #>+ 3 @@ -718,7 +718,7 @@ clean-ui: #>+ 3 clean-closures: - -rm -f kwin_deKorator_config.la.closure + -rm -f twin_deKorator_config.la.closure #>+ 2 docs-am: @@ -762,36 +762,36 @@ bcheck-am: #>+ 11 -kwin_deKorator_config_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/deKoratorconfig.cc configdialog.cc themes.moc deKoratorconfig.moc - @echo 'creating kwin_deKorator_config_la.all_cc.cc ...'; \ - rm -f kwin_deKorator_config_la.all_cc.files kwin_deKorator_config_la.all_cc.final; \ - echo "#define KDE_USE_FINAL 1" >> kwin_deKorator_config_la.all_cc.final; \ +twin_deKorator_config_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/deKoratorconfig.cc configdialog.cc themes.moc deKoratorconfig.moc + @echo 'creating twin_deKorator_config_la.all_cc.cc ...'; \ + rm -f twin_deKorator_config_la.all_cc.files twin_deKorator_config_la.all_cc.final; \ + echo "#define KDE_USE_FINAL 1" >> twin_deKorator_config_la.all_cc.final; \ for file in deKoratorconfig.cc configdialog.cc ; do \ - echo "#include \"$$file\"" >> kwin_deKorator_config_la.all_cc.files; \ - test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kwin_deKorator_config_la.all_cc.final; \ + echo "#include \"$$file\"" >> twin_deKorator_config_la.all_cc.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> twin_deKorator_config_la.all_cc.final; \ done; \ - cat kwin_deKorator_config_la.all_cc.final kwin_deKorator_config_la.all_cc.files > kwin_deKorator_config_la.all_cc.cc; \ - rm -f kwin_deKorator_config_la.all_cc.final kwin_deKorator_config_la.all_cc.files + cat twin_deKorator_config_la.all_cc.final twin_deKorator_config_la.all_cc.files > twin_deKorator_config_la.all_cc.cc; \ + rm -f twin_deKorator_config_la.all_cc.final twin_deKorator_config_la.all_cc.files #>+ 3 clean-final: - -rm -f kwin_deKorator_config_la.all_cc.cc + -rm -f twin_deKorator_config_la.all_cc.cc #>+ 3 final: - $(MAKE) kwin_deKorator_config_la_OBJECTS="$(kwin_deKorator_config_la_final_OBJECTS)" all-am + $(MAKE) twin_deKorator_config_la_OBJECTS="$(twin_deKorator_config_la_final_OBJECTS)" all-am #>+ 3 final-install: - $(MAKE) kwin_deKorator_config_la_OBJECTS="$(kwin_deKorator_config_la_final_OBJECTS)" install-am + $(MAKE) twin_deKorator_config_la_OBJECTS="$(twin_deKorator_config_la_final_OBJECTS)" install-am #>+ 3 no-final: - $(MAKE) kwin_deKorator_config_la_OBJECTS="$(kwin_deKorator_config_la_nofinal_OBJECTS)" all-am + $(MAKE) twin_deKorator_config_la_OBJECTS="$(twin_deKorator_config_la_nofinal_OBJECTS)" all-am #>+ 3 no-final-install: - $(MAKE) kwin_deKorator_config_la_OBJECTS="$(kwin_deKorator_config_la_nofinal_OBJECTS)" install-am + $(MAKE) twin_deKorator_config_la_OBJECTS="$(twin_deKorator_config_la_nofinal_OBJECTS)" install-am #>+ 3 kde-rpo-clean: @@ -811,7 +811,7 @@ themes.o: themes.moc configdialog.cc: $(srcdir)/configdialog.ui configdialog.h configdialog.moc rm -f configdialog.cc echo '#include <kdialog.h>' > configdialog.cc - echo '#include <klocale.h>' >> configdialog.cc + echo '#include <tdelocale.h>' >> configdialog.cc $(UIC) -tr ${UIC_TR} -i configdialog.h $(srcdir)/configdialog.ui > configdialog.cc.temp ; ret=$$?; \ $(PERL) -pe "s,${UIC_TR}( \"\" ),QString::null,g" configdialog.cc.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.cc ;\ rm -f configdialog.cc.temp ;\ diff --git a/client/config/configdialog.ui b/client/config/configdialog.ui index bce071a..3bb9950 100644 --- a/client/config/configdialog.ui +++ b/client/config/configdialog.ui @@ -1685,7 +1685,7 @@ <bool>true</bool> </property> <property name="whatsThis" stdset="0"> - <string>This is a Screen shot of what KDM will look like when you go to log in.</string> + <string>This is a Screen shot of what TDM will look like when you go to log in.</string> </property> </widget> <spacer> @@ -1709,7 +1709,7 @@ </widget> </vbox> </widget> - <widget class="KListView"> + <widget class="TDEListView"> <column> <property name="text"> <string>Theme Name</string> @@ -1787,7 +1787,7 @@ </property> <property name="text"> <string>****** Summary ****** -deKorator is a kwin engine that takes several user-defined images and presents +deKorator is a twin engine that takes several user-defined images and presents them as a window decoration. deKorator expects to find those in a theme. Here is a guide for building such a theme. @@ -2159,7 +2159,7 @@ Email: <a href="mailto:moty.rahamim@gmail.com"><font color="#ff0000"> <includehint>kurlrequester.h</includehint> <includehint>klineedit.h</includehint> <includehint>kpushbutton.h</includehint> - <includehint>klistview.h</includehint> + <includehint>tdelistview.h</includehint> <includehint>kactivelabel.h</includehint> </includehints> </UI> diff --git a/client/config/deKoratorconfig.cc b/client/config/deKoratorconfig.cc index cae4fa9..8373530 100644 --- a/client/config/deKoratorconfig.cc +++ b/client/config/deKoratorconfig.cc @@ -31,9 +31,9 @@ // Boston, MA 02110-1301, USA. /////////////////////////////////////////////////////////////////////// -#include <kconfig.h> -#include <klocale.h> -#include <kglobal.h> +#include <tdeconfig.h> +#include <tdelocale.h> +#include <tdeglobal.h> #include <tqbuttongroup.h> #include <tqgroupbox.h> #include <tqradiobutton.h> @@ -43,7 +43,7 @@ #include <tqspinbox.h> #include <tqcheckbox.h> #include <kcolorbutton.h> -#include <klistview.h> +#include <tdelistview.h> #include "deKoratorconfig.h" #include "configdialog.h" @@ -56,12 +56,12 @@ // ------------- // Constructor -DeKoratorConfig::DeKoratorConfig( KConfig* config, TQWidget* parent ) +DeKoratorConfig::DeKoratorConfig( TDEConfig* config, TQWidget* parent ) : TQObject( parent ), config_( 0 ), dialog_( 0 ) { // create the configuration object - config_ = new KConfig( "kwindeKoratorrc" ); - KGlobal::locale() ->insertCatalogue( "kwin_deKorator_config" ); + config_ = new TDEConfig( "twindeKoratorrc" ); + TDEGlobal::locale() ->insertCatalogue( "twin_deKorator_config" ); @@ -181,7 +181,7 @@ void DeKoratorConfig::selectionChanged( int ) // ------ // Load configuration data -void DeKoratorConfig::load( KConfig* ) +void DeKoratorConfig::load( TDEConfig* ) { // misc config_->setGroup( "MISC" ); @@ -262,7 +262,7 @@ void DeKoratorConfig::load( KConfig* ) // ------ // Save configuration data -void DeKoratorConfig::save( KConfig* ) +void DeKoratorConfig::save( TDEConfig* ) { // misc config_->setGroup( "MISC" ); @@ -455,7 +455,7 @@ void DeKoratorConfig::setTheme() extern "C" { - TQObject * allocate_config( KConfig * config, TQWidget * parent ) + TQObject * allocate_config( TDEConfig * config, TQWidget * parent ) { return ( new DeKoratorConfig( config, parent ) ); } diff --git a/client/config/deKoratorconfig.h b/client/config/deKoratorconfig.h index 399002f..312026e 100644 --- a/client/config/deKoratorconfig.h +++ b/client/config/deKoratorconfig.h @@ -37,7 +37,7 @@ #include <tqobject.h> -class KConfig; +class TDEConfig; class ConfigDialog; class IconThemesConfig; @@ -45,15 +45,15 @@ class DeKoratorConfig : public TQObject { Q_OBJECT public: - DeKoratorConfig( KConfig* config, TQWidget* parent ); + DeKoratorConfig( TDEConfig* config, TQWidget* parent ); ~DeKoratorConfig(); signals: void changed(); public slots: - void load( KConfig* ); - void save( KConfig* ); + void load( TDEConfig* ); + void save( TDEConfig* ); void defaults(); @@ -64,7 +64,7 @@ protected slots: void removeSelectedTheme(); void setTheme(); private: - KConfig *config_; + TDEConfig *config_; IconThemesConfig *themes_; ConfigDialog *dialog_; }; diff --git a/client/config/themes.cpp b/client/config/themes.cpp index 4820954..0033f1b 100644 --- a/client/config/themes.cpp +++ b/client/config/themes.cpp @@ -42,22 +42,22 @@ #include <tqpushbutton.h> #include <kdebug.h> -#include <kapplication.h> +#include <tdeapplication.h> #include <kstandarddirs.h> #include <kservice.h> -#include <klocale.h> +#include <tdelocale.h> #include <ksimpleconfig.h> #undef Unsorted #include <kipc.h> -#include <klistview.h> +#include <tdelistview.h> #include <kurlrequesterdlg.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kprogress.h> #include <kiconloader.h> -#include <kio/job.h> -#include <kio/netaccess.h> +#include <tdeio/job.h> +#include <tdeio/netaccess.h> #include <ktar.h> #ifdef HAVE_LIBART @@ -77,7 +77,7 @@ // ---------- // -IconThemesConfig::IconThemesConfig( TQWidget *parent, KListView *themesView /*, TQPushButton *removethemeBtn*/ ) +IconThemesConfig::IconThemesConfig( TQWidget *parent, TDEListView *themesView /*, TQPushButton *removethemeBtn*/ ) { parent_ = parent; themesView_ = themesView; @@ -128,15 +128,15 @@ void IconThemesConfig::loadThemes() if ( ! TQDir( TQDir::homeDirPath() + "/.kde/share/apps/" ).exists( "deKorator" ) ) { tqWarning( "no dirs, will make them..." ); - KIO::mkdir( TQDir::homeDirPath() + "/.kde/share/apps/deKorator/" ); - KIO::mkdir( TQDir::homeDirPath() + "/.kde/share/apps/deKorator/themes/" ); + TDEIO::mkdir( TQDir::homeDirPath() + "/.kde/share/apps/deKorator/" ); + TDEIO::mkdir( TQDir::homeDirPath() + "/.kde/share/apps/deKorator/themes/" ); } else { tqWarning( "exist" ); } - themesDirs = KGlobal::dirs() ->findDirs( "data", "deKorator/themes" ) ; + themesDirs = TDEGlobal::dirs() ->findDirs( "data", "deKorator/themes" ) ; for ( it = themesDirs.begin(); it != themesDirs.end(); ++it ) { @@ -174,7 +174,7 @@ void IconThemesConfig::installNewTheme() // themeTmpFile contains the name of the downloaded file TQString themeTmpFile; - if ( !KIO::NetAccess::download( themeURL, themeTmpFile, parent_ ) ) + if ( !TDEIO::NetAccess::download( themeURL, themeTmpFile, parent_ ) ) { TQString sorryText; if ( themeURL.isLocalFile() ) @@ -193,7 +193,7 @@ void IconThemesConfig::installNewTheme() TQString invalidArch( i18n( "The file is not a valid deKorator theme archive." ) ); KMessageBox::error( parent_, invalidArch ); - KIO::NetAccess::removeTempFile( themeTmpFile ); + TDEIO::NetAccess::removeTempFile( themeTmpFile ); return ; } @@ -207,7 +207,7 @@ void IconThemesConfig::installNewTheme() KMessageBox::error( parent_, somethingWrong ); } - KIO::NetAccess::removeTempFile( themeTmpFile ); + TDEIO::NetAccess::removeTempFile( themeTmpFile ); loadThemes(); @@ -341,7 +341,7 @@ void IconThemesConfig::removeSelectedTheme() TQDir dir = TQDir( deldirStr ); dir.rename( deldirStr, deldirStr + "del" ); - KIO::del( KURL( deldirStr + "del" ) ); + TDEIO::del( KURL( deldirStr + "del" ) ); loadThemes(); } diff --git a/client/config/themes.h b/client/config/themes.h index 238bbe1..e7214b0 100644 --- a/client/config/themes.h +++ b/client/config/themes.h @@ -34,9 +34,9 @@ #ifndef ICONTHEMES_H #define ICONTHEMES_H -#include <kcmodule.h> +#include <tdecmodule.h> #include <tqmap.h> -#include <klistview.h> +#include <tdelistview.h> class TQPushButton; class DeviceManager; @@ -50,7 +50,7 @@ class IconThemesConfig : public TQObject Q_OBJECT public: - IconThemesConfig( TQWidget *parent, KListView *themesView/*, TQPushButton *removethemeBtn*/ ); + IconThemesConfig( TQWidget *parent, TDEListView *themesView/*, TQPushButton *removethemeBtn*/ ); virtual ~IconThemesConfig(); void loadThemes(); @@ -63,7 +63,7 @@ public: private: TQListViewItem *iconThemeItem( const TQString &name ); - KListView *themesView_; + TDEListView *themesView_; TQWidget *parent_; //TQPushButton *removeThemeBtn_; TQListViewItem *m_defaultTheme; diff --git a/client/config/themes.moc.cc b/client/config/themes.moc.cc index d64c1a9..9e25331 100644 --- a/client/config/themes.moc.cc +++ b/client/config/themes.moc.cc @@ -51,7 +51,7 @@ TQMetaObject* IconThemesConfig::staticMetaObject() { if ( metaObj ) return metaObj; - TQMetaObject* parentObject = KCModule::staticMetaObject(); + TQMetaObject* parentObject = TDECModule::staticMetaObject(); static const TQUParameter param_slot_0[] = { { "item", &static_QUType_ptr, "TQListViewItem", TQUParameter::In } }; @@ -80,7 +80,7 @@ void* IconThemesConfig::tqt_cast( const char* clname ) { if ( !qstrcmp( clname, "IconThemesConfig" ) ) return this; - return KCModule::tqt_cast( clname ); + return TDECModule::tqt_cast( clname ); } bool IconThemesConfig::tqt_invoke( int _id, TQUObject* _o ) @@ -90,20 +90,20 @@ bool IconThemesConfig::tqt_invoke( int _id, TQUObject* _o ) case 1: installNewTheme(); break; case 2: removeSelectedTheme(); break; default: - return KCModule::tqt_invoke( _id, _o ); + return TDECModule::tqt_invoke( _id, _o ); } return TRUE; } bool IconThemesConfig::tqt_emit( int _id, TQUObject* _o ) { - return KCModule::tqt_emit(_id,_o); + return TDECModule::tqt_emit(_id,_o); } #ifndef QT_NO_PROPERTIES bool IconThemesConfig::tqt_property( int id, int f, TQVariant* v) { - return KCModule::tqt_property( id, f, v); + return TDECModule::tqt_property( id, f, v); } bool IconThemesConfig::tqt_static_property( TQObject* , int , int , TQVariant* ){ return FALSE; } diff --git a/client/deKorator.desktop b/client/deKorator.desktop index 62e2b0c..afc4c60 100644 --- a/client/deKorator.desktop +++ b/client/deKorator.desktop @@ -2,4 +2,4 @@ [Desktop Entry] Encoding=UTF-8 Name=DeKorator -X-KDE-Library=kwin3_deKorator +X-TDE-Library=twin3_deKorator diff --git a/client/deKoratorclient.cc b/client/deKoratorclient.cc index 8f6d87c..c92cb02 100644 --- a/client/deKoratorclient.cc +++ b/client/deKoratorclient.cc @@ -327,7 +327,7 @@ bool DeKoratorFactory::reset( unsigned long changed ) bool DeKoratorFactory::readConfig() { // create a config object - KConfig config( "kwindeKoratorrc" ); + TDEConfig config( "twindeKoratorrc" ); TQColor col = TQColor( 150, 150, 150 ); // grab settings @@ -827,7 +827,7 @@ void DeKoratorFactory::colorizePixmap( TQPixmap *pix, TQColor c, TQString colori if ( colorizeMethod == "Liquid Method" ) { img = pix->convertToImage(); - //KIconEffect::toGray( img, 1.0 ); + //TDEIconEffect::toGray( img, 1.0 ); if ( img.depth() != 32 ) img = img.convertDepth( 32 ); @@ -877,13 +877,13 @@ void DeKoratorFactory::colorizePixmap( TQPixmap *pix, TQColor c, TQString colori else if ( colorizeMethod == "Kde Method" ) { img = pix->convertToImage(); - KIconEffect::colorize( img, c, 1.0 ); + TDEIconEffect::colorize( img, c, 1.0 ); pix->convertFromImage( img, 0 ); } else if ( colorizeMethod == "Hue Adgustment" ) { img = pix->convertToImage(); - //KIconEffect::toGray( img, 1.0 ); + //TDEIconEffect::toGray( img, 1.0 ); if ( img.depth() != 32 ) img = img.convertDepth( 32 ); @@ -1493,7 +1493,7 @@ TQImage* DeKoratorButton::chooseRightHoverEffect( TQImage * img, TQString res ) else { if ( BUTTONHOVERTYPE == "To Gray" ) - KIconEffect::toGray( *img, EFFECTAMOUNT ); + TDEIconEffect::toGray( *img, EFFECTAMOUNT ); else if ( BUTTONHOVERTYPE == "Colorize" ) { TQColor col = client_->isActive() ? ACTIVEHIGHLIGHTCOLOR : INACTIVEHIGHLIGHTCOLOR; @@ -1504,9 +1504,9 @@ TQImage* DeKoratorButton::chooseRightHoverEffect( TQImage * img, TQString res ) *img = pix.convertToImage(); } else if ( BUTTONHOVERTYPE == "DeSaturate" ) - KIconEffect::deSaturate( *img, EFFECTAMOUNT ); + TDEIconEffect::deSaturate( *img, EFFECTAMOUNT ); else if ( BUTTONHOVERTYPE == "To Gamma" ) - KIconEffect::toGamma( *img, EFFECTAMOUNT ); + TDEIconEffect::toGamma( *img, EFFECTAMOUNT ); } return img; } diff --git a/client/deKoratorclient.h b/client/deKoratorclient.h index d1bbede..9d5130d 100644 --- a/client/deKoratorclient.h +++ b/client/deKoratorclient.h @@ -48,11 +48,11 @@ #include <kdecoration.h> #include <kdecorationfactory.h> -#include <kconfig.h> -#include <kdeversion.h> -#include <kglobal.h> -#include <kglobalsettings.h> -#include <klocale.h> +#include <tdeconfig.h> +#include <tdeversion.h> +#include <tdeglobal.h> +#include <tdeglobalsettings.h> +#include <tdelocale.h> #include <kiconeffect.h> #include <kimageeffect.h> diff --git a/client/themes.moc.cc b/client/themes.moc.cc index 6d8ec8a..f685683 100644 --- a/client/themes.moc.cc +++ b/client/themes.moc.cc @@ -51,7 +51,7 @@ TQMetaObject* IconThemesConfig::staticMetaObject() { if ( metaObj ) return metaObj; - TQMetaObject* parentObject = KCModule::staticMetaObject(); + TQMetaObject* parentObject = TDECModule::staticMetaObject(); static const TQUParameter param_slot_0[] = { { "item", &static_QUType_ptr, "TQListViewItem", TQUParameter::In } }; @@ -80,7 +80,7 @@ void* IconThemesConfig::tqt_cast( const char* clname ) { if ( !qstrcmp( clname, "IconThemesConfig" ) ) return this; - return KCModule::tqt_cast( clname ); + return TDECModule::tqt_cast( clname ); } bool IconThemesConfig::tqt_invoke( int _id, TQUObject* _o ) @@ -90,20 +90,20 @@ bool IconThemesConfig::tqt_invoke( int _id, TQUObject* _o ) case 1: installNewTheme(); break; case 2: removeSelectedTheme(); break; default: - return KCModule::tqt_invoke( _id, _o ); + return TDECModule::tqt_invoke( _id, _o ); } return TRUE; } bool IconThemesConfig::tqt_emit( int _id, TQUObject* _o ) { - return KCModule::tqt_emit(_id,_o); + return TDECModule::tqt_emit(_id,_o); } #ifndef QT_NO_PROPERTIES bool IconThemesConfig::tqt_property( int id, int f, TQVariant* v) { - return KCModule::tqt_property( id, f, v); + return TDECModule::tqt_property( id, f, v); } bool IconThemesConfig::tqt_static_property( TQObject* , int , int , TQVariant* ){ return FALSE; } |