Commit bc9c20d0 authored by Laurent Montel's avatar Laurent Montel 😁
Browse files

Fix includes

parent defa6dc7
......@@ -24,12 +24,13 @@
#include "aboutdata.h"
#include "version.h"
#include <KLocalizedString>
using namespace KOrg;
AboutData::AboutData()
: KAboutData( "korganizer", 0, ki18n( "KOrganizer" ), korgVersion,
: K4AboutData( "korganizer", 0, ki18n( "KOrganizer" ), korgVersion,
ki18n( "A Personal Organizer" ),
KAboutData::License_GPL,
K4AboutData::License_GPL,
ki18n( "Copyright © 1997–1999 Preston Brown\n"
"Copyright © 2000–2004, 2007 Cornelius Schumacher\n"
"Copyright © 2004–2005 Reinhold Kainhofer\n"
......
......@@ -25,11 +25,11 @@
#define KORG_ABOUTDATA_H
#include "korganizer_export.h"
#include <KAboutData>
#include <k4aboutdata.h>
namespace KOrg {
class KORGANIZERPRIVATE_EXPORT AboutData : public KAboutData
class KORGANIZERPRIVATE_EXPORT AboutData : public K4AboutData
{
public:
AboutData();
......
......@@ -87,6 +87,8 @@
#include <KWindowSystem>
#include <KIO/NetAccess>
#include <KNS3/DownloadDialog>
#include <KIcon>
#include <KDebug>
#include <QApplication>
#include <QTimer>
......
......@@ -35,9 +35,9 @@
#include <calendarsupport/kcalprefs.h>
#include <calendarsupport/utils.h>
#include <Akonadi/AgentFilterProxyModel>
#include <Akonadi/AgentInstanceCreateJob>
#include <Akonadi/AgentManager>
#include <AkonadiCore/AgentFilterProxyModel>
#include <AkonadiCore/AgentInstanceCreateJob>
#include <AkonadiCore/AgentManager>
#include <AkonadiWidgets/AgentTypeDialog>
#include <Akonadi/CollectionDeleteJob>
#include <AkonadiCore/CollectionFilterProxyModel>
......
......@@ -32,7 +32,7 @@
#include <calendarsupport/utils.h>
#include <Akonadi/ItemFetchJob>
#include <AkonadiCore/ItemFetchJob>
#include <AkonadiCore/ItemFetchScope>
#include <KCalendarSystem>
......
......@@ -27,7 +27,7 @@
#include "korganizer_export.h"
#include <Akonadi/Entity>
#include <AkonadiCore/Entity>
#include <KCalCore/Incidence>
......
......@@ -26,7 +26,8 @@
#include "koprefs.h"
#include <KGlobalSettings>
#include <KGlobal>
#include <KDebug>
#include <QDir>
class KOPrefsPrivate
......@@ -92,14 +93,14 @@ void KOPrefs::usrReadConfig()
KConfigSkeleton::usrReadConfig();
}
void KOPrefs::usrWriteConfig()
bool KOPrefs::usrWriteConfig()
{
KConfigGroup generalConfig( config(), "General" );
KConfigGroup timeScaleConfig( config(), "Timescale" );
timeScaleConfig.writeEntry( "Timescale Timezones", timeScaleTimezones() );
KConfigSkeleton::usrWriteConfig();
return KConfigSkeleton::usrWriteConfig();
}
void KOPrefs::setResourceColor ( const QString &cal, const QColor &color )
......
......@@ -48,7 +48,7 @@ class KORGANIZER_CORE_EXPORT KOPrefs : public KOPrefsBase
void usrReadConfig();
/** Write preferences to config file */
void usrWriteConfig();
bool usrWriteConfig();
private:
/** Constructor disabled for public. Use instance() to create a KOPrefs
......
......@@ -36,9 +36,9 @@
#include <incidenceeditor-ng/globalsettings.h>
#include <widgets/tagwidgets.h>
#include <Akonadi/AgentFilterProxyModel>
#include <Akonadi/AgentInstanceCreateJob>
#include <Akonadi/AgentManager>
#include <AkonadiCore/AgentFilterProxyModel>
#include <AkonadiCore/AgentInstanceCreateJob>
#include <AkonadiCore/AgentManager>
#include <AkonadiWidgets/AgentTypeDialog>
#include <AkonadiWidgets/CollectionComboBox>
#include <AkonadiCore/CollectionModel>
......@@ -49,7 +49,7 @@
#include <KHolidays/Holidays>
#include <Mailtransport/TransportManagementWidget>
#include <MailTransport/TransportManagementWidget>
#include <KCalendarSystem>
#include <KColorButton>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment