diff options
| author | Timothy Pearson <[email protected]> | 2013-02-07 17:55:08 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-02-07 17:55:08 -0600 |
| commit | 563c54585088010ae6b1c49b925e408be345a303 (patch) | |
| tree | fb52f5a698b3261de9c2659d00fc12524b491e99 /libkonq | |
| parent | e0602f96ec0eea1dab12e83b5fcd598c9a400c65 (diff) | |
| download | tdebase-563c54585088010ae6b1c49b925e408be345a303.tar.gz tdebase-563c54585088010ae6b1c49b925e408be345a303.zip | |
Rename KComp to avoid conflicts with KDE4
Diffstat (limited to 'libkonq')
| -rw-r--r-- | libkonq/konq_historymgr.cc | 8 | ||||
| -rw-r--r-- | libkonq/konq_historymgr.h | 10 |
2 files changed, 9 insertions, 9 deletions
diff --git a/libkonq/konq_historymgr.cc b/libkonq/konq_historymgr.cc index c9367130d..aaac8dfff 100644 --- a/libkonq/konq_historymgr.cc +++ b/libkonq/konq_historymgr.cc @@ -55,8 +55,8 @@ KonqHistoryManager::KonqHistoryManager( TQObject *parent, const char *name ) // take care of the completion object - m_pCompletion = new KCompletion; - m_pCompletion->setOrder( KCompletion::Weighted ); + m_pCompletion = new TDECompletion; + m_pCompletion->setOrder( TDECompletion::Weighted ); // and load the history loadHistory(); @@ -619,10 +619,10 @@ bool KonqHistoryManager::loadFallback() // tries to create a small KonqHistoryEntry out of a string, where the string // looks like "http://www.bla.com/bla.html:23" -// the attached :23 is the weighting from KCompletion +// the attached :23 is the weighting from TDECompletion KonqHistoryEntry * KonqHistoryManager::createFallbackEntry(const TQString& item) const { - // code taken from KCompletion::addItem(), adjusted to use weight = 1 + // code taken from TDECompletion::addItem(), adjusted to use weight = 1 uint len = item.length(); uint weight = 1; diff --git a/libkonq/konq_historymgr.h b/libkonq/konq_historymgr.h index bd22331fd..c4cc6a9b1 100644 --- a/libkonq/konq_historymgr.h +++ b/libkonq/konq_historymgr.h @@ -37,7 +37,7 @@ #include <libkonq_export.h> -class KCompletion; +class TDECompletion; typedef TQPtrList<KonqHistoryEntry> KonqBaseHistoryList; @@ -69,7 +69,7 @@ protected: * Konqueror instance. Additionally it synchronizes the history with other * Konqueror instances via DCOP to keep one global and persistant history. * - * It keeps the history in sync with one KCompletion object + * It keeps the history in sync with one TDECompletion object */ class LIBKONQ_EXPORT KonqHistoryManager : public KParts::HistoryProvider, public KonqHistoryComm @@ -164,9 +164,9 @@ public: void removePending( const KURL& url ); /** - * @returns the KCompletion object. + * @returns the TDECompletion object. */ - KCompletion * completionObject() const { return m_pCompletion; } + TDECompletion * completionObject() const { return m_pCompletion; } /** * @returns the list of all history entries, sorted by date @@ -370,7 +370,7 @@ private: TQ_UINT32 m_maxCount; // maximum of history entries TQ_UINT32 m_maxAgeDays; // maximum age of a history entry - KCompletion *m_pCompletion; // the completion object we sync with + TDECompletion *m_pCompletion; // the completion object we sync with /** * A timer that will emit the KParts::HistoryProvider::updated() signal |