[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: koffice/kword
From: Laurent Montel <montel () kde ! org>
Date: 2007-12-27 11:37:03
Message-ID: 1198755423.001438.1454.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 753410 by mlaurent:
Fix include
M +0 -5 mailmerge/KWClassicSerialDataSource.cpp
M +0 -2 mailmerge/kabc/KWMailMergeKABC.cpp
M +0 -1 mailmerge/kabc/KWMailMergeKABC.h
M +0 -3 mailmerge/kabc/KWMailMergeKABCConfig.cpp
M +0 -2 mailmerge/kspread/kwmailmerge_kspread_config.cpp
M +0 -2 mailmerge/sql/KWQtSqlEasyFilter.cpp
M +0 -3 mailmerge/sql/KWQtSqlMailMergeOpen.cpp
M +0 -3 mailmerge/sql/KWQtSqlPowerSerialDataSource.cpp
M +0 -1 mailmerge/sql/KWQtSqlPowerSerialDataSource.h
M +0 -2 mailmerge/sql/KWQtSqlSerialDataSource.cpp
M +0 -2 mailmerge/sql/KWQtSqlSerialDataSourceBase.cpp
M +0 -1 part/KWCanvas.cpp
M +0 -1 part/KWDLoader.cpp
M +1 -1 part/KWDLoader.h
M +0 -2 part/KWDocument.cpp
M +0 -1 part/KWFactory.cpp
M +2 -2 part/KWGui.cpp
M +0 -1 part/KWGui.h
M +1 -2 part/KWOpenDocumentLoader.cpp
M +0 -1 part/KWOpenDocumentLoader.h
M +0 -1 part/KWPage.cpp
M +0 -2 part/KWStatusBar.cpp
M +0 -3 part/KWView.cpp
M +0 -1 part/KWViewMode.cpp
M +0 -1 part/KWViewMode.h
M +1 -2 part/KWViewModePreview.cpp
M +0 -1 part/dialogs/KWDocumentColumns.cpp
M +0 -2 part/dialogs/KWFrameConnectSelector.cpp
M +0 -1 part/dialogs/KWFrameConnectSelector.h
M +0 -1 part/dialogs/KWFrameDialog.cpp
M +0 -1 part/dialogs/KWFrameGeometry.cpp
M +0 -2 part/dialogs/KWFrameGeometry.h
M +0 -1 part/dialogs/KWFrameRunaroundProperties.cpp
M +0 -1 part/dialogs/KWFrameRunaroundProperties.h
M +0 -1 part/dialogs/KWGeneralFrameProperties.cpp
M +0 -1 part/dialogs/KWGeneralFrameProperties.h
M +0 -1 part/dialogs/KWPageLayout.cpp
M +0 -1 part/dialogs/KWPagePreview.cpp
M +0 -1 part/dialogs/KWPageSettingsDialog.cpp
M +0 -1 part/dialogs/KWPrintingDialog.cpp
M +0 -1 part/dialogs/KWStartupWidget.cpp
M +1 -2 part/dialogs/KWStatistics.cpp
M +0 -1 part/dialogs/KWStatisticsDialog.cpp
M +0 -1 part/dockers/KWStatisticsDocker.cpp
M +0 -1 part/frames/KWAnchorStrategy.cpp
M +0 -1 part/frames/KWAnchorStrategy.h
M +0 -1 part/frames/KWFrameLayout.cpp
M +0 -1 part/frames/KWFrameSet.cpp
M +0 -2 part/frames/KWTextDocumentLayout.h
M +0 -4 part/frames/KWTextFrame.cpp
M +0 -2 part/frames/KWTextFrameSet.cpp
M +0 -1 part/frames/tests/TestBasicLayout.cpp
M +0 -1 part/frames/tests/TestDocumentLayout.cpp
M +0 -1 plugins/scripting/FrameSet.h
M +0 -3 plugins/scripting/KWScriptingPart.cpp
M +0 -1 plugins/scripting/TextDocument.h
M +0 -1 plugins/scripting/TextList.h
M +0 -1 plugins/scripting/Tool.h
--- trunk/koffice/kword/mailmerge/KWClassicSerialDataSource.cpp #753409:753410
@@ -19,23 +19,18 @@
*/
#include "KWClassicSerialDataSource.h"
-#include "KWClassicSerialDataSource.moc"
#include "KWMailMergeDataBase.h"
#include <kinputdialog.h>
-#include <QLabel>
-#include <QLayout>
#include <QPushButton>
#include <QLineEdit>
-#include <QValidator>
//Added by qt3to4:
#include <QResizeEvent>
#include <Q3VBoxLayout>
#include <klocale.h>
#include <kdebug.h>
#include <QToolButton>
-#include <QToolTip>
#include <kiconloader.h>
#include <q3header.h>
#include <kvbox.h>
--- trunk/koffice/kword/mailmerge/kabc/KWMailMergeKABC.cpp #753409:753410
@@ -33,7 +33,6 @@
#include "KWMailMergeKABC.h"
#include "KWMailMergeKABCConfig.h"
//Added by qt3to4:
-#include <Q3ValueList>
KWMailMergeKABC::KWMailMergeKABC( const KComponentData &inst, QObject *parent )
: KWMailMergeDataSource( inst, parent )
@@ -548,6 +547,5 @@
-#include "KWMailMergeKABC.moc"
--- trunk/koffice/kword/mailmerge/kabc/KWMailMergeKABC.h #753409:753410
@@ -24,7 +24,6 @@
#define _KWMAILMERGE_KABC_H_
#include <qdom.h>
-#include <QPointer>
#include <kabc/addressbook.h>
--- trunk/koffice/kword/mailmerge/kabc/KWMailMergeKABCConfig.cpp #753409:753410
@@ -20,8 +20,6 @@
#include <q3vbox.h>
-#include <QLayout>
-#include <QLineEdit>
//Added by qt3to4:
#include <Q3VBoxLayout>
@@ -549,4 +547,3 @@
}
}
-#include "KWMailMergeKABCConfig.moc"
--- trunk/koffice/kword/mailmerge/kspread/kwmailmerge_kspread_config.cpp \
#753409:753410 @@ -20,10 +20,8 @@
#include <QLabel>
-#include <QLayout>
//Added by qt3to4:
#include <Q3GridLayout>
-#include <Q3Frame>
#include <kcombobox.h>
#include <klineedit.h>
--- trunk/koffice/kword/mailmerge/sql/KWQtSqlEasyFilter.cpp #753409:753410
@@ -17,11 +17,9 @@
* Boston, MA 02110-1301, USA.
*/
#include "KWQtSqlEasyFilter.h"
-#include "KWQtSqlEasyFilter.moc"
#include <q3table.h>
#include <q3scrollview.h>
#include <klocale.h>
-#include <QLayout>
#include <QCheckBox>
KWQtSqlEasyFilter::KWQtSqlEasyFilter( QWidget *parent)
--- trunk/koffice/kword/mailmerge/sql/KWQtSqlMailMergeOpen.cpp #753409:753410
@@ -18,11 +18,9 @@
*/
#include "KWQtSqlMailMergeOpen.h"
-#include "KWQtSqlMailMergeOpen.moc"
#include <kcombobox.h>
#include <klineedit.h>
#include <kdebug.h>
-#include <QLayout>
//Added by qt3to4:
#include <Q3VBoxLayout>
#include <kconfig.h>
@@ -30,7 +28,6 @@
#include <klineeditdlg.h>
#include <kiconloader.h>
#include <qsqldatabase.h>
-#include <QPointer>
#include <klocale.h>
/******************************************************************
--- trunk/koffice/kword/mailmerge/sql/KWQtSqlPowerSerialDataSource.cpp #753409:753410
@@ -18,9 +18,7 @@
*/
#include "KWQtSqlPowerSerialDataSource.h"
-#include "KWQtSqlPowerSerialDataSource.moc"
#include "KWQtSqlMailMergeOpen.h"
-#include <QLayout>
#include <qdom.h>
//Added by qt3to4:
#include <Q3VBoxLayout>
@@ -28,7 +26,6 @@
#include <klineedit.h>
#include <kpushbutton.h>
#include <qsqldatabase.h>
-#include <QMessageBox>
#include <kpassworddialog.h>
#include <qsqlrecord.h>
#include <q3sqlcursor.h>
--- trunk/koffice/kword/mailmerge/sql/KWQtSqlPowerSerialDataSource.h #753409:753410
@@ -29,7 +29,6 @@
#include <q3sqlcursor.h>
#include <qsqldriver.h>
/* END FOR THE DIRTY HACK */
-#include <QPointer>
#include "defs.h"
#include "KWMailMergeDataSource.h"
--- trunk/koffice/kword/mailmerge/sql/KWQtSqlSerialDataSource.cpp #753409:753410
@@ -18,11 +18,9 @@
*/
#include "KWQtSqlSerialDataSource.h"
-#include "KWQtSqlSerialDataSource.moc"
#include "KWQtSqlEasyFilter.h"
#include <klocale.h>
-#include <QLayout>
#include <q3sqlcursor.h>
#include <q3datatable.h>
#include <QCheckBox>
--- trunk/koffice/kword/mailmerge/sql/KWQtSqlSerialDataSourceBase.cpp #753409:753410
@@ -18,9 +18,7 @@
*/
#include "KWQtSqlSerialDataSourceBase.h"
-#include "KWQtSqlSerialDataSourceBase.moc"
#include "KWQtSqlMailMergeOpen.h"
-#include <QLayout>
#include <qdom.h>
//Added by qt3to4:
#include <QSqlError>
--- trunk/koffice/kword/part/KWCanvas.cpp #753409:753410
@@ -281,4 +281,3 @@
painter.end();
}
-#include "KWCanvas.moc"
--- trunk/koffice/kword/part/KWDLoader.cpp #753409:753410
@@ -1131,4 +1131,3 @@
m_anchors.clear();
}
-#include "KWDLoader.moc"
--- trunk/koffice/kword/part/KWDLoader.h #753409:753410
@@ -21,9 +21,9 @@
#define KWDLOADER_H
#include <QObject>
-#include <QTextCursor>
#include <KoXmlReader.h>
+#include <QTextDocument>
class KWDocument;
class KWFrameSet;
--- trunk/koffice/kword/part/KWDocument.cpp #753409:753410
@@ -67,7 +67,6 @@
#include <QTimer>
#include <QThread>
#include <QCoreApplication>
-#include <QUrl>
KWDocument::KWDocument( QWidget *parentWidget, QObject* parent, bool singleViewMode \
) : KoDocument(parentWidget, parent, singleViewMode),
@@ -782,4 +781,3 @@
m_pages.clear();
deleteLater();
}
-#include "KWDocument.moc"
--- trunk/koffice/kword/part/KWFactory.cpp #753409:753410
@@ -78,4 +78,3 @@
return *s_instance;
}
-#include "KWFactory.moc"
--- trunk/koffice/kword/part/KWGui.cpp #753409:753410
@@ -35,11 +35,12 @@
#include <KoToolBoxFactory.h>
#include <KoToolDockerFactory.h>
#include <KoRulerController.h>
+#include <KActionCollection>
-#include <KActionCollection>
#include <QGridLayout>
#include <QTimer>
#include <QAction>
+#include <QScrollBar>
KWGui::KWGui( const QString& viewMode, KWView *parent )
: QWidget( parent),
@@ -169,4 +170,3 @@
m_horizontalRuler->setPopupActionList(unitActions);
}
-#include "KWGui.moc"
--- trunk/koffice/kword/part/KWGui.h #753409:753410
@@ -22,7 +22,6 @@
#include <QWidget>
-#include <QScrollBar>
class KWView;
class KWCanvas;
--- trunk/koffice/kword/part/KWOpenDocumentLoader.cpp #753409:753410
@@ -51,9 +51,9 @@
// KDE + Qt includes
#include <QTextCursor>
-#include <QTextBlock>
#include <klocale.h>
#include <kdebug.h>
+#include <QTextBlock>
/**
* The KWOpenDocumentFrameLoader class implements a KoTextFrameLoader to
@@ -692,4 +692,3 @@
d->frameLoader->loadFrame(context, frameElem, cursor);
}
-#include "KWOpenDocumentLoader.moc"
--- trunk/koffice/kword/part/KWOpenDocumentLoader.h #753409:753410
@@ -23,7 +23,6 @@
#ifndef KWOPENDOCUMENTLOADER_H
#define KWOPENDOCUMENTLOADER_H
-#include <QObject>
#include <KoStore.h>
#include <KoTextLoader.h>
--- trunk/koffice/kword/part/KWPage.cpp #753409:753410
@@ -21,7 +21,6 @@
#include "KoZoomHandler.h"
#include <QRect>
-#include <QApplication>
KWPage::KWPage(KWPageManager *parent, int pageNum) {
m_parent = parent;
--- trunk/koffice/kword/part/KWStatusBar.cpp #753409:753410
@@ -21,7 +21,6 @@
#include <QPoint>
#include <QLabel>
-#include <QTextDocument>
#include <QTextCursor>
#include <QFontMetrics>
#include <QPointer>
@@ -266,4 +265,3 @@
d->mousePosLabel->setText( QString("%1:%2").arg(pos.x()).arg(pos.y()) );
}
-#include "KWStatusBar.moc"
--- trunk/koffice/kword/part/KWView.cpp #753409:753410
@@ -65,8 +65,6 @@
// KDE + Qt includes
#include <QHBoxLayout>
-#include <QTextDocument>
-#include <QTimer>
#include <QMenu>
#include <klocale.h>
#include <kdebug.h>
@@ -1052,4 +1050,3 @@
}
}
-#include "KWView.moc"
--- trunk/koffice/kword/part/KWViewMode.cpp #753409:753410
@@ -59,4 +59,3 @@
return new KWViewModeNormal(canvas);
}
-#include "KWViewMode.moc"
--- trunk/koffice/kword/part/KWViewMode.h #753409:753410
@@ -28,7 +28,6 @@
#include <QRectF>
#include <QSizeF>
#include <QObject>
-#include <QMap>
#include <QRect>
/**
--- trunk/koffice/kword/part/KWViewModePreview.cpp #753409:753410
@@ -30,8 +30,7 @@
// #include "KWFrameViewManager.h"
// #include "KWFrameView.h"
// #include "KWGUI.h"
-// #include <QApplication>
-// #include <kdebug.h>
+// // #include <kdebug.h>
KWViewModePreview::KWViewModePreview( KWCanvas* canvas )
--- trunk/koffice/kword/part/dialogs/KWDocumentColumns.cpp #753409:753410
@@ -59,4 +59,3 @@
emit columnsChanged(m_columns);
}
-#include <KWDocumentColumns.moc>
--- trunk/koffice/kword/part/dialogs/KWFrameConnectSelector.cpp #753409:753410
@@ -22,7 +22,6 @@
#include "frames/KWTextFrameSet.h"
#include "frames/KWTextFrame.h"
-#include <QHeaderView>
KWFrameConnectSelector::KWFrameConnectSelector(FrameConfigSharedState *state)
: m_state(state),
@@ -131,4 +130,3 @@
open(frame);
}
-#include "KWFrameConnectSelector.moc"
--- trunk/koffice/kword/part/dialogs/KWFrameConnectSelector.h #753409:753410
@@ -25,7 +25,6 @@
#include <KoShapeConfigWidgetBase.h>
-#include <QWidget>
#include <QList>
class KWFrame;
--- trunk/koffice/kword/part/dialogs/KWFrameDialog.cpp #753409:753410
@@ -89,4 +89,3 @@
return answer;
}
-#include "KWFrameDialog.moc"
--- trunk/koffice/kword/part/dialogs/KWFrameGeometry.cpp #753409:753410
@@ -194,4 +194,3 @@
widget.height->changeValue(m_originalSize.width() / m_originalSize.height() \
* widget.width->value()); }
-#include "KWFrameGeometry.moc"
--- trunk/koffice/kword/part/dialogs/KWFrameGeometry.h #753409:753410
@@ -24,8 +24,6 @@
#include <KoShapeConfigWidgetBase.h>
-#include <QWidget>
-#include <QList>
class KWFrame;
class KoShape;
--- trunk/koffice/kword/part/dialogs/KWFrameRunaroundProperties.cpp #753409:753410
@@ -106,4 +106,3 @@
m_state->removeUser();
}
-#include "KWFrameRunaroundProperties.moc"
--- trunk/koffice/kword/part/dialogs/KWFrameRunaroundProperties.h #753409:753410
@@ -25,7 +25,6 @@
#include <KoShapeConfigWidgetBase.h>
-#include <QWidget>
#include <QList>
class KWFrame;
--- trunk/koffice/kword/part/dialogs/KWGeneralFrameProperties.cpp #753409:753410
@@ -171,4 +171,3 @@
m_state->setKeepAspectRatio( widget.keepAspectRatio->checkState() == Qt::Checked \
); }
-#include "KWGeneralFrameProperties.moc"
--- trunk/koffice/kword/part/dialogs/KWGeneralFrameProperties.h #753409:753410
@@ -25,7 +25,6 @@
#include <KoShapeConfigWidgetBase.h>
-#include <QWidget>
#include <QList>
class KWFrame;
--- trunk/koffice/kword/part/dialogs/KWPageLayout.cpp #753409:753410
@@ -286,4 +286,3 @@
}
}
-#include <KWPageLayout.moc>
--- trunk/koffice/kword/part/dialogs/KWPagePreview.cpp #753409:753410
@@ -123,4 +123,3 @@
update();
}
-#include "KWPagePreview.moc"
--- trunk/koffice/kword/part/dialogs/KWPageSettingsDialog.cpp #753409:753410
@@ -104,4 +104,3 @@
m_pageLayoutWidget->showTextDirection(on);
}
-#include <KWPageSettingsDialog.moc>
--- trunk/koffice/kword/part/dialogs/KWPrintingDialog.cpp #753409:753410
@@ -29,7 +29,6 @@
#include <KoInsets.h>
#include <KoShapeManager.h>
-#include <QPainter>
// #define PRINT_VIA_KRITA
--- trunk/koffice/kword/part/dialogs/KWStartupWidget.cpp #753409:753410
@@ -101,4 +101,3 @@
emit documentSelected();
}
-#include <KWStartupWidget.moc>
--- trunk/koffice/kword/part/dialogs/KWStatistics.cpp #753409:753410
@@ -30,9 +30,9 @@
#include <KoSelection.h>
#include <KoShape.h>
+#include <QTextLayout>
#include <QTextDocument>
#include <QTextBlock>
-#include <QTextLayout>
#include <QTimer>
KWStatistics::KWStatistics(KoCanvasResourceProvider *provider, KWDocument* document, \
KoSelection *selection, QWidget *parent) @@ -290,4 +290,3 @@
}
}
-#include <KWStatistics.moc>
--- trunk/koffice/kword/part/dialogs/KWStatisticsDialog.cpp #753409:753410
@@ -34,4 +34,3 @@
KWStatisticsDialog::~KWStatisticsDialog() {
}
-#include "KWStatisticsDialog.moc"
--- trunk/koffice/kword/part/dockers/KWStatisticsDocker.cpp #753409:753410
@@ -74,5 +74,4 @@
return widget;
}
-#include "KWStatisticsDocker.moc"
--- trunk/koffice/kword/part/frames/KWAnchorStrategy.cpp #753409:753410
@@ -25,7 +25,6 @@
#include <QTextBlock>
#include <QTextLine>
-#include <QTextDocument>
#include <KDebug>
--- trunk/koffice/kword/part/frames/KWAnchorStrategy.h #753409:753410
@@ -22,7 +22,6 @@
#include <KoTextDocumentLayout.h>
-#include <QList>
class KoTextAnchor;
class KWAnchorStrategy;
--- trunk/koffice/kword/part/frames/KWFrameLayout.cpp #753409:753410
@@ -688,4 +688,3 @@
return m_maintext;
}
-#include "KWFrameLayout.moc"
--- trunk/koffice/kword/part/frames/KWFrameSet.cpp #753409:753410
@@ -86,4 +86,3 @@
}
#endif
-#include "KWFrameSet.moc"
--- trunk/koffice/kword/part/frames/KWTextDocumentLayout.h #753409:753410
@@ -24,8 +24,6 @@
#include <KoTextDocumentLayout.h>
-#include <QRectF>
-#include <QSizeF>
class KWTextFrameSet;
class KWAnchorStrategy;
--- trunk/koffice/kword/part/frames/KWTextFrame.cpp #753409:753410
@@ -23,10 +23,6 @@
#include <KoViewConverter.h>
#include <KoTextShapeData.h>
-#include <QTextFrame>
-#include <QTextDocument>
-#include <QTextBlock>
-#include <QTextFragment>
#include <kdebug.h>
KWTextFrame::KWTextFrame(KoShape *shape, KWTextFrameSet *parent)
--- trunk/koffice/kword/part/frames/KWTextFrameSet.cpp #753409:753410
@@ -31,7 +31,6 @@
#include <klocale.h>
#include <kdebug.h>
#include <QTextDocument>
-#include <QTimer>
KWTextFrameSet::KWTextFrameSet(const KWDocument *doc)
: m_document( new QTextDocument() ),
@@ -269,4 +268,3 @@
}
#endif
-#include "KWTextFrameSet.moc"
--- trunk/koffice/kword/part/frames/tests/TestBasicLayout.cpp #753409:753410
@@ -9,7 +9,6 @@
#include "KWTextFrame.h"
#include "KWord.h"
-#include <QList>
#include <kcomponentdata.h>
class Helper {
--- trunk/koffice/kword/part/frames/tests/TestDocumentLayout.cpp #753409:753410
@@ -9,7 +9,6 @@
#include <KoTextBlockData.h>
#include <KoStyleManager.h>
-#include <QtGui>
#include <kdebug.h>
#include <kcomponentdata.h>
--- trunk/koffice/kword/plugins/scripting/FrameSet.h #753409:753410
@@ -22,7 +22,6 @@
#include <QPointer>
#include <QObject>
-#include <QTextDocument>
#include <kdebug.h>
#include <KoShapeRegistry.h>
--- trunk/koffice/kword/plugins/scripting/KWScriptingPart.cpp #753409:753410
@@ -23,8 +23,6 @@
#include "Variable.h"
// qt
-#include <QApplication>
-#include <QDockWidget>
// kde
#include <klocale.h>
#include <kgenericfactory.h>
@@ -86,4 +84,3 @@
delete d;
}
-#include "KWScriptingPart.moc"
--- trunk/koffice/kword/plugins/scripting/TextDocument.h #753409:753410
@@ -23,7 +23,6 @@
#include <QPointer>
#include <QObject>
#include <QTextDocument>
-#include <QAbstractTextDocumentLayout>
#include <kdebug.h>
#include <KoVariable.h>
#include <KoVariableManager.h>
--- trunk/koffice/kword/plugins/scripting/TextList.h #753409:753410
@@ -25,7 +25,6 @@
#include <QTextList>
#include <QTextBlock>
#include <QTextCursor>
-#include <QTextListFormat>
#include <kdebug.h>
#include <KoParagraphStyle.h>
--- trunk/koffice/kword/plugins/scripting/Tool.h #753409:753410
@@ -25,7 +25,6 @@
//#include <QStringList>
#include <QObject>
#include <QAction>
-#include <QPointer>
#include <QSignalMapper>
#include <kdebug.h>
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic