kdelibs4support--

akonadimodel.cpp

@@ -50,7 +50,7 @@
 #include <AkonadiCore/itemfetchscope.h>
 #include <AkonadiWidgets/agenttypedialog.h>
 
-#include <KDebug>
+#include <QDebug>
 #include <KUrl>
 #include <KLocalizedString>
 #include <kcolorutils.h>
@@ -169,14 +169,14 @@ void AkonadiModel::checkResources(ServerManager::State state)
         case ServerManager::Running:
             if (!mResourcesChecked)
             {
-                kDebug() << "Server running";
+                qDebug() << "Server running";
                 mResourcesChecked = true;
                 mMigrating = true;
                 CalendarMigrator::execute();
             }
             break;
         case ServerManager::NotRunning:
-            kDebug() << "Server stopped";
+            qDebug() << "Server stopped";
             mResourcesChecked = false;
             mMigrating = false;
             mCollectionAlarmTypes.clear();

collectionmodel.cpp

@@ -33,7 +33,7 @@
 #include <AkonadiCore/entitymimetypefiltermodel.h>
 
 #include <KLocalizedString>
-#include <KDebug>
+#include <QDebug>
 #include <KUrl>
 #include <KSharedConfig>
 

collectionsearch.cpp

@@ -29,7 +29,7 @@
 #include <AkonadiCore/itemfetchjob.h>
 #include <AkonadiCore/itemdeletejob.h>
 
-#include <KDebug>
+#include <QDebug>
 
 #include <QTimer>
 

eventlistview.cpp

@@ -29,7 +29,7 @@
 #include <QMouseEvent>
 #include <QToolTip>
 #include <QApplication>
-#include <kdebug.h>
+#include <QDebug>
 
 
 EventListView::EventListView(QWidget* parent)
@@ -101,7 +101,7 @@ KAEvent EventListView::selectedEvent() const
     QModelIndexList list = selectionModel()->selectedRows();
     if (list.count() != 1)
         return KAEvent();
-kDebug(0)<<"SelectedEvent() count="<<list.count();
+qDebug()<<"SelectedEvent() count="<<list.count();
     const ItemListModel* model = static_cast<const ItemListModel*>(list[0].model());
     return model->event(list[0]);
 }

functions.cpp

@@ -56,7 +56,7 @@ using namespace KCalCore;
 
 #include <kconfiggroup.h>
 #include <KSharedConfig>
-#include <kaction.h>
+#include <QAction>
 #include <ktoggleaction.h>
 #include <kactioncollection.h>
 #include <kdbusservicestarter.h>

mainwindow.cpp

@@ -53,7 +53,7 @@ using namespace KCalCore;
 using namespace KCalUtils;
 
 #include <ktoolbar.h>
-#include <kaction.h>
+#include <QAction>
 #include <kactioncollection.h>
 #include <ksystemtrayicon.h>
 #include <kstandardaction.h>

messagewin.cpp

@@ -41,7 +41,7 @@
 //QT5 #include "kspeechinterface.h"
 
 
-#include <kaction.h>
+#include <QAction>
 #include <kstandardguiitem.h>
 #include <K4AboutData>
 #include <klocale.h>

resourceselector.cpp

@@ -46,7 +46,7 @@
 #include <kglobal.h>
 #include <kcombobox.h>
 #include <kactioncollection.h>
-#include <kaction.h>
+#include <QAction>
 #include <ktoggleaction.h>
 
 #include <QLabel>

templatedlg.cpp

@@ -34,7 +34,7 @@
 #include <kguiitem.h>
 #include <kstandardaction.h>
 #include <kactioncollection.h>
-#include <kaction.h>
+#include <QAction>
 
 #include <QPushButton>
 #include <QVBoxLayout>

templatemenuaction.h

@@ -22,7 +22,7 @@
 #define TEMPLATEMENUACTION_H
 
 #include <kactionmenu.h>
-#include <KIcon>
+#include <QIcon>
 #include <QMap>
 class QAction;
 namespace KAlarmCal { class KAEvent; }