From 63bce9d1b41d84d845d2c11b264261baa636a046 Mon Sep 17 00:00:00 2001 From: "Aaron J. Seigo" Date: Wed, 30 Jul 2008 20:35:42 +0000 Subject: [PATCH] move all the prive code into private/; makes it much clearer with the division lines are svn path=/trunk/KDE/kdebase/workspace/libs/plasma/; revision=839792 --- CMakeLists.txt | 13 +- applet.cpp | 37 ++-- containment.cpp | 13 +- datacontainer.cpp | 3 +- datacontainer_p.h | 194 ------------------ dataengine.cpp | 5 +- dataenginemanager.cpp | 2 +- applet_p.h => private/applet_p.h | 0 applethandle.cpp => private/applethandle.cpp | 3 +- applethandle_p.h => private/applethandle_p.h | 0 containment_p.h => private/containment_p.h | 0 private/datacontainer_p.cpp | 128 ++++++++++++ private/datacontainer_p.h | 103 ++++++++++ dataengine_p.h => private/dataengine_p.h | 0 .../desktoptoolbox.cpp | 0 .../desktoptoolbox_p.h | 2 +- packages.cpp => private/packages.cpp | 2 +- packages_p.h => private/packages_p.h | 0 paneltoolbox.cpp => private/paneltoolbox.cpp | 0 paneltoolbox_p.h => private/paneltoolbox_p.h | 2 +- service_p.h => private/service_p.h | 5 + sharedtimer_p.h => private/sharedtimer_p.h | 0 toolbox.cpp => private/toolbox.cpp | 7 +- toolbox_p.h => private/toolbox_p.h | 0 tooltip.cpp => private/tooltip.cpp | 3 +- tooltip_p.h => private/tooltip_p.h | 0 scripting/scriptengine.cpp | 3 +- service.cpp | 2 +- theme.cpp | 2 +- tooltipmanager.cpp | 12 +- 30 files changed, 296 insertions(+), 245 deletions(-) delete mode 100644 datacontainer_p.h rename applet_p.h => private/applet_p.h (100%) rename applethandle.cpp => private/applethandle.cpp (99%) rename applethandle_p.h => private/applethandle_p.h (100%) rename containment_p.h => private/containment_p.h (100%) create mode 100644 private/datacontainer_p.cpp create mode 100644 private/datacontainer_p.h rename dataengine_p.h => private/dataengine_p.h (100%) rename desktoptoolbox.cpp => private/desktoptoolbox.cpp (100%) rename desktoptoolbox_p.h => private/desktoptoolbox_p.h (98%) rename packages.cpp => private/packages.cpp (99%) rename packages_p.h => private/packages_p.h (100%) rename paneltoolbox.cpp => private/paneltoolbox.cpp (100%) rename paneltoolbox_p.h => private/paneltoolbox_p.h (98%) rename service_p.h => private/service_p.h (97%) rename sharedtimer_p.h => private/sharedtimer_p.h (100%) rename toolbox.cpp => private/toolbox.cpp (94%) rename toolbox_p.h => private/toolbox_p.h (100%) rename tooltip.cpp => private/tooltip.cpp (99%) rename tooltip_p.h => private/tooltip_p.h (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index ed7344616..13a31578f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -27,7 +27,6 @@ set(plasma_LIB_SRCS appletbrowser/kcategorizeditemsviewmodels.cpp appletbrowser/openwidgetassistant.cpp appletbrowser/plasmaappletitemmodel.cpp - applethandle.cpp configxml.cpp containment.cpp corona.cpp @@ -35,16 +34,20 @@ set(plasma_LIB_SRCS dataengine.cpp dataenginemanager.cpp delegate.cpp - desktoptoolbox.cpp dialog.cpp #FOR FUTURE #layouts/borderlayout.cpp - packages.cpp paintutils.cpp panelsvg.cpp - paneltoolbox.cpp plasma.cpp popupapplet.cpp + private/applethandle.cpp + private/datacontainer_p.cpp + private/desktoptoolbox.cpp + private/packages.cpp + private/paneltoolbox.cpp + private/toolbox.cpp + private/tooltip.cpp querymatch.cpp runnercontext.cpp runnermanager.cpp @@ -56,9 +59,7 @@ set(plasma_LIB_SRCS servicejob.cpp svg.cpp theme.cpp - toolbox.cpp tooltipmanager.cpp - tooltip.cpp uiloader.cpp version.cpp view.cpp diff --git a/applet.cpp b/applet.cpp index e7da91036..9516b2dac 100644 --- a/applet.cpp +++ b/applet.cpp @@ -20,7 +20,7 @@ */ #include "applet.h" -#include "applet_p.h" +#include "private/applet_p.h" #include #include @@ -59,23 +59,24 @@ #include -#include "plasma/configxml.h" -#include "plasma/containment.h" -#include "plasma/containment_p.h" -#include "plasma/corona.h" -#include "plasma/dataenginemanager.h" -#include "plasma/package.h" -#include "plasma/packages_p.h" -#include "plasma/plasma.h" -#include "plasma/scripting/appletscript.h" -#include "plasma/svg.h" -#include "plasma/panelsvg.h" -#include "plasma/theme.h" -#include "plasma/toolbox_p.h" -#include "plasma/view.h" -#include "plasma/widgets/label.h" -#include "plasma/widgets/pushbutton.h" -#include "plasma/tooltipmanager.h" +#include "configxml.h" +#include "containment.h" +#include "corona.h" +#include "dataenginemanager.h" +#include "package.h" +#include "plasma.h" +#include "scripting/appletscript.h" +#include "svg.h" +#include "panelsvg.h" +#include "theme.h" +#include "view.h" +#include "widgets/label.h" +#include "widgets/pushbutton.h" +#include "tooltipmanager.h" + +#include "private/containment_p.h" +#include "private/packages_p.h" +#include "private/toolbox_p.h" //#define DYNAMIC_SHADOWS namespace Plasma diff --git a/containment.cpp b/containment.cpp index 1a59fa0ea..c583dda55 100644 --- a/containment.cpp +++ b/containment.cpp @@ -19,7 +19,7 @@ */ #include "containment.h" -#include "containment_p.h" +#include "private/containment_p.h" #include #include @@ -44,14 +44,15 @@ #include #include -#include "applet_p.h" -#include "applethandle_p.h" -#include "corona.h" #include "animator.h" -#include "desktoptoolbox_p.h" -#include "paneltoolbox_p.h" +#include "corona.h" #include "svg.h" +#include "private/applet_p.h" +#include "private/applethandle_p.h" +#include "private/desktoptoolbox_p.h" +#include "private/paneltoolbox_p.h" + namespace Plasma { diff --git a/datacontainer.cpp b/datacontainer.cpp index 1928e700e..b4417c241 100644 --- a/datacontainer.cpp +++ b/datacontainer.cpp @@ -18,7 +18,7 @@ */ #include "datacontainer.h" -#include "datacontainer_p.h" +#include "private/datacontainer_p.h" #include @@ -192,5 +192,4 @@ void DataContainer::checkUsage() } // Plasma namespace #include "datacontainer.moc" -#include "datacontainer_p.moc" diff --git a/datacontainer_p.h b/datacontainer_p.h deleted file mode 100644 index f577a0d4a..000000000 --- a/datacontainer_p.h +++ /dev/null @@ -1,194 +0,0 @@ -/* - * Copyright 2006-2007 Aaron Seigo - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU Library General Public License as - * published by the Free Software Foundation; either version 2, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details - * - * You should have received a copy of the GNU Library General Public - * License along with this program; if not, write to the - * Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - -#ifndef PLASMA_DATACONTAINER_P_H -#define PLASMA_DATACONTAINER_P_H - -#include -#include - -namespace Plasma -{ - -class SignalRelay; - -class DataContainerPrivate -{ -public: - DataContainerPrivate() - : dirty(false), cached(false) - {} - - SignalRelay* signalRelay(const DataContainer* dc, QObject *visualization, - uint pollingInterval, Plasma::IntervalAlignment align); - - bool hasUpdates(); - - DataEngine::Data data; - QMap relayObjects; - QMap relays; - QTime updateTs; - bool dirty : 1; - bool cached : 1; -}; - -class SignalRelay : public QObject -{ - Q_OBJECT - -public: - SignalRelay(DataContainer* parent, DataContainerPrivate *data, uint ival, Plasma::IntervalAlignment align) - : QObject(parent), - dc(parent), - d(data), - m_interval(ival), - m_align(align), - m_resetTimer(true), - m_queued(false) - { - //kDebug() << "signal relay with time of" << m_timerId << "being set up"; - m_timerId = startTimer(0); - if (m_align != Plasma::NoAlignment) { - checkAlignment(); - } - } - - int receiverCount() const - { - return receivers(SIGNAL(dataUpdated(QString,Plasma::DataEngine::Data))); - } - - bool isUnused() - { - return receivers(SIGNAL(dataUpdated(QString,Plasma::DataEngine::Data))) < 1; - } - - void checkAlignment() - { - int newTime = 0; - - QTime t = QTime::currentTime(); - if (m_align == Plasma::AlignToMinute) { - int seconds = t.second(); - if (seconds > 2) { - newTime = ((60 - seconds) * 1000) + 500; - } - } else if (m_align == Plasma::AlignToHour) { - int minutes = t.minute(); - int seconds = t.second(); - if (minutes > 1 || seconds > 10) { - newTime = ((60 - minutes) * 1000 * 60) + - ((60 - seconds) * 1000) + 500; - } - } - - if (newTime) { - killTimer(m_timerId); - m_timerId = startTimer(newTime); - m_resetTimer = true; - } - } - - void checkQueueing() { - if (m_queued) { - emit dataUpdated(dc->objectName(), d->data); - m_queued = false; - //TODO: should we re-align our timer at this point, to avoid - // constant queueing due to more-or-less constant time - // async update time? this might make sense for - // staggered accesses to the same source by multiple - // visualizations causing a minimumPollingInterval violation. - // it may not make sense for purely async-and-takes-a-while - // type operations (e.g. network fetching). - // we need more real world data before making such a change - // change - // - // killTimer(m_timerId); - // m_timerId = startTime(m_interval); - } - } - - DataContainer *dc; - DataContainerPrivate *d; - uint m_interval; - Plasma::IntervalAlignment m_align; - int m_timerId; - bool m_resetTimer; - bool m_queued; - -signals: - void dataUpdated(const QString&, const Plasma::DataEngine::Data&); - -protected: - void timerEvent(QTimerEvent *event) - { - if (m_resetTimer) { - killTimer(m_timerId); - m_timerId = startTimer(m_interval); - m_resetTimer = false; - } - - if (m_align != Plasma::NoAlignment) { - checkAlignment(); - } - - emit dc->updateRequested(dc); - if (d->hasUpdates()) { - //kDebug() << "emitting data updated directly" << d->data; - emit dataUpdated(dc->objectName(), d->data); - } else { - // the source wasn't actually updated; so let's put ourselves in the queue - // so we get an dataUpdated() when the data does arrive - //kDebug() << "queued"; - m_queued = true; - } - event->accept(); - } -}; - -SignalRelay* DataContainerPrivate::signalRelay(const DataContainer* dc, QObject *visualization, uint pollingInterval, Plasma::IntervalAlignment align) -{ - QMap::const_iterator relayIt = relays.find(pollingInterval); - SignalRelay *relay = 0; - - //FIXME what if we have two applets with the same interval and different alignment? - if (relayIt == relays.end()) { - relay = new SignalRelay(const_cast(dc), this, pollingInterval, align); - relays[pollingInterval] = relay; - } else { - relay = relayIt.value(); - } - - relayObjects[visualization] = relay; - return relay; -} - -bool DataContainerPrivate::hasUpdates() -{ - if (cached) { - //some signalrelay needs us to pretend we did an update - cached = false; - return true; - } - return dirty; -} - -} - -#endif // multiple inclusion guard diff --git a/dataengine.cpp b/dataengine.cpp index 39c13016f..3a9572a35 100644 --- a/dataengine.cpp +++ b/dataengine.cpp @@ -18,7 +18,7 @@ */ #include "dataengine.h" -#include "dataengine_p.h" +#include "private/dataengine_p.h" #include #include @@ -34,9 +34,10 @@ #include "datacontainer.h" #include "package.h" #include "service.h" -#include "service_p.h" #include "scripting/dataenginescript.h" +#include "private/service_p.h" + namespace Plasma { diff --git a/dataenginemanager.cpp b/dataenginemanager.cpp index 840f8df4c..bc0aa956c 100644 --- a/dataenginemanager.cpp +++ b/dataenginemanager.cpp @@ -22,7 +22,7 @@ #include #include -#include "dataengine_p.h" +#include "private/dataengine_p.h" #include "scripting/scriptengine.h" namespace Plasma diff --git a/applet_p.h b/private/applet_p.h similarity index 100% rename from applet_p.h rename to private/applet_p.h diff --git a/applethandle.cpp b/private/applethandle.cpp similarity index 99% rename from applethandle.cpp rename to private/applethandle.cpp index 40cee6000..70a24662f 100644 --- a/applethandle.cpp +++ b/private/applethandle.cpp @@ -17,7 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include "applethandle_p.h" +#include "private/applethandle_p.h" #include #include @@ -892,3 +892,4 @@ void AppletHandle::calculateSize() } // Plasma Namespace #include "applethandle_p.moc" + diff --git a/applethandle_p.h b/private/applethandle_p.h similarity index 100% rename from applethandle_p.h rename to private/applethandle_p.h diff --git a/containment_p.h b/private/containment_p.h similarity index 100% rename from containment_p.h rename to private/containment_p.h diff --git a/private/datacontainer_p.cpp b/private/datacontainer_p.cpp new file mode 100644 index 000000000..835647e0f --- /dev/null +++ b/private/datacontainer_p.cpp @@ -0,0 +1,128 @@ +/* + * Copyright 2006-2007 Aaron Seigo + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Library General Public License as + * published by the Free Software Foundation; either version 2, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details + * + * You should have received a copy of the GNU Library General Public + * License along with this program; if not, write to the + * Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + +#include "datacontainer.h" +#include "datacontainer_p.h" + +namespace Plasma +{ + +SignalRelay* DataContainerPrivate::signalRelay(const DataContainer* dc, QObject *visualization, uint pollingInterval, Plasma::IntervalAlignment align) +{ + QMap::const_iterator relayIt = relays.find(pollingInterval); + SignalRelay *relay = 0; + + //FIXME what if we have two applets with the same interval and different alignment? + if (relayIt == relays.end()) { + relay = new SignalRelay(const_cast(dc), this, pollingInterval, align); + relays[pollingInterval] = relay; + } else { + relay = relayIt.value(); + } + + relayObjects[visualization] = relay; + return relay; +} + +bool DataContainerPrivate::hasUpdates() +{ + if (cached) { + // SignalRelay needs us to pretend we did an update + cached = false; + return true; + } + + return dirty; +} + +void SignalRelay::checkAlignment() +{ + int newTime = 0; + + QTime t = QTime::currentTime(); + if (m_align == Plasma::AlignToMinute) { + int seconds = t.second(); + if (seconds > 2) { + newTime = ((60 - seconds) * 1000) + 500; + } + } else if (m_align == Plasma::AlignToHour) { + int minutes = t.minute(); + int seconds = t.second(); + if (minutes > 1 || seconds > 10) { + newTime = ((60 - minutes) * 1000 * 60) + + ((60 - seconds) * 1000) + 500; + } + } + + if (newTime) { + killTimer(m_timerId); + m_timerId = startTimer(newTime); + m_resetTimer = true; + } +} + +void SignalRelay::checkQueueing() +{ + if (m_queued) { + emit dataUpdated(dc->objectName(), d->data); + m_queued = false; + //TODO: should we re-align our timer at this point, to avoid + // constant queueing due to more-or-less constant time + // async update time? this might make sense for + // staggered accesses to the same source by multiple + // visualizations causing a minimumPollingInterval violation. + // it may not make sense for purely async-and-takes-a-while + // type operations (e.g. network fetching). + // we need more real world data before making such a change + // change + // + // killTimer(m_timerId); + // m_timerId = startTime(m_interval); + } +} + +void SignalRelay::timerEvent(QTimerEvent *event) +{ + if (m_resetTimer) { + killTimer(m_timerId); + m_timerId = startTimer(m_interval); + m_resetTimer = false; + } + + if (m_align != Plasma::NoAlignment) { + checkAlignment(); + } + + emit dc->updateRequested(dc); + if (d->hasUpdates()) { + //kDebug() << "emitting data updated directly" << d->data; + emit dataUpdated(dc->objectName(), d->data); + } else { + // the source wasn't actually updated; so let's put ourselves in the queue + // so we get an dataUpdated() when the data does arrive + //kDebug() << "queued"; + m_queued = true; + } + event->accept(); +} + +} // Plasma namespace + +#include "datacontainer_p.moc" + diff --git a/private/datacontainer_p.h b/private/datacontainer_p.h new file mode 100644 index 000000000..bee7d115a --- /dev/null +++ b/private/datacontainer_p.h @@ -0,0 +1,103 @@ +/* + * Copyright 2006-2007 Aaron Seigo + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Library General Public License as + * published by the Free Software Foundation; either version 2, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details + * + * You should have received a copy of the GNU Library General Public + * License along with this program; if not, write to the + * Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + +#ifndef PLASMA_DATACONTAINER_P_H +#define PLASMA_DATACONTAINER_P_H + +#include +#include + +namespace Plasma +{ + +class SignalRelay; + +class DataContainerPrivate +{ +public: + DataContainerPrivate() + : dirty(false), cached(false) + {} + + SignalRelay* signalRelay(const DataContainer* dc, QObject *visualization, + uint pollingInterval, Plasma::IntervalAlignment align); + + bool hasUpdates(); + + DataEngine::Data data; + QMap relayObjects; + QMap relays; + QTime updateTs; + bool dirty : 1; + bool cached : 1; +}; + +class SignalRelay : public QObject +{ + Q_OBJECT + +public: + SignalRelay(DataContainer* parent, DataContainerPrivate *data, uint ival, Plasma::IntervalAlignment align) + : QObject(parent), + dc(parent), + d(data), + m_interval(ival), + m_align(align), + m_resetTimer(true), + m_queued(false) + { + //kDebug() << "signal relay with time of" << m_timerId << "being set up"; + m_timerId = startTimer(0); + if (m_align != Plasma::NoAlignment) { + checkAlignment(); + } + } + + int receiverCount() const + { + return receivers(SIGNAL(dataUpdated(QString,Plasma::DataEngine::Data))); + } + + bool isUnused() + { + return receivers(SIGNAL(dataUpdated(QString,Plasma::DataEngine::Data))) < 1; + } + + void checkAlignment(); + void checkQueueing(); + + DataContainer *dc; + DataContainerPrivate *d; + uint m_interval; + Plasma::IntervalAlignment m_align; + int m_timerId; + bool m_resetTimer; + bool m_queued; + +signals: + void dataUpdated(const QString&, const Plasma::DataEngine::Data&); + +protected: + void timerEvent(QTimerEvent *event); +}; + +} // Plasma namespace + +#endif // multiple inclusion guard + diff --git a/dataengine_p.h b/private/dataengine_p.h similarity index 100% rename from dataengine_p.h rename to private/dataengine_p.h diff --git a/desktoptoolbox.cpp b/private/desktoptoolbox.cpp similarity index 100% rename from desktoptoolbox.cpp rename to private/desktoptoolbox.cpp diff --git a/desktoptoolbox_p.h b/private/desktoptoolbox_p.h similarity index 98% rename from desktoptoolbox_p.h rename to private/desktoptoolbox_p.h index a4636dab3..533ed8126 100644 --- a/desktoptoolbox_p.h +++ b/private/desktoptoolbox_p.h @@ -27,7 +27,7 @@ #include -#include +#include #include "animator.h" diff --git a/packages.cpp b/private/packages.cpp similarity index 99% rename from packages.cpp rename to private/packages.cpp index 822dfdbbe..b1278e55a 100644 --- a/packages.cpp +++ b/private/packages.cpp @@ -17,7 +17,7 @@ * Boston, MA 02110-1301, USA. * *******************************************************************************/ -#include "packages_p.h" +#include "private/packages_p.h" #include #include diff --git a/packages_p.h b/private/packages_p.h similarity index 100% rename from packages_p.h rename to private/packages_p.h diff --git a/paneltoolbox.cpp b/private/paneltoolbox.cpp similarity index 100% rename from paneltoolbox.cpp rename to private/paneltoolbox.cpp diff --git a/paneltoolbox_p.h b/private/paneltoolbox_p.h similarity index 98% rename from paneltoolbox_p.h rename to private/paneltoolbox_p.h index e7038bb21..003d6389b 100644 --- a/paneltoolbox_p.h +++ b/private/paneltoolbox_p.h @@ -27,7 +27,7 @@ #include -#include +#include #include "animator.h" diff --git a/service_p.h b/private/service_p.h similarity index 97% rename from service_p.h rename to private/service_p.h index 88e26a60a..1ad70b4c6 100644 --- a/service_p.h +++ b/private/service_p.h @@ -17,9 +17,13 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ +#ifndef SERVICE_P_H +#define SERVICE_P_H #include "servicejob.h" + #include + namespace Plasma { @@ -83,4 +87,5 @@ public: } // namespace Plasma +#endif diff --git a/sharedtimer_p.h b/private/sharedtimer_p.h similarity index 100% rename from sharedtimer_p.h rename to private/sharedtimer_p.h diff --git a/toolbox.cpp b/private/toolbox.cpp similarity index 94% rename from toolbox.cpp rename to private/toolbox.cpp index e5fcfd500..5f798c1c1 100644 --- a/toolbox.cpp +++ b/private/toolbox.cpp @@ -19,7 +19,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include "toolbox_p.h" +#include "private/toolbox_p.h" #include #include @@ -76,7 +76,10 @@ void ToolBox::addTool(QAction *action) tool->setAction(action); tool->setDrawBackground(true); tool->setOrientation(Qt::Horizontal); - tool->resize(tool->sizeFromIconSize(22)); + QSizeF iconSize = tool->sizeFromIconSize(22); + tool->setMinimumSize(iconSize); + tool->setMaximumSize(iconSize); + tool->resize(tool->size()); tool->hide(); const int height = static_cast(tool->boundingRect().height()); diff --git a/toolbox_p.h b/private/toolbox_p.h similarity index 100% rename from toolbox_p.h rename to private/toolbox_p.h diff --git a/tooltip.cpp b/private/tooltip.cpp similarity index 99% rename from tooltip.cpp rename to private/tooltip.cpp index a154a66e6..9aa2ec5f1 100644 --- a/tooltip.cpp +++ b/private/tooltip.cpp @@ -18,7 +18,8 @@ * Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include "tooltip_p.h" + +#include "private/tooltip_p.h" #include #include diff --git a/tooltip_p.h b/private/tooltip_p.h similarity index 100% rename from tooltip_p.h rename to private/tooltip_p.h diff --git a/scripting/scriptengine.cpp b/scripting/scriptengine.cpp index 8b8f23bb4..2fa9e07e7 100644 --- a/scripting/scriptengine.cpp +++ b/scripting/scriptengine.cpp @@ -27,11 +27,12 @@ #include "applet.h" #include "dataengine.h" #include "package.h" -#include "packages_p.h" #include "scripting/appletscript.h" #include "scripting/dataenginescript.h" #include "scripting/runnerscript.h" +#include "private/packages_p.h" + namespace Plasma { diff --git a/service.cpp b/service.cpp index c783ab4ba..c71c760c4 100644 --- a/service.cpp +++ b/service.cpp @@ -18,7 +18,7 @@ */ #include "service.h" -#include "service_p.h" +#include "private/service_p.h" #include diff --git a/theme.cpp b/theme.cpp index ff1732b8f..072321cd3 100644 --- a/theme.cpp +++ b/theme.cpp @@ -35,7 +35,7 @@ #include #include -#include "plasma/packages_p.h" +#include "private/packages_p.h" namespace Plasma { diff --git a/tooltipmanager.cpp b/tooltipmanager.cpp index 7ace8eaab..41b195ff0 100644 --- a/tooltipmanager.cpp +++ b/tooltipmanager.cpp @@ -40,12 +40,12 @@ //Plasma -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include namespace Plasma {