[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: koffice/tools/f-office
From: Boudewijn Rempt <boud () valdyas ! org>
Date: 2010-08-31 19:42:05
Message-ID: 20100831194205.4E4E5AC896 () svn ! kde ! org
[Download RAW message or body]
SVN commit 1170412 by rempt:
Fix warnings: FreOffice now compiles without any warning for me.
M +2 -2 CMakeLists.txt
M +5 -4 CollabClient.cpp
M +5 -2 CollabServer.cpp
M +7 -5 FoCellEditor.cpp
M +1 -1 FoCellTool.cpp
M +1 -0 GlPresenter.cpp
M +4 -3 GlWidget.cpp
M +71 -71 MainWindow.cpp
M +3 -3 PresentationTool.cpp
M +1 -1 PresentationTool.h
M +1 -1 SlidingMotionDialog.cpp
--- trunk/koffice/tools/f-office/CMakeLists.txt #1170411:1170412
@@ -20,7 +20,7 @@
QT4_WRAP_UI(FreOfficeUiSrc MainWindow.ui ZoomDialog.ui AboutDialog.ui \
CollabDialog.ui)
-QT4_WRAP_CPP(FreOfficeMocSrc MainWindow.h Accelerator.h VirtualKeyBoard.h \
ZoomDialog.h HildonMenu.h HildonApplication.h Splash.h NotifyDialog.h DBusAdaptor.h \
PresentationTool.h AboutDialog.h OfficeInterface.h CollabDialog.h Collaborate.h \
CollabServer.h CollabClient.h PreviewDialog.h MainWindowAdaptor.h \
PresentationToolAdaptor.h NotesDialog.h PreviewButton.h FoCellToolFactory.h \
FoCellTool.h SlidingMotionDialog.h GlWidget.h GlPresenter.h FoExternalEditor.h \
FoCellEditor.h DigitalSignatureDialog.h FoDocumentRdf.h RdfInfoDialog.h) \
+QT4_WRAP_CPP(FreOfficeMocSrc MainWindow.h Accelerator.h VirtualKeyBoard.h \
ZoomDialog.h HildonMenu.h HildonApplication.h Splash.h NotifyDialog.h DBusAdaptor.h \
PresentationTool.h AboutDialog.h CollabDialog.h Collaborate.h CollabServer.h \
CollabClient.h PreviewDialog.h MainWindowAdaptor.h PresentationToolAdaptor.h \
NotesDialog.h PreviewButton.h FoCellToolFactory.h FoCellTool.h SlidingMotionDialog.h \
GlWidget.h GlPresenter.h FoExternalEditor.h FoCellEditor.h DigitalSignatureDialog.h \
FoDocumentRdf.h RdfInfoDialog.h)
add_executable(FreOffice Main.cpp MainWindow.cpp Accelerator.cpp VirtualKeyBoard.cpp \
ZoomDialog.cpp HildonMenu.cpp HildonApplication.cpp Splash.cpp NotifyDialog.cpp \
PresentationTool.cpp DBusAdaptor.cpp AboutDialog.cpp CollabDialog.cpp Collaborate.cpp \
CollabServer.cpp CollabClient.cpp FlowLayout.cpp PreviewDialog.cpp \
MainWindowAdaptor.cpp PresentationToolAdaptor.cpp NotesDialog.cpp PreviewButton.cpp \
FoCellTool.cpp FoCellToolFactory.cpp SlidingMotionDialog.cpp GlWidget.cpp \
GlPresenter.cpp FoExternalEditor.cpp FoCellEditor.cpp RemoveSheet.cpp \
DigitalSignatureDialog.cpp FoDocumentRdf.cpp RdfInfoDialog.cpp ${FreOfficeUiSrc} \
${FreOfficeMocSrc} ${FreOffice_RCC_SRCS}) @@ -29,7 +29,7 @@
QT4_WRAP_UI(FreOfficeUiSrc MainWindow.ui ZoomDialog.ui AboutDialog.ui \
CollabDialog.ui)
-QT4_WRAP_CPP(FreOfficeMocSrc MainWindow.h Accelerator.h VirtualKeyBoard.h \
ZoomDialog.h HildonMenu.h HildonApplication.h Splash.h NotifyDialog.h DBusAdaptor.h \
PresentationTool.h AboutDialog.h OfficeInterface.h CollabDialog.h Collaborate.h \
CollabServer.h CollabClient.h FlowLayout.h PreviewDialog.h MainWindowAdaptor.h \
PresentationToolAdaptor.h NotesDialog.h PreviewButton.h FoCellToolFactory.h \
FoCellTool.h SlidingMotionDialog.h GlWidget.h GlPresenter.h FoExternalEditor.h \
FoCellEditor.h RemoveSheet.h DigitalSignatureDialog.h) +QT4_WRAP_CPP(FreOfficeMocSrc \
MainWindow.h Accelerator.h VirtualKeyBoard.h ZoomDialog.h HildonMenu.h \
HildonApplication.h Splash.h NotifyDialog.h DBusAdaptor.h PresentationTool.h \
AboutDialog.h CollabDialog.h Collaborate.h CollabServer.h CollabClient.h \
PreviewDialog.h MainWindowAdaptor.h PresentationToolAdaptor.h NotesDialog.h \
PreviewButton.h FoCellToolFactory.h FoCellTool.h SlidingMotionDialog.h GlWidget.h \
GlPresenter.h FoExternalEditor.h FoCellEditor.h DigitalSignatureDialog.h)
add_executable(FreOffice Main.cpp MainWindow.cpp Accelerator.cpp VirtualKeyBoard.cpp \
ZoomDialog.cpp HildonMenu.cpp HildonApplication.cpp Splash.cpp NotifyDialog.cpp \
PresentationTool.cpp DBusAdaptor.cpp AboutDialog.cpp CollabDialog.cpp Collaborate.cpp \
CollabServer.cpp CollabClient.cpp FlowLayout.cpp PreviewDialog.cpp \
MainWindowAdaptor.cpp PresentationToolAdaptor.cpp NotesDialog.cpp PreviewButton.cpp \
FoCellTool.cpp FoCellToolFactory.cpp SlidingMotionDialog.cpp GlWidget.cpp \
GlPresenter.cpp FoExternalEditor.cpp FoCellEditor.cpp RemoveSheet.cpp \
DigitalSignatureDialog.cpp ${FreOfficeUiSrc} ${FreOfficeMocSrc} \
${FreOffice_RCC_SRCS})
--- trunk/koffice/tools/f-office/CollabClient.cpp #1170411:1170412
@@ -27,8 +27,9 @@
CollabClient::CollabClient(const QString &nick, const QHostAddress &address,
quint16 port, QObject *parent) :
-address(address), port(port),
-Collaborate(nick, parent)
+ Collaborate(nick, parent),
+ address(address),
+ port(port)
{
QTcpSocket* socket = new QTcpSocket(this);
socket->connectToHost(address, port);
@@ -60,7 +61,7 @@
emit error((SocketError << 7) + socketError);
}
-void CollabClient::readyRead(int source)
+void CollabClient::readyRead(int /*source*/)
{
QDataStream& stream = *(peers.at(0)->stream);
@@ -100,7 +101,7 @@
}
}
-void CollabClient::disconnected(int source) {
+void CollabClient::disconnected(int /*source*/) {
qDebug() << "Disconnected";
// TODO: create a disconnection signal and emit it
}
--- trunk/koffice/tools/f-office/CollabServer.cpp #1170411:1170412
@@ -26,8 +26,11 @@
#include "CollabServer.h"
-CollabServer::CollabServer(const QString &nick, const QString &filename, quint16 \
port, QObject *parent) :
- port(port), Collaborate(nick, parent)
+CollabServer::CollabServer(const QString &nick, const QString &filename, quint16 \
port, QObject *parent) + : Collaborate(nick, parent)
+ , port(port)
+ , readySignal(0)
+ , disconnectSignal(0)
{
this->filename = filename;
--- trunk/koffice/tools/f-office/FoCellEditor.cpp #1170411:1170412
@@ -50,6 +50,7 @@
document()->setDocumentMargin(0);
const Cell cell(m_cellTool->selection()->activeSheet(), \
m_cellTool->selection()->marker()); const bool wrapText = cell.style().wrapText();
+ Q_UNUSED(wrapText);
setWordWrapMode(QTextOption::WordWrap);
setReadOnly(false);
@@ -119,7 +120,7 @@
return textCursor().position();
}
-void FoCellEditor::setActiveSubRegion(int index)
+void FoCellEditor::setActiveSubRegion(int /*index*/)
{
/*index = qBound(0, index, (int)d->highlighter->rangeCount());
int counter = 0;
@@ -188,9 +189,9 @@
if (hasFocus()) {
emit textChanged(text);
}
-
+#if 0
// Enable/disable the reference selection.
- /* if (!text.isEmpty() && text[0] == '=') {
+ if (!text.isEmpty() && text[0] == '=') {
m_cellTool->selection()->startReferenceSelection();
} else {
m_cellTool->selection()->endReferenceSelection();
@@ -198,13 +199,14 @@
}
//Code to be uncommented when using formula.
- /* if (d->highlighter->rangeChanged()) {
+ if (d->highlighter->rangeChanged()) {
// Reset the flag, that indicates range changes after text changes.
d->highlighter->resetRangeChanged();
// Rebuild the reference selection by using the formula tokens.
d->rebuildSelection();
- }*/
}
+#endif
+}
void FoCellEditor::slotCursorPositionChanged()
--- trunk/koffice/tools/f-office/FoCellTool.cpp #1170411:1170412
@@ -124,7 +124,7 @@
return m_editor;
}
-bool FoCellTool::createEditor(bool clear, bool focus)
+bool FoCellTool::createEditor(bool clear, bool /*focus*/)
{
bool status=false;
const Cell cell(selection()->activeSheet(), selection()->marker());
--- trunk/koffice/tools/f-office/GlPresenter.cpp #1170411:1170412
@@ -32,6 +32,7 @@
#include <QDebug>
GLPresenter::GLPresenter(QWidget *parent, int stl, int st, QList <QPixmap> p)
+ : QWidget(parent)
{
keepDisplayOn();
glbase = new GLWidget(this);
--- trunk/koffice/tools/f-office/GlWidget.cpp #1170411:1170412
@@ -27,6 +27,7 @@
#include "GlWidget.h"
GLWidget::GLWidget(QWidget *parent)
+ : QGLWidget(parent)
{
change = false;
pos1 = pos2 = 0;
@@ -153,7 +154,7 @@
}
}
-void GLWidget::resizeGL(int width, int height)
+void GLWidget::resizeGL(int /*width*/, int /*height*/)
{
glViewport(0, -160, 800, 800); //TODO : Adjust for a better \
viewport than a fixed one.
@@ -169,7 +170,7 @@
#endif
}
-void GLWidget::mousePressEvent(QMouseEvent *event)
+void GLWidget::mousePressEvent(QMouseEvent */*event*/)
{
emit paused();
}
@@ -182,7 +183,7 @@
}
}
-void GLWidget::mouseDoubleClickEvent(QMouseEvent * event)
+void GLWidget::mouseDoubleClickEvent(QMouseEvent * /*event*/)
{
close();
emit end();
--- trunk/koffice/tools/f-office/MainWindow.cpp #1170411:1170412
@@ -122,7 +122,7 @@
using KSpread::View;
using KSpread::Sheet;
-#define FORMATFRAME_XCORDINATE_VALUE 465
+#define FORMATRAME_XCORDINATE_VALUE 465
#define FORMATFRAME_YCORDINATE_VALUE 150
#define FORMATFRAME_WIDTH 335
#define FORMATFRAME_HEIGHT 210
@@ -148,90 +148,40 @@
bool MainWindow::virtualKeyBoardIsOnScreen=false;
MainWindow::MainWindow(Splash *aSplash, QWidget *parent)
: QMainWindow(parent),
- m_ui(new Ui::MainWindow),
- m_search(0),
- m_doc(0),
- m_view(0),
- m_editor(0),
- m_kwview(0),
- m_controller(0),
- m_undostack(0),
- m_focelltool(0),
- m_vPage(0),
- m_hPage(0),
- m_pressed(false),
- m_isViewToolBar(true),
- m_fsTimer(0),
- m_fsButton(0),
- m_fsIcon(FS_BUTTON_PATH),
- m_fsPPTBackButton(0),
- m_fsPPTForwardButton(0),
- m_currentPage(1),
- m_index(0),
- m_wholeWord(false),
- m_type(Text),
- m_splash(aSplash),
- m_panningCount(0),
- m_isLoading(false),
- m_fontstyleframe(0),
+ m_xcordinate(0),
+ m_ycordinate(0),
+ m_fontSizeDialog(0),
+ m_fontSizeDialogLayout(0),
+ m_fontSizeLineEdit(0),
+ m_fontSizeList(0),
m_formatframe(0),
- m_confirmationdialog(0),
- m_docdialog(0),
m_formatframelayout(0),
- m_bold(0),
- m_italic(0),
- m_underline(0),
m_alignleft(0),
m_alignright(0),
m_aligncenter(0),
m_numberedlist(0),
m_bulletlist(0),
m_alignjustify(0),
+ m_fontstyleframe(0),
m_fontstyleframelayout(0),
m_fontcombobox(0),
+ m_fontsizebutton(0),
m_textcolor(0),
+ m_textbackgroundcolor(0),
m_superscript(0),
m_subscript(0),
- m_textbackgroundcolor(0),
+ m_bold(0),
+ m_italic(0),
+ m_underline(0),
+ m_docdialog(0),
m_docdialoglayout(0),
- m_fontsizebutton(0),
- m_fontSizeDialog(0),
- m_fontSizeDialogLayout(0),
- m_fontSizeLineEdit(0),
- m_fontSizeList(0),
- m_document(0),
- m_presenter(0),
- m_spreadsheet(0),
+ m_templateWidget(0),
+ m_confirmationdialog(0),
m_confirmationdialoglayout(0),
m_yes(0),
m_no(0),
m_cancel(0),
- m_firstChar(true),
m_message(0),
- m_isDocModified(false),
- m_xcordinate(0),
- m_ycordinate(0),
- m_pptTool(0),
- m_fsPPTDrawHighlightButton(0),
- m_fsPPTDrawPenButton(0),
-#ifdef Q_WS_MAEMO_5
- m_fsAccButton(0),
-#endif
- m_dbus( new MainWindowAdaptor(this)),
- m_collab(0),
- m_collabDialog(0),
- m_collabEditor(0),
- storeButtonPreview(0),
- notesDialog(0),
- m_slidingmotiondialog(0),
- m_slideNotesButton(0),
- m_slideNotesIcon(VIEW_NOTES_PIXMAP),
- m_tempselectiondialog(0),
- m_tempdialoglayout(0),
- m_templateWidget(0),
- m_go(0),
- m_closetemp(0),
- m_templatepreview(0),
m_addAction(0),
m_subtractAction(0),
m_multiplyAction(0),
@@ -239,14 +189,64 @@
m_percentageAction(0),
m_equalsAction(0),
m_signalMapper(0),
- m_spreadEditToolBar(0),
m_sheetInfoFrame(0),
m_sheetInfoFrameLayout(0),
m_addSheet(0),
m_removeSheet(0),
m_sheetName(0),
- digitalSignatureDialog(0)
+ m_search(0),
+ m_doc(0),
+ m_editor(0),
+ m_kwview(0),
+ m_view(0),
+ m_controller(0),
+ m_undostack(0),
+ m_focelltool(0),
+ m_vPage(0),
+ m_hPage(0),
+ m_pressed(false),
+ m_isViewToolBar(true),
+ m_fsTimer(0),
+ m_fsButton(0),
+ m_fsIcon(FS_BUTTON_PATH),
+ m_fsPPTBackButton(0),
+ m_fsPPTForwardButton(0),
+ m_splash(aSplash),
+ m_fsPPTDrawPenButton(0),
+ m_fsPPTDrawHighlightButton(0),
+ m_pptTool(0),
+ m_dbus( new MainWindowAdaptor(this)),
+ m_isDocModified(false),
+ m_panningCount(0),
+ m_isLoading(false),
+ storeButtonPreview(0),
+ m_slideNotesButton(0),
+ m_slideNotesIcon(VIEW_NOTES_PIXMAP)
{
+ digitalSignatureDialog = 0;
+ m_closetemp = 0;
+ m_collab = 0;
+ m_collabDialog = 0;
+ m_collabEditor = 0;
+ m_currentPage = 1;
+ m_document = 0;
+ m_firstChar = true;
+ m_go = 0;
+ m_index = 0;
+ m_presenter = 0;
+ m_slidingmotiondialog = 0;
+ m_spreadEditToolBar = 0;
+ m_spreadsheet = 0;
+ m_tempdialoglayout = 0;
+ m_templatepreview = 0;
+ m_tempselectiondialog = 0;
+ m_type = Text;
+ m_ui = new Ui::MainWindow;
+ m_wholeWord = false;
+ notesDialog = 0;
+#ifdef Q_WS_MAEMO_5
+ m_fsAccButton = 0;
+#endif
init();
}
@@ -586,7 +586,7 @@
m_formatframelayout->addWidget(m_numberedlist,2,0);
m_formatframelayout->addWidget(m_bulletlist,2,1);
- m_formatframe->setGeometry(FORMATFRAME_XCORDINATE_VALUE,
+ m_formatframe->setGeometry(FORMATRAME_XCORDINATE_VALUE,
FORMATFRAME_YCORDINATE_VALUE,
FORMATFRAME_WIDTH,
FORMATFRAME_HEIGHT);
@@ -3387,7 +3387,7 @@
openFileDialog();
}
-void MainWindow::pluginOpen(bool newWindow, const QString& path)
+void MainWindow::pluginOpen(bool /*newWindow*/, const QString& path)
{
openDocument(path,false);
}
@@ -3458,7 +3458,7 @@
}
}
-void MainWindow::paintEvent( QPaintEvent *event )
+void MainWindow::paintEvent( QPaintEvent */*event*/ )
{
if( !m_pptTool ) {
return;
--- trunk/koffice/tools/f-office/PresentationTool.cpp #1170411:1170412
@@ -33,11 +33,11 @@
#include "PresentationTool.h"
PresentationTool::PresentationTool(MainWindow * window, KoCanvasControllerWidget * \
controller )
-: scribbling(false),
+ : m_controller(controller),
m_window(window),
-m_controller(controller),
+ m_penToolActivated(false),
m_highlightToolActivated(false),
-m_penToolActivated(false),
+ scribbling(false),
m_dbus( new PresentationToolAdaptor( this ) )
{
QDBusConnection::sessionBus().registerObject("/presentation/tool", this);
--- trunk/koffice/tools/f-office/PresentationTool.h #1170411:1170412
@@ -84,7 +84,7 @@
*/
bool m_penToolActivated;
bool m_highlightToolActivated;
- bool scribbling;
+ bool scribbling; // XXX: always use m_ prefix!
/*!
* The points that are used by the pen tool
--- trunk/koffice/tools/f-office/SlidingMotionDialog.cpp #1170411:1170412
@@ -24,7 +24,7 @@
#include <QString>
#include <QDialog>
-SlidingMotionDialog::SlidingMotionDialog(QWidget *parent)
+SlidingMotionDialog::SlidingMotionDialog(QWidget */*parent*/)
:m_slidingmotionframe(0),
m_slidingmotionframelayout(0),
m_opengl(0),
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic