diff options
| author | Timothy Pearson <[email protected]> | 2013-02-04 14:08:44 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-02-04 14:08:44 -0600 |
| commit | e3c309e27d0fa1b9e425700d98bdd5436b95500b (patch) | |
| tree | a6a64d7746cbf6f01bed0a653c0482285dc6c709 | |
| parent | ebdb595c7ff4bda884abde1eef41ff390efe1b96 (diff) | |
| download | qt4-tqt-theme-engine-e3c309e27d0fa1b9e425700d98bdd5436b95500b.tar.gz qt4-tqt-theme-engine-e3c309e27d0fa1b9e425700d98bdd5436b95500b.zip | |
Rename KIcon to enhance compatibility with KDE4
| -rw-r--r-- | plugin/simplestyle.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/plugin/simplestyle.cpp b/plugin/simplestyle.cpp index 74158f8..cee6ab1 100644 --- a/plugin/simplestyle.cpp +++ b/plugin/simplestyle.cpp @@ -171,7 +171,7 @@ Qt4TDEStyle::Qt4TDEStyle() : m_aboutData(NULL), m_tqApplication(NULL), m_tdeAppl } // Set the Qt4 icon set to the TDE icon set - QIcon::setThemeName(convertTQt3ToQt4String(KIconTheme::current())); + QIcon::setThemeName(convertTQt3ToQt4String(TDEIconTheme::current())); // Set the Qt4 default font QApplication::setFont(convertTQt3ToQt4Font(TQApplication::font())); @@ -180,16 +180,16 @@ Qt4TDEStyle::Qt4TDEStyle() : m_aboutData(NULL), m_tqApplication(NULL), m_tdeAppl // FIXME // m_tqt3DialogButtons_ShowIcons, m_tqt3IconSize_MenuItem, and m_tqt3IconSize_Large are still hardcoded // Verify all mappings - m_tqt3IconSize_NoGroup = IconSize(KIcon::NoGroup); - m_tqt3IconSize_Desktop = IconSize(KIcon::Desktop); - m_tqt3IconSize_FirstGroup = IconSize(KIcon::FirstGroup); - m_tqt3IconSize_Toolbar = IconSize(KIcon::Toolbar); - m_tqt3IconSize_MainToolbar = IconSize(KIcon::MainToolbar); - m_tqt3IconSize_Small = IconSize(KIcon::Small); + m_tqt3IconSize_NoGroup = IconSize(TDEIcon::NoGroup); + m_tqt3IconSize_Desktop = IconSize(TDEIcon::Desktop); + m_tqt3IconSize_FirstGroup = IconSize(TDEIcon::FirstGroup); + m_tqt3IconSize_Toolbar = IconSize(TDEIcon::Toolbar); + m_tqt3IconSize_MainToolbar = IconSize(TDEIcon::MainToolbar); + m_tqt3IconSize_Small = IconSize(TDEIcon::Small); m_tqt3IconSize_Large = 32; - m_tqt3IconSize_Panel = IconSize(KIcon::Panel); - m_tqt3IconSize_LastGroup = IconSize(KIcon::LastGroup); - m_tqt3IconSize_User = IconSize(KIcon::User); + m_tqt3IconSize_Panel = IconSize(TDEIcon::Panel); + m_tqt3IconSize_LastGroup = IconSize(TDEIcon::LastGroup); + m_tqt3IconSize_User = IconSize(TDEIcon::User); m_tqt3IconSize_MenuItem = 16; m_tqt3IconSize_Tabbar = m_tqt3IconSize_MenuItem; m_tqt3IconSize_Listview = m_tqt3IconSize_MenuItem; @@ -634,7 +634,7 @@ QIcon Qt4TDEStyle::standardIconImplementation(StandardPixmap standardIcon, const } else if (retswitch == 3) { // convert string to icon - reticon = QIcon(convertTQt3ToQt4String(TDEGlobal::iconLoader()->iconPath(iconLookupName, KIcon::Desktop, true))); + reticon = QIcon(convertTQt3ToQt4String(TDEGlobal::iconLoader()->iconPath(iconLookupName, TDEIcon::Desktop, true))); } else { // Tell Qt4 to get the information |