[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: koffice/kspread
From: Boudewijn Rempt <boud () valdyas ! org>
Date: 2009-06-16 20:49:27
Message-ID: 1245185367.617484.8333.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 982823 by rempt:
Make kspread compile and link
And use KoRTree from flake instead of main. Also: KoTabBar is
back in kspread, since now that krita has stopped using it, no
other application uses it.
M +5 -4 CMakeLists.txt
A KoTabBar.cpp [License: LGPL (v2+)]
A KoTabBar.h [License: LGPL (v2+)]
M +6 -6 Sheet.cpp
M +0 -1 Sheet.h
M +0 -6 interfaces/ViewAdaptor.h
M +0 -1 part/Canvas.cpp
M +0 -8 part/Doc.cpp
M +4 -4 part/View.cpp
M +1 -1 plugins/calendar/CMakeLists.txt
M +1 -1 plugins/scripting/CMakeLists.txt
M +1 -1 plugins/solver/CMakeLists.txt
M +2 -2 shape/CMakeLists.txt
M +1 -1 tests/CMakeLists.txt
--- trunk/koffice/kspread/CMakeLists.txt #982822:982823
@@ -13,7 +13,7 @@
${CMAKE_CURRENT_SOURCE_DIR}/ui
${CMAKE_SOURCE_DIR}/interfaces
${CMAKE_SOURCE_DIR}/kchart
- ${KOGUIUTILS_INCLUDES}
+ ${KOMAIN_INCLUDES}
${KOTEXT_INCLUDES}
${EIGEN2_INCLUDE_DIR} )
@@ -203,6 +203,7 @@
ValueConverter.cpp
ValueFormatter.cpp
ValueParser.cpp
+ KoTabBar.cpp
tests/inspector.cpp
${chart_DIR_SRCS}
${commands_DIR_SRCS}
@@ -219,11 +220,11 @@
target_link_libraries(kspreadcommon
${QT_QTSQL_LIBRARY}
${KDE4_KNOTIFYCONFIG_LIBS} ${KDE4_KPARTS_LIBS}
- koguiutils
- kutils flake
+ komain
+ kutils
${KDE4_KDE3SUPPORT_LIBS} )
-target_link_libraries(kspreadcommon LINK_INTERFACE_LIBRARIES koguiutils flake \
${QT_QT3SUPPORT_LIBRARY} ) +target_link_libraries(kspreadcommon \
LINK_INTERFACE_LIBRARIES komain ${QT_QT3SUPPORT_LIBRARY} )
set_target_properties(kspreadcommon PROPERTIES
VERSION ${GENERIC_KOFFICE_LIB_VERSION} SOVERSION \
${GENERIC_KOFFICE_LIB_SOVERSION}
--- trunk/koffice/kspread/Sheet.cpp #982822:982823
@@ -43,7 +43,7 @@
#include <KoOdfLoadingContext.h>
#include <KoOasisSettings.h>
#include <KoOdfStylesReader.h>
-#include <KoQueryTrader.h>
+
#include <KoShape.h>
#include <KoShapeLoadingContext.h>
#include <KoShapeManager.h>
@@ -272,7 +272,7 @@
// flake
#if 0
//FIXME This does not work as copySettings does not work. Also \
createDefaultShapeAndInit without the correct settings can not work
- //I think this should use saveOdf and loadOdf for copying
+ //I think this should use saveOdf and loadOdf for copying
KoShape* shape;
const QList<KoShape*> shapes = other.d->shapes;
for (int i = 0; i < shapes.count(); ++i)
@@ -1443,7 +1443,7 @@
int mx = pasteArea.left();
int my = pasteArea.top();
-
+
// split the text into lines and put them into an array value
QStringList list = _text.split( '\n' );
Value value( Value::Array );
@@ -1453,7 +1453,7 @@
value.setElement (0, which++, Value (*it));
Region range (mx, my, 1, list.size());
-
+
// create a manipulator, configure it and execute it
DataManipulator *manipulator = new DataManipulator;
manipulator->setSheet (this);
@@ -3738,7 +3738,7 @@
// stop if we reached the end column
if (i > maxCols || nextCell.isNull())
break;
-
+
cell = Cell( this, i, row );
// if we have a shape anchored to an empty cell, ensure that the cell gets \
also processed
int nextShape = tableContext.nextAnchoredShape (this, row, column);
@@ -3746,7 +3746,7 @@
cell = Cell (this, nextShape, row);
i = nextShape;
}
-
+
nextCell = d->cellStorage->nextInRow( i, row );
}
--- trunk/koffice/kspread/Sheet.h #982822:982823
@@ -30,7 +30,6 @@
//#include <QWidget>
#include <KoDocument.h>
-#include <KoDocumentChild.h>
#include <KoOasisSettings.h> // for KoOasisSettings::NamedMap
#include <KoShapeControllerBase.h>
#include <KoShapeUserData.h>
--- trunk/koffice/kspread/interfaces/ViewAdaptor.h #982822:982823
@@ -30,7 +30,6 @@
#include <QRect>
#include <QString>
#include <QtDBus/QtDBus>
-#include <KoDocumentChild.h>
#include "kspread_export.h"
namespace KSpread
{
@@ -250,11 +249,6 @@
/** This signal got emitted if the selection changed. */
void selectionChanged();
- //void childSelected(KoDocumentChild *sheet);
- //void childUnselected(KoDocumentChild *sheet);
- //void childActivated( KoDocumentChild *sheet );
- //void childDeactivated( KoDocumentChild *sheet );
-
private:
View* m_view;
CellProxy* m_proxy;
--- trunk/koffice/kspread/part/Canvas.cpp #982822:982823
@@ -85,7 +85,6 @@
// KOffice
#include <KoCanvasController.h>
-#include <KoDocumentChild.h>
#include <KoShapeManager.h>
#include <KoStore.h>
#include <KoToolManager.h>
--- trunk/koffice/kspread/part/Doc.cpp #982822:982823
@@ -889,14 +889,6 @@
// else {
// matrix = painter.matrix();
// }
-//
-// QPtrListIterator<KoDocumentChild> it( children() );
-// for( ; it.current(); ++it ) {
-// // if ( ((Child*)it.current())->sheet() == sheet &&
-// // !m_pView->hasDocumentInWindow( it.current()->document() ) )
-// if ( ((Child*)it.current())->sheet() == sheet)
-// rgn -= it.current()->region( matrix );
-// }
painter.setClipRegion( rgn );
Region::ConstIterator endOfList(region.constEnd());
--- trunk/koffice/kspread/part/View.cpp #982822:982823
@@ -750,8 +750,8 @@
dockerMng = new KoDockerManager(this);
setDockerManager(dockerMng);
}
- connect( d->canvasController, SIGNAL( toolOptionWidgetsChanged(const \
QMap<QString, QWidget *> &, KoView *) ),
- dockerMng, SLOT( newOptionWidgets(const QMap<QString, QWidget *> &, \
KoView *) ) ); + connect( d->canvasController, SIGNAL( \
toolOptionWidgetsChanged(const QMap<QString, QWidget *> &, QWidget*) ), + \
dockerMng, SLOT( newOptionWidgets(const QMap<QString, QWidget *> &, QWidget*) ) );
// Setup the zoom controller.
d->zoomHandler = new KoZoomHandler();
@@ -1082,7 +1082,7 @@
{
// If the anchoring differs between shapes, deselect the anchoring \
action and stop here. d->actions->shapeAnchor->setCurrentAction(0);
- break;
+ break;
}
}
}
@@ -1149,7 +1149,7 @@
refreshView();
// Activate the cell tool.
- if (shell())
+ if (shell())
KoToolManager::instance()->switchToolRequested("KSpreadCellToolId");
}
--- trunk/koffice/kspread/plugins/calendar/CMakeLists.txt #982822:982823
@@ -1,4 +1,4 @@
-include_directories(${CMAKE_SOURCE_DIR}/kspread ${KOGUIUTILS_INCLUDES})
+include_directories(${CMAKE_SOURCE_DIR}/kspread ${KOMAIN_INCLUDES})
set(kspread_plugin_tool_calendar_SRCS CalendarTool.cpp CalendarToolFactory.cpp \
CalendarToolWidget.cpp) kde4_add_ui_files(kspread_plugin_tool_calendar_SRCS \
CalendarToolWidget.ui)
--- trunk/koffice/kspread/plugins/scripting/CMakeLists.txt #982822:982823
@@ -3,7 +3,7 @@
${CMAKE_SOURCE_DIR}/kspread/commands
${CMAKE_SOURCE_DIR}/kspread/ui
${KOTEXT_INCLUDES}
- ${KOGUIUTILS_INCLUDES}
+ ${KOMAIN_INCLUDES}
${KOKROSS_INCLUDES}
)
--- trunk/koffice/kspread/plugins/solver/CMakeLists.txt #982822:982823
@@ -6,7 +6,7 @@
include_directories( ${CMAKE_SOURCE_DIR}/kspread
${CMAKE_SOURCE_DIR}/kspread/ui
- ${KOGUIUTILS_INCLUDES}
+ ${KOMAIN_INCLUDES}
${GSL_INCLUDE_DIR} )
########### next target ###############
--- trunk/koffice/kspread/shape/CMakeLists.txt #982822:982823
@@ -1,7 +1,7 @@
include_directories(
${CMAKE_SOURCE_DIR}/kspread
${CMAKE_SOURCE_DIR}/kspread/ui
- ${KOGUIUTILS_INCLUDES}
+ ${KOMAIN_INCLUDES}
${KOTEXT_INCLUDES}
)
@@ -22,7 +22,7 @@
kde4_add_plugin(spreadsheetshape ${tableshape_LIB_SRCS})
-target_link_libraries(spreadsheetshape kspreadcommon ${QT_QT3SUPPORT_LIBRARY} \
${KDE4_KIO_LIBS} ${KDE4_KDEUI_LIBS} kotext) +target_link_libraries(spreadsheetshape \
kspreadcommon ${QT_QT3SUPPORT_LIBRARY} ${KDE4_KIO_LIBS} ${KDE4_KDEUI_LIBS} flake \
kotext kobase) install(TARGETS spreadsheetshape DESTINATION ${PLUGIN_INSTALL_DIR})
########### install files ###############
--- trunk/koffice/kspread/tests/CMakeLists.txt #982822:982823
@@ -1,6 +1,6 @@
include(MacroAddCompileFlags)
set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
-include_directories( ${CMAKE_SOURCE_DIR}/kspread ${KOGUIUTILS_INCLUDES} \
${EIGEN2_INCLUDE_DIR} ) +include_directories( ${CMAKE_SOURCE_DIR}/kspread \
${EIGEN2_INCLUDE_DIR} ${KOMAIN_INCLUDES} ${KDE4_INCLUDES} )
########### Core Functionality ###############
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic