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 /kmdi | |
| parent | 07c48c43ff72c237e4028154f4594102b798073f (diff) | |
| download | tdelibs-28edc0aa2ab09297288186f5bc15765eb7be58c0.tar.gz tdelibs-28edc0aa2ab09297288186f5bc15765eb7be58c0.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kmdi')
| -rw-r--r-- | kmdi/kmdi/dockcontainer.cpp | 2 | ||||
| -rw-r--r-- | kmdi/kmdichildarea.cpp | 16 | ||||
| -rw-r--r-- | kmdi/kmdichildarea.h | 4 | ||||
| -rw-r--r-- | kmdi/kmdidockcontainer.cpp | 2 |
4 files changed, 12 insertions, 12 deletions
diff --git a/kmdi/kmdi/dockcontainer.cpp b/kmdi/kmdi/dockcontainer.cpp index 65433cfaa..79e319964 100644 --- a/kmdi/kmdi/dockcontainer.cpp +++ b/kmdi/kmdi/dockcontainer.cpp @@ -278,7 +278,7 @@ bool DockContainer::eventFilter( TQObject *obj, TQEvent *event ) case TQEvent::MouseMove: if (m_movingState==WaitingForMoveStart) { TQPoint p( ((TQMouseEvent*)event)->pos() - m_startEvent->pos() ); - if( p.manhattanLength() > KGlobalSettings::dndEventDelay()) { + if( p.manhattanLength() > TDEGlobalSettings::dndEventDelay()) { m_dockManager->eventFilter(m_dragPanel,TQT_TQEVENT(m_startEvent)); m_dockManager->eventFilter(m_dragPanel,event); m_movingState=Moving; diff --git a/kmdi/kmdichildarea.cpp b/kmdi/kmdichildarea.cpp index fe28fdff9..342fbdd9c 100644 --- a/kmdi/kmdichildarea.cpp +++ b/kmdi/kmdichildarea.cpp @@ -52,10 +52,10 @@ KMdiChildArea::KMdiChildArea( TQWidget *parent ) m_captionFont = TQFont(); TQFontMetrics fm( m_captionFont ); m_captionFontLineSpacing = fm.lineSpacing(); - m_captionActiveBackColor = KGlobalSettings::activeTitleColor(); - m_captionActiveForeColor = KGlobalSettings::activeTextColor(); - m_captionInactiveBackColor = KGlobalSettings::inactiveTitleColor(); - m_captionInactiveForeColor = KGlobalSettings::inactiveTextColor(); + m_captionActiveBackColor = TDEGlobalSettings::activeTitleColor(); + m_captionActiveForeColor = TDEGlobalSettings::activeTextColor(); + m_captionInactiveBackColor = TDEGlobalSettings::inactiveTitleColor(); + m_captionInactiveForeColor = TDEGlobalSettings::inactiveTextColor(); m_pZ = new TQPtrList<KMdiChildFrm>; m_pZ->setAutoDelete( true ); setFocusPolicy( TQ_ClickFocus ); @@ -784,10 +784,10 @@ void KMdiChildArea::setMdiCaptionInactiveBackColor( const TQColor& clr ) void KMdiChildArea::getCaptionColors( const TQPalette& /*pal*/, TQColor& activeBG, TQColor& activeFG, TQColor& inactiveBG, TQColor& inactiveFG ) { - activeBG = KGlobalSettings::activeTitleColor(); - activeFG = KGlobalSettings::activeTextColor(); - inactiveBG = KGlobalSettings::inactiveTitleColor(); - inactiveFG = KGlobalSettings::inactiveTextColor(); + activeBG = TDEGlobalSettings::activeTitleColor(); + activeFG = TDEGlobalSettings::activeTextColor(); + inactiveBG = TDEGlobalSettings::inactiveTitleColor(); + inactiveFG = TDEGlobalSettings::inactiveTextColor(); } // kate: space-indent off; replace-tabs off; tab-width 4; indent-mode csands; diff --git a/kmdi/kmdichildarea.h b/kmdi/kmdichildarea.h index 747919a4a..0a6076076 100644 --- a/kmdi/kmdichildarea.h +++ b/kmdi/kmdichildarea.h @@ -188,8 +188,8 @@ public: * This method is useful not only for KMDI child windows. * Colors are returned via activeBG, activeFG, inactiveBG, inactiveFG references. * - * @deprecated Use KGlobalSettings::activeTitleColor(), KGlobalSettings::activeTextColor(), - * KGlobalSettings::inactiveTitleColor() and KGlobalSettings::inactiveTextColor() instead. + * @deprecated Use TDEGlobalSettings::activeTitleColor(), TDEGlobalSettings::activeTextColor(), + * TDEGlobalSettings::inactiveTitleColor() and TDEGlobalSettings::inactiveTextColor() instead. */ static void getCaptionColors( const TQPalette &pal, TQColor &activeBG, TQColor &activeFG, TQColor &inactiveBG, TQColor &inactiveFG ) KDE_DEPRECATED; diff --git a/kmdi/kmdidockcontainer.cpp b/kmdi/kmdidockcontainer.cpp index cf7053c51..7c3da3878 100644 --- a/kmdi/kmdidockcontainer.cpp +++ b/kmdi/kmdidockcontainer.cpp @@ -301,7 +301,7 @@ bool KMdiDockContainer::eventFilter( TQObject *obj, TQEvent *event ) if ( m_movingState == WaitingForMoveStart ) { TQPoint p( ( ( TQMouseEvent* ) event )->pos() - m_startEvent->pos() ); - if ( p.manhattanLength() > KGlobalSettings::dndEventDelay() ) + if ( p.manhattanLength() > TDEGlobalSettings::dndEventDelay() ) { m_dockManager->eventFilter( m_dragPanel, TQT_TQEVENT(m_startEvent) ); m_dockManager->eventFilter( m_dragPanel, event ); |