diff options
Diffstat (limited to 'kdeui')
-rw-r--r-- | kdeui/CMakeLists.txt | 12 | ||||
-rw-r--r-- | kdeui/Makefile.am | 12 | ||||
-rw-r--r-- | kdeui/about/CMakeLists.txt | 2 | ||||
-rw-r--r-- | kdeui/about/Makefile.am | 2 | ||||
-rw-r--r-- | kdeui/kaboutkde.cpp | 2 | ||||
-rw-r--r-- | kdeui/kactivelabel.cpp | 2 | ||||
-rw-r--r-- | kdeui/kcmodule.cpp | 2 | ||||
-rw-r--r-- | kdeui/kdepackages.h | 42 | ||||
-rw-r--r-- | kdeui/kdetrayproxy/CMakeLists.txt | 6 | ||||
-rw-r--r-- | kdeui/kpanelmenu.cpp | 2 | ||||
-rw-r--r-- | kdeui/kpanelmenu.h | 4 | ||||
-rw-r--r-- | kdeui/kpassdlg.cpp | 4 | ||||
-rw-r--r-- | kdeui/kpixmapio.cpp | 2 | ||||
-rw-r--r-- | kdeui/kpixmapio.h | 2 | ||||
-rw-r--r-- | kdeui/kpixmapregionselectorwidget.cpp | 4 | ||||
-rw-r--r-- | kdeui/kpixmapregionselectorwidget.h | 4 | ||||
-rw-r--r-- | kdeui/krootpixmap.cpp | 2 | ||||
-rw-r--r-- | kdeui/ktip.cpp | 4 | ||||
-rw-r--r-- | kdeui/libkdeui.nmcheck | 2 | ||||
-rw-r--r-- | kdeui/qxembed.cpp | 4 | ||||
-rw-r--r-- | kdeui/tests/CMakeLists.txt | 8 | ||||
-rw-r--r-- | kdeui/tests/Makefile.am | 2 |
22 files changed, 63 insertions, 63 deletions
diff --git a/kdeui/CMakeLists.txt b/kdeui/CMakeLists.txt index 2623a1cea..284a37409 100644 --- a/kdeui/CMakeLists.txt +++ b/kdeui/CMakeLists.txt @@ -21,10 +21,10 @@ include_directories( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_BINARY_DIR} - ${CMAKE_BINARY_DIR}/kdecore + ${CMAKE_BINARY_DIR}/tdecore ${CMAKE_SOURCE_DIR}/dcop - ${CMAKE_SOURCE_DIR}/kdecore - ${CMAKE_SOURCE_DIR}/kdefx + ${CMAKE_SOURCE_DIR}/tdecore + ${CMAKE_SOURCE_DIR}/tdefx ${CMAKE_SOURCE_DIR}/kio ${CMAKE_SOURCE_DIR}/kio/kio ${CMAKE_SOURCE_DIR}/kio/kfile @@ -84,7 +84,7 @@ install( FILES install( FILES aboutkde.png ktip-bulb.png ktip-background.png - DESTINATION ${DATA_INSTALL_DIR}/kdeui/pics ) + DESTINATION ${DATA_INSTALL_DIR}/tdeui/pics ) install( FILES ui_standards.rc @@ -97,7 +97,7 @@ install( PROGRAMS ##### libtdeui ################################## -set( target kdeui ) +set( target tdeui ) set( ${target}_SRCS qxembed.cpp ksharedpixmap.cpp kpixmapio.cpp @@ -148,7 +148,7 @@ set( ${target}_SRCS tde_add_library( ${target} SHARED AUTOMOC SOURCES ${${target}_SRCS} VERSION 4.2.0 - LINK kdecore-shared ${FREETYPE_LIBRARIES} ${FONTCONFIG_LIBRARIES} + LINK tdecore-shared ${FREETYPE_LIBRARIES} ${FONTCONFIG_LIBRARIES} DEPENDENCIES dcopidl DESTINATION ${LIB_INSTALL_DIR} ) diff --git a/kdeui/Makefile.am b/kdeui/Makefile.am index 66719d8b1..4752cdb95 100644 --- a/kdeui/Makefile.am +++ b/kdeui/Makefile.am @@ -20,7 +20,7 @@ SUBDIRS = . tests about kdetrayproxy -INCLUDES= -I/usr/include/freetype2/ -I$(top_srcdir)/kdefx -I$(top_srcdir)/interfaces $(all_includes) +INCLUDES= -I/usr/include/freetype2/ -I$(top_srcdir)/tdefx -I$(top_srcdir)/interfaces $(all_includes) # For the future: examine if condensing the tons of *_LDFLAGS variables # into $(all_libraries) isn't better @@ -28,12 +28,12 @@ AM_LDFLAGS = $(LDFLAGS_AS_NEEDED) $(LDFLAGS_NEW_DTAGS) lib_LTLIBRARIES = libtdeui.la libkspell.la libtdeui_la_LDFLAGS = $(KDE_MT_LDFLAGS) -no-undefined -version-info 6:0:2 -libtdeui_la_LIBADD = ../kdecore/libtdecore.la $(LIB_QT) $(top_builddir)/dcop/libDCOP.la $(LIB_X11) $(top_builddir)/kdefx/libtdefx.la $(LIB_XEXT) +libtdeui_la_LIBADD = ../tdecore/libtdecore.la $(LIB_QT) $(top_builddir)/dcop/libDCOP.la $(LIB_X11) $(top_builddir)/tdefx/libtdefx.la $(LIB_XEXT) libkspell_la_LDFLAGS = $(KDE_MT_LDFLAGS) -version-info 6:0:2 -no-undefined libkspell_la_SOURCES = dummy.cpp -picsdir = $(kde_datadir)/kdeui/pics +picsdir = $(kde_datadir)/tdeui/pics pics_DATA = aboutkde.png ktip-bulb.png ktip-background.png include_HEADERS = kprogressbox.h kprogress.h kcolordlg.h \ @@ -135,8 +135,8 @@ scriptsdir = $(kde_bindir) libtdeui_la_METASOURCES = AUTO libtdeui_la_NMCHECK = $(srcdir)/libtdeui.nmcheck -libtdeui_la_NMCHECKWEAK = $(srcdir)/libtdeui_weak.nmcheck $(top_srcdir)/kdecore/libtdecore_weak.nmcheck \ - $(top_srcdir)/dcop/libDCOP_weak.nmcheck $(top_srcdir)/kdecore/libqt-mt_weak.nmcheck +libtdeui_la_NMCHECKWEAK = $(srcdir)/libtdeui_weak.nmcheck $(top_srcdir)/tdecore/libtdecore_weak.nmcheck \ + $(top_srcdir)/dcop/libDCOP_weak.nmcheck $(top_srcdir)/tdecore/libqt-mt_weak.nmcheck rcdir = $(kde_confdir)/ui rc_DATA = ui_standards.rc @@ -166,6 +166,6 @@ dummy.cpp: echo "}" >> dummy.cpp echo "#endif" >> dummy.cpp -DOXYGEN_REFERENCES = kdecore kdefx dcop kio kutils +DOXYGEN_REFERENCES = tdecore tdefx dcop kio kutils DOXYGEN_SET_INTERNAL_DOCS = YES include ../admin/Doxyfile.am diff --git a/kdeui/about/CMakeLists.txt b/kdeui/about/CMakeLists.txt index 63b43e462..7330005e2 100644 --- a/kdeui/about/CMakeLists.txt +++ b/kdeui/about/CMakeLists.txt @@ -18,4 +18,4 @@ install( FILES box-top-left.png bar-middle-right.png box-bottom-left.png box-top-middle.png bar-top-left.png box-bottom-middle.png box-top-right.png bar-top-middle.png box-bottom-right.png kde_infopage.css kde_infopage_rtl.css - DESTINATION ${DATA_INSTALL_DIR}/kdeui/about ) + DESTINATION ${DATA_INSTALL_DIR}/tdeui/about ) diff --git a/kdeui/about/Makefile.am b/kdeui/about/Makefile.am index 6bff21130..478bb71e0 100644 --- a/kdeui/about/Makefile.am +++ b/kdeui/about/Makefile.am @@ -1,5 +1,5 @@ -kde_infopage_datadir = $(kde_datadir)/kdeui/about +kde_infopage_datadir = $(kde_datadir)/tdeui/about kde_infopage_data_DATA = \ bar-bottom-left.png bar-top-right.png bar-bottom-middle.png bottom-left.png \ box-middle-left.png top-left.png bar-bottom-right.png bottom-middle.png \ diff --git a/kdeui/kaboutkde.cpp b/kdeui/kaboutkde.cpp index 807604c47..b520e8380 100644 --- a/kdeui/kaboutkde.cpp +++ b/kdeui/kaboutkde.cpp @@ -82,6 +82,6 @@ KAboutKDE::KAboutKDE( TQWidget *parent, const char *name, bool modal ) addTextPage( i18n("&Report Bugs or Wishes"), text2, true ); addTextPage( i18n("&Join the Trinity Team"), text3, true ); addTextPage( i18n("&Support Trinity"), text4, true ); - setImage( locate( "data", TQString::tqfromLatin1("kdeui/pics/aboutkde.png")) ); + setImage( locate( "data", TQString::tqfromLatin1("tdeui/pics/aboutkde.png")) ); setImageBackgroundColor( white ); } diff --git a/kdeui/kactivelabel.cpp b/kdeui/kactivelabel.cpp index 0315e348d..e16de1374 100644 --- a/kdeui/kactivelabel.cpp +++ b/kdeui/kactivelabel.cpp @@ -74,7 +74,7 @@ void KActiveLabel::openLink(const TQString & link) TQStringList args; args << "exec" << link; - kapp->kdeinitExec("kfmclient", args); + kapp->tdeinitExec("kfmclient", args); } void KActiveLabel::virtual_hook( int, void* ) diff --git a/kdeui/kcmodule.cpp b/kdeui/kcmodule.cpp index 0c26d11ec..7d82d2957 100644 --- a/kdeui/kcmodule.cpp +++ b/kdeui/kcmodule.cpp @@ -1,7 +1,7 @@ /* This file is part of the KDE libraries -<<<Copyright (c) 2001 Michael Goffioul <[email protected]> +<<<Copyright (c) 2001 Michael Goffioul <[email protected]> Copyright (C) 2004 Frans Englich <[email protected]> This library is free software; you can redistribute it and/or diff --git a/kdeui/kdepackages.h b/kdeui/kdepackages.h index 28248210a..0f146975b 100644 --- a/kdeui/kdepackages.h +++ b/kdeui/kdepackages.h @@ -414,11 +414,11 @@ const char * const packages[] = { "kdelibs", "kdelibs/kbugreport", "kdelibs/kcertpart", -"kdelibs/kdecore", +"kdelibs/tdecore", "kdelibs/kded", -"kdelibs/kdeinit", -"kdelibs/kdesasl", -"kdelibs/kdeui", +"kdelibs/tdeinit", +"kdelibs/tdesasl", +"kdelibs/tdeui", "kdelibs/kedittoolbar", "kdelibs/kimgio", "kdelibs/klauncher", @@ -437,20 +437,20 @@ const char * const packages[] = { "kdelirc/kcmlirc", "kdemultimedia", "kdepasswd", -"kdepimlibs", -"kdepimlibs/gpgme++", -"kdepimlibs/kabc", -"kdepimlibs/kblog", -"kdepimlibs/kcal", -"kdepimlibs/kldap", -"kdepimlibs/kmime", -"kdepimlibs/kpimidentities", -"kdepimlibs/mailtransport", -"kdepimlibs/qgpgme", -"kdepimlibs/syndication", -"kdeprint", -"kdeprint/kdeprintfax", -"kdeprint/kjobviewer", +"tdepimlibs", +"tdepimlibs/gpgme++", +"tdepimlibs/kabc", +"tdepimlibs/kblog", +"tdepimlibs/kcal", +"tdepimlibs/kldap", +"tdepimlibs/kmime", +"tdepimlibs/kpimidentities", +"tdepimlibs/mailtransport", +"tdepimlibs/qgpgme", +"tdepimlibs/syndication", +"tdeprint", +"tdeprint/tdeprintfax", +"tdeprint/kjobviewer", "kdesdk-scripts", "kdesdk-scripts/Miscellaneous", "kdesdk-scripts/cmake", @@ -460,9 +460,9 @@ const char * const packages[] = { "kdesktop/minicli", "kdesktop/wallpaper", "kdessh", -"kdesu", -"kdesu/kdesu", -"kdesu/kdesud", +"tdesu", +"tdesu/tdesu", +"tdesu/tdesud", "kdesvn-build", "kdetv", "kdevelop", diff --git a/kdeui/kdetrayproxy/CMakeLists.txt b/kdeui/kdetrayproxy/CMakeLists.txt index 1d26e60a5..be341b277 100644 --- a/kdeui/kdetrayproxy/CMakeLists.txt +++ b/kdeui/kdetrayproxy/CMakeLists.txt @@ -12,10 +12,10 @@ include_directories( ${TQT_INCLUDE_DIRS} ${CMAKE_CURRENT_BINARY_DIR} - ${CMAKE_BINARY_DIR}/kdecore + ${CMAKE_BINARY_DIR}/tdecore ${CMAKE_SOURCE_DIR}/dcop ${CMAKE_SOURCE_DIR}/kded - ${CMAKE_SOURCE_DIR}/kdecore + ${CMAKE_SOURCE_DIR}/tdecore ) link_directories( @@ -40,7 +40,7 @@ set( ${target}_SRCS tde_add_kpart( ${target} AUTOMOC SOURCES ${${target}_SRCS} - LINK kdecore-shared kdeinit_kded-shared + LINK tdecore-shared tdeinit_kded-shared DEPENDENCIES dcopidl DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kdeui/kpanelmenu.cpp b/kdeui/kpanelmenu.cpp index c1431a22e..ed13502a4 100644 --- a/kdeui/kpanelmenu.cpp +++ b/kdeui/kpanelmenu.cpp @@ -1,7 +1,7 @@ /***************************************************************** Copyright (c) 1996-2000 the kicker authors. See file AUTHORS. - (c) Michael Goffioul <[email protected]> + (c) Michael Goffioul <[email protected]> Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/kdeui/kpanelmenu.h b/kdeui/kpanelmenu.h index de0b065eb..7db6393b2 100644 --- a/kdeui/kpanelmenu.h +++ b/kdeui/kpanelmenu.h @@ -1,7 +1,7 @@ /***************************************************************** Copyright (c) 1996-2000 the kicker authors. See file AUTHORS. - (c) 2001 Michael Goffioul <[email protected]> + (c) 2001 Michael Goffioul <[email protected]> Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -48,7 +48,7 @@ class KPanelMenuPrivate; * library name without any extension). This desktop file has to be installed in * $KDEDIR/share/apps/kicker/menuext/. * - * @author The kicker maintainers, Michael Goffioul <[email protected]> + * @author The kicker maintainers, Michael Goffioul <[email protected]> */ class KDEUI_EXPORT KPanelMenu : public KPopupMenu { diff --git a/kdeui/kpassdlg.cpp b/kdeui/kpassdlg.cpp index dad923c62..c10a1b673 100644 --- a/kdeui/kpassdlg.cpp +++ b/kdeui/kpassdlg.cpp @@ -49,7 +49,7 @@ #include "kpassdlg.h" -#include "../kdesu/defaults.h" +#include "../tdesu/defaults.h" /* * Password line editor. @@ -339,7 +339,7 @@ void KPasswordDialog::init() KConfig* const cfg = KGlobal::config(); const KConfigGroupSaver saver(cfg, "Passwords"); - bool def = ( qstrcmp( tqAppName(), "kdesu" ) == 0 ? defKeep : false ); + bool def = ( qstrcmp( tqAppName(), "tdesu" ) == 0 ? defKeep : false ); if (m_Keep && cfg->readBoolEntry("Keep", def)) ++m_Keep; diff --git a/kdeui/kpixmapio.cpp b/kdeui/kpixmapio.cpp index 4d1e3c06a..1900da11f 100644 --- a/kdeui/kpixmapio.cpp +++ b/kdeui/kpixmapio.cpp @@ -1,7 +1,7 @@ /* vi: ts=8 sts=4 sw=4 * * - * This file is part of the KDE project, module kdeui. + * This file is part of the KDE project, module tdeui. * Copyright (C) 2000 Geert Jansen <[email protected]>. * * You can Freely distribute this program under the GNU Library General diff --git a/kdeui/kpixmapio.h b/kdeui/kpixmapio.h index 4913de580..62bde1c35 100644 --- a/kdeui/kpixmapio.h +++ b/kdeui/kpixmapio.h @@ -1,7 +1,7 @@ /* vi: ts=8 sts=4 sw=4 * * - * This file is part of the KDE project, module kdeui. + * This file is part of the KDE project, module tdeui. * Copyright (C) 2000 Geert Jansen <[email protected]> * * You can Freely distribute this program under the GNU Library General diff --git a/kdeui/kpixmapregionselectorwidget.cpp b/kdeui/kpixmapregionselectorwidget.cpp index df096067e..1af5ef14a 100644 --- a/kdeui/kpixmapregionselectorwidget.cpp +++ b/kdeui/kpixmapregionselectorwidget.cpp @@ -18,8 +18,8 @@ */ /* NOTE: There are two copies of this .h and the .cpp file, with subtle differences. - * One copy is in kdelibs/kdeui, and the other copy is in kdepim/libtdepim - * This is because kdepim has to remain backwards compatible. Any changes + * One copy is in kdelibs/tdeui, and the other copy is in tdepim/libtdepim + * This is because tdepim has to remain backwards compatible. Any changes * to either file should be made to the other. */ diff --git a/kdeui/kpixmapregionselectorwidget.h b/kdeui/kpixmapregionselectorwidget.h index 3709f1fde..6bd518c93 100644 --- a/kdeui/kpixmapregionselectorwidget.h +++ b/kdeui/kpixmapregionselectorwidget.h @@ -34,8 +34,8 @@ class KPopupMenu; * user with a friendly way to select a rectangular subregion of the pixmap. * * NOTE: There are two copies of this .h and the .cpp file, with subtle differences. - * One copy is in kdelibs/kdeui, and the other copy is in kdepim/libtdepim - * This is because kdepim has to remain backwards compatible. Any changes + * One copy is in kdelibs/tdeui, and the other copy is in tdepim/libtdepim + * This is because tdepim has to remain backwards compatible. Any changes * to either file should be made to the other. * * @author Antonio Larrosa <[email protected]> diff --git a/kdeui/krootpixmap.cpp b/kdeui/krootpixmap.cpp index 8dbdf6149..6f664b9a0 100644 --- a/kdeui/krootpixmap.cpp +++ b/kdeui/krootpixmap.cpp @@ -1,7 +1,7 @@ /* vi: ts=8 sts=4 sw=4 * * - * This file is part of the KDE project, module kdeui. + * This file is part of the KDE project, module tdeui. * Copyright (C) 1999,2000 Geert Jansen <[email protected]> * * You can Freely distribute this program under the GNU Library diff --git a/kdeui/ktip.cpp b/kdeui/ktip.cpp index f8e30fcd1..8ccd23945 100644 --- a/kdeui/ktip.cpp +++ b/kdeui/ktip.cpp @@ -216,11 +216,11 @@ KTipDialog::KTipDialog(KTipDatabase *db, TQWidget *parent, const char *name) TQHBoxLayout *pl = new TQHBoxLayout(vbox, 0, 0); TQLabel *bulb = new TQLabel(this); - bulb->setPixmap(locate("data", "kdeui/pics/ktip-bulb.png")); + bulb->setPixmap(locate("data", "tdeui/pics/ktip-bulb.png")); pl->addWidget(bulb); TQLabel *titlePane = new TQLabel(this); - titlePane->setBackgroundPixmap(locate("data", "kdeui/pics/ktip-background.png")); + titlePane->setBackgroundPixmap(locate("data", "tdeui/pics/ktip-background.png")); titlePane->setText(i18n("Did you know...?\n")); titlePane->setFont(TQFont(KGlobalSettings::generalFont().family(), 20, TQFont::Bold)); titlePane->tqsetAlignment(TQLabel::AlignCenter); diff --git a/kdeui/libkdeui.nmcheck b/kdeui/libkdeui.nmcheck index 8f9ee9237..df40cf046 100644 --- a/kdeui/libkdeui.nmcheck +++ b/kdeui/libkdeui.nmcheck @@ -1,5 +1,5 @@ # KDE namespace check file -# kdeui classes +# tdeui classes K*::* QXEmbed::* diff --git a/kdeui/qxembed.cpp b/kdeui/qxembed.cpp index 6288fea57..03d9ca1d2 100644 --- a/kdeui/qxembed.cpp +++ b/kdeui/qxembed.cpp @@ -447,7 +447,7 @@ static int qxembed_x11_event_filter( XEvent* e) extra->embedded = 1; #ifdef USE_QT4 // [FIXME] - printf("[FIXME] WId not set in kdelibs/kdeui/qxembed.cpp\n\r"); + printf("[FIXME] WId not set in kdelibs/tdeui/qxembed.cpp\n\r"); #else // USE_QT4 extra->parentWinId = e->xclient.data.l[3]; #endif // USE_QT4 @@ -1320,7 +1320,7 @@ void QXEmbed::embedClientIntoWindow(TQWidget* client, WId window) ((QXEmbed*)client)->topData()->embedded = true; #ifdef USE_QT4 // [FIXME] - printf("[FIXME] WId not set in kdelibs/kdeui/qxembed.cpp\n\r"); + printf("[FIXME] WId not set in kdelibs/tdeui/qxembed.cpp\n\r"); #else // USE_QT4 ((QXEmbed*)client)->topData()->parentWinId = window; #endif // USE_QT4 diff --git a/kdeui/tests/CMakeLists.txt b/kdeui/tests/CMakeLists.txt index c6baf54ab..3cc853235 100644 --- a/kdeui/tests/CMakeLists.txt +++ b/kdeui/tests/CMakeLists.txt @@ -12,9 +12,9 @@ include_directories( ${TQT_INCLUDE_DIRS} ${CMAKE_CURRENT_BINARY_DIR} - ${CMAKE_SOURCE_DIR}/kdecore - ${CMAKE_SOURCE_DIR}/kdeui - ${CMAKE_SOURCE_DIR}/kdefx + ${CMAKE_SOURCE_DIR}/tdecore + ${CMAKE_SOURCE_DIR}/tdeui + ${CMAKE_SOURCE_DIR}/tdefx ${CMAKE_SOURCE_DIR}/dcop ) @@ -45,5 +45,5 @@ set( test_PROGS ) foreach( PROG ${test_PROGS} ) - tde_add_executable( ${PROG} AUTOMOC SOURCES "${PROG}.cpp" LINK kdeui-shared ) + tde_add_executable( ${PROG} AUTOMOC SOURCES "${PROG}.cpp" LINK tdeui-shared ) endforeach( PROG ${test_PROGS} ) diff --git a/kdeui/tests/Makefile.am b/kdeui/tests/Makefile.am index 607196380..b919ab3b4 100644 --- a/kdeui/tests/Makefile.am +++ b/kdeui/tests/Makefile.am @@ -17,7 +17,7 @@ # the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, # Boston, MA 02110-1301, USA. -INCLUDES = -I$(top_srcdir)/kdefx -I$(top_srcdir)/kdecore -I$(top_srcdir)/kdeui \ +INCLUDES = -I$(top_srcdir)/tdefx -I$(top_srcdir)/tdecore -I$(top_srcdir)/tdeui \ $(all_includes) AM_LDFLAGS = $(QT_LDFLAGS) $(X_LDFLAGS) $(KDE_RPATH) |