diff options
| author | Timothy Pearson <[email protected]> | 2013-01-24 13:43:14 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-24 13:43:14 -0600 |
| commit | 79b21d47bce1ee428affc97534cd8b257232a871 (patch) | |
| tree | 0df1fa0109d9f2bcef932eda8b5c25b2e06669ed /kicker/taskbar/taskbar.cpp | |
| parent | 9a898d493f493adbc404f7223043c85f3817472b (diff) | |
| download | tdebase-79b21d47bce1ee428affc97534cd8b257232a871.tar.gz tdebase-79b21d47bce1ee428affc97534cd8b257232a871.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kicker/taskbar/taskbar.cpp')
| -rw-r--r-- | kicker/taskbar/taskbar.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/kicker/taskbar/taskbar.cpp b/kicker/taskbar/taskbar.cpp index 131a1d79d..ddeef37a5 100644 --- a/kicker/taskbar/taskbar.cpp +++ b/kicker/taskbar/taskbar.cpp @@ -125,7 +125,7 @@ TaskBar::TaskBar( TaskBarSettings* settingsObject, TQWidget *parent, const char blocklayout = false; connect(kapp, TQT_SIGNAL(settingsChanged(int)), TQT_SLOT(slotSettingsChanged(int))); - keys = new KGlobalAccel( TQT_TQOBJECT(this) ); + keys = new TDEGlobalAccel( TQT_TQOBJECT(this) ); #include "taskbarbindings.cpp" keys->readSettings(); keys->updateConnections(); @@ -172,7 +172,7 @@ TQSize TaskBar::sizeHint() const { // get our minimum height based on the minimum button height or the // height of the font in use, which is largest - TQFontMetrics fm(KGlobalSettings::taskbarFont()); + TQFontMetrics fm(TDEGlobalSettings::taskbarFont()); int minButtonHeight = fm.height() > m_settingsObject->minimumButtonHeight() ? fm.height() : m_settingsObject->minimumButtonHeight(); @@ -183,7 +183,7 @@ TQSize TaskBar::sizeHint( KPanelExtension::Position p, TQSize maxSize) const { // get our minimum height based on the minimum button height or the // height of the font in use, which is largest - TQFontMetrics fm(KGlobalSettings::taskbarFont()); + TQFontMetrics fm(TDEGlobalSettings::taskbarFont()); int minButtonHeight = fm.height() > m_settingsObject->minimumButtonHeight() ? fm.height() : m_settingsObject->minimumButtonHeight(); @@ -710,7 +710,7 @@ void TaskBar::reLayout() // number of rows simply depends on our height which is either the // minimum button height or the height of the font in use, whichever is // largest - TQFontMetrics fm(KGlobalSettings::taskbarFont()); + TQFontMetrics fm(TDEGlobalSettings::taskbarFont()); int minButtonHeight = fm.height() > m_settingsObject->minimumButtonHeight() ? fm.height() : m_settingsObject->minimumButtonHeight(); @@ -970,7 +970,7 @@ int TaskBar::taskCount() const int TaskBar::maximumButtonsWithoutShrinking() const { - TQFontMetrics fm(KGlobalSettings::taskbarFont()); + TQFontMetrics fm(TDEGlobalSettings::taskbarFont()); int minButtonHeight = fm.height() > m_settingsObject->minimumButtonHeight() ? fm.height() : m_settingsObject->minimumButtonHeight(); int rows = contentsRect().height() / minButtonHeight; |