Rename kdewidgets => tdewidgets

CMakeLists.txt

@@ -1049,7 +1049,7 @@ tde_conditional_add_subdirectory( WITH_XRANDR tderandr )
 add_subdirectory( tdehtml )
 add_subdirectory( tdecmshell )
 add_subdirectory( tdeconf_update )
-add_subdirectory( kdewidgets )
+add_subdirectory( tdewidgets )
 add_subdirectory( kimgio )
 add_subdirectory( tdeioslave )
 add_subdirectory( tdestyles )

Makefile.am.in

@@ -28,7 +28,7 @@ COMPILE_BEFORE_kate = interfaces tdeutils
 COMPILE_BEFORE_tdemdi = tdeutils
 COMPILE_BEFORE_tdespell2 = tdeutils
 COMPILE_BEFORE_tdecmshell = tdeutils
-COMPILE_BEFORE_kdewidgets = tdeabc tdehtml
+COMPILE_BEFORE_tdewidgets = tdeabc tdehtml
 COMPILE_BEFORE_interfaces = arts tdeabc
 
 $(top_srcdir)/acinclude.m4: $(top_srcdir)/libltdl/ltdl.m4

README

@@ -66,7 +66,7 @@ Here is an alphabetical list:
     KSpell and related classes are a frontend to ispell for use within a
     GUI app.
 
-* kdewidgets
+* tdewidgets
     For developers: KDE's custom widgets for Qt Designer.
 
 * kdoctools

admin

@@ -1 +1 @@
-Subproject commit 9f768663f33e818a14dff26b403bae12a447a9ec
+Subproject commit bae6da3fa84fa5d9cce73cf89968d61f1766e91d

cmake

@@ -1 +1 @@
-Subproject commit b51b691c8b18f5e7cf01689752c9b03a4212bdf6
+Subproject commit d29f6d6b10fe1748c2a5fb1f9f2cdcecc473d354

configure.in.in

@@ -99,7 +99,7 @@ DCOPIDLNG="compiled"
 MEINPROC="compiled"
 KDECONFIG="compiled"
 KCONFIG_COMPILER="compiled"
-MAKEKDEWIDGETS="compiled"
+MAKETDEWIDGETS="compiled"
 
 dnl Checks for libraries etc
 AC_BASE_PATH_KDE([don't test]) dnl tdelibs is a special case
@@ -307,7 +307,7 @@ AC_SUBST(ICE_RLIB, 'ICE/libkICE.la')
 AC_SUBST(DCOPIDL, '$(top_builddir)/dcop/dcopidl/dcopidl')
 AC_SUBST(DCOPIDLNG, '$(top_srcdir)/dcop/dcopidlng/dcopidlng')
 AC_SUBST(DCOPIDL2CPP, '$(top_builddir)/dcop/dcopidl2cpp/dcopidl2cpp')
-AC_SUBST(MAKEKDEWIDGETS, '$(top_builddir)/kdewidgets/maketdewidgets')
+AC_SUBST(MAKETDEWIDGETS, '$(top_builddir)/tdewidgets/maketdewidgets')
 AC_SUBST(KCONFIG_COMPILER, '$(top_builddir)/tdecore/tdeconfig_compiler/tdeconfig_compiler')
 
 ac_save_LIBS="$LIBS"

tdewidgets/CMakeLists.txt

@@ -46,16 +46,16 @@ tde_add_executable( ${target}
   DESTINATION ${BIN_INSTALL_DIR}
 )
 
-##### kdewidgets ################################
+##### tdewidgets ################################
 
-set( target kdewidgets )
+set( target tdewidgets )
 
 set( ${target}_SRCS
-  classpreviews.cpp kdewidgets.cpp
+  classpreviews.cpp tdewidgets.cpp
 )
 
-add_custom_command( OUTPUT kdewidgets.cpp
-  COMMAND ./maketdewidgets -o kdewidgets.cpp ${CMAKE_CURRENT_SOURCE_DIR}/kde.widgets
+add_custom_command( OUTPUT tdewidgets.cpp
+  COMMAND ./maketdewidgets -o tdewidgets.cpp ${CMAKE_CURRENT_SOURCE_DIR}/kde.widgets
   DEPENDS maketdewidgets ${CMAKE_CURRENT_SOURCE_DIR}/kde.widgets
 )
 

tdewidgets/Makefile.am

@@ -28,13 +28,13 @@ maketdewidgets_SOURCES = maketdewidgets.cpp
 maketdewidgets_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 maketdewidgets_LDADD = $(LIB_QT) ../tdecore/libtdecore.la 
 
-kde_widget_LTLIBRARIES = kdewidgets.la
-kdewidgets_la_LDFLAGS = $(KDE_PLUGIN) -module $(all_libraries)
-kdewidgets_la_LIBADD = $(LIB_TDEIO) $(LIB_TDEABC) $(LIB_QT) $(LIB_TDEUI) $(LIB_TDECORE)
-kdewidgets_la_SOURCES = classpreviews.cpp kdewidgets.cpp
+kde_widget_LTLIBRARIES = tdewidgets.la
+tdewidgets_la_LDFLAGS = $(KDE_PLUGIN) -module $(all_libraries)
+tdewidgets_la_LIBADD = $(LIB_TDEIO) $(LIB_TDEABC) $(LIB_QT) $(LIB_TDEUI) $(LIB_TDECORE)
+tdewidgets_la_SOURCES = classpreviews.cpp tdewidgets.cpp
 
-kdewidgets.cpp: $(srcdir)/kde.widgets maketdewidgets
-	./maketdewidgets -o kdewidgets.cpp $(srcdir)/kde.widgets
+tdewidgets.cpp: $(srcdir)/kde.widgets maketdewidgets
+	./maketdewidgets -o tdewidgets.cpp $(srcdir)/kde.widgets
 
-CLEANFILES = kdewidgets.cpp
+CLEANFILES = tdewidgets.cpp
 

tdewidgets/README

@@ -9,7 +9,7 @@ This directory contains KDE custom widgets for designer 2 which comes with
 Qt 3. Just make sure your plugin path in qtconfig includes
 $TDEDIR/lib/trinity/plugins . With the KDE build system nothing special 
 (i.e. editing the plugin path) is needed, as uic will automatically be
-called with -L <path to the kdewidgets plugin> .
+called with -L <path to the tdewidgets plugin> .
 
 This plugin uses the QWidget plugin API of Qt >= 3.0
 Don't expect it to work with any other versions of Qt.

tdewidgets/kde.widgets

@@ -1,7 +1,7 @@
 [Global]
 PluginName=KDEWidgets
 Includes=kinstance.h,classpreviews.h
-Init=new TDEInstance("kdewidgets");
+Init=new TDEInstance("tdewidgets");
 
 [KActiveLabel]
 ToolTip=Active Label (KDE)

tdewidgets/pics/CMakeLists.txt

@@ -24,4 +24,4 @@ install( FILES
     kintnuminput.png krestrictedline.png ktextedit.png
     kurlcomborequester.png kkeybutton.png kpalettetable.png
     tdeactionselector.png kdatetable.png kdatetimewidget.png
-  DESTINATION ${DATA_INSTALL_DIR}/kdewidgets/pics )
+  DESTINATION ${DATA_INSTALL_DIR}/tdewidgets/pics )

tdewidgets/pics/Makefile.am

@@ -1,4 +1,4 @@
-kdewidgetsdata_DATA =  klineedit.png ktextbrowser.png kpasswordedit.png kdatewidget.png \
+tdewidgetsdata_DATA =  klineedit.png ktextbrowser.png kpasswordedit.png kdatewidget.png \
              tdefontrequester.png kurlrequester.png kcombobox.png kiconview.png kintspinbox.png \
              kled.png ksqueezedtextlabel.png  kprogress.png kurllabel.png \
              kruler.png tdecmodule.png kdoublespinbox.png kdoublenuminput.png \
@@ -12,6 +12,6 @@ kdewidgetsdata_DATA =  klineedit.png ktextbrowser.png kpasswordedit.png kdatewid
 	     tdeactionselector.png kdatetable.png kdatetimewidget.png 
 
 
-kdewidgetsdatadir = $(kde_datadir)/kdewidgets/pics
+tdewidgetsdatadir = $(kde_datadir)/tdewidgets/pics
 
-EXTRA_DIST = $(kdewidgetsdata_DATA)
+EXTRA_DIST = $(tdewidgetsdata_DATA)

tdewidgets/tests/Makefile.am

@@ -23,7 +23,7 @@ check-local: testwithpixmaps.cpp testkde.cpp
 # md5sum -c $(srcdir)/sums
 
 testwithpixmaps.cpp: $(srcdir)/test.widgets
-	../maketdewidgets -o testwithpixmaps.cpp -p $(top_srcdir)/kdewidgets/pics $(srcdir)/test.widgets
+	../maketdewidgets -o testwithpixmaps.cpp -p $(top_srcdir)/tdewidgets/pics $(srcdir)/test.widgets
 testkde.cpp: $(srcdir)/test.widgets
 	../maketdewidgets -o testkde.cpp $(srcdir)/test.widgets
 

tdewidgets/tests/test.widgets

@@ -1,7 +1,7 @@
 [Global]
 PluginName=KDEWidgets
 Includes=kinstance.h,classpreviews.h
-Init=new TDEInstance("kdewidgets");
+Init=new TDEInstance("tdewidgets");
 
 [KActiveLabel]
 ToolTip=Active Label (KDE)

win/pro_files/tdewidgets/tdewidgets.pro

@@ -3,11 +3,11 @@ CONFIG += trinitylib #this is a dynamic kde library
 
 include( $(KDELIBS)/win/common.pro )
 
-system( maketdewidgets -o kdewidgets.cpp kde.widgets )
+system( maketdewidgets -o tdewidgets.cpp kde.widgets )
 
 #no _d because it's a special case
 
-TARGET = kdewidgets
+TARGET = tdewidgets
 
 DESTDIR		= $$KDELIBDESTDIR/trinity/plugins/designer
 
@@ -16,5 +16,5 @@ LIBS +=  $$KDELIBDESTDIR/tdecore$$KDELIB_SUFFIX $$KDELIBDESTDIR/tdeio$$KDELIB_SU
 	$$KDELIBDESTDIR/tdeabc$$KDELIB_SUFFIX $$KDELIBDESTDIR/tdeutils$$KDELIB_SUFFIX \
 	$$KDELIBDESTDIR/tderesources$$KDELIB_SUFFIX 
 
-SOURCES += classpreviews.cpp kdewidgets.cpp
+SOURCES += classpreviews.cpp tdewidgets.cpp
 

win/tools/build_tdelibs_dbg

@@ -68,12 +68,12 @@ kate/part \
 	cd $pwd
 done
 
-cd kdewidgets
+cd tdewidgets
 qmake maketdewidgets.pro && $make clean && $make || exit 1
 qmake && $make clean && $make || exit 1
 
-# copy kdewidgets plugin for Qt Designer
-cp $TDEDIR/lib/trinity/plugins/designer/kdewidgets.dll $QTDIR/plugins/designer/
+# copy tdewidgets plugin for Qt Designer
+cp $TDEDIR/lib/trinity/plugins/designer/tdewidgets.dll $QTDIR/plugins/designer/
 
 cd $pwd