summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2013-12-23 13:14:38 +0100
committerSlávek Banko <slavek.banko@axis.cz>2013-12-23 13:14:38 +0100
commite1062b5b6bd0edc320ab967816743d7a52bbeeb6 (patch)
treee679ff2fd6f44a45c056bc306bc3eec5b353c901
parent7f8e73d6f561a95fc6d7084149ded936f0d69c42 (diff)
downloadtdelibs-e1062b5b6bd0edc320ab967816743d7a52bbeeb6.tar.gz
tdelibs-e1062b5b6bd0edc320ab967816743d7a52bbeeb6.zip
Rename kdewidgets => tdewidgets
-rw-r--r--CMakeLists.txt2
-rw-r--r--Makefile.am.in2
-rw-r--r--README2
m---------admin0
m---------cmake0
-rw-r--r--configure.in.in4
-rw-r--r--tdewidgets/AUTHORS (renamed from kdewidgets/AUTHORS)0
-rw-r--r--tdewidgets/CMakeLists.txt (renamed from kdewidgets/CMakeLists.txt)10
-rw-r--r--tdewidgets/Makefile.am (renamed from kdewidgets/Makefile.am)14
-rw-r--r--tdewidgets/README (renamed from kdewidgets/README)2
-rw-r--r--tdewidgets/classpreviews.cpp (renamed from kdewidgets/classpreviews.cpp)0
-rw-r--r--tdewidgets/classpreviews.h (renamed from kdewidgets/classpreviews.h)0
-rw-r--r--tdewidgets/kde.widgets (renamed from kdewidgets/kde.widgets)2
-rw-r--r--tdewidgets/maketdewidgets.cpp (renamed from kdewidgets/maketdewidgets.cpp)0
-rw-r--r--tdewidgets/pics/CMakeLists.txt (renamed from kdewidgets/pics/CMakeLists.txt)2
-rw-r--r--tdewidgets/pics/Makefile.am (renamed from kdewidgets/pics/Makefile.am)6
-rw-r--r--tdewidgets/pics/kactivelabel.png (renamed from kdewidgets/pics/kactivelabel.png)bin1271 -> 1271 bytes
-rw-r--r--tdewidgets/pics/kcharselect.png (renamed from kdewidgets/pics/kcharselect.png)bin1288 -> 1288 bytes
-rw-r--r--tdewidgets/pics/kcolorbutton.png (renamed from kdewidgets/pics/kcolorbutton.png)bin226 -> 226 bytes
-rw-r--r--tdewidgets/pics/kcolorcombo.png (renamed from kdewidgets/pics/kcolorcombo.png)bin557 -> 557 bytes
-rw-r--r--tdewidgets/pics/kcombobox.png (renamed from kdewidgets/pics/kcombobox.png)bin1212 -> 1212 bytes
-rw-r--r--tdewidgets/pics/kdatepicker.png (renamed from kdewidgets/pics/kdatepicker.png)bin965 -> 965 bytes
-rw-r--r--tdewidgets/pics/kdatetable.png (renamed from kdewidgets/pics/kdatetable.png)bin268 -> 268 bytes
-rw-r--r--tdewidgets/pics/kdatetimewidget.png (renamed from kdewidgets/pics/kdatetimewidget.png)bin702 -> 702 bytes
-rw-r--r--tdewidgets/pics/kdatewidget.png (renamed from kdewidgets/pics/kdatewidget.png)bin1232 -> 1232 bytes
-rw-r--r--tdewidgets/pics/kdialog.png (renamed from kdewidgets/pics/kdialog.png)bin1077 -> 1077 bytes
-rw-r--r--tdewidgets/pics/kdoublenuminput.png (renamed from kdewidgets/pics/kdoublenuminput.png)bin833 -> 833 bytes
-rw-r--r--tdewidgets/pics/kdoublespinbox.png (renamed from kdewidgets/pics/kdoublespinbox.png)bin833 -> 833 bytes
-rw-r--r--tdewidgets/pics/kdualcolorbutton.png (renamed from kdewidgets/pics/kdualcolorbutton.png)bin377 -> 377 bytes
-rw-r--r--tdewidgets/pics/keditlistbox.png (renamed from kdewidgets/pics/keditlistbox.png)bin662 -> 662 bytes
-rw-r--r--tdewidgets/pics/kgradientselector.png (renamed from kdewidgets/pics/kgradientselector.png)bin180 -> 180 bytes
-rw-r--r--tdewidgets/pics/khistorycombo.png (renamed from kdewidgets/pics/khistorycombo.png)bin1262 -> 1262 bytes
-rw-r--r--tdewidgets/pics/khsselector.png (renamed from kdewidgets/pics/khsselector.png)bin693 -> 693 bytes
-rw-r--r--tdewidgets/pics/kiconbutton.png (renamed from kdewidgets/pics/kiconbutton.png)bin1170 -> 1170 bytes
-rw-r--r--tdewidgets/pics/kiconview.png (renamed from kdewidgets/pics/kiconview.png)bin662 -> 662 bytes
-rw-r--r--tdewidgets/pics/kintnuminput.png (renamed from kdewidgets/pics/kintnuminput.png)bin805 -> 805 bytes
-rw-r--r--tdewidgets/pics/kintspinbox.png (renamed from kdewidgets/pics/kintspinbox.png)bin1288 -> 1288 bytes
-rw-r--r--tdewidgets/pics/kkeybutton.png (renamed from kdewidgets/pics/kkeybutton.png)bin771 -> 771 bytes
-rw-r--r--tdewidgets/pics/kled.png (renamed from kdewidgets/pics/kled.png)bin557 -> 557 bytes
-rw-r--r--tdewidgets/pics/klineedit.png (renamed from kdewidgets/pics/klineedit.png)bin1170 -> 1170 bytes
-rw-r--r--tdewidgets/pics/kpalettetable.png (renamed from kdewidgets/pics/kpalettetable.png)bin236 -> 236 bytes
-rw-r--r--tdewidgets/pics/kpasswordedit.png (renamed from kdewidgets/pics/kpasswordedit.png)bin568 -> 568 bytes
-rw-r--r--tdewidgets/pics/kprogress.png (renamed from kdewidgets/pics/kprogress.png)bin1068 -> 1068 bytes
-rw-r--r--tdewidgets/pics/kpushbutton.png (renamed from kdewidgets/pics/kpushbutton.png)bin1221 -> 1221 bytes
-rw-r--r--tdewidgets/pics/krestrictedline.png (renamed from kdewidgets/pics/krestrictedline.png)bin688 -> 688 bytes
-rw-r--r--tdewidgets/pics/kruler.png (renamed from kdewidgets/pics/kruler.png)bin226 -> 226 bytes
-rw-r--r--tdewidgets/pics/ksqueezedtextlabel.png (renamed from kdewidgets/pics/ksqueezedtextlabel.png)bin170 -> 170 bytes
-rw-r--r--tdewidgets/pics/ktextbrowser.png (renamed from kdewidgets/pics/ktextbrowser.png)bin1448 -> 1448 bytes
-rw-r--r--tdewidgets/pics/ktextedit.png (renamed from kdewidgets/pics/ktextedit.png)bin1451 -> 1451 bytes
-rw-r--r--tdewidgets/pics/ktimewidget.png (renamed from kdewidgets/pics/ktimewidget.png)bin818 -> 818 bytes
-rw-r--r--tdewidgets/pics/kurlcomborequester.png (renamed from kdewidgets/pics/kurlcomborequester.png)bin823 -> 823 bytes
-rw-r--r--tdewidgets/pics/kurllabel.png (renamed from kdewidgets/pics/kurllabel.png)bin320 -> 320 bytes
-rw-r--r--tdewidgets/pics/kurlrequester.png (renamed from kdewidgets/pics/kurlrequester.png)bin569 -> 569 bytes
-rw-r--r--tdewidgets/pics/tdeactionselector.png (renamed from kdewidgets/pics/tdeactionselector.png)bin282 -> 282 bytes
-rw-r--r--tdewidgets/pics/tdecmodule.png (renamed from kdewidgets/pics/tdecmodule.png)bin1340 -> 1340 bytes
-rw-r--r--tdewidgets/pics/tdefontcombo.png (renamed from kdewidgets/pics/tdefontcombo.png)bin1194 -> 1194 bytes
-rw-r--r--tdewidgets/pics/tdefontrequester.png (renamed from kdewidgets/pics/tdefontrequester.png)bin1035 -> 1035 bytes
-rw-r--r--tdewidgets/pics/tdelistbox.png (renamed from kdewidgets/pics/tdelistbox.png)bin1035 -> 1035 bytes
-rw-r--r--tdewidgets/pics/tdelistview.png (renamed from kdewidgets/pics/tdelistview.png)bin1185 -> 1185 bytes
-rw-r--r--tdewidgets/tests/Makefile.am (renamed from kdewidgets/tests/Makefile.am)2
-rw-r--r--tdewidgets/tests/README (renamed from kdewidgets/tests/README)0
-rw-r--r--tdewidgets/tests/sums (renamed from kdewidgets/tests/sums)0
-rw-r--r--tdewidgets/tests/test.widgets (renamed from kdewidgets/tests/test.widgets)2
-rw-r--r--win/pro_files/tdewidgets/maketdewidgets.pro (renamed from win/pro_files/kdewidgets/maketdewidgets.pro)0
-rw-r--r--win/pro_files/tdewidgets/tdewidgets.pro (renamed from win/pro_files/kdewidgets/kdewidgets.pro)6
-rw-r--r--win/tools/build_tdelibs_dbg6
66 files changed, 31 insertions, 31 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 53cfe8119..51ddfc9b4 100644
--- a/CMakeLists.txt
+++ b/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 )
diff --git a/Makefile.am.in b/Makefile.am.in
index 10a07b429..b7bfdf012 100644
--- a/Makefile.am.in
+++ b/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
diff --git a/README b/README
index 01674c3ba..47f0327bd 100644
--- a/README
+++ b/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
diff --git a/admin b/admin
-Subproject 9f768663f33e818a14dff26b403bae12a447a9e
+Subproject bae6da3fa84fa5d9cce73cf89968d61f1766e91
diff --git a/cmake b/cmake
-Subproject b51b691c8b18f5e7cf01689752c9b03a4212bdf
+Subproject d29f6d6b10fe1748c2a5fb1f9f2cdcecc473d35
diff --git a/configure.in.in b/configure.in.in
index 92bf3c22d..16b63b68c 100644
--- a/configure.in.in
+++ b/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"
diff --git a/kdewidgets/AUTHORS b/tdewidgets/AUTHORS
index 1c8341527..1c8341527 100644
--- a/kdewidgets/AUTHORS
+++ b/tdewidgets/AUTHORS
diff --git a/kdewidgets/CMakeLists.txt b/tdewidgets/CMakeLists.txt
index ce8c223a9..2874d6544 100644
--- a/kdewidgets/CMakeLists.txt
+++ b/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
)
diff --git a/kdewidgets/Makefile.am b/tdewidgets/Makefile.am
index 5633b9c1d..894d33393 100644
--- a/kdewidgets/Makefile.am
+++ b/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
diff --git a/kdewidgets/README b/tdewidgets/README
index a1b236ef3..d0ce8fcab 100644
--- a/kdewidgets/README
+++ b/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.
diff --git a/kdewidgets/classpreviews.cpp b/tdewidgets/classpreviews.cpp
index 0ba98f8bf..0ba98f8bf 100644
--- a/kdewidgets/classpreviews.cpp
+++ b/tdewidgets/classpreviews.cpp
diff --git a/kdewidgets/classpreviews.h b/tdewidgets/classpreviews.h
index c2b67f27e..c2b67f27e 100644
--- a/kdewidgets/classpreviews.h
+++ b/tdewidgets/classpreviews.h
diff --git a/kdewidgets/kde.widgets b/tdewidgets/kde.widgets
index 04db6f0d5..787b6f336 100644
--- a/kdewidgets/kde.widgets
+++ b/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)
diff --git a/kdewidgets/maketdewidgets.cpp b/tdewidgets/maketdewidgets.cpp
index 535ad0526..535ad0526 100644
--- a/kdewidgets/maketdewidgets.cpp
+++ b/tdewidgets/maketdewidgets.cpp
diff --git a/kdewidgets/pics/CMakeLists.txt b/tdewidgets/pics/CMakeLists.txt
index f398f174d..b12179d43 100644
--- a/kdewidgets/pics/CMakeLists.txt
+++ b/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 )
diff --git a/kdewidgets/pics/Makefile.am b/tdewidgets/pics/Makefile.am
index 0d4ee1e61..40b4311cc 100644
--- a/kdewidgets/pics/Makefile.am
+++ b/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)
diff --git a/kdewidgets/pics/kactivelabel.png b/tdewidgets/pics/kactivelabel.png
index 4b935a008..4b935a008 100644
--- a/kdewidgets/pics/kactivelabel.png
+++ b/tdewidgets/pics/kactivelabel.png
Binary files differ
diff --git a/kdewidgets/pics/kcharselect.png b/tdewidgets/pics/kcharselect.png
index 0bdeec8ff..0bdeec8ff 100644
--- a/kdewidgets/pics/kcharselect.png
+++ b/tdewidgets/pics/kcharselect.png
Binary files differ
diff --git a/kdewidgets/pics/kcolorbutton.png b/tdewidgets/pics/kcolorbutton.png
index 14a237249..14a237249 100644
--- a/kdewidgets/pics/kcolorbutton.png
+++ b/tdewidgets/pics/kcolorbutton.png
Binary files differ
diff --git a/kdewidgets/pics/kcolorcombo.png b/tdewidgets/pics/kcolorcombo.png
index 7f987ea63..7f987ea63 100644
--- a/kdewidgets/pics/kcolorcombo.png
+++ b/tdewidgets/pics/kcolorcombo.png
Binary files differ
diff --git a/kdewidgets/pics/kcombobox.png b/tdewidgets/pics/kcombobox.png
index 6fa07065b..6fa07065b 100644
--- a/kdewidgets/pics/kcombobox.png
+++ b/tdewidgets/pics/kcombobox.png
Binary files differ
diff --git a/kdewidgets/pics/kdatepicker.png b/tdewidgets/pics/kdatepicker.png
index 4bcc64500..4bcc64500 100644
--- a/kdewidgets/pics/kdatepicker.png
+++ b/tdewidgets/pics/kdatepicker.png
Binary files differ
diff --git a/kdewidgets/pics/kdatetable.png b/tdewidgets/pics/kdatetable.png
index f8cea6970..f8cea6970 100644
--- a/kdewidgets/pics/kdatetable.png
+++ b/tdewidgets/pics/kdatetable.png
Binary files differ
diff --git a/kdewidgets/pics/kdatetimewidget.png b/tdewidgets/pics/kdatetimewidget.png
index bdef7bc4f..bdef7bc4f 100644
--- a/kdewidgets/pics/kdatetimewidget.png
+++ b/tdewidgets/pics/kdatetimewidget.png
Binary files differ
diff --git a/kdewidgets/pics/kdatewidget.png b/tdewidgets/pics/kdatewidget.png
index e2fa34682..e2fa34682 100644
--- a/kdewidgets/pics/kdatewidget.png
+++ b/tdewidgets/pics/kdatewidget.png
Binary files differ
diff --git a/kdewidgets/pics/kdialog.png b/tdewidgets/pics/kdialog.png
index 7d62678c8..7d62678c8 100644
--- a/kdewidgets/pics/kdialog.png
+++ b/tdewidgets/pics/kdialog.png
Binary files differ
diff --git a/kdewidgets/pics/kdoublenuminput.png b/tdewidgets/pics/kdoublenuminput.png
index 09b0418a4..09b0418a4 100644
--- a/kdewidgets/pics/kdoublenuminput.png
+++ b/tdewidgets/pics/kdoublenuminput.png
Binary files differ
diff --git a/kdewidgets/pics/kdoublespinbox.png b/tdewidgets/pics/kdoublespinbox.png
index 09b0418a4..09b0418a4 100644
--- a/kdewidgets/pics/kdoublespinbox.png
+++ b/tdewidgets/pics/kdoublespinbox.png
Binary files differ
diff --git a/kdewidgets/pics/kdualcolorbutton.png b/tdewidgets/pics/kdualcolorbutton.png
index 1d67cc4c6..1d67cc4c6 100644
--- a/kdewidgets/pics/kdualcolorbutton.png
+++ b/tdewidgets/pics/kdualcolorbutton.png
Binary files differ
diff --git a/kdewidgets/pics/keditlistbox.png b/tdewidgets/pics/keditlistbox.png
index 67fd7eac0..67fd7eac0 100644
--- a/kdewidgets/pics/keditlistbox.png
+++ b/tdewidgets/pics/keditlistbox.png
Binary files differ
diff --git a/kdewidgets/pics/kgradientselector.png b/tdewidgets/pics/kgradientselector.png
index f022d63cc..f022d63cc 100644
--- a/kdewidgets/pics/kgradientselector.png
+++ b/tdewidgets/pics/kgradientselector.png
Binary files differ
diff --git a/kdewidgets/pics/khistorycombo.png b/tdewidgets/pics/khistorycombo.png
index 9d2dd22e4..9d2dd22e4 100644
--- a/kdewidgets/pics/khistorycombo.png
+++ b/tdewidgets/pics/khistorycombo.png
Binary files differ
diff --git a/kdewidgets/pics/khsselector.png b/tdewidgets/pics/khsselector.png
index aabb41a35..aabb41a35 100644
--- a/kdewidgets/pics/khsselector.png
+++ b/tdewidgets/pics/khsselector.png
Binary files differ
diff --git a/kdewidgets/pics/kiconbutton.png b/tdewidgets/pics/kiconbutton.png
index 0a6028b77..0a6028b77 100644
--- a/kdewidgets/pics/kiconbutton.png
+++ b/tdewidgets/pics/kiconbutton.png
Binary files differ
diff --git a/kdewidgets/pics/kiconview.png b/tdewidgets/pics/kiconview.png
index b4a7db351..b4a7db351 100644
--- a/kdewidgets/pics/kiconview.png
+++ b/tdewidgets/pics/kiconview.png
Binary files differ
diff --git a/kdewidgets/pics/kintnuminput.png b/tdewidgets/pics/kintnuminput.png
index bdfeef776..bdfeef776 100644
--- a/kdewidgets/pics/kintnuminput.png
+++ b/tdewidgets/pics/kintnuminput.png
Binary files differ
diff --git a/kdewidgets/pics/kintspinbox.png b/tdewidgets/pics/kintspinbox.png
index a095e2cc4..a095e2cc4 100644
--- a/kdewidgets/pics/kintspinbox.png
+++ b/tdewidgets/pics/kintspinbox.png
Binary files differ
diff --git a/kdewidgets/pics/kkeybutton.png b/tdewidgets/pics/kkeybutton.png
index c5a9a1e09..c5a9a1e09 100644
--- a/kdewidgets/pics/kkeybutton.png
+++ b/tdewidgets/pics/kkeybutton.png
Binary files differ
diff --git a/kdewidgets/pics/kled.png b/tdewidgets/pics/kled.png
index cf998e189..cf998e189 100644
--- a/kdewidgets/pics/kled.png
+++ b/tdewidgets/pics/kled.png
Binary files differ
diff --git a/kdewidgets/pics/klineedit.png b/tdewidgets/pics/klineedit.png
index 81d313913..81d313913 100644
--- a/kdewidgets/pics/klineedit.png
+++ b/tdewidgets/pics/klineedit.png
Binary files differ
diff --git a/kdewidgets/pics/kpalettetable.png b/tdewidgets/pics/kpalettetable.png
index 8964305fd..8964305fd 100644
--- a/kdewidgets/pics/kpalettetable.png
+++ b/tdewidgets/pics/kpalettetable.png
Binary files differ
diff --git a/kdewidgets/pics/kpasswordedit.png b/tdewidgets/pics/kpasswordedit.png
index e783b2092..e783b2092 100644
--- a/kdewidgets/pics/kpasswordedit.png
+++ b/tdewidgets/pics/kpasswordedit.png
Binary files differ
diff --git a/kdewidgets/pics/kprogress.png b/tdewidgets/pics/kprogress.png
index 57a33db0f..57a33db0f 100644
--- a/kdewidgets/pics/kprogress.png
+++ b/tdewidgets/pics/kprogress.png
Binary files differ
diff --git a/kdewidgets/pics/kpushbutton.png b/tdewidgets/pics/kpushbutton.png
index f1b30dfa3..f1b30dfa3 100644
--- a/kdewidgets/pics/kpushbutton.png
+++ b/tdewidgets/pics/kpushbutton.png
Binary files differ
diff --git a/kdewidgets/pics/krestrictedline.png b/tdewidgets/pics/krestrictedline.png
index 0f7eb9ad3..0f7eb9ad3 100644
--- a/kdewidgets/pics/krestrictedline.png
+++ b/tdewidgets/pics/krestrictedline.png
Binary files differ
diff --git a/kdewidgets/pics/kruler.png b/tdewidgets/pics/kruler.png
index 6e696751b..6e696751b 100644
--- a/kdewidgets/pics/kruler.png
+++ b/tdewidgets/pics/kruler.png
Binary files differ
diff --git a/kdewidgets/pics/ksqueezedtextlabel.png b/tdewidgets/pics/ksqueezedtextlabel.png
index d30f94645..d30f94645 100644
--- a/kdewidgets/pics/ksqueezedtextlabel.png
+++ b/tdewidgets/pics/ksqueezedtextlabel.png
Binary files differ
diff --git a/kdewidgets/pics/ktextbrowser.png b/tdewidgets/pics/ktextbrowser.png
index b9b0a64d1..b9b0a64d1 100644
--- a/kdewidgets/pics/ktextbrowser.png
+++ b/tdewidgets/pics/ktextbrowser.png
Binary files differ
diff --git a/kdewidgets/pics/ktextedit.png b/tdewidgets/pics/ktextedit.png
index 7325b3dd1..7325b3dd1 100644
--- a/kdewidgets/pics/ktextedit.png
+++ b/tdewidgets/pics/ktextedit.png
Binary files differ
diff --git a/kdewidgets/pics/ktimewidget.png b/tdewidgets/pics/ktimewidget.png
index 1b0d79afe..1b0d79afe 100644
--- a/kdewidgets/pics/ktimewidget.png
+++ b/tdewidgets/pics/ktimewidget.png
Binary files differ
diff --git a/kdewidgets/pics/kurlcomborequester.png b/tdewidgets/pics/kurlcomborequester.png
index f23c6bb6c..f23c6bb6c 100644
--- a/kdewidgets/pics/kurlcomborequester.png
+++ b/tdewidgets/pics/kurlcomborequester.png
Binary files differ
diff --git a/kdewidgets/pics/kurllabel.png b/tdewidgets/pics/kurllabel.png
index 055cdfce5..055cdfce5 100644
--- a/kdewidgets/pics/kurllabel.png
+++ b/tdewidgets/pics/kurllabel.png
Binary files differ
diff --git a/kdewidgets/pics/kurlrequester.png b/tdewidgets/pics/kurlrequester.png
index 6885167de..6885167de 100644
--- a/kdewidgets/pics/kurlrequester.png
+++ b/tdewidgets/pics/kurlrequester.png
Binary files differ
diff --git a/kdewidgets/pics/tdeactionselector.png b/tdewidgets/pics/tdeactionselector.png
index acfdce496..acfdce496 100644
--- a/kdewidgets/pics/tdeactionselector.png
+++ b/tdewidgets/pics/tdeactionselector.png
Binary files differ
diff --git a/kdewidgets/pics/tdecmodule.png b/tdewidgets/pics/tdecmodule.png
index 1a6a9dc17..1a6a9dc17 100644
--- a/kdewidgets/pics/tdecmodule.png
+++ b/tdewidgets/pics/tdecmodule.png
Binary files differ
diff --git a/kdewidgets/pics/tdefontcombo.png b/tdewidgets/pics/tdefontcombo.png
index 87835d6ce..87835d6ce 100644
--- a/kdewidgets/pics/tdefontcombo.png
+++ b/tdewidgets/pics/tdefontcombo.png
Binary files differ
diff --git a/kdewidgets/pics/tdefontrequester.png b/tdewidgets/pics/tdefontrequester.png
index a01f4d692..a01f4d692 100644
--- a/kdewidgets/pics/tdefontrequester.png
+++ b/tdewidgets/pics/tdefontrequester.png
Binary files differ
diff --git a/kdewidgets/pics/tdelistbox.png b/tdewidgets/pics/tdelistbox.png
index f7405b39f..f7405b39f 100644
--- a/kdewidgets/pics/tdelistbox.png
+++ b/tdewidgets/pics/tdelistbox.png
Binary files differ
diff --git a/kdewidgets/pics/tdelistview.png b/tdewidgets/pics/tdelistview.png
index 932d910c8..932d910c8 100644
--- a/kdewidgets/pics/tdelistview.png
+++ b/tdewidgets/pics/tdelistview.png
Binary files differ
diff --git a/kdewidgets/tests/Makefile.am b/tdewidgets/tests/Makefile.am
index 220f8afac..43435995a 100644
--- a/kdewidgets/tests/Makefile.am
+++ b/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
diff --git a/kdewidgets/tests/README b/tdewidgets/tests/README
index 5d97aa029..5d97aa029 100644
--- a/kdewidgets/tests/README
+++ b/tdewidgets/tests/README
diff --git a/kdewidgets/tests/sums b/tdewidgets/tests/sums
index 8b1f80899..8b1f80899 100644
--- a/kdewidgets/tests/sums
+++ b/tdewidgets/tests/sums
diff --git a/kdewidgets/tests/test.widgets b/tdewidgets/tests/test.widgets
index b1ee195f2..e428d0711 100644
--- a/kdewidgets/tests/test.widgets
+++ b/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)
diff --git a/win/pro_files/kdewidgets/maketdewidgets.pro b/win/pro_files/tdewidgets/maketdewidgets.pro
index bf0aabf05..bf0aabf05 100644
--- a/win/pro_files/kdewidgets/maketdewidgets.pro
+++ b/win/pro_files/tdewidgets/maketdewidgets.pro
diff --git a/win/pro_files/kdewidgets/kdewidgets.pro b/win/pro_files/tdewidgets/tdewidgets.pro
index 1da63e6ec..fc54194e2 100644
--- a/win/pro_files/kdewidgets/kdewidgets.pro
+++ b/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
diff --git a/win/tools/build_tdelibs_dbg b/win/tools/build_tdelibs_dbg
index e726ff855..b293bc269 100644
--- a/win/tools/build_tdelibs_dbg
+++ b/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