[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: koffice/kword
From: Thomas Zander <zander () kde ! org>
Date: 2007-03-31 9:20:27
Message-ID: 1175332827.544367.3145.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 648404 by zander:
In Java dirs are always singular, and old habits die hard ;)
We use plural names in KDE/KOffice. So lets follow suit and rename
the dir 'frame' to 'frames'
M +8 -8 part/CMakeLists.txt
M +2 -2 part/KWDLoader.cpp
M +5 -5 part/KWDocument.cpp
M +1 -1 part/KWDocument.h
M +2 -2 part/KWOpenDocumentLoader.cpp
M +1 -1 part/KWView.cpp
M +2 -2 part/commands/KWFrameDeleteCommand.cpp
M +2 -2 part/commands/KWPageInsertCommand.cpp
M +3 -3 part/commands/KWPagePropertiesCommand.cpp
M +2 -2 part/dialog/KWFrameConnectSelector.cpp
M +1 -1 part/dialog/KWFrameDialog.cpp
M +1 -1 part/dialog/KWFrameGeometry.cpp
M +1 -1 part/dialog/KWFrameRunaroundProperties.cpp
M +2 -2 part/dialog/KWGeneralFrameProperties.cpp
M +2 -2 part/dialog/KWShapeConfigFactory.cpp
D part/frame (directory)
A part/frames (directory) part/frame#647499
A part/frames/KWFrame.cpp part/frame/KWFrame.cpp#648403
A part/frames/KWFrameLayout.cpp part/frame/KWFrameLayout.cpp#648403
A part/frames/KWTextDocumentLayout.cpp part/frame/KWTextDocumentLayout.cpp#648403
A part/frames/KWTextDocumentLayout.h part/frame/KWTextDocumentLayout.h#648403
A part/frames/KWTextFrame.cpp part/frame/KWTextFrame.cpp#648403
A part/frames/KWTextFrameSet.cpp part/frame/KWTextFrameSet.cpp#648403
A part/frames/KWTextFrameSet.h part/frame/KWTextFrameSet.h#648403
M +1 -1 part/frames/tests/CMakeLists.txt
M +1 -1 plugins/scripting/CMakeLists.txt
--- trunk/koffice/kword/part/CMakeLists.txt #648403:648404
@@ -1,6 +1,6 @@
project(kwordpart)
-add_subdirectory( frame/tests )
+add_subdirectory( frames/tests )
add_subdirectory( tests )
include_directories( ${KOTEXT_INCLUDES} ${KOFFICEUI_INCLUDES} )
@@ -22,13 +22,13 @@
KWOpenDocumentLoader.cpp
KWDLoader.cpp
- frame/KWTextDocumentLayout.cpp
- frame/KWFrameLayout.cpp
- frame/KWFrame.cpp
- frame/KWFrameSet.cpp
- frame/KWTextFrame.cpp
- frame/KWTextFrameSet.cpp
- frame/KWCopyShape.cpp
+ frames/KWTextDocumentLayout.cpp
+ frames/KWFrameLayout.cpp
+ frames/KWFrame.cpp
+ frames/KWFrameSet.cpp
+ frames/KWTextFrame.cpp
+ frames/KWTextFrameSet.cpp
+ frames/KWCopyShape.cpp
dialog/KWFrameConnectSelector.cpp
dialog/KWFrameGeometry.cpp
--- trunk/koffice/kword/part/KWDLoader.cpp #648403:648404
@@ -20,8 +20,8 @@
#include "KWDLoader.h"
#include "KWDocument.h"
#include "KWPageSettings.h"
-#include "frame/KWTextFrameSet.h"
-#include "frame/KWTextFrame.h"
+#include "frames/KWTextFrameSet.h"
+#include "frames/KWTextFrame.h"
// koffice
#include <KoShapeRegistry.h>
--- trunk/koffice/kword/part/KWDocument.cpp #648403:648404
@@ -27,11 +27,11 @@
#include "KWPage.h"
#include "KWOpenDocumentLoader.h"
#include "KWDLoader.h"
-#include "frame/KWFrameSet.h"
-#include "frame/KWTextFrameSet.h"
-#include "frame/KWFrame.h"
-#include "frame/KWFrameLayout.h"
-#include "frame/KWTextDocumentLayout.h"
+#include "frames/KWFrameSet.h"
+#include "frames/KWTextFrameSet.h"
+#include "frames/KWFrame.h"
+#include "frames/KWFrameLayout.h"
+#include "frames/KWTextDocumentLayout.h"
#include "dialog/KWFrameDialog.h"
#include "dialog/KWStartupWidget.h"
#include "commands/KWPageInsertCommand.h"
--- trunk/koffice/kword/part/KWDocument.h #648403:648404
@@ -23,7 +23,7 @@
#include "KWPageSettings.h"
#include "KWPageManager.h"
-#include "frame/KWFrameLayout.h"
+#include "frames/KWFrameLayout.h"
#include <KoDocument.h>
#include <KoShapeControllerBase.h>
--- trunk/koffice/kword/part/KWOpenDocumentLoader.cpp #648403:648404
@@ -22,8 +22,8 @@
#include "KWOpenDocumentLoader.h"
#include "KWDocument.h"
//#include "KWPageSettings.h"
-#include "frame/KWTextFrameSet.h"
-#include "frame/KWTextFrame.h"
+#include "frames/KWTextFrameSet.h"
+#include "frames/KWTextFrame.h"
// koffice
#include <KoOasisLoadingContext.h>
--- trunk/koffice/kword/part/KWView.cpp #648403:648404
@@ -26,7 +26,7 @@
#include "KWPage.h"
#include "KWViewMode.h"
#include "KWFactory.h"
-#include "frame/KWFrame.h"
+#include "frames/KWFrame.h"
#include "dialog/KWFrameDialog.h"
#include "dialog/KWPageSettingsDialog.h"
--- trunk/koffice/kword/part/commands/KWFrameDeleteCommand.cpp #648403:648404
@@ -18,8 +18,8 @@
*/
#include "KWFrameDeleteCommand.h"
-#include "frame/KWFrame.h"
-#include "frame/KWFrameSet.h"
+#include "frames/KWFrame.h"
+#include "frames/KWFrameSet.h"
#include <KoShapeDeleteCommand.h>
--- trunk/koffice/kword/part/commands/KWPageInsertCommand.cpp #648403:648404
@@ -20,8 +20,8 @@
#include "KWPageInsertCommand.h"
#include "KWDocument.h"
#include "KWPage.h"
-#include "frame/KWFrameSet.h"
-#include "frame/KWFrame.h"
+#include "frames/KWFrameSet.h"
+#include "frames/KWFrame.h"
#include <KoShapeMoveCommand.h>
--- trunk/koffice/kword/part/commands/KWPagePropertiesCommand.cpp #648403:648404
@@ -20,9 +20,9 @@
#include "KWPagePropertiesCommand.h"
#include "KWDocument.h"
#include "KWPage.h"
-#include "frame/KWFrame.h"
-#include "frame/KWTextFrameSet.h"
-#include "frame/KWFrameLayout.h"
+#include "frames/KWFrame.h"
+#include "frames/KWTextFrameSet.h"
+#include "frames/KWFrameLayout.h"
#include "commands/KWPageInsertCommand.h"
#include "commands/KWFrameDeleteCommand.h"
--- trunk/koffice/kword/part/dialog/KWFrameConnectSelector.cpp #648403:648404
@@ -19,8 +19,8 @@
#include "KWFrameConnectSelector.h"
#include "KWDocument.h"
-#include "frame/KWTextFrameSet.h"
-#include "frame/KWTextFrame.h"
+#include "frames/KWTextFrameSet.h"
+#include "frames/KWTextFrame.h"
#include <QHeaderView>
--- trunk/koffice/kword/part/dialog/KWFrameDialog.cpp #648403:648404
@@ -23,7 +23,7 @@
#include "KWFrameConnectSelector.h"
#include "KWFrameRunaroundProperties.h"
#include "KWGeneralFrameProperties.h"
-#include "frame/KWFrame.h"
+#include "frames/KWFrame.h"
#include "KoShapeGeometry.h"
--- trunk/koffice/kword/part/dialog/KWFrameGeometry.cpp #648403:648404
@@ -18,7 +18,7 @@
*/
#include "KWFrameGeometry.h"
#include "KWDocument.h"
-#include "frame/KWFrame.h"
+#include "frames/KWFrame.h"
#include <kdebug.h>
--- trunk/koffice/kword/part/dialog/KWFrameRunaroundProperties.cpp #648403:648404
@@ -20,7 +20,7 @@
#include "KWFrameRunaroundProperties.h"
#include "KWFrameDialog.h"
#include "KWDocument.h"
-#include "frame/KWFrame.h"
+#include "frames/KWFrame.h"
KWFrameRunaroundProperties::KWFrameRunaroundProperties(FrameConfigSharedState *state)
: m_state(state),
--- trunk/koffice/kword/part/dialog/KWGeneralFrameProperties.cpp #648403:648404
@@ -19,8 +19,8 @@
#include "KWGeneralFrameProperties.h"
#include "KWFrameDialog.h"
-#include "frame/KWFrame.h"
-#include "frame/KWTextFrameSet.h"
+#include "frames/KWFrame.h"
+#include "frames/KWTextFrameSet.h"
KWGeneralFrameProperties::KWGeneralFrameProperties(FrameConfigSharedState *state)
: m_state(state),
--- trunk/koffice/kword/part/dialog/KWShapeConfigFactory.cpp #648403:648404
@@ -23,8 +23,8 @@
#include "KWFrameConnectSelector.h"
#include "KWFrameGeometry.h"
#include <KWCanvas.h>
-#include <frame/KWFrame.h>
-#include <frame/KWFrameSet.h>
+#include <frames/KWFrame.h>
+#include <frames/KWFrameSet.h>
#include <klocale.h>
--- trunk/koffice/kword/part/frames/tests/CMakeLists.txt #647499:648404
@@ -4,7 +4,7 @@
add_definitions(-DCOMPILING_TESTS)
include_directories( ${KOFFICECORE_INCLUDES} ${FLAKE_INCLUDES} ${KOTEXT_INCLUDES} ${KDE4_INCLUDES}
- ${QT_INCLUDES} ${CMAKE_SOURCE_DIR}/kword/part ${CMAKE_SOURCE_DIR}/kword/part/frame)
+ ${QT_INCLUDES} ${CMAKE_SOURCE_DIR}/kword/part ${CMAKE_SOURCE_DIR}/kword/part/frames)
########### next target ###############
--- trunk/koffice/kword/plugins/scripting/CMakeLists.txt #648403:648404
@@ -1,6 +1,6 @@
include_directories(
${CMAKE_SOURCE_DIR}/kword/part
- ${CMAKE_SOURCE_DIR}/kword/part/frame
+ ${CMAKE_SOURCE_DIR}/kword/part/frames
${KOTEXT_INCLUDES}
${KOFFICEUI_INCLUDES}
${KOKROSS_INCLUDES} )
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic