summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
authorOliver Bolte <obo@openoffice.org>2006-10-13 07:33:24 +0000
committerOliver Bolte <obo@openoffice.org>2006-10-13 07:33:24 +0000
commit83f9de4a164f7773c28de10ef3d3e2f8b5292a89 (patch)
tree68cb63bfeb1db624dd828001bd95ff9ba1f72ba5 /vcl
parentc1f0a1c829179242f829e48cab132c3c43b257da (diff)
INTEGRATION: CWS vcl65 (1.2.54); FILE MERGED
2006/09/05 16:22:13 pl 1.2.54.1: #i53068# remove ugly #define private public
Diffstat (limited to 'vcl')
-rw-r--r--vcl/unx/inc/kde_headers.h9
1 files changed, 2 insertions, 7 deletions
diff --git a/vcl/unx/inc/kde_headers.h b/vcl/unx/inc/kde_headers.h
index 7fa3fe12c6b2..1f101dec09d6 100644
--- a/vcl/unx/inc/kde_headers.h
+++ b/vcl/unx/inc/kde_headers.h
@@ -4,9 +4,9 @@
*
* $RCSfile: kde_headers.h,v $
*
- * $Revision: 1.2 $
+ * $Revision: 1.3 $
*
- * last change: $Author: ihi $ $Date: 2006-08-01 10:27:42 $
+ * last change: $Author: obo $ $Date: 2006-10-13 08:33:24 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -58,12 +58,7 @@
#include <qlineedit.h>
#include <qlistview.h>
#include <qmainwindow.h>
-
-/* Ugly hack to be able to access QMenuItem::is_enabled */
-#define private public
#include <qmenudata.h>
-#undef private
-
#include <qpaintdevice.h>
#include <qpainter.h>
#include <qpushbutton.h>