Git commit 6f10de5b4c1973016f950adeeaa04a9256102065 by Pierre Stirnweiss. Pushed by pstirnweiss into branch 'master'. Fix some compilation issues on windows msvc2010 M +9 -1 kexi/formeditor/WidgetTreeWidget.cpp M +4 -0 kexi/formeditor/tabstopdialog.cpp M +8 -0 kexi/main/KexiMainWindow.cpp M +1 -0 kexi/shapes/relationdesign/kexirelationdesignfactory.cpp M +1 -0 kpresenter/part/KPrPlaceholderShapeFactory.cpp M +2 -2 kpresenter/part/stage_export.h M +8 -0 libs/koreport/common/krsectiondata.cpp M +1 -0 libs/kotext/KoInlineObject.cpp M +3 -0 libs/kotext/KoNamedVariable.cpp M +1 -0 libs/kotext/KoTextLocator.cpp M +5 -0 libs/kotext/KoTextReference.cpp M +1 -0 libs/odf/KoRawCellChild.cpp M +1 -0 words/part/frames/KWCopyShape.cpp M +2 -2 words/part/kword_export.h http://commits.kde.org/47e7010d/6f10de5b4c1973016f950adeeaa04a9256102065 diff --git a/kexi/formeditor/WidgetTreeWidget.cpp b/kexi/formeditor/WidgetTreeWidget.cpp index d86b87f..855cf29 100644 --- a/kexi/formeditor/WidgetTreeWidget.cpp +++ b/kexi/formeditor/WidgetTreeWidget.cpp @@ -157,7 +157,11 @@ bool WidgetTreeWidgetItem::operator<( const QTreeWidgetItem & other ) const return m_customSortingKey < otherItem->customSortingKey(); } -#warning port WidgetTreeWidgetItem::paintCell +#ifdef __GNUC__ +#warning port WidgetTreeWidgetItem::paintCell +#else +#pragma WARNING( port WidgetTreeWidgetItem::paintCell ) +#endif #if 0 void WidgetTreeWidgetItem::paintCell(QPainter *p, const QColorGroup & cg, int column, int width, int align) @@ -283,7 +287,11 @@ WidgetTreeWidget::~WidgetTreeWidget() { } +#ifdef __GNUC__ #warning TODO WidgetTreeWidget::sizeHint() const +#else +#pragma WARNING( TODO WidgetTreeWidget::sizeHint() const ) +#endif // QSize // WidgetTreeWidget::sizeHint() const // { diff --git a/kexi/formeditor/tabstopdialog.cpp b/kexi/formeditor/tabstopdialog.cpp index 0a01ee3..6de772c 100644 --- a/kexi/formeditor/tabstopdialog.cpp +++ b/kexi/formeditor/tabstopdialog.cpp @@ -66,7 +66,11 @@ TabStopDialog::TabStopDialog(QWidget *parent) m_widgetTree->m_form = 0; connect(m_widgetTree, SIGNAL(itemSelectionChanged()), this, SLOT(slotSelectionChanged())); +#ifdef __GNUC__ #warning TODO connect(m_widgetTree, SIGNAL(moved(Q3ListViewItem*, Q3ListViewItem*, Q3ListViewItem*)), this, SLOT(updateButtons(Q3ListViewItem*))); +#else +#pragma WARNING( TODO connect(m_widgetTree, SIGNAL(moved(Q3ListViewItem*, Q3ListViewItem*, Q3ListViewItem*)), this, SLOT(updateButtons(Q3ListViewItem*))); ) +#endif QVBoxLayout *vbox = new QVBoxLayout(); l->addLayout(vbox, 0, 1); diff --git a/kexi/main/KexiMainWindow.cpp b/kexi/main/KexiMainWindow.cpp index b7a0d18..053b93c 100644 --- a/kexi/main/KexiMainWindow.cpp +++ b/kexi/main/KexiMainWindow.cpp @@ -3040,7 +3040,11 @@ KexiMainWindow::slotProjectNew() //todo: pass new_data->caption() //start new instance //! @todo use KProcess? +#ifdef __GNUC__ #warning untested +#else +#pragma WARNING( untested ) +#endif QProcess proc(this); // proc.setCommunication((Q3Process::Communication)0); // proc.setWorkingDirectory( QFileInfo(new_data->connectionData()->fileName()).dir(true) ); @@ -3258,7 +3262,11 @@ tristate KexiMainWindow::openProjectInExternalKexiInstance(const QString& aFileN } //! @todo use KRun //Can arguments be supplied to KRun like is used here? AP +#ifdef __GNUC__ #warning untested +#else +#pragma WARNING( untested ) +#endif args << fileName; QProcess proc(this); proc.setWorkingDirectory(QFileInfo(fileName).absoluteDir().absolutePath()); diff --git a/kexi/shapes/relationdesign/kexirelationdesignfactory.cpp b/kexi/shapes/relationdesign/kexirelationdesignfactory.cpp index d81b3ec..dd7171c 100644 --- a/kexi/shapes/relationdesign/kexirelationdesignfactory.cpp +++ b/kexi/shapes/relationdesign/kexirelationdesignfactory.cpp @@ -18,6 +18,7 @@ #include "kexirelationdesignfactory.h" #include "kexirelationdesignshape.h" +#include #include #include diff --git a/kpresenter/part/KPrPlaceholderShapeFactory.cpp b/kpresenter/part/KPrPlaceholderShapeFactory.cpp index 5073486..fdca058 100644 --- a/kpresenter/part/KPrPlaceholderShapeFactory.cpp +++ b/kpresenter/part/KPrPlaceholderShapeFactory.cpp @@ -24,6 +24,7 @@ #include #include #include "KPrPlaceholderShape.h" +#include #include diff --git a/kpresenter/part/stage_export.h b/kpresenter/part/stage_export.h index 83dca77..d4fec74 100644 --- a/kpresenter/part/stage_export.h +++ b/kpresenter/part/stage_export.h @@ -27,7 +27,7 @@ #if defined _WIN32 || defined _WIN64 #ifndef STAGE_EXPORT -# if defined(MAKE_KPRESENTERPRIVATE_LIB) +# if defined(MAKE_CALLIGRASTAGEPRIVATE_LIB) /* We are building this library */ # define STAGE_EXPORT KDE_EXPORT # else @@ -47,7 +47,7 @@ #ifdef COMPILING_TESTS #if defined _WIN32 || defined _WIN64 -# if defined(MAKE_KPRESENTERPRIVATE_LIB) +# if defined(MAKE_CALLIGRASTAGEPRIVATE_LIB) # define STAGE_TEST_EXPORT KDE_EXPORT # else # define STAGE_TEST_EXPORT KDE_IMPORT diff --git a/libs/koreport/common/krsectiondata.cpp b/libs/koreport/common/krsectiondata.cpp index 9c20a2c..38c14c8 100644 --- a/libs/koreport/common/krsectiondata.cpp +++ b/libs/koreport/common/krsectiondata.cpp @@ -123,7 +123,11 @@ QString KRSectionData::name() const QString KRSectionData::sectionTypeString(KRSectionData::Section s) { +#ifdef __GNUC__ #warning use QMap +#else +#pragma WARNING( use QMap ) +#endif QString sectiontype; switch (s) { case KRSectionData::PageHeaderAny: @@ -180,7 +184,11 @@ QString KRSectionData::sectionTypeString(KRSectionData::Section s) KRSectionData::Section KRSectionData::sectionTypeFromString(const QString& s) { +#ifdef __GNUC__ #warning use QMap +#else +#pragma WARNING( use QMap ) +#endif KRSectionData::Section sec; kDebug() << "Determining section type for " << s; diff --git a/libs/kotext/KoInlineObject.cpp b/libs/kotext/KoInlineObject.cpp index b04b5a7..9b22132 100644 --- a/libs/kotext/KoInlineObject.cpp +++ b/libs/kotext/KoInlineObject.cpp @@ -21,6 +21,7 @@ #include "KoInlineObject_p.h" #include "KoTextDocumentLayout.h" #include "KoShapeSavingContext.h" +#include "KoShapeLoadingContext.h" #include "KoInlineTextObjectManager.h" #include "KoTextInlineRdf.h" diff --git a/libs/kotext/KoNamedVariable.cpp b/libs/kotext/KoNamedVariable.cpp index 78871de..68776270 100644 --- a/libs/kotext/KoNamedVariable.cpp +++ b/libs/kotext/KoNamedVariable.cpp @@ -19,7 +19,10 @@ #include "KoNamedVariable.h" #include "KoInlineTextObjectManager.h" +#include "KoShapeLoadingContext.h" +#include "KoShapeSavingContext.h" #include +#include KoNamedVariable::KoNamedVariable(Property key, const QString &name) : KoVariable(true), diff --git a/libs/kotext/KoTextLocator.cpp b/libs/kotext/KoTextLocator.cpp index 4622b87..f872220 100644 --- a/libs/kotext/KoTextLocator.cpp +++ b/libs/kotext/KoTextLocator.cpp @@ -26,6 +26,7 @@ #include #include +#include "KoShapeSavingContext.h" #include #include diff --git a/libs/kotext/KoTextReference.cpp b/libs/kotext/KoTextReference.cpp index 5def62d..9d79f32 100644 --- a/libs/kotext/KoTextReference.cpp +++ b/libs/kotext/KoTextReference.cpp @@ -18,9 +18,14 @@ */ #include "KoTextReference.h" + +#include "KoShapeLoadingContext.h" +#include "KoShapeSavingContext.h" #include "KoTextLocator.h" #include "KoInlineTextObjectManager.h" +#include + KoTextReference::KoTextReference(int indexId) : KoVariable(), m_indexId(indexId) diff --git a/libs/odf/KoRawCellChild.cpp b/libs/odf/KoRawCellChild.cpp index 2f03332..15ed2ef 100644 --- a/libs/odf/KoRawCellChild.cpp +++ b/libs/odf/KoRawCellChild.cpp @@ -18,6 +18,7 @@ #include "KoRawCellChild.h" +#include #include KoRawCellChild::KoRawCellChild(QBuffer* content) diff --git a/words/part/frames/KWCopyShape.cpp b/words/part/frames/KWCopyShape.cpp index f14a96c..4d880f6 100644 --- a/words/part/frames/KWCopyShape.cpp +++ b/words/part/frames/KWCopyShape.cpp @@ -23,6 +23,7 @@ #include "KWPageManager.h" #include +#include #include #include #include diff --git a/words/part/kword_export.h b/words/part/kword_export.h index 93d0042..9f2f34d 100644 --- a/words/part/kword_export.h +++ b/words/part/kword_export.h @@ -27,7 +27,7 @@ #if defined _WIN32 || defined _WIN64 #ifndef KWORD_EXPORT -# if defined(MAKE_KWORDPRIVATE_LIB) +# if defined(MAKE_WORDSPRIVATE_LIB) /* We are building this library */ # define KWORD_EXPORT KDE_EXPORT # else @@ -46,7 +46,7 @@ #ifdef COMPILING_TESTS #if defined _WIN32 || defined _WIN64 -# if defined(MAKE_KWORDPRIVATE_LIB) +# if defined(MAKE_WORDSPRIVATE_LIB) # define KWORD_TEST_EXPORT KDE_EXPORT # else # define KWORD_TEST_EXPORT KDE_IMPORT