summaryrefslogtreecommitdiff
authorzecke <zecke>2004-07-15 17:29:39 (UTC)
committer zecke <zecke>2004-07-15 17:29:39 (UTC)
commitaa292b322f1ecb43dd8f4e3cd295855730dd9f59 (patch) (side-by-side diff)
tree63238dd550aee1007902af07c35bcc8bb6480fa1
parentca486a4558dc7aa23e3e5c677f6eedd26ed02746 (diff)
downloadopie-aa292b322f1ecb43dd8f4e3cd295855730dd9f59.zip
opie-aa292b322f1ecb43dd8f4e3cd295855730dd9f59.tar.gz
opie-aa292b322f1ecb43dd8f4e3cd295855730dd9f59.tar.bz2
-Change order of includes. Include "qpedialog.h" first
-In regards to precompiled headers drop the 'protected -> public define hack' and use TrollTechs solution inspired from QETWidget to static_cast to a private reimplementation to change the method. This was taken from Qtopia
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--library/qpedialog.cpp22
1 files changed, 16 insertions, 6 deletions
diff --git a/library/qpedialog.cpp b/library/qpedialog.cpp
index da461b7..87d61e3 100644
--- a/library/qpedialog.cpp
+++ b/library/qpedialog.cpp
@@ -15,18 +15,25 @@
**
** Contact info@trolltech.com if any conditions of this licensing are
** not clear to you.
**
**********************************************************************/
-#define protected public
+#include "qpedialog.h"
+
#include <qdialog.h>
-#undef protected
-#include "qpedialog.h"
-#include <qpe/qpeapplication.h>
+#include "qpeapplication.h"
+
+
+// Allow access to nornally protected accept and reject functions
+class HackedPrivateQDialog : public QDialog{
+public:
+ void accept() { QDialog::accept();}
+ void reject() { QDialog::reject();}
+};
/**
* \brief This is the only c'tor.
*
* The parent of this Listener is the Dialog you pass. This means once
@@ -63,12 +70,15 @@ QPEDialogListener::~QPEDialogListener() {}
* \internal
*/
void QPEDialogListener::appMessage( const QCString &msg, const QByteArray & )
{
if (!dialog)
return;
+
+ HackedPrivateQDialog *hackedDialog = static_cast<HackedPrivateQDialog*>(dialog);
+
if (msg == "accept()") {
- dialog->accept();
+ hackedDialog->accept();
} else if (msg == "reject()") {
- dialog->reject();
+ hackedDialog->reject();
}
}