diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:23:24 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:23:24 -0600 |
| commit | 5b8ab149469c8e186ee8b05d90c0103ae722dd85 (patch) | |
| tree | fb31321c80b12ee8e2237bdcf8c228fe44e67772 /kexi/widget/relations | |
| parent | fe33d391dd7c9da0f83e779344a17e2e445b70a8 (diff) | |
| download | koffice-5b8ab149469c8e186ee8b05d90c0103ae722dd85.tar.gz koffice-5b8ab149469c8e186ee8b05d90c0103ae722dd85.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kexi/widget/relations')
| -rw-r--r-- | kexi/widget/relations/kexirelationview.cpp | 2 | ||||
| -rw-r--r-- | kexi/widget/relations/kexirelationviewtable.cpp | 16 |
2 files changed, 9 insertions, 9 deletions
diff --git a/kexi/widget/relations/kexirelationview.cpp b/kexi/widget/relations/kexirelationview.cpp index 378d2580..a3ce7632 100644 --- a/kexi/widget/relations/kexirelationview.cpp +++ b/kexi/widget/relations/kexirelationview.cpp @@ -430,7 +430,7 @@ KexiRelationView::keyPressEvent(TQKeyEvent *ev) { kdDebug() << "KexiRelationView::keyPressEvent()" << endl; - if (ev->key()==KGlobalSettings::contextMenuKey()) { + if (ev->key()==TDEGlobalSettings::contextMenuKey()) { if (m_selectedConnection) { emit connectionContextMenuRequest( mapToGlobal(m_selectedConnection->connectionRect().center()) ); diff --git a/kexi/widget/relations/kexirelationviewtable.cpp b/kexi/widget/relations/kexirelationviewtable.cpp index ce94a809..426edf71 100644 --- a/kexi/widget/relations/kexirelationviewtable.cpp +++ b/kexi/widget/relations/kexirelationviewtable.cpp @@ -135,8 +135,8 @@ void KexiRelationViewTableContainer::setFocus() m_tableHeader->setFocus(); m_tableView->setFocus(); /* TQPalette p = tqApp->palette(); - p.setColor( TQPalette::Active, TQColorGroup::Highlight, KGlobalSettings::highlightColor() ); - p.setColor( TQPalette::Active, TQColorGroup::HighlightedText, KGlobalSettings::highlightedTextColor() ); + p.setColor( TQPalette::Active, TQColorGroup::Highlight, TDEGlobalSettings::highlightColor() ); + p.setColor( TQPalette::Active, TQColorGroup::HighlightedText, TDEGlobalSettings::highlightedTextColor() ); m_tableView->setPalette(p);*/ raise(); @@ -156,8 +156,8 @@ void KexiRelationViewTableContainer::unsetFocus() // m_tableView->unsetPalette(); /* TQPalette p = m_tableView->palette(); -// p.setColor( TQPalette::Active, TQColorGroup::Highlight, KGlobalSettings::highlightColor() ); -// p.setColor( TQPalette::Active, TQColorGroup::HighlightedText, KGlobalSettings::highlightedTextColor() ); +// p.setColor( TQPalette::Active, TQColorGroup::Highlight, TDEGlobalSettings::highlightColor() ); +// p.setColor( TQPalette::Active, TQColorGroup::HighlightedText, TDEGlobalSettings::highlightedTextColor() ); p.setColor( TQPalette::Active, TQColorGroup::Highlight, p.color(TQPalette::Active, TQColorGroup::Background ) ); // p.setColor( TQPalette::Active, TQColorGroup::Highlight, gray ); p.setColor( TQPalette::Active, TQColorGroup::HighlightedText, p.color(TQPalette::Active, TQColorGroup::Foreground ) ); @@ -180,10 +180,10 @@ KexiRelationViewTableContainerHeader::KexiRelationViewTableContainerHeader( :TQLabel(text,parent),m_dragging(false) { setMargin(1); - m_activeBG = KGlobalSettings::activeTitleColor(); - m_activeFG = KGlobalSettings::activeTextColor(); - m_inactiveBG = KGlobalSettings::inactiveTitleColor(); - m_inactiveFG = KGlobalSettings::inactiveTextColor(); + m_activeBG = TDEGlobalSettings::activeTitleColor(); + m_activeFG = TDEGlobalSettings::activeTextColor(); + m_inactiveBG = TDEGlobalSettings::inactiveTitleColor(); + m_inactiveFG = TDEGlobalSettings::inactiveTextColor(); installEventFilter(this); } |