diff options
60 files changed, 73 insertions, 73 deletions
diff --git a/doc/kuickshow/index.docbook b/doc/kuickshow/index.docbook index e454e2bf..373be9f2 100644 --- a/doc/kuickshow/index.docbook +++ b/doc/kuickshow/index.docbook @@ -987,7 +987,7 @@ Documentation copyright 2001 &Carsten.Pfeiffer; &Carsten.Pfeiffer.mail; <para>To be written</para> <!-- List any special requirements for your application here. This should include: -.Libraries or other software that is not included in kdesupport, +.Libraries or other software that is not included in tdesupport, kdelibs, or kdebase. .Hardware requirements like amount of RAM, disk space, graphics card capabilities, screen resolution, special expansion cards, etc. diff --git a/kcoloredit/CMakeLists.txt b/kcoloredit/CMakeLists.txt index 93fc29f3..caf8e202 100644 --- a/kcoloredit/CMakeLists.txt +++ b/kcoloredit/CMakeLists.txt @@ -52,6 +52,6 @@ tde_add_executable( kcoloredit AUTOMOC tde_add_executable( kcolorchooser AUTOMOC SOURCES kcolorchooser.cpp - LINK kdeui-shared + LINK tdeui-shared DESTINATION ${BIN_INSTALL_DIR} ) diff --git a/kcoloredit/Makefile.am b/kcoloredit/Makefile.am index a5df457b..34992836 100644 --- a/kcoloredit/Makefile.am +++ b/kcoloredit/Makefile.am @@ -7,7 +7,7 @@ kcoloredit_SOURCES = kzcolorselector.cpp imageselection.cpp \ kcoloreditview.cpp kcoloreditdoc.cpp kcoloredit.cpp main.cpp kcoloredit_METASOURCES = AUTO kcoloredit_LDADD = $(LIB_KDEUI) $(LIB_KFILE) -kcoloredit_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +kcoloredit_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor rcdir = $(kde_datadir)/kcoloredit rc_DATA = kcoloreditui.rc @@ -15,7 +15,7 @@ rc_DATA = kcoloreditui.rc bin_PROGRAMS = kcoloredit kcolorchooser kcolorchooser_SOURCES = kcolorchooser.cpp kcolorchooser_LDADD = $(LIB_KDEUI) -kcolorchooser_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +kcolorchooser_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor noinst_HEADERS = color.h colorselector.h editablestreamhistory.h \ gradientselection.h imageselection.h kcoloredit.h kcoloreditdoc.h \ diff --git a/kdvi/CMakeLists.txt b/kdvi/CMakeLists.txt index 82cbe170..e726b97f 100644 --- a/kdvi/CMakeLists.txt +++ b/kdvi/CMakeLists.txt @@ -75,7 +75,7 @@ tde_add_kpart( kdvipart AUTOMOC TeXFont_PFB.cpp TeXFont_TFM.cpp TeXFontDefinition.cpp dviWidget.cpp dvisourcesplitter.cpp prefs.kcfgc LINK - kmultipage-shared kdeprint-shared kparts-shared ${FREETYPE_LIBRARIES} + kmultipage-shared tdeprint-shared kparts-shared ${FREETYPE_LIBRARIES} DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kdvi/Makefile.am b/kdvi/Makefile.am index 9a3d8ede..a016ff12 100644 --- a/kdvi/Makefile.am +++ b/kdvi/Makefile.am @@ -39,7 +39,7 @@ squeeze_SOURCES = squeeze.c KDE_OPTIONS = nofinal kdvi_SOURCES = main.cpp -kdvi_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +kdvi_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor kdvi_LDADD = ../kviewshell/libifaces.la ../kviewshell/libkviewshell.la -lkparts ## this option you can leave out. Just, if you use "make dist", you need it diff --git a/kfax/CMakeLists.txt b/kfax/CMakeLists.txt index e42b4f23..0ace8632 100644 --- a/kfax/CMakeLists.txt +++ b/kfax/CMakeLists.txt @@ -34,7 +34,7 @@ tde_add_executable( kfax AUTOMOC SOURCES options.cpp kfax.cpp faxexpand.cpp faxinit.cpp faxinput.cpp viewfax.cpp kfax_printsettings.cpp - LINK kdeui-shared kdeprint-shared + LINK tdeui-shared tdeprint-shared DESTINATION ${BIN_INSTALL_DIR} ) diff --git a/kfax/Makefile.am b/kfax/Makefile.am index 5981250e..f0c2f01d 100644 --- a/kfax/Makefile.am +++ b/kfax/Makefile.am @@ -1,4 +1,4 @@ -AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor LDADD = $(LIB_KFILE) $(LIB_KDEPRINT) -lm INCLUDES = $(all_includes) diff --git a/kfax/kfax_printsettings.h b/kfax/kfax_printsettings.h index 135788a6..fa774151 100644 --- a/kfax/kfax_printsettings.h +++ b/kfax/kfax_printsettings.h @@ -20,7 +20,7 @@ #ifndef KFAX_PRINTSETTINGS_H #define KFAX_PRINTSETTINGS_H -#include <kdeprint/kprintdialogpage.h> +#include <tdeprint/kprintdialogpage.h> class TQCheckBox; diff --git a/kfaxview/Makefile.am b/kfaxview/Makefile.am index f0cfb19a..259aaf6d 100644 --- a/kfaxview/Makefile.am +++ b/kfaxview/Makefile.am @@ -12,7 +12,7 @@ METASOURCES = AUTO bin_PROGRAMS = kfaxview kfaxview_SOURCES = main.cpp -kfaxview_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +kfaxview_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor kfaxview_LDADD = ../kviewshell/libifaces.la ../kviewshell/libkviewshell.la -lkparts # this is where the desktop file will go @@ -23,7 +23,7 @@ shellrcdir = $(kde_datadir)/kfaxview kde_module_LTLIBRARIES = kfaxviewpart.la kfaxviewpart_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module -kfaxviewpart_la_LIBADD = -lkdeprint -lkparts $(top_builddir)/kviewshell/libkmultipage.la libkfaximage/libkfaximage.la +kfaxviewpart_la_LIBADD = -ltdeprint -lkparts $(top_builddir)/kviewshell/libkmultipage.la libkfaximage/libkfaximage.la kfaxviewpart_la_SOURCES = faxmultipage.cpp faxrenderer.cpp partdir = $(kde_datadir)/kfaxview diff --git a/kgamma/kcmkgamma/kgamma.cpp b/kgamma/kcmkgamma/kgamma.cpp index 519549c3..7f28dc63 100644 --- a/kgamma/kcmkgamma/kgamma.cpp +++ b/kgamma/kcmkgamma/kgamma.cpp @@ -369,7 +369,7 @@ void KGamma::save() { Arguments += rgamma[assign[i]] + " " + ggamma[assign[i]] + " " + \ bgamma[assign[i]] + " "; rootProcess->clearArguments(); - *rootProcess << "kdesu" << Arguments; + *rootProcess << "tdesu" << Arguments; rootProcess->start(); } } diff --git a/kghostview/CMakeLists.txt b/kghostview/CMakeLists.txt index e8f8d2a1..2cde1120 100644 --- a/kghostview/CMakeLists.txt +++ b/kghostview/CMakeLists.txt @@ -46,7 +46,7 @@ tde_add_library( kghostviewlib SHARED AUTOMOC displayoptions.cpp kpswidget.cpp fullscreenfilter.cpp kgvfactory.cpp generalsettingswidget.ui gssettingswidget.ui thumbnailservice.cpp configuration.kcfgc - LINK dscparse-static kdeprint-shared kparts-shared + LINK dscparse-static tdeprint-shared kparts-shared VERSION 0.0.0 DESTINATION ${LIB_INSTALL_DIR} ) diff --git a/kghostview/Makefile.am b/kghostview/Makefile.am index 500d290e..81ebcfd1 100644 --- a/kghostview/Makefile.am +++ b/kghostview/Makefile.am @@ -10,7 +10,7 @@ kde_module_LTLIBRARIES = libkghostviewpart.la noinst_LTLIBRARIES = libdscparse.la libkghostviewlib_la_LDFLAGS = $(all_libraries) -libkghostviewlib_la_LIBADD = $(LIB_KFILE) $(LIB_KPARTS) -lkdeprint libdscparse.la +libkghostviewlib_la_LIBADD = $(LIB_KFILE) $(LIB_KPARTS) -ltdeprint libdscparse.la libkghostviewpart_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module libkghostviewpart_la_LIBADD = libkghostviewlib.la @@ -28,7 +28,7 @@ libkghostviewlib_la_SOURCES = kgvshell.cpp kgvdocument.cpp kgv_miniwidget.cpp \ libkghostviewpart_la_SOURCES = part_init.cpp kghostview_SOURCES = main.cpp -kghostview_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +kghostview_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor kghostview_LDADD = libkghostviewlib.la libdscparse_la_LDFLAGS = $(all_libraries) -no-undefined diff --git a/kiconedit/CMakeLists.txt b/kiconedit/CMakeLists.txt index 0724ce14..fbd10516 100644 --- a/kiconedit/CMakeLists.txt +++ b/kiconedit/CMakeLists.txt @@ -37,6 +37,6 @@ tde_add_executable( kiconedit AUTOMOC kiconcolors.cpp kcolorgrid.cpp palettetoolbar.cpp kicon.cpp kresize.cpp knew.cpp properties.cpp kiconeditslots.cpp kiconconfig.cpp - LINK kio-shared kdeprint-shared + LINK kio-shared tdeprint-shared DESTINATION ${BIN_INSTALL_DIR} ) diff --git a/kiconedit/Makefile.am b/kiconedit/Makefile.am index b0ec8a42..96d32fd2 100644 --- a/kiconedit/Makefile.am +++ b/kiconedit/Makefile.am @@ -11,8 +11,8 @@ kiconedit_SOURCES = utils.cpp main.cpp kiconedit.cpp kicongrid.cpp \ kiconedit_METASOURCES = AUTO # the library search path. -kiconedit_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor -kiconedit_LDADD = $(LIB_KFILE) -lkdeprint +kiconedit_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor +kiconedit_LDADD = $(LIB_KFILE) -ltdeprint DISTCLEANFILES = *~ .deps/* .libs/* diff --git a/kmrml/kmrml/CMakeLists.txt b/kmrml/kmrml/CMakeLists.txt index 3d491827..20f6edb5 100644 --- a/kmrml/kmrml/CMakeLists.txt +++ b/kmrml/kmrml/CMakeLists.txt @@ -54,9 +54,9 @@ tde_add_kpart( libkmrmlpart AUTOMOC ) -##### mrmlsearch (kdeinit) ###################### +##### mrmlsearch (tdeinit) ###################### -tde_add_kdeinit_executable( mrmlsearch AUTOMOC +tde_add_tdeinit_executable( mrmlsearch AUTOMOC SOURCES mrmlsearch.cpp - LINK kmrmlstuff-static kdecore-shared + LINK kmrmlstuff-static tdecore-shared ) diff --git a/kmrml/kmrml/Makefile.am b/kmrml/kmrml/Makefile.am index 440e1123..bfedadd8 100644 --- a/kmrml/kmrml/Makefile.am +++ b/kmrml/kmrml/Makefile.am @@ -30,7 +30,7 @@ servicemenudir = $(kde_datadir)/konqueror/servicemenus ############################################# bin_PROGRAMS = lib_LTLIBRARIES = -kdeinit_LTLIBRARIES = mrmlsearch.la +tdeinit_LTLIBRARIES = mrmlsearch.la mrmlsearch_la_LIBADD = $(LIB_KMRMLSTUFF) $(LIB_KDECORE) mrmlsearch_la_LDFLAGS = $(all_libraries) -module -avoid-version diff --git a/kmrml/kmrml/mrml_part.cpp b/kmrml/kmrml/mrml_part.cpp index c35e6607..542d3b9c 100644 --- a/kmrml/kmrml/mrml_part.cpp +++ b/kmrml/kmrml/mrml_part.cpp @@ -284,7 +284,7 @@ bool MrmlPart::openURL( const KURL& url ) "kmrml_ask_configure_gift" ) == KMessageBox::Yes ) { - KApplication::kdeinitExec( "kcmshell", + KApplication::tdeinitExec( "kcmshell", TQString::tqfromLatin1("kcmkmrml")); settqStatus( NeedCollection ); return false; diff --git a/kmrml/kmrml/server/CMakeLists.txt b/kmrml/kmrml/server/CMakeLists.txt index 430f2c39..f51a9b80 100644 --- a/kmrml/kmrml/server/CMakeLists.txt +++ b/kmrml/kmrml/server/CMakeLists.txt @@ -30,6 +30,6 @@ INSTALL( FILES daemonwatcher.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kded ) tde_add_kpart( kded_daemonwatcher AUTOMOC SOURCES watcher.cpp watcher.skel - LINK kmrmlstuff-static kparts-shared kio-shared kdeinit_kded-shared + LINK kmrmlstuff-static kparts-shared kio-shared tdeinit_kded-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kolourpaint/CMakeLists.txt b/kolourpaint/CMakeLists.txt index 3f6e2daa..ee5f064c 100644 --- a/kolourpaint/CMakeLists.txt +++ b/kolourpaint/CMakeLists.txt @@ -60,6 +60,6 @@ tde_add_executable( kolourpaint AUTOMOC LINK kolourpainttools-static kolourpaintpixmapfx-static kolourpaintcursors-static kolourpaintviews-static kolourpaintwidgets-static - kdeprint-shared + tdeprint-shared DESTINATION ${BIN_INSTALL_DIR} ) diff --git a/kolourpaint/Makefile.am b/kolourpaint/Makefile.am index a8045c5c..681097e6 100644 --- a/kolourpaint/Makefile.am +++ b/kolourpaint/Makefile.am @@ -39,7 +39,7 @@ kolourpaint_SOURCES = kolourpaint.cpp \ kpviewmanager.cpp \ kpviewscrollablecontainer.cpp \ kpwidgetmapper.cpp -kolourpaint_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +kolourpaint_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor kolourpaint_LDADD = $(LIB_KDEPRINT) \ cursors/libkolourpaintcursors.la \ pixmapfx/libkolourpaintpixmapfx.la \ diff --git a/kooka/CMakeLists.txt b/kooka/CMakeLists.txt index a45f3983..37b3984b 100644 --- a/kooka/CMakeLists.txt +++ b/kooka/CMakeLists.txt @@ -43,6 +43,6 @@ tde_add_executable( kooka AUTOMOC dwmenuaction.cpp kocrbase.cpp kocrgocr.cpp kocrkadmos.cpp kadmosocr.cpp ocrword.cpp ocrresedit.cpp kookaprint.cpp imgprintdialog.cpp kocrocrad.cpp - LINK kscan-shared kparts-shared kdeprint-shared + LINK kscan-shared kparts-shared tdeprint-shared DESTINATION ${BIN_INSTALL_DIR} ) diff --git a/kooka/Makefile.am b/kooka/Makefile.am index ec4adf29..4384fa76 100644 --- a/kooka/Makefile.am +++ b/kooka/Makefile.am @@ -16,8 +16,8 @@ kooka_SOURCES = main.cpp kooka.cpp kookaview.cpp kookapref.cpp \ kocrocrad.cpp # pagesetup.cpp -kooka_LDADD = $(LIB_KFILE) -lkdeprint -lktexteditor $(LIBTIFF) $(top_builddir)/libkscan/libkscan.la $(KADMOS_LIB) $(LIB_KSPELL) -kooka_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +kooka_LDADD = $(LIB_KFILE) -ltdeprint -lktexteditor $(LIBTIFF) $(top_builddir)/libkscan/libkscan.la $(KADMOS_LIB) $(LIB_KSPELL) +kooka_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor INCLUDES = -I$(top_srcdir)/libkscan $(all_includes) $(LIBSANE_INCLUDES) $(KADMOS_INC) diff --git a/kooka/imgprintdialog.h b/kooka/imgprintdialog.h index 3176afb8..38c00a67 100644 --- a/kooka/imgprintdialog.h +++ b/kooka/imgprintdialog.h @@ -29,7 +29,7 @@ #include <tqmap.h> #include <tqcheckbox.h> -#include <kdeprint/kprintdialogpage.h> +#include <tdeprint/kprintdialogpage.h> #include "kookaimage.h" diff --git a/kooka/kookaprint.h b/kooka/kookaprint.h index d1470251..a7b63f46 100644 --- a/kooka/kookaprint.h +++ b/kooka/kookaprint.h @@ -31,7 +31,7 @@ #include <tqmap.h> #include <tqstring.h> #include <kprinter.h> -#include <kdeprint/kprintdialogpage.h> +#include <tdeprint/kprintdialogpage.h> class KookaImage; class KPrinter; diff --git a/kpdf/CMakeLists.txt b/kpdf/CMakeLists.txt index 682038d2..5b76c014 100644 --- a/kpdf/CMakeLists.txt +++ b/kpdf/CMakeLists.txt @@ -45,7 +45,7 @@ tde_add_kpart( libkpdfpart AUTOMOC LINK kpdfconf-static kpdfui-static kpdfcore-static generatorkimgio-static generatorpdf-static xpdf-static goo-static splash-static fofi-static - kutils-shared kdeprint-shared kparts-shared ${PAPER_LIBRARY} ${XFT_LIBRARIES} + kutils-shared tdeprint-shared kparts-shared ${PAPER_LIBRARY} ${XFT_LIBRARIES} DEPENDENCIES kpdfconf-static DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kpdf/part.cpp b/kpdf/part.cpp index 0f8f2d9f..529bfca2 100644 --- a/kpdf/part.cpp +++ b/kpdf/part.cpp @@ -39,7 +39,7 @@ #include <kdirwatch.h> #include <kinstance.h> #include <kprinter.h> -#include <kdeprint/kprintdialogpage.h> +#include <tdeprint/kprintdialogpage.h> #include <kstdaction.h> #include <kdeversion.h> #include <kparts/genericfactory.h> diff --git a/kpdf/shell/Makefile.am b/kpdf/shell/Makefile.am index d5fcc83f..e3c55578 100644 --- a/kpdf/shell/Makefile.am +++ b/kpdf/shell/Makefile.am @@ -5,7 +5,7 @@ METASOURCES = AUTO bin_PROGRAMS = kpdf kpdf_SOURCES = main.cpp shell.cpp -kpdf_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +kpdf_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor kpdf_LDADD = $(LIB_KPARTS) EXTRA_DIST = kpdf.desktop diff --git a/kpovmodeler/Makefile.am b/kpovmodeler/Makefile.am index 717b80b3..0125891a 100644 --- a/kpovmodeler/Makefile.am +++ b/kpovmodeler/Makefile.am @@ -227,7 +227,7 @@ libkpovmodelerpart_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) bin_PROGRAMS = kpovmodeler kpovmodeler_SOURCES = main.cpp -kpovmodeler_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +kpovmodeler_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor kpovmodeler_LDADD = libkpovmodeler.la dummy.cpp: diff --git a/kpovmodeler/kdoc.rules b/kpovmodeler/kdoc.rules index 6b5d40a6..7a8d984d 100644 --- a/kpovmodeler/kdoc.rules +++ b/kpovmodeler/kdoc.rules @@ -6,5 +6,5 @@ kde_MODULES = kpovmodeler kpovmodeler_FILES = *.h -kpovmodeler_LIBS = -lkdeui -lkparts -lkdecore -ldcop -lkfile -lkio -lqt -p +kpovmodeler_LIBS = -ltdeui -lkparts -ltdecore -ldcop -lkfile -lkio -lqt -p kpovmodeler_PATH = .
\ No newline at end of file diff --git a/kruler/CMakeLists.txt b/kruler/CMakeLists.txt index 660acfc7..9798b11e 100644 --- a/kruler/CMakeLists.txt +++ b/kruler/CMakeLists.txt @@ -35,6 +35,6 @@ install( FILES uninstall.desktop DESTINATION ${APPS_INSTALL_DIR}/Graphics RENAME tde_add_executable( kruler AUTOMOC SOURCES klineal.cpp main.cpp - LINK kdeui-shared + LINK tdeui-shared DESTINATION ${BIN_INSTALL_DIR} ) diff --git a/kruler/Makefile.am b/kruler/Makefile.am index cf12df74..8014ece0 100644 --- a/kruler/Makefile.am +++ b/kruler/Makefile.am @@ -4,7 +4,7 @@ INCLUDES= $(all_includes) bin_PROGRAMS = kruler kruler_METASOURCES = AUTO -kruler_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +kruler_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor kruler_LDADD = $(LIB_KDEUI) kruler_SOURCES = klineal.cpp main.cpp diff --git a/ksnapshot/CMakeLists.txt b/ksnapshot/CMakeLists.txt index b5d5fd3e..24a7945c 100644 --- a/ksnapshot/CMakeLists.txt +++ b/ksnapshot/CMakeLists.txt @@ -40,6 +40,6 @@ tde_add_executable( ksnapshot AUTOMOC SOURCES ksnapshotiface.skel main.cpp ksnapshot.cpp regiongrabber.cpp windowgrabber.cpp ksnapshotwidget.ui - LINK kdeprint-shared + LINK tdeprint-shared DESTINATION ${BIN_INSTALL_DIR} ) diff --git a/ksnapshot/Makefile.am b/ksnapshot/Makefile.am index 26707695..a8676f30 100644 --- a/ksnapshot/Makefile.am +++ b/ksnapshot/Makefile.am @@ -2,7 +2,7 @@ bin_PROGRAMS= ksnapshot INCLUDES = -DKSNAPVERSION="\"0.7\"" $(all_includes) -ksnapshot_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +ksnapshot_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor ksnapshot_LDADD = $(LIB_KDEPRINT) ksnapshot_SOURCES = ksnapshotiface.skel main.cpp ksnapshot.cpp \ diff --git a/ksvg/impl/svgpathparser.cc b/ksvg/impl/svgpathparser.cc index 590ac2ba..4392e0b9 100644 --- a/ksvg/impl/svgpathparser.cc +++ b/ksvg/impl/svgpathparser.cc @@ -393,7 +393,7 @@ SVGPathParser::parseSVG( const TQString &s, bool process ) // This works by converting the SVG arc to "simple" beziers. // For each bezier found a svgToCurve call is done. -// Adapted from Niko's code in kdelibs/kdecore/svgicons. +// Adapted from Niko's code in kdelibs/tdecore/svgicons. // Maybe this can serve in some shared lib? (Rob) void SVGPathParser::calculateArc(bool relative, double &curx, double &cury, double angle, double x, double y, double r1, double r2, bool largeArcFlag, bool sweepFlag) diff --git a/ksvg/test/external/Makefile.am b/ksvg/test/external/Makefile.am index 3b7530c7..f6d57a64 100644 --- a/ksvg/test/external/Makefile.am +++ b/ksvg/test/external/Makefile.am @@ -6,8 +6,8 @@ bin_PROGRAMS = svgdisplay printnodetest svgdisplay_SOURCES = SVGTestWidget.cc svgdisplay.cc svgdisplay_LDADD = $(LIB_KDECORE) ../../libksvg.la -svgdisplay_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +svgdisplay_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor printnodetest_SOURCES = printnodetest.cpp printnodetest_LDADD = $(LIB_KDECORE) ../../libksvg.la -printnodetest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +printnodetest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor diff --git a/kuickshow/ChangeLog b/kuickshow/ChangeLog index 55a198b2..33767a5d 100644 --- a/kuickshow/ChangeLog +++ b/kuickshow/ChangeLog @@ -279,7 +279,7 @@ Mon Mar 5 00:12:45 2001 Carsten Pfeiffer <pfeiffer@kde.org> image window * Makefile.am - build as KLM (kdeinit-loadable-module) to speed up startup + build as KLM (tdeinit-loadable-module) to speed up startup * hah! Adding two lines makes browsing about twice as fast :) Well, equally as fast as the KDE1 version at least ;) The new caching @@ -404,7 +404,7 @@ Fri Nov 3 01:49:57 2000 Carsten Pfeiffer <pfeiffer@kde.org> the window works properly again. NETWM/KWin handling is better now. Also better handling of non-loadable files. - Will make it a kdeinit-loadable module (KLM) for fast startup-times + Will make it a tdeinit-loadable module (KLM) for fast startup-times later. Finally using it again reminds me how fast it is compared to, erm, the diff --git a/kuickshow/src/CMakeLists.txt b/kuickshow/src/CMakeLists.txt index 5ab3f39f..21d145ce 100644 --- a/kuickshow/src/CMakeLists.txt +++ b/kuickshow/src/CMakeLists.txt @@ -27,14 +27,14 @@ tde_install_icons( kuickshow ) install( FILES kuickshow.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} ) -##### kuickshow (kdeinit) ####################### +##### kuickshow (tdeinit) ####################### -tde_add_kdeinit_executable( kuickshow AUTOMOC +tde_add_tdeinit_executable( kuickshow AUTOMOC SOURCES kuickshow.cpp aboutwidget.cpp generalwidget.cpp kuickconfigdlg.cpp main.cpp defaultswidget.cpp imagewindow.cpp kuickdata.cpp imdata.cpp filefinder.cpp kurlwidget.cpp filewidget.cpp kuick.cpp imlibwidget.cpp slideshowwidget.cpp printing.cpp kuickfile.cpp kuickimage.cpp filecache.cpp - LINK kdeprint-shared ${IMLIB_LIBRARIES} + LINK tdeprint-shared ${IMLIB_LIBRARIES} ) diff --git a/kuickshow/src/Makefile.am b/kuickshow/src/Makefile.am index 57c92388..c541b30c 100644 --- a/kuickshow/src/Makefile.am +++ b/kuickshow/src/Makefile.am @@ -2,7 +2,7 @@ bin_PROGRAMS = lib_LTLIBRARIES = -kdeinit_LTLIBRARIES = kuickshow.la +tdeinit_LTLIBRARIES = kuickshow.la # set the include path for X, qt and KDE INCLUDES = $(all_includes) diff --git a/kuickshow/src/printing.h b/kuickshow/src/printing.h index 065ea310..36dd4b32 100644 --- a/kuickshow/src/printing.h +++ b/kuickshow/src/printing.h @@ -22,7 +22,7 @@ #include <tqfontmetrics.h> #include <tqstring.h> -#include <kdeprint/kprintdialogpage.h> +#include <tdeprint/kprintdialogpage.h> class TQCheckBox; class TQRadioButton; diff --git a/kview/CMakeLists.txt b/kview/CMakeLists.txt index 44ff4460..1d34c3ef 100644 --- a/kview/CMakeLists.txt +++ b/kview/CMakeLists.txt @@ -35,9 +35,9 @@ install( FILES kview.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} ) install( FILES kviewui.rc DESTINATION ${DATA_INSTALL_DIR}/kview ) -##### kview (kdeinit) ########################### +##### kview (tdeinit) ########################### -tde_add_kdeinit_executable( kview AUTOMOC +tde_add_tdeinit_executable( kview AUTOMOC SOURCES kview.cpp main.cpp LINK kparts-shared kutils-shared ) diff --git a/kview/Makefile.am b/kview/Makefile.am index 2acb3133..590a0c7b 100644 --- a/kview/Makefile.am +++ b/kview/Makefile.am @@ -6,7 +6,7 @@ METASOURCES = AUTO bin_PROGRAMS = lib_LTLIBRARIES = -kdeinit_LTLIBRARIES = kview.la +tdeinit_LTLIBRARIES = kview.la noinst_HEADERS = kview.h diff --git a/kview/config/CMakeLists.txt b/kview/config/CMakeLists.txt index 5024be81..53b97f03 100644 --- a/kview/config/CMakeLists.txt +++ b/kview/config/CMakeLists.txt @@ -32,6 +32,6 @@ install( FILES kview.setdlg DESTINATION ${DATA_INSTALL_DIR}/kview ) tde_add_kpart( kcm_kviewgeneralconfig AUTOMOC SOURCES kviewconfmodules.cpp - LINK kdeui-shared + LINK tdeui-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kview/kviewcanvas/config/CMakeLists.txt b/kview/kviewcanvas/config/CMakeLists.txt index c7837242..99fbb78f 100644 --- a/kview/kviewcanvas/config/CMakeLists.txt +++ b/kview/kviewcanvas/config/CMakeLists.txt @@ -31,6 +31,6 @@ install( FILES tde_add_kpart( kcm_kviewcanvasconfig AUTOMOC SOURCES generalconfigwidget.ui confmodules.cpp - LINK kdeui-shared + LINK tdeui-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kview/kviewcanvas/test/Makefile.am b/kview/kviewcanvas/test/Makefile.am index 7188a518..c6a2b08c 100644 --- a/kview/kviewcanvas/test/Makefile.am +++ b/kview/kviewcanvas/test/Makefile.am @@ -5,5 +5,5 @@ METASOURCES = AUTO check_PROGRAMS = test test_SOURCES = main.cpp test.cpp -test_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +test_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor test_LDADD = $(LIB_KPARTS) $(top_builddir)/kview/kimageviewer/libkimageviewer.la diff --git a/kview/kviewviewer/CMakeLists.txt b/kview/kviewviewer/CMakeLists.txt index 59860d9f..aea04495 100644 --- a/kview/kviewviewer/CMakeLists.txt +++ b/kview/kviewviewer/CMakeLists.txt @@ -35,6 +35,6 @@ tde_add_kpart( libkviewviewer AUTOMOC SOURCES printimagesettings.ui imagesettings.cpp kviewkonqextension.cpp kviewviewer.cpp - LINK kimageviewer-shared kutils-shared kdeprint-shared + LINK kimageviewer-shared kutils-shared tdeprint-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kview/kviewviewer/imagesettings.h b/kview/kviewviewer/imagesettings.h index 4d8b2144..8e1f6c68 100644 --- a/kview/kviewviewer/imagesettings.h +++ b/kview/kviewviewer/imagesettings.h @@ -19,7 +19,7 @@ #ifndef IMAGESETTINGS_H #define IMAGESETTINGS_H -#include <kdeprint/kprintdialogpage.h> +#include <tdeprint/kprintdialogpage.h> class TQCheckBox; diff --git a/kview/kviewviewer/test/Makefile.am b/kview/kviewviewer/test/Makefile.am index 688efb30..d3e00137 100644 --- a/kview/kviewviewer/test/Makefile.am +++ b/kview/kviewviewer/test/Makefile.am @@ -5,5 +5,5 @@ METASOURCES = AUTO check_PROGRAMS = test test_SOURCES = main.cpp test.cpp -test_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +test_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor test_LDADD = $(LIB_KPARTS) diff --git a/kview/modules/browser/Makefile.am b/kview/modules/browser/Makefile.am index 001eefd0..2cbafea8 100644 --- a/kview/modules/browser/Makefile.am +++ b/kview/modules/browser/Makefile.am @@ -3,7 +3,7 @@ INCLUDES = -I$(top_srcdir)/kview $(all_includes) kde_module_LTLIBRARIES = kview_browserplugin.la kview_browserplugin_la_SOURCES = kmyfileitemlist.cpp kviewbrowser.cpp -kview_browserplugin_la_LIBADD = $(LIB_KFILE) $(LIB_KPARTS) -lkdeprint +kview_browserplugin_la_LIBADD = $(LIB_KFILE) $(LIB_KPARTS) -ltdeprint kview_browserplugin_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) plugdir = $(kde_datadir)/kviewviewer/kpartplugins diff --git a/kview/modules/effects/Makefile.am b/kview/modules/effects/Makefile.am index 64205856..aefaa6c2 100644 --- a/kview/modules/effects/Makefile.am +++ b/kview/modules/effects/Makefile.am @@ -3,7 +3,7 @@ INCLUDES = -I$(top_srcdir)/kview $(all_includes) kde_module_LTLIBRARIES = kview_effectsplugin.la kview_effectsplugin_la_SOURCES = kvieweffects.cpp -kview_effectsplugin_la_LIBADD = $(LIB_KFILE) $(LIB_KPARTS) -lkdeprint +kview_effectsplugin_la_LIBADD = $(LIB_KFILE) $(LIB_KPARTS) -ltdeprint kview_effectsplugin_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) plugdir = $(kde_datadir)/kview/kpartplugins diff --git a/kview/modules/scale/Makefile.am b/kview/modules/scale/Makefile.am index 39442781..463f7a1e 100644 --- a/kview/modules/scale/Makefile.am +++ b/kview/modules/scale/Makefile.am @@ -3,7 +3,7 @@ INCLUDES = -I$(top_srcdir)/kview $(all_includes) kde_module_LTLIBRARIES = kview_scale.la kview_scale_la_SOURCES = kfloatspinbox.cpp scaledlg.cpp kview_scale.cpp -kview_scale_la_LIBADD = $(LIB_KFILE) $(LIB_KPARTS) -lkdeprint +kview_scale_la_LIBADD = $(LIB_KFILE) $(LIB_KPARTS) -ltdeprint kview_scale_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) plugdir = $(kde_datadir)/kviewviewer/kpartplugins diff --git a/kview/modules/scanner/Makefile.am b/kview/modules/scanner/Makefile.am index 83a22b32..40ed2d88 100644 --- a/kview/modules/scanner/Makefile.am +++ b/kview/modules/scanner/Makefile.am @@ -3,7 +3,7 @@ INCLUDES = -I$(top_srcdir)/kview $(all_includes) kde_module_LTLIBRARIES = kview_scannerplugin.la kview_scannerplugin_la_SOURCES = kviewscanner.cpp -kview_scannerplugin_la_LIBADD = $(LIB_KFILE) $(LIB_KPARTS) -lkdeprint +kview_scannerplugin_la_LIBADD = $(LIB_KFILE) $(LIB_KPARTS) -ltdeprint kview_scannerplugin_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) plugdir = $(kde_datadir)/kview/kpartplugins diff --git a/kview/modules/template/Makefile.am b/kview/modules/template/Makefile.am index 29ddc94c..9254048c 100644 --- a/kview/modules/template/Makefile.am +++ b/kview/modules/template/Makefile.am @@ -3,7 +3,7 @@ INCLUDES = -I$(top_srcdir)/kview $(all_includes) kde_module_LTLIBRARIES = kview_templateplugin.la kview_templateplugin_la_SOURCES = kviewtemplate.cpp -kview_templateplugin_la_LIBADD = $(LIB_KFILE) $(LIB_KPARTS) -lkdeprint +kview_templateplugin_la_LIBADD = $(LIB_KFILE) $(LIB_KPARTS) -ltdeprint kview_templateplugin_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) plugdir = $(kde_datadir)/kview/kpartplugins diff --git a/kviewshell/CMakeLists.txt b/kviewshell/CMakeLists.txt index dc28b4f8..8a9de930 100644 --- a/kviewshell/CMakeLists.txt +++ b/kviewshell/CMakeLists.txt @@ -78,7 +78,7 @@ tde_add_library( kmultipage SHARED AUTOMOC selection.cpp documentRenderer.cpp history.cpp kvsprefs.kcfgc tableOfContents.cpp kprintDialogPage_pageoptions.cpp VERSION 0.0.0 - LINK kparts-shared kdeprint-shared + LINK kparts-shared tdeprint-shared DESTINATION ${LIB_INSTALL_DIR} ) diff --git a/kviewshell/Makefile.am b/kviewshell/Makefile.am index 3cf71a7b..8b8bcebd 100644 --- a/kviewshell/Makefile.am +++ b/kviewshell/Makefile.am @@ -30,7 +30,7 @@ libkmultipage_la_SOURCES = kmultipage.cpp pageView.cpp marklist.cpp kmultipageIn kde_kcfg_DATA = kviewshell.kcfg libkmultipage_la_LDFLAGS = $(all_libraries) -libkmultipage_la_LIBADD = $(LIB_KFILE) -lkdeprint -lkparts +libkmultipage_la_LIBADD = $(LIB_KFILE) -ltdeprint -lkparts emptymultipagepart_la_SOURCES = empty_multipage.cpp emptyRenderer.cpp emptymultipagepart_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module @@ -39,7 +39,7 @@ emptymultipagepart_la_LIBADD = -lkparts libkmultipage.la libkviewshell_la_SOURCES = kviewshell.cpp kviewshell_SOURCES = main.cpp -kviewshell_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +kviewshell_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor kviewshell_LDADD = libkviewshell.la ./libifaces.la -lkparts kviewshellinclude_HEADERS = anchor.h bookmark.h pageView.h documentPageCache.h documentRenderer.h documentWidget.h \ diff --git a/kviewshell/documentWidget.h b/kviewshell/documentWidget.h index fcec6646..491cfc36 100644 --- a/kviewshell/documentWidget.h +++ b/kviewshell/documentWidget.h @@ -177,7 +177,7 @@ private: static TQColor backgroundColorForCorners; /** The following tables store grey values for roundish shadow - corners. They were shamelessly stolen from kdelibs/kdefx/kstyle.cpp. */ + corners. They were shamelessly stolen from kdelibs/tdefx/kstyle.cpp. */ static const int bottom_right_corner[16]; static const int bottom_left_corner[16]; static const int shadow_strip[4]; diff --git a/kviewshell/kmultipage.cpp b/kviewshell/kmultipage.cpp index afe04fd1..7fc41986 100644 --- a/kviewshell/kmultipage.cpp +++ b/kviewshell/kmultipage.cpp @@ -639,7 +639,7 @@ void KMultiPage::handleLocalLink(const TQString &linkText) TQStringList args; args << "openURL"; args << Link_Url.toString(); - kapp->kdeinitExec("kfmclient", args); + kapp->tdeinitExec("kfmclient", args); } } } diff --git a/kviewshell/kprintDialogPage_pageoptions.h b/kviewshell/kprintDialogPage_pageoptions.h index 8fea375f..8b3ff434 100644 --- a/kviewshell/kprintDialogPage_pageoptions.h +++ b/kviewshell/kprintDialogPage_pageoptions.h @@ -11,7 +11,7 @@ #ifndef KPRINTDIALOGPAGE_PAGEOPTIONS_H #define KPRINTDIALOGPAGE_PAGEOPTIONS_H -#include <kdeprint/kprintdialogpage.h> +#include <tdeprint/kprintdialogpage.h> class TQCheckBox; class TQVBoxLayout; diff --git a/kviewshell/plugins/djvu/Makefile.am b/kviewshell/plugins/djvu/Makefile.am index c0124821..1dba2502 100644 --- a/kviewshell/plugins/djvu/Makefile.am +++ b/kviewshell/plugins/djvu/Makefile.am @@ -18,7 +18,7 @@ shellrcdir = $(kde_datadir)/kviewshell/plugins/djvu kde_module_LTLIBRARIES = djvuviewpart.la djvuviewpart_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module -djvuviewpart_la_LIBADD = -lkdeprint -lkparts $(top_builddir)/kviewshell/libkmultipage.la libdjvu/libdjvu.la +djvuviewpart_la_LIBADD = -ltdeprint -lkparts $(top_builddir)/kviewshell/libkmultipage.la libdjvu/libdjvu.la djvuviewpart_la_SOURCES = djvumultipage.cpp djvurenderer.cpp kprintDialogPage_DJVUpageoptions.cpp \ kprintDialogPage_DJVUconversionoptions.cpp kprintDialogPage_DJVUconversionoptions_basewidget.ui \ pageRangeWidget_base.ui pageRangeWidget.cpp \ diff --git a/kviewshell/plugins/djvu/kprintDialogPage_DJVUconversionoptions.h b/kviewshell/plugins/djvu/kprintDialogPage_DJVUconversionoptions.h index c1ec4b3c..0c15d1ea 100644 --- a/kviewshell/plugins/djvu/kprintDialogPage_DJVUconversionoptions.h +++ b/kviewshell/plugins/djvu/kprintDialogPage_DJVUconversionoptions.h @@ -21,7 +21,7 @@ #ifndef KPRINTDIALOGPAGE_DJVUCONVERSIONOPTIONS_H #define KPRINTDIALOGPAGE_DJVUCONVERSIONOPTIONS_H -#include <kdeprint/kprintdialogpage.h> +#include <tdeprint/kprintdialogpage.h> class kprintDialogPage_DJVUconversionoptions_basewidget; diff --git a/kviewshell/plugins/djvu/kprintDialogPage_DJVUpageoptions.h b/kviewshell/plugins/djvu/kprintDialogPage_DJVUpageoptions.h index 5bb5833e..c23b7efb 100644 --- a/kviewshell/plugins/djvu/kprintDialogPage_DJVUpageoptions.h +++ b/kviewshell/plugins/djvu/kprintDialogPage_DJVUpageoptions.h @@ -11,7 +11,7 @@ #define KPRINTDIALOGPAGE_DJVUPAGEOPTIONS_H -#include <kdeprint/kprintdialogpage.h> +#include <tdeprint/kprintdialogpage.h> class TQVBoxLayout; |