'koffice/kexi'

[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    koffice/kexi
From:       Jarosław Staniek <staniek () kde ! org>
Date:       2010-08-27 22:35:08
Message-ID: 20100827223508.1061DAC871 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1168934 by staniek:

make #warnings work on windows too


 M  +2 -0      formeditor/container.cpp  
 M  +2 -0      formeditor/editlistviewdialog.cpp  
 M  +11 -0     formeditor/form.cpp  
 M  +20 -4     formeditor/formIO.cpp  
 M  +2 -0      kexidb/drivers/pqxx/pqxxconnection.cpp  
 M  +4 -0      main/KexiMainWindow.cpp  
 M  +2 -0      main/startup/KexiStartupDialog.cpp  
 M  +11 -3     webforms/model/DataProvider.cpp  
 M  +6 -0      widget/KexiProjectNavigator.cpp  
 M  +2 -0      widget/relations/KexiRelationsTableContainer_p.cpp  


--- trunk/koffice/kexi/formeditor/container.cpp #1168933:1168934
@@ -882,6 +882,8 @@
     delete w;
 #ifdef __GNUC__
 #warning "OK?"
+#else
+#pragma WARNING( OK? )
 #endif
 }
 
--- trunk/koffice/kexi/formeditor/editlistviewdialog.cpp #1168933:1168934
@@ -171,6 +171,8 @@
     //// Init dialog and display it ////////////////////////
 #ifdef __GNUC__
 #warning "setInitialSize() unavailable on kde 4"
+#else
+#pragma WARNING( setInitialSize() unavailable on kde 4 )
 #endif
 // setInitialSize(QSize(500, 300), true);
 }
--- trunk/koffice/kexi/formeditor/form.cpp #1168933:1168934
@@ -64,7 +64,10 @@
 
 #ifdef __GNUC__
 #warning pixmapcollection
+#else
+#pragma WARNING( pixmapcollection )
 #endif
+
 #define KEXI_NO_PIXMAPCOLLECTION
 #ifndef KEXI_NO_PIXMAPCOLLECTION
 #include "pixmapcollection.h"
@@ -725,6 +728,8 @@
     d->toplevel->setForm(this);
 #ifdef __GNUC__
 #warning pixmapcollection
+#else
+#pragma WARNING( pixmapcollection )
 #endif
 #ifndef KEXI_NO_PIXMAPCOLLECTION
     d->pixcollection = new PixmapCollection(container->objectName(), this);
@@ -1029,6 +1034,8 @@
 {
 #ifdef __GNUC__
 #warning pixmapcollection
+#else
+#pragma WARNING( pixmapcollection )
 #endif
 #ifndef KEXI_NO_PIXMAPCOLLECTION
     KAction *undoAction = d->collection->action(QLatin1String("edit_undo"));
@@ -1341,6 +1348,8 @@
 {
 #ifdef __GNUC__
 #warning pixmapcollection
+#else
+#pragma WARNING( pixmapcollection )
 #endif
 #ifndef KEXI_NO_PIXMAPCOLLECTION
     KAction *undoAction = d->collection->action(QLatin1String("edit_undo"));
@@ -2642,6 +2651,8 @@
 
 #ifdef __GNUC__
 #warning pixmapcollection
+#else
+#pragma WARNING( pixmapcollection )
 #endif
 #ifndef KEXI_NO_PIXMAPCOLLECTION
     PixmapCollectionEditor dialog(pixmapCollection(), widget()->topLevelWidget());
--- trunk/koffice/kexi/formeditor/formIO.cpp #1168933:1168934
@@ -60,7 +60,9 @@
 
 #define KEXI_NO_FLOWLAYOUT
 #ifdef __GNUC__
-#warning "Port Kexi flow layout!"
+#warning Port Kexi flow layout!
+#else
+#pragma WARNING( Port Kexi flow layout! )
 #endif
 #ifndef KEXI_NO_FLOWLAYOUT
 #include <kexiutils/FlowLayout.h>
@@ -69,6 +71,8 @@
 #define KEXI_NO_PIXMAPCOLLECTION
 #ifdef __GNUC__
 #warning pixmapcollection
+#else
+#pragma WARNING( pixmapcollection )
 #endif
 #ifndef KEXI_NO_PIXMAPCOLLECTION
 #include "pixmapcollection.h"
@@ -242,6 +246,8 @@
 
 #ifdef __GNUC__
 #warning pixmapcollection
+#else
+#pragma WARNING( pixmapcollection )
 #endif
 #ifndef KEXI_NO_PIXMAPCOLLECTION
     // Save the Form 's PixmapCollection
@@ -393,6 +399,8 @@
     m_savePixmapsInline = ((ui.firstChildElement("pixmapinproject").isNull()) || \
(!ui.firstChildElement("images").isNull()));  #ifdef __GNUC__
 #warning pixmapcollection
+#else
+#pragma WARNING( pixmapcollection )
 #endif
 #ifndef KEXI_NO_PIXMAPCOLLECTION
     form->pixmapCollection()->load(ui.namedItem("collection"));
@@ -878,6 +886,8 @@
     } else if (type == "pixmap") {
 #ifdef __GNUC__
 #warning pixmapcollection
+#else
+#pragma WARNING( pixmapcollection )
 #endif
 #ifndef KEXI_NO_PIXMAPCOLLECTION
         if (m_savePixmapsInline || !m_currentForm || !m_currentItem || \
!m_currentForm->pixmapCollection()->contains(text)) @@ -1080,7 +1090,9 @@
     case Form::VFlow: {
 #ifdef KEXI_NO_FLOWLAYOUT
 #ifdef __GNUC__
-#warning "Port Kexi flow layout!"
+#warning Port Kexi flow layout!
+#else
+#pragma WARNING( Port Kexi flow layout! )
 #endif
 #else
         layout.setTagName("grid");
@@ -1402,7 +1414,9 @@
                 } else if ((name == "justify")) {
 #ifdef KEXI_NO_FLOWLAYOUT
 #ifdef __GNUC__
-#warning "Port Kexi flow layout!"
+#warning Port Kexi flow layout!
+#else
+#pragma WARNING( Port Kexi flow layout! )
 #endif
 #else
                     bool justify = readPropertyValue(node.firstChild(), w, \
name).toBool(); @@ -1474,7 +1488,9 @@
             if (layoutName == "HFlow") {
 #ifdef KEXI_NO_FLOWLAYOUT
 #ifdef __GNUC__
-#warning "Port Kexi flow layout!"
+#warning Port Kexi flow layout!
+#else
+#pragma WARNING( Port Kexi flow layout! )
 #endif
 #else
                 item->container()->m_layType = Form::HFlow;
--- trunk/koffice/kexi/kexidb/drivers/pqxx/pqxxconnection.cpp #1168933:1168934
@@ -101,6 +101,8 @@
     d->version = &version; //remember for later...
 #ifdef __GNUC__
 #warning pqxxSqlConnection::drv_connect implement setting version info when we drop \
libpqxx for libpq +#else
+#pragma WARNING( pqxxSqlConnection::drv_connect implement setting version info when \
we drop libpqxx for libpq )  #endif
     return true;
 }
--- trunk/koffice/kexi/main/KexiMainWindow.cpp #1168933:1168934
@@ -621,6 +621,8 @@
     //kde4
 #ifdef __GNUC__
 #warning TODO setupGUI(KMainWindow::Keys|KMainWindow::StatusBar|KMainWindow::Save|KMainWindow::Create, \
"kexiui.rc" ); +#else
+#pragma WARNING( TODO \
setupGUI(KMainWindow::Keys|KMainWindow::StatusBar|KMainWindow::Save|KMainWindow::Create, \
"kexiui.rc" ); )  #endif
 
 // d->actionMapper = new QSignalMapper(this, "act_map");
@@ -1089,6 +1091,8 @@
     //SETTINGS MENU
 #ifdef __GNUC__
 #warning TODO setStandardToolBarMenuEnabled( true );
+#else
+#pragma WARNING( setStandardToolBarMenuEnabled( true ); )
 #endif
 
     action = KStandardAction::keyBindings(this, SLOT(slotConfigureKeys()), this);
--- trunk/koffice/kexi/main/startup/KexiStartupDialog.cpp #1168933:1168934
@@ -326,6 +326,8 @@
 //  d->templatesWidget_IconListBox = d->templatesWidget->child(0,"KListBox");
 #ifdef __GNUC__
 #warning OK for KPageWidget?
+#else
+#pragma WARNING( OK for KPageWidget? )
 #endif
         d->templatesWidget_IconListView
         = KexiUtils::findFirstChild<QListView*>(d->templatesWidget, "QListView");
--- trunk/koffice/kexi/webforms/model/DataProvider.cpp #1168933:1168934
@@ -34,7 +34,12 @@
 namespace KexiWebForms {
 namespace Model {
 
-#warning "WARNING: Direct calls to gConnections are deprecated from now on!"
+
+#ifdef __GNUC__
+#warning Direct calls to gConnections are deprecated from now on!
+#else
+#pragma WARNING( Direct calls to gConnections are deprecated from now on! )
+#endif
 KexiDB::Connection* gConnection;
 
 DataProvider* DataProvider::m_instance = 0;
@@ -78,8 +83,11 @@
             m_connData->setFileName(fileName);
 
             m_connection = m_driver->createConnection(*m_connData);
-
-#warning "This is just for compatibility"
+#ifdef __GNUC__
+#warning This is just for compatibility
+#else
+#pragma WARNING( This is just for compatibility )
+#endif
             gConnection = m_connection; // FIXME: drop this and port all code
 
             if (!m_connection || m_driver->error()) {
--- trunk/koffice/kexi/widget/KexiProjectNavigator.cpp #1168933:1168934
@@ -447,6 +447,11 @@
 
 void KexiProjectNavigator::updateItemName(KexiPart::Item& item, bool dirty)
 {
+#ifdef __GNUC__
+#warning implement KexiProjectNavigator::updateItemName()
+#else
+#pragma WARNING( implement KexiProjectNavigator::updateItemName() )
+#endif
 #if 0
     if (!(m_features & Writable))
         return;
@@ -465,6 +470,7 @@
 
 void KexiProjectNavigator::selectItem(KexiPart::Item& item)
 {
+#warning implement KexiProjectNavigator::selectItem()
 #if 0
     KexiProjectListViewItem *bitem = m_normalItems.value(item.identifier());
     if (!bitem)
--- trunk/koffice/kexi/widget/relations/KexiRelationsTableContainer_p.cpp \
#1168933:1168934 @@ -292,6 +292,8 @@
 {
 #ifdef __GNUC__
 #warning TODO KexiRelationsTableFieldList::drawItemHighlighter() OK?
+#else
+#pragma WARNING( TODO KexiRelationsTableFieldList::drawItemHighlighter() OK? )
 #endif
     if (painter) {
         QStyleOptionFocusRect option;


[prev in list] [next in list] [prev in thread] [next in thread]
Configure | About | News | Add a list | Sponsored by KoreLogic