summaryrefslogtreecommitdiffstats
path: root/tdeui/kcolordialog.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-01-24 13:47:22 -0600
committerTimothy Pearson <[email protected]>2013-01-24 13:47:22 -0600
commit28edc0aa2ab09297288186f5bc15765eb7be58c0 (patch)
tree7b7a01768b3781763186c825af21bb14717d2c32 /tdeui/kcolordialog.cpp
parent07c48c43ff72c237e4028154f4594102b798073f (diff)
downloadtdelibs-28edc0aa2ab09297288186f5bc15765eb7be58c0.tar.gz
tdelibs-28edc0aa2ab09297288186f5bc15765eb7be58c0.zip
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'tdeui/kcolordialog.cpp')
-rw-r--r--tdeui/kcolordialog.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/tdeui/kcolordialog.cpp b/tdeui/kcolordialog.cpp
index ec3930fa3..7db3807a7 100644
--- a/tdeui/kcolordialog.cpp
+++ b/tdeui/kcolordialog.cpp
@@ -429,7 +429,7 @@ void KColorCells::mouseMoveEvent( TQMouseEvent *e )
if( !(e->state() & Qt::LeftButton)) return;
if(inMouse) {
- int delay = KGlobalSettings::dndEventDelay();
+ int delay = TDEGlobalSettings::dndEventDelay();
if(e->x() > mPos.x()+delay || e->x() < mPos.x()-delay ||
e->y() > mPos.y()+delay || e->y() < mPos.y()-delay){
// Drag color object
@@ -645,7 +645,7 @@ KPaletteTable::readNamedColor( void )
return; // Strings already present
}
- KGlobal::locale()->insertCatalogue("tdelibs_colors");
+ TDEGlobal::locale()->insertCatalogue("tdelibs_colors");
//
// Code somewhat inspired by KPalette.
@@ -1254,7 +1254,7 @@ void KColorDialog::slotDefaultColorClicked()
void
KColorDialog::readSettings()
{
- KConfigGroup group( KGlobal::config(), "Colors" );
+ KConfigGroup group( TDEGlobal::config(), "Colors" );
TQString palette = group.readEntry("CurrentPalette");
d->table->setPalette(palette);
@@ -1263,7 +1263,7 @@ KColorDialog::readSettings()
void
KColorDialog::slotWriteSettings()
{
- KConfigGroup group( KGlobal::config(), "Colors" );
+ KConfigGroup group( TDEGlobal::config(), "Colors" );
TQString palette = d->table->palette();
if (!group.hasDefault("CurrentPalette") &&