Commit 5516e222 authored by Laurent Montel's avatar Laurent Montel 😁
Browse files

Fix includes

parent 460d45e0
......@@ -33,7 +33,6 @@
#include <KCalCore/ICalFormat>
#include <KTimeZone>
#include <kglobal.h>
#include <KLocalizedString>
#include <kstandarddirs.h>
#include <kio/netaccess.h>
......
......@@ -39,7 +39,6 @@
#include <AkonadiCore/entitymimetypefiltermodel.h>
#include <KLocalizedString>
#include <kglobal.h>
#include <kconfiggroup.h>
#include <kmessagebox.h>
#include <kstandardaction.h>
......
......@@ -30,7 +30,6 @@
#include <kalarmcal/datetime.h>
#include <kalarmcal/kaevent.h>
#include <kglobal.h>
#include <KLocalizedString>
#include <QVBoxLayout>
......
......@@ -24,7 +24,6 @@
#include "checkbox.h"
#include "fontcolour.h"
#include <kglobal.h>
#include <kfontchooser.h>
#include <kfontdialog.h>
......
......@@ -58,7 +58,6 @@ using namespace KCalCore;
#include <ktoggleaction.h>
#include <kactioncollection.h>
#include <kdbusservicestarter.h>
#include <kglobal.h>
#include <KLocalizedString>
#include <kauth.h>
#include <ksystemtimezone.h>
......
......@@ -53,7 +53,6 @@
#include <K4AboutData>
#include <QTemporaryFile>
#include <kfileitem.h>
#include <kglobal.h>
#include <kstandardguiitem.h>
#include <kservicetypetrader.h>
#include <ktoolinvocation.h>
......
......@@ -21,7 +21,7 @@
#include "pushbutton.h"
#include <KGuiItem>
#include <KIcon>
#include <QIcon>
#include <QMouseEvent>
#include <QKeyEvent>
......@@ -48,7 +48,7 @@ PushButton::PushButton(const QString& text, QWidget* parent)
mNoHighlight(false)
{ }
PushButton::PushButton(const KIcon& icon, const QString& text, QWidget* parent)
PushButton::PushButton(const QIcon& icon, const QString& text, QWidget* parent)
: QPushButton(icon, text, parent),
mFocusPolicy(focusPolicy()),
mReadOnly(false),
......
......@@ -25,7 +25,7 @@
class QMouseEvent;
class QKeyEvent;
class KGuiItem;
class KIcon;
class QIcon;
/**
......@@ -62,7 +62,7 @@ class PushButton : public QPushButton
* @param text The text to show on the button.
* @param parent The parent object of this widget.
*/
PushButton(const KIcon& icon, const QString& text, QWidget* parent);
PushButton(const QIcon &icon, const QString& text, QWidget* parent);
/** Sets whether the push button is read-only for the user.
* @param readOnly True to set the widget read-only, false to enable its action.
* @param noHighlight True to prevent the button being highlighted on mouse-over.
......
......@@ -69,7 +69,7 @@ using namespace KHolidays;
#include <kcombobox.h>
#include <kstandardguiitem.h>
#include <ksystemtimezone.h>
#include <kicon.h>
#include <qicon.h>
#if KDEPIM_HAVE_X11
#include <kwindowinfo.h>
#include <kwindowsystem.h>
......@@ -157,37 +157,37 @@ KAlarmPrefDlg::KAlarmPrefDlg()
mMiscPage = new MiscPrefTab(mTabScrollGroup);
mMiscPageItem = new KPageWidgetItem(mMiscPage, i18nc("@title:tab General preferences", "General"));
mMiscPageItem->setHeader(i18nc("@title General preferences", "General"));
mMiscPageItem->setIcon(KIcon(DesktopIcon(QLatin1String("preferences-other"))));
mMiscPageItem->setIcon(QIcon(DesktopIcon(QLatin1String("preferences-other"))));
addPage(mMiscPageItem);
mTimePage = new TimePrefTab(mTabScrollGroup);
mTimePageItem = new KPageWidgetItem(mTimePage, i18nc("@title:tab", "Time & Date"));
mTimePageItem->setHeader(i18nc("@title", "Time and Date"));
mTimePageItem->setIcon(KIcon(DesktopIcon(QLatin1String("preferences-system-time"))));
mTimePageItem->setIcon(QIcon(DesktopIcon(QLatin1String("preferences-system-time"))));
addPage(mTimePageItem);
mStorePage = new StorePrefTab(mTabScrollGroup);
mStorePageItem = new KPageWidgetItem(mStorePage, i18nc("@title:tab", "Storage"));
mStorePageItem->setHeader(i18nc("@title", "Alarm Storage"));
mStorePageItem->setIcon(KIcon(DesktopIcon(QLatin1String("system-file-manager"))));
mStorePageItem->setIcon(QIcon(DesktopIcon(QLatin1String("system-file-manager"))));
addPage(mStorePageItem);
mEmailPage = new EmailPrefTab(mTabScrollGroup);
mEmailPageItem = new KPageWidgetItem(mEmailPage, i18nc("@title:tab Email preferences", "Email"));
mEmailPageItem->setHeader(i18nc("@title", "Email Alarm Settings"));
mEmailPageItem->setIcon(KIcon(DesktopIcon(QLatin1String("internet-mail"))));
mEmailPageItem->setIcon(QIcon(DesktopIcon(QLatin1String("internet-mail"))));
addPage(mEmailPageItem);
mViewPage = new ViewPrefTab(mTabScrollGroup);
mViewPageItem = new KPageWidgetItem(mViewPage, i18nc("@title:tab", "View"));
mViewPageItem->setHeader(i18nc("@title", "View Settings"));
mViewPageItem->setIcon(KIcon(DesktopIcon(QLatin1String("preferences-desktop-theme"))));
mViewPageItem->setIcon(QIcon(DesktopIcon(QLatin1String("preferences-desktop-theme"))));
addPage(mViewPageItem);
mEditPage = new EditPrefTab(mTabScrollGroup);
mEditPageItem = new KPageWidgetItem(mEditPage, i18nc("@title:tab", "Edit"));
mEditPageItem->setHeader(i18nc("@title", "Default Alarm Edit Settings"));
mEditPageItem->setIcon(KIcon(DesktopIcon(QLatin1String("document-properties"))));
mEditPageItem->setIcon(QIcon(DesktopIcon(QLatin1String("document-properties"))));
addPage(mEditPageItem);
connect(button(QDialogButtonBox::Ok), SIGNAL(clicked()), SLOT(slotOk()));
connect(button(QDialogButtonBox::Cancel), SIGNAL(clicked()), SLOT(slotCancel()));
......@@ -1333,7 +1333,7 @@ EditPrefTab::EditPrefTab(StackedScrollGroup* scrollGroup)
mSoundFile = new QLineEdit(box);
mSoundFileLabel->setBuddy(mSoundFile);
mSoundFileBrowse = new QPushButton(box);
mSoundFileBrowse->setIcon(KIcon(SmallIcon(QLatin1String("document-open"))));
mSoundFileBrowse->setIcon(QIcon(SmallIcon(QLatin1String("document-open"))));
int size = mSoundFileBrowse->sizeHint().height();
mSoundFileBrowse->setFixedSize(size, size);
connect(mSoundFileBrowse, SIGNAL(clicked()), SLOT(slotBrowseSoundFile()));
......
......@@ -30,7 +30,7 @@
#include "soundpicker.h"
#include "spinbox.h"
#include <KIcon>
#include <QIcon>
#include <KGlobal>
#include <KLocalizedString>
#include <kstandarddirs.h>
......@@ -189,7 +189,7 @@ SoundWidget::SoundWidget(bool showPlay, bool showRepeat, QWidget* parent)
// File browse button
mFileBrowseButton = new PushButton(box);
boxHLayout->addWidget(mFileBrowseButton);
mFileBrowseButton->setIcon(KIcon(SmallIcon(QLatin1String("document-open"))));
mFileBrowseButton->setIcon(QIcon(SmallIcon(QLatin1String("document-open"))));
int size = mFileBrowseButton->sizeHint().height();
mFileBrowseButton->setFixedSize(size, size);
connect(mFileBrowseButton, &PushButton::clicked, this, &SoundWidget::slotPickFile);
......
......@@ -28,8 +28,7 @@
#include "sounddlg.h"
#include "soundpicker.h"
#include <KIcon>
#include <kglobal.h>
#include <QIcon>
#include <KLocalizedString>
#include <kfiledialog.h>
#include <kiconloader.h>
......@@ -94,7 +93,7 @@ SoundPicker::SoundPicker(QWidget* parent)
// Sound file picker button
mFilePicker = new PushButton(this);
mFilePicker->setIcon(KIcon(SmallIcon(QLatin1String("audio-x-generic"))));
mFilePicker->setIcon(QIcon(SmallIcon(QLatin1String("audio-x-generic"))));
int size = mFilePicker->sizeHint().height();
mFilePicker->setFixedSize(size, size);
connect(mFilePicker, &PushButton::clicked, this, &SoundPicker::slotPickFile);
......
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