From 00202cc4766cdeca061d63e12ec5dc817f4a4d81 Mon Sep 17 00:00:00 2001 From: Reto Zingg Date: Sat, 15 Dec 2012 19:28:48 +0200 Subject: [PATCH] adapt qmvocidentifier.cpp for querymee --- qmvocidentifier.cpp | 45 +++++++++++++++++++++++++-------------------- 1 file changed, 25 insertions(+), 20 deletions(-) diff --git a/qmvocidentifier.cpp b/qmvocidentifier.cpp index 6d5f845..a42f0bb 100644 --- a/qmvocidentifier.cpp +++ b/qmvocidentifier.cpp @@ -1,5 +1,10 @@ +/*************************************************************************** +* this file is from kdeedu project. Filename: keduvocidentifier.cpp +***************************************************************************/ + /*************************************************************************** Copyright 2007-2008 Frederik Gladhorn + Copyright (C) 2010, 2012 Reto Zingg ***************************************************************************/ /*************************************************************************** @@ -10,9 +15,9 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include "keduvocidentifier.h" +#include "qmvocidentifier.h" -class KEduVocIdentifier::Private +class QmVocIdentifier::Private { public: /// the name: English, Anatomy, Fruit salad @@ -30,29 +35,29 @@ public: QString m_type; /** I, you, he, she, it... */ - KEduVocPersonalPronoun m_personalPronouns; + QmVocPersonalPronoun m_personalPronouns; /** the for english ;) der, die, das ... in german */ - KEduVocArticle m_articles; + QmVocArticle m_articles; /** Future, present and past... and many more */ QStringList m_tenses; }; -KEduVocIdentifier::KEduVocIdentifier() +QmVocIdentifier::QmVocIdentifier() : d( new Private ) { ///@todo maybe the user locale would be more appropriate d->m_locale = "en"; } -KEduVocIdentifier::~KEduVocIdentifier() +QmVocIdentifier::~QmVocIdentifier() { delete d; } -KEduVocIdentifier::KEduVocIdentifier( const KEduVocIdentifier &other ) +QmVocIdentifier::QmVocIdentifier( const QmVocIdentifier &other ) : d( new Private( *other.d ) ) { #if 0 @@ -66,7 +71,7 @@ KEduVocIdentifier::KEduVocIdentifier( const KEduVocIdentifier &other ) #endif } -KEduVocIdentifier& KEduVocIdentifier::operator= ( const KEduVocIdentifier &other ) +QmVocIdentifier& QmVocIdentifier::operator= ( const QmVocIdentifier &other ) { d->m_locale = other.d->m_locale; d->m_name = other.d->m_name; @@ -78,53 +83,53 @@ KEduVocIdentifier& KEduVocIdentifier::operator= ( const KEduVocIdentifier &other return *this; } -QString KEduVocIdentifier::name() const +QString QmVocIdentifier::name() const { return d->m_name; } -void KEduVocIdentifier::setName(const QString & name) +void QmVocIdentifier::setName(const QString & name) { d->m_name = name; } -QString KEduVocIdentifier::locale() const +QString QmVocIdentifier::locale() const { return d->m_locale; } -void KEduVocIdentifier::setLocale(const QString & locale) +void QmVocIdentifier::setLocale(const QString & locale) { d->m_locale = locale; } -void KEduVocIdentifier::setArticle( const KEduVocArticle& articles ) +void QmVocIdentifier::setArticle( const QmVocArticle& articles ) { d->m_articles = articles; } -KEduVocArticle& KEduVocIdentifier::article() const +QmVocArticle& QmVocIdentifier::article() const { return d->m_articles; } -KEduVocPersonalPronoun& KEduVocIdentifier::personalPronouns() const +QmVocPersonalPronoun& QmVocIdentifier::personalPronouns() const { return d->m_personalPronouns; } -void KEduVocIdentifier::setPersonalPronouns( const KEduVocPersonalPronoun & pronouns ) +void QmVocIdentifier::setPersonalPronouns( const QmVocPersonalPronoun & pronouns ) { d->m_personalPronouns = pronouns; } -QString KEduVocIdentifier::tense(int tenseIndex) const +QString QmVocIdentifier::tense(int tenseIndex) const { Q_ASSERT(d->m_tenses.size() > tenseIndex); return d->m_tenses.value(tenseIndex); } -void KEduVocIdentifier::setTense(int tenseIndex, const QString& tense) +void QmVocIdentifier::setTense(int tenseIndex, const QString& tense) { Q_ASSERT(d->m_tenses.size() >= tenseIndex); if (tenseIndex == d->m_tenses.size()) { @@ -134,12 +139,12 @@ void KEduVocIdentifier::setTense(int tenseIndex, const QString& tense) } } -QStringList KEduVocIdentifier::tenseList() const +QStringList QmVocIdentifier::tenseList() const { return d->m_tenses; } -void KEduVocIdentifier::setTenseList(const QStringList& tenses) +void QmVocIdentifier::setTenseList(const QStringList& tenses) { d->m_tenses = tenses; } -- 2.47.3