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

List:       kde-commits
Subject:    KDE/kdelibs/kdeui/widgets
From:       Laurent Montel <montel () kde ! org>
Date:       2008-01-04 12:20:58
Message-ID: 1199449258.578717.25145.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 757187 by mlaurent:


Fix compile enable finale


 M  +3 -0      kdeuiwidgetsproxystyle_p.h  
 M  +2 -0      ktimezonewidget.cpp  


--- trunk/KDE/kdelibs/kdeui/widgets/kdeuiwidgetsproxystyle_p.h #757186:757187
@@ -18,6 +18,8 @@
     the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
     Boston, MA 02110-1301, USA.
 */
+#ifndef KDEUIPROXYSTYLE_H
+#define KDEUIPROXYSTYLE_H
 
 #include <kdeui_export.h>
 
@@ -62,3 +64,4 @@
     QWidget *parent;
 };
 
+#endif
--- trunk/KDE/kdelibs/kdeui/widgets/ktimezonewidget.cpp #757186:757187
@@ -44,10 +44,12 @@
     };
 };
 
+#ifndef KDE_USE_FINAL
 static bool localeLessThan (const QString &a, const QString &b)
 {
     return QString::localeAwareCompare(a, b) < 0;
 }
+#endif
 
 KTimeZoneWidget::KTimeZoneWidget( QWidget *parent, KTimeZones *db )
   : QTreeWidget( parent ),
[prev in list] [next in list] [prev in thread] [next in thread]