summaryrefslogtreecommitdiffstats
path: root/malloryclient/config
diff options
context:
space:
mode:
Diffstat (limited to 'malloryclient/config')
-rw-r--r--malloryclient/config/.deps/configdialog.Plo10
-rw-r--r--malloryclient/config/.deps/malloryconfig.Plo26
-rw-r--r--malloryclient/config/Makefile122
-rw-r--r--malloryclient/config/Makefile.am26
-rw-r--r--malloryclient/config/Makefile.in116
-rw-r--r--malloryclient/config/malloryconfig.cpp18
-rw-r--r--malloryclient/config/malloryconfig.h10
7 files changed, 164 insertions, 164 deletions
diff --git a/malloryclient/config/.deps/configdialog.Plo b/malloryclient/config/.deps/configdialog.Plo
index 613c17c..e4cb4ca 100644
--- a/malloryclient/config/.deps/configdialog.Plo
+++ b/malloryclient/config/.deps/configdialog.Plo
@@ -1,5 +1,5 @@
configdialog.lo .libs/configdialog.o: configdialog.cpp \
- /opt/kde3/include/klocale.h /usr/lib/qt3/include/ntqstring.h \
+ /opt/kde3/include/tdelocale.h /usr/lib/qt3/include/ntqstring.h \
/usr/lib/qt3/include/ntqcstring.h /usr/lib/qt3/include/ntqmemarray.h \
/usr/lib/qt3/include/ntqgarray.h /usr/lib/qt3/include/ntqshared.h \
/usr/lib/qt3/include/ntqglobal.h /usr/lib/qt3/include/ntqconfig.h \
@@ -67,7 +67,7 @@ configdialog.lo .libs/configdialog.o: configdialog.cpp \
/usr/include/g++/bits/stl_algo.h /usr/include/g++/bits/stl_heap.h \
/usr/include/g++/bits/stl_tempbuf.h \
/usr/include/g++/bits/basic_string.tcc \
- /opt/kde3/include/kdelibs_export.h /opt/kde3/include/kdemacros.h \
+ /opt/kde3/include/tdelibs_export.h /opt/kde3/include/tdemacros.h \
configdialog.h /usr/lib/qt3/include/ntqvariant.h \
/usr/lib/qt3/include/ntqvaluelist.h /usr/lib/qt3/include/ntqtl.h \
/usr/lib/qt3/include/ntqtextstream.h /usr/lib/qt3/include/ntqiodevice.h \
@@ -129,7 +129,7 @@ configdialog.lo .libs/configdialog.o: configdialog.cpp \
/usr/lib/qt3/include/private/qucomextra_p.h \
/usr/lib/qt3/include/private/qucom_p.h /usr/lib/qt3/include/ntquuid.h
-/opt/kde3/include/klocale.h:
+/opt/kde3/include/tdelocale.h:
/usr/lib/qt3/include/ntqstring.h:
@@ -359,9 +359,9 @@ configdialog.lo .libs/configdialog.o: configdialog.cpp \
/usr/include/g++/bits/basic_string.tcc:
-/opt/kde3/include/kdelibs_export.h:
+/opt/kde3/include/tdelibs_export.h:
-/opt/kde3/include/kdemacros.h:
+/opt/kde3/include/tdemacros.h:
configdialog.h:
diff --git a/malloryclient/config/.deps/malloryconfig.Plo b/malloryclient/config/.deps/malloryconfig.Plo
index c127acc..e5c573d 100644
--- a/malloryclient/config/.deps/malloryconfig.Plo
+++ b/malloryclient/config/.deps/malloryconfig.Plo
@@ -1,5 +1,5 @@
malloryconfig.lo .libs/malloryconfig.o: malloryconfig.cpp \
- /opt/kde3/include/kconfig.h /usr/lib/qt3/include/ntqvaluelist.h \
+ /opt/kde3/include/tdeconfig.h /usr/lib/qt3/include/ntqvaluelist.h \
/usr/lib/qt3/include/ntqtl.h /usr/lib/qt3/include/ntqglobal.h \
/usr/lib/qt3/include/ntqconfig.h /usr/lib/qt3/include/ntqmodules.h \
/usr/lib/qt3/include/ntqfeatures.h /usr/lib/qt3/include/ntqtextstream.h \
@@ -96,7 +96,7 @@ malloryconfig.lo .libs/malloryconfig.o: malloryconfig.cpp \
/usr/include/g++/istream /usr/include/g++/bits/istream.tcc \
/usr/include/g++/bits/stream_iterator.h /usr/include/g++/list \
/usr/include/g++/bits/stl_list.h /usr/include/g++/bits/list.tcc \
- /opt/kde3/include/kconfigbase.h /usr/lib/qt3/include/ntqobject.h \
+ /opt/kde3/include/tdeconfigbase.h /usr/lib/qt3/include/ntqobject.h \
/usr/lib/qt3/include/ntqobjectdefs.h /usr/lib/qt3/include/ntqwindowdefs.h \
/usr/lib/qt3/include/ntqnamespace.h /usr/lib/qt3/include/ntqevent.h \
/usr/lib/qt3/include/ntqregion.h /usr/lib/qt3/include/ntqrect.h \
@@ -109,10 +109,10 @@ malloryconfig.lo .libs/malloryconfig.o: malloryconfig.cpp \
/usr/lib/qt3/include/ntqptrlist.h /usr/lib/qt3/include/ntqglist.h \
/usr/lib/qt3/include/ntqptrcollection.h /usr/lib/qt3/include/ntqfont.h \
/usr/lib/qt3/include/ntqdatetime.h /usr/lib/qt3/include/ntqvariant.h \
- /opt/kde3/include/kconfigdata.h /opt/kde3/include/kdelibs_export.h \
- /opt/kde3/include/kdemacros.h /opt/kde3/include/klockfile.h \
- /opt/kde3/include/ksharedptr.h /opt/kde3/include/klocale.h \
- /opt/kde3/include/kglobal.h /opt/kde3/include/kinstance.h \
+ /opt/kde3/include/tdeconfigdata.h /opt/kde3/include/tdelibs_export.h \
+ /opt/kde3/include/tdemacros.h /opt/kde3/include/klockfile.h \
+ /opt/kde3/include/ksharedptr.h /opt/kde3/include/tdelocale.h \
+ /opt/kde3/include/tdeglobal.h /opt/kde3/include/kinstance.h \
/usr/lib/qt3/include/ntqcheckbox.h /usr/lib/qt3/include/ntqbutton.h \
/usr/lib/qt3/include/ntqwidget.h /usr/lib/qt3/include/ntqpaintdevice.h \
/usr/lib/qt3/include/ntqpalette.h /usr/lib/qt3/include/ntqbrush.h \
@@ -129,7 +129,7 @@ malloryconfig.lo .libs/malloryconfig.o: malloryconfig.cpp \
/usr/lib/qt3/include/private/qucomextra_p.h \
/usr/lib/qt3/include/private/qucom_p.h /usr/lib/qt3/include/ntquuid.h
-/opt/kde3/include/kconfig.h:
+/opt/kde3/include/tdeconfig.h:
/usr/lib/qt3/include/ntqvaluelist.h:
@@ -467,7 +467,7 @@ malloryconfig.lo .libs/malloryconfig.o: malloryconfig.cpp \
/usr/include/g++/bits/list.tcc:
-/opt/kde3/include/kconfigbase.h:
+/opt/kde3/include/tdeconfigbase.h:
/usr/lib/qt3/include/ntqobject.h:
@@ -519,19 +519,19 @@ malloryconfig.lo .libs/malloryconfig.o: malloryconfig.cpp \
/usr/lib/qt3/include/ntqvariant.h:
-/opt/kde3/include/kconfigdata.h:
+/opt/kde3/include/tdeconfigdata.h:
-/opt/kde3/include/kdelibs_export.h:
+/opt/kde3/include/tdelibs_export.h:
-/opt/kde3/include/kdemacros.h:
+/opt/kde3/include/tdemacros.h:
/opt/kde3/include/klockfile.h:
/opt/kde3/include/ksharedptr.h:
-/opt/kde3/include/klocale.h:
+/opt/kde3/include/tdelocale.h:
-/opt/kde3/include/kglobal.h:
+/opt/kde3/include/tdeglobal.h:
/opt/kde3/include/kinstance.h:
diff --git a/malloryclient/config/Makefile b/malloryclient/config/Makefile
index 27dbc4c..fa14fbb 100644
--- a/malloryclient/config/Makefile
+++ b/malloryclient/config/Makefile
@@ -106,7 +106,7 @@ JAR = @JAR@
JAVAC = @JAVAC@
JAVAH = @JAVAH@
JVMLIBS = @JVMLIBS@
-KDECONFIG = /opt/kde3/bin/kde-config
+KDECONFIG = /opt/kde3/bin/tde-config
KDE_EXTRA_RPATH =
KDE_HAS_DOXYGEN = @KDE_HAS_DOXYGEN@
KDE_HAVE_DOT = @KDE_HAVE_DOT@
@@ -151,18 +151,18 @@ LIBUTIL = -lutil
LIBZ = -lz
LIB_JASPER = @LIB_JASPER@
LIB_KAB = -lkab
-LIB_KABC = -lkabc
-LIB_KDECORE = -lkdecore
-LIB_KDEPRINT = -lkdeprint
-LIB_KDEUI = -lkdeui
-LIB_KFILE = -lkio
+LIB_KABC = -ltdeabc
+LIB_TDECORE = -ltdecore
+LIB_TDEPRINT = -ltdeprint
+LIB_TDEUI = -ltdeui
+LIB_KFILE = -ltdeio
LIB_KFM =
-LIB_KHTML = -lkhtml
+LIB_TDEHTML = -ltdehtml
LIB_KIMGIO = @LIB_KIMGIO@
-LIB_KIO = -lkio
-LIB_KPARTS = -lkparts
-LIB_KSPELL = -lkspell
-LIB_KSYCOCA = -lkio
+LIB_TDEIO = -ltdeio
+LIB_TDEPARTS = -ltdeparts
+LIB_TDESPELL = -ltdespell
+LIB_TDESYCOCA = -ltdeio
LIB_POLL =
LIB_QPE =
LIB_QT = -ltqt-mt $(LIBPNG) -lXext $(LIB_X11) $(LIBSM) -lpthread
@@ -245,7 +245,7 @@ kde_styledir = ${libdir}/kde3/plugins/styles
kde_templatesdir = ${prefix}/share/templates
kde_wallpaperdir = ${prefix}/share/wallpapers
kde_widgetdir = /opt/kde3/lib/kde3/plugins/designer
-kdeinitdir = $(kde_moduledir)
+tdeinitdir = $(kde_moduledir)
micodir = @micodir@
qt_includes = /usr/lib/qt3/include
qt_libraries = /usr/lib/qt3/lib
@@ -255,34 +255,34 @@ xdg_appsdir = ${datadir}/applications
xdg_directorydir = ${datadir}/desktop-directories
INCLUDES = $(all_includes)
-kde_module_LTLIBRARIES = kwin_mallory_config.la
+kde_module_LTLIBRARIES = twin_mallory_config.la
-#>- kwin_mallory_config_la_SOURCES = malloryconfig.cpp configdialog.ui
+#>- twin_mallory_config_la_SOURCES = malloryconfig.cpp configdialog.ui
#>+ 1
-kwin_mallory_config_la_SOURCES=malloryconfig.cpp configdialog.cpp
-kwin_mallory_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
-kwin_mallory_config_la_LIBADD = $(LIB_KDEUI)
+twin_mallory_config_la_SOURCES=malloryconfig.cpp configdialog.cpp
+twin_mallory_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
+twin_mallory_config_la_LIBADD = $(LIB_TDEUI)
#>- METASOURCES = AUTO
# noinst_HEADERS = malloryconfig.h configdialog.h
noinst_HEADERS = malloryconfig.h
DISTCLEANFILES = $(METASOURCES)
-lnkdir = $(kde_datadir)/kwin
+lnkdir = $(kde_datadir)/twin
subdir = malloryclient/config
mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
LTLIBRARIES = $(kde_module_LTLIBRARIES)
-kwin_mallory_config_la_DEPENDENCIES =
-am_kwin_mallory_config_la_OBJECTS = malloryconfig.lo
-#>- kwin_mallory_config_la_OBJECTS = $(am_kwin_mallory_config_la_OBJECTS)
+twin_mallory_config_la_DEPENDENCIES =
+am_twin_mallory_config_la_OBJECTS = malloryconfig.lo
+#>- twin_mallory_config_la_OBJECTS = $(am_twin_mallory_config_la_OBJECTS)
#>+ 4
-kwin_mallory_config_la_final_OBJECTS = kwin_mallory_config_la.all_cpp.lo
-kwin_mallory_config_la_nofinal_OBJECTS = malloryconfig.lo configdialog.lo
-kwin_mallory_config_la_OBJECTS = $(kwin_mallory_config_la_nofinal_OBJECTS)
-#kwin_mallory_config_la_OBJECTS = $(kwin_mallory_config_la_final_OBJECTS)
+twin_mallory_config_la_final_OBJECTS = twin_mallory_config_la.all_cpp.lo
+twin_mallory_config_la_nofinal_OBJECTS = malloryconfig.lo configdialog.lo
+twin_mallory_config_la_OBJECTS = $(twin_mallory_config_la_nofinal_OBJECTS)
+#twin_mallory_config_la_OBJECTS = $(twin_mallory_config_la_final_OBJECTS)
DEFS = -DHAVE_CONFIG_H
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
@@ -293,7 +293,7 @@ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
am__depfiles_maybe = depfiles
#>- DEP_FILES = ./$(DEPDIR)/malloryconfig.Plo
#>+ 3
-#DEP_FILES = $(DEPDIR)/configdialog.P $(DEPDIR)/kwin_mallory_config_la.all_cpp.P ./$(DEPDIR)/malloryconfig.Plo
+#DEP_FILES = $(DEPDIR)/configdialog.P $(DEPDIR)/twin_mallory_config_la.all_cpp.P ./$(DEPDIR)/malloryconfig.Plo
DEP_FILES = $(DEPDIR)/configdialog.P ./$(DEPDIR)/malloryconfig.Plo
#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -315,11 +315,11 @@ CXXLD = $(CXX)
CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
$(AM_LDFLAGS) $(LDFLAGS) -o $@
CXXFLAGS = -Wnon-virtual-dtor -Wno-long-long -Wundef -Wall -pedantic -W -Wpointer-arith -Wwrite-strings -ansi -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -Wcast-align -Wconversion -Wchar-subscripts -O2 -Wformat-security -Wmissing-format-attribute -fno-exceptions -fno-check-new -fno-common
-DIST_SOURCES = $(kwin_mallory_config_la_SOURCES)
+DIST_SOURCES = $(twin_mallory_config_la_SOURCES)
HEADERS = $(noinst_HEADERS)
DIST_COMMON = $(noinst_HEADERS) Makefile.am Makefile.in
-SOURCES = $(kwin_mallory_config_la_SOURCES)
+SOURCES = $(twin_mallory_config_la_SOURCES)
#>- all: all-am
#>+ 1
@@ -364,11 +364,11 @@ clean-kde_moduleLTLIBRARIES:
echo "rm -f \"$${dir}/so_locations\""; \
rm -f "$${dir}/so_locations"; \
done
-#>- kwin_mallory_config.la: $(kwin_mallory_config_la_OBJECTS) $(kwin_mallory_config_la_DEPENDENCIES)
+#>- twin_mallory_config.la: $(twin_mallory_config_la_OBJECTS) $(twin_mallory_config_la_DEPENDENCIES)
#>+ 2
-kwin_mallory_config.la: kwin_mallory_config.la.closure $(kwin_mallory_config_la_OBJECTS) $(kwin_mallory_config_la_DEPENDENCIES)
-#kwin_mallory_config.la: $(kwin_mallory_config_la_OBJECTS) $(kwin_mallory_config_la_DEPENDENCIES)
- $(CXXLINK) -rpath $(kde_moduledir) $(kwin_mallory_config_la_LDFLAGS) $(kwin_mallory_config_la_OBJECTS) $(kwin_mallory_config_la_LIBADD) $(LIBS)
+twin_mallory_config.la: twin_mallory_config.la.closure $(twin_mallory_config_la_OBJECTS) $(twin_mallory_config_la_DEPENDENCIES)
+#twin_mallory_config.la: $(twin_mallory_config_la_OBJECTS) $(twin_mallory_config_la_DEPENDENCIES)
+ $(CXXLINK) -rpath $(kde_moduledir) $(twin_mallory_config_la_LDFLAGS) $(twin_mallory_config_la_OBJECTS) $(twin_mallory_config_la_LIBADD) $(LIBS)
mostlyclean-compile:
-rm -f *.$(OBJEXT) core *.core
@@ -570,7 +570,7 @@ uninstall-am: uninstall-info-am uninstall-kde_moduleLTLIBRARIES
messages:
- $(XGETTEXT) *.cpp -o $(podir)/kwin_mallory_config.pot
+ $(XGETTEXT) *.cpp -o $(podir)/twin_mallory_config.pot
# AUTOMAKE_OPTIONS = foreign
#
@@ -580,33 +580,33 @@ messages:
#
# noinst_HEADERS = malloryconfig.h configdialog.h
#
-# kde_module_LTLIBRARIES = kwin_mallory_config.la
-# kwin_mallory_config_la_SOURCES = malloryconfig.cpp configdialog.ui
-# kwin_mallory_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
-# kwin_mallory_config_la_LIBADD = $(LIB_KDEUI)
-# kwin_mallory_config_la_METASOURCES = AUTO
+# kde_module_LTLIBRARIES = twin_mallory_config.la
+# twin_mallory_config_la_SOURCES = malloryconfig.cpp configdialog.ui
+# twin_mallory_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
+# twin_mallory_config_la_LIBADD = $(LIB_TDEUI)
+# twin_mallory_config_la_METASOURCES = AUTO
#
-# DISTCLEANFILES = $(kwin_mallory_la_METASOURCES)
+# DISTCLEANFILES = $(twin_mallory_la_METASOURCES)
#
# messages:
-# $(XGETTEXT) *.cpp -o $(podir)/kwin_mallory_config.pot
+# $(XGETTEXT) *.cpp -o $(podir)/twin_mallory_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_mallory_config.la.closure: $(kwin_mallory_config_la_OBJECTS) $(kwin_mallory_config_la_DEPENDENCIES)
- @echo "int main() {return 0;}" > kwin_mallory_config_la_closure.cpp
- @$(LTCXXCOMPILE) -c kwin_mallory_config_la_closure.cpp
- $(CXXLINK) kwin_mallory_config_la_closure.lo $(kwin_mallory_config_la_LDFLAGS) $(kwin_mallory_config_la_OBJECTS) $(kwin_mallory_config_la_LIBADD) $(LIBS)
- @rm -f kwin_mallory_config_la_closure.* kwin_mallory_config.la.closure
- @echo "timestamp" > kwin_mallory_config.la.closure
+twin_mallory_config.la.closure: $(twin_mallory_config_la_OBJECTS) $(twin_mallory_config_la_DEPENDENCIES)
+ @echo "int main() {return 0;}" > twin_mallory_config_la_closure.cpp
+ @$(LTCXXCOMPILE) -c twin_mallory_config_la_closure.cpp
+ $(CXXLINK) twin_mallory_config_la_closure.lo $(twin_mallory_config_la_LDFLAGS) $(twin_mallory_config_la_OBJECTS) $(twin_mallory_config_la_LIBADD) $(LIBS)
+ @rm -f twin_mallory_config_la_closure.* twin_mallory_config.la.closure
+ @echo "timestamp" > twin_mallory_config.la.closure
#>+ 14
configdialog.cpp: $(srcdir)/configdialog.ui configdialog.h configdialog.moc
rm -f 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=$$?; \
sed -e "s,${UIC_TR}( \"\" ),QString::null,g" configdialog.cpp.temp | sed -e "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | sed -e "s,image\([0-9][0-9]*\)_data,img\1_configdialog,g" >> configdialog.cpp ;\
rm -f configdialog.cpp.temp ;\
@@ -635,7 +635,7 @@ clean-ui:
#>+ 3
clean-closures:
- -rm -f kwin_mallory_config.la.closure
+ -rm -f twin_mallory_config.la.closure
#>+ 2
docs-am:
@@ -669,33 +669,33 @@ bcheck-am:
#>+ 11
-kwin_mallory_config_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/malloryconfig.cpp configdialog.cpp malloryconfig.moc configdialog.moc
- @echo 'creating kwin_mallory_config_la.all_cpp.cpp ...'; \
- rm -f kwin_mallory_config_la.all_cpp.files kwin_mallory_config_la.all_cpp.final; \
- echo "#define KDE_USE_FINAL 1" >> kwin_mallory_config_la.all_cpp.final; \
+twin_mallory_config_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/malloryconfig.cpp configdialog.cpp malloryconfig.moc configdialog.moc
+ @echo 'creating twin_mallory_config_la.all_cpp.cpp ...'; \
+ rm -f twin_mallory_config_la.all_cpp.files twin_mallory_config_la.all_cpp.final; \
+ echo "#define KDE_USE_FINAL 1" >> twin_mallory_config_la.all_cpp.final; \
for file in malloryconfig.cpp configdialog.cpp ; do \
- echo "#include \"$$file\"" >> kwin_mallory_config_la.all_cpp.files; \
- test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kwin_mallory_config_la.all_cpp.final; \
+ echo "#include \"$$file\"" >> twin_mallory_config_la.all_cpp.files; \
+ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> twin_mallory_config_la.all_cpp.final; \
done; \
- cat kwin_mallory_config_la.all_cpp.final kwin_mallory_config_la.all_cpp.files > kwin_mallory_config_la.all_cpp.cpp; \
- rm -f kwin_mallory_config_la.all_cpp.final kwin_mallory_config_la.all_cpp.files
+ cat twin_mallory_config_la.all_cpp.final twin_mallory_config_la.all_cpp.files > twin_mallory_config_la.all_cpp.cpp; \
+ rm -f twin_mallory_config_la.all_cpp.final twin_mallory_config_la.all_cpp.files
#>+ 3
clean-final:
- -rm -f kwin_mallory_config_la.all_cpp.cpp
+ -rm -f twin_mallory_config_la.all_cpp.cpp
#>+ 2
final:
- $(MAKE) kwin_mallory_config_la_OBJECTS="$(kwin_mallory_config_la_final_OBJECTS)" all-am
+ $(MAKE) twin_mallory_config_la_OBJECTS="$(twin_mallory_config_la_final_OBJECTS)" all-am
#>+ 2
final-install:
- $(MAKE) kwin_mallory_config_la_OBJECTS="$(kwin_mallory_config_la_final_OBJECTS)" install-am
+ $(MAKE) twin_mallory_config_la_OBJECTS="$(twin_mallory_config_la_final_OBJECTS)" install-am
#>+ 2
no-final:
- $(MAKE) kwin_mallory_config_la_OBJECTS="$(kwin_mallory_config_la_nofinal_OBJECTS)" all-am
+ $(MAKE) twin_mallory_config_la_OBJECTS="$(twin_mallory_config_la_nofinal_OBJECTS)" all-am
#>+ 2
no-final-install:
- $(MAKE) kwin_mallory_config_la_OBJECTS="$(kwin_mallory_config_la_nofinal_OBJECTS)" install-am
+ $(MAKE) twin_mallory_config_la_OBJECTS="$(twin_mallory_config_la_nofinal_OBJECTS)" install-am
#>+ 3
cvs-clean:
$(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean
diff --git a/malloryclient/config/Makefile.am b/malloryclient/config/Makefile.am
index c02605b..b3bdfd1 100644
--- a/malloryclient/config/Makefile.am
+++ b/malloryclient/config/Makefile.am
@@ -1,20 +1,20 @@
INCLUDES = $(all_includes)
-kde_module_LTLIBRARIES = kwin_mallory_config.la
+kde_module_LTLIBRARIES = twin_mallory_config.la
-kwin_mallory_config_la_SOURCES = malloryconfig.cpp configdialog.ui
-kwin_mallory_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
-kwin_mallory_config_la_LIBADD = $(LIB_KDEUI)
+twin_mallory_config_la_SOURCES = malloryconfig.cpp configdialog.ui
+twin_mallory_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
+twin_mallory_config_la_LIBADD = $(LIB_TDEUI)
METASOURCES = AUTO
# noinst_HEADERS = malloryconfig.h configdialog.h
noinst_HEADERS = malloryconfig.h
DISTCLEANFILES = $(METASOURCES)
-lnkdir = $(kde_datadir)/kwin
+lnkdir = $(kde_datadir)/twin
messages:
- $(XGETTEXT) *.cpp -o $(podir)/kwin_mallory_config.pot
+ $(XGETTEXT) *.cpp -o $(podir)/twin_mallory_config.pot
# AUTOMAKE_OPTIONS = foreign
#
@@ -24,13 +24,13 @@ messages:
#
# noinst_HEADERS = malloryconfig.h configdialog.h
#
-# kde_module_LTLIBRARIES = kwin_mallory_config.la
-# kwin_mallory_config_la_SOURCES = malloryconfig.cpp configdialog.ui
-# kwin_mallory_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
-# kwin_mallory_config_la_LIBADD = $(LIB_KDEUI)
-# kwin_mallory_config_la_METASOURCES = AUTO
+# kde_module_LTLIBRARIES = twin_mallory_config.la
+# twin_mallory_config_la_SOURCES = malloryconfig.cpp configdialog.ui
+# twin_mallory_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
+# twin_mallory_config_la_LIBADD = $(LIB_TDEUI)
+# twin_mallory_config_la_METASOURCES = AUTO
#
-# DISTCLEANFILES = $(kwin_mallory_la_METASOURCES)
+# DISTCLEANFILES = $(twin_mallory_la_METASOURCES)
#
# messages:
-# $(XGETTEXT) *.cpp -o $(podir)/kwin_mallory_config.pot
+# $(XGETTEXT) *.cpp -o $(podir)/twin_mallory_config.pot
diff --git a/malloryclient/config/Makefile.in b/malloryclient/config/Makefile.in
index d22a8b8..a74c1ab 100644
--- a/malloryclient/config/Makefile.in
+++ b/malloryclient/config/Makefile.in
@@ -151,17 +151,17 @@ LIBZ = @LIBZ@
LIB_JASPER = @LIB_JASPER@
LIB_KAB = @LIB_KAB@
LIB_KABC = @LIB_KABC@
-LIB_KDECORE = @LIB_KDECORE@
-LIB_KDEPRINT = @LIB_KDEPRINT@
-LIB_KDEUI = @LIB_KDEUI@
+LIB_TDECORE = @LIB_TDECORE@
+LIB_TDEPRINT = @LIB_TDEPRINT@
+LIB_TDEUI = @LIB_TDEUI@
LIB_KFILE = @LIB_KFILE@
LIB_KFM = @LIB_KFM@
-LIB_KHTML = @LIB_KHTML@
+LIB_TDEHTML = @LIB_TDEHTML@
LIB_KIMGIO = @LIB_KIMGIO@
-LIB_KIO = @LIB_KIO@
-LIB_KPARTS = @LIB_KPARTS@
-LIB_KSPELL = @LIB_KSPELL@
-LIB_KSYCOCA = @LIB_KSYCOCA@
+LIB_TDEIO = @LIB_TDEIO@
+LIB_TDEPARTS = @LIB_TDEPARTS@
+LIB_TDESPELL = @LIB_TDESPELL@
+LIB_TDESYCOCA = @LIB_TDESYCOCA@
LIB_POLL = @LIB_POLL@
LIB_QPE = @LIB_QPE@
LIB_QT = @LIB_QT@
@@ -244,7 +244,7 @@ kde_styledir = @kde_styledir@
kde_templatesdir = @kde_templatesdir@
kde_wallpaperdir = @kde_wallpaperdir@
kde_widgetdir = @kde_widgetdir@
-kdeinitdir = @kdeinitdir@
+tdeinitdir = @tdeinitdir@
micodir = @micodir@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
@@ -254,34 +254,34 @@ xdg_appsdir = @xdg_appsdir@
xdg_directorydir = @xdg_directorydir@
INCLUDES = $(all_includes)
-kde_module_LTLIBRARIES = kwin_mallory_config.la
+kde_module_LTLIBRARIES = twin_mallory_config.la
-#>- kwin_mallory_config_la_SOURCES = malloryconfig.cpp configdialog.ui
+#>- twin_mallory_config_la_SOURCES = malloryconfig.cpp configdialog.ui
#>+ 1
-kwin_mallory_config_la_SOURCES=malloryconfig.cpp configdialog.cpp
-kwin_mallory_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
-kwin_mallory_config_la_LIBADD = $(LIB_KDEUI)
+twin_mallory_config_la_SOURCES=malloryconfig.cpp configdialog.cpp
+twin_mallory_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
+twin_mallory_config_la_LIBADD = $(LIB_TDEUI)
#>- METASOURCES = AUTO
# noinst_HEADERS = malloryconfig.h configdialog.h
noinst_HEADERS = malloryconfig.h
DISTCLEANFILES = $(METASOURCES)
-lnkdir = $(kde_datadir)/kwin
+lnkdir = $(kde_datadir)/twin
subdir = malloryclient/config
mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
LTLIBRARIES = $(kde_module_LTLIBRARIES)
-kwin_mallory_config_la_DEPENDENCIES =
-am_kwin_mallory_config_la_OBJECTS = malloryconfig.lo
-#>- kwin_mallory_config_la_OBJECTS = $(am_kwin_mallory_config_la_OBJECTS)
+twin_mallory_config_la_DEPENDENCIES =
+am_twin_mallory_config_la_OBJECTS = malloryconfig.lo
+#>- twin_mallory_config_la_OBJECTS = $(am_twin_mallory_config_la_OBJECTS)
#>+ 4
-kwin_mallory_config_la_final_OBJECTS = kwin_mallory_config_la.all_cpp.lo
-kwin_mallory_config_la_nofinal_OBJECTS = malloryconfig.lo configdialog.lo
-@KDE_USE_FINAL_FALSE@kwin_mallory_config_la_OBJECTS = $(kwin_mallory_config_la_nofinal_OBJECTS)
-@KDE_USE_FINAL_TRUE@kwin_mallory_config_la_OBJECTS = $(kwin_mallory_config_la_final_OBJECTS)
+twin_mallory_config_la_final_OBJECTS = twin_mallory_config_la.all_cpp.lo
+twin_mallory_config_la_nofinal_OBJECTS = malloryconfig.lo configdialog.lo
+@KDE_USE_FINAL_FALSE@twin_mallory_config_la_OBJECTS = $(twin_mallory_config_la_nofinal_OBJECTS)
+@KDE_USE_FINAL_TRUE@twin_mallory_config_la_OBJECTS = $(twin_mallory_config_la_final_OBJECTS)
DEFS = @DEFS@
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
@@ -292,7 +292,7 @@ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
am__depfiles_maybe = depfiles
#>- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/malloryconfig.Plo
#>+ 3
-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/configdialog.P $(DEPDIR)/kwin_mallory_config_la.all_cpp.P ./$(DEPDIR)/malloryconfig.Plo
+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/configdialog.P $(DEPDIR)/twin_mallory_config_la.all_cpp.P ./$(DEPDIR)/malloryconfig.Plo
@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES = $(DEPDIR)/configdialog.P ./$(DEPDIR)/malloryconfig.Plo
#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -314,11 +314,11 @@ CXXLD = $(CXX)
CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
$(AM_LDFLAGS) $(LDFLAGS) -o $@
CXXFLAGS = @CXXFLAGS@
-DIST_SOURCES = $(kwin_mallory_config_la_SOURCES)
+DIST_SOURCES = $(twin_mallory_config_la_SOURCES)
HEADERS = $(noinst_HEADERS)
DIST_COMMON = $(noinst_HEADERS) Makefile.am Makefile.in
-SOURCES = $(kwin_mallory_config_la_SOURCES)
+SOURCES = $(twin_mallory_config_la_SOURCES)
#>- all: all-am
#>+ 1
@@ -363,11 +363,11 @@ clean-kde_moduleLTLIBRARIES:
echo "rm -f \"$${dir}/so_locations\""; \
rm -f "$${dir}/so_locations"; \
done
-#>- kwin_mallory_config.la: $(kwin_mallory_config_la_OBJECTS) $(kwin_mallory_config_la_DEPENDENCIES)
+#>- twin_mallory_config.la: $(twin_mallory_config_la_OBJECTS) $(twin_mallory_config_la_DEPENDENCIES)
#>+ 2
-@KDE_USE_CLOSURE_TRUE@kwin_mallory_config.la: kwin_mallory_config.la.closure $(kwin_mallory_config_la_OBJECTS) $(kwin_mallory_config_la_DEPENDENCIES)
-@KDE_USE_CLOSURE_FALSE@kwin_mallory_config.la: $(kwin_mallory_config_la_OBJECTS) $(kwin_mallory_config_la_DEPENDENCIES)
- $(CXXLINK) -rpath $(kde_moduledir) $(kwin_mallory_config_la_LDFLAGS) $(kwin_mallory_config_la_OBJECTS) $(kwin_mallory_config_la_LIBADD) $(LIBS)
+@KDE_USE_CLOSURE_TRUE@twin_mallory_config.la: twin_mallory_config.la.closure $(twin_mallory_config_la_OBJECTS) $(twin_mallory_config_la_DEPENDENCIES)
+@KDE_USE_CLOSURE_FALSE@twin_mallory_config.la: $(twin_mallory_config_la_OBJECTS) $(twin_mallory_config_la_DEPENDENCIES)
+ $(CXXLINK) -rpath $(kde_moduledir) $(twin_mallory_config_la_LDFLAGS) $(twin_mallory_config_la_OBJECTS) $(twin_mallory_config_la_LIBADD) $(LIBS)
mostlyclean-compile:
-rm -f *.$(OBJEXT) core *.core
@@ -569,7 +569,7 @@ uninstall-am: uninstall-info-am uninstall-kde_moduleLTLIBRARIES
messages:
- $(XGETTEXT) *.cpp -o $(podir)/kwin_mallory_config.pot
+ $(XGETTEXT) *.cpp -o $(podir)/twin_mallory_config.pot
# AUTOMAKE_OPTIONS = foreign
#
@@ -579,33 +579,33 @@ messages:
#
# noinst_HEADERS = malloryconfig.h configdialog.h
#
-# kde_module_LTLIBRARIES = kwin_mallory_config.la
-# kwin_mallory_config_la_SOURCES = malloryconfig.cpp configdialog.ui
-# kwin_mallory_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
-# kwin_mallory_config_la_LIBADD = $(LIB_KDEUI)
-# kwin_mallory_config_la_METASOURCES = AUTO
+# kde_module_LTLIBRARIES = twin_mallory_config.la
+# twin_mallory_config_la_SOURCES = malloryconfig.cpp configdialog.ui
+# twin_mallory_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
+# twin_mallory_config_la_LIBADD = $(LIB_TDEUI)
+# twin_mallory_config_la_METASOURCES = AUTO
#
-# DISTCLEANFILES = $(kwin_mallory_la_METASOURCES)
+# DISTCLEANFILES = $(twin_mallory_la_METASOURCES)
#
# messages:
-# $(XGETTEXT) *.cpp -o $(podir)/kwin_mallory_config.pot
+# $(XGETTEXT) *.cpp -o $(podir)/twin_mallory_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_mallory_config.la.closure: $(kwin_mallory_config_la_OBJECTS) $(kwin_mallory_config_la_DEPENDENCIES)
- @echo "int main() {return 0;}" > kwin_mallory_config_la_closure.cpp
- @$(LTCXXCOMPILE) -c kwin_mallory_config_la_closure.cpp
- $(CXXLINK) kwin_mallory_config_la_closure.lo $(kwin_mallory_config_la_LDFLAGS) $(kwin_mallory_config_la_OBJECTS) $(kwin_mallory_config_la_LIBADD) $(LIBS)
- @rm -f kwin_mallory_config_la_closure.* kwin_mallory_config.la.closure
- @echo "timestamp" > kwin_mallory_config.la.closure
+twin_mallory_config.la.closure: $(twin_mallory_config_la_OBJECTS) $(twin_mallory_config_la_DEPENDENCIES)
+ @echo "int main() {return 0;}" > twin_mallory_config_la_closure.cpp
+ @$(LTCXXCOMPILE) -c twin_mallory_config_la_closure.cpp
+ $(CXXLINK) twin_mallory_config_la_closure.lo $(twin_mallory_config_la_LDFLAGS) $(twin_mallory_config_la_OBJECTS) $(twin_mallory_config_la_LIBADD) $(LIBS)
+ @rm -f twin_mallory_config_la_closure.* twin_mallory_config.la.closure
+ @echo "timestamp" > twin_mallory_config.la.closure
#>+ 14
configdialog.cpp: $(srcdir)/configdialog.ui configdialog.h configdialog.moc
rm -f 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=$$?; \
sed -e "s,${UIC_TR}( \"\" ),QString::null,g" configdialog.cpp.temp | sed -e "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | sed -e "s,image\([0-9][0-9]*\)_data,img\1_configdialog,g" >> configdialog.cpp ;\
rm -f configdialog.cpp.temp ;\
@@ -634,7 +634,7 @@ clean-ui:
#>+ 3
clean-closures:
- -rm -f kwin_mallory_config.la.closure
+ -rm -f twin_mallory_config.la.closure
#>+ 2
docs-am:
@@ -668,33 +668,33 @@ bcheck-am:
#>+ 11
-kwin_mallory_config_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/malloryconfig.cpp configdialog.cpp malloryconfig.moc configdialog.moc
- @echo 'creating kwin_mallory_config_la.all_cpp.cpp ...'; \
- rm -f kwin_mallory_config_la.all_cpp.files kwin_mallory_config_la.all_cpp.final; \
- echo "#define KDE_USE_FINAL 1" >> kwin_mallory_config_la.all_cpp.final; \
+twin_mallory_config_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/malloryconfig.cpp configdialog.cpp malloryconfig.moc configdialog.moc
+ @echo 'creating twin_mallory_config_la.all_cpp.cpp ...'; \
+ rm -f twin_mallory_config_la.all_cpp.files twin_mallory_config_la.all_cpp.final; \
+ echo "#define KDE_USE_FINAL 1" >> twin_mallory_config_la.all_cpp.final; \
for file in malloryconfig.cpp configdialog.cpp ; do \
- echo "#include \"$$file\"" >> kwin_mallory_config_la.all_cpp.files; \
- test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kwin_mallory_config_la.all_cpp.final; \
+ echo "#include \"$$file\"" >> twin_mallory_config_la.all_cpp.files; \
+ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> twin_mallory_config_la.all_cpp.final; \
done; \
- cat kwin_mallory_config_la.all_cpp.final kwin_mallory_config_la.all_cpp.files > kwin_mallory_config_la.all_cpp.cpp; \
- rm -f kwin_mallory_config_la.all_cpp.final kwin_mallory_config_la.all_cpp.files
+ cat twin_mallory_config_la.all_cpp.final twin_mallory_config_la.all_cpp.files > twin_mallory_config_la.all_cpp.cpp; \
+ rm -f twin_mallory_config_la.all_cpp.final twin_mallory_config_la.all_cpp.files
#>+ 3
clean-final:
- -rm -f kwin_mallory_config_la.all_cpp.cpp
+ -rm -f twin_mallory_config_la.all_cpp.cpp
#>+ 2
final:
- $(MAKE) kwin_mallory_config_la_OBJECTS="$(kwin_mallory_config_la_final_OBJECTS)" all-am
+ $(MAKE) twin_mallory_config_la_OBJECTS="$(twin_mallory_config_la_final_OBJECTS)" all-am
#>+ 2
final-install:
- $(MAKE) kwin_mallory_config_la_OBJECTS="$(kwin_mallory_config_la_final_OBJECTS)" install-am
+ $(MAKE) twin_mallory_config_la_OBJECTS="$(twin_mallory_config_la_final_OBJECTS)" install-am
#>+ 2
no-final:
- $(MAKE) kwin_mallory_config_la_OBJECTS="$(kwin_mallory_config_la_nofinal_OBJECTS)" all-am
+ $(MAKE) twin_mallory_config_la_OBJECTS="$(twin_mallory_config_la_nofinal_OBJECTS)" all-am
#>+ 2
no-final-install:
- $(MAKE) kwin_mallory_config_la_OBJECTS="$(kwin_mallory_config_la_nofinal_OBJECTS)" install-am
+ $(MAKE) twin_mallory_config_la_OBJECTS="$(twin_mallory_config_la_nofinal_OBJECTS)" install-am
#>+ 3
cvs-clean:
$(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean
diff --git a/malloryclient/config/malloryconfig.cpp b/malloryclient/config/malloryconfig.cpp
index 8626ec4..c482ff3 100644
--- a/malloryclient/config/malloryconfig.cpp
+++ b/malloryclient/config/malloryconfig.cpp
@@ -7,9 +7,9 @@
* (at your option) any later version. *
***************************************************************************/
-#include <kconfig.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdeconfig.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
#include <ntqcheckbox.h>
#include <ntqslider.h>
#include <ntqspinbox.h>
@@ -19,12 +19,12 @@
#include "malloryconfig.h"
#include "configdialog.h"
-MalloryConfig::MalloryConfig(KConfig* config, TQWidget* parent)
+MalloryConfig::MalloryConfig(TDEConfig* config, TQWidget* parent)
: TQObject(parent), m_config(0), m_dialog(0)
{
// Create the configuration object.
- m_config = new KConfig("kwinmalloryrc");
- KGlobal::locale()->insertCatalogue("kwin_mallory_config");
+ m_config = new TDEConfig("twinmalloryrc");
+ TDEGlobal::locale()->insertCatalogue("twin_mallory_config");
// Create and show the configuration dialog.
m_dialog = new ConfigDialog(parent);
@@ -52,7 +52,7 @@ MalloryConfig::~MalloryConfig()
if (m_config) delete m_config;
}
-void MalloryConfig::load(KConfig*)
+void MalloryConfig::load(TDEConfig*)
{
m_config->setGroup("General");
@@ -76,7 +76,7 @@ void MalloryConfig::load(KConfig*)
m_dialog->m_titleShadowSize->setValue(titleShadowSize);
}
-void MalloryConfig::save(KConfig*)
+void MalloryConfig::save(TDEConfig*)
{
m_config->setGroup("General");
@@ -111,7 +111,7 @@ void MalloryConfig::defaults()
extern "C"
{
- TQObject* allocate_config(KConfig* config, TQWidget* parent) {
+ TQObject* allocate_config(TDEConfig* config, TQWidget* parent) {
return (new MalloryConfig(config, parent));
}
}
diff --git a/malloryclient/config/malloryconfig.h b/malloryclient/config/malloryconfig.h
index fee108f..64b3095 100644
--- a/malloryclient/config/malloryconfig.h
+++ b/malloryclient/config/malloryconfig.h
@@ -15,26 +15,26 @@
class TQButtonGroup;
class TQGroupBox;
class TQComboBox;
-class KConfig;
+class TDEConfig;
class ConfigDialog;
class MalloryConfig : public TQObject
{
Q_OBJECT
public:
- MalloryConfig(KConfig* config, TQWidget* parent); ///< Constructor
+ MalloryConfig(TDEConfig* config, TQWidget* parent); ///< Constructor
~MalloryConfig(); ///< Destructor
signals:
void changed(); ///< Widget state has changed
public slots:
- void load(KConfig *config); ///< Load configuration data
- void save(KConfig *config); ///< Save configuration data
+ void load(TDEConfig *config); ///< Load configuration data
+ void save(TDEConfig *config); ///< Save configuration data
void defaults(); ///< Set configuration defaults
private:
- KConfig *m_config;
+ TDEConfig *m_config;
ConfigDialog *m_dialog;
};
generated by cgit v1.2.1 (git 2.18.0) at 2025-01-03 11:34:12 +0000