diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-05-05 22:07:15 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-05-05 22:07:15 +0000 |
commit | 421b60af92c83b889f8903c2898f2bd07186fcd8 (patch) | |
tree | ad873a24c9438baed4942fda795430a4c3dc9a9a /kbfxlib/common | |
parent | 39e896bddf25bf34cbf8be814d959181e2c1d1dd (diff) | |
download | kbfx-421b60af92c83b889f8903c2898f2bd07186fcd8.tar.gz kbfx-421b60af92c83b889f8903c2898f2bd07186fcd8.zip |
TQt4 port kbfx
This enables compilation under both Qt3 and Qt4
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kbfx@1230544 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kbfxlib/common')
-rw-r--r-- | kbfxlib/common/kbfxconfig.cpp | 406 | ||||
-rw-r--r-- | kbfxlib/common/kbfxconfig.h | 190 | ||||
-rw-r--r-- | kbfxlib/common/kbfxfontchooser.cpp | 36 | ||||
-rw-r--r-- | kbfxlib/common/kbfxfontchooser.h | 35 | ||||
-rw-r--r-- | kbfxlib/common/kbfxkiodownload.cpp | 10 | ||||
-rw-r--r-- | kbfxlib/common/kbfxkiodownload.h | 17 | ||||
-rw-r--r-- | kbfxlib/common/kbfxpixmaplabel.cpp | 34 | ||||
-rw-r--r-- | kbfxlib/common/kbfxpixmaplabel.h | 21 | ||||
-rw-r--r-- | kbfxlib/common/kbfxplasmapixmapprovider.cpp | 62 | ||||
-rw-r--r-- | kbfxlib/common/kbfxplasmapixmapprovider.h | 22 | ||||
-rw-r--r-- | kbfxlib/common/kbfxpushbutton.cpp | 10 | ||||
-rw-r--r-- | kbfxlib/common/kbfxpushbutton.h | 7 | ||||
-rw-r--r-- | kbfxlib/common/kbfxthemesdata.cpp | 20 | ||||
-rw-r--r-- | kbfxlib/common/kbfxthemesdata.h | 12 |
14 files changed, 443 insertions, 439 deletions
diff --git a/kbfxlib/common/kbfxconfig.cpp b/kbfxlib/common/kbfxconfig.cpp index 15c2590..0b256f2 100644 --- a/kbfxlib/common/kbfxconfig.cpp +++ b/kbfxlib/common/kbfxconfig.cpp @@ -26,11 +26,11 @@ KbfxConfig::KbfxConfig() /* set default configuration values */ /* KBFX internal settings */ - KbfxThemeRcDestination = KGlobal::dirs()->saveLocation ( "data", QString ( "kbfx/themerc/" ), TRUE ); + KbfxThemeRcDestination = KGlobal::dirs()->saveLocation ( "data", TQString ( "kbfx/themerc/" ), TRUE ); KbfxRcPath = KGlobal::dirs()->findResource ( "config", "kbfxrc" ); m_KbfxDeleteOldConf = FALSE; - QString _unspecified = tr2i18n ( "Not Specified" ); - QString path = locate ( "data", "kbfx/skins/default/bg.png" ); + TQString _unspecified = tr2i18n ( "Not Specified" ); + TQString path = locate ( "data", "kbfx/skins/default/bg.png" ); path.remove ( "default/bg.png" ); kdDebug() << "Configuration path skins: " + path << endl; @@ -63,7 +63,7 @@ KbfxConfig::KbfxConfig() m_ToolTipTextDefault = "Application menu"; m_ToolTipAvatarDefault = path + "default/butterfly.png"; m_SpinxTooltipDudeboxDefault = path + "default/tooltip_dudebox.png"; - m_SpinxTooltipMaskDefault = path + "default/tooltip_mask.png"; + m_SpinxTooltipMaskDefault = path + "default/tooltip_tqmask.png"; m_SpinxTooltipWindowDefault = path + "default/tooltip_window.png"; m_SpinxTooltipLogoDefault = path + "default/tooltip_logo.png"; @@ -140,21 +140,21 @@ KbfxConfig::KbfxConfig() m_iconSizeDefault = 32; /* set default fonts values */ - m_fontTooltipColorDefault = QColor ( 0,0,0 ); - m_fontTooltipFontDefault = QFont ( "Arial", 8, QFont::Normal ); - m_fontAppNameColorDefault = QColor ( 0,0,0 ); - m_fontAppNameFontDefault = QFont ( "Arial", 8, QFont::Normal ); - m_fontAppCommentColorDefault = QColor ( 128,125,0 ); - m_fontAppCommentFontDefault = QFont ( "Arial", 8, QFont::Normal ); - m_fontIndexColorDefault = QColor ( 0,0,0 ); - m_fontIndexFontDefault = QFont ( "Arial", 8, QFont::Normal ); - m_userNameColorDefault = QColor ( 255,255,255 ); - m_userNameFontDefault = QFont ( "Arial", 10, QFont::Bold ); - m_sepNameColorDefault = QColor ( 0,0,0 ); - m_sepNameFontDefault = QFont ( "Arial", 8, QFont::Bold ); - m_pluginNameColorDefault = QColor ( 0,0,0 ); - m_pluginNameFontDefault = QFont ( "Arial", 8, QFont::Normal ); - m_lineColorDefault = QColor ( 255,220,125 ); + m_fontTooltipColorDefault = TQColor ( 0,0,0 ); + m_fontTooltipFontDefault = TQFont ( "Arial", 8, TQFont::Normal ); + m_fontAppNameColorDefault = TQColor ( 0,0,0 ); + m_fontAppNameFontDefault = TQFont ( "Arial", 8, TQFont::Normal ); + m_fontAppCommentColorDefault = TQColor ( 128,125,0 ); + m_fontAppCommentFontDefault = TQFont ( "Arial", 8, TQFont::Normal ); + m_fontIndexColorDefault = TQColor ( 0,0,0 ); + m_fontIndexFontDefault = TQFont ( "Arial", 8, TQFont::Normal ); + m_userNameColorDefault = TQColor ( 255,255,255 ); + m_userNameFontDefault = TQFont ( "Arial", 10, TQFont::Bold ); + m_sepNameColorDefault = TQColor ( 0,0,0 ); + m_sepNameFontDefault = TQFont ( "Arial", 8, TQFont::Bold ); + m_pluginNameColorDefault = TQColor ( 0,0,0 ); + m_pluginNameFontDefault = TQFont ( "Arial", 8, TQFont::Normal ); + m_lineColorDefault = TQColor ( 255,220,125 ); m_fontHoverBoldDefault = FALSE; /* set default theme info values */ @@ -208,7 +208,7 @@ void KbfxConfig::setThemeInfoDefault() void KbfxConfig::setThemeDefault() { - /* set default theme layout configuration */ + /* set default theme tqlayout configuration */ m_KbfxNormalButtonPath = m_KbfxNormalButtonPathDefault; m_KbfxHoverButtonPath = m_KbfxHoverButtonPathDefault; m_KbfxPressedButtonPath = m_KbfxPressedButtonPathDefault; @@ -293,11 +293,11 @@ void KbfxConfig::setFontsDefault() m_fontHoverBold = m_fontHoverBoldDefault; } -void KbfxConfig::readThemeInfo ( QString &themePath, QString &themeName ) +void KbfxConfig::readThemeInfo ( TQString &themePath, TQString &themeName ) { setThemeInfoDefault(); - QFileInfo * info_theme = new QFileInfo ( themePath + themeName + "/" + m_KbfxThemesVersion ); + TQFileInfo * info_theme = new TQFileInfo ( themePath + themeName + "/" + m_KbfxThemesVersion ); KConfig * infoconfig = 0; if ( info_theme->exists() == TRUE ) @@ -325,11 +325,11 @@ void KbfxConfig::readThemeInfo ( QString &themePath, QString &themeName ) void KbfxConfig::read() { /* read general configuration */ - KConfigSkeleton *confskel = new KConfigSkeleton ( QString::fromLatin1 ( "kbfxrc" ) ); + KConfigSkeleton *confskel = new KConfigSkeleton ( TQString::tqfromLatin1 ( "kbfxrc" ) ); KConfig *conf = confskel->config(); - QString __default = KGlobal::iconLoader()->iconPath ( "kbfx", ( int ) KIcon::Desktop, FALSE ); + TQString __default = KGlobal::iconLoader()->iconPath ( "kbfx", ( int ) KIcon::Desktop, FALSE ); conf->setGroup ( "KbfxGeneral" ); m_KbfxGeneralVersion = conf->readNumEntry ( "Version", 0 ); @@ -400,7 +400,7 @@ void KbfxConfig::read() } } -void KbfxConfig::readFontrc ( QString & themePath, QString & themeName, bool user_rc ) +void KbfxConfig::readFontrc ( TQString & themePath, TQString & themeName, bool user_rc ) { setFontsDefault(); @@ -411,9 +411,9 @@ void KbfxConfig::readFontrc ( QString & themePath, QString & themeName, bool use themeName = m_SpinxThemeNameDefault; } /* get some font settings from theme file or from theme section */ - QString _abs_path = ""; - QFileInfo * info = new QFileInfo ( themePath + themeName + "/kbfxfontrc" ); - QFileInfo * info_theme = new QFileInfo ( KbfxThemeRcDestination + "/" + themeName + "_fontrc" ); + TQString _abs_path = ""; + TQFileInfo * info = new TQFileInfo ( themePath + themeName + "/kbfxfontrc" ); + TQFileInfo * info_theme = new TQFileInfo ( KbfxThemeRcDestination + "/" + themeName + "_fontrc" ); KConfig * fontconfig = 0; /* if theme kbfxfontrc exists, make its configuration as default values - prefer users' configuration */ @@ -485,9 +485,9 @@ void KbfxConfig::readFontrc ( QString & themePath, QString & themeName, bool use delete fontconfig; } -void KbfxConfig::readThemerc ( QString &themePath, QString &themeName, bool user_rc ) +void KbfxConfig::readThemerc ( TQString &themePath, TQString &themeName, bool user_rc ) { - /* if a new version use default theme layout */ + /* if a new version use default theme tqlayout */ if ( m_KbfxGeneralVersion < m_KbfxGeneralVersionDefault ) { themePath = m_SpinxThemeBasePathDefault; @@ -495,15 +495,15 @@ void KbfxConfig::readThemerc ( QString &themePath, QString &themeName, bool user } /* load theme's on and off buttons if any */ - KbfxOnImg = QPixmap::QPixmap ( KbfxPlasmaPixmapProvider::PixmapPath ( "on", themePath, themeName ) ); - KbfxOffImg = QPixmap::QPixmap ( KbfxPlasmaPixmapProvider::PixmapPath ( "off", themePath, themeName ) ); + KbfxOnImg = TQPixmap::TQPixmap ( KbfxPlasmaPixmapProvider::PixmapPath ( "on", themePath, themeName ) ); + KbfxOffImg = TQPixmap::TQPixmap ( KbfxPlasmaPixmapProvider::PixmapPath ( "off", themePath, themeName ) ); /* use theme's default dude image if any */ - KConfigSkeleton *confskel = new KConfigSkeleton ( QString::fromLatin1 ( "kbfxrc" ) ); + KConfigSkeleton *confskel = new KConfigSkeleton ( TQString::tqfromLatin1 ( "kbfxrc" ) ); KConfig *conf = confskel->config(); - QString __default = KGlobal::iconLoader()->iconPath ( "kbfx", ( int ) KIcon::Desktop, FALSE ); + TQString __default = KGlobal::iconLoader()->iconPath ( "kbfx", ( int ) KIcon::Desktop, FALSE ); - if ( m_SpinxDudeImageDefault == QString::null || !KStandardDirs::exists ( m_SpinxDudeImageDefault ) ) + if ( m_SpinxDudeImageDefault == TQString() || !KStandardDirs::exists ( m_SpinxDudeImageDefault ) ) { m_SpinxDudeImageDefault = KbfxPlasmaPixmapProvider::PixmapPath ( "menu_top_image_person", themePath, themeName ); } @@ -519,19 +519,19 @@ void KbfxConfig::readThemerc ( QString &themePath, QString &themeName, bool user /* load theme's default tooltip images if any */ m_ToolTipAvatarDefault = KbfxPlasmaPixmapProvider::PixmapPath ( "butterfly", themePath, themeName ); m_SpinxTooltipDudeboxDefault = KbfxPlasmaPixmapProvider::PixmapPath ( "tooltip_dudebox", themePath, themeName ); - m_SpinxTooltipMaskDefault = KbfxPlasmaPixmapProvider::PixmapPath ( "tooltip_mask", themePath, themeName ); + m_SpinxTooltipMaskDefault = KbfxPlasmaPixmapProvider::PixmapPath ( "tooltip_tqmask", themePath, themeName ); m_SpinxTooltipWindowDefault = KbfxPlasmaPixmapProvider::PixmapPath ( "tooltip_window", themePath, themeName ); m_SpinxTooltipLogoDefault = KbfxPlasmaPixmapProvider::PixmapPath ( "tooltip_logo", themePath, themeName ); setThemeDefault(); - /* get some theme layout settings from theme file or from theme section */ - QString _abs_path = ""; - QFileInfo * info = new QFileInfo ( themePath + themeName + "/kbfxlayoutrc" ); - QFileInfo * info_theme = new QFileInfo ( KbfxThemeRcDestination + "/" + themeName + "_layoutrc" ); - KConfig *layoutconfig = 0; + /* get some theme tqlayout settings from theme file or from theme section */ + TQString _abs_path = ""; + TQFileInfo * info = new TQFileInfo ( themePath + themeName + "/kbfxtqlayoutrc" ); + TQFileInfo * info_theme = new TQFileInfo ( KbfxThemeRcDestination + "/" + themeName + "_layoutrc" ); + KConfig *tqlayoutconfig = 0; - /* if theme kbfxlayoutrc exists, make its configuration as default values - prefer users' configuration */ + /* if theme kbfxtqlayoutrc exists, make its configuration as default values - prefer users' configuration */ if ( info_theme->exists() == TRUE || info->exists() == TRUE ) { if ( info_theme->exists() == TRUE && m_KbfxGeneralVersion >= m_KbfxGeneralVersionDefault && user_rc ) @@ -543,82 +543,82 @@ void KbfxConfig::readThemerc ( QString &themePath, QString &themeName, bool user _abs_path = info->absFilePath(); } - layoutconfig = new KConfig ( _abs_path ); - - layoutconfig->setGroup ( "KbfxButton" ); - m_KbfxNormalButtonPath = layoutconfig->readEntry ( "Normal", m_KbfxNormalButtonPathDefault ); - m_KbfxHoverButtonPath = layoutconfig->readEntry ( "Hover", m_KbfxHoverButtonPathDefault ); - m_KbfxPressedButtonPath = layoutconfig->readEntry ( "Press", m_KbfxPressedButtonPathDefault ); - m_fadeTime = layoutconfig->readNumEntry ( "FadeTime", m_fadeTimeDefault ); - - layoutconfig->setGroup ( "ToolTip" ); - m_ToolTipAvatar = layoutconfig->readEntry ( "Avatar", m_ToolTipAvatarDefault ); - m_SpinxTooltipDudebox = layoutconfig->readEntry ( "Dudebox", m_SpinxTooltipDudeboxDefault ); - m_SpinxTooltipMask = layoutconfig->readEntry ( "Mask", m_SpinxTooltipMaskDefault ); - m_SpinxTooltipWindow = layoutconfig->readEntry ( "Window", m_SpinxTooltipWindowDefault ); - m_SpinxTooltipLogo = layoutconfig->readEntry ( "Logo", m_SpinxTooltipLogoDefault ); - - layoutconfig->setGroup ( "TopBar" ); - m_facePos_x = layoutconfig->readNumEntry ( "DudeX", m_facePos_xDefault ); - m_facePos_y = layoutconfig->readNumEntry ( "DudeY", m_facePos_yDefault ); - m_faceIconX = layoutconfig->readNumEntry ( "FaceX",m_faceIconXDefault ); - m_faceIconY = layoutconfig->readNumEntry ( "FaceY",m_faceIconYDefault ); - m_faceIconH = layoutconfig->readNumEntry ( "FaceH",m_faceIconHDefault ); - m_faceIconW = layoutconfig->readNumEntry ( "FaceW",m_faceIconWDefault ); - m_userNamePos_x = layoutconfig->readNumEntry ( "UserNameX", m_userNamePos_xDefault ); - m_userNamePos_y = layoutconfig->readNumEntry ( "UserNameY", m_userNamePos_yDefault ); - m_faceBoxHideText= layoutconfig->readBoolEntry ( "DisableUserName", m_faceBoxHideTextDefault ); - m_topBar_h = layoutconfig->readNumEntry ( "Height", m_topBar_hDefault ); - m_topBar_w = layoutconfig->readNumEntry ( "Width", m_topBar_wDefault ); - m_topBar_x = layoutconfig->readNumEntry ( "X", m_topBar_xDefault ); - m_topBar_y = layoutconfig->readNumEntry ( "Y", m_topBar_yDefault ); - - layoutconfig->setGroup ( "BottomBar" ); - m_botBar_h = layoutconfig->readNumEntry ( "Height", m_botBar_hDefault ); - m_botBar_w = layoutconfig->readNumEntry ( "Width", m_botBar_wDefault ); - m_botBar_x = layoutconfig->readNumEntry ( "X", m_botBar_xDefault ); - m_botBar_y = layoutconfig->readNumEntry ( "Y", m_botBar_yDefault ); - - layoutconfig->setGroup ( "Scrollbars" ); - m_scrollBarBotX = layoutconfig->readNumEntry ( "ScrollBarBotX", m_scrollBarBotXDefault ); - m_scrollBarBotY = layoutconfig->readNumEntry ( "ScrollBarBotY", m_scrollBarBotYDefault ); - m_scrollBarTopX = layoutconfig->readNumEntry ( "ScrollBarTopX", m_scrollBarTopXDefault ); - m_scrollBarTopY = layoutconfig->readNumEntry ( "ScrollBarTopY", m_scrollBarTopYDefault ); - - layoutconfig->setGroup ( "ListBox" ); - m_listBox_h = layoutconfig->readNumEntry ( "Height", m_listBox_hDefault ); - m_listBox_w = layoutconfig->readNumEntry ( "Width", m_listBox_wDefault ); - m_listBox_x = layoutconfig->readNumEntry ( "X", m_listBox_xDefault ); - m_listBox_y = layoutconfig->readNumEntry ( "Y", m_listBox_yDefault ); - - layoutconfig->setGroup ( "SearchBox" ); - m_searchBox_h = layoutconfig->readNumEntry ( "Height", m_searchBox_hDefault ); - m_searchBox_w = layoutconfig->readNumEntry ( "Width", m_searchBox_wDefault ); - m_searchBox_x = layoutconfig->readNumEntry ( "X", m_searchBox_xDefault ); - m_searchBox_y = layoutconfig->readNumEntry ( "Y", m_searchBox_yDefault ); - m_searchBox_static = layoutconfig->readBoolEntry ( "FixedPos", m_searchBox_staticDefault ); - - layoutconfig->setGroup ( "ItemView" ); - m_itemView_h = layoutconfig->readNumEntry ( "Height", m_itemView_hDefault ); - m_itemView_w = layoutconfig->readNumEntry ( "Width", m_itemView_wDefault ); - m_itemView_x = layoutconfig->readNumEntry ( "X", m_itemView_xDefault ); - m_itemView_y = layoutconfig->readNumEntry ( "Y", m_itemView_yDefault ); - - layoutconfig->setGroup ( "ToolBar" ); - m_toolBarButtonNormalSize = layoutconfig->readNumEntry ( "ButtonNormalSize", m_toolBarButtonNormalSizeDefault ); - m_toolBarButtonExpandSize = layoutconfig->readNumEntry ( "ButtonPressedSize", m_toolBarButtonExpandSizeDefault ); - - layoutconfig->setGroup ( "MainMenu" ); - m_userMenuHeight = layoutconfig->readNumEntry ( "UserMenuHeight",m_userMenuHeightDefault ); - m_userMenuWidth = layoutconfig->readNumEntry ( "UserMenuWidth",m_userMenuWidthDefault ); - m_startHidden = layoutconfig->readBoolEntry ( "ContractedMenu", m_startHiddenDefault ); - - layoutconfig->setGroup ( "ItemProperties" ); - m_noComments = layoutconfig->readBoolEntry ( "NoComments",m_noCommentsDefault ); - m_commentMargine = layoutconfig->readNumEntry ( "CommentMargin",m_commentMargineDefault ); - m_iconSize = layoutconfig->readNumEntry ( "IconSize",m_iconSizeDefault ); - - kdDebug() << "Read default layout settings for theme: " + tqlayoutconfig = new KConfig ( _abs_path ); + + tqlayoutconfig->setGroup ( "KbfxButton" ); + m_KbfxNormalButtonPath = tqlayoutconfig->readEntry ( "Normal", m_KbfxNormalButtonPathDefault ); + m_KbfxHoverButtonPath = tqlayoutconfig->readEntry ( "Hover", m_KbfxHoverButtonPathDefault ); + m_KbfxPressedButtonPath = tqlayoutconfig->readEntry ( "Press", m_KbfxPressedButtonPathDefault ); + m_fadeTime = tqlayoutconfig->readNumEntry ( "FadeTime", m_fadeTimeDefault ); + + tqlayoutconfig->setGroup ( "ToolTip" ); + m_ToolTipAvatar = tqlayoutconfig->readEntry ( "Avatar", m_ToolTipAvatarDefault ); + m_SpinxTooltipDudebox = tqlayoutconfig->readEntry ( "Dudebox", m_SpinxTooltipDudeboxDefault ); + m_SpinxTooltipMask = tqlayoutconfig->readEntry ( "Mask", m_SpinxTooltipMaskDefault ); + m_SpinxTooltipWindow = tqlayoutconfig->readEntry ( "Window", m_SpinxTooltipWindowDefault ); + m_SpinxTooltipLogo = tqlayoutconfig->readEntry ( "Logo", m_SpinxTooltipLogoDefault ); + + tqlayoutconfig->setGroup ( "TopBar" ); + m_facePos_x = tqlayoutconfig->readNumEntry ( "DudeX", m_facePos_xDefault ); + m_facePos_y = tqlayoutconfig->readNumEntry ( "DudeY", m_facePos_yDefault ); + m_faceIconX = tqlayoutconfig->readNumEntry ( "FaceX",m_faceIconXDefault ); + m_faceIconY = tqlayoutconfig->readNumEntry ( "FaceY",m_faceIconYDefault ); + m_faceIconH = tqlayoutconfig->readNumEntry ( "FaceH",m_faceIconHDefault ); + m_faceIconW = tqlayoutconfig->readNumEntry ( "FaceW",m_faceIconWDefault ); + m_userNamePos_x = tqlayoutconfig->readNumEntry ( "UserNameX", m_userNamePos_xDefault ); + m_userNamePos_y = tqlayoutconfig->readNumEntry ( "UserNameY", m_userNamePos_yDefault ); + m_faceBoxHideText= tqlayoutconfig->readBoolEntry ( "DisableUserName", m_faceBoxHideTextDefault ); + m_topBar_h = tqlayoutconfig->readNumEntry ( "Height", m_topBar_hDefault ); + m_topBar_w = tqlayoutconfig->readNumEntry ( "Width", m_topBar_wDefault ); + m_topBar_x = tqlayoutconfig->readNumEntry ( "X", m_topBar_xDefault ); + m_topBar_y = tqlayoutconfig->readNumEntry ( "Y", m_topBar_yDefault ); + + tqlayoutconfig->setGroup ( "BottomBar" ); + m_botBar_h = tqlayoutconfig->readNumEntry ( "Height", m_botBar_hDefault ); + m_botBar_w = tqlayoutconfig->readNumEntry ( "Width", m_botBar_wDefault ); + m_botBar_x = tqlayoutconfig->readNumEntry ( "X", m_botBar_xDefault ); + m_botBar_y = tqlayoutconfig->readNumEntry ( "Y", m_botBar_yDefault ); + + tqlayoutconfig->setGroup ( "Scrollbars" ); + m_scrollBarBotX = tqlayoutconfig->readNumEntry ( "ScrollBarBotX", m_scrollBarBotXDefault ); + m_scrollBarBotY = tqlayoutconfig->readNumEntry ( "ScrollBarBotY", m_scrollBarBotYDefault ); + m_scrollBarTopX = tqlayoutconfig->readNumEntry ( "ScrollBarTopX", m_scrollBarTopXDefault ); + m_scrollBarTopY = tqlayoutconfig->readNumEntry ( "ScrollBarTopY", m_scrollBarTopYDefault ); + + tqlayoutconfig->setGroup ( "ListBox" ); + m_listBox_h = tqlayoutconfig->readNumEntry ( "Height", m_listBox_hDefault ); + m_listBox_w = tqlayoutconfig->readNumEntry ( "Width", m_listBox_wDefault ); + m_listBox_x = tqlayoutconfig->readNumEntry ( "X", m_listBox_xDefault ); + m_listBox_y = tqlayoutconfig->readNumEntry ( "Y", m_listBox_yDefault ); + + tqlayoutconfig->setGroup ( "SearchBox" ); + m_searchBox_h = tqlayoutconfig->readNumEntry ( "Height", m_searchBox_hDefault ); + m_searchBox_w = tqlayoutconfig->readNumEntry ( "Width", m_searchBox_wDefault ); + m_searchBox_x = tqlayoutconfig->readNumEntry ( "X", m_searchBox_xDefault ); + m_searchBox_y = tqlayoutconfig->readNumEntry ( "Y", m_searchBox_yDefault ); + m_searchBox_static = tqlayoutconfig->readBoolEntry ( "FixedPos", m_searchBox_staticDefault ); + + tqlayoutconfig->setGroup ( "ItemView" ); + m_itemView_h = tqlayoutconfig->readNumEntry ( "Height", m_itemView_hDefault ); + m_itemView_w = tqlayoutconfig->readNumEntry ( "Width", m_itemView_wDefault ); + m_itemView_x = tqlayoutconfig->readNumEntry ( "X", m_itemView_xDefault ); + m_itemView_y = tqlayoutconfig->readNumEntry ( "Y", m_itemView_yDefault ); + + tqlayoutconfig->setGroup ( "ToolBar" ); + m_toolBarButtonNormalSize = tqlayoutconfig->readNumEntry ( "ButtonNormalSize", m_toolBarButtonNormalSizeDefault ); + m_toolBarButtonExpandSize = tqlayoutconfig->readNumEntry ( "ButtonPressedSize", m_toolBarButtonExpandSizeDefault ); + + tqlayoutconfig->setGroup ( "MainMenu" ); + m_userMenuHeight = tqlayoutconfig->readNumEntry ( "UserMenuHeight",m_userMenuHeightDefault ); + m_userMenuWidth = tqlayoutconfig->readNumEntry ( "UserMenuWidth",m_userMenuWidthDefault ); + m_startHidden = tqlayoutconfig->readBoolEntry ( "ContractedMenu", m_startHiddenDefault ); + + tqlayoutconfig->setGroup ( "ItemProperties" ); + m_noComments = tqlayoutconfig->readBoolEntry ( "NoComments",m_noCommentsDefault ); + m_commentMargine = tqlayoutconfig->readNumEntry ( "CommentMargin",m_commentMargineDefault ); + m_iconSize = tqlayoutconfig->readNumEntry ( "IconSize",m_iconSizeDefault ); + + kdDebug() << "Read default tqlayout settings for theme: " << themeName << " from file: " << _abs_path @@ -691,18 +691,18 @@ void KbfxConfig::readThemerc ( QString &themePath, QString &themeName, bool user delete info; delete info_theme; - delete layoutconfig; + delete tqlayoutconfig; } void KbfxConfig::write() { - if ( m_KbfxDeleteOldConf && KbfxRcPath != QString::null ) + if ( m_KbfxDeleteOldConf && KbfxRcPath != TQString() ) { - QFile::remove ( KbfxRcPath ); + TQFile::remove ( KbfxRcPath ); kdDebug() << "Deleting general RC file: " << KbfxRcPath << endl; } - KConfigSkeleton *confskel = new KConfigSkeleton ( QString::fromLatin1 ( "kbfxrc" ) ); + KConfigSkeleton *confskel = new KConfigSkeleton ( TQString::tqfromLatin1 ( "kbfxrc" ) ); /* write general KBFX configuration options */ KConfig *conf = confskel->config(); @@ -743,7 +743,7 @@ void KbfxConfig::write() delete confskel; } -void KbfxConfig::writeFontrc ( QString & themeName ) +void KbfxConfig::writeFontrc ( TQString & themeName ) { /* write fonts KBFX configuration from theme name */ KConfig *fontconfig = new KConfig ( KbfxThemeRcDestination + "/" + themeName + "_fontrc" ); @@ -770,89 +770,89 @@ void KbfxConfig::writeFontrc ( QString & themeName ) delete fontconfig; } -void KbfxConfig::writeThemerc ( QString & themeName ) +void KbfxConfig::writeThemerc ( TQString & themeName ) { checkValues(); - /* write layout theme configuration from theme name */ - KConfig *layoutconfig = new KConfig ( KbfxThemeRcDestination + "/" + themeName + "_layoutrc" ); - - layoutconfig->setGroup ( "KbfxButton" ); - layoutconfig->writeEntry ( "Normal", m_KbfxNormalButtonPath ); - layoutconfig->writeEntry ( "Hover", m_KbfxHoverButtonPath ); - layoutconfig->writeEntry ( "Press", m_KbfxPressedButtonPath ); - layoutconfig->writeEntry ( "FadeTime", m_fadeTime ); - - layoutconfig->setGroup ( "ToolTip" ); - layoutconfig->writeEntry ( "Avatar", m_ToolTipAvatar ); - layoutconfig->writeEntry ( "Dudebox", m_SpinxTooltipDudebox ); - layoutconfig->writeEntry ( "Mask", m_SpinxTooltipMask ); - layoutconfig->writeEntry ( "Window", m_SpinxTooltipWindow ); - layoutconfig->writeEntry ( "Logo", m_SpinxTooltipLogo ); - - layoutconfig->setGroup ( "TopBar" ); - layoutconfig->writeEntry ( "DudeX", m_facePos_x ); - layoutconfig->writeEntry ( "DudeY", m_facePos_y ); - layoutconfig->writeEntry ( "FaceX",m_faceIconX ); - layoutconfig->writeEntry ( "FaceY",m_faceIconY ); - layoutconfig->writeEntry ( "FaceH",m_faceIconH ); - layoutconfig->writeEntry ( "FaceW",m_faceIconW ); - layoutconfig->writeEntry ( "UserNameX", m_userNamePos_x ); - layoutconfig->writeEntry ( "UserNameY", m_userNamePos_y ); - layoutconfig->writeEntry ( "DisableUserName", m_faceBoxHideText ); - layoutconfig->writeEntry ( "Height", m_topBar_h ); - layoutconfig->writeEntry ( "Width", m_topBar_w ); - layoutconfig->writeEntry ( "X", m_topBar_x ); - layoutconfig->writeEntry ( "Y", m_topBar_y ); - - layoutconfig->setGroup ( "BottomBar" ); - layoutconfig->writeEntry ( "Height", m_botBar_h ); - layoutconfig->writeEntry ( "Width", m_botBar_w ); - layoutconfig->writeEntry ( "X", m_botBar_x ); - layoutconfig->writeEntry ( "Y", m_botBar_y ); - - layoutconfig->setGroup ( "Scrollbars" ); - layoutconfig->writeEntry ( "ScrollBarBotX", m_scrollBarBotX ); - layoutconfig->writeEntry ( "ScrollBarBotY", m_scrollBarBotY ); - layoutconfig->writeEntry ( "ScrollBarTopX", m_scrollBarTopX ); - layoutconfig->writeEntry ( "ScrollBarTopY", m_scrollBarTopY ); - - layoutconfig->setGroup ( "ListBox" ); - layoutconfig->writeEntry ( "Height", m_listBox_h ); - layoutconfig->writeEntry ( "Width", m_listBox_w ); - layoutconfig->writeEntry ( "X", m_listBox_x ); - layoutconfig->writeEntry ( "Y", m_listBox_y ); - - layoutconfig->setGroup ( "SearchBox" ); - layoutconfig->writeEntry ( "Height", m_searchBox_h ); - layoutconfig->writeEntry ( "Width", m_searchBox_w ); - layoutconfig->writeEntry ( "X", m_searchBox_x ); - layoutconfig->writeEntry ( "Y", m_searchBox_y ); - layoutconfig->writeEntry ( "FixedPos", m_searchBox_static ); - - layoutconfig->setGroup ( "ItemView" ); - layoutconfig->writeEntry ( "Height", m_itemView_h ); - layoutconfig->writeEntry ( "Width", m_itemView_w ); - layoutconfig->writeEntry ( "X", m_itemView_x ); - layoutconfig->writeEntry ( "Y", m_itemView_y ); - - layoutconfig->setGroup ( "ToolBar" ); - layoutconfig->writeEntry ( "ButtonNormalSize", m_toolBarButtonNormalSize ); - layoutconfig->writeEntry ( "ButtonPressedSize", m_toolBarButtonExpandSize ); - - layoutconfig->setGroup ( "MainMenu" ); - layoutconfig->writeEntry ( "UserMenuHeight",m_userMenuHeight ); - layoutconfig->writeEntry ( "UserMenuWidth",m_userMenuWidth ); - layoutconfig->writeEntry ( "ContractedMenu", m_startHidden ); - - layoutconfig->setGroup ( "ItemProperties" ); - layoutconfig->writeEntry ( "NoComments",m_noComments ); - layoutconfig->writeEntry ( "CommentMargin",m_commentMargine ); - layoutconfig->writeEntry ( "IconSize",m_iconSize ); - - layoutconfig->sync(); - - delete layoutconfig; + /* write tqlayout theme configuration from theme name */ + KConfig *tqlayoutconfig = new KConfig ( KbfxThemeRcDestination + "/" + themeName + "_layoutrc" ); + + tqlayoutconfig->setGroup ( "KbfxButton" ); + tqlayoutconfig->writeEntry ( "Normal", m_KbfxNormalButtonPath ); + tqlayoutconfig->writeEntry ( "Hover", m_KbfxHoverButtonPath ); + tqlayoutconfig->writeEntry ( "Press", m_KbfxPressedButtonPath ); + tqlayoutconfig->writeEntry ( "FadeTime", m_fadeTime ); + + tqlayoutconfig->setGroup ( "ToolTip" ); + tqlayoutconfig->writeEntry ( "Avatar", m_ToolTipAvatar ); + tqlayoutconfig->writeEntry ( "Dudebox", m_SpinxTooltipDudebox ); + tqlayoutconfig->writeEntry ( "Mask", m_SpinxTooltipMask ); + tqlayoutconfig->writeEntry ( "Window", m_SpinxTooltipWindow ); + tqlayoutconfig->writeEntry ( "Logo", m_SpinxTooltipLogo ); + + tqlayoutconfig->setGroup ( "TopBar" ); + tqlayoutconfig->writeEntry ( "DudeX", m_facePos_x ); + tqlayoutconfig->writeEntry ( "DudeY", m_facePos_y ); + tqlayoutconfig->writeEntry ( "FaceX",m_faceIconX ); + tqlayoutconfig->writeEntry ( "FaceY",m_faceIconY ); + tqlayoutconfig->writeEntry ( "FaceH",m_faceIconH ); + tqlayoutconfig->writeEntry ( "FaceW",m_faceIconW ); + tqlayoutconfig->writeEntry ( "UserNameX", m_userNamePos_x ); + tqlayoutconfig->writeEntry ( "UserNameY", m_userNamePos_y ); + tqlayoutconfig->writeEntry ( "DisableUserName", m_faceBoxHideText ); + tqlayoutconfig->writeEntry ( "Height", m_topBar_h ); + tqlayoutconfig->writeEntry ( "Width", m_topBar_w ); + tqlayoutconfig->writeEntry ( "X", m_topBar_x ); + tqlayoutconfig->writeEntry ( "Y", m_topBar_y ); + + tqlayoutconfig->setGroup ( "BottomBar" ); + tqlayoutconfig->writeEntry ( "Height", m_botBar_h ); + tqlayoutconfig->writeEntry ( "Width", m_botBar_w ); + tqlayoutconfig->writeEntry ( "X", m_botBar_x ); + tqlayoutconfig->writeEntry ( "Y", m_botBar_y ); + + tqlayoutconfig->setGroup ( "Scrollbars" ); + tqlayoutconfig->writeEntry ( "ScrollBarBotX", m_scrollBarBotX ); + tqlayoutconfig->writeEntry ( "ScrollBarBotY", m_scrollBarBotY ); + tqlayoutconfig->writeEntry ( "ScrollBarTopX", m_scrollBarTopX ); + tqlayoutconfig->writeEntry ( "ScrollBarTopY", m_scrollBarTopY ); + + tqlayoutconfig->setGroup ( "ListBox" ); + tqlayoutconfig->writeEntry ( "Height", m_listBox_h ); + tqlayoutconfig->writeEntry ( "Width", m_listBox_w ); + tqlayoutconfig->writeEntry ( "X", m_listBox_x ); + tqlayoutconfig->writeEntry ( "Y", m_listBox_y ); + + tqlayoutconfig->setGroup ( "SearchBox" ); + tqlayoutconfig->writeEntry ( "Height", m_searchBox_h ); + tqlayoutconfig->writeEntry ( "Width", m_searchBox_w ); + tqlayoutconfig->writeEntry ( "X", m_searchBox_x ); + tqlayoutconfig->writeEntry ( "Y", m_searchBox_y ); + tqlayoutconfig->writeEntry ( "FixedPos", m_searchBox_static ); + + tqlayoutconfig->setGroup ( "ItemView" ); + tqlayoutconfig->writeEntry ( "Height", m_itemView_h ); + tqlayoutconfig->writeEntry ( "Width", m_itemView_w ); + tqlayoutconfig->writeEntry ( "X", m_itemView_x ); + tqlayoutconfig->writeEntry ( "Y", m_itemView_y ); + + tqlayoutconfig->setGroup ( "ToolBar" ); + tqlayoutconfig->writeEntry ( "ButtonNormalSize", m_toolBarButtonNormalSize ); + tqlayoutconfig->writeEntry ( "ButtonPressedSize", m_toolBarButtonExpandSize ); + + tqlayoutconfig->setGroup ( "MainMenu" ); + tqlayoutconfig->writeEntry ( "UserMenuHeight",m_userMenuHeight ); + tqlayoutconfig->writeEntry ( "UserMenuWidth",m_userMenuWidth ); + tqlayoutconfig->writeEntry ( "ContractedMenu", m_startHidden ); + + tqlayoutconfig->setGroup ( "ItemProperties" ); + tqlayoutconfig->writeEntry ( "NoComments",m_noComments ); + tqlayoutconfig->writeEntry ( "CommentMargin",m_commentMargine ); + tqlayoutconfig->writeEntry ( "IconSize",m_iconSize ); + + tqlayoutconfig->sync(); + + delete tqlayoutconfig; } void KbfxConfig::checkValues() diff --git a/kbfxlib/common/kbfxconfig.h b/kbfxlib/common/kbfxconfig.h index 739524b..edfc66d 100644 --- a/kbfxlib/common/kbfxconfig.h +++ b/kbfxlib/common/kbfxconfig.h @@ -24,12 +24,12 @@ #include <config.h> -#include <qcolor.h> -#include <qfile.h> -#include <qfileinfo.h> -#include <qfont.h> -#include <qpixmap.h> -#include <qstring.h> +#include <tqcolor.h> +#include <tqfile.h> +#include <tqfileinfo.h> +#include <tqfont.h> +#include <tqpixmap.h> +#include <tqstring.h> #include <kapplication.h> #include <kconfig.h> @@ -47,66 +47,66 @@ class KbfxConfig { public: void read(); - void readFontrc ( QString &themePath, QString &themeName, bool user_rc=TRUE ); - void readThemerc ( QString &themePath, QString &themeName, bool user_rc=TRUE ); - void readThemeInfo ( QString &themePath, QString &themeName ); + void readFontrc ( TQString &themePath, TQString &themeName, bool user_rc=TRUE ); + void readThemerc ( TQString &themePath, TQString &themeName, bool user_rc=TRUE ); + void readThemeInfo ( TQString &themePath, TQString &themeName ); void setDefault(); void setThemeDefault(); void setFontsDefault(); void setThemeInfoDefault(); void write(); - void writeFontrc ( QString &themeName ); - void writeThemerc ( QString &themeName ); + void writeFontrc ( TQString &themeName ); + void writeThemerc ( TQString &themeName ); void checkValues(); /* Theme info resources */ - QString m_InfoVersion; - QString m_InfoVersionDefault; - QString m_InfoAuthor; - QString m_InfoAuthorDefault; - QString m_InfoEmail; - QString m_InfoEmailDefault; - QString m_InfoUrl; - QString m_InfoUrlDefault; + TQString m_InfoVersion; + TQString m_InfoVersionDefault; + TQString m_InfoAuthor; + TQString m_InfoAuthorDefault; + TQString m_InfoEmail; + TQString m_InfoEmailDefault; + TQString m_InfoUrl; + TQString m_InfoUrlDefault; /* kbfx_menu_button config items list */ - QString m_KbfxThemesVersion; - QString KbfxThemeRcDestination; - QString KbfxRcPath; - QPixmap KbfxOnImg; - QPixmap KbfxOffImg; + TQString m_KbfxThemesVersion; + TQString KbfxThemeRcDestination; + TQString KbfxRcPath; + TQPixmap KbfxOnImg; + TQPixmap KbfxOffImg; int m_KbfxGeneralVersion; int m_KbfxGeneralVersionDefault; - QString m_KbfxNormalButtonPath; - QString m_KbfxNormalButtonPathDefault; - QString m_KbfxHoverButtonPath; - QString m_KbfxHoverButtonPathDefault; - QString m_KbfxPressedButtonPath; - QString m_KbfxPressedButtonPathDefault; - QString m_KbfxMouseOverAnimationPath; - QString m_KbfxMouseOverAnimationPathDefault; - QColor m_KbfxButtonColor; - QColor m_KbfxButtonColorDefault; + TQString m_KbfxNormalButtonPath; + TQString m_KbfxNormalButtonPathDefault; + TQString m_KbfxHoverButtonPath; + TQString m_KbfxHoverButtonPathDefault; + TQString m_KbfxPressedButtonPath; + TQString m_KbfxPressedButtonPathDefault; + TQString m_KbfxMouseOverAnimationPath; + TQString m_KbfxMouseOverAnimationPathDefault; + TQColor m_KbfxButtonColor; + TQColor m_KbfxButtonColorDefault; int m_KbfxButtonSize; int m_KbfxButtonSizeDefault; bool m_KbfxButtonGlow; bool m_KbfxButtonGlowDefault; bool m_KbfxButtonKikerResize; bool m_KbfxButtonKikerResizeDefault; - QString m_KbfxMenuType; - QString m_KbfxMenuTypeDefault; + TQString m_KbfxMenuType; + TQString m_KbfxMenuTypeDefault; /* spinx config items list */ - QString m_SpinxThemeBasePath; - QString m_SpinxThemeBasePathDefault; - QString m_UserSpinxThemeBasePath; - QString m_UserSpinxThemeBasePathDefault; + TQString m_SpinxThemeBasePath; + TQString m_SpinxThemeBasePathDefault; + TQString m_UserSpinxThemeBasePath; + TQString m_UserSpinxThemeBasePathDefault; bool m_SpinxDudeBlink; bool m_SpinxDudeBlinkDefault; - QString m_SpinxDudeImage; - QString m_SpinxDudeImageDefault; - QString m_SpinxThemeName; - QString m_SpinxThemeNameDefault; + TQString m_SpinxDudeImage; + TQString m_SpinxDudeImageDefault; + TQString m_SpinxThemeName; + TQString m_SpinxThemeNameDefault; bool m_ToolBarResize; bool m_ToolBarResizeDefault; bool m_KbfxWatcher; @@ -120,65 +120,65 @@ class KbfxConfig bool m_ToolTipAnimationDefault; bool m_ToolTip; bool m_ToolTipDefault; - QString m_ToolTipText; - QString m_ToolTipTextDefault; - QString m_ToolTipAvatar; - QString m_ToolTipAvatarDefault; - QString m_SpinxTooltipDudebox; - QString m_SpinxTooltipDudeboxDefault; - QString m_SpinxTooltipMask; - QString m_SpinxTooltipMaskDefault; - QString m_SpinxTooltipWindow; - QString m_SpinxTooltipWindowDefault; - QString m_SpinxTooltipLogo; - QString m_SpinxTooltipLogoDefault; + TQString m_ToolTipText; + TQString m_ToolTipTextDefault; + TQString m_ToolTipAvatar; + TQString m_ToolTipAvatarDefault; + TQString m_SpinxTooltipDudebox; + TQString m_SpinxTooltipDudeboxDefault; + TQString m_SpinxTooltipMask; + TQString m_SpinxTooltipMaskDefault; + TQString m_SpinxTooltipWindow; + TQString m_SpinxTooltipWindowDefault; + TQString m_SpinxTooltipLogo; + TQString m_SpinxTooltipLogoDefault; - QString m_KbfxHistory; - QString m_KbfxHistoryDefault; + TQString m_KbfxHistory; + TQString m_KbfxHistoryDefault; /* font settings */ - QColor m_fontTooltipColor; - QColor m_fontTooltipColorDefault; - QFont m_fontTooltipFont; - QFont m_fontTooltipFontDefault; - QColor m_fontAppNameColor; - QColor m_fontAppNameColorDefault; - QFont m_fontAppNameFont; - QFont m_fontAppNameFontDefault; - QColor m_fontAppCommentColor; - QColor m_fontAppCommentColorDefault; - QFont m_fontAppCommentFont; - QFont m_fontAppCommentFontDefault; - QColor m_lineColor; - QColor m_lineColorDefault; - QColor m_fontIndexColor; - QColor m_fontIndexColorDefault; - QFont m_fontIndexFont; - QFont m_fontIndexFontDefault; - QColor m_userImageColor; - QColor m_userImageColorDefault; - QColor m_userNameColor; - QColor m_userNameColorDefault; - QFont m_userNameFont; - QFont m_userNameFontDefault; - QColor m_sepNameColor; - QColor m_sepNameColorDefault; - QFont m_sepNameFont; - QFont m_sepNameFontDefault; - QColor m_pluginNameColor; - QColor m_pluginNameColorDefault; - QFont m_pluginNameFont; - QFont m_pluginNameFontDefault; + TQColor m_fontTooltipColor; + TQColor m_fontTooltipColorDefault; + TQFont m_fontTooltipFont; + TQFont m_fontTooltipFontDefault; + TQColor m_fontAppNameColor; + TQColor m_fontAppNameColorDefault; + TQFont m_fontAppNameFont; + TQFont m_fontAppNameFontDefault; + TQColor m_fontAppCommentColor; + TQColor m_fontAppCommentColorDefault; + TQFont m_fontAppCommentFont; + TQFont m_fontAppCommentFontDefault; + TQColor m_lineColor; + TQColor m_lineColorDefault; + TQColor m_fontIndexColor; + TQColor m_fontIndexColorDefault; + TQFont m_fontIndexFont; + TQFont m_fontIndexFontDefault; + TQColor m_userImageColor; + TQColor m_userImageColorDefault; + TQColor m_userNameColor; + TQColor m_userNameColorDefault; + TQFont m_userNameFont; + TQFont m_userNameFontDefault; + TQColor m_sepNameColor; + TQColor m_sepNameColorDefault; + TQFont m_sepNameFont; + TQFont m_sepNameFontDefault; + TQColor m_pluginNameColor; + TQColor m_pluginNameColorDefault; + TQFont m_pluginNameFont; + TQFont m_pluginNameFontDefault; bool m_fontHoverBold; bool m_fontHoverBoldDefault; /* history */ - QStringList m_pluginsLeft; - QStringList m_pluginsLeftDefault; - QStringList m_pluginsRight; - QStringList m_pluginsRightDefault; + TQStringList m_pluginsLeft; + TQStringList m_pluginsLeftDefault; + TQStringList m_pluginsRight; + TQStringList m_pluginsRightDefault; - /* layout */ + /* tqlayout */ int m_facePos_x; int m_facePos_xDefault; int m_facePos_y; diff --git a/kbfxlib/common/kbfxfontchooser.cpp b/kbfxlib/common/kbfxfontchooser.cpp index c05a81e..24f773a 100644 --- a/kbfxlib/common/kbfxfontchooser.cpp +++ b/kbfxlib/common/kbfxfontchooser.cpp @@ -20,32 +20,32 @@ #include "kbfxfontchooser.h" -KBFXFontChooser::KBFXFontChooser ( QWidget *parent, const char *name ) - : QWidget ( parent, name ) +KBFXFontChooser::KBFXFontChooser ( TQWidget *tqparent, const char *name ) + : TQWidget ( tqparent, name ) { - QHBoxLayout* layout = new QHBoxLayout ( this, 0, KDialog::spacingHint() ); + TQHBoxLayout* tqlayout = new TQHBoxLayout ( this, 0, KDialog::spacingHint() ); - m_label = new QLabel ( this, "fontLabel" ); - m_label->setSizePolicy ( QSizePolicy::Expanding, QSizePolicy::Fixed, TRUE); -// m_label->setFrameShape ( QFrame::StyledPanel ); -// m_label->setFrameShadow ( QFrame::Sunken ); + m_label = new TQLabel ( this, "fontLabel" ); + m_label->tqsetSizePolicy ( TQSizePolicy::Expanding, TQSizePolicy::Fixed, TRUE); +// m_label->setFrameShape ( TQFrame::StyledPanel ); +// m_label->setFrameShadow ( TQFrame::Sunken ); - layout->addWidget ( m_label ); + tqlayout->addWidget ( m_label ); - m_button = new QPushButton ( this, "fontButton" ); + m_button = new TQPushButton ( this, "fontButton" ); m_label->setMaximumHeight ( m_button -> height() ); m_label->setMinimumHeight ( m_button -> height() ); - QString fontText = i18n ( "Font..." ); -// m_button->setSizePolicy ( QSizePolicy::Minimum, QSizePolicy::Minimum, TRUE); + TQString fontText = i18n ( "Font..." ); +// m_button->tqsetSizePolicy ( TQSizePolicy::Minimum, TQSizePolicy::Minimum, TRUE); m_button->setText ( fontText ); - QIconSet iconSet = SmallIconSet ( QString::fromLatin1 ( "fonts" ) ); - QPixmap pixmap = iconSet.pixmap ( QIconSet::Small, QIconSet::Normal ); + TQIconSet iconSet = SmallIconSet ( TQString::tqfromLatin1 ( "fonts" ) ); + TQPixmap pixmap = iconSet.pixmap ( TQIconSet::Small, TQIconSet::Normal ); m_button->setIconSet ( iconSet ); m_button->setFixedWidth ( m_button->fontMetrics().width ( fontText ) + 3 * KDialog::spacingHint() + pixmap.width() ); - layout->addWidget ( m_button ); + tqlayout->addWidget ( m_button ); - connect ( m_button, SIGNAL ( clicked() ), this, SLOT ( buttonClicked() ) ); + connect ( m_button, TQT_SIGNAL ( clicked() ), this, TQT_SLOT ( buttonClicked() ) ); updateFontLabel(); @@ -55,7 +55,7 @@ KBFXFontChooser::KBFXFontChooser ( QWidget *parent, const char *name ) KBFXFontChooser::~KBFXFontChooser() {} -void KBFXFontChooser::setFont ( const QFont& font ) +void KBFXFontChooser::setFont ( const TQFont& font ) { m_font = font; updateFontLabel(); @@ -63,10 +63,10 @@ void KBFXFontChooser::setFont ( const QFont& font ) void KBFXFontChooser::updateFontLabel() { - QString s = QString ( "%1 (%2pt) " ).arg ( m_font.family() ).arg ( m_font.pointSize() ); + TQString s = TQString ( "%1 (%2pt) " ).arg ( m_font.family() ).arg ( m_font.pointSize() ); m_label->setFont ( m_font ); m_label->setText ( s ); - m_label->setAlignment ( Qt::AlignLeft | Qt::AlignVCenter ); + m_label->tqsetAlignment ( TQt::AlignLeft | TQt::AlignVCenter ); emit FontChanged(); } diff --git a/kbfxlib/common/kbfxfontchooser.h b/kbfxlib/common/kbfxfontchooser.h index 639a674..d0535d1 100644 --- a/kbfxlib/common/kbfxfontchooser.h +++ b/kbfxlib/common/kbfxfontchooser.h @@ -24,33 +24,34 @@ #include <kfontdialog.h> #include <klocale.h> #include <kiconloader.h> -#include <qwidget.h> -#include <qlabel.h> -#include <qpushbutton.h> -#include <qlayout.h> -#include <qfont.h> -#include <qsizepolicy.h> +#include <tqwidget.h> +#include <tqlabel.h> +#include <tqpushbutton.h> +#include <tqlayout.h> +#include <tqfont.h> +#include <tqsizepolicy.h> -class QLabel; -class QPushButton; -class QFont; +class TQLabel; +class TQPushButton; +class TQFont; /** @author Petri Damsten <petri.damsten@iki.fi> */ -class KBFXFontChooser : public QWidget +class KBFXFontChooser : public TQWidget { Q_OBJECT - Q_PROPERTY ( QFont font READ font WRITE setFont ) + TQ_OBJECT + TQ_PROPERTY ( TQFont font READ font WRITE setFont ) public: - KBFXFontChooser ( QWidget *parent = 0, const char *name = 0 ); + KBFXFontChooser ( TQWidget *tqparent = 0, const char *name = 0 ); ~KBFXFontChooser(); - QFont font() const { return m_font; }; + TQFont font() const { return m_font; }; public slots: - void setFont ( const QFont& font ); + void setFont ( const TQFont& font ); protected: void updateFontLabel(); @@ -59,9 +60,9 @@ class KBFXFontChooser : public QWidget void buttonClicked(); private: - QFont m_font; - QLabel* m_label; - QPushButton* m_button; + TQFont m_font; + TQLabel* m_label; + TQPushButton* m_button; signals: void FontChanged(); diff --git a/kbfxlib/common/kbfxkiodownload.cpp b/kbfxlib/common/kbfxkiodownload.cpp index ff6dccc..59d0db2 100644 --- a/kbfxlib/common/kbfxkiodownload.cpp +++ b/kbfxlib/common/kbfxkiodownload.cpp @@ -21,8 +21,8 @@ #include "kbfxkiodownload.h" -KbfxKioDownload::KbfxKioDownload ( QObject *parent, const char *name ) - : QObject ( parent, name ) +KbfxKioDownload::KbfxKioDownload ( TQObject *tqparent, const char *name ) + : TQObject ( tqparent, name ) { m_KbfxBrowserError = 0; m_KbfxBrowserErrorText = "No error"; @@ -36,14 +36,14 @@ KbfxKioDownload::KbfxKioDownload ( QObject *parent, const char *name ) KbfxKioDownload::~KbfxKioDownload() {} -void KbfxKioDownload::KbfxKioDownloadStart ( QString &url ) +void KbfxKioDownload::KbfxKioDownloadStart ( TQString &url ) { KIO::Job *download_job = KIO::file_copy ( KURL ( url ), KURL ( m_KbfxBrowserTmpFile ), -1, TRUE ); - connect ( download_job, SIGNAL ( result ( KIO::Job* ) ), - this, SLOT ( KbfxBrowserResult ( KIO::Job * ) ) ); + connect ( download_job, TQT_SIGNAL ( result ( KIO::Job* ) ), + this, TQT_SLOT ( KbfxBrowserResult ( KIO::Job * ) ) ); } void KbfxKioDownload::KbfxBrowserResult ( KIO::Job *download_job ) diff --git a/kbfxlib/common/kbfxkiodownload.h b/kbfxlib/common/kbfxkiodownload.h index 61efb91..7765076 100644 --- a/kbfxlib/common/kbfxkiodownload.h +++ b/kbfxlib/common/kbfxkiodownload.h @@ -29,19 +29,20 @@ /** * @author PhobosK <phobosk@mail.kbfx.org> */ -class KbfxKioDownload : public QObject +class KbfxKioDownload : public TQObject { Q_OBJECT + TQ_OBJECT public: - KbfxKioDownload ( QObject * parent = 0, const char * name = 0 ); + KbfxKioDownload ( TQObject * tqparent = 0, const char * name = 0 ); ~KbfxKioDownload(); - /* KbfxKioDownload invocation - pass an url as QString */ - void KbfxKioDownloadStart ( QString &url ); + /* KbfxKioDownload invocation - pass an url as TQString */ + void KbfxKioDownloadStart ( TQString &url ); /* return temp file name for the download */ - QString KbfxBrowserTmpFile() {return m_KbfxBrowserTmpFile;} + TQString KbfxBrowserTmpFile() {return m_KbfxBrowserTmpFile;} /* return error number occured during download * see definition in global.h @@ -49,12 +50,12 @@ class KbfxKioDownload : public QObject int KbfxBrowserError() {return m_KbfxBrowserError;} /* return error text occured during download */ - QString KbfxBrowserErrorText() {return m_KbfxBrowserErrorText;} + TQString KbfxBrowserErrorText() {return m_KbfxBrowserErrorText;} protected: - QString m_KbfxBrowserTmpFile; + TQString m_KbfxBrowserTmpFile; int m_KbfxBrowserError; - QString m_KbfxBrowserErrorText; + TQString m_KbfxBrowserErrorText; private: KTempFile tmpF; diff --git a/kbfxlib/common/kbfxpixmaplabel.cpp b/kbfxlib/common/kbfxpixmaplabel.cpp index a85627e..9907473 100644 --- a/kbfxlib/common/kbfxpixmaplabel.cpp +++ b/kbfxlib/common/kbfxpixmaplabel.cpp @@ -21,15 +21,15 @@ #include "kbfxpixmaplabel.h" -KbfxPixmapLabel::KbfxPixmapLabel ( QWidget *parent, const char *name, WFlags fl ) - : QLabel ( parent, name, fl ) +KbfxPixmapLabel::KbfxPixmapLabel ( TQWidget *tqparent, const char *name, WFlags fl ) + : TQLabel ( tqparent, name, fl ) { - // setFrameShape(QLabel::WinPanel); - // setFrameShadow(QLabel::Sunken); - setFrameShape ( QLabel::LineEditPanel ); - setFrameShadow ( QLabel::Plain ); + // setFrameShape(TQLabel::WinPanel); + // setFrameShadow(TQLabel::Sunken); + setFrameShape ( TQLabel::LineEditPanel ); + setFrameShadow ( TQLabel::Plain ); setScaledContents ( FALSE ); - setAlignment ( int ( QLabel::WordBreak | QLabel::AlignCenter ) ); + tqsetAlignment ( int ( TQLabel::WordBreak | TQLabel::AlignCenter ) ); setMouseTracking ( TRUE ); } @@ -40,25 +40,25 @@ KbfxPixmapLabel::~KbfxPixmapLabel() /* normalize label */ void KbfxPixmapLabel::normalize () { - setFrameShape ( QLabel::NoFrame ); - setFrameShadow ( QLabel::Plain ); + setFrameShape ( TQLabel::NoFrame ); + setFrameShadow ( TQLabel::Plain ); setScaledContents ( FALSE ); - setAlignment ( int ( QLabel::WordBreak | QLabel::AlignCenter ) ); + tqsetAlignment ( int ( TQLabel::WordBreak | TQLabel::AlignCenter ) ); } /* processing drag events over label */ -void KbfxPixmapLabel::dragEnterEvent ( QDragEnterEvent *mouseDragEnterEvent ) +void KbfxPixmapLabel::dragEnterEvent ( TQDragEnterEvent *mouseDragEnterEvent ) { kdDebug() << "Accepting drag..." << endl; - mouseDragEnterEvent->accept ( QTextDrag::canDecode ( mouseDragEnterEvent ) ); + mouseDragEnterEvent->accept ( TQTextDrag::canDecode ( mouseDragEnterEvent ) ); } /* processing drop events over label */ -void KbfxPixmapLabel::dropEvent ( QDropEvent *mouseDropEvent ) +void KbfxPixmapLabel::dropEvent ( TQDropEvent *mouseDropEvent ) { - QString text; + TQString text; - if ( QTextDrag::decode ( mouseDropEvent,text ) ) + if ( TQTextDrag::decode ( mouseDropEvent,text ) ) { if ( text.startsWith ( "file://" ) ) text.remove ( "file://" ); @@ -69,7 +69,7 @@ void KbfxPixmapLabel::dropEvent ( QDropEvent *mouseDropEvent ) } /* processing mouse click events over label */ -void KbfxPixmapLabel::mousePressEvent ( QMouseEvent * e ) +void KbfxPixmapLabel::mousePressEvent ( TQMouseEvent * e ) { e->accept(); ButtonState _btn = e->button(); @@ -80,7 +80,7 @@ void KbfxPixmapLabel::mousePressEvent ( QMouseEvent * e ) } /* processing mouse double click events over label */ -void KbfxPixmapLabel::mouseDoubleClickEvent ( QMouseEvent * e ) +void KbfxPixmapLabel::mouseDoubleClickEvent ( TQMouseEvent * e ) { e->accept(); ButtonState _btn = e->button(); diff --git a/kbfxlib/common/kbfxpixmaplabel.h b/kbfxlib/common/kbfxpixmaplabel.h index 1e20b99..51091aa 100644 --- a/kbfxlib/common/kbfxpixmaplabel.h +++ b/kbfxlib/common/kbfxpixmaplabel.h @@ -22,27 +22,28 @@ #ifndef KBFX_PIXMAP_LABEL_H #define KBFX_PIXMAP_LABEL_H -#include <qlabel.h> +#include <tqlabel.h> #include <kdebug.h> -#include <qdragobject.h> -#include <qtooltip.h> +#include <tqdragobject.h> +#include <tqtooltip.h> -class KbfxPixmapLabel : public QLabel +class KbfxPixmapLabel : public TQLabel { Q_OBJECT + TQ_OBJECT public: - KbfxPixmapLabel ( QWidget *parent = 0, const char *name = 0, WFlags f = 0 ); + KbfxPixmapLabel ( TQWidget *tqparent = 0, const char *name = 0, WFlags f = 0 ); ~KbfxPixmapLabel (); - void dragEnterEvent ( QDragEnterEvent *mouseDragEnterEvent ); - void dropEvent ( QDropEvent *mouseDropEvent ); - void mousePressEvent ( QMouseEvent * e ); - void mouseDoubleClickEvent ( QMouseEvent * e ); + void dragEnterEvent ( TQDragEnterEvent *mouseDragEnterEvent ); + void dropEvent ( TQDropEvent *mouseDropEvent ); + void mousePressEvent ( TQMouseEvent * e ); + void mouseDoubleClickEvent ( TQMouseEvent * e ); void normalize (); signals: - void targetDrop ( const QString & ); + void targetDrop ( const TQString & ); void clicked(); void mouseClicked (); void mouseClicked ( const ButtonState & ); diff --git a/kbfxlib/common/kbfxplasmapixmapprovider.cpp b/kbfxlib/common/kbfxplasmapixmapprovider.cpp index e505c62..9310362 100644 --- a/kbfxlib/common/kbfxplasmapixmapprovider.cpp +++ b/kbfxlib/common/kbfxplasmapixmapprovider.cpp @@ -22,76 +22,76 @@ #include "kbfxplasmapixmapprovider.h" int -KbfxPlasmaPixmapProvider::addPixmap ( QString pixmapname ) +KbfxPlasmaPixmapProvider::addPixmap ( TQString pixmapname ) { - QString lFileName = PixmapPath( pixmapname ); - QPixmap * lPixmapPtr = 0; + TQString lFileName = PixmapPath( pixmapname ); + TQPixmap * lPixmapPtr = 0; - if ( ( lPixmapPtr = QPixmapCache::find ( pixmapname ) ) == NULL ) + if ( ( lPixmapPtr = TQPixmapCache::tqfind ( pixmapname ) ) == NULL ) { - lPixmapPtr = new QPixmap ( lFileName ); - QPixmapCache::insert ( pixmapname,lPixmapPtr ); + lPixmapPtr = new TQPixmap ( lFileName ); + TQPixmapCache::insert ( pixmapname,lPixmapPtr ); return ( lPixmapPtr->height() *lPixmapPtr->width() *lPixmapPtr->depth() ) /8; } return 0; } -QString -KbfxPlasmaPixmapProvider::PixmapPath ( QString pixmapName ) +TQString +KbfxPlasmaPixmapProvider::PixmapPath ( TQString pixmapName ) { - QString lFileName = ConfigInit ().m_SpinxThemeBasePath + ConfigInit ().m_SpinxThemeName + "/" + pixmapName + ".png"; + TQString lFileName = ConfigInit ().m_SpinxThemeBasePath + ConfigInit ().m_SpinxThemeName + "/" + pixmapName + ".png"; - if ( QPixmap::QPixmap ( lFileName ).isNull() ) + if ( TQPixmap::TQPixmap ( lFileName ).isNull() ) lFileName = locate ( "data", "kbfx/skins/default/" + pixmapName + ".png" ); return lFileName; } -QString -KbfxPlasmaPixmapProvider::PixmapPath ( QString pixmapName, QString themePath, QString themeName ) +TQString +KbfxPlasmaPixmapProvider::PixmapPath ( TQString pixmapName, TQString themePath, TQString themeName ) { - QString lFileName = themePath + themeName + "/" + pixmapName + ".png"; + TQString lFileName = themePath + themeName + "/" + pixmapName + ".png"; - if ( QPixmap::QPixmap ( lFileName ).isNull() ) + if ( TQPixmap::TQPixmap ( lFileName ).isNull() ) lFileName = locate ( "data", "kbfx/skins/default/" + pixmapName + ".png" ); return lFileName; } bool -KbfxPlasmaPixmapProvider::PixmapPathCheck ( QString pixmapPath ) +KbfxPlasmaPixmapProvider::PixmapPathCheck ( TQString pixmapPath ) { - if ( QPixmap::QPixmap ( pixmapPath ).isNull() ) + if ( TQPixmap::TQPixmap ( pixmapPath ).isNull() ) return FALSE; return TRUE; } void -KbfxPlasmaPixmapProvider::deletePixmap ( const QString & key ) +KbfxPlasmaPixmapProvider::deletePixmap ( const TQString & key ) { - QPixmapCache::remove ( key ); + TQPixmapCache::remove ( key ); } void KbfxPlasmaPixmapProvider::rebuildCache() { - QPixmapCache::clear (); + TQPixmapCache::clear (); buildCache(); } void KbfxPlasmaPixmapProvider::buildCache() { //m_skinElements.append("topbg"); - QPixmapCache::setCacheLimit ( 1024*5 ); - static QStringList m_skinElements; + TQPixmapCache::setCacheLimit ( 1024*5 ); + static TQStringList m_skinElements; m_skinElements - <<"appfind" + <<"apptqfind" <<"bg" <<"botbg" <<"butterfly" <<"dudebox" - <<"find" + <<"tqfind" <<"hover" <<"indexseparator" <<"listboxbg" @@ -99,7 +99,7 @@ void KbfxPlasmaPixmapProvider::buildCache() <<"lockhover" <<"logout" <<"logouthover" - <<"mask" + <<"tqmask" <<"menu_top" <<"menu_top_image_person" <<"middleboxbg" @@ -119,20 +119,20 @@ void KbfxPlasmaPixmapProvider::buildCache() <<"appviewbg" ; - for ( QStringList::Iterator it = m_skinElements.begin(); it != m_skinElements.end(); ++it ) + for ( TQStringList::Iterator it = m_skinElements.begin(); it != m_skinElements.end(); ++it ) { - QPixmapCache::setCacheLimit ( KbfxPlasmaPixmapProvider::addPixmap ( *it ) +QPixmapCache::cacheLimit() ); + TQPixmapCache::setCacheLimit ( KbfxPlasmaPixmapProvider::addPixmap ( *it ) +TQPixmapCache::cacheLimit() ); } } -QPixmap * -KbfxPlasmaPixmapProvider::pixmap ( const QString & key ) +TQPixmap * +KbfxPlasmaPixmapProvider::pixmap ( const TQString & key ) { - QPixmap* pp; - QPixmap p; - if ( ( pp=QPixmapCache::find ( key ) ) ) + TQPixmap* pp; + TQPixmap p; + if ( ( pp=TQPixmapCache::tqfind ( key ) ) ) { return pp; } diff --git a/kbfxlib/common/kbfxplasmapixmapprovider.h b/kbfxlib/common/kbfxplasmapixmapprovider.h index 00fd5b4..db435e3 100644 --- a/kbfxlib/common/kbfxplasmapixmapprovider.h +++ b/kbfxlib/common/kbfxplasmapixmapprovider.h @@ -23,11 +23,11 @@ #define KBFX_PLASMA_PIXMAP_PROVIDER_H -#include <qfileinfo.h> -#include <qpixmapcache.h> -#include <qpixmap.h> -#include <qstring.h> -#include <qstringlist.h> +#include <tqfileinfo.h> +#include <tqpixmapcache.h> +#include <tqpixmap.h> +#include <tqstring.h> +#include <tqstringlist.h> #include <kbfxconfig.h> @@ -40,14 +40,14 @@ class KbfxPlasmaPixmapProvider {} ~KbfxPlasmaPixmapProvider() {} - static int addPixmap ( QString ); - static void deletePixmap ( const QString & ); + static int addPixmap ( TQString ); + static void deletePixmap ( const TQString & ); static void rebuildCache(); static void buildCache(); - static QPixmap* pixmap ( const QString & ); - static QString PixmapPath ( QString, QString, QString ); - static QString PixmapPath ( QString ); - static bool PixmapPathCheck ( QString ); + static TQPixmap* pixmap ( const TQString & ); + static TQString PixmapPath ( TQString, TQString, TQString ); + static TQString PixmapPath ( TQString ); + static bool PixmapPathCheck ( TQString ); }; #endif diff --git a/kbfxlib/common/kbfxpushbutton.cpp b/kbfxlib/common/kbfxpushbutton.cpp index e971993..bc62903 100644 --- a/kbfxlib/common/kbfxpushbutton.cpp +++ b/kbfxlib/common/kbfxpushbutton.cpp @@ -21,12 +21,12 @@ #include "kbfxpushbutton.h" -KbfxPushButton::KbfxPushButton ( QWidget *parent, const char *name ) - : KPushButton ( parent, name ) +KbfxPushButton::KbfxPushButton ( TQWidget *tqparent, const char *name ) + : KPushButton ( tqparent, name ) { setText ( "P R E V I E W" ); setToggleButton ( TRUE ); - setFocusPolicy ( QWidget::NoFocus ); + setFocusPolicy ( TQ_NoFocus ); } KbfxPushButton::~KbfxPushButton() @@ -34,12 +34,12 @@ KbfxPushButton::~KbfxPushButton() } /* process hover events */ -void KbfxPushButton::enterEvent ( QEvent * ) +void KbfxPushButton::enterEvent ( TQEvent * ) { if ( this->state() == 0 ) this->setPixmap ( ConfigInit().m_KbfxHoverButtonPath ); } -void KbfxPushButton::leaveEvent ( QEvent * ) +void KbfxPushButton::leaveEvent ( TQEvent * ) { if ( this->state() == 2 ) this->setPixmap ( ConfigInit().m_KbfxPressedButtonPath ); if ( this->state() == 0 ) this->setPixmap ( ConfigInit().m_KbfxNormalButtonPath ); diff --git a/kbfxlib/common/kbfxpushbutton.h b/kbfxlib/common/kbfxpushbutton.h index 3d90bf7..dc38e05 100644 --- a/kbfxlib/common/kbfxpushbutton.h +++ b/kbfxlib/common/kbfxpushbutton.h @@ -29,13 +29,14 @@ class KbfxPushButton: public KPushButton { Q_OBJECT + TQ_OBJECT public: - KbfxPushButton ( QWidget *parent = 0, const char *name = 0 ); + KbfxPushButton ( TQWidget *tqparent = 0, const char *name = 0 ); ~KbfxPushButton(); - void enterEvent ( QEvent * ); - void leaveEvent ( QEvent * ); + void enterEvent ( TQEvent * ); + void leaveEvent ( TQEvent * ); }; #endif // KBFX_PUSH_BUTTON_H diff --git a/kbfxlib/common/kbfxthemesdata.cpp b/kbfxlib/common/kbfxthemesdata.cpp index 2ebaa10..464f285 100644 --- a/kbfxlib/common/kbfxthemesdata.cpp +++ b/kbfxlib/common/kbfxthemesdata.cpp @@ -29,18 +29,18 @@ KbfxThemesData::~KbfxThemesData() m_themesMap.clear(); } -ThemesMap KbfxThemesData::setThemeList ( QString path ) +ThemesMap KbfxThemesData::setThemeList ( TQString path ) { - QString m_KbfxThemesVersion = ConfigInit().m_KbfxThemesVersion; + TQString m_KbfxThemesVersion = ConfigInit().m_KbfxThemesVersion; bool m_KbfxShowOldThemes = ConfigInit().m_KbfxShowOldThemes; - QFileInfo *fi=0, *f=0; + TQFileInfo *fi=0, *f=0; m_themesMap.clear(); KStandardDirs *tmp = new KStandardDirs(); /* search themes in KDE Resource Folders and append user selected folder */ - QStringList skinsFolders = tmp->findDirs ( "data", "kbfx/skins" ); + TQStringList skinsFolders = tmp->findDirs ( "data", "kbfx/skins" ); if ( tmp->exists ( path ) ) { skinsFolders.append ( path ); @@ -50,19 +50,19 @@ ThemesMap KbfxThemesData::setThemeList ( QString path ) kdDebug() << "KbfxThemesData: Path doesn't exist! :" << path << endl; } - for ( QStringList::Iterator skinsIt = skinsFolders.begin(); skinsIt != skinsFolders.end(); ++skinsIt ) + for ( TQStringList::Iterator skinsIt = skinsFolders.begin(); skinsIt != skinsFolders.end(); ++skinsIt ) { - QDir d ( *skinsIt ); - d.setFilter ( QDir::Dirs ); + TQDir d ( *skinsIt ); + d.setFilter ( TQDir::Dirs ); - const QFileInfoList *list = d.entryInfoList(); - QFileInfoListIterator it ( *list ); + const TQFileInfoList *list = d.entryInfoList(); + TQFileInfoListIterator it ( *list ); while ( ( fi = it.current() ) != 0 ) { if ( !fi->fileName().startsWith ( "." ) ) { - f = new QFileInfo ( d, fi->fileName() + "/" + m_KbfxThemesVersion ); + f = new TQFileInfo ( d, fi->fileName() + "/" + m_KbfxThemesVersion ); if ( m_KbfxShowOldThemes ) { m_themesMap[fi->fileName() ] = ( fi->dirPath ( TRUE ) ).append ( "/" ); diff --git a/kbfxlib/common/kbfxthemesdata.h b/kbfxlib/common/kbfxthemesdata.h index 5dd0bf1..19e494e 100644 --- a/kbfxlib/common/kbfxthemesdata.h +++ b/kbfxlib/common/kbfxthemesdata.h @@ -23,16 +23,16 @@ #define KBFX_THEMES_DATA_H #include <kdebug.h> -#include <qstringlist.h> +#include <tqstringlist.h> #include <kio/netaccess.h> #include <kstandarddirs.h> -#include <qmap.h> -#include <qdir.h> -#include <qfileinfo.h> +#include <tqmap.h> +#include <tqdir.h> +#include <tqfileinfo.h> #include "kbfxconfig.h" -typedef QMap<QString, QString> ThemesMap; +typedef TQMap<TQString, TQString> ThemesMap; /** * @author PhobosK <phobosk@mail.kbfx.org> @@ -43,7 +43,7 @@ class KbfxThemesData KbfxThemesData(); ~KbfxThemesData(); - ThemesMap setThemeList ( QString path ); + ThemesMap setThemeList ( TQString path ); private: ThemesMap m_themesMap; |