Commit 7e1b331d authored by Dan Meltzer's avatar Dan Meltzer

Make compile against latest kdelibs. Merge from branches/work/kde4_kconfig/kconfig/port_koffice

svn path=/trunk/koffice/; revision=721761
parent 6b3244df
......@@ -168,7 +168,7 @@ macro_optional_add_subdirectory(kivio)
macro_optional_add_subdirectory(kounavail)
macro_optional_add_subdirectory(kplato)
macro_optional_add_subdirectory(krita)
macro_optional_add_subdirectory(kugar)
#macro_optional_add_subdirectory(kugar)
macro_optional_add_subdirectory(kword)
add_subdirectory(pics)
add_subdirectory(plugins)
......
......@@ -24,6 +24,9 @@
#include <kconfig.h>
#include <klocale.h>
#include <kconfiggroup.h>
#include <kglobal.h>
#include <kdebug.h>
#include <KoID.h>
......
......@@ -19,6 +19,7 @@
#include <kglobal.h>
#include <kicon.h>
#include <kconfiggroup.h>
#include <QImage>
#include <QDateTime>
......
......@@ -30,6 +30,7 @@
#include <threadweaver/ThreadWeaver.h>
#include <klocale.h>
#include <kdebug.h>
#include <kconfiggroup.h>
#include "KoColorProfile.h"
#include "KoColor.h"
......
......@@ -37,6 +37,7 @@
#include <klocale.h>
#include <kglobal.h>
#include <ksharedconfig.h>
#include <kconfiggroup.h>
#include "kis_brush.h"
#include "kis_complex_color.h"
......
......@@ -25,6 +25,7 @@
#include <kglobal.h>
#include <ksharedconfig.h>
#include <kconfiggroup.h>
#include "kis_image.h"
#include "kis_group_layer.h"
......
......@@ -23,6 +23,7 @@
#include <kglobal.h>
#include <ksharedconfig.h>
#include <kconfiggroup.h>
#include "kis_paint_device.h"
......
......@@ -34,6 +34,7 @@
#include <k3staticdeleter.h>
#include <kglobal.h>
#include <ksharedconfig.h>
#include <kconfiggroup.h>
#include "kis_tileddatamanager.h"
#include "kis_tile.h"
......
......@@ -16,6 +16,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#include <kdebug.h>
#include "kis_dynamic_programs_editor.h"
#include <QVBoxLayout>
......
......@@ -16,6 +16,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#include <kdebug.h>
#include "kis_dynamic_sensor_time.h"
#include "ui_SensorTimeConfiguration.h"
......
......@@ -16,6 +16,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#include <kdebug.h>
#include "kis_sensor_selector.h"
#include <QHBoxLayout>
......
......@@ -20,6 +20,7 @@
#include <kdialog.h>
#include <klocale.h>
#include <kdebug.h>
#include "ui_FiltersListDynamicProgramEditor.h"
......
......@@ -24,6 +24,7 @@
#include <klocale.h>
#include <kstandarddirs.h>
#include <kdebug.h>
#include <kis_meta_data_store.h>
#include <kis_meta_data_entry.h>
......
......@@ -24,6 +24,7 @@
#include <QVariant>
#include <kross/core/action.h>
#include <kdebug.h>
KisScriptDockFactory::KisScriptDockFactory(Kross::Action* act) : m_action(act)
{
......
......@@ -22,6 +22,7 @@
#include <QColor>
#include <ksharedconfig.h>
#include <kconfiggroup.h>
#include "kis_global.h"
#include "krita_export.h"
......
......@@ -32,6 +32,7 @@
#include <kdebug.h>
#include <kglobalsettings.h>
#include <kconfiggroup.h>
#include "kis_types.h"
#include "kis_paint_device.h"
......
......@@ -32,7 +32,7 @@
#include <KoMainWindow.h>
#include <ksharedconfig.h>
#include <kconfiggroup.h>
#include <QtGui/QMouseEvent>
#include <QtGui/QPainter>
#include <QtGui/QScrollBar>
......
......@@ -31,8 +31,10 @@
#include <KoProperties.h>
// #include <kdebug.h>
#include <kdebug.h>
#include <ksharedconfig.h>
#include <kglobal.h>
#include <kconfiggroup.h>
#include <QPainter>
#include <QDragEnterEvent>
......
......@@ -30,6 +30,8 @@
#include <kmimetype.h>
#include <QtCore/QTime>
KoShapeSavingContext::KoShapeSavingContext( KoXmlWriter &xmlWriter, KoSavingContext &context )
: m_xmlWriter( &xmlWriter )
, m_savingOptions( 0 )
......
......@@ -27,6 +27,7 @@
// kde + qt includes
#include <kdialog.h>
#include <kdebug.h>
#include <QButtonGroup>
#include <QAbstractButton>
#include <QMainWindow>
......
......@@ -47,6 +47,7 @@
#include <kpagedialog.h>
#include <kaction.h>
#include <kactioncollection.h>
#include <kdebug.h>
#include <ktar.h>
#include <kio/netaccess.h>
......
......@@ -35,6 +35,7 @@
#include <kurl.h>
#include <kmimetype.h>
#include <kfilewidget.h>
#include <kdebug.h>
/********************************************************************
* KoScriptManagerAddTypeWidget
......
......@@ -46,6 +46,8 @@
#include "KoPAStyles.h"
#include "KoPALoadingContext.h"
#include <kdebug.h>
#include <typeinfo>
KoPADocument::KoPADocument( QWidget* parentWidget, QObject* parent, bool singleViewMode )
......
......@@ -22,6 +22,8 @@
#include "KoText.h"
#include "styles/KoCharacterStyle.h"
#include <kdebug.h>
KoHighlightingTab::KoHighlightingTab( QWidget* parent)
: QWidget ( parent)
{
......
......@@ -54,6 +54,7 @@
#include "../styles/KoListLevelProperties.h"
// KDE + Qt includes
#include <kdebug.h>
#include <QDomDocument>
#include <QTextDocument>
#include <QTextCursor>
......
......@@ -58,7 +58,9 @@
#include <QTextBlock>
#include <QTextList>
#include <QTextTable>
#include <QTime>
#include <klocale.h>
#include <kdebug.h>
// if defined then debugging is enabled
#define KOOPENDOCUMENTLOADER_DEBUG
......
......@@ -31,6 +31,7 @@
#include <kmessagebox.h>
#include <kstandarddirs.h>
#include <kiconloader.h>
#include <kdebug.h>
#include <QtDBus/QtDBus>
#include <QFile>
......
......@@ -38,6 +38,7 @@
#include <kdialog.h>
#include <kfileitem.h>
#include <kdebug.h>
#include <kio/job.h>
#include <kio/jobuidelegate.h>
#include <kio/netaccess.h>
......@@ -48,6 +49,7 @@
#include <kxmlguifactory.h>
#include <KIconLoader>
#include <kundostack.h>
#include <kdebug.h>
#include <QBuffer>
#include <QDir>
......
......@@ -26,6 +26,7 @@
#include <ktemporaryfile.h>
#include <kdeversion.h>
#include <kfilterdev.h>
#include <kdebug.h>
#include <QBuffer>
#include <QFile>
......
......@@ -30,6 +30,7 @@
#endif
#include <kdebug.h>
#include <kconfiggroup.h>
#include <kglobalsettings.h>
#include <kglobal.h>
#include <klocale.h>
......@@ -116,7 +117,7 @@ QStringList KoGlobal::_listOfLanguages()
void KoGlobal::createListOfLanguages()
{
KConfig config( "locale", "all_languages", KConfig::NoGlobals );
KConfig config("all_languages", KConfig::NoGlobals, "locale");
// Note that we could also use KLocale::allLanguagesTwoAlpha
QMap<QString, bool> seenLanguages;
......
......@@ -50,6 +50,7 @@
#include <kxmlguifactory.h>
#include <kfileitem.h>
#include <ktoolbar.h>
#include <kdebug.h>
#include <kactionmenu.h>
#include <kactioncollection.h>
......
......@@ -22,7 +22,8 @@
#include "KoPageFormat.h"
#include <klocale.h>
#include <kdebug.h>
#include <kglobal.h>
// paper formats ( mm )
#define PG_A3_WIDTH 297.0
#define PG_A3_HEIGHT 420.0
......
......@@ -28,6 +28,7 @@
#include <kservicetypetrader.h>
#include <k3staticdeleter.h>
#include <KConfig>
#include <KConfigGroup>
class KoPluginLoader::Private {
public:
......
......@@ -34,7 +34,7 @@
#include <kiconloader.h>
#include <kio/netaccess.h>
#include <klocale.h>
#include <kconfiggroup.h>
#include <stdlib.h>
......
......@@ -33,6 +33,8 @@
#include <kparts/partmanager.h>
#include <kparts/event.h>
#include <kstatusbar.h>
#include <kdebug.h>
#include <kconfiggroup.h>
#include <QTimer>
#include <QtGui/QDockWidget>
#include <QToolBar>
......
......@@ -21,6 +21,8 @@
#include <QRect>
#include <kdebug.h>
#include <KoView.h>
#include <KoFrame.h>
#include <KoDocumentChild.h>
......
......@@ -25,6 +25,9 @@
#include "KoColorConversionTransformationFactory.h"
#include "KoColorModelStandardIds.h"
#include <kdebug.h>
#include <kconfiggroup.h>
// -- KoLcmsColorConversionTransformationFactory --
class KoLcmsColorConversionTransformationFactory : public KoColorConversionTransformationFactory {
......
......@@ -24,6 +24,7 @@
#include <KAboutData>
#include <KCmdLineArgs>
#include <KApplication>
#include <KDebug>
#include "KoColorSpaceRegistry.h"
#include "KoColorConversionSystem.h"
......
......@@ -37,6 +37,7 @@
#include <kzip.h>
#include <kio/netaccess.h>
#include <ktemporaryfile.h>
#include <kdebug.h>
struct KoEncryptedStore_EncryptionData {
// Needed for Key Derivation
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment