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

List:       kde-commits
Subject:    [kdepim] kalarm: Make it compile. Disable KDEPIM_HAVE_X11 for the moment doesn't compile
From:       Montel Laurent <montel () kde ! org>
Date:       2014-08-13 20:58:10
Message-ID: E1XHfcY-0004E5-Vg () scm ! kde ! org
[Download RAW message or body]

Git commit 4050612ebfe1ee67ecbb33b214d2026f28678f26 by Montel Laurent.
Committed on 13/08/2014 at 20:57.
Pushed by mlaurent into branch 'master'.

Make it compile. Disable KDEPIM_HAVE_X11 for the moment doesn't compile

M  +6    -0    kalarm/functions.cpp
M  +1    -0    kalarm/lib/pushbutton.h
M  +1    -0    kalarm/soundpicker.cpp

http://commits.kde.org/kdepim/4050612ebfe1ee67ecbb33b214d2026f28678f26

diff --git a/kalarm/functions.cpp b/kalarm/functions.cpp
index 259a3b9..e3074dd 100644
--- a/kalarm/functions.cpp
+++ b/kalarm/functions.cpp
@@ -1411,6 +1411,7 @@ QString runKMail(bool minimise)
 */
 bool Private::startKMailMinimised()
 {
+#if 0 //PORT QT5
 #if KDEPIM_HAVE_X11
     NETRootInfo i(QX11Info::display(), NET::Supported);
     if (i.isSupported(NET::WM2KDETemporaryRules))
@@ -1450,6 +1451,9 @@ bool Private::startKMailMinimised()
 #else
     return false;
 #endif
+#else
+    return false;
+#endif
 }
 
 /******************************************************************************
@@ -1458,6 +1462,7 @@ bool Private::startKMailMinimised()
 */
 void Private::windowAdded(WId w)
 {
+#if 0 //Port QT5
 #if KDEPIM_HAVE_X11
     static const int SUPPORTED_TYPES = NET::NormalMask | NET::DesktopMask | NET::DockMask
                                      | NET::ToolbarMask | NET::MenuMask | NET::DialogMask
@@ -1488,6 +1493,7 @@ void Private::windowAdded(WId w)
     XSync(QX11Info::display(), False);
     QApplication::flush();
 #endif
+#endif
 }
 
 /******************************************************************************
diff --git a/kalarm/lib/pushbutton.h b/kalarm/lib/pushbutton.h
index 78d087f..5d96d6b 100644
--- a/kalarm/lib/pushbutton.h
+++ b/kalarm/lib/pushbutton.h
@@ -22,6 +22,7 @@
 #define PUSHBUTTON_H
 
 #include <QPushButton>
+#include <KIcon>
 class QMouseEvent;
 class QKeyEvent;
 class KGuiItem;
diff --git a/kalarm/soundpicker.cpp b/kalarm/soundpicker.cpp
index 8e737df..a37a2ff 100644
--- a/kalarm/soundpicker.cpp
+++ b/kalarm/soundpicker.cpp
@@ -28,6 +28,7 @@
 #include "sounddlg.h"
 #include "soundpicker.h"
 
+#include <KIcon>
 #include <kglobal.h>
 #include <klocale.h>
 #include <kfiledialog.h>
[prev in list] [next in list] [prev in thread] [next in thread]