diff options
| -rw-r--r-- | src/columnviewsettingspage.cpp | 12 | ||||
| -rw-r--r-- | src/detailsviewsettingspage.cpp | 12 | ||||
| -rw-r--r-- | src/dolphin_columnmodesettings.kcfg | 2 | ||||
| -rw-r--r-- | src/dolphin_detailsmodesettings.kcfg | 2 | ||||
| -rw-r--r-- | src/dolphin_iconsmodesettings.kcfg | 6 | ||||
| -rw-r--r-- | src/dolphincategorydrawer.cpp | 14 | ||||
| -rw-r--r-- | src/dolphincolumnview.cpp | 14 | ||||
| -rw-r--r-- | src/dolphindetailsview.cpp | 14 | ||||
| -rw-r--r-- | src/dolphiniconsview.cpp | 26 | ||||
| -rw-r--r-- | src/dolphinview.cpp | 4 | ||||
| -rw-r--r-- | src/iconsizedialog.cpp | 38 | ||||
| -rw-r--r-- | src/infosidebarpage.cpp | 12 | ||||
| -rw-r--r-- | src/pixmapviewer.cpp | 4 | ||||
| -rw-r--r-- | src/statusbarmessagelabel.cpp | 2 |
14 files changed, 78 insertions, 84 deletions
diff --git a/src/columnviewsettingspage.cpp b/src/columnviewsettingspage.cpp index 2904465dc..57d246fa2 100644 --- a/src/columnviewsettingspage.cpp +++ b/src/columnviewsettingspage.cpp @@ -114,11 +114,11 @@ void ColumnViewSettingsPage::applySettings() { ColumnModeSettings* settings = DolphinSettings::instance().columnModeSettings(); - int iconSize = K3Icon::SizeSmall; + int iconSize = KIconLoader::SizeSmall; if (m_mediumIconSize->isChecked()) { - iconSize = K3Icon::SizeMedium; + iconSize = KIconLoader::SizeMedium; } else if (m_largeIconSize->isChecked()) { - iconSize = K3Icon::SizeLarge; + iconSize = KIconLoader::SizeLarge; } settings->setIconSize(iconSize); @@ -144,15 +144,15 @@ void ColumnViewSettingsPage::loadSettings() ColumnModeSettings* settings = DolphinSettings::instance().columnModeSettings(); switch (settings->iconSize()) { - case K3Icon::SizeLarge: + case KIconLoader::SizeLarge: m_largeIconSize->setChecked(true); break; - case K3Icon::SizeMedium: + case KIconLoader::SizeMedium: m_mediumIconSize->setChecked(true); break; - case K3Icon::SizeSmall: + case KIconLoader::SizeSmall: default: m_smallIconSize->setChecked(true); } diff --git a/src/detailsviewsettingspage.cpp b/src/detailsviewsettingspage.cpp index 2a635d6d5..c07394d46 100644 --- a/src/detailsviewsettingspage.cpp +++ b/src/detailsviewsettingspage.cpp @@ -123,11 +123,11 @@ void DetailsViewSettingsPage::applySettings() settings->setShowGroup(m_groupBox->isChecked()); settings->setShowType(m_typeBox->isChecked()); - int iconSize = K3Icon::SizeSmall; + int iconSize = KIconLoader::SizeSmall; if (m_mediumIconSize->isChecked()) { - iconSize = K3Icon::SizeMedium; + iconSize = KIconLoader::SizeMedium; } else if (m_largeIconSize->isChecked()) { - iconSize = K3Icon::SizeLarge; + iconSize = KIconLoader::SizeLarge; } settings->setIconSize(iconSize); @@ -156,15 +156,15 @@ void DetailsViewSettingsPage::loadSettings() m_typeBox->setChecked(settings->showType()); switch (settings->iconSize()) { - case K3Icon::SizeLarge: + case KIconLoader::SizeLarge: m_largeIconSize->setChecked(true); break; - case K3Icon::SizeMedium: + case KIconLoader::SizeMedium: m_mediumIconSize->setChecked(true); break; - case K3Icon::SizeSmall: + case KIconLoader::SizeSmall: default: m_smallIconSize->setChecked(true); } diff --git a/src/dolphin_columnmodesettings.kcfg b/src/dolphin_columnmodesettings.kcfg index a5072131d..c57db4073 100644 --- a/src/dolphin_columnmodesettings.kcfg +++ b/src/dolphin_columnmodesettings.kcfg @@ -23,7 +23,7 @@ </entry> <entry name="IconSize" type="Int"> <label context="@label">Icon size</label> - <default code="true">K3Icon::SizeSmall</default> + <default code="true">KIconLoader::SizeSmall</default> </entry> <entry name="ColumnWidth" type="Int"> <label context="@label">Column width</label> diff --git a/src/dolphin_detailsmodesettings.kcfg b/src/dolphin_detailsmodesettings.kcfg index 85795a498..f995d87ea 100644 --- a/src/dolphin_detailsmodesettings.kcfg +++ b/src/dolphin_detailsmodesettings.kcfg @@ -23,7 +23,7 @@ </entry> <entry name="IconSize" type="Int"> <label context="@label">Icon size</label> - <default code="true">K3Icon::SizeSmall</default> + <default code="true">KIconLoader::SizeSmall</default> </entry> <entry name="ShowDate" type="Bool"> <label context="@label">Show date</label> diff --git a/src/dolphin_iconsmodesettings.kcfg b/src/dolphin_iconsmodesettings.kcfg index b4fa14d82..dce32a8b7 100644 --- a/src/dolphin_iconsmodesettings.kcfg +++ b/src/dolphin_iconsmodesettings.kcfg @@ -32,7 +32,7 @@ check 'void IconsViewSettingsPage::applySettings()' as reference (iconsviewsettingspage.cpp): itemHeight += fontHeight * numberOfTextlines + 16; /--> - <default code="true">K3Icon::SizeMedium + (QFontMetrics(KGlobalSettings::generalFont()).height() * 2) + 16</default> + <default code="true">KIconLoader::SizeMedium + (QFontMetrics(KGlobalSettings::generalFont()).height() * 2) + 16</default> </entry> <entry name="ItemWidth" type="Int"> <label context="@label">Item width</label> @@ -48,7 +48,7 @@ </entry> <entry name="IconSize" type="Int"> <label context="@label">Icon size</label> - <default code="true">K3Icon::SizeMedium</default> + <default code="true">KIconLoader::SizeMedium</default> </entry> <entry name="NumberOfTextlines" type="Int"> <label context="@label">Number of textlines</label> @@ -56,7 +56,7 @@ </entry> <entry name="PreviewSize" type="Int"> <label context="@label">Preview size</label> - <default code="true">K3Icon::SizeHuge</default> + <default code="true">KIconLoader::SizeHuge</default> </entry> </group> </kcfg> diff --git a/src/dolphincategorydrawer.cpp b/src/dolphincategorydrawer.cpp index dd2c26bd9..2a9642240 100644 --- a/src/dolphincategorydrawer.cpp +++ b/src/dolphincategorydrawer.cpp @@ -52,7 +52,7 @@ void DolphinCategoryDrawer::drawCategory(const QModelIndex &index, int sortRole, { QRect starRect = option.rect; - int iconSize = KIconLoader::global()->currentSize(K3Icon::Small); + int iconSize = KIconLoader::global()->currentSize(KIconLoader::Small); QVariant categoryVariant = index.model()->data(index, KCategorizedSortFilterProxyModel::CategoryRole); if (!categoryVariant.isValid()) @@ -177,7 +177,7 @@ void DolphinCategoryDrawer::drawCategory(const QModelIndex &index, int sortRole, } else { - icon = KIconLoader::global()->loadIcon("user", K3Icon::NoGroup, option.fontMetrics.height()); + icon = KIconLoader::global()->loadIcon("user", KIconLoader::NoGroup, option.fontMetrics.height()); } opt.rect.setTop(opt.rect.top() - icon.height()); @@ -199,7 +199,7 @@ void DolphinCategoryDrawer::drawCategory(const QModelIndex &index, int sortRole, // so the group icon drawn is that one particularly. This way assures the drawn // icon is the one of the mimetype of the group itself. (ereslibre) icon = KIconLoader::global()->loadMimeTypeIcon(item.mimeTypePtr()->iconName(), - K3Icon::NoGroup, option.fontMetrics.height()); + KIconLoader::NoGroup, option.fontMetrics.height()); opt.rect.setTop(opt.rect.top() - icon.height()); @@ -214,9 +214,9 @@ void DolphinCategoryDrawer::drawCategory(const QModelIndex &index, int sortRole, starRect.setTop(option.rect.top() + (option.rect.height() / 2) - (iconSize / 2)); starRect.setSize(QSize(iconSize, iconSize)); - QPixmap pixmap = KIconLoader::global()->loadIcon("rating", K3Icon::Small); - QPixmap smallPixmap = KIconLoader::global()->loadIcon("rating", K3Icon::NoGroup, iconSize / 2); - QPixmap disabledPixmap = KIconLoader::global()->loadIcon("rating", K3Icon::Small); + QPixmap pixmap = KIconLoader::global()->loadIcon("rating", KIconLoader::Small); + QPixmap smallPixmap = KIconLoader::global()->loadIcon("rating", KIconLoader::NoGroup, iconSize / 2); + QPixmap disabledPixmap = KIconLoader::global()->loadIcon("rating", KIconLoader::Small); QImage img = disabledPixmap.toImage(); Blitz::grayscale(img); @@ -330,7 +330,7 @@ void DolphinCategoryDrawer::drawCategory(const QModelIndex &index, int sortRole, int DolphinCategoryDrawer::categoryHeight(const QStyleOption &option) const { - int iconSize = KIconLoader::global()->currentSize(K3Icon::Small); + int iconSize = KIconLoader::global()->currentSize(KIconLoader::Small); return qMax(option.fontMetrics.height() + (iconSize / 4) * 2 + 2, iconSize + (iconSize / 4) * 2 + 2) /* 2 gradient */; } diff --git a/src/dolphincolumnview.cpp b/src/dolphincolumnview.cpp index e38d08187..7cb87e654 100644 --- a/src/dolphincolumnview.cpp +++ b/src/dolphincolumnview.cpp @@ -734,10 +734,9 @@ void DolphinColumnView::zoomIn() { if (isZoomInPossible()) { ColumnModeSettings* settings = DolphinSettings::instance().columnModeSettings(); - // TODO: get rid of K3Icon sizes switch (settings->iconSize()) { - case K3Icon::SizeSmall: settings->setIconSize(K3Icon::SizeMedium); break; - case K3Icon::SizeMedium: settings->setIconSize(K3Icon::SizeLarge); break; + case KIconLoader::SizeSmall: settings->setIconSize(KIconLoader::SizeMedium); break; + case KIconLoader::SizeMedium: settings->setIconSize(KIconLoader::SizeLarge); break; default: Q_ASSERT(false); break; } updateDecorationSize(); @@ -748,10 +747,9 @@ void DolphinColumnView::zoomOut() { if (isZoomOutPossible()) { ColumnModeSettings* settings = DolphinSettings::instance().columnModeSettings(); - // TODO: get rid of K3Icon sizes switch (settings->iconSize()) { - case K3Icon::SizeLarge: settings->setIconSize(K3Icon::SizeMedium); break; - case K3Icon::SizeMedium: settings->setIconSize(K3Icon::SizeSmall); break; + case KIconLoader::SizeLarge: settings->setIconSize(KIconLoader::SizeMedium); break; + case KIconLoader::SizeMedium: settings->setIconSize(KIconLoader::SizeSmall); break; default: Q_ASSERT(false); break; } updateDecorationSize(); @@ -842,13 +840,13 @@ void DolphinColumnView::slotDirListerCompleted() bool DolphinColumnView::isZoomInPossible() const { ColumnModeSettings* settings = DolphinSettings::instance().columnModeSettings(); - return settings->iconSize() < K3Icon::SizeLarge; + return settings->iconSize() < KIconLoader::SizeLarge; } bool DolphinColumnView::isZoomOutPossible() const { ColumnModeSettings* settings = DolphinSettings::instance().columnModeSettings(); - return settings->iconSize() > K3Icon::SizeSmall; + return settings->iconSize() > KIconLoader::SizeSmall; } void DolphinColumnView::setActiveColumnIndex(int index) diff --git a/src/dolphindetailsview.cpp b/src/dolphindetailsview.cpp index b4f42cf50..1d26f4ec8 100644 --- a/src/dolphindetailsview.cpp +++ b/src/dolphindetailsview.cpp @@ -381,10 +381,9 @@ void DolphinDetailsView::zoomIn() { if (isZoomInPossible()) { DetailsModeSettings* settings = DolphinSettings::instance().detailsModeSettings(); - // TODO: get rid of K3Icon sizes switch (settings->iconSize()) { - case K3Icon::SizeSmall: settings->setIconSize(K3Icon::SizeMedium); break; - case K3Icon::SizeMedium: settings->setIconSize(K3Icon::SizeLarge); break; + case KIconLoader::SizeSmall: settings->setIconSize(KIconLoader::SizeMedium); break; + case KIconLoader::SizeMedium: settings->setIconSize(KIconLoader::SizeLarge); break; default: Q_ASSERT(false); break; } updateDecorationSize(); @@ -395,10 +394,9 @@ void DolphinDetailsView::zoomOut() { if (isZoomOutPossible()) { DetailsModeSettings* settings = DolphinSettings::instance().detailsModeSettings(); - // TODO: get rid of K3Icon sizes switch (settings->iconSize()) { - case K3Icon::SizeLarge: settings->setIconSize(K3Icon::SizeMedium); break; - case K3Icon::SizeMedium: settings->setIconSize(K3Icon::SizeSmall); break; + case KIconLoader::SizeLarge: settings->setIconSize(KIconLoader::SizeMedium); break; + case KIconLoader::SizeMedium: settings->setIconSize(KIconLoader::SizeSmall); break; default: Q_ASSERT(false); break; } updateDecorationSize(); @@ -459,13 +457,13 @@ void DolphinDetailsView::configureColumns(const QPoint& pos) bool DolphinDetailsView::isZoomInPossible() const { DetailsModeSettings* settings = DolphinSettings::instance().detailsModeSettings(); - return settings->iconSize() < K3Icon::SizeLarge; + return settings->iconSize() < KIconLoader::SizeLarge; } bool DolphinDetailsView::isZoomOutPossible() const { DetailsModeSettings* settings = DolphinSettings::instance().detailsModeSettings(); - return settings->iconSize() > K3Icon::SizeSmall; + return settings->iconSize() > KIconLoader::SizeSmall; } void DolphinDetailsView::updateDecorationSize() diff --git a/src/dolphiniconsview.cpp b/src/dolphiniconsview.cpp index 3da04c113..9e2d3ee02 100644 --- a/src/dolphiniconsview.cpp +++ b/src/dolphiniconsview.cpp @@ -303,26 +303,25 @@ bool DolphinIconsView::isZoomInPossible() const { IconsModeSettings* settings = DolphinSettings::instance().iconsModeSettings(); const int size = m_controller->showPreview() ? settings->previewSize() : settings->iconSize(); - return size < K3Icon::SizeEnormous; + return size < KIconLoader::SizeEnormous; } bool DolphinIconsView::isZoomOutPossible() const { IconsModeSettings* settings = DolphinSettings::instance().iconsModeSettings(); const int size = m_controller->showPreview() ? settings->previewSize() : settings->iconSize(); - return size > K3Icon::SizeSmall; + return size > KIconLoader::SizeSmall; } int DolphinIconsView::increasedIconSize(int size) const { - // TODO: get rid of K3Icon sizes int incSize = 0; switch (size) { - case K3Icon::SizeSmall: incSize = K3Icon::SizeSmallMedium; break; - case K3Icon::SizeSmallMedium: incSize = K3Icon::SizeMedium; break; - case K3Icon::SizeMedium: incSize = K3Icon::SizeLarge; break; - case K3Icon::SizeLarge: incSize = K3Icon::SizeHuge; break; - case K3Icon::SizeHuge: incSize = K3Icon::SizeEnormous; break; + case KIconLoader::SizeSmall: incSize = KIconLoader::SizeSmallMedium; break; + case KIconLoader::SizeSmallMedium: incSize = KIconLoader::SizeMedium; break; + case KIconLoader::SizeMedium: incSize = KIconLoader::SizeLarge; break; + case KIconLoader::SizeLarge: incSize = KIconLoader::SizeHuge; break; + case KIconLoader::SizeHuge: incSize = KIconLoader::SizeEnormous; break; default: Q_ASSERT(false); break; } return incSize; @@ -330,14 +329,13 @@ int DolphinIconsView::increasedIconSize(int size) const int DolphinIconsView::decreasedIconSize(int size) const { - // TODO: get rid of K3Icon sizes int decSize = 0; switch (size) { - case K3Icon::SizeSmallMedium: decSize = K3Icon::SizeSmall; break; - case K3Icon::SizeMedium: decSize = K3Icon::SizeSmallMedium; break; - case K3Icon::SizeLarge: decSize = K3Icon::SizeMedium; break; - case K3Icon::SizeHuge: decSize = K3Icon::SizeLarge; break; - case K3Icon::SizeEnormous: decSize = K3Icon::SizeHuge; break; + case KIconLoader::SizeSmallMedium: decSize = KIconLoader::SizeSmall; break; + case KIconLoader::SizeMedium: decSize = KIconLoader::SizeSmallMedium; break; + case KIconLoader::SizeLarge: decSize = KIconLoader::SizeMedium; break; + case KIconLoader::SizeHuge: decSize = KIconLoader::SizeLarge; break; + case KIconLoader::SizeEnormous: decSize = KIconLoader::SizeHuge; break; default: Q_ASSERT(false); break; } return decSize; diff --git a/src/dolphinview.cpp b/src/dolphinview.cpp index 2c02820c4..845220bca 100644 --- a/src/dolphinview.cpp +++ b/src/dolphinview.cpp @@ -524,7 +524,7 @@ void DolphinView::showPreview(const KFileItem& item, const QPixmap& pixmap) const QMimeData* mimeData = QApplication::clipboard()->mimeData(); if (KonqMimeData::decodeIsCutSelection(mimeData) && isCutItem(item)) { KIconEffect iconEffect; - const QPixmap cutPixmap = iconEffect.apply(pixmap, K3Icon::Desktop, K3Icon::DisabledState); + const QPixmap cutPixmap = iconEffect.apply(pixmap, KIconLoader::Desktop, KIconLoader::DisabledState); m_dolphinModel->setData(idx, QIcon(cutPixmap), Qt::DecorationRole); } else { m_dolphinModel->setData(idx, QIcon(pixmap), Qt::DecorationRole); @@ -919,7 +919,7 @@ void DolphinView::applyCutItemEffect() // apply icon effect to the cut item KIconEffect iconEffect; - pixmap = iconEffect.apply(pixmap, K3Icon::Desktop, K3Icon::DisabledState); + pixmap = iconEffect.apply(pixmap, KIconLoader::Desktop, KIconLoader::DisabledState); m_dolphinModel->setData(index, QIcon(pixmap), Qt::DecorationRole); } } diff --git a/src/iconsizedialog.cpp b/src/iconsizedialog.cpp index 75638348c..429f8926b 100644 --- a/src/iconsizedialog.cpp +++ b/src/iconsizedialog.cpp @@ -76,8 +76,8 @@ IconSizeDialog::IconSizeDialog(QWidget* parent) : new QLabel(i18nc("@item:inrange Icon Size", "Large"), iconSizeHBox); m_iconSizeViewer = new PixmapViewer(iconSizeBox, PixmapViewer::SizeTransition); - m_iconSizeViewer->setMinimumWidth(K3Icon::SizeEnormous); - m_iconSizeViewer->setFixedHeight(K3Icon::SizeEnormous); + m_iconSizeViewer->setMinimumWidth(KIconLoader::SizeEnormous); + m_iconSizeViewer->setFixedHeight(KIconLoader::SizeEnormous); QPalette p = m_iconSizeViewer->palette(); p.setColor(m_iconSizeViewer->backgroundRole(), iconBackgroundColor); m_iconSizeViewer->setPalette(p); @@ -104,8 +104,8 @@ IconSizeDialog::IconSizeDialog(QWidget* parent) : new QLabel(i18nc("@item:inrange Preview Size", "Large"), previewSizeHBox); m_previewSizeViewer = new PixmapViewer(previewSizeBox, PixmapViewer::SizeTransition); - m_previewSizeViewer->setMinimumWidth(K3Icon::SizeEnormous); - m_previewSizeViewer->setFixedHeight(K3Icon::SizeEnormous); + m_previewSizeViewer->setMinimumWidth(KIconLoader::SizeEnormous); + m_previewSizeViewer->setFixedHeight(KIconLoader::SizeEnormous); p = m_previewSizeViewer->palette(); p.setColor(m_previewSizeViewer->backgroundRole(), iconBackgroundColor); m_previewSizeViewer->setPalette(p); @@ -142,7 +142,7 @@ void IconSizeDialog::slotButtonClicked(int button) void IconSizeDialog::updateIconSize(int value) { - m_iconSizeViewer->setPixmap(KIconLoader::global()->loadIcon("folder", K3Icon::Desktop, iconSize(value))); + m_iconSizeViewer->setPixmap(KIconLoader::global()->loadIcon("folder", KIconLoader::Desktop, iconSize(value))); if (m_previewSizeSlider != 0) { updatePreviewSize(m_previewSizeSlider->value()); } @@ -155,19 +155,19 @@ void IconSizeDialog::updatePreviewSize(int value) // assure that the preview size is never smaller than the icon size value = iconSizeValue; } - m_previewSizeViewer->setPixmap(KIconLoader::global()->loadIcon("preview", K3Icon::Desktop, iconSize(value))); + m_previewSizeViewer->setPixmap(KIconLoader::global()->loadIcon("preview", KIconLoader::Desktop, iconSize(value))); } int IconSizeDialog::iconSize(int sliderValue) const { - int size = K3Icon::SizeMedium; + int size = KIconLoader::SizeMedium; switch (sliderValue) { - case 0: size = K3Icon::SizeSmall; break; - case 1: size = K3Icon::SizeSmallMedium; break; - case 2: size = K3Icon::SizeMedium; break; - case 3: size = K3Icon::SizeLarge; break; - case 4: size = K3Icon::SizeHuge; break; - case 5: size = K3Icon::SizeEnormous; break; + case 0: size = KIconLoader::SizeSmall; break; + case 1: size = KIconLoader::SizeSmallMedium; break; + case 2: size = KIconLoader::SizeMedium; break; + case 3: size = KIconLoader::SizeLarge; break; + case 4: size = KIconLoader::SizeHuge; break; + case 5: size = KIconLoader::SizeEnormous; break; } return size; } @@ -176,12 +176,12 @@ int IconSizeDialog::sliderValue(int iconSize) const { int value = 0; switch (iconSize) { - case K3Icon::SizeSmall: value = 0; break; - case K3Icon::SizeSmallMedium: value = 1; break; - case K3Icon::SizeMedium: value = 2; break; - case K3Icon::SizeLarge: value = 3; break; - case K3Icon::SizeHuge: value = 4; break; - case K3Icon::SizeEnormous: value = 5; break; + case KIconLoader::SizeSmall: value = 0; break; + case KIconLoader::SizeSmallMedium: value = 1; break; + case KIconLoader::SizeMedium: value = 2; break; + case KIconLoader::SizeLarge: value = 3; break; + case KIconLoader::SizeHuge: value = 4; break; + case KIconLoader::SizeEnormous: value = 5; break; default: break; } return value; diff --git a/src/infosidebarpage.cpp b/src/infosidebarpage.cpp index 319582cb4..8ef1d3525 100644 --- a/src/infosidebarpage.cpp +++ b/src/infosidebarpage.cpp @@ -66,8 +66,8 @@ InfoSidebarPage::InfoSidebarPage(QWidget* parent) : // preview m_preview = new PixmapViewer(this); - m_preview->setMinimumWidth(K3Icon::SizeEnormous); - m_preview->setFixedHeight(K3Icon::SizeEnormous); + m_preview->setMinimumWidth(KIconLoader::SizeEnormous); + m_preview->setFixedHeight(KIconLoader::SizeEnormous); // name m_nameLabel = new QLabel(this); @@ -188,8 +188,8 @@ void InfoSidebarPage::showItemInfo() if (itemCount > 1) { KIconLoader iconLoader; QPixmap icon = iconLoader.loadIcon("exec", - K3Icon::NoGroup, - K3Icon::SizeEnormous); + KIconLoader::NoGroup, + KIconLoader::SizeEnormous); m_preview->setPixmap(icon); m_nameLabel->setText(i18ncp("@info", "%1 item selected", "%1 items selected", selectedItems.count())); } else if (!applyPlace(file)) { @@ -202,7 +202,7 @@ void InfoSidebarPage::showItemInfo() KIO::PreviewJob* job = KIO::filePreview(list, m_preview->width(), - K3Icon::SizeEnormous, + KIconLoader::SizeEnormous, 0, 0, true, @@ -233,7 +233,7 @@ void InfoSidebarPage::showIcon(const KFileItem& item) { m_pendingPreview = false; if (!applyPlace(item.url())) { - m_preview->setPixmap(item.pixmap(K3Icon::SizeEnormous)); + m_preview->setPixmap(item.pixmap(KIconLoader::SizeEnormous)); } } diff --git a/src/pixmapviewer.cpp b/src/pixmapviewer.cpp index 2fe8c0c2e..a7a593bb0 100644 --- a/src/pixmapviewer.cpp +++ b/src/pixmapviewer.cpp @@ -30,8 +30,8 @@ PixmapViewer::PixmapViewer(QWidget* parent, Transition transition) : m_transition(transition), m_animationStep(0) { - setMinimumWidth(K3Icon::SizeEnormous); - setMinimumHeight(K3Icon::SizeEnormous); + setMinimumWidth(KIconLoader::SizeEnormous); + setMinimumHeight(KIconLoader::SizeEnormous); m_animation.setDuration(150); m_animation.setCurveShape(QTimeLine::LinearCurve); diff --git a/src/statusbarmessagelabel.cpp b/src/statusbarmessagelabel.cpp index 8f5f2096e..a32d259fc 100644 --- a/src/statusbarmessagelabel.cpp +++ b/src/statusbarmessagelabel.cpp @@ -42,7 +42,7 @@ StatusBarMessageLabel::StatusBarMessageLabel(QWidget* parent) : m_timer(0), m_closeButton(0) { - setMinimumHeight(K3Icon::SizeSmall); + setMinimumHeight(KIconLoader::SizeSmall); QPalette palette; palette.setColor(QPalette::Background, Qt::transparent); |