diff options
38 files changed, 74 insertions, 74 deletions
diff --git a/configdialog/kbfxconfigapp.cpp b/configdialog/kbfxconfigapp.cpp index 127a7f2..c12522a 100644 --- a/configdialog/kbfxconfigapp.cpp +++ b/configdialog/kbfxconfigapp.cpp @@ -21,8 +21,8 @@ #include "kbfxconfigapp.h" -KbfxConfigApp::KbfxConfigApp ( TQWidget* tqparent, const char* name, WFlags fl ) - : KbfxConfigDlgMain ( tqparent,name,fl ) +KbfxConfigApp::KbfxConfigApp ( TQWidget* parent, const char* name, WFlags fl ) + : KbfxConfigDlgMain ( parent,name,fl ) { // m_KbfxVersion = tr2i18n("<p align='center'>Running KBFX version: " APPLICATION_VERSION "</p>"); m_KbfxVersion = tr2i18n ( "<p align='center'>%1</p>" ); diff --git a/configdialog/kbfxconfigapp.h b/configdialog/kbfxconfigapp.h index aa22861..3b64e45 100644 --- a/configdialog/kbfxconfigapp.h +++ b/configdialog/kbfxconfigapp.h @@ -94,7 +94,7 @@ class KbfxConfigApp : public KbfxConfigDlgMain /** * Default Constructor */ - KbfxConfigApp ( TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 ); + KbfxConfigApp ( TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); /** * Default Destructor diff --git a/kbfxlib/common/kbfxconfig.cpp b/kbfxlib/common/kbfxconfig.cpp index c279a41..942a173 100644 --- a/kbfxlib/common/kbfxconfig.cpp +++ b/kbfxlib/common/kbfxconfig.cpp @@ -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_tqmask.png"; + m_SpinxTooltipMaskDefault = path + "default/tooltip_mask.png"; m_SpinxTooltipWindowDefault = path + "default/tooltip_window.png"; m_SpinxTooltipLogoDefault = path + "default/tooltip_logo.png"; @@ -519,7 +519,7 @@ void KbfxConfig::readThemerc ( TQString &themePath, TQString &themeName, bool us /* 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_tqmask", themePath, themeName ); + m_SpinxTooltipMaskDefault = KbfxPlasmaPixmapProvider::PixmapPath ( "tooltip_mask", themePath, themeName ); m_SpinxTooltipWindowDefault = KbfxPlasmaPixmapProvider::PixmapPath ( "tooltip_window", themePath, themeName ); m_SpinxTooltipLogoDefault = KbfxPlasmaPixmapProvider::PixmapPath ( "tooltip_logo", themePath, themeName ); diff --git a/kbfxlib/common/kbfxfontchooser.cpp b/kbfxlib/common/kbfxfontchooser.cpp index 24f773a..2a445d6 100644 --- a/kbfxlib/common/kbfxfontchooser.cpp +++ b/kbfxlib/common/kbfxfontchooser.cpp @@ -20,8 +20,8 @@ #include "kbfxfontchooser.h" -KBFXFontChooser::KBFXFontChooser ( TQWidget *tqparent, const char *name ) - : TQWidget ( tqparent, name ) +KBFXFontChooser::KBFXFontChooser ( TQWidget *parent, const char *name ) + : TQWidget ( parent, name ) { TQHBoxLayout* tqlayout = new TQHBoxLayout ( this, 0, KDialog::spacingHint() ); diff --git a/kbfxlib/common/kbfxfontchooser.h b/kbfxlib/common/kbfxfontchooser.h index d0535d1..8d0191d 100644 --- a/kbfxlib/common/kbfxfontchooser.h +++ b/kbfxlib/common/kbfxfontchooser.h @@ -45,7 +45,7 @@ class KBFXFontChooser : public TQWidget TQ_OBJECT TQ_PROPERTY ( TQFont font READ font WRITE setFont ) public: - KBFXFontChooser ( TQWidget *tqparent = 0, const char *name = 0 ); + KBFXFontChooser ( TQWidget *parent = 0, const char *name = 0 ); ~KBFXFontChooser(); TQFont font() const { return m_font; }; diff --git a/kbfxlib/common/kbfxkiodownload.cpp b/kbfxlib/common/kbfxkiodownload.cpp index 59d0db2..8a74b38 100644 --- a/kbfxlib/common/kbfxkiodownload.cpp +++ b/kbfxlib/common/kbfxkiodownload.cpp @@ -21,8 +21,8 @@ #include "kbfxkiodownload.h" -KbfxKioDownload::KbfxKioDownload ( TQObject *tqparent, const char *name ) - : TQObject ( tqparent, name ) +KbfxKioDownload::KbfxKioDownload ( TQObject *parent, const char *name ) + : TQObject ( parent, name ) { m_KbfxBrowserError = 0; m_KbfxBrowserErrorText = "No error"; diff --git a/kbfxlib/common/kbfxkiodownload.h b/kbfxlib/common/kbfxkiodownload.h index 7765076..5058750 100644 --- a/kbfxlib/common/kbfxkiodownload.h +++ b/kbfxlib/common/kbfxkiodownload.h @@ -35,7 +35,7 @@ class KbfxKioDownload : public TQObject TQ_OBJECT public: - KbfxKioDownload ( TQObject * tqparent = 0, const char * name = 0 ); + KbfxKioDownload ( TQObject * parent = 0, const char * name = 0 ); ~KbfxKioDownload(); /* KbfxKioDownload invocation - pass an url as TQString */ diff --git a/kbfxlib/common/kbfxpixmaplabel.cpp b/kbfxlib/common/kbfxpixmaplabel.cpp index 9907473..25f43bc 100644 --- a/kbfxlib/common/kbfxpixmaplabel.cpp +++ b/kbfxlib/common/kbfxpixmaplabel.cpp @@ -21,8 +21,8 @@ #include "kbfxpixmaplabel.h" -KbfxPixmapLabel::KbfxPixmapLabel ( TQWidget *tqparent, const char *name, WFlags fl ) - : TQLabel ( tqparent, name, fl ) +KbfxPixmapLabel::KbfxPixmapLabel ( TQWidget *parent, const char *name, WFlags fl ) + : TQLabel ( parent, name, fl ) { // setFrameShape(TQLabel::WinPanel); // setFrameShadow(TQLabel::Sunken); diff --git a/kbfxlib/common/kbfxpixmaplabel.h b/kbfxlib/common/kbfxpixmaplabel.h index 51091aa..decbf50 100644 --- a/kbfxlib/common/kbfxpixmaplabel.h +++ b/kbfxlib/common/kbfxpixmaplabel.h @@ -33,7 +33,7 @@ class KbfxPixmapLabel : public TQLabel TQ_OBJECT public: - KbfxPixmapLabel ( TQWidget *tqparent = 0, const char *name = 0, WFlags f = 0 ); + KbfxPixmapLabel ( TQWidget *parent = 0, const char *name = 0, WFlags f = 0 ); ~KbfxPixmapLabel (); void dragEnterEvent ( TQDragEnterEvent *mouseDragEnterEvent ); diff --git a/kbfxlib/common/kbfxplasmapixmapprovider.cpp b/kbfxlib/common/kbfxplasmapixmapprovider.cpp index d334a01..abfc410 100644 --- a/kbfxlib/common/kbfxplasmapixmapprovider.cpp +++ b/kbfxlib/common/kbfxplasmapixmapprovider.cpp @@ -99,7 +99,7 @@ void KbfxPlasmaPixmapProvider::buildCache() <<"lockhover" <<"logout" <<"logouthover" - <<"tqmask" + <<"mask" <<"menu_top" <<"menu_top_image_person" <<"middleboxbg" diff --git a/kbfxlib/common/kbfxpushbutton.cpp b/kbfxlib/common/kbfxpushbutton.cpp index bc62903..098ea11 100644 --- a/kbfxlib/common/kbfxpushbutton.cpp +++ b/kbfxlib/common/kbfxpushbutton.cpp @@ -21,8 +21,8 @@ #include "kbfxpushbutton.h" -KbfxPushButton::KbfxPushButton ( TQWidget *tqparent, const char *name ) - : KPushButton ( tqparent, name ) +KbfxPushButton::KbfxPushButton ( TQWidget *parent, const char *name ) + : KPushButton ( parent, name ) { setText ( "P R E V I E W" ); setToggleButton ( TRUE ); diff --git a/kbfxlib/common/kbfxpushbutton.h b/kbfxlib/common/kbfxpushbutton.h index dc38e05..65f20e5 100644 --- a/kbfxlib/common/kbfxpushbutton.h +++ b/kbfxlib/common/kbfxpushbutton.h @@ -32,7 +32,7 @@ class KbfxPushButton: public KPushButton TQ_OBJECT public: - KbfxPushButton ( TQWidget *tqparent = 0, const char *name = 0 ); + KbfxPushButton ( TQWidget *parent = 0, const char *name = 0 ); ~KbfxPushButton(); void enterEvent ( TQEvent * ); diff --git a/src/kbfxbutton.cpp b/src/kbfxbutton.cpp index 4815a6b..a3a0f87 100644 --- a/src/kbfxbutton.cpp +++ b/src/kbfxbutton.cpp @@ -27,8 +27,8 @@ bool KbfxButton::m_sizeHeight = TRUE; int KbfxButton::m_size = 0; -KbfxButton::KbfxButton ( TQWidget * tqparent, const char *name) : - TQLabel ( tqparent,name,TQt::WStaticContents | TQt::WNoAutoErase |TQt::WPaintDesktop ) +KbfxButton::KbfxButton ( TQWidget * parent, const char *name) : + TQLabel ( parent,name,TQt::WStaticContents | TQt::WNoAutoErase |TQt::WPaintDesktop ) { setLineWidth ( 0 ); setScaledContents ( false ); diff --git a/src/kbfxbutton.h b/src/kbfxbutton.h index a333b2d..7467ac0 100644 --- a/src/kbfxbutton.h +++ b/src/kbfxbutton.h @@ -51,7 +51,7 @@ class KbfxButton:public TQLabel TQ_OBJECT public: - KbfxButton ( TQWidget * tqparent, const char * name = 0 ); + KbfxButton ( TQWidget * parent, const char * name = 0 ); ~KbfxButton(); void kbfx_vista_button_setFx ( bool choice ); virtual void paintEvent ( TQPaintEvent *pe ); diff --git a/src/kbfxplasmacanvasview.cpp b/src/kbfxplasmacanvasview.cpp index 1484f9a..d50e33b 100644 --- a/src/kbfxplasmacanvasview.cpp +++ b/src/kbfxplasmacanvasview.cpp @@ -21,9 +21,9 @@ #include "kbfxplasmacanvasview.h" -KbfxPlasmaCanvasView::KbfxPlasmaCanvasView ( TQWidget * tqparent, +KbfxPlasmaCanvasView::KbfxPlasmaCanvasView ( TQWidget * parent, const char *name, WFlags fl ) : - TQCanvasView ( tqparent, name,fl ) + TQCanvasView ( parent, name,fl ) { viewport ()->setMouseTracking ( TRUE ); diff --git a/src/kbfxplasmacanvasview.h b/src/kbfxplasmacanvasview.h index 4d7df00..5a13999 100644 --- a/src/kbfxplasmacanvasview.h +++ b/src/kbfxplasmacanvasview.h @@ -59,7 +59,7 @@ class KbfxPlasmaCanvasView : public TQCanvasView typedef TQMap<TQString,KbfxDataStack*> dataStack; typedef TQMap<int,KbfxPlasmaCanvasItem*> searchMap; - KbfxPlasmaCanvasView ( TQWidget * tqparent = 0, const char * name = 0, WFlags f = 0 ); + KbfxPlasmaCanvasView ( TQWidget * parent = 0, const char * name = 0, WFlags f = 0 ); virtual ~KbfxPlasmaCanvasView(); void addStack ( KbfxPlasmaCanvasStack*stk,TQString name ); void addStack ( KbfxDataStack*stk,TQString name ); diff --git a/src/kbfxplasmaindexitem.cpp b/src/kbfxplasmaindexitem.cpp index 3c08d3c..b7a37fd 100644 --- a/src/kbfxplasmaindexitem.cpp +++ b/src/kbfxplasmaindexitem.cpp @@ -168,9 +168,9 @@ KbfxPlasmaIndexItem::belongsTo() } void -KbfxPlasmaIndexItem::setBelongsTo ( TQString tqparent ) +KbfxPlasmaIndexItem::setBelongsTo ( TQString parent ) { - m_parent = tqparent; + m_parent = parent; } diff --git a/src/kbfxplasmaindexitem.h b/src/kbfxplasmaindexitem.h index cd58f81..ec77faf 100644 --- a/src/kbfxplasmaindexitem.h +++ b/src/kbfxplasmaindexitem.h @@ -39,7 +39,7 @@ class KbfxPlasmaIndexItem : public KbfxPlasmaCanvasAbstractItem void setId ( int id ); //void setName(TQString name); void setLabelText ( TQString text ); - void setBelongsTo ( TQString tqparent ); + void setBelongsTo ( TQString parent ); TQString belongsTo(); int height(); void setSelected ( bool select ); diff --git a/src/kbfxplasmaindexview.cpp b/src/kbfxplasmaindexview.cpp index 68bee8f..c0a0216 100644 --- a/src/kbfxplasmaindexview.cpp +++ b/src/kbfxplasmaindexview.cpp @@ -21,9 +21,9 @@ #include "kbfxplasmaindexview.h" -KbfxPlasmaIndexView::KbfxPlasmaIndexView ( TQWidget * tqparent, const char *name, +KbfxPlasmaIndexView::KbfxPlasmaIndexView ( TQWidget * parent, const char *name, WFlags l ) : - TQCanvasView ( tqparent, name, l ) + TQCanvasView ( parent, name, l ) { m_itemGroup = new KbfxPlasmaCanvasGroup (); m_itemGroupList = new KbfxPlasmaCanvasGroupView (); diff --git a/src/kbfxplasmaindexview.h b/src/kbfxplasmaindexview.h index 59e44bf..587b090 100644 --- a/src/kbfxplasmaindexview.h +++ b/src/kbfxplasmaindexview.h @@ -47,7 +47,7 @@ class KbfxPlasmaIndexView : public TQCanvasView public: - KbfxPlasmaIndexView ( TQWidget * tqparent = 0, const char * name = 0, WFlags l = 0 ); + KbfxPlasmaIndexView ( TQWidget * parent = 0, const char * name = 0, WFlags l = 0 ); virtual ~KbfxPlasmaIndexView(); void loadList ( KbfxDataStack * stkPtr ); int count() { return m_itemGroup->count() ; } diff --git a/src/kbfxspinx.cpp b/src/kbfxspinx.cpp index af0e65f..4510f38 100644 --- a/src/kbfxspinx.cpp +++ b/src/kbfxspinx.cpp @@ -25,10 +25,10 @@ bool KbfxSpinx::m_horizontal_position = TRUE; -KbfxSpinx::KbfxSpinx ( const TQString& configFile, Type type, int actions, TQWidget *tqparent, const char *name ) - : KPanelApplet ( configFile, type, actions, tqparent, name ),DCOPObject ( "KBFXInterface" ) +KbfxSpinx::KbfxSpinx ( const TQString& configFile, Type type, int actions, TQWidget *parent, const char *name ) + : KPanelApplet ( configFile, type, actions, parent, name ),DCOPObject ( "KBFXInterface" ) { - m_parent = tqparent; + m_parent = parent; createKbfx(); } @@ -95,7 +95,7 @@ void KbfxSpinx::notifyConfigChange() /* FIXME The delete here does not reload everything. - Only the button and the tqparent menu. + Only the button and the parent menu. Carefull memory de-allocation is needed before deleteing further :-( Else be ready for a nice backtrace. Memleak is obvious. @@ -315,12 +315,12 @@ TQPoint KbfxSpinx::menuPosition() extern "C" { - KPanelApplet* init ( TQWidget *tqparent, const TQString& configFile ) + KPanelApplet* init ( TQWidget *parent, const TQString& configFile ) { KGlobal::locale()->insertCatalogue ( "KbfxSpinx" ); return new KbfxSpinx ( configFile, KPanelApplet::Normal, KPanelApplet::About | KPanelApplet::Help | KPanelApplet::Preferences, - tqparent, "KbfxSpinx" ); + parent, "KbfxSpinx" ); } } diff --git a/src/kbfxspinx.h b/src/kbfxspinx.h index 8e02421..5aa86c3 100644 --- a/src/kbfxspinx.h +++ b/src/kbfxspinx.h @@ -67,7 +67,7 @@ class KbfxSpinx : public KPanelApplet,public DCOPObject public: KbfxSpinx ( const TQString& configFile, Type t = Normal, int actions = 0, - TQWidget *tqparent = 0, const char *name = 0 ); + TQWidget *parent = 0, const char *name = 0 ); ~KbfxSpinx(); virtual int widthForHeight ( int height ) const; diff --git a/src/kbfxspinxmenu.cpp b/src/kbfxspinxmenu.cpp index 6f1ab9a..3dd3432 100644 --- a/src/kbfxspinxmenu.cpp +++ b/src/kbfxspinxmenu.cpp @@ -21,12 +21,12 @@ #include "kbfxspinxmenu.h" -KbfxSpinxMenuWidget::KbfxSpinxMenuWidget ( TQWidget * tqparent, const char *name, +KbfxSpinxMenuWidget::KbfxSpinxMenuWidget ( TQWidget * parent, const char *name, WFlags fl ) : - TQWidget ( tqparent, "MenuWidget", + TQWidget ( parent, "MenuWidget", fl | TQt::WStyle_Customize | TQt::WStyle_NoBorder | TQt::WStyle_StaysOnTop ) { - m_parent = tqparent; + m_parent = parent; TQString _name=name; init(); @@ -232,7 +232,7 @@ KbfxSpinxMenuWidget::changeHeight (int het) void KbfxSpinxMenuWidget::createMask () { - TQPixmap maskpng = ( *KbfxPlasmaPixmapProvider::pixmap ( "tqmask" ) ); + TQPixmap maskpng = ( *KbfxPlasmaPixmapProvider::pixmap ( "mask" ) ); TQImage rawimg = maskpng.convertToImage (); rawimg = @@ -246,7 +246,7 @@ KbfxSpinxMenuWidget::createMask () setMinimumHeight ( maskpng.height () ); // setMaximumWidth ( maskpng.width () ); // setMaximumHeight ( maskpng.height () ); - if ( !maskpng.tqmask () ) + if ( !maskpng.mask () ) if ( rawimg.hasAlphaBuffer () ) { TQBitmap bm; @@ -260,8 +260,8 @@ KbfxSpinxMenuWidget::createMask () // maskpng.setMask ( bm ); } - if ( maskpng.tqmask () && m_parent ) - m_parent->setMask ( *maskpng.tqmask () ); + if ( maskpng.mask () && m_parent ) + m_parent->setMask ( *maskpng.mask () ); } void diff --git a/src/kbfxspinxmenu.h b/src/kbfxspinxmenu.h index f897691..93dcada 100644 --- a/src/kbfxspinxmenu.h +++ b/src/kbfxspinxmenu.h @@ -64,7 +64,7 @@ class KbfxSpinxMenuWidget:public TQWidget Q_OBJECT TQ_OBJECT public : - KbfxSpinxMenuWidget ( TQWidget * tqparent = 0, const char * name = 0,WFlags fl =0 ); + KbfxSpinxMenuWidget ( TQWidget * parent = 0, const char * name = 0,WFlags fl =0 ); virtual ~KbfxSpinxMenuWidget(); // virtual void mouseMoveEvent(TQMouseEvent * me); // virtual void focusInEvent ( TQFocusEvent * ) ; diff --git a/src/kbfxspinxpopup.cpp b/src/kbfxspinxpopup.cpp index 677687d..2afc10f 100644 --- a/src/kbfxspinxpopup.cpp +++ b/src/kbfxspinxpopup.cpp @@ -32,7 +32,7 @@ // #include "kbfxspinxpopup.h" -KbfxSpinxPopUp::KbfxSpinxPopUp ( TQWidget * tqparent, const char * name ) :TQPopupMenu ( tqparent,name ) +KbfxSpinxPopUp::KbfxSpinxPopUp ( TQWidget * parent, const char * name ) :TQPopupMenu ( parent,name ) { m_mainItem = 0L; } diff --git a/src/kbfxspinxpopup.h b/src/kbfxspinxpopup.h index 821d829..55cbad9 100644 --- a/src/kbfxspinxpopup.h +++ b/src/kbfxspinxpopup.h @@ -47,7 +47,7 @@ class KbfxSpinxPopUp : public TQPopupMenu TQ_OBJECT public: - KbfxSpinxPopUp ( TQWidget * tqparent = 0, const char * name = 0 ) ; + KbfxSpinxPopUp ( TQWidget * parent = 0, const char * name = 0 ) ; ~KbfxSpinxPopUp(); virtual void keyPressEvent ( TQKeyEvent * ke ); diff --git a/src/kbfxspinxscrollbar.cpp b/src/kbfxspinxscrollbar.cpp index c2f7d08..59cdaf0 100644 --- a/src/kbfxspinxscrollbar.cpp +++ b/src/kbfxspinxscrollbar.cpp @@ -21,8 +21,8 @@ #include "kbfxspinxscrollbar.h" -KbfxSpinxScrollBar::KbfxSpinxScrollBar ( TQWidget * tqparent, const char *name, int type ) : - TQWidget ( tqparent, name ) +KbfxSpinxScrollBar::KbfxSpinxScrollBar ( TQWidget * parent, const char *name, int type ) : + TQWidget ( parent, name ) { if (type == 0){ m_normal = ( *KbfxPlasmaPixmapProvider::pixmap ( "scrollnormal" ) ); diff --git a/src/kbfxspinxscrollbar.h b/src/kbfxspinxscrollbar.h index 8ed7b73..50daf01 100644 --- a/src/kbfxspinxscrollbar.h +++ b/src/kbfxspinxscrollbar.h @@ -41,7 +41,7 @@ class KbfxSpinxScrollBar:public TQWidget TQ_OBJECT public: typedef enum {UP,DOWN,LEFT,RIGHT} Direction; - KbfxSpinxScrollBar ( TQWidget * tqparent = 0,const char * name = 0,int type = 0 ); + KbfxSpinxScrollBar ( TQWidget * parent = 0,const char * name = 0,int type = 0 ); ~KbfxSpinxScrollBar(); virtual void paintEvent ( TQPaintEvent * ev ); virtual void mousePressEvent ( TQMouseEvent * me ); diff --git a/src/kbfxspinxtoolbar.cpp b/src/kbfxspinxtoolbar.cpp index bd8b029..80195b5 100644 --- a/src/kbfxspinxtoolbar.cpp +++ b/src/kbfxspinxtoolbar.cpp @@ -21,7 +21,7 @@ #include "kbfxspinxtoolbar.h" -KbfxSpinxToolBar::KbfxSpinxToolBar ( TQWidget * tqparent , const char * name , WFlags l ) :TQWidget ( tqparent,name,l ) +KbfxSpinxToolBar::KbfxSpinxToolBar ( TQWidget * parent , const char * name , WFlags l ) :TQWidget ( parent,name,l ) { _y = 0; diff --git a/src/kbfxspinxtoolbar.h b/src/kbfxspinxtoolbar.h index 802c137..b598b46 100644 --- a/src/kbfxspinxtoolbar.h +++ b/src/kbfxspinxtoolbar.h @@ -38,7 +38,7 @@ class KbfxSpinxToolBar:public TQWidget Q_OBJECT TQ_OBJECT public: - KbfxSpinxToolBar ( TQWidget * tqparent = 0, const char * name = 0, WFlags f = 0 ); + KbfxSpinxToolBar ( TQWidget * parent = 0, const char * name = 0, WFlags f = 0 ); virtual ~KbfxSpinxToolBar(); virtual void paintEvent ( TQPaintEvent * pe ); diff --git a/src/kbfxspinxtoolbutton.cpp b/src/kbfxspinxtoolbutton.cpp index ec69685..9f90102 100644 --- a/src/kbfxspinxtoolbutton.cpp +++ b/src/kbfxspinxtoolbutton.cpp @@ -21,7 +21,7 @@ #include "kbfxspinxtoolbutton.h" -KbfxSpinxToolButton::KbfxSpinxToolButton ( TQWidget * tqparent , const char * name ) :TQLabel ( tqparent,name,TQt::WStaticContents | TQt::WNoAutoErase |TQt::WPaintDesktop ) +KbfxSpinxToolButton::KbfxSpinxToolButton ( TQWidget * parent , const char * name ) :TQLabel ( parent,name,TQt::WStaticContents | TQt::WNoAutoErase |TQt::WPaintDesktop ) { m_dataSource = 0; m_dataGroup = 0; diff --git a/src/kbfxspinxtoolbutton.h b/src/kbfxspinxtoolbutton.h index a8a73dd..88cbcac 100644 --- a/src/kbfxspinxtoolbutton.h +++ b/src/kbfxspinxtoolbutton.h @@ -48,7 +48,7 @@ class KbfxSpinxToolButton:public TQLabel public: typedef enum{SINGLE=0,EXPANDABLE} ButtonType; - KbfxSpinxToolButton ( TQWidget * tqparent = 0, const char * name = 0 ); + KbfxSpinxToolButton ( TQWidget * parent = 0, const char * name = 0 ); virtual ~KbfxSpinxToolButton(); virtual void paintEvent ( TQPaintEvent * pe ); diff --git a/src/kbfxspinxtop.cpp b/src/kbfxspinxtop.cpp index 5a4fdf3..d2a651a 100644 --- a/src/kbfxspinxtop.cpp +++ b/src/kbfxspinxtop.cpp @@ -21,7 +21,7 @@ #include "kbfxspinxtop.h" -KbfxSpinxTop::KbfxSpinxTop ( TQWidget * tqparent,const char * name ) :TQWidget ( tqparent,name,TQt::WNoAutoErase | WStaticContents | TQt::WPaintClever | TQt::WNoAutoErase ) +KbfxSpinxTop::KbfxSpinxTop ( TQWidget * parent,const char * name ) :TQWidget ( parent,name,TQt::WNoAutoErase | WStaticContents | TQt::WPaintClever | TQt::WNoAutoErase ) { m_background = ( *KbfxPlasmaPixmapProvider::pixmap ( "topbg" ) ); diff --git a/src/kbfxspinxtop.h b/src/kbfxspinxtop.h index cf5460e..7c94ae9 100644 --- a/src/kbfxspinxtop.h +++ b/src/kbfxspinxtop.h @@ -40,7 +40,7 @@ class KbfxSpinxTop:public TQWidget TQ_OBJECT public: - KbfxSpinxTop ( TQWidget * tqparent = 0,const char * name = 0 ); + KbfxSpinxTop ( TQWidget * parent = 0,const char * name = 0 ); virtual ~KbfxSpinxTop(); virtual void paintEvent ( TQPaintEvent * ); diff --git a/src/kbfxspinxview.cpp b/src/kbfxspinxview.cpp index 5ff5776..3acdad1 100644 --- a/src/kbfxspinxview.cpp +++ b/src/kbfxspinxview.cpp @@ -21,7 +21,7 @@ #include "kbfxspinxview.h" -KbfxSpinxView::KbfxSpinxView ( TQWidget * tqparent , const char * name,WFlags flag ) :TQFrame ( tqparent,name,flag ) +KbfxSpinxView::KbfxSpinxView ( TQWidget * parent , const char * name,WFlags flag ) :TQFrame ( parent,name,flag ) { setMinimumWidth ( 300 ); setMinimumHeight ( 365 ); diff --git a/src/kbfxspinxview.h b/src/kbfxspinxview.h index 8ca1a7a..3097809 100644 --- a/src/kbfxspinxview.h +++ b/src/kbfxspinxview.h @@ -31,7 +31,7 @@ class KbfxSpinxView:public TQFrame TQ_OBJECT public: - KbfxSpinxView ( TQWidget * tqparent = 0, const char * name = 0, WFlags f = 0 ); + KbfxSpinxView ( TQWidget * parent = 0, const char * name = 0, WFlags f = 0 ); ~KbfxSpinxView(); public slots: diff --git a/src/kbfxtooltip.cpp b/src/kbfxtooltip.cpp index 28a4167..d09c927 100644 --- a/src/kbfxtooltip.cpp +++ b/src/kbfxtooltip.cpp @@ -23,8 +23,8 @@ #include "kbfxtooltip.h" -KbfxToolTip::KbfxToolTip ( TQWidget * tqparent, const char *name, WFlags fl ) : - TQWidget ( tqparent, name, +KbfxToolTip::KbfxToolTip ( TQWidget * parent, const char *name, WFlags fl ) : + TQWidget ( parent, name, fl | WStyle_Customize | WRepaintNoErase | WStyle_NoBorder | WDestructiveClose | TQt::WPaintDesktop | TQt::WType_Popup | TQt:: WPaintClever | TQt::WNoAutoErase | TQt::WResizeNoErase | TQt:: @@ -41,7 +41,7 @@ KbfxToolTip::KbfxToolTip ( TQWidget * tqparent, const char *name, WFlags fl ) : TQImage ( ConfigInit ().m_SpinxTooltipWindow ) : TQImage ( ConfigInit ().m_SpinxTooltipWindowDefault ); - tooltip_tqmask = ( KbfxPlasmaPixmapProvider::PixmapPathCheck ( ConfigInit().m_SpinxTooltipMask ) ) ? + tooltip_mask = ( KbfxPlasmaPixmapProvider::PixmapPathCheck ( ConfigInit().m_SpinxTooltipMask ) ) ? TQImage ( ConfigInit().m_SpinxTooltipMask ) : TQImage ( ConfigInit().m_SpinxTooltipMaskDefault ); @@ -114,10 +114,10 @@ KbfxToolTip::setAnimationImage ( TQString path ) _agent->resize ( 100, 100 ); _agent_anim = new TQMovie ( path ); - TQPixmap agent_tqmask = _agent_anim->framePixmap (); - _agent->setBackgroundPixmap ( agent_tqmask ); - if ( agent_tqmask.tqmask () ) - _agent->setMask ( *agent_tqmask.tqmask () ); + TQPixmap agent_mask = _agent_anim->framePixmap (); + _agent->setBackgroundPixmap ( agent_mask ); + if ( agent_mask.mask () ) + _agent->setMask ( *agent_mask.mask () ); _agent->tqrepaint (); /*FIXME:Need to remove Hard Coded Values */ @@ -135,7 +135,7 @@ KbfxToolTip::setBackground ( TQPixmap bg ) { ( bg.isNull () ) ? - _bg = tooltip_tqmask + _bg = tooltip_mask : _bg = bg.convertToImage (); /* animation check : Auto streatch */ @@ -150,8 +150,8 @@ KbfxToolTip::setBackground ( TQPixmap bg ) this->setBackgroundPixmap ( pm ); TQPixmap m_tmp ( _bg ); - if ( m_tmp.tqmask () ) - this->setMask ( ( *m_tmp.tqmask () ) ); + if ( m_tmp.mask () ) + this->setMask ( ( *m_tmp.mask () ) ); this->resize ( _bg.width (), _bg.height () ); _maxW = _bg.width (); } @@ -196,10 +196,10 @@ KbfxToolTip::logoMove () p.end (); } - TQPixmap agent_tqmask = _agent_anim->framePixmap (); - _agent->setBackgroundPixmap ( agent_tqmask ); - if ( agent_tqmask.tqmask () ) - _agent->setMask ( *agent_tqmask.tqmask () ); + TQPixmap agent_mask = _agent_anim->framePixmap (); + _agent->setBackgroundPixmap ( agent_mask ); + if ( agent_mask.mask () ) + _agent->setMask ( *agent_mask.mask () ); _agent->tqrepaint (); } diff --git a/src/kbfxtooltip.h b/src/kbfxtooltip.h index 0bdd00c..a2076e3 100644 --- a/src/kbfxtooltip.h +++ b/src/kbfxtooltip.h @@ -48,7 +48,7 @@ class KbfxToolTip:public TQWidget Q_OBJECT TQ_OBJECT public: - KbfxToolTip ( TQWidget * tqparent=0,const char * name=0,WFlags fl=WType_TopLevel ); + KbfxToolTip ( TQWidget * parent=0,const char * name=0,WFlags fl=WType_TopLevel ); ~KbfxToolTip(); void setStartPos ( int x=0, int y=0 ); virtual void paintEvent ( TQPaintEvent *pe ); @@ -88,7 +88,7 @@ class KbfxToolTip:public TQWidget TQFont m_fontTooltipFont; TQImage logo; TQImage tooltip_win; - TQImage tooltip_tqmask; + TQImage tooltip_mask; TQImage dude_img; }; #endif |