diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:43:14 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:43:14 -0600 |
| commit | 79b21d47bce1ee428affc97534cd8b257232a871 (patch) | |
| tree | 0df1fa0109d9f2bcef932eda8b5c25b2e06669ed /konqueror/konq_combo.cc | |
| parent | 9a898d493f493adbc404f7223043c85f3817472b (diff) | |
| download | tdebase-79b21d47bce1ee428affc97534cd8b257232a871.tar.gz tdebase-79b21d47bce1ee428affc97534cd8b257232a871.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'konqueror/konq_combo.cc')
| -rw-r--r-- | konqueror/konq_combo.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/konqueror/konq_combo.cc b/konqueror/konq_combo.cc index dd1e7fe40..4edce07ad 100644 --- a/konqueror/konq_combo.cc +++ b/konqueror/konq_combo.cc @@ -568,7 +568,7 @@ void KonqCombo::mouseMoveEvent( TQMouseEvent *e ) if ( e->state() & Qt::LeftButton && (e->pos() - m_dragStart).manhattanLength() > - KGlobalSettings::dndEventDelay() ) + TDEGlobalSettings::dndEventDelay() ) { KURL url = KURL::fromPathOrURL( currentText() ); if ( url.isValid() ) @@ -733,7 +733,7 @@ void KonqComboListBoxPixmap::paint( TQPainter *painter ) painter->drawText( pmWidth, 0, urlWidth + pmWidth, itemHeight, Qt::AlignLeft | Qt::AlignTop, squeezedText ); - //painter->setPen( KGlobalSettings::inactiveTextColor() ); + //painter->setPen( TDEGlobalSettings::inactiveTextColor() ); squeezedText = KStringHandler::rPixelSqueeze( title, listBox()->fontMetrics(), titleWidth ); TQFont font = painter->font(); font.setItalic( true ); |