diff options
author | Timothy Pearson <[email protected]> | 2013-02-04 14:01:06 -0600 |
---|---|---|
committer | Timothy Pearson <[email protected]> | 2013-02-04 14:01:06 -0600 |
commit | 8773bce422c47cf1bd4049d82952c93e7bdb029d (patch) | |
tree | bb559831f6514727d944233fb41da9a2e8c6f00d /src/dolphiniconsviewsettings.cpp | |
parent | 32932d14f9b794773c7eb4deb33777248065a37c (diff) | |
download | dolphin-8773bce422c47cf1bd4049d82952c93e7bdb029d.tar.gz dolphin-8773bce422c47cf1bd4049d82952c93e7bdb029d.zip |
Rename KIcon to enhance compatibility with KDE4
Diffstat (limited to 'src/dolphiniconsviewsettings.cpp')
-rw-r--r-- | src/dolphiniconsviewsettings.cpp | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/src/dolphiniconsviewsettings.cpp b/src/dolphiniconsviewsettings.cpp index 6b3e9c5..60d41ec 100644 --- a/src/dolphiniconsviewsettings.cpp +++ b/src/dolphiniconsviewsettings.cpp @@ -27,10 +27,10 @@ DolphinIconsViewSettings::DolphinIconsViewSettings(DolphinIconsView::LayoutMode mode) : m_arrangement(TQIconView::LeftToRight), m_layoutMode(mode), - m_iconSize(KIcon::SizeMedium), - m_previewSize(KIcon::SizeMedium), + m_iconSize(TDEIcon::SizeMedium), + m_previewSize(TDEIcon::SizeMedium), m_gridWidth(0), - m_gridHeight(KIcon::SizeMedium), + m_gridHeight(TDEIcon::SizeMedium), m_gridSpacing(8), m_fontSize(0), m_textlinesCount(2) @@ -41,7 +41,7 @@ DolphinIconsViewSettings::DolphinIconsViewSettings(DolphinIconsView::LayoutMode // read icon size m_iconSize = config->readNumEntry("Icon Size", -1); if (m_iconSize < 0) { - m_iconSize = KIcon::SizeMedium; + m_iconSize = TDEIcon::SizeMedium; } // read arrangement @@ -61,14 +61,14 @@ DolphinIconsViewSettings::DolphinIconsViewSettings(DolphinIconsView::LayoutMode if (mode == DolphinIconsView::Previews) { if (m_previewSize < 0) { - m_previewSize = KIcon::SizeEnormous; + m_previewSize = TDEIcon::SizeEnormous; } if (m_gridWidth < 0) { m_gridWidth = m_previewSize + (m_previewSize / 2); } } else if (m_gridWidth < 0) { - m_gridWidth = m_iconSize + (m_iconSize / 2) + (KIcon::SizeLarge * 2); + m_gridWidth = m_iconSize + (m_iconSize / 2) + (TDEIcon::SizeLarge * 2); } if (m_gridHeight < 0) { @@ -142,14 +142,14 @@ void DolphinIconsViewSettings::calculateGridSize(int hint) const int maxSize = (m_previewSize > m_iconSize) ? m_previewSize : m_iconSize; if (m_arrangement == TQIconView::LeftToRight) { int widthUnit = maxSize + (maxSize / 2); - if (widthUnit < KIcon::SizeLarge) { - widthUnit = KIcon::SizeLarge; + if (widthUnit < TDEIcon::SizeLarge) { + widthUnit = TDEIcon::SizeLarge; } - //m_gridWidth = widthUnit + hint * KIcon::SizeLarge; - m_gridWidth = widthUnit + hint * KIcon::SizeLarge; + //m_gridWidth = widthUnit + hint * TDEIcon::SizeLarge; + m_gridWidth = widthUnit + hint * TDEIcon::SizeLarge; m_gridHeight = m_iconSize; - if (m_gridHeight <= KIcon::SizeMedium) { + if (m_gridHeight <= TDEIcon::SizeMedium) { m_gridHeight = m_gridHeight * 2; } else { @@ -172,10 +172,10 @@ int DolphinIconsViewSettings::textWidthHint() const int hint = 0; if (m_arrangement == TQIconView::LeftToRight) { int widthUnit = maxSize + (maxSize / 2); - if (widthUnit < KIcon::SizeLarge) { - widthUnit = KIcon::SizeLarge; + if (widthUnit < TDEIcon::SizeLarge) { + widthUnit = TDEIcon::SizeLarge; } - hint = (m_gridWidth - widthUnit) / KIcon::SizeLarge; + hint = (m_gridWidth - widthUnit) / TDEIcon::SizeLarge; } else { assert(m_arrangement == TQIconView::TopToBottom); |