[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: koffice/kexi/main
From: Jarosław Staniek <staniek () kde ! org>
Date: 2009-08-09 16:27:23
Message-ID: 1249835243.789005.9495.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 1009300 by staniek:
warnins--
M +32 -6 KexiMainWindow.h
M +3 -0 startup/KexiStartupFileWidget.h
--- trunk/koffice/kexi/main/KexiMainWindow.h #1009299:1009300
@@ -21,6 +21,8 @@
#ifndef KEXIMAINWINDOW_H
#define KEXIMAINWINDOW_H
+//#define KEXI_IMPL_WARNINGS
+
#include <KMainWindow>
#include <core/KexiMainWindowIface.h>
#include <core/kexiguimsghandler.h>
@@ -85,48 +87,58 @@
virtual KActionCollection* actionCollection() const;
+#ifdef KEXI_IMPL_WARNINGS
#ifdef __GNUC__
#warning TODO virtual QWidget* focusWidget() const;
#else
#pragma WARNING( TODO virtual QWidget* focusWidget() const; )
#endif
+#endif
virtual QWidget* focusWidget() const {
return KexiMainWindowSuper::focusWidget();
}
+#ifdef KEXI_IMPL_WARNINGS
#ifdef __GNUC__
#warning TODO virtual void plugActionList(const QString& name,
#else
#pragma WARNING( TODO virtual void plugActionList(const QString& name, )
#endif
+#endif
virtual void plugActionList(const QString& name,
const QList<KAction *>& actionList) {
Q_UNUSED(name)
Q_UNUSED(actionList)
}
+#ifdef KEXI_IMPL_WARNINGS
#ifdef __GNUC__
#warning TODO KXMLGUIClient* guiClient() const;
#else
#pragma WARNING( TODO KXMLGUIClient* guiClient() const; )
#endif
+#endif
virtual KXMLGUIClient* guiClient() const;
+#ifdef KEXI_IMPL_WARNINGS
#ifdef __GNUC__
#warning TODO virtual void unplugActionList (const QString &name);
#else
#pragma WARNING( TODO virtual void unplugActionList (const QString &name); )
#endif
+#endif
virtual void unplugActionList(const QString &name) {
Q_UNUSED(name)
}
//! Implemented by KMainWindow
+#ifdef KEXI_IMPL_WARNINGS
#ifdef __GNUC__
#warning TODO virtual KXMLGUIFactory * KMainWindow::guiFactory();
#else
#pragma WARNING( TODO virtual KXMLGUIFactory * KMainWindow::guiFactory(); )
#endif
+#endif
virtual KXMLGUIFactory* guiFactory();
@@ -195,19 +207,22 @@
public slots:
/*! Inherited from KMdiMainFrm: we need to do some tasks before child is closed.
Just calls closeWindow(). Use closeWindow() if you need, not this one. */
+#ifdef KEXI_IMPL_WARNINGS
#ifdef __GNUC__
#warning TODO virtual void closeWindow(KMdiChildView *pWnd, bool layoutTaskBar = \
true); #else
#pragma WARNING( TODO virtual void closeWindow(KMdiChildView *pWnd, bool \
layoutTaskBar = true); ) #endif
+#endif
/*! Reimplemented for internal reasons. */
+#ifdef KEXI_IMPL_WARNINGS
#ifdef __GNUC__
#warning TODO virtual void addWindow( KMdiChildView* pView, int flags = \
KMdi::StandardAdd ); #else
#pragma WARNING( TODO virtual void addWindow( KMdiChildView* pView, int flags = \
KMdi::StandardAdd ); ) #endif
-
+#endif
/*! Implemented for KexiMainWindow */
virtual tristate closeWindow(KexiWindow *window);
@@ -228,6 +243,7 @@
/*! Activates previous window. */
void activatePreviousWindow();
+#ifdef KEXI_IMPL_WARNINGS
#ifdef __GNUC__
#warning TODO virtual void detachWindow(KMdiChildView *pWnd,bool bShow=true);
#else
@@ -238,6 +254,7 @@
#else
#pragma WARNING( TODO virtual void attachWindow(KMdiChildView *pWnd,bool \
bShow=true,bool bAutomaticResize=false); ) #endif
+#endif
//! @todo move part of this to KexiProject, because currently \
KexiProject::openObject() allows multiple opens! /*! Opens object pointed by \a item \
in a view \a viewMode. @@ -404,12 +421,13 @@
(in case when server database project was selected). */
KexiProjectData* createBlankProjectData(bool &cancelled, bool confirmOverwrites \
= true, QString *shortcutFileName = 0);
+#ifdef KEXI_IMPL_WARNINGS
#ifdef __GNUC__
#warning TODO void setWindowMenu(Q3PopupMenu *menu);
#else
#pragma WARNING( TODO void setWindowMenu(Q3PopupMenu *menu); )
#endif
-
+#endif
/*! \return focused kexi window (KexiWindow or KexiDockBase subclass) */
// QWidget* focusWindow() const;
@@ -468,11 +486,13 @@
void activeWindowChanged(KexiWindow *window, KexiWindow *prevWindow);
/*! This slot is called if a window gets colsed and will unregister stuff */
+#ifdef KEXI_IMPL_WARNINGS
#ifdef __GNUC__
#warning TODO void childClosed(KMdiChildView *dlg);
#else
#pragma WARNING( TODO void childClosed(KMdiChildView *dlg); )
#endif
+#endif
void slotPartLoaded(KexiPart::Part* p);
@@ -533,12 +553,13 @@
and also optionally application's caption. */
virtual void slotObjectRenamed(const KexiPart::Item &item, const QString& \
oldName);
+#ifdef KEXI_IMPL_WARNINGS
#ifdef __GNUC__
#warning TODO virtual void fillWindowMenu();
#else
#pragma WARNING( TODO virtual void fillWindowMenu(); )
#endif
-
+#endif
void invalidateSharedActions();
void invalidateSharedActionsLater();
@@ -609,12 +630,13 @@
/*! Handles changes in 'dirty' flag for windows. */
void slotDirtyFlagChanged(KexiWindow* window);
+#ifdef KEXI_IMPL_WARNINGS
#ifdef __GNUC__
#warning TODO void slotMdiModeHasBeenChangedTo(KMdi::MdiMode);
#else
#pragma WARNING( TODO void slotMdiModeHasBeenChangedTo(KMdi::MdiMode); )
#endif
-
+#endif
//! reimplemented to add "restart is required" message box
//2.0: unused virtual void switchToIDEAlMode();
//2.0: unused void switchToIDEAlMode(bool showMessage);
@@ -647,12 +669,13 @@
//! Shows "print" dialog for \a item and \a settings.
//! \return true on success.
+#ifdef KEXI_IMPL_WARNINGS
#ifdef __GNUC__
#warning TODO reenable when ported bool printItem(KexiPart::Item* item, const \
KexiSimplePrintingSettings& settings, const QString& titleText = QString()); #else
#pragma WARNING( TODO reenable when ported bool printItem(KexiPart::Item* item, \
const KexiSimplePrintingSettings& settings, const QString& titleText = QString()); ) \
#endif
-
+#endif
/*! Shows "print preview" window for \a item.
The preview windoe is cached, so \a reload == true is sometimes needed
if data or print settings have changed in the meantime.
@@ -661,20 +684,23 @@
//! Shows "print preview" window.
//! \return true on success.
+#ifdef KEXI_IMPL_WARNINGS
#ifdef __GNUC__
#warning TODO reenable when ported bool printPreviewForItem(KexiPart::Item* item, \
const KexiSimplePrintingSettings& settings, const QString& titleText = QString(), \
bool reload = false); #else
#pragma WARNING( TODO reenable when ported bool printPreviewForItem(KexiPart::Item* \
item, const KexiSimplePrintingSettings& settings, const QString& titleText = \
QString(), bool reload = false); ) #endif
-
+#endif
/*! Implemented for KexiMainWindow. Helper for printItem() and \
printPreviewForItem(). Also used by KexiFormEventAction.
\return true on success and cancelled when the action was cancelled. */
+#ifdef KEXI_IMPL_WARNINGS
#ifdef __GNUC__
#warning TODO reenable when ported tristate printActionForItem(KexiPart::Item* \
item, PrintActionType action); #else
#pragma WARNING( TODO reenable when ported tristate \
printActionForItem(KexiPart::Item* item, PrintActionType action); ) #endif
+#endif
private:
class MessageHandler;
--- trunk/koffice/kexi/main/startup/KexiStartupFileWidget.h #1009299:1009300
@@ -1,3 +1,4 @@
+
/* This file is part of the KDE project
Copyright (C) 2003-2007 Jarosław Staniek <staniek@kde.org>
@@ -58,6 +59,8 @@
false in user do not want to overwrite. */
static bool askForOverwriting(const QString& filePath, QWidget *parent = 0);
+ using KFileWidget::setMode;
+
void setMode(Mode mode);
QSet<QString> additionalFilters() const;
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic