Windows build breakage

[Andreas Holzammer]

Hi David,

I tried to compile kde windows 4.7 and was stumbling about your patch
which is shown beneath. Under windows MessageBox is defined to
MessageBoxW. There is already a undef in the header, but when you
include this header to early it gets overwritten. Its not ideal to name
a class after a standard class name, it hurts all the time. I can think
of two solutions to this.

1. include the header later
2. rename the class so it will not collide

Ok thank you


Andy



From 4411f7da11e0a66d386e5600fe869234f3779a37 Mon Sep 17 00:00:00 2001
From: David Jarvie <djarvie at kde.org>
Date: Tue, 16 Aug 2011 00:49:20 +0100
Subject: [PATCH] Make prompt windows non-application modal

Use KMessageBox::WindowModal by default to avoid prompts preventing
user input to alarm windows.

Backport f5d274b96c0c76998d72660f6317f6561531b7d8 from master.
---
 kalarm/akonadimodel.cpp         |   11 +++--
 kalarm/alarmcalendar.cpp        |   29 ++++++++-----
 kalarm/alarmtimewidget.cpp      |   14 +++---
 kalarm/calendarcompat.cpp       |    5 +-
 kalarm/calendarmigrator.cpp     |    2 +-
 kalarm/collectionmodel.cpp      |    4 +-
 kalarm/deferdlg.cpp             |    6 +-
 kalarm/editdlg.cpp              |   22 +++++-----
 kalarm/editdlgtypes.cpp         |   20 ++++----
 kalarm/find.cpp                 |    8 ++--
 kalarm/functions.cpp            |   26 ++++++------
 kalarm/kalarmapp.cpp            |   10 ++--
 kalarm/kamail.cpp               |    4 +-
 kalarm/lib/messagebox.cpp       |   18 +-------
 kalarm/lib/messagebox.h         |   87
++++++++++++++++++++++++++++++++-------
 kalarm/mainwindow.cpp           |   16 ++++----
 kalarm/messagewin.cpp           |   18 ++++----
 kalarm/prefdlg.cpp              |   24 +++++-----
 kalarm/resourceconfigdialog.cpp |    6 +-
 kalarm/resourcemodelview.cpp    |   14 +++---
 kalarm/resourceselector.cpp     |   22 +++++-----
 kalarm/templatedlg.cpp          |   12 +++---
 kalarm/undo.cpp                 |    6 +-
 kalarm/wakedlg.cpp              |    6 +-
 24 files changed, 221 insertions(+), 169 deletions(-)

<snip>
diff --git a/kalarm/resourcemodelview.cpp b/kalarm/resourcemodelview.cpp
index 2a803af..66244f5 100644
--- a/kalarm/resourcemodelview.cpp
+++ b/kalarm/resourcemodelview.cpp
@@ -20,11 +20,11 @@

 #include "kalarm.h"

+#include "messagebox.h"
 #include "preferences.h"
 #include "resourcemodelview.moc"

 #include <klocale.h>
-#include <kmessagebox.h>
 #include <kdebug.h>

 #include <QApplication>
@@ -412,8 +412,8 @@ bool ResourceDelegate::editorEvent(QEvent* event,
QAbstractItemModel* model, con
             // It's the standard resource for its type.
             if (resource->alarmType() == KAlarm::CalEvent::ACTIVE)
             {
-                KMessageBox::sorry(static_cast<QWidget*>(parent()),
-                                   i18nc("@info", "You cannot disable
your default active alarm calendar."));
+                MessageBox::sorry(static_cast<QWidget*>(parent()),
+                                  i18nc("@info", "You cannot disable
your default active alarm calendar."));
                 return false;

             }
@@ -421,13 +421,13 @@ bool ResourceDelegate::editorEvent(QEvent* event,
QAbstractItemModel* model, con
             {
                 // Only allow the archived alarms standard resource to
be disabled if
                 // we're not saving archived alarms.
-                KMessageBox::sorry(static_cast<QWidget*>(parent()),
-                                   i18nc("@info", "You cannot disable
your default archived alarm calendar "
+                MessageBox::sorry(static_cast<QWidget*>(parent()),
+                                  i18nc("@info", "You cannot disable
your default archived alarm calendar "
                                         "while expired alarms are
configured to be kept."));
                 return false;
             }
-            if
(KMessageBox::warningContinueCancel(static_cast<QWidget*>(parent()),
-                                                   i18nc("@info", "Do
you really want to disable your default calendar?"))
+            if
(MessageBox::warningContinueCancel(static_cast<QWidget*>(parent()),
+                                                  i18nc("@info", "Do
you really want to disable your default calendar?"))
                        == KMessageBox::Cancel)
                 return false;
         }
<snip>

-- 
Andreas Holzammer | andreas.holzammer at kdab.com | Software Engineer
KDAB (Deutschland) GmbH&Co KG, a KDAB Group company
Tel. Germany +49-30-521325470, Sweden (HQ) +46-563-540090
KDAB - Qt Experts - Platform-independent software solutions

-------------- next part --------------
A non-text attachment was scrubbed...
Name: smime.p7s
Type: application/pkcs7-signature
Size: 4134 bytes
Desc: S/MIME Kryptografische Unterschrift
URL: <http://mail.kde.org/pipermail/kde-windows/attachments/20110820/0a4089bd/attachment.p7s>