Rename KComp to avoid conflicts with KDE4

pull/1/head
Timothy Pearson 11 years ago
parent 3a3518bb00
commit a5ef67db99

@ -401,7 +401,7 @@ Example: f(x)=x^2</string>
<signal>returnPressed(const TQString&amp;)</signal> <signal>returnPressed(const TQString&amp;)</signal>
<signal>completion(const TQString&amp;)</signal> <signal>completion(const TQString&amp;)</signal>
<signal>substringCompletion(const TQString&amp;)</signal> <signal>substringCompletion(const TQString&amp;)</signal>
<signal>textRotation(KCompletionBase::KeyBindingType)</signal> <signal>textRotation(TDECompletionBase::KeyBindingType)</signal>
<signal>completionModeChanged(TDEGlobalSettings::Completion)</signal> <signal>completionModeChanged(TDEGlobalSettings::Completion)</signal>
<signal>aboutToShowContextMenu(TQPopupMenu*)</signal> <signal>aboutToShowContextMenu(TQPopupMenu*)</signal>
<slot access="public" specifier="">deleteLater()</slot> <slot access="public" specifier="">deleteLater()</slot>
@ -473,7 +473,7 @@ Example: f(x)=x^2</string>
<slot access="public" specifier="">setDragEnabled(bool)</slot> <slot access="public" specifier="">setDragEnabled(bool)</slot>
<slot access="private" specifier="">clipboardChanged()</slot> <slot access="private" specifier="">clipboardChanged()</slot>
<slot access="public" specifier="">setReadOnly(bool)</slot> <slot access="public" specifier="">setReadOnly(bool)</slot>
<slot access="public" specifier="">rotateText(KCompletionBase::KeyBindingType)</slot> <slot access="public" specifier="">rotateText(TDECompletionBase::KeyBindingType)</slot>
<slot access="public" specifier="">setCompletedText(const TQString&amp;)</slot> <slot access="public" specifier="">setCompletedText(const TQString&amp;)</slot>
<slot access="public" specifier="">setCompletedItems(const TQStringList&amp;)</slot> <slot access="public" specifier="">setCompletedItems(const TQStringList&amp;)</slot>
<slot access="public" specifier="">setCompletedItems(const TQStringList&amp;,bool)</slot> <slot access="public" specifier="">setCompletedItems(const TQStringList&amp;,bool)</slot>

@ -30,11 +30,11 @@ DlgLanguage::DlgLanguage(TQWidget *parent, const char *name, bool modal): KDialo
dlgBase -> picLanguage1 -> setPixmap(TDEGlobal::iconLoader()->loadIcon("question", TDEIcon::Panel)); dlgBase -> picLanguage1 -> setPixmap(TDEGlobal::iconLoader()->loadIcon("question", TDEIcon::Panel));
dlgBase -> picLanguage2 -> setPixmap(TDEGlobal::iconLoader()->loadIcon("answer", TDEIcon::Panel)); dlgBase -> picLanguage2 -> setPixmap(TDEGlobal::iconLoader()->loadIcon("answer", TDEIcon::Panel));
completion1 = new KCompletion(); completion1 = new TDECompletion();
completion1->setItems(Prefs::columnTitles1()); completion1->setItems(Prefs::columnTitles1());
dlgBase -> txtLanguage1->setCompletionObject(completion1); dlgBase -> txtLanguage1->setCompletionObject(completion1);
completion2 = new KCompletion(); completion2 = new TDECompletion();
completion2->setItems(Prefs::columnTitles2()); completion2->setItems(Prefs::columnTitles2());
dlgBase -> txtLanguage2->setCompletionObject(completion2); dlgBase -> txtLanguage2->setCompletionObject(completion2);

@ -21,7 +21,7 @@
#include "dlglanguagebase.h" #include "dlglanguagebase.h"
class KCompletion; class TDECompletion;
/** /**
@author Peter Hedlund @author Peter Hedlund
@ -38,8 +38,8 @@ class DlgLanguage : public KDialogBase {
private: private:
DlgLanguageBase *dlgBase; DlgLanguageBase *dlgBase;
KCompletion * completion1; TDECompletion * completion1;
KCompletion * completion2; TDECompletion * completion2;
}; };

Loading…
Cancel
Save