diff -r 90517678cc4f -r 453da2cfceef qtmobility/src/contacts/qcontactmanager_p.h --- a/qtmobility/src/contacts/qcontactmanager_p.h Mon May 03 13:18:40 2010 +0300 +++ b/qtmobility/src/contacts/qcontactmanager_p.h Fri May 14 16:41:33 2010 +0300 @@ -62,9 +62,6 @@ #include "qcontactmanager.h" #include "qcontactmanagerengine.h" -#include "qcontactactiondescriptor.h" -#include "qcontactactionfactory.h" - QTM_BEGIN_NAMESPACE class QContactManagerEngineFactory; @@ -86,8 +83,6 @@ void createEngine(const QString& managerName, const QMap& parameters); static QContactManagerEngine* engine(const QContactManager* manager); - static QList actionDescriptors(const QString& actionName = QString(), const QString& vendorName = QString(), int implementationVersion = -1); - static QContactAction* action(const QContactActionDescriptor& actionDescriptor); QContactManagerEngine* m_engine; QContactManager::Error m_error; @@ -100,14 +95,6 @@ static void loadFactories(); static void loadStaticFactories(); - /* Action Implementations */ - typedef QHash DescriptorHash; - static QList m_actionfactories; // list of all factories - static QList m_descriptors; // all descriptors - static DescriptorHash m_descriptormap; - static QHash m_actionmap; - static QHash m_vendormap; - private: Q_DISABLE_COPY(QContactManagerData) };