diff options
| author | Konstantin Ritt <ritt.ks@gmail.com> | 2014-01-08 08:08:45 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-01-08 15:39:14 +0100 |
| commit | 1ca893339669947fa60597d6a524a997e6bb87e9 (patch) | |
| tree | 0c76345773f15bd0b3c3c0abba79ef7d348d764d /src/organizer/qorganizermanager_p.cpp | |
| parent | 7487a1bfc3f85c8d3d69ed294fc97e6079f30201 (diff) | |
Use the installed headers
This fixes synqt warnings about incorrect inclusions in public headers.
Also deals with extra- and duplicate includes, forward declaration,
namespacing issues, and circular dependencies...
...and Qt-ifies the headers after all.
Change-Id: Ia373d6fb93e0fecedd2a2334fbeb4c2005a67a4c
Reviewed-by: Michael Krasnyk <michael.krasnyk@gmail.com>
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
Diffstat (limited to 'src/organizer/qorganizermanager_p.cpp')
| -rw-r--r-- | src/organizer/qorganizermanager_p.cpp | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/src/organizer/qorganizermanager_p.cpp b/src/organizer/qorganizermanager_p.cpp index 5a46e7127..a450b00ab 100644 --- a/src/organizer/qorganizermanager_p.cpp +++ b/src/organizer/qorganizermanager_p.cpp @@ -39,14 +39,18 @@ ** ****************************************************************************/ -#include <private/qorganizermanager_p.h> -#include <qorganizeritemobserver.h> -#include <qorganizermanagerenginefactory.h> +#include "qorganizermanager_p.h" #include <QtCore/qcoreapplication.h> +#if !defined(QT_NO_DEBUG) +#include <QtCore/qdebug.h> +#endif #include <QtCore/qpluginloader.h> #include <QtCore/private/qfactoryloader_p.h> +#include "qorganizeritemobserver.h" +#include "qorganizermanagerenginefactory.h" + QT_BEGIN_NAMESPACE_ORGANIZER QHash<QString, QOrganizerManagerEngineFactory *> QOrganizerManagerData::m_engines; @@ -134,11 +138,11 @@ void QOrganizerManagerData::loadStaticFactories() if (name != QStringLiteral("invalid") && !name.isEmpty()) { // we also need to ensure that we haven't already loaded this factory. if (m_engines.keys().contains(name)) - qWarning() << "Static organizeritems plugin" << name << "has the same name as a currently loaded plugin; ignored"; + qWarning("Static organizeritems plugin %s has the same name as a currently loaded plugin; ignored", qPrintable(name)); else m_engines.insertMulti(name, f); } else { - qWarning() << "Static organizeritems plugin with reserved name" << name << "ignored"; + qWarning("Static organizeritems plugin with reserved name %s ignored", qPrintable(name)); } } } @@ -172,11 +176,11 @@ void QOrganizerManagerData::loadFactories() if (name != QStringLiteral("invalid") && !name.isEmpty()) { // we also need to ensure that we haven't already loaded this factory. if (m_engines.keys().contains(name)) - qWarning() << "Organizer plugin" << m_pluginPaths.at(i) << "has the same name as currently loaded plugin" << name << "; ignored"; + qWarning("Organizer plugin %s has the same name as currently loaded plugin %s; ignored", qPrintable(m_pluginPaths.at(i)), qPrintable(name)); else m_engines.insertMulti(name, f); } else { - qWarning() << "Organizer plugin" << m_pluginPaths.at(i) << "with reserved name" << name << "ignored"; + qWarning("Organizer plugin %s with reserved name %s ignored", qPrintable(m_pluginPaths.at(i)), qPrintable(name)); } } |