Browse Source

Rename KComp to avoid conflicts with KDE4

tags/r14.0.0
Timothy Pearson 7 years ago
parent
commit
338af5d52c
10 changed files with 17 additions and 17 deletions
  1. +1
    -1
      kexi/doc/dev/CHANGELOG-Kexi-js
  2. +4
    -4
      kexi/main/startup/KexiStartupFileDialog_win.cpp
  3. +1
    -1
      kexi/widget/kexidatasourcecombobox.cpp
  4. +1
    -1
      kspread/dialogs/kspread_dlg_formula.h
  5. +2
    -2
      kspread/kspread_doc.cc
  6. +1
    -1
      kspread/kspread_doc.h
  7. +1
    -1
      kspread/kspread_editors.h
  8. +1
    -1
      lib/koproperty/editors/combobox.cpp
  9. +2
    -2
      lib/kotext/KoAutoFormat.cpp
  10. +3
    -3
      lib/kotext/KoAutoFormat.h

+ 1
- 1
kexi/doc/dev/CHANGELOG-Kexi-js View File

@@ -16,7 +16,7 @@ Legend:
mentioning in the public changelog

TODO: fix displaying default values in comboboxes (form and tableview)
TODO: use KCompletionBox in (editable/noneditable) comboboxes
TODO: use TDECompletionBox in (editable/noneditable) comboboxes

2007-04-11
Forms


+ 4
- 4
kexi/main/startup/KexiStartupFileDialog_win.cpp View File

@@ -272,8 +272,8 @@ void KexiStartupFileDialogBase::init(const TQString& startDir, const TQString& f
TQT_SLOT( pathComboChanged( const TQString& ) ));
connect( d->pathCombo, TQT_SIGNAL( completion( const TQString& )),
TQT_SLOT( dirCompletion( const TQString& )));
connect( d->pathCombo, TQT_SIGNAL( textRotation(KCompletionBase::KeyBindingType) ),
d->pathCombo, TQT_SLOT( rotateText(KCompletionBase::KeyBindingType) ));
connect( d->pathCombo, TQT_SIGNAL( textRotation(TDECompletionBase::KeyBindingType) ),
d->pathCombo, TQT_SLOT( rotateText(TDECompletionBase::KeyBindingType) ));

TQString whatsThisText;

@@ -299,8 +299,8 @@ void KexiStartupFileDialogBase::init(const TQString& startDir, const TQString& f
this, TQT_SLOT( locationActivated( const TQString& ) ));
connect( locationEdit, TQT_SIGNAL( completion( const TQString& )),
TQT_SLOT( fileCompletion( const TQString& )));
connect( locationEdit, TQT_SIGNAL( textRotation(KCompletionBase::KeyBindingType) ),
locationEdit, TQT_SLOT( rotateText(KCompletionBase::KeyBindingType) ));
connect( locationEdit, TQT_SIGNAL( textRotation(TDECompletionBase::KeyBindingType) ),
locationEdit, TQT_SLOT( rotateText(TDECompletionBase::KeyBindingType) ));

// the Filter label/edit
whatsThisText = i18n("<qt>This is the filter to apply to the file list. "


+ 1
- 1
kexi/widget/kexidatasourcecombobox.cpp View File

@@ -128,7 +128,7 @@ void KexiDataSourceComboBox::setProject(KexiProject *prj, bool showTables, bool
insertItem(i18n("Define Query..."));
#endif

KCompletion *comp = completionObject();
TDECompletion *comp = completionObject();

if (d->showTables) {
//tables


+ 1
- 1
kspread/dialogs/kspread_dlg_formula.h View File

@@ -139,7 +139,7 @@ private:
TQLineEdit *result;

KLineEdit *searchFunct;
KCompletion listFunct;
TDECompletion listFunct;

TQLabel* label1;
TQLabel* label2;


+ 2
- 2
kspread/kspread_doc.cc View File

@@ -126,7 +126,7 @@ public:
TQPtrList<Plugin> plugins;

TQValueList<Reference> refs;
KCompletion listCompletion;
TDECompletion listCompletion;

int numOperations;

@@ -500,7 +500,7 @@ const TQValueList<Reference> &Doc::listArea()
return d->refs;
}

KCompletion& Doc::completion()
TDECompletion& Doc::completion()
{
return d->listCompletion;
}


+ 1
- 1
kspread/kspread_doc.h View File

@@ -517,7 +517,7 @@ public:
void addAreaName(const TQRect &_rect,const TQString & name,const TQString & sheetName);
const TQValueList<Reference> & listArea();
void removeArea( const TQString &name);
KCompletion & completion();
TDECompletion & completion();
void addStringCompletion(const TQString & stringCompletion);

void changeAreaSheetName(const TQString & oldName,const TQString &sheetName);


+ 1
- 1
kspread/kspread_editors.h View File

@@ -279,7 +279,7 @@ protected:
virtual void keyPressEvent( TQKeyEvent * _ev );
private:
View * m_pView;
KCompletion completionList;
TDECompletion completionList;
bool activateItem();
};



+ 1
- 1
lib/koproperty/editors/combobox.cpp View File

@@ -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);
}


+ 2
- 2
lib/kotext/KoAutoFormat.cpp View File

@@ -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 );
}


+ 3
- 3
lib/kotext/KoAutoFormat.h View File

@@ -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;


Loading…
Cancel
Save