From kde-commits Fri Dec 28 15:29:18 2012 From: Albert Astals Cid Date: Fri, 28 Dec 2012 15:29:18 +0000 To: kde-commits Subject: [kdelibs/frameworks] /: klocale.h does not need to include klocalizedstring.h Message-Id: <20121228152918.ADC77A6091 () git ! kde ! org> X-MARC-Message: https://marc.info/?l=kde-commits&m=135670856916692 Git commit 918da72aa300991435d242431c74ae1ff7d6c426 by Albert Astals Cid. Committed on 28/12/2012 at 16:28. Pushed by aacid into branch 'frameworks'. klocale.h does not need to include klocalizedstring.h Expected more places that were including klocale.h to get klocalizedstring.h but there were only 2 M +1 -0 kde3support/kdeui/k3sconfig.cpp M +1 -0 kdecore/date/kcalendarsystem.cpp M +1 -0 kdecore/date/kcalendarsystemcoptic.cpp M +1 -0 kdecore/date/kcalendarsystemethiopian.cpp M +1 -0 kdecore/date/kcalendarsystemgregorian.cpp M +1 -0 kdecore/date/kcalendarsystemhebrew.cpp M +1 -0 kdecore/date/kcalendarsystemindiannational.cpp M +2 -0 kdecore/date/kcalendarsystemislamiccivil.cpp M +2 -0 kdecore/date/kcalendarsystemjalali.cpp M +1 -0 kdecore/date/kcalendarsystemjapanese.cpp M +1 -0 kdecore/date/kcalendarsystemjulian.cpp M +1 -0 kdecore/date/kcalendarsystemminguo.cpp M +1 -0 kdecore/date/kcalendarsystemqdate.cpp M +1 -0 kdecore/date/kcalendarsystemthai.cpp M +1 -0 kdecore/date/kdatetime.cpp M +2 -1 kdecore/kde-config.cpp M +0 -1 kdecore/localization/klocale.h M +1 -0 kdecore/localization/klocale_p.h M +1 -0 kdecore/tests/kcalendartest.cpp M +1 -0 kdeui/dialogs/kbugreport.cpp M +1 -0 kdeui/dialogs/kshortcutsdialog_p.h M +1 -0 kdeui/fonts/kfontchooser.cpp M +1 -0 kdeui/fonts/kfontrequester.cpp M +1 -0 kdeui/jobs/kstatusbarjobtracker.cpp M +1 -0 kdeui/jobs/kwidgetjobtracker.cpp M +1 -1 kdeui/kde4uic.cmake M +1 -0 kdeui/widgets/kdatecombobox.cpp M +1 -0 kdeui/widgets/kdatepicker.cpp M +1 -0 kdeui/widgets/klanguagebutton.cpp M +1 -0 kdeui/widgets/ktimecombobox.cpp M +1 -0 kdeui/widgets/ktimezonewidget.cpp M +1 -0 kdoctools/meinproc.cpp M +1 -0 kinit/klauncher_main.cpp M +1 -0 kio/kfile/kencodingfiledialog.cpp M +1 -0 kio/kfile/kpropertiesdialog.cpp M +1 -0 kio/kio/fileundomanager.cpp M +1 -0 kio/kio/job_error.cpp M +1 -0 kio/kio/kdirmodel.cpp M +1 -0 kio/kio/kfileitem.cpp M +1 -0 kio/kio/kfileitemdelegate.cpp M +1 -0 kio/kssl/kcm/displaycertdialog.cpp M +1 -0 kio/kssl/ksslinfodialog.cpp M +1 -0 kio/kssl/ksslutils.cpp M +1 -0 kioslave/http/kcookiejar/kcookiewin.cpp M +1 -0 kunitconversion/currency.cpp M +1 -1 staging/kde4support/src/kdecore/k4aboutdata.h M +1 -0 staging/kde4support/src/kdeui/kapplication.cpp M +1 -0 staging/kio/src/core/global.cpp http://commits.kde.org/kdelibs/918da72aa300991435d242431c74ae1ff7d6c426 diff --git a/kde3support/kdeui/k3sconfig.cpp b/kde3support/kdeui/k3sconfig.= cpp index 06e8d71..a1fde30 100644 --- a/kde3support/kdeui/k3sconfig.cpp +++ b/kde3support/kdeui/k3sconfig.cpp @@ -35,6 +35,7 @@ #include #include #include +#include #include = #include diff --git a/kdecore/date/kcalendarsystem.cpp b/kdecore/date/kcalendarsyste= m.cpp index 1aed791..198a863 100644 --- a/kdecore/date/kcalendarsystem.cpp +++ b/kdecore/date/kcalendarsystem.cpp @@ -27,6 +27,7 @@ = #include = +#include "klocalizedstring.h" #include "kdatetime.h" #include "kdatetimeformatter_p.h" #include "kdatetimeparser_p.h" diff --git a/kdecore/date/kcalendarsystemcoptic.cpp b/kdecore/date/kcalenda= rsystemcoptic.cpp index 0a95dbe..43d2611 100644 --- a/kdecore/date/kcalendarsystemcoptic.cpp +++ b/kdecore/date/kcalendarsystemcoptic.cpp @@ -23,6 +23,7 @@ = #include "kdebug.h" #include "klocale.h" +#include "klocalizedstring.h" = #include #include diff --git a/kdecore/date/kcalendarsystemethiopian.cpp b/kdecore/date/kcale= ndarsystemethiopian.cpp index e2d293f..9bfc41f 100644 --- a/kdecore/date/kcalendarsystemethiopian.cpp +++ b/kdecore/date/kcalendarsystemethiopian.cpp @@ -22,6 +22,7 @@ = #include "kdebug.h" #include "klocale.h" +#include "klocalizedstring.h" = #include #include diff --git a/kdecore/date/kcalendarsystemgregorian.cpp b/kdecore/date/kcale= ndarsystemgregorian.cpp index 40db17a..663cd1b 100644 --- a/kdecore/date/kcalendarsystemgregorian.cpp +++ b/kdecore/date/kcalendarsystemgregorian.cpp @@ -25,6 +25,7 @@ = #include "kdebug.h" #include "klocale.h" +#include "klocalizedstring.h" #include "kconfiggroup.h" = #include diff --git a/kdecore/date/kcalendarsystemhebrew.cpp b/kdecore/date/kcalenda= rsystemhebrew.cpp index e3d1484..fd66fa2 100644 --- a/kdecore/date/kcalendarsystemhebrew.cpp +++ b/kdecore/date/kcalendarsystemhebrew.cpp @@ -27,6 +27,7 @@ = #include "kdebug.h" #include "klocale.h" +#include "klocalizedstring.h" = #include #include diff --git a/kdecore/date/kcalendarsystemindiannational.cpp b/kdecore/date/= kcalendarsystemindiannational.cpp index 7222722..2cbfe23 100644 --- a/kdecore/date/kcalendarsystemindiannational.cpp +++ b/kdecore/date/kcalendarsystemindiannational.cpp @@ -22,6 +22,7 @@ = #include "kdebug.h" #include "klocale.h" +#include "klocalizedstring.h" = #include #include diff --git a/kdecore/date/kcalendarsystemislamiccivil.cpp b/kdecore/date/kc= alendarsystemislamiccivil.cpp index eea98e2..774e081 100644 --- a/kdecore/date/kcalendarsystemislamiccivil.cpp +++ b/kdecore/date/kcalendarsystemislamiccivil.cpp @@ -24,6 +24,8 @@ = #include = +#include + class KCalendarSystemIslamicCivilPrivate : public KCalendarSystemPrivate { public: diff --git a/kdecore/date/kcalendarsystemjalali.cpp b/kdecore/date/kcalenda= rsystemjalali.cpp index 889a060..486ef16 100644 --- a/kdecore/date/kcalendarsystemjalali.cpp +++ b/kdecore/date/kcalendarsystemjalali.cpp @@ -32,6 +32,8 @@ = #include = +#include + class KCalendarSystemJalaliPrivate : public KCalendarSystemPrivate { public: diff --git a/kdecore/date/kcalendarsystemjapanese.cpp b/kdecore/date/kcalen= darsystemjapanese.cpp index dbbf94b..d8a870b 100644 --- a/kdecore/date/kcalendarsystemjapanese.cpp +++ b/kdecore/date/kcalendarsystemjapanese.cpp @@ -22,6 +22,7 @@ = #include "kdebug.h" #include "klocale.h" +#include "klocalizedstring.h" = #include = diff --git a/kdecore/date/kcalendarsystemjulian.cpp b/kdecore/date/kcalenda= rsystemjulian.cpp index 9bfc5f9..23988e8 100644 --- a/kdecore/date/kcalendarsystemjulian.cpp +++ b/kdecore/date/kcalendarsystemjulian.cpp @@ -22,6 +22,7 @@ = #include "kdebug.h" #include "klocale.h" +#include "klocalizedstring.h" #include "kconfiggroup.h" = #include diff --git a/kdecore/date/kcalendarsystemminguo.cpp b/kdecore/date/kcalenda= rsystemminguo.cpp index 6761f63..449d103 100644 --- a/kdecore/date/kcalendarsystemminguo.cpp +++ b/kdecore/date/kcalendarsystemminguo.cpp @@ -22,6 +22,7 @@ = #include "kdebug.h" #include "klocale.h" +#include "klocalizedstring.h" = #include = diff --git a/kdecore/date/kcalendarsystemqdate.cpp b/kdecore/date/kcalendar= systemqdate.cpp index f233d219..f07e93b 100644 --- a/kdecore/date/kcalendarsystemqdate.cpp +++ b/kdecore/date/kcalendarsystemqdate.cpp @@ -27,6 +27,7 @@ = #include "kdebug.h" #include "klocale.h" +#include "klocalizedstring.h" #include "kconfiggroup.h" = #include diff --git a/kdecore/date/kcalendarsystemthai.cpp b/kdecore/date/kcalendars= ystemthai.cpp index 61de6e3..bb89d1a 100644 --- a/kdecore/date/kcalendarsystemthai.cpp +++ b/kdecore/date/kcalendarsystemthai.cpp @@ -22,6 +22,7 @@ = #include "kdebug.h" #include "klocale.h" +#include "klocalizedstring.h" = #include = diff --git a/kdecore/date/kdatetime.cpp b/kdecore/date/kdatetime.cpp index 2395a80..bb1f08b 100644 --- a/kdecore/date/kdatetime.cpp +++ b/kdecore/date/kdatetime.cpp @@ -40,6 +40,7 @@ #include = #include +#include #include "kcalendarsystem.h" #include #include diff --git a/kdecore/kde-config.cpp b/kdecore/kde-config.cpp index 0218717..4c046c6 100644 --- a/kdecore/kde-config.cpp +++ b/kdecore/kde-config.cpp @@ -24,7 +24,8 @@ = = #include -#include +#include +#include #include #include #include diff --git a/kdecore/localization/klocale.h b/kdecore/localization/klocale.h index c21bb37..ff713c8 100644 --- a/kdecore/localization/klocale.h +++ b/kdecore/localization/klocale.h @@ -22,7 +22,6 @@ #define KLOCALE_H = #include -#include #include = #include diff --git a/kdecore/localization/klocale_p.h b/kdecore/localization/klocal= e_p.h index 329104ac..e4b149b 100644 --- a/kdecore/localization/klocale_p.h +++ b/kdecore/localization/klocale_p.h @@ -22,6 +22,7 @@ #define KLOCALE_P_H = #include "klocale.h" +#include "klocalizedstring.h" = class QMutex; = diff --git a/kdecore/tests/kcalendartest.cpp b/kdecore/tests/kcalendartest.= cpp index 346f964..d236dce 100644 --- a/kdecore/tests/kcalendartest.cpp +++ b/kdecore/tests/kcalendartest.cpp @@ -27,6 +27,7 @@ #include #include "kcalendarsystem.h" #include "klocalizeddate.h" +#include "klocalizedstring.h" #include "kconfiggroup.h" = QTEST_MAIN(KCalendarTest) diff --git a/kdeui/dialogs/kbugreport.cpp b/kdeui/dialogs/kbugreport.cpp index 4807877..b560b68 100644 --- a/kdeui/dialogs/kbugreport.cpp +++ b/kdeui/dialogs/kbugreport.cpp @@ -37,6 +37,7 @@ #include #include #include +#include #include #include #include diff --git a/kdeui/dialogs/kshortcutsdialog_p.h b/kdeui/dialogs/kshortcutsd= ialog_p.h index d23eea9..992ad2c 100644 --- a/kdeui/dialogs/kshortcutsdialog_p.h +++ b/kdeui/dialogs/kshortcutsdialog_p.h @@ -27,6 +27,7 @@ #include "kextendableitemdelegate.h" #include "kshortcutseditor.h" #include "kkeysequencewidget.h" +#include "klocalizedstring.h" = #include #include diff --git a/kdeui/fonts/kfontchooser.cpp b/kdeui/fonts/kfontchooser.cpp index de74388..a445f43 100644 --- a/kdeui/fonts/kfontchooser.cpp +++ b/kdeui/fonts/kfontchooser.cpp @@ -36,6 +36,7 @@ Boston, MA 02110-1301, USA. #include #include #include +#include #include #include = diff --git a/kdeui/fonts/kfontrequester.cpp b/kdeui/fonts/kfontrequester.cpp index 031182c..79d269d 100644 --- a/kdeui/fonts/kfontrequester.cpp +++ b/kdeui/fonts/kfontrequester.cpp @@ -27,6 +27,7 @@ = #include #include +#include = #include = diff --git a/kdeui/jobs/kstatusbarjobtracker.cpp b/kdeui/jobs/kstatusbarjob= tracker.cpp index 3dff1d6..abcd416 100644 --- a/kdeui/jobs/kstatusbarjobtracker.cpp +++ b/kdeui/jobs/kstatusbarjobtracker.cpp @@ -31,6 +31,7 @@ #include = #include +#include = KStatusBarJobTracker::KStatusBarJobTracker(QWidget *parent, bool button) : KAbstractWidgetJobTracker(parent), d(new Private(parent, button)) diff --git a/kdeui/jobs/kwidgetjobtracker.cpp b/kdeui/jobs/kwidgetjobtracke= r.cpp index e4c061b..b21175d 100644 --- a/kdeui/jobs/kwidgetjobtracker.cpp +++ b/kdeui/jobs/kwidgetjobtracker.cpp @@ -40,6 +40,7 @@ #include #include #include +#include #include #include #include diff --git a/kdeui/kde4uic.cmake b/kdeui/kde4uic.cmake index ed328b4..5a43c31 100644 --- a/kdeui/kde4uic.cmake +++ b/kdeui/kde4uic.cmake @@ -51,6 +51,6 @@ IF (_uic_CONTENTS) STRING(REGEX REPLACE "#ifndef " "#ifndef UI_" _uic_CONTENTS "${_uic_CONT= ENTS}") STRING(REGEX REPLACE "#define " "#define UI_" _uic_CONTENTS "${_uic_CONT= ENTS}") = - FILE(WRITE ${KDE_UIC_CPP_FILE} "#include \n#include \n\n${_uic_CONTENTS}\n") + FILE(WRITE ${KDE_UIC_CPP_FILE} "#include \n#include \n\n${_uic_CONTENTS}\n") ENDIF() = diff --git a/kdeui/widgets/kdatecombobox.cpp b/kdeui/widgets/kdatecombobox.= cpp index 08e5af1..2e5f8a6 100644 --- a/kdeui/widgets/kdatecombobox.cpp +++ b/kdeui/widgets/kdatecombobox.cpp @@ -30,6 +30,7 @@ = #include "kdebug.h" #include "klocale.h" +#include "klocalizedstring.h" #include "klocalizeddate.h" #include "kcombobox.h" #include "kdatepicker.h" diff --git a/kdeui/widgets/kdatepicker.cpp b/kdeui/widgets/kdatepicker.cpp index 4af65ec..3a5f730 100644 --- a/kdeui/widgets/kdatepicker.cpp +++ b/kdeui/widgets/kdatepicker.cpp @@ -35,6 +35,7 @@ = #include #include +#include #include #include #include diff --git a/kdeui/widgets/klanguagebutton.cpp b/kdeui/widgets/klanguagebut= ton.cpp index 16b42ab..c5d8e4b 100644 --- a/kdeui/widgets/klanguagebutton.cpp +++ b/kdeui/widgets/klanguagebutton.cpp @@ -28,6 +28,7 @@ #include "klanguagebutton.h" = #include +#include #include #include = diff --git a/kdeui/widgets/ktimecombobox.cpp b/kdeui/widgets/ktimecombobox.= cpp index af5a17f..e1a9322 100644 --- a/kdeui/widgets/ktimecombobox.cpp +++ b/kdeui/widgets/ktimecombobox.cpp @@ -25,6 +25,7 @@ = #include "kdebug.h" #include "klocale.h" +#include "klocalizedstring.h" #include "kcombobox.h" #include "kmessagebox.h" = diff --git a/kdeui/widgets/ktimezonewidget.cpp b/kdeui/widgets/ktimezonewid= get.cpp index 0682250..28d51c2 100644 --- a/kdeui/widgets/ktimezonewidget.cpp +++ b/kdeui/widgets/ktimezonewidget.cpp @@ -25,6 +25,7 @@ = #include #include +#include #include #include = diff --git a/kdoctools/meinproc.cpp b/kdoctools/meinproc.cpp index 5168686..5098aed 100644 --- a/kdoctools/meinproc.cpp +++ b/kdoctools/meinproc.cpp @@ -17,6 +17,7 @@ #include #include #include +#include #include #include = diff --git a/kinit/klauncher_main.cpp b/kinit/klauncher_main.cpp index 7b22c1a..f3ca2f2 100644 --- a/kinit/klauncher_main.cpp +++ b/kinit/klauncher_main.cpp @@ -30,6 +30,7 @@ #include #include #include +#include #include = #include "klauncher_cmds.h" diff --git a/kio/kfile/kencodingfiledialog.cpp b/kio/kfile/kencodingfiledia= log.cpp index 8ccf0ff..5c3554f 100644 --- a/kio/kfile/kencodingfiledialog.cpp +++ b/kio/kfile/kencodingfiledialog.cpp @@ -26,6 +26,7 @@ #include #include #include +#include #include #include #include diff --git a/kio/kfile/kpropertiesdialog.cpp b/kio/kfile/kpropertiesdialog.= cpp index 2bfb4a0..5e63388 100644 --- a/kio/kfile/kpropertiesdialog.cpp +++ b/kio/kfile/kpropertiesdialog.cpp @@ -91,6 +91,7 @@ extern "C" { #include #include #include +#include #include #include #include diff --git a/kio/kio/fileundomanager.cpp b/kio/kio/fileundomanager.cpp index 6730839..9705040 100644 --- a/kio/kio/fileundomanager.cpp +++ b/kio/kio/fileundomanager.cpp @@ -30,6 +30,7 @@ #include #include #include +#include #include #include #include diff --git a/kio/kio/job_error.cpp b/kio/kio/job_error.cpp index 8ee07eb..0446710 100644 --- a/kio/kio/job_error.cpp +++ b/kio/kio/job_error.cpp @@ -19,6 +19,7 @@ #include "job.h" #include #include +#include #include #include // Qt::escape #include diff --git a/kio/kio/kdirmodel.cpp b/kio/kio/kdirmodel.cpp index 7770c4b..a021ff6 100644 --- a/kio/kio/kdirmodel.cpp +++ b/kio/kio/kdirmodel.cpp @@ -22,6 +22,7 @@ #include "kfileitem.h" #include #include +#include #include #include #include diff --git a/kio/kio/kfileitem.cpp b/kio/kio/kfileitem.cpp index 2d5bdb5..9ba01ba 100644 --- a/kio/kio/kfileitem.cpp +++ b/kio/kio/kfileitem.cpp @@ -46,6 +46,7 @@ #include #include #include +#include #include #include #include diff --git a/kio/kio/kfileitemdelegate.cpp b/kio/kio/kfileitemdelegate.cpp index 7bf5f1e..7b4c76b 100644 --- a/kio/kio/kfileitemdelegate.cpp +++ b/kio/kio/kfileitemdelegate.cpp @@ -39,6 +39,7 @@ #include = #include +#include #include #include #include diff --git a/kio/kssl/kcm/displaycertdialog.cpp b/kio/kssl/kcm/displaycertd= ialog.cpp index 52e2f59..2652d88 100644 --- a/kio/kssl/kcm/displaycertdialog.cpp +++ b/kio/kssl/kcm/displaycertdialog.cpp @@ -19,6 +19,7 @@ = #include "displaycertdialog_p.h" #include +#include #include = = diff --git a/kio/kssl/ksslinfodialog.cpp b/kio/kssl/ksslinfodialog.cpp index 592be8a..c19d330 100644 --- a/kio/kssl/ksslinfodialog.cpp +++ b/kio/kssl/ksslinfodialog.cpp @@ -34,6 +34,7 @@ #include = #include +#include #include = #include "ksslcertificate.h" diff --git a/kio/kssl/ksslutils.cpp b/kio/kssl/ksslutils.cpp index e31f312..1129105 100644 --- a/kio/kssl/ksslutils.cpp +++ b/kio/kssl/ksslutils.cpp @@ -23,6 +23,7 @@ = #include #include +#include #include = #include "kopenssl.h" diff --git a/kioslave/http/kcookiejar/kcookiewin.cpp b/kioslave/http/kcooki= ejar/kcookiewin.cpp index 5967921..dcfed33 100644 --- a/kioslave/http/kcookiejar/kcookiewin.cpp +++ b/kioslave/http/kcookiejar/kcookiewin.cpp @@ -47,6 +47,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS= IN THE SOFTWARE. = #include #include +#include #include #include #include diff --git a/kunitconversion/currency.cpp b/kunitconversion/currency.cpp index f36ddc0..45d16e6 100644 --- a/kunitconversion/currency.cpp +++ b/kunitconversion/currency.cpp @@ -29,6 +29,7 @@ #include #include #include +#include = = #if !KUNITCONVERSION_NO_SOLID diff --git a/staging/kde4support/src/kdecore/k4aboutdata.h b/staging/kde4su= pport/src/kdecore/k4aboutdata.h index 063eaf8..42d5ddc 100644 --- a/staging/kde4support/src/kdecore/k4aboutdata.h +++ b/staging/kde4support/src/kdecore/k4aboutdata.h @@ -25,7 +25,7 @@ #define K4ABOUTDATA_H = #include -#include +#include // Qt #include #include diff --git a/staging/kde4support/src/kdeui/kapplication.cpp b/staging/kde4s= upport/src/kdeui/kapplication.cpp index 9fbecb7..89ec58f 100644 --- a/staging/kde4support/src/kdeui/kapplication.cpp +++ b/staging/kde4support/src/kdeui/kapplication.cpp @@ -44,6 +44,7 @@ #include "kdebug.h" #include "kglobal.h" #include "klocale.h" +#include "klocalizedstring.h" #include "ksessionmanager.h" #include "ktoolinvocation.h" #include "kgesturemap.h" diff --git a/staging/kio/src/core/global.cpp b/staging/kio/src/core/global.= cpp index 41bfb04..a8d946c 100644 --- a/staging/kio/src/core/global.cpp +++ b/staging/kio/src/core/global.cpp @@ -21,6 +21,7 @@ #include #include #include +#include #include #include #include