diff options
Diffstat (limited to 'tdespell2')
| -rw-r--r-- | tdespell2/README | 2 | ||||
| -rw-r--r-- | tdespell2/broker.cpp | 10 | ||||
| -rw-r--r-- | tdespell2/broker.h | 10 | ||||
| -rw-r--r-- | tdespell2/settings.cpp | 6 | ||||
| -rw-r--r-- | tdespell2/settings.h | 6 | ||||
| -rw-r--r-- | tdespell2/ui/highlighter.cpp | 2 |
6 files changed, 18 insertions, 18 deletions
diff --git a/tdespell2/README b/tdespell2/README index 4cba772b6..53d6f4e27 100644 --- a/tdespell2/README +++ b/tdespell2/README @@ -9,7 +9,7 @@ Dictionaries are abstracted in the KSpell::Dictionary object which encapsulates all spell-checking functionality. You'll notice that the Broker is being created via the -Broker::Ptr Broker::openBroker( KSharedConfig *config =0 ); +Broker::Ptr Broker::openBroker( TDESharedConfig *config =0 ); call. The Broker is a shared object and the reason for this construct is very simple: - most application would need to have a few Broker objects (one for diff --git a/tdespell2/broker.cpp b/tdespell2/broker.cpp index a5df8178c..5e03c377b 100644 --- a/tdespell2/broker.cpp +++ b/tdespell2/broker.cpp @@ -56,11 +56,11 @@ public: TQPtrDict<Broker> *Broker::s_brokers = 0; -Broker *Broker::openBroker( KSharedConfig *config ) +Broker *Broker::openBroker( TDESharedConfig *config ) { - KSharedConfig::Ptr preventDeletion; + TDESharedConfig::Ptr preventDeletion; if ( !config ) { - preventDeletion = KSharedConfig::openConfig( DEFAULT_CONFIG_FILE ); + preventDeletion = TDESharedConfig::openConfig( DEFAULT_CONFIG_FILE ); } else preventDeletion = config; @@ -74,9 +74,9 @@ Broker *Broker::openBroker( KSharedConfig *config ) return broker; } -Broker::Broker( KSharedConfig *config ) +Broker::Broker( TDESharedConfig *config ) { - KSharedConfig::Ptr preventDeletion( config ); + TDESharedConfig::Ptr preventDeletion( config ); Q_UNUSED( preventDeletion ); if ( !s_brokers ) diff --git a/tdespell2/broker.h b/tdespell2/broker.h index 26be0e11e..f96361a58 100644 --- a/tdespell2/broker.h +++ b/tdespell2/broker.h @@ -28,7 +28,7 @@ #include <tqstringlist.h> #include <tqstring.h> -class KSharedConfig; +class TDESharedConfig; template <typename T> class TQPtrDict; @@ -46,11 +46,11 @@ namespace KSpell2 * of the KSpell2 architecture. */ class KDE_EXPORT Broker : public TQObject, - public KShared + public TDEShared { Q_OBJECT public: - typedef KSharedPtr<Broker> Ptr; + typedef TDESharedPtr<Broker> Ptr; /** * Constructs the broker. * @@ -65,7 +65,7 @@ namespace KSpell2 * and default client values. If no value will * be passed Broker will use global tdespellrc file. */ - static Broker *openBroker( KSharedConfig *config = 0 ); + static Broker *openBroker( TDESharedConfig *config = 0 ); public: ~Broker(); @@ -122,7 +122,7 @@ namespace KSpell2 friend class Settings; void changed(); private: - Broker( KSharedConfig *config ); + Broker( TDESharedConfig *config ); void loadPlugins(); void loadPlugin( const TQString& ); private: diff --git a/tdespell2/settings.cpp b/tdespell2/settings.cpp index d1d050ce7..57535b85c 100644 --- a/tdespell2/settings.cpp +++ b/tdespell2/settings.cpp @@ -37,7 +37,7 @@ class Settings::Private { public: Broker* broker; //can't be a Ptr since we don't want to hold a ref on it - KSharedConfig::Ptr config; + TDESharedConfig::Ptr config; bool modified; TQString defaultLanguage; @@ -50,7 +50,7 @@ public: TQMap<TQString, bool> ignore; }; -Settings::Settings( Broker *broker, KSharedConfig *config ) +Settings::Settings( Broker *broker, TDESharedConfig *config ) { d = new Private; d->broker = broker; @@ -67,7 +67,7 @@ Settings::~Settings() delete d; d = 0; } -KSharedConfig *Settings::sharedConfig() const +TDESharedConfig *Settings::sharedConfig() const { return d->config; } diff --git a/tdespell2/settings.h b/tdespell2/settings.h index 2346f0772..ebf3ad46d 100644 --- a/tdespell2/settings.h +++ b/tdespell2/settings.h @@ -26,7 +26,7 @@ #include <tqstring.h> #include <tdelibs_export.h> -class KSharedConfig; +class TDESharedConfig; namespace KSpell2 { @@ -59,7 +59,7 @@ namespace KSpell2 void save(); - KSharedConfig *sharedConfig() const; + TDESharedConfig *sharedConfig() const; private: void loadConfig(); @@ -68,7 +68,7 @@ namespace KSpell2 private: friend class Broker; - Settings( Broker *broker, KSharedConfig *config ); + Settings( Broker *broker, TDESharedConfig *config ); private: class Private; Private *d; diff --git a/tdespell2/ui/highlighter.cpp b/tdespell2/ui/highlighter.cpp index 176d69232..32970f9e4 100644 --- a/tdespell2/ui/highlighter.cpp +++ b/tdespell2/ui/highlighter.cpp @@ -51,7 +51,7 @@ Highlighter::Highlighter( TQTextEdit *textEdit, d = new Private; d->filter = filter; if ( !configFile.isEmpty() ) - d->broker = Broker::openBroker( KSharedConfig::openConfig( configFile ) ); + d->broker = Broker::openBroker( TDESharedConfig::openConfig( configFile ) ); else d->broker = Broker::openBroker(); |