Remove the tq in front of these incorrectly TQt4-converted methods/data members:

tqrepaint[...]
tqinvalidate[...]
tqparent[...]
tqmask[...]
tqlayout[...]
tqalignment[...]


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kbfx@1240522 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

14 files changed, 258 insertions, 258 deletions

diff --git a/configdialog/kbfxconfigdlgabout.ui b/configdialog/kbfxconfigdlgabout.ui
index 455216c..33c9e49 100644
--- a/configdialog/kbfxconfigdlgabout.ui
+++ b/configdialog/kbfxconfigdlgabout.ui
@@ -717,7 +717,7 @@ THANKS A LOT ALL OF YOU OUT THERE!!!</string>
     <function access="private" specifier="non virtual">init()</function>
     <function specifier="non virtual" returnType="bool">eventFilter( TQObject * obj, TQEvent * ev )</function>
 </functions>
-<tqlayoutdefaults spacing="6" margin="0"/>
+<layoutdefaults spacing="6" margin="0"/>
 <includehints>
     <includehint>kactivelabel.h</includehint>
     <includehint>kactivelabel.h</includehint>
diff --git a/configdialog/kbfxconfigdlgbutton.ui b/configdialog/kbfxconfigdlgbutton.ui
index 73f4e07..221d9ba 100644
--- a/configdialog/kbfxconfigdlgbutton.ui
+++ b/configdialog/kbfxconfigdlgbutton.ui
@@ -1254,7 +1254,7 @@
 <functions>
     <function access="private" specifier="non virtual">init()</function>
 </functions>
-<tqlayoutdefaults spacing="4" margin="0"/>
+<layoutdefaults spacing="4" margin="0"/>
 <includehints>
     <includehint>kurlrequester.h</includehint>
     <includehint>klineedit.h</includehint>
diff --git a/configdialog/kbfxconfigdlgfonts-old.ui b/configdialog/kbfxconfigdlgfonts-old.ui
index 4277bfa..835739d 100644
--- a/configdialog/kbfxconfigdlgfonts-old.ui
+++ b/configdialog/kbfxconfigdlgfonts-old.ui
@@ -1161,7 +1161,7 @@
 <functions>
     <function access="private" specifier="non virtual">init()</function>
 </functions>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kactivelabel.h</includehint>
     <includehint>kactivelabel.h</includehint>
diff --git a/configdialog/kbfxconfigdlglayout.ui b/configdialog/kbfxconfigdlglayout.ui
index 2e80db2..e1d5f2d 100644
--- a/configdialog/kbfxconfigdlglayout.ui
+++ b/configdialog/kbfxconfigdlglayout.ui
@@ -127,7 +127,7 @@
                         <string>EXPORT KBFXLAYOUTRC FILE</string>
                     </property>
                     <property name="toolTip" stdset="0">
-                        <string>Export the kbfxtqlayoutrc file to a folder</string>
+                        <string>Export the kbfxlayoutrc file to a folder</string>
                     </property>
                 </widget>
             </hbox>
@@ -1074,7 +1074,7 @@
     <function access="private">KbfxMakePanel(int)</function>
     <function access="private" returnType="bool">KbfxMessage()</function>
 </functions>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kactivelabel.h</includehint>
     <includehint>kactivelabel.h</includehint>
diff --git a/configdialog/kbfxconfigdlglayout.ui.h b/configdialog/kbfxconfigdlglayout.ui.h
index 3d595d6..d57e9e0 100644
--- a/configdialog/kbfxconfigdlglayout.ui.h
+++ b/configdialog/kbfxconfigdlglayout.ui.h
@@ -457,97 +457,97 @@ void KbfxConfigDlgLayout::KbfxExportFileAction()
 	TQString KbfxExportLayoutRcDialogURL = KFileDialog::getExistingDirectory (
 	                                        TQString(),
 	                                        0,
-	                                        tr2i18n ( "Select folder to export kbfxtqlayoutrc file" ) ).append ( "/kbfxtqlayoutrc" );
+	                                        tr2i18n ( "Select folder to export kbfxlayoutrc file" ) ).append ( "/kbfxlayoutrc" );
 
-	if ( KbfxExportLayoutRcDialogURL == "/kbfxtqlayoutrc") return;
+	if ( KbfxExportLayoutRcDialogURL == "/kbfxlayoutrc") return;
 
 	kdDebug() << "Selected export file is: "
 	<< KbfxExportLayoutRcDialogURL
 	<< endl;
 
 	/* write tqlayout theme configuration file */
-	KConfig *tqlayoutconfig = new KConfig ( KbfxExportLayoutRcDialogURL );
+	KConfig *layoutconfig = new KConfig ( KbfxExportLayoutRcDialogURL );
 
-	tqlayoutconfig->setGroup ( "KbfxButton" );
-	tqlayoutconfig->writeEntry ( "FadeTime", ConfigInit().m_fadeTime );
+	layoutconfig->setGroup ( "KbfxButton" );
+	layoutconfig->writeEntry ( "FadeTime", ConfigInit().m_fadeTime );
 
 /*
 	// No need for this to be exported because it is user/installation specific
-	tqlayoutconfig->writeEntry ( "Normal", ConfigInit().m_KbfxNormalButtonPath );
-	tqlayoutconfig->writeEntry ( "Hover", ConfigInit().m_KbfxHoverButtonPath );
-	tqlayoutconfig->writeEntry ( "Press",  ConfigInit().m_KbfxPressedButtonPath );
-
-	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 );
+	layoutconfig->writeEntry ( "Normal", ConfigInit().m_KbfxNormalButtonPath );
+	layoutconfig->writeEntry ( "Hover", ConfigInit().m_KbfxHoverButtonPath );
+	layoutconfig->writeEntry ( "Press",  ConfigInit().m_KbfxPressedButtonPath );
+
+	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 );
 */
 
-	tqlayoutconfig->setGroup ( "TopBar" );
-	tqlayoutconfig->writeEntry ( "DudeX", ConfigInit().m_facePos_x );
-	tqlayoutconfig->writeEntry ( "DudeY", ConfigInit().m_facePos_y );
-	tqlayoutconfig->writeEntry ( "FaceX", ConfigInit().m_faceIconX );
-	tqlayoutconfig->writeEntry ( "FaceY", ConfigInit().m_faceIconY );
-	tqlayoutconfig->writeEntry ( "FaceH", ConfigInit().m_faceIconH );
-	tqlayoutconfig->writeEntry ( "FaceW", ConfigInit().m_faceIconW );
-	tqlayoutconfig->writeEntry ( "UserNameX", ConfigInit().m_userNamePos_x );
-	tqlayoutconfig->writeEntry ( "UserNameY", ConfigInit().m_userNamePos_y );
-	tqlayoutconfig->writeEntry ( "DisableUserName", ConfigInit().m_faceBoxHideText );
-	tqlayoutconfig->writeEntry ( "Height", ConfigInit().m_topBar_h );
-	tqlayoutconfig->writeEntry ( "Width", ConfigInit().m_topBar_w );
-	tqlayoutconfig->writeEntry ( "X", ConfigInit().m_topBar_x );
-	tqlayoutconfig->writeEntry ( "Y", ConfigInit().m_topBar_y );
-
-	tqlayoutconfig->setGroup ( "BottomBar" );
-	tqlayoutconfig->writeEntry ( "Height", ConfigInit().m_botBar_h );
-	tqlayoutconfig->writeEntry ( "Width", ConfigInit().m_botBar_w );
-	tqlayoutconfig->writeEntry ( "X", ConfigInit().m_botBar_x );
-	tqlayoutconfig->writeEntry ( "Y", ConfigInit().m_botBar_y );
-
-	tqlayoutconfig->setGroup ( "Scrollbars" );
-	tqlayoutconfig->writeEntry ( "ScrollBarBotX", ConfigInit().m_scrollBarBotX );
-	tqlayoutconfig->writeEntry ( "ScrollBarBotY", ConfigInit().m_scrollBarBotY );
-	tqlayoutconfig->writeEntry ( "ScrollBarTopX", ConfigInit().m_scrollBarTopX );
-	tqlayoutconfig->writeEntry ( "ScrollBarTopY", ConfigInit().m_scrollBarTopY );
-
-	tqlayoutconfig->setGroup ( "ListBox" );
-	tqlayoutconfig->writeEntry ( "Height", ConfigInit().m_listBox_h );
-	tqlayoutconfig->writeEntry ( "Width", ConfigInit().m_listBox_w );
-	tqlayoutconfig->writeEntry ( "X", ConfigInit().m_listBox_x );
-	tqlayoutconfig->writeEntry ( "Y", ConfigInit().m_listBox_y );
-
-	tqlayoutconfig->setGroup ( "SearchBox" );
-	tqlayoutconfig->writeEntry ( "Height", ConfigInit().m_searchBox_h );
-	tqlayoutconfig->writeEntry ( "Width", ConfigInit().m_searchBox_w );
-	tqlayoutconfig->writeEntry ( "X", ConfigInit().m_searchBox_x );
-	tqlayoutconfig->writeEntry ( "Y", ConfigInit().m_searchBox_y );
-	tqlayoutconfig->writeEntry ( "FixedPos", ConfigInit().m_searchBox_static );
-
-	tqlayoutconfig->setGroup ( "ItemView" );
-	tqlayoutconfig->writeEntry ( "Height", ConfigInit().m_itemView_h );
-	tqlayoutconfig->writeEntry ( "Width", ConfigInit().m_itemView_w );
-	tqlayoutconfig->writeEntry ( "X", ConfigInit().m_itemView_x );
-	tqlayoutconfig->writeEntry ( "Y", ConfigInit().m_itemView_y );
-
-	tqlayoutconfig->setGroup ( "ToolBar" );
-	tqlayoutconfig->writeEntry ( "ButtonNormalSize", ConfigInit().m_toolBarButtonNormalSize );
-	tqlayoutconfig->writeEntry ( "ButtonPressedSize", ConfigInit().m_toolBarButtonExpandSize );
-
-	tqlayoutconfig->setGroup ( "MainMenu" );
-	tqlayoutconfig->writeEntry ( "UserMenuHeight", ConfigInit().m_userMenuHeight );
-	tqlayoutconfig->writeEntry ( "UserMenuWidth", ConfigInit().m_userMenuWidth );
-	tqlayoutconfig->writeEntry ( "ContractedMenu", ConfigInit().m_startHidden );
-
-	tqlayoutconfig->setGroup ( "ItemProperties" );
-	tqlayoutconfig->writeEntry ( "NoComments", ConfigInit().m_noComments );
-	tqlayoutconfig->writeEntry ( "CommentMargin", ConfigInit().m_commentMargine );
-	tqlayoutconfig->writeEntry ( "IconSize", ConfigInit().m_iconSize );
-
-	tqlayoutconfig->sync();
-
-	delete tqlayoutconfig;
+	layoutconfig->setGroup ( "TopBar" );
+	layoutconfig->writeEntry ( "DudeX", ConfigInit().m_facePos_x );
+	layoutconfig->writeEntry ( "DudeY", ConfigInit().m_facePos_y );
+	layoutconfig->writeEntry ( "FaceX", ConfigInit().m_faceIconX );
+	layoutconfig->writeEntry ( "FaceY", ConfigInit().m_faceIconY );
+	layoutconfig->writeEntry ( "FaceH", ConfigInit().m_faceIconH );
+	layoutconfig->writeEntry ( "FaceW", ConfigInit().m_faceIconW );
+	layoutconfig->writeEntry ( "UserNameX", ConfigInit().m_userNamePos_x );
+	layoutconfig->writeEntry ( "UserNameY", ConfigInit().m_userNamePos_y );
+	layoutconfig->writeEntry ( "DisableUserName", ConfigInit().m_faceBoxHideText );
+	layoutconfig->writeEntry ( "Height", ConfigInit().m_topBar_h );
+	layoutconfig->writeEntry ( "Width", ConfigInit().m_topBar_w );
+	layoutconfig->writeEntry ( "X", ConfigInit().m_topBar_x );
+	layoutconfig->writeEntry ( "Y", ConfigInit().m_topBar_y );
+
+	layoutconfig->setGroup ( "BottomBar" );
+	layoutconfig->writeEntry ( "Height", ConfigInit().m_botBar_h );
+	layoutconfig->writeEntry ( "Width", ConfigInit().m_botBar_w );
+	layoutconfig->writeEntry ( "X", ConfigInit().m_botBar_x );
+	layoutconfig->writeEntry ( "Y", ConfigInit().m_botBar_y );
+
+	layoutconfig->setGroup ( "Scrollbars" );
+	layoutconfig->writeEntry ( "ScrollBarBotX", ConfigInit().m_scrollBarBotX );
+	layoutconfig->writeEntry ( "ScrollBarBotY", ConfigInit().m_scrollBarBotY );
+	layoutconfig->writeEntry ( "ScrollBarTopX", ConfigInit().m_scrollBarTopX );
+	layoutconfig->writeEntry ( "ScrollBarTopY", ConfigInit().m_scrollBarTopY );
+
+	layoutconfig->setGroup ( "ListBox" );
+	layoutconfig->writeEntry ( "Height", ConfigInit().m_listBox_h );
+	layoutconfig->writeEntry ( "Width", ConfigInit().m_listBox_w );
+	layoutconfig->writeEntry ( "X", ConfigInit().m_listBox_x );
+	layoutconfig->writeEntry ( "Y", ConfigInit().m_listBox_y );
+
+	layoutconfig->setGroup ( "SearchBox" );
+	layoutconfig->writeEntry ( "Height", ConfigInit().m_searchBox_h );
+	layoutconfig->writeEntry ( "Width", ConfigInit().m_searchBox_w );
+	layoutconfig->writeEntry ( "X", ConfigInit().m_searchBox_x );
+	layoutconfig->writeEntry ( "Y", ConfigInit().m_searchBox_y );
+	layoutconfig->writeEntry ( "FixedPos", ConfigInit().m_searchBox_static );
+
+	layoutconfig->setGroup ( "ItemView" );
+	layoutconfig->writeEntry ( "Height", ConfigInit().m_itemView_h );
+	layoutconfig->writeEntry ( "Width", ConfigInit().m_itemView_w );
+	layoutconfig->writeEntry ( "X", ConfigInit().m_itemView_x );
+	layoutconfig->writeEntry ( "Y", ConfigInit().m_itemView_y );
+
+	layoutconfig->setGroup ( "ToolBar" );
+	layoutconfig->writeEntry ( "ButtonNormalSize", ConfigInit().m_toolBarButtonNormalSize );
+	layoutconfig->writeEntry ( "ButtonPressedSize", ConfigInit().m_toolBarButtonExpandSize );
+
+	layoutconfig->setGroup ( "MainMenu" );
+	layoutconfig->writeEntry ( "UserMenuHeight", ConfigInit().m_userMenuHeight );
+	layoutconfig->writeEntry ( "UserMenuWidth", ConfigInit().m_userMenuWidth );
+	layoutconfig->writeEntry ( "ContractedMenu", ConfigInit().m_startHidden );
+
+	layoutconfig->setGroup ( "ItemProperties" );
+	layoutconfig->writeEntry ( "NoComments", ConfigInit().m_noComments );
+	layoutconfig->writeEntry ( "CommentMargin", ConfigInit().m_commentMargine );
+	layoutconfig->writeEntry ( "IconSize", ConfigInit().m_iconSize );
+
+	layoutconfig->sync();
+
+	delete layoutconfig;
 
 	KMessageBox::information ( 0,
 	                           tr2i18n ( "<p align='center'>The Layout configuration of the KBFX Theme <strong>%1</strong> has been exported successfully!</p>" ).arg ( ConfigInit().m_SpinxThemeName ),
diff --git a/configdialog/kbfxconfigdlgmain.ui b/configdialog/kbfxconfigdlgmain.ui
index 2d110f2..96d30f5 100644
--- a/configdialog/kbfxconfigdlgmain.ui
+++ b/configdialog/kbfxconfigdlgmain.ui
@@ -663,7 +663,7 @@
 <functions>
     <function access="private" specifier="non virtual">init()</function>
 </functions>
-<tqlayoutdefaults spacing="10" margin="10"/>
+<layoutdefaults spacing="10" margin="10"/>
 <includehints>
     <includehint>kactivelabel.h</includehint>
 </includehints>
diff --git a/configdialog/kbfxconfigdlgplugins.ui b/configdialog/kbfxconfigdlgplugins.ui
index 313168a..201e2f0 100644
--- a/configdialog/kbfxconfigdlgplugins.ui
+++ b/configdialog/kbfxconfigdlgplugins.ui
@@ -381,7 +381,7 @@
     <function access="private" returnType="TQStringList">KbfxListPlugins( int panel )</function>
     <function access="private">KbfxSaveSelectedPlugins()</function>
 </functions>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kactivelabel.h</includehint>
     <includehint>kcombobox.h</includehint>
diff --git a/configdialog/kbfxconfigdlgstyle.ui b/configdialog/kbfxconfigdlgstyle.ui
index 22c0f67..40220c0 100644
--- a/configdialog/kbfxconfigdlgstyle.ui
+++ b/configdialog/kbfxconfigdlgstyle.ui
@@ -498,7 +498,7 @@
     <slot>KbfxStyleSelected( int )</slot>
     <slot>ChangeForm()</slot>
 </Q_SLOTS>
-<tqlayoutdefaults spacing="6" margin="0"/>
+<layoutdefaults spacing="6" margin="0"/>
 <includehints>
     <includehint>kactivelabel.h</includehint>
 </includehints>
diff --git a/configdialog/kbfxconfigdlgthemes.ui b/configdialog/kbfxconfigdlgthemes.ui
index 0d9a6e5..1d37a64 100644
--- a/configdialog/kbfxconfigdlgthemes.ui
+++ b/configdialog/kbfxconfigdlgthemes.ui
@@ -1021,7 +1021,7 @@
 <functions>
     <function access="private" specifier="non virtual">init()</function>
 </functions>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kurlrequester.h</includehint>
     <includehint>klineedit.h</includehint>
diff --git a/configdialog/kbfxconfigdlgthemes.ui.h b/configdialog/kbfxconfigdlgthemes.ui.h
index 7689989..e960eac 100644
--- a/configdialog/kbfxconfigdlgthemes.ui.h
+++ b/configdialog/kbfxconfigdlgthemes.ui.h
@@ -192,7 +192,7 @@ void KbfxConfigDlgThemes::KbfxDeleteThemeClicked()
 		if ( TQFile::exists ( KbfxThemeRcDestination + "_layoutrc" ) )
 		{
 			TQFile::remove ( KbfxThemeRcDestination + "_layoutrc" );
-			kdDebug() << "Deleting user's tqlayoutrc file: "
+			kdDebug() << "Deleting user's layoutrc file: "
 			<< KbfxThemeRcDestination + "_layoutrc"
 			<< endl;
 		}
diff --git a/configdialog/kbfxconfigdlgtooltip.ui b/configdialog/kbfxconfigdlgtooltip.ui
index cd473f6..d5005ae 100644
--- a/configdialog/kbfxconfigdlgtooltip.ui
+++ b/configdialog/kbfxconfigdlgtooltip.ui
@@ -706,7 +706,7 @@
 <functions>
     <function access="private" specifier="non virtual">init()</function>
 </functions>
-<tqlayoutdefaults spacing="6" margin="0"/>
+<layoutdefaults spacing="6" margin="0"/>
 <includehints>
     <includehint>kactivelabel.h</includehint>
     <includehint>kactivelabel.h</includehint>
diff --git a/configdialog/kbfxthemeinfo.ui b/configdialog/kbfxthemeinfo.ui
index 0338039..c52b7ea 100644
--- a/configdialog/kbfxthemeinfo.ui
+++ b/configdialog/kbfxthemeinfo.ui
@@ -587,7 +587,7 @@
 <functions>
     <function access="private" specifier="non virtual">init()</function>
 </functions>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kactivelabel.h</includehint>
     <includehint>kactivelabel.h</includehint>
diff --git a/kbfxlib/common/kbfxconfig.cpp b/kbfxlib/common/kbfxconfig.cpp
index 0b256f2..99d60d6 100644
--- a/kbfxlib/common/kbfxconfig.cpp
+++ b/kbfxlib/common/kbfxconfig.cpp
@@ -527,11 +527,11 @@ void KbfxConfig::readThemerc ( TQString &themePath, TQString &themeName, bool us
 
 	/* get some theme tqlayout settings from theme file or from theme section */
 	TQString _abs_path = "";
-	TQFileInfo * info = new TQFileInfo ( themePath + themeName + "/kbfxtqlayoutrc" );
+	TQFileInfo * info = new TQFileInfo ( themePath + themeName + "/kbfxlayoutrc" );
 	TQFileInfo * info_theme =  new TQFileInfo ( KbfxThemeRcDestination + "/" +  themeName + "_layoutrc" );
-	KConfig *tqlayoutconfig = 0;
+	KConfig *layoutconfig = 0;
 
-	/* if theme kbfxtqlayoutrc exists, make its configuration as default values - prefer users' configuration */
+	/* if theme kbfxlayoutrc 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,80 +543,80 @@ void KbfxConfig::readThemerc ( TQString &themePath, TQString &themeName, bool us
 			_abs_path = info->absFilePath();
 		}
 
-		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 );
+		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 tqlayout settings for theme: "
 		<< themeName
@@ -691,7 +691,7 @@ void KbfxConfig::readThemerc ( TQString &themePath, TQString &themeName, bool us
 
 	delete info;
 	delete info_theme;
-	delete tqlayoutconfig;
+	delete layoutconfig;
 }
 
 void KbfxConfig::write()
@@ -775,84 +775,84 @@ void KbfxConfig::writeThemerc ( TQString & themeName )
 	checkValues();
 
 	/* 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;
+	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;
 }
 
 void KbfxConfig::checkValues()
diff --git a/src/kbfxspinxmenu.cpp b/src/kbfxspinxmenu.cpp
index 6af42ef..ed9924d 100644
--- a/src/kbfxspinxmenu.cpp
+++ b/src/kbfxspinxmenu.cpp
@@ -232,36 +232,36 @@ KbfxSpinxMenuWidget::changeHeight (int het)
 void
 KbfxSpinxMenuWidget::createMask ()
 {
-	TQPixmap tqmaskpng = ( *KbfxPlasmaPixmapProvider::pixmap ( "tqmask" ) );
-	TQImage rawimg = tqmaskpng.convertToImage ();
+	TQPixmap maskpng = ( *KbfxPlasmaPixmapProvider::pixmap ( "tqmask" ) );
+	TQImage rawimg = maskpng.convertToImage ();
 
 	rawimg =
 	    rawimg.smoothScale ( ConfigInit ().m_userMenuWidth,
 	                   ConfigInit ().m_userMenuHeight,
 	                   TQ_ScaleFree );
 
-	tqmaskpng.convertFromImage ( rawimg );
+	maskpng.convertFromImage ( rawimg );
 
-	setMinimumWidth ( tqmaskpng.width () );
-	setMinimumHeight ( tqmaskpng.height () );
-//	setMaximumWidth ( tqmaskpng.width () );
-//	setMaximumHeight ( tqmaskpng.height () );
-	if ( !tqmaskpng.tqmask () )
+	setMinimumWidth ( maskpng.width () );
+	setMinimumHeight ( maskpng.height () );
+//	setMaximumWidth ( maskpng.width () );
+//	setMaximumHeight ( maskpng.height () );
+	if ( !maskpng.tqmask () )
 		if ( rawimg.hasAlphaBuffer () )
 		{
 			TQBitmap bm;
 			bm.convertFromImage(rawimg.createAlphaMask ());
-			tqmaskpng.setMask ( bm );
+			maskpng.setMask ( bm );
 		}
 		else
 		{
 			TQBitmap bm;
 			bm.convertFromImage(rawimg.createHeuristicMask ());
-		//	tqmaskpng.setMask ( bm );
+		//	maskpng.setMask ( bm );
 		}
 
-	if ( tqmaskpng.tqmask () && m_parent )
-		m_parent->setMask ( *tqmaskpng.tqmask () );
+	if ( maskpng.tqmask () && m_parent )
+		m_parent->setMask ( *maskpng.tqmask () );
 }
 
 void