CVS commit by adridg: Headers purity (I'm not sure if it's _really_ relevant in kdebase though). Make all headers compile independent of what was included before them. Also deal with QT_NO_ASCII_CAST issues. M +1 -1 kbookmarkimporter_ie.h 1.3 M +1 -0 knewmenu.h 1.22 M +2 -1 konq_propsview.h 1.47 --- kdebase/libkonq/kbookmarkimporter_ie.h #1.2:1.3 @@ -68,5 +68,5 @@ signals: protected: - void parseIEBookmarks_dir( QString dirname, QString name = "" ); + void parseIEBookmarks_dir( QString dirname, QString name = QString() ); void parseIEBookmarks_url_file( QString filename, QString name ); --- kdebase/libkonq/knewmenu.h #1.21:1.22 @@ -25,4 +25,5 @@ #include #include +#include namespace KIO { class Job; } --- kdebase/libkonq/konq_propsview.h #1.46:1.47 @@ -123,5 +123,6 @@ protected: QString currentGroup() const { - return isDefaultProperties() ? "Settings" : "URL properties"; + return isDefaultProperties() ? + QString::fromLatin1("Settings") : QString::fromLatin1("URL properties"); }