diff --git a/private/dataengineservice.cpp b/private/dataengineservice.cpp index 7a5c05c92..511483bd7 100644 --- a/private/dataengineservice.cpp +++ b/private/dataengineservice.cpp @@ -16,10 +16,10 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include "dataengineservice.h" +#include "dataengineservice_p.h" #include "../dataengine.h" -#include "getsource.h" +#include "getsource_p.h" #include @@ -56,5 +56,5 @@ void DataEngineService::sourceAdded(QString source) } -#include "dataengineservice.moc" +#include "dataengineservice_p.moc" diff --git a/private/dataengineservice.h b/private/dataengineservice_p.h similarity index 100% rename from private/dataengineservice.h rename to private/dataengineservice_p.h diff --git a/private/denyallauthorization.cpp b/private/denyallauthorization.cpp index 3f06aceae..31c56c378 100644 --- a/private/denyallauthorization.cpp +++ b/private/denyallauthorization.cpp @@ -17,7 +17,7 @@ * Boston, MA 02110-1301 USA */ -#include "denyallauthorization.h" +#include "denyallauthorization_p.h" #include "authorizationrule.h" #include "clientpinrequest.h" diff --git a/private/denyallauthorization.h b/private/denyallauthorization_p.h similarity index 100% rename from private/denyallauthorization.h rename to private/denyallauthorization_p.h diff --git a/private/getsource.cpp b/private/getsource.cpp index cec5eadd5..01154729d 100644 --- a/private/getsource.cpp +++ b/private/getsource.cpp @@ -16,9 +16,10 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include "getsource.h" +#include "getsource_p.h" #include "authorizationmanager_p.h" +#include "dataengineservice_p.h" #include "service_p.h" #include "../remote/authorizationmanager.h" @@ -31,6 +32,15 @@ namespace Plasma { +GetSource::GetSource(DataEngine *engine, const QString& operation, + QMap& parameters, + DataEngineService *service) + : ServiceJob(QString("publickey"), operation, parameters, service), + m_engine(engine), + m_service(service) +{ +} + void GetSource::start() { kDebug() << "Trying to perform the action" << operationName(); @@ -65,5 +75,5 @@ void GetSource::start() } -#include "getsource.moc" +#include "getsource_p.moc" diff --git a/private/getsource.h b/private/getsource_p.h similarity index 77% rename from private/getsource.h rename to private/getsource_p.h index ec3d5a69b..0c71b3706 100644 --- a/private/getsource.h +++ b/private/getsource_p.h @@ -19,30 +19,22 @@ #ifndef GETSOURCE_H #define GETSOURCE_H -#include "dataengineservice.h" - -#include "../dataengine.h" #include "../servicejob.h" namespace Plasma { class DataEngine; +class DataEngineService; class GetSource : public Plasma::ServiceJob { Q_OBJECT public: - GetSource(DataEngine *engine, - const QString& operation, + GetSource(DataEngine *engine, const QString& operation, QMap& parameters, - DataEngineService *service = 0) - : ServiceJob(QString("publickey"), operation, parameters, service), - m_engine(engine), - m_service(service) - { - } + DataEngineService *service = 0); void start(); diff --git a/private/pinpairingauthorization.cpp b/private/pinpairingauthorization.cpp index ef0aa0377..b42707bf3 100644 --- a/private/pinpairingauthorization.cpp +++ b/private/pinpairingauthorization.cpp @@ -17,11 +17,11 @@ * Boston, MA 02110-1301 USA */ -#include "pinpairingauthorization.h" +#include "pinpairingauthorization_p.h" #include "authorizationrule.h" #include "clientpinrequest.h" -#include "pinpairingdialog.h" +#include "pinpairingdialog_p.h" #include "../remote/credentials.h" diff --git a/private/pinpairingauthorization.h b/private/pinpairingauthorization_p.h similarity index 97% rename from private/pinpairingauthorization.h rename to private/pinpairingauthorization_p.h index 6c1681159..cd4b96aca 100644 --- a/private/pinpairingauthorization.h +++ b/private/pinpairingauthorization_p.h @@ -20,13 +20,11 @@ #ifndef PLASMA_PINPAIRINGAUTHORIZATION_H #define PLASMA_PINPAIRINGAUTHORIZATION_H -#include "plasma_export.h" - -#include "authorizationinterface.h" -#include "pinpairingauthorization.h" - #include +#include "plasma_export.h" +#include "authorizationinterface.h" + namespace Plasma { diff --git a/private/pinpairingdialog.cpp b/private/pinpairingdialog.cpp index 35388c301..7160aa772 100644 --- a/private/pinpairingdialog.cpp +++ b/private/pinpairingdialog.cpp @@ -16,7 +16,7 @@ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "pinpairingdialog.h" +#include "pinpairingdialog_p.h" #include "authorizationrule.h" #include "clientpinrequest.h" @@ -116,4 +116,4 @@ PinPairingDialog::~PinPairingDialog() } -#include "pinpairingdialog.moc" +#include "pinpairingdialog_p.moc" diff --git a/private/pinpairingdialog.h b/private/pinpairingdialog_p.h similarity index 100% rename from private/pinpairingdialog.h rename to private/pinpairingdialog_p.h diff --git a/private/plasmoidservice.cpp b/private/plasmoidservice.cpp index a055eeba9..044a2987b 100644 --- a/private/plasmoidservice.cpp +++ b/private/plasmoidservice.cpp @@ -16,7 +16,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include "plasmoidservice.h" +#include "plasmoidservice_p.h" #include "authorizationmanager_p.h" #include "dataengineconsumer_p.h" @@ -145,5 +145,5 @@ Plasma::ServiceJob* PlasmoidService::createJob(const QString& operation, } -#include "plasmoidservice.moc" +#include "plasmoidservice_p.moc" diff --git a/private/plasmoidservice.h b/private/plasmoidservice_p.h similarity index 100% rename from private/plasmoidservice.h rename to private/plasmoidservice_p.h diff --git a/private/runnerjobs.cpp b/private/runnerjobs.cpp index 07862ca56..e18cd8aa3 100644 --- a/private/runnerjobs.cpp +++ b/private/runnerjobs.cpp @@ -26,7 +26,7 @@ //#include #include -#include "runnerjobs.h" +#include "runnerjobs_p.h" #include "plasma/querymatch.h" using ThreadWeaver::Job; diff --git a/private/runnerjobs.h b/private/runnerjobs_p.h similarity index 100% rename from private/runnerjobs.h rename to private/runnerjobs_p.h diff --git a/private/trustedonlyauthorization.cpp b/private/trustedonlyauthorization.cpp index 06d1ed139..4fe84cdc0 100644 --- a/private/trustedonlyauthorization.cpp +++ b/private/trustedonlyauthorization.cpp @@ -17,10 +17,10 @@ * Boston, MA 02110-1301 USA */ -#include "trustedonlyauthorization.h" +#include "trustedonlyauthorization_p.h" #include "authorizationrule.h" -#include "pinpairingdialog.h" +#include "pinpairingdialog_p.h" #include #include diff --git a/private/trustedonlyauthorization.h b/private/trustedonlyauthorization_p.h similarity index 100% rename from private/trustedonlyauthorization.h rename to private/trustedonlyauthorization_p.h diff --git a/remote/authorizationmanager.cpp b/remote/authorizationmanager.cpp index 6a3e6e16c..660eef1dc 100644 --- a/remote/authorizationmanager.cpp +++ b/remote/authorizationmanager.cpp @@ -27,10 +27,10 @@ #include "servicejob.h" #include "private/authorizationrule_p.h" -#include "private/denyallauthorization.h" +#include "private/denyallauthorization_p.h" #include "private/joliemessagehelper_p.h" -#include "private/pinpairingauthorization.h" -#include "private/trustedonlyauthorization.h" +#include "private/pinpairingauthorization_p.h" +#include "private/trustedonlyauthorization_p.h" #include #include