diff options
author | Timothy Pearson <[email protected]> | 2013-02-04 14:09:06 -0600 |
---|---|---|
committer | Timothy Pearson <[email protected]> | 2013-02-04 14:09:06 -0600 |
commit | af2cf87ad7298281a262208f4397132d7e10ac63 (patch) | |
tree | 177c390a6e5256a088eb1286042af45af3b47453 | |
parent | cd7745fcd06d293c907ebb02c366a20413c1a0bc (diff) | |
download | rosegarden-af2cf87ad7298281a262208f4397132d7e10ac63.tar.gz rosegarden-af2cf87ad7298281a262208f4397132d7e10ac63.zip |
Rename KIcon to enhance compatibility with KDE4
-rw-r--r-- | src/gui/dialogs/ConfigureDialog.cpp | 2 | ||||
-rw-r--r-- | src/gui/dialogs/DocumentConfigureDialog.cpp | 2 | ||||
-rw-r--r-- | src/gui/general/EditView.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/gui/dialogs/ConfigureDialog.cpp b/src/gui/dialogs/ConfigureDialog.cpp index 118f5ba..42276b6 100644 --- a/src/gui/dialogs/ConfigureDialog.cpp +++ b/src/gui/dialogs/ConfigureDialog.cpp @@ -54,7 +54,7 @@ static TQPixmap loadIcon(const char *name) return TQPixmap(fileBase + ".xpm"); } TQPixmap pmap = TDEGlobal::instance()->iconLoader() - ->loadIcon(TQString::fromLatin1(name), KIcon::NoGroup, KIcon::SizeMedium); + ->loadIcon(TQString::fromLatin1(name), TDEIcon::NoGroup, TDEIcon::SizeMedium); return pmap; } diff --git a/src/gui/dialogs/DocumentConfigureDialog.cpp b/src/gui/dialogs/DocumentConfigureDialog.cpp index 52d5e5f..bff4531 100644 --- a/src/gui/dialogs/DocumentConfigureDialog.cpp +++ b/src/gui/dialogs/DocumentConfigureDialog.cpp @@ -53,7 +53,7 @@ static TQPixmap loadIcon(const char *name) } TQPixmap pmap = TDEGlobal::instance()->iconLoader() - ->loadIcon(TQString::fromLatin1(name), KIcon::NoGroup, KIcon::SizeMedium); + ->loadIcon(TQString::fromLatin1(name), TDEIcon::NoGroup, TDEIcon::SizeMedium); return pmap; } diff --git a/src/gui/general/EditView.cpp b/src/gui/general/EditView.cpp index 7c75195..551e48a 100644 --- a/src/gui/general/EditView.cpp +++ b/src/gui/general/EditView.cpp @@ -360,7 +360,7 @@ void EditView::addPropertyBox(TQWidget *w) void EditView::addControlRuler(ControlRuler* ruler) { ruler->setWorldMatrix(m_currentRulerZoomMatrix); - m_controlRulers->addTab(ruler, TDEGlobal::iconLoader()->loadIconSet("fileclose", KIcon::Small), + m_controlRulers->addTab(ruler, TDEGlobal::iconLoader()->loadIconSet("fileclose", TDEIcon::Small), ruler->getName()); m_controlRulers->showPage(ruler); |