diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:47:22 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:47:22 -0600 |
| commit | 28edc0aa2ab09297288186f5bc15765eb7be58c0 (patch) | |
| tree | 7b7a01768b3781763186c825af21bb14717d2c32 /khtml/rendering | |
| parent | 07c48c43ff72c237e4028154f4594102b798073f (diff) | |
| download | tdelibs-28edc0aa2ab09297288186f5bc15765eb7be58c0.tar.gz tdelibs-28edc0aa2ab09297288186f5bc15765eb7be58c0.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'khtml/rendering')
| -rw-r--r-- | khtml/rendering/render_form.cpp | 2 | ||||
| -rw-r--r-- | khtml/rendering/render_replaced.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/khtml/rendering/render_form.cpp b/khtml/rendering/render_form.cpp index a0ac7b732..81005de85 100644 --- a/khtml/rendering/render_form.cpp +++ b/khtml/rendering/render_form.cpp @@ -783,7 +783,7 @@ RenderFileButton::RenderFileButton(HTMLInputElementImpl *element) KURLRequester* w = new KURLRequester( view()->viewport(), "__khtml" ); w->setMode(KFile::File | KFile::ExistingOnly); - w->completionObject()->setDir(KGlobalSettings::documentPath()); + w->completionObject()->setDir(TDEGlobalSettings::documentPath()); connect(w->lineEdit(), TQT_SIGNAL(returnPressed()), this, TQT_SLOT(slotReturnPressed())); connect(w->lineEdit(), TQT_SIGNAL(textChanged(const TQString &)),this,TQT_SLOT(slotTextChanged(const TQString &))); diff --git a/khtml/rendering/render_replaced.cpp b/khtml/rendering/render_replaced.cpp index 6d6823455..319f842e7 100644 --- a/khtml/rendering/render_replaced.cpp +++ b/khtml/rendering/render_replaced.cpp @@ -272,7 +272,7 @@ void RenderWidget::updateFromElement() if ( color.isValid() || backgroundColor.isValid() ) { TQPalette pal(TQApplication::palette(m_widget)); - int contrast_ = KGlobalSettings::contrast(); + int contrast_ = TDEGlobalSettings::contrast(); int highlightVal = 100 + (2*contrast_+4)*16/10; int lowlightVal = 100 + (2*contrast_+4)*10; |