diff options
| -rw-r--r-- | acinclude.m4 | 24 | ||||
| -rw-r--r-- | aclocal.m4 | 24 | ||||
| m--------- | admin | 0 | ||||
| -rw-r--r-- | systemsettings/Makefile.am | 4 | ||||
| -rw-r--r-- | systemsettings/kcmultiwidget.h | 2 | ||||
| -rw-r--r-- | systemsettings/menu/audioencoding.desktop | 2 | ||||
| -rw-r--r-- | systemsettings/tdecmodulemenu.h | 6 |
7 files changed, 31 insertions, 31 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 855a2a5..d5ec932 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -2070,35 +2070,35 @@ if test $kde_qtver = 3; then AC_SUBST(LIB_KDED, $lib_kded) AC_SUBST(LIB_TDECORE, "-ltdecore") AC_SUBST(LIB_TDEUI, "-ltdeui") - AC_SUBST(LIB_KIO, "-ltdeio") + AC_SUBST(LIB_TDEIO, "-ltdeio") AC_SUBST(LIB_KJS, "-lkjs") AC_SUBST(LIB_SMB, "-lsmb") AC_SUBST(LIB_KAB, "-lkab") AC_SUBST(LIB_TDEABC, "-ltdeabc") AC_SUBST(LIB_TDEHTML, "-ltdehtml") - AC_SUBST(LIB_KSPELL, "-ltdespell") - AC_SUBST(LIB_KPARTS, "-ltdeparts") + AC_SUBST(LIB_TDESPELL, "-ltdespell") + AC_SUBST(LIB_TDEPARTS, "-ltdeparts") AC_SUBST(LIB_TDEPRINT, "-ltdeprint") - AC_SUBST(LIB_KUTILS, "-ltdeutils") + AC_SUBST(LIB_TDEUTILS, "-ltdeutils") AC_SUBST(LIB_TDEPIM, "-ltdepim") - AC_SUBST(LIB_KIMPROXY, "-ltdeimproxy") + AC_SUBST(LIB_TDEIMPROXY, "-ltdeimproxy") AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff") - AC_SUBST(LIB_KDNSSD, "-ltdednssd") - AC_SUBST(LIB_KUNITTEST, "-ltdeunittest") + AC_SUBST(LIB_TDEDNSSD, "-ltdednssd") + AC_SUBST(LIB_TDEUNITTEST, "-ltdeunittest") # these are for backward compatibility - AC_SUBST(LIB_KSYCOCA, "-ltdeio") + AC_SUBST(LIB_TDESYCOCA, "-ltdeio") AC_SUBST(LIB_TDEFILE, "-ltdeio") elif test $kde_qtver = 2; then AC_SUBST(LIB_TDECORE, "-ltdecore") AC_SUBST(LIB_TDEUI, "-ltdeui") - AC_SUBST(LIB_KIO, "-ltdeio") - AC_SUBST(LIB_KSYCOCA, "-ltdesycoca") + AC_SUBST(LIB_TDEIO, "-ltdeio") + AC_SUBST(LIB_TDESYCOCA, "-ltdesycoca") AC_SUBST(LIB_SMB, "-lsmb") AC_SUBST(LIB_TDEFILE, "-ltdefile") AC_SUBST(LIB_KAB, "-lkab") AC_SUBST(LIB_TDEHTML, "-ltdehtml") - AC_SUBST(LIB_KSPELL, "-ltdespell") - AC_SUBST(LIB_KPARTS, "-ltdeparts") + AC_SUBST(LIB_TDESPELL, "-ltdespell") + AC_SUBST(LIB_TDEPARTS, "-ltdeparts") AC_SUBST(LIB_TDEPRINT, "-ltdeprint") else AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)") @@ -2082,35 +2082,35 @@ if test $kde_qtver = 3; then AC_SUBST(LIB_KDED, $lib_kded) AC_SUBST(LIB_TDECORE, "-ltdecore") AC_SUBST(LIB_TDEUI, "-ltdeui") - AC_SUBST(LIB_KIO, "-ltdeio") + AC_SUBST(LIB_TDEIO, "-ltdeio") AC_SUBST(LIB_KJS, "-lkjs") AC_SUBST(LIB_SMB, "-lsmb") AC_SUBST(LIB_KAB, "-lkab") AC_SUBST(LIB_TDEABC, "-ltdeabc") AC_SUBST(LIB_TDEHTML, "-ltdehtml") - AC_SUBST(LIB_KSPELL, "-ltdespell") - AC_SUBST(LIB_KPARTS, "-ltdeparts") + AC_SUBST(LIB_TDESPELL, "-ltdespell") + AC_SUBST(LIB_TDEPARTS, "-ltdeparts") AC_SUBST(LIB_TDEPRINT, "-ltdeprint") - AC_SUBST(LIB_KUTILS, "-ltdeutils") + AC_SUBST(LIB_TDEUTILS, "-ltdeutils") AC_SUBST(LIB_TDEPIM, "-ltdepim") - AC_SUBST(LIB_KIMPROXY, "-ltdeimproxy") + AC_SUBST(LIB_TDEIMPROXY, "-ltdeimproxy") AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff") - AC_SUBST(LIB_KDNSSD, "-ltdednssd") - AC_SUBST(LIB_KUNITTEST, "-ltdeunittest") + AC_SUBST(LIB_TDEDNSSD, "-ltdednssd") + AC_SUBST(LIB_TDEUNITTEST, "-ltdeunittest") # these are for backward compatibility - AC_SUBST(LIB_KSYCOCA, "-ltdeio") + AC_SUBST(LIB_TDESYCOCA, "-ltdeio") AC_SUBST(LIB_TDEFILE, "-ltdeio") elif test $kde_qtver = 2; then AC_SUBST(LIB_TDECORE, "-ltdecore") AC_SUBST(LIB_TDEUI, "-ltdeui") - AC_SUBST(LIB_KIO, "-ltdeio") - AC_SUBST(LIB_KSYCOCA, "-ltdesycoca") + AC_SUBST(LIB_TDEIO, "-ltdeio") + AC_SUBST(LIB_TDESYCOCA, "-ltdesycoca") AC_SUBST(LIB_SMB, "-lsmb") AC_SUBST(LIB_TDEFILE, "-ltdefile") AC_SUBST(LIB_KAB, "-lkab") AC_SUBST(LIB_TDEHTML, "-ltdehtml") - AC_SUBST(LIB_KSPELL, "-ltdespell") - AC_SUBST(LIB_KPARTS, "-ltdeparts") + AC_SUBST(LIB_TDESPELL, "-ltdespell") + AC_SUBST(LIB_TDEPARTS, "-ltdeparts") AC_SUBST(LIB_TDEPRINT, "-ltdeprint") else AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)") diff --git a/admin b/admin -Subproject b4d585c643d92787bfa17b935ce00b09960ee36 +Subproject 6b7f7225eff4c49b2dd71804d5fdacb03efcf46 diff --git a/systemsettings/Makefile.am b/systemsettings/Makefile.am index e112e0a..dbc0de4 100644 --- a/systemsettings/Makefile.am +++ b/systemsettings/Makefile.am @@ -27,8 +27,8 @@ systemsettings_SOURCES = tdecmodulemenu.cpp kcmsearch.cpp kcmultiwidget.cpp main EXTRA_DIST = tdecmodulemenu.h kcmultiwidget.h moduleiconitem.h version.h kcmsearch.h mainwindow.h modulesview.h kcscrollview.h -systemsettings_LDADD = $(LIB_TDEUI) $(LIB_KUTILS) -systemsettings_LDFLAGS = $(all_libraries) -module -avoid-version $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +systemsettings_LDADD = $(LIB_TDEUI) $(LIB_TDEUTILS) +systemsettings_LDFLAGS = $(all_libraries) -module -avoid-version $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor appdata_DATA = systemsettingsui.rc appdatadir = $(kde_datadir)/systemsettings diff --git a/systemsettings/kcmultiwidget.h b/systemsettings/kcmultiwidget.h index 2eece35..e1c0887 100644 --- a/systemsettings/kcmultiwidget.h +++ b/systemsettings/kcmultiwidget.h @@ -37,7 +37,7 @@ class TDECModule; * @short A method that offers a KDialogBase containing arbitrary * Control Modules. */ -class KUTILS_EXPORT KCMultiWidget : public KDialogBase +class TDEUTILS_EXPORT KCMultiWidget : public KDialogBase { Q_OBJECT diff --git a/systemsettings/menu/audioencoding.desktop b/systemsettings/menu/audioencoding.desktop index 9df3084..8cef0a5 100644 --- a/systemsettings/menu/audioencoding.desktop +++ b/systemsettings/menu/audioencoding.desktop @@ -30,7 +30,7 @@ Comment[da]=Indstil I/O-slave for lyd-cd Comment[de]=Konfiguration des Audio-CD Ein-/Ausgabemoduls Comment[el]=Ρύθμιση io slave για CD ήχου Comment[es]=Configuración del esclavo ES Audiocd -Comment[et]=Audiocd KIO-mooduli seadistused +Comment[et]=Audiocd TDEIO-mooduli seadistused Comment[gl]=Configurazón do IO Slave de Audiocd Comment[ja]=オーディオ CD IO スレーブの設定 Comment[nl]=Audiocd IO-slave instellen diff --git a/systemsettings/tdecmodulemenu.h b/systemsettings/tdecmodulemenu.h index d056f96..551dc75 100644 --- a/systemsettings/tdecmodulemenu.h +++ b/systemsettings/tdecmodulemenu.h @@ -17,8 +17,8 @@ * Boston, MA 02110-1301, USA. */ -#ifndef KCMMODULEMENU_H -#define KCMMODULEMENU_H +#ifndef TDECMODULEMENU_H +#define TDECMODULEMENU_H #include <tdecmoduleinfo.h> @@ -154,5 +154,5 @@ private: TQString deriveCaptionFromPath( const TQString &menuPath ); }; -#endif // KCMMODULEMENU_H +#endif // TDECMODULEMENU_H |