diff options
author | Timothy Pearson <[email protected]> | 2013-02-07 17:47:17 -0600 |
---|---|---|
committer | Timothy Pearson <[email protected]> | 2013-02-07 17:47:17 -0600 |
commit | 338af5d52cf033dd699e3fb1595c36036c2ffc0b (patch) | |
tree | 6ff81e02c67ad66f528cc634a8db2a06734bc3a3 /lib | |
parent | ea720a87cc64cfc09e53ff48303de43b4df1fb01 (diff) | |
download | koffice-338af5d52cf033dd699e3fb1595c36036c2ffc0b.tar.gz koffice-338af5d52cf033dd699e3fb1595c36036c2ffc0b.zip |
Rename KComp to avoid conflicts with KDE4
Diffstat (limited to 'lib')
-rw-r--r-- | lib/koproperty/editors/combobox.cpp | 2 | ||||
-rw-r--r-- | lib/kotext/KoAutoFormat.cpp | 4 | ||||
-rw-r--r-- | lib/kotext/KoAutoFormat.h | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/lib/koproperty/editors/combobox.cpp b/lib/koproperty/editors/combobox.cpp index 164c5816..1e2a47d4 100644 --- a/lib/koproperty/editors/combobox.cpp +++ b/lib/koproperty/editors/combobox.cpp @@ -144,7 +144,7 @@ ComboBox::fillBox() } m_edit->insertStringList(property()->listData()->names); - KCompletion *comp = m_edit->completionObject(); + TDECompletion *comp = m_edit->completionObject(); comp->insertItems(property()->listData()->names); comp->setCompletionMode(TDEGlobalSettings::CompletionShell); } diff --git a/lib/kotext/KoAutoFormat.cpp b/lib/kotext/KoAutoFormat.cpp index 1a3c5245..b6268a76 100644 --- a/lib/kotext/KoAutoFormat.cpp +++ b/lib/kotext/KoAutoFormat.cpp @@ -148,7 +148,7 @@ KoAutoFormat::KoAutoFormat( KoDocument *_doc, KoVariableCollection *_varCollecti m_typographicDoubleQuotes(), m_typographicDefaultDoubleQuotes(), m_typographicDefaultSimpleQuotes(), - m_listCompletion( new KCompletion ), + m_listCompletion( new TDECompletion ), m_entries(17,false), m_allLanguages(17,false), m_superScriptEntries(), @@ -218,7 +218,7 @@ KoAutoFormat::KoAutoFormat( const KoAutoFormat& format ) m_completionBox(0), m_keyCompletionAction( format.m_keyCompletionAction ) { - //m_listCompletion=new KCompletion(); + //m_listCompletion=new TDECompletion(); //m_listCompletion->setItems( autoFormat.listCompletion() ); //copyAutoFormatEntries( autoFormat ); } diff --git a/lib/kotext/KoAutoFormat.h b/lib/kotext/KoAutoFormat.h index d122f7b7..b4e53f6c 100644 --- a/lib/kotext/KoAutoFormat.h +++ b/lib/kotext/KoAutoFormat.h @@ -37,7 +37,7 @@ class KoTextParag; class KoTextObject; class KoVariableCollection; class KoVariableFormatCollection; -class KCompletion; +class TDECompletion; class KoTextCursor; class KCommand; class KoSearchContext; @@ -315,7 +315,7 @@ public: TQStringList listCompletion() const; - KCompletion *getCompletion() const { return m_listCompletion; } + TDECompletion *getCompletion() const { return m_listCompletion; } int nbSuperScriptEntry() const { return m_superScriptEntries.count(); } @@ -399,7 +399,7 @@ private: TypographicQuotes m_typographicDefaultSimpleQuotes; - KCompletion *m_listCompletion; + TDECompletion *m_listCompletion; TQDict<KoAutoFormatEntry> m_entries; TQDict<KoAutoFormatEntry> m_allLanguages; |