From 421b60af92c83b889f8903c2898f2bd07186fcd8 Mon Sep 17 00:00:00 2001 From: tpearson Date: Thu, 5 May 2011 22:07:15 +0000 Subject: [PATCH] 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 --- configdialog/kbfxconfigapp.cpp | 80 ++-- configdialog/kbfxconfigapp.h | 63 +-- configdialog/kbfxconfigdlgabout.ui | 114 ++--- configdialog/kbfxconfigdlgabout.ui.h | 54 +-- configdialog/kbfxconfigdlgbutton.ui | 190 ++++---- configdialog/kbfxconfigdlgbutton.ui.h | 26 +- configdialog/kbfxconfigdlgfonts-old.ui | 136 +++--- configdialog/kbfxconfigdlgfonts-old.ui.h | 26 +- configdialog/kbfxconfigdlglayout.ui | 160 +++---- configdialog/kbfxconfigdlglayout.ui.h | 252 +++++------ configdialog/kbfxconfigdlgmain.ui | 78 ++-- configdialog/kbfxconfigdlgmain.ui.h | 2 +- configdialog/kbfxconfigdlgplugins.ui | 66 +-- configdialog/kbfxconfigdlgplugins.ui.h | 26 +- configdialog/kbfxconfigdlgstyle.ui | 58 +-- configdialog/kbfxconfigdlgstyle.ui.h | 2 +- configdialog/kbfxconfigdlgthemes.ui | 154 +++---- configdialog/kbfxconfigdlgthemes.ui.h | 60 +-- configdialog/kbfxconfigdlgtooltip.ui | 96 ++--- configdialog/kbfxconfigdlgtooltip.ui.h | 2 +- configdialog/kbfxthemeinfo.ui | 62 +-- configdialog/kbfxthemeinfo.ui.h | 2 +- configdialog/main.cpp | 12 +- kbfxlib/common/kbfxconfig.cpp | 406 +++++++++--------- kbfxlib/common/kbfxconfig.h | 190 ++++---- kbfxlib/common/kbfxfontchooser.cpp | 36 +- kbfxlib/common/kbfxfontchooser.h | 35 +- kbfxlib/common/kbfxkiodownload.cpp | 10 +- kbfxlib/common/kbfxkiodownload.h | 17 +- kbfxlib/common/kbfxpixmaplabel.cpp | 34 +- kbfxlib/common/kbfxpixmaplabel.h | 21 +- kbfxlib/common/kbfxplasmapixmapprovider.cpp | 62 +-- kbfxlib/common/kbfxplasmapixmapprovider.h | 22 +- kbfxlib/common/kbfxpushbutton.cpp | 10 +- kbfxlib/common/kbfxpushbutton.h | 7 +- kbfxlib/common/kbfxthemesdata.cpp | 20 +- kbfxlib/common/kbfxthemesdata.h | 12 +- kbfxlib/data/kbfxdatagroup.cpp | 4 +- kbfxlib/data/kbfxdatagroup.h | 20 +- kbfxlib/data/kbfxdatagrouplist.h | 16 +- kbfxlib/data/kbfxdatasource.cpp | 12 +- kbfxlib/data/kbfxdatasource.h | 50 +-- kbfxlib/data/kbfxdatastack.cpp | 10 +- kbfxlib/data/kbfxdatastack.h | 30 +- kbfxlib/data/kbfxplasmapluginloader.cpp | 36 +- kbfxlib/data/kbfxplasmapluginloader.h | 19 +- kbfxlib/data/kbfxplugin.cpp | 14 +- kbfxlib/data/kbfxplugin.h | 25 +- plugins/applications/kbfxplasmadataplugin.cpp | 16 +- plugins/common/kbfxplasmadataplugin-common.h | 8 +- .../kbfxplasmadatapluginplosmoid.cpp | 44 +- plugins/recentstuff/kbfxplasmarecentstuff.cpp | 44 +- .../settings/kbfxplasmadatapluginsettings.cpp | 10 +- plugins/strigi/kbfxstrigiplugin.cpp | 30 +- plugins/strigi/kbfxstrigiplugin.h | 8 +- src/kbfxbutton.cpp | 142 +++--- src/kbfxbutton.h | 67 +-- src/kbfxplasmacanvasabstractitem.cpp | 22 +- src/kbfxplasmacanvasabstractitem.h | 31 +- src/kbfxplasmacanvasgroup.cpp | 16 +- src/kbfxplasmacanvasgroup.h | 29 +- src/kbfxplasmacanvasgroupview.cpp | 16 +- src/kbfxplasmacanvasgroupview.h | 19 +- src/kbfxplasmacanvasitem.cpp | 84 ++-- src/kbfxplasmacanvasitem.h | 75 ++-- src/kbfxplasmacanvasitem_events.cpp | 12 +- src/kbfxplasmacanvasitemwrapper.cpp | 72 ++-- src/kbfxplasmacanvasitemwrapper.h | 13 +- src/kbfxplasmacanvasstack.cpp | 10 +- src/kbfxplasmacanvasstack.h | 29 +- src/kbfxplasmacanvasstackdata.h | 4 +- src/kbfxplasmacanvasview.cpp | 142 +++--- src/kbfxplasmacanvasview.h | 67 +-- src/kbfxplasmaindexitem.cpp | 40 +- src/kbfxplasmaindexitem.h | 31 +- src/kbfxplasmaindexview.cpp | 90 ++-- src/kbfxplasmaindexview.h | 31 +- src/kbfxsignal.h | 6 +- src/kbfxspinx.cpp | 82 ++-- src/kbfxspinx.h | 27 +- src/kbfxspinxmenu.cpp | 270 ++++++------ src/kbfxspinxmenu.h | 67 +-- src/kbfxspinxpopup.cpp | 10 +- src/kbfxspinxpopup.h | 11 +- src/kbfxspinxscrollbar.cpp | 38 +- src/kbfxspinxscrollbar.h | 39 +- src/kbfxspinxtoolbar.cpp | 10 +- src/kbfxspinxtoolbar.h | 19 +- src/kbfxspinxtoolbutton.cpp | 50 +-- src/kbfxspinxtoolbutton.h | 61 +-- src/kbfxspinxtop.cpp | 40 +- src/kbfxspinxtop.h | 37 +- src/kbfxspinxview.cpp | 2 +- src/kbfxspinxview.h | 7 +- src/kbfxtooltip.cpp | 158 +++---- src/kbfxtooltip.h | 69 +-- 96 files changed, 2537 insertions(+), 2507 deletions(-) diff --git a/configdialog/kbfxconfigapp.cpp b/configdialog/kbfxconfigapp.cpp index ac17881..127a7f2 100644 --- a/configdialog/kbfxconfigapp.cpp +++ b/configdialog/kbfxconfigapp.cpp @@ -21,8 +21,8 @@ #include "kbfxconfigapp.h" -KbfxConfigApp::KbfxConfigApp ( QWidget* parent, const char* name, WFlags fl ) - : KbfxConfigDlgMain ( parent,name,fl ) +KbfxConfigApp::KbfxConfigApp ( TQWidget* tqparent, const char* name, WFlags fl ) + : KbfxConfigDlgMain ( tqparent,name,fl ) { // m_KbfxVersion = tr2i18n("

Running KBFX version: " APPLICATION_VERSION "

"); m_KbfxVersion = tr2i18n ( "

%1

" ); @@ -79,62 +79,62 @@ void KbfxConfigApp::InitForm() lb_Main->insertItem ( img_themes, tr2i18n ( "Themes" ), THEMES ); KbfxConfigDlgThemes *pageThemes = new KbfxConfigDlgThemes(); ws_Main->addWidget ( pageThemes, THEMES ); - connect ( this, SIGNAL ( KbfxConfigDlgThemesChanged() ), - pageThemes, SLOT ( ChangeForm() ) ); + connect ( this, TQT_SIGNAL ( KbfxConfigDlgThemesChanged() ), + pageThemes, TQT_SLOT ( ChangeForm() ) ); emit KbfxConfigDlgThemesChanged(); - connect ( pageThemes->KbfxGetMoreThemes, SIGNAL ( clicked() ), - this, SLOT ( KbfxGetMoreThemesClicked() ) ); - connect ( this, SIGNAL ( KbfxThemeDoInstall ( QString & ) ), - pageThemes, SLOT ( KbfxThemeInstall ( QString & ) ) ); + connect ( pageThemes->KbfxGetMoreThemes, TQT_SIGNAL ( clicked() ), + this, TQT_SLOT ( KbfxGetMoreThemesClicked() ) ); + connect ( this, TQT_SIGNAL ( KbfxThemeDoInstall ( TQString & ) ), + pageThemes, TQT_SLOT ( KbfxThemeInstall ( TQString & ) ) ); /* initialize Button page */ lb_Main->insertItem ( img_button, tr2i18n ( "Start Button" ), BUTTON ); KbfxConfigDlgButton *pageButton = new KbfxConfigDlgButton(); ws_Main->addWidget ( pageButton, BUTTON ); - connect ( this, SIGNAL ( KbfxConfigDlgButtonChanged() ), - pageButton, SLOT ( ChangeForm() ) ); + connect ( this, TQT_SIGNAL ( KbfxConfigDlgButtonChanged() ), + pageButton, TQT_SLOT ( ChangeForm() ) ); emit KbfxConfigDlgButtonChanged(); /* initialize Fonts page */ lb_Main->insertItem ( img_fonts, tr2i18n ( "Fonts" ), FONTS ); KbfxConfigDlgFonts *pageFonts = new KbfxConfigDlgFonts(); ws_Main->addWidget ( pageFonts, FONTS ); - connect ( this, SIGNAL ( KbfxConfigDlgFontsChanged() ), - pageFonts, SLOT ( ChangeForm() ) ); + connect ( this, TQT_SIGNAL ( KbfxConfigDlgFontsChanged() ), + pageFonts, TQT_SLOT ( ChangeForm() ) ); emit KbfxConfigDlgFontsChanged(); /* initialize Layout Page */ lb_Main->insertItem ( img_search, tr2i18n ( "Layout" ), LAYOUT ); KbfxConfigDlgLayout *pageLayout = new KbfxConfigDlgLayout(); ws_Main->addWidget ( pageLayout, LAYOUT ); - connect ( this, SIGNAL ( KbfxConfigDlgLayoutChanged() ), - pageLayout, SLOT ( ChangeForm() ) ); - connect ( this, SIGNAL ( KbfxConfigDlgLayoutLeft() ), - pageLayout, SLOT ( LayoutFormLeft() ) ); + connect ( this, TQT_SIGNAL ( KbfxConfigDlgLayoutChanged() ), + pageLayout, TQT_SLOT ( ChangeForm() ) ); + connect ( this, TQT_SIGNAL ( KbfxConfigDlgLayoutLeft() ), + pageLayout, TQT_SLOT ( LayoutFormLeft() ) ); emit KbfxConfigDlgLayoutChanged(); /* initialize Plugins Page */ lb_Main->insertItem ( img_plugins, tr2i18n ( "Plugins" ), PLUGINS ); KbfxConfigDlgPlugins *pagePlugins = new KbfxConfigDlgPlugins(); ws_Main->addWidget ( pagePlugins, PLUGINS ); - connect ( this, SIGNAL ( KbfxConfigDlgPluginsChanged() ), - pagePlugins, SLOT ( ChangeForm() ) ); + connect ( this, TQT_SIGNAL ( KbfxConfigDlgPluginsChanged() ), + pagePlugins, TQT_SLOT ( ChangeForm() ) ); emit KbfxConfigDlgPluginsChanged(); /* initialize Tooltip page */ lb_Main->insertItem ( img_tooltip, tr2i18n ( "Tooltip" ), TOOLTIP ); KbfxConfigDlgTooltip *pageTooltip = new KbfxConfigDlgTooltip(); ws_Main->addWidget ( pageTooltip, TOOLTIP ); - connect ( this, SIGNAL ( KbfxConfigDlgTooltipChanged() ), - pageTooltip, SLOT ( ChangeForm() ) ); + connect ( this, TQT_SIGNAL ( KbfxConfigDlgTooltipChanged() ), + pageTooltip, TQT_SLOT ( ChangeForm() ) ); emit KbfxConfigDlgTooltipChanged(); /* initialize Menu Style page */ lb_Main->insertItem ( img_style, tr2i18n ( "Menu Style" ), STYLE ); KbfxConfigDlgStyle *pageStyle = new KbfxConfigDlgStyle(); ws_Main->addWidget ( pageStyle, STYLE ); - connect ( this, SIGNAL ( KbfxConfigDlgStyleChanged() ), - pageStyle, SLOT ( ChangeForm() ) ); + connect ( this, TQT_SIGNAL ( KbfxConfigDlgStyleChanged() ), + pageStyle, TQT_SLOT ( ChangeForm() ) ); emit KbfxConfigDlgStyleChanged(); /* initialize About page */ @@ -143,14 +143,14 @@ void KbfxConfigApp::InitForm() ws_Main->addWidget ( pageAbout,ABOUT ); pageAbout->KbfxLabelVersion->setText ( m_KbfxVersion2 ); - connect ( btn_Default, SIGNAL ( clicked() ), - this, SLOT ( btn_DefaultClicked() ) ); - connect ( btn_Help, SIGNAL ( clicked() ), - this, SLOT ( btn_HelpClicked() ) ); - connect ( lb_Main, SIGNAL ( highlighted ( int ) ), - this, SLOT ( KbfxMenuItemChanged ( int ) ) ); - connect ( btn_SaveApply, SIGNAL ( clicked() ), - this, SLOT ( btn_SaveApplyClicked() ) ); + connect ( btn_Default, TQT_SIGNAL ( clicked() ), + this, TQT_SLOT ( btn_DefaultClicked() ) ); + connect ( btn_Help, TQT_SIGNAL ( clicked() ), + this, TQT_SLOT ( btn_HelpClicked() ) ); + connect ( lb_Main, TQT_SIGNAL ( highlighted ( int ) ), + this, TQT_SLOT ( KbfxMenuItemChanged ( int ) ) ); + connect ( btn_SaveApply, TQT_SIGNAL ( clicked() ), + this, TQT_SLOT ( btn_SaveApplyClicked() ) ); m_KbfxPage = THEMES; lb_Main->setCurrentItem ( THEMES ); @@ -350,8 +350,8 @@ void KbfxConfigApp::browserInit() { /* initialize NewsBrowser widget */ kio = new KbfxKioDownload(); - connect ( kio, SIGNAL ( KbfxKioDownloadReady() ), - this, SLOT ( KbfxNewsBrowserLoad() ) ); + connect ( kio, TQT_SIGNAL ( KbfxKioDownloadReady() ), + this, TQT_SLOT ( KbfxNewsBrowserLoad() ) ); kio->KbfxKioDownloadStart ( m_KbfxNewsBrowserAddress ); } @@ -363,17 +363,17 @@ void KbfxConfigApp::KbfxNewsBrowserLoad() browser = new KHTMLPart ( KBFXNewsBrowser ); browser->openURL ( kio->KbfxBrowserTmpFile() ); browser->view()->resize ( KBFXNewsBrowser->width(), KBFXNewsBrowser->height() ); - browser->view()->setVScrollBarMode ( QScrollView::AlwaysOff ); - browser->view()->setHScrollBarMode ( QScrollView::AlwaysOff ); - browser->view()->setFocusPolicy ( QWidget::NoFocus ); + browser->view()->setVScrollBarMode ( TQScrollView::AlwaysOff ); + browser->view()->setHScrollBarMode ( TQScrollView::AlwaysOff ); + browser->view()->setFocusPolicy ( TQ_NoFocus ); browser->view()->show(); connect ( browser->browserExtension(), - SIGNAL ( openURLRequest ( const KURL &, const KParts::URLArgs & ) ), + TQT_SIGNAL ( openURLRequest ( const KURL &, const KParts::URLArgs & ) ), this, - SLOT ( KbfxNewsBrowserOpenURLRequest ( const KURL &, const KParts::URLArgs & ) ) ); - connect ( browser, SIGNAL ( completed() ), - this, SLOT ( KbfxNewsBrowserCompleted() ) ); + TQT_SLOT ( KbfxNewsBrowserOpenURLRequest ( const KURL &, const KParts::URLArgs & ) ) ); + connect ( browser, TQT_SIGNAL ( completed() ), + this, TQT_SLOT ( KbfxNewsBrowserCompleted() ) ); } } @@ -384,7 +384,7 @@ void KbfxConfigApp::KbfxGetMoreThemesClicked() return ; } -void KbfxConfigApp::KbfxThemeInstall ( QString & themeURL ) +void KbfxConfigApp::KbfxThemeInstall ( TQString & themeURL ) { emit KbfxThemeDoInstall ( themeURL ); } diff --git a/configdialog/kbfxconfigapp.h b/configdialog/kbfxconfigapp.h index 80f22ca..aa22861 100644 --- a/configdialog/kbfxconfigapp.h +++ b/configdialog/kbfxconfigapp.h @@ -25,20 +25,20 @@ #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include @@ -89,11 +89,12 @@ enum {THEMES=0, BUTTON, FONTS, LAYOUT, PLUGINS, TOOLTIP, STYLE, ABOUT}; class KbfxConfigApp : public KbfxConfigDlgMain { Q_OBJECT + TQ_OBJECT public: /** * Default Constructor */ - KbfxConfigApp ( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); + KbfxConfigApp ( TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 ); /** * Default Destructor @@ -101,23 +102,23 @@ class KbfxConfigApp : public KbfxConfigDlgMain virtual ~KbfxConfigApp(); void InitForm(); - QString m_KbfxVersion; - QString m_KbfxVersion2; - QString m_KbfxNewsBrowserError; - QString m_KbfxNewsBrowserAddress; + TQString m_KbfxVersion; + TQString m_KbfxVersion2; + TQString m_KbfxNewsBrowserError; + TQString m_KbfxNewsBrowserAddress; void browserInit(); private: - QString m_KbfxLogoButton; - QString m_KbfxLogoThemes; - QString m_KbfxLogoAbout; - QString m_KbfxLogoLayout; - QString m_KbfxLogoTooltip; - QString m_KbfxLogoFonts; - QString m_KbfxLogoStyle; - QString m_KbfxLogoPlugins; + TQString m_KbfxLogoButton; + TQString m_KbfxLogoThemes; + TQString m_KbfxLogoAbout; + TQString m_KbfxLogoLayout; + TQString m_KbfxLogoTooltip; + TQString m_KbfxLogoFonts; + TQString m_KbfxLogoStyle; + TQString m_KbfxLogoPlugins; KbfxConfigDlgButton *pageButton; KbfxConfigDlgThemes *pageThemes; KbfxConfigDlgFonts *pageFonts; @@ -128,8 +129,8 @@ class KbfxConfigApp : public KbfxConfigDlgMain KbfxConfigDlgAbout *pageAbout; KHTMLPart * browser; KbfxKioDownload * kio; - QString m_KbfxThemeUrl; - QString m_KbfxThemeFolderUrl; + TQString m_KbfxThemeUrl; + TQString m_KbfxThemeFolderUrl; int m_KbfxPage; public slots: @@ -141,7 +142,7 @@ class KbfxConfigApp : public KbfxConfigDlgMain virtual void KbfxNewsBrowserCompleted(); virtual void KbfxNewsBrowserLoad(); virtual void KbfxGetMoreThemesClicked(); - virtual void KbfxThemeInstall ( QString & ); + virtual void KbfxThemeInstall ( TQString & ); signals: void KbfxConfigDlgButtonChanged(); @@ -152,7 +153,7 @@ class KbfxConfigApp : public KbfxConfigDlgMain void KbfxConfigDlgLayoutLeft(); void KbfxConfigDlgPluginsChanged(); void KbfxConfigDlgFontsChanged(); - void KbfxThemeDoInstall( QString & ); + void KbfxThemeDoInstall( TQString & ); }; diff --git a/configdialog/kbfxconfigdlgabout.ui b/configdialog/kbfxconfigdlgabout.ui index 034575f..5ac9dd1 100644 --- a/configdialog/kbfxconfigdlgabout.ui +++ b/configdialog/kbfxconfigdlgabout.ui @@ -1,10 +1,10 @@ KbfxConfigDlgAbout - + KbfxConfigDlgAbout - + 0 0 @@ -45,13 +45,13 @@ 0 - + 0 29 - + 32767 29 @@ -80,17 +80,17 @@ <b><h3><p align="center">People behind KBFX</p></h3></b> - + - layout4 + tqlayout4 unnamed - + - layout5 + tqlayout5 @@ -114,13 +114,13 @@ 0 - + 629 20 - + 629 20 @@ -160,13 +160,13 @@ 0 - + 0 20 - + 32767 20 @@ -181,7 +181,7 @@ - + textLabel1 @@ -198,7 +198,7 @@ We would like to thank all people who have helped with KBFX or have donated money to our project! THANKS A LOT ALL OF YOU OUT THERE!!! - + AlignVCenter @@ -218,15 +218,15 @@ THANKS A LOT ALL OF YOU OUT THERE!!! - + - layout6 + tqlayout6 unnamed - + KbfxTeamInfo @@ -254,17 +254,17 @@ THANKS A LOT ALL OF YOU OUT THERE!!! true - + - layout5 + tqlayout5 unnamed - + - layout8 + tqlayout8 @@ -273,7 +273,7 @@ THANKS A LOT ALL OF YOU OUT THERE!!! 20 - + KbfxPixmapLabelEphracis @@ -285,13 +285,13 @@ THANKS A LOT ALL OF YOU OUT THERE!!! 0 - + 90 90 - + 90 90 @@ -316,7 +316,7 @@ THANKS A LOT ALL OF YOU OUT THERE!!! true - + KbfxPixmapLabelJohnny @@ -328,13 +328,13 @@ THANKS A LOT ALL OF YOU OUT THERE!!! 0 - + 90 90 - + 90 90 @@ -359,7 +359,7 @@ THANKS A LOT ALL OF YOU OUT THERE!!! true - + KbfxPixmapLabelPhobosK @@ -371,13 +371,13 @@ THANKS A LOT ALL OF YOU OUT THERE!!! 0 - + 90 90 - + 90 90 @@ -402,7 +402,7 @@ THANKS A LOT ALL OF YOU OUT THERE!!! true - + KbfxPixmapLabelNookie @@ -414,13 +414,13 @@ THANKS A LOT ALL OF YOU OUT THERE!!! 0 - + 90 90 - + 90 90 @@ -445,7 +445,7 @@ THANKS A LOT ALL OF YOU OUT THERE!!! true - + KbfxPixmapLabelNathanael @@ -457,13 +457,13 @@ THANKS A LOT ALL OF YOU OUT THERE!!! 0 - + 90 90 - + 90 90 @@ -488,7 +488,7 @@ THANKS A LOT ALL OF YOU OUT THERE!!! true - + KbfxPixmapLabelSiraj @@ -500,13 +500,13 @@ THANKS A LOT ALL OF YOU OUT THERE!!! 0 - + 90 90 - + 90 90 @@ -536,7 +536,7 @@ THANKS A LOT ALL OF YOU OUT THERE!!! - + textLabel3 @@ -557,7 +557,7 @@ THANKS A LOT ALL OF YOU OUT THERE!!! <b>Tip!</b> Hover over the contact images to see each personal contact information. - + WordBreak|AlignVCenter @@ -571,14 +571,14 @@ THANKS A LOT ALL OF YOU OUT THERE!!! MinimumExpanding - + 24 1 - + groupBox1 @@ -601,7 +601,7 @@ THANKS A LOT ALL OF YOU OUT THERE!!! SPONSORS! - + AlignVCenter @@ -611,7 +611,7 @@ THANKS A LOT ALL OF YOU OUT THERE!!! 4 - + textLabel5 @@ -626,7 +626,7 @@ THANKS A LOT ALL OF YOU OUT THERE!!! We would like to thank swedish computer company <b>PC Agenten</b> for sponsoring us with a server and bandwidth. - + WordBreak|AlignVCenter @@ -699,25 +699,25 @@ THANKS A LOT ALL OF YOU OUT THERE!!! kdebug.h - qevent.h + tqevent.h kbfxconfigdlgabout.ui.h - QString KbfxMemberTextJohnny; - QString KbfxMemberTextEphracis; - QString KbfxMemberTextNathanael; - QString KbfxMemberTextSiraj; - QString KbfxMemberTextNookie; - QString KbfxMemberTextPhobosK; + TQString KbfxMemberTextJohnny; + TQString KbfxMemberTextEphracis; + TQString KbfxMemberTextNathanael; + TQString KbfxMemberTextSiraj; + TQString KbfxMemberTextNookie; + TQString KbfxMemberTextPhobosK; - + KbfxUnmarkAllPixmaps() - + init() - eventFilter( QObject * obj, QEvent * ev ) + eventFilter( TQObject * obj, TQEvent * ev ) - + kactivelabel.h kactivelabel.h diff --git a/configdialog/kbfxconfigdlgabout.ui.h b/configdialog/kbfxconfigdlgabout.ui.h index 7f4b739..fa31f83 100644 --- a/configdialog/kbfxconfigdlgabout.ui.h +++ b/configdialog/kbfxconfigdlgabout.ui.h @@ -2,7 +2,7 @@ ** ui.h extension file, included from the uic-generated form implementation. ** ** If you want to add, delete, or rename functions or slots, use -** Qt Designer to update this file, preserving your code. +** TQt Designer to update this file, preserving your code. ** ** You should not define a constructor or destructor in this file. ** Instead, write your code in functions called init() and destroy(). @@ -51,7 +51,7 @@ void KbfxConfigDlgAbout::init() "

" "Country: Bulgaria" "

" - "KBFX: package & release manager, Q/A, bug hunter, mandriva packages, project administrator, developer Qt/C++" + "KBFX: package & release manager, Q/A, bug hunter, mandriva packages, project administrator, developer TQt/C++" "

" "Email: phobosk@mail.kbfx.org" ); @@ -60,7 +60,7 @@ void KbfxConfigDlgAbout::init() "

" "Country: Peru" "

" - "KBFX: developer Qt4/C++" + "KBFX: developer TQt4/C++" "

" "Email: saenzac@mail.kbfx.org" ); @@ -74,60 +74,60 @@ void KbfxConfigDlgAbout::init() "Email: ephracis@mail.kbfx.org" ); } -bool KbfxConfigDlgAbout::eventFilter ( QObject *obj, QEvent *ev ) +bool KbfxConfigDlgAbout::eventFilter ( TQObject *obj, TQEvent *ev ) { - QCursor kbfxCursor; + TQCursor kbfxCursor; kbfxCursor.setShape ( Qt::PointingHandCursor ); - this->setCursor ( ( const QCursor ) kbfxCursor ); + this->setCursor ( ( const TQCursor ) kbfxCursor ); - if ( ev->type() == QEvent::FocusIn || ev->type() == QEvent::Enter ) + if ( ev->type() == TQEvent::FocusIn || ev->type() == TQEvent::Enter ) { - if ( obj == KbfxPixmapLabelNookie ) + if ( TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(KbfxPixmapLabelNookie) ) { KbfxTeamInfo->setText ( KbfxMemberTextNookie ); KbfxUnmarkAllPixmaps(); - KbfxPixmapLabelNookie->setFrameShape ( QFrame::WinPanel ); + KbfxPixmapLabelNookie->setFrameShape ( TQFrame::WinPanel ); return TRUE; } - else if ( obj == KbfxPixmapLabelSiraj ) + else if ( TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(KbfxPixmapLabelSiraj) ) { KbfxTeamInfo->setText ( KbfxMemberTextSiraj ); KbfxUnmarkAllPixmaps(); - KbfxPixmapLabelSiraj->setFrameShape ( QFrame::WinPanel ); + KbfxPixmapLabelSiraj->setFrameShape ( TQFrame::WinPanel ); return TRUE; } - else if ( obj == KbfxPixmapLabelNathanael ) + else if ( TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(KbfxPixmapLabelNathanael) ) { KbfxTeamInfo->setText ( KbfxMemberTextNathanael ); KbfxUnmarkAllPixmaps(); - KbfxPixmapLabelNathanael->setFrameShape ( QFrame::WinPanel ); + KbfxPixmapLabelNathanael->setFrameShape ( TQFrame::WinPanel ); return TRUE; } - else if ( obj == KbfxPixmapLabelPhobosK ) + else if ( TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(KbfxPixmapLabelPhobosK) ) { KbfxTeamInfo->setText ( KbfxMemberTextPhobosK ); KbfxUnmarkAllPixmaps(); - KbfxPixmapLabelPhobosK->setFrameShape ( QFrame::WinPanel ); + KbfxPixmapLabelPhobosK->setFrameShape ( TQFrame::WinPanel ); return TRUE; } - else if ( obj == KbfxPixmapLabelJohnny ) + else if ( TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(KbfxPixmapLabelJohnny) ) { KbfxTeamInfo->setText ( KbfxMemberTextJohnny ); KbfxUnmarkAllPixmaps(); - KbfxPixmapLabelJohnny->setFrameShape ( QFrame::WinPanel ); + KbfxPixmapLabelJohnny->setFrameShape ( TQFrame::WinPanel ); return TRUE; } - else if ( obj == KbfxPixmapLabelEphracis ) + else if ( TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(KbfxPixmapLabelEphracis) ) { KbfxTeamInfo->setText ( KbfxMemberTextEphracis ); KbfxUnmarkAllPixmaps(); - KbfxPixmapLabelEphracis->setFrameShape ( QFrame::WinPanel ); + KbfxPixmapLabelEphracis->setFrameShape ( TQFrame::WinPanel ); return TRUE; } } /* - if ( ev->type() == QEvent::Leave ) + if ( ev->type() == TQEvent::Leave ) { if( obj == KbfxPixmapLabelNookie || @@ -144,16 +144,16 @@ bool KbfxConfigDlgAbout::eventFilter ( QObject *obj, QEvent *ev ) } */ - return QWidget::eventFilter ( obj, ev ); + return TQWidget::eventFilter ( obj, ev ); // return FALSE; } void KbfxConfigDlgAbout::KbfxUnmarkAllPixmaps() { - KbfxPixmapLabelNookie->setFrameShape ( QFrame::NoFrame ); - KbfxPixmapLabelSiraj->setFrameShape ( QFrame::NoFrame ); - KbfxPixmapLabelNathanael->setFrameShape ( QFrame::NoFrame ); - KbfxPixmapLabelPhobosK->setFrameShape ( QFrame::NoFrame ); - KbfxPixmapLabelEphracis->setFrameShape ( QFrame::NoFrame ); - KbfxPixmapLabelJohnny->setFrameShape ( QFrame::NoFrame ); + KbfxPixmapLabelNookie->setFrameShape ( TQFrame::NoFrame ); + KbfxPixmapLabelSiraj->setFrameShape ( TQFrame::NoFrame ); + KbfxPixmapLabelNathanael->setFrameShape ( TQFrame::NoFrame ); + KbfxPixmapLabelPhobosK->setFrameShape ( TQFrame::NoFrame ); + KbfxPixmapLabelEphracis->setFrameShape ( TQFrame::NoFrame ); + KbfxPixmapLabelJohnny->setFrameShape ( TQFrame::NoFrame ); } diff --git a/configdialog/kbfxconfigdlgbutton.ui b/configdialog/kbfxconfigdlgbutton.ui index 3d63e75..c5b5638 100644 --- a/configdialog/kbfxconfigdlgbutton.ui +++ b/configdialog/kbfxconfigdlgbutton.ui @@ -1,13 +1,13 @@ KbfxConfigDlgButton - + KbfxConfigDlgButton true - + 0 0 @@ -48,15 +48,15 @@ Minimum - + - layout6 + tqlayout6 unnamed - + groupBoxPressed @@ -68,7 +68,7 @@ 0 - + 32767 150 @@ -80,7 +80,7 @@ "PRESSED" IMAGE SELECTION - + AlignVCenter @@ -93,7 +93,7 @@ 0 - + textLabel8 @@ -142,7 +142,7 @@ - + groupBox10 @@ -154,7 +154,7 @@ 0 - + 322 150 @@ -166,7 +166,7 @@ Preview - + AlignVCenter @@ -191,13 +191,13 @@ 0 - + 150 50 - + 150 50 @@ -220,15 +220,15 @@ - + - layout7 + tqlayout7 unnamed - + groupBoxNormal @@ -240,7 +240,7 @@ 0 - + 32767 150 @@ -252,7 +252,7 @@ "NORMAL" IMAGE SELECTION - + AlignVCenter @@ -265,7 +265,7 @@ 0 - + textLabel6 @@ -308,7 +308,7 @@ - + groupBox7 @@ -320,7 +320,7 @@ 0 - + 322 150 @@ -332,7 +332,7 @@ Preview - + AlignVCenter @@ -360,13 +360,13 @@ 0 - + 150 50 - + 150 50 @@ -389,15 +389,15 @@ - + - layout8 + tqlayout8 unnamed - + groupBoxHover @@ -409,7 +409,7 @@ 0 - + 32767 150 @@ -421,7 +421,7 @@ "HOVER" IMAGE SELECTION - + AlignVCenter @@ -434,7 +434,7 @@ 0 - + textLabel7 @@ -486,7 +486,7 @@ - + groupBox9 @@ -498,7 +498,7 @@ 0 - + 322 150 @@ -510,7 +510,7 @@ Preview - + AlignVCenter @@ -535,13 +535,13 @@ 0 - + 150 50 - + 150 50 @@ -576,13 +576,13 @@ 0 - + 0 29 - + 32767 29 @@ -620,7 +620,7 @@ AutoAll - + KbfxResizeKickerBox @@ -638,7 +638,7 @@ Resize Panel - + AlignVCenter @@ -651,7 +651,7 @@ 0 - + textLabel9_2 @@ -669,13 +669,13 @@ RichText - + WordBreak|AlignTop|AlignLeft - + - layout8 + tqlayout8 @@ -691,14 +691,14 @@ Minimum - + 1 1 - + KbfxResizeKicker @@ -710,7 +710,7 @@ 0 - + 270 58 @@ -745,7 +745,7 @@ Minimum - + 1 1 @@ -764,7 +764,7 @@ Minimum - + 16 1 @@ -785,13 +785,13 @@ 0 - + 0 29 - + 32767 29 @@ -829,7 +829,7 @@ AutoAll - + groupBox11 @@ -847,7 +847,7 @@ Livepreview - + AlignVCenter @@ -860,7 +860,7 @@ 0 - + textLabel9 @@ -878,7 +878,7 @@ RichText - + WordBreak|AlignTop|AlignLeft @@ -892,7 +892,7 @@ Minimum - + 20 1 @@ -914,13 +914,13 @@ 0 - + 150 50 - + 150 50 @@ -944,7 +944,7 @@ - + KbfxFadeButton @@ -987,7 +987,7 @@ 10 - + textLabel5 @@ -1009,7 +1009,7 @@ Here you can enter the value of the fade effect transition time in msec.<br>Valid values are between 20 and 1000 msec.<br>Default is 75 msec. - + KbfxFadeTime @@ -1027,7 +1027,7 @@ StyledPanel - + AlignHCenter @@ -1047,7 +1047,7 @@ MinimumExpanding - + 16 16 @@ -1066,7 +1066,7 @@ MinimumExpanding - + 16 1 @@ -1091,7 +1091,7 @@ 0 image1 - targetDrop(const QString &) + targetDrop(const TQString &) mouseClicked( const ButtonState & ) mouseDoubleClicked( const ButtonState & ) dragEnterEvent( QDragEnterEvent *mouseDragEnterEvent ) @@ -1137,39 +1137,39 @@ KbfxURLRequesterHover - urlSelected(const QString&) + urlSelected(const TQString&) KbfxConfigDlgButton - KbfxURLRequesterHoverUrlSelected(const QString&) + KbfxURLRequesterHoverUrlSelected(const TQString&) KbfxURLRequesterPressed - urlSelected(const QString&) + urlSelected(const TQString&) KbfxConfigDlgButton - KbfxURLRequesterPressedUrlSelected(const QString&) + KbfxURLRequesterPressedUrlSelected(const TQString&) KbfxURLRequesterNormal - urlSelected(const QString&) + urlSelected(const TQString&) KbfxConfigDlgButton - KbfxURLRequesterNormalUrlSelected(const QString&) + KbfxURLRequesterNormalUrlSelected(const TQString&) KbfxURLRequesterHover - returnPressed(const QString&) + returnPressed(const TQString&) KbfxConfigDlgButton - KbfxURLRequesterHoverUrlSelected(const QString&) + KbfxURLRequesterHoverUrlSelected(const TQString&) KbfxURLRequesterPressed - returnPressed(const QString&) + returnPressed(const TQString&) KbfxConfigDlgButton - KbfxURLRequesterPressedUrlSelected(const QString&) + KbfxURLRequesterPressedUrlSelected(const TQString&) KbfxURLRequesterNormal - returnPressed(const QString&) + returnPressed(const TQString&) KbfxConfigDlgButton - KbfxURLRequesterNormalUrlSelected(const QString&) + KbfxURLRequesterNormalUrlSelected(const TQString&) KbfxButton @@ -1179,21 +1179,21 @@ KbfxPixmapLabelHover - targetDrop(const QString&) + targetDrop(const TQString&) KbfxConfigDlgButton - KbfxURLRequesterHoverUrlSelected(const QString&) + KbfxURLRequesterHoverUrlSelected(const TQString&) KbfxPixmapLabelNormal - targetDrop(const QString&) + targetDrop(const TQString&) KbfxConfigDlgButton - KbfxURLRequesterNormalUrlSelected(const QString&) + KbfxURLRequesterNormalUrlSelected(const TQString&) KbfxPixmapLabelPressed - targetDrop(const QString&) + targetDrop(const TQString&) KbfxConfigDlgButton - KbfxURLRequesterPressedUrlSelected(const QString&) + KbfxURLRequesterPressedUrlSelected(const TQString&) KbfxResizeKicker @@ -1231,30 +1231,30 @@ kmessagebox.h kbfxpushbutton.h - qstring.h - qpainter.h - qimage.h + tqstring.h + tqpainter.h + tqimage.h kbfxpixmaplabel.h kbfxconfigdlgbutton.ui.h - - KbfxConfigDlgButtonChanged(const char * name, const QString & path) - - - KbfxURLRequesterNormalUrlSelected( const QString & selected_img_path ) - KbfxURLRequesterPressedUrlSelected( const QString & selected_img_path ) - KbfxURLRequesterHoverUrlSelected( const QString & selected_img_path ) + + KbfxConfigDlgButtonChanged(const char * name, const TQString & path) + + + KbfxURLRequesterNormalUrlSelected( const TQString & selected_img_path ) + KbfxURLRequesterPressedUrlSelected( const TQString & selected_img_path ) + KbfxURLRequesterHoverUrlSelected( const TQString & selected_img_path ) KbfxButtonToggled( bool ) - ChangeForm( const char * name, const QString & path ) + ChangeForm( const char * name, const TQString & path ) ChangeForm() KbfxResizeKickerToggled( bool ) KbfxFadeButton_toggled( bool _state ) KbfxFadeTime_lostFocus() - + init() - + kurlrequester.h klineedit.h diff --git a/configdialog/kbfxconfigdlgbutton.ui.h b/configdialog/kbfxconfigdlgbutton.ui.h index 015b860..0901dd2 100644 --- a/configdialog/kbfxconfigdlgbutton.ui.h +++ b/configdialog/kbfxconfigdlgbutton.ui.h @@ -2,7 +2,7 @@ ** ui.h extension file, included from the uic-generated form implementation. ** ** If you want to add, delete, or rename functions or slots, use -** Qt Designer to update this file, preserving your code. +** TQt Designer to update this file, preserving your code. ** ** You should not define a constructor or destructor in this file. ** Instead, write your code in functions called init() and destroy(). @@ -12,22 +12,22 @@ void KbfxConfigDlgButton::init() { - connect ( this, SIGNAL ( KbfxConfigDlgButtonChanged ( const char *, const QString & ) ), - this, SLOT ( ChangeForm ( const char *, const QString & ) ) ); + connect ( this, TQT_SIGNAL ( KbfxConfigDlgButtonChanged ( const char *, const TQString & ) ), + this, TQT_SLOT ( ChangeForm ( const char *, const TQString & ) ) ); } /* actions performed when url is selected */ -void KbfxConfigDlgButton::KbfxURLRequesterNormalUrlSelected ( const QString &selected_img_path ) +void KbfxConfigDlgButton::KbfxURLRequesterNormalUrlSelected ( const TQString &selected_img_path ) { emit KbfxConfigDlgButtonChanged ( "normal", selected_img_path ); } -void KbfxConfigDlgButton::KbfxURLRequesterPressedUrlSelected ( const QString &selected_img_path ) +void KbfxConfigDlgButton::KbfxURLRequesterPressedUrlSelected ( const TQString &selected_img_path ) { emit KbfxConfigDlgButtonChanged ( "pressed", selected_img_path ); } -void KbfxConfigDlgButton::KbfxURLRequesterHoverUrlSelected ( const QString &selected_img_path ) +void KbfxConfigDlgButton::KbfxURLRequesterHoverUrlSelected ( const TQString &selected_img_path ) { emit KbfxConfigDlgButtonChanged ( "hover", selected_img_path ); } @@ -42,16 +42,16 @@ void KbfxConfigDlgButton::KbfxButtonToggled ( bool ) } /* url processing */ -void KbfxConfigDlgButton::ChangeForm ( const char *name, const QString &path ) +void KbfxConfigDlgButton::ChangeForm ( const char *name, const TQString &path ) { kdDebug() << "Received: " << name << " + " << path << endl; - QString tmppath = path; + TQString tmppath = path; if ( tmppath.startsWith ( "file://" ) ) tmppath.remove ( "file://" ); - QImage tmp ( tmppath ); + TQImage tmp ( tmppath ); - QString tmpname = name; + TQString tmpname = name; if ( tmpname == "pressed" ) { if ( tmp.isNull() ) @@ -133,7 +133,7 @@ void KbfxConfigDlgButton::ChangeForm() if ( ConfigInit().m_ToolBarResize == FALSE && KbfxResizeKicker->state() == 2 ) KbfxResizeKicker->toggle(); - KbfxFadeTime->setText ( QString::number ( ConfigInit().m_fadeTime ) ); + KbfxFadeTime->setText ( TQString::number ( ConfigInit().m_fadeTime ) ); } @@ -163,7 +163,7 @@ void KbfxConfigDlgButton::KbfxFadeButton_toggled( bool _state ) { if ( _state ) { - KbfxFadeTime->setText ( QString::number ( ConfigInit().m_fadeTimeDefault ) ); + KbfxFadeTime->setText ( TQString::number ( ConfigInit().m_fadeTimeDefault ) ); ConfigInit().m_fadeTime = ConfigInit().m_fadeTimeDefault; } else @@ -179,5 +179,5 @@ void KbfxConfigDlgButton::KbfxFadeTime_lostFocus() ConfigInit().m_fadeTime = _value; ConfigInit().checkValues(); - KbfxFadeTime->setText ( QString::number ( ConfigInit().m_fadeTime ) ); + KbfxFadeTime->setText ( TQString::number ( ConfigInit().m_fadeTime ) ); } diff --git a/configdialog/kbfxconfigdlgfonts-old.ui b/configdialog/kbfxconfigdlgfonts-old.ui index e76071f..0b24c19 100644 --- a/configdialog/kbfxconfigdlgfonts-old.ui +++ b/configdialog/kbfxconfigdlgfonts-old.ui @@ -1,10 +1,10 @@ KbfxConfigDlgFonts - + KbfxConfigDlgFonts - + 0 0 @@ -51,13 +51,13 @@ 0 - + 0 29 - + 32767 29 @@ -83,9 +83,9 @@ <b><h3><p align="center">Font options</p></h3></b> - + - layout14 + tqlayout14 @@ -101,14 +101,14 @@ Expanding - + 436 1 - + KbfxExportFile @@ -132,7 +132,7 @@ - + groupBox43 @@ -167,24 +167,24 @@ MinimumExpanding - + 16 1 - + - layout17 + tqlayout17 unnamed - + - layout15 + tqlayout15 @@ -200,16 +200,16 @@ MinimumExpanding - + 1 1 - + - layout22 + tqlayout22 @@ -261,9 +261,9 @@ - + - layout21 + tqlayout21 @@ -315,9 +315,9 @@ - + - layout20 + tqlayout20 @@ -369,9 +369,9 @@ - + - layout19 + tqlayout19 @@ -423,9 +423,9 @@ - + - layout23 + tqlayout23 @@ -471,9 +471,9 @@ - + - layout17 + tqlayout17 @@ -525,9 +525,9 @@ - + - layout18 + tqlayout18 @@ -579,9 +579,9 @@ - + - layout18_2 + tqlayout18_2 @@ -649,9 +649,9 @@ Vertical - + - layout16 + tqlayout16 @@ -667,7 +667,7 @@ MinimumExpanding - + 22 1 @@ -821,7 +821,7 @@ Minimum - + 16 1 @@ -842,9 +842,9 @@ Horizontal - + - layout15 + tqlayout15 @@ -868,7 +868,7 @@ 0 - + 32767 32767 @@ -896,7 +896,7 @@ 0 - + 32767 32767 @@ -928,7 +928,7 @@ Please select the theme you want to edit - + KbfxBoldHover @@ -965,7 +965,7 @@ Minimum - + 16 1 @@ -1010,39 +1010,39 @@ KbfxApplicationColor - activated(const QColor&) + activated(const TQColor&) KbfxConfigDlgFonts - KbfxApplicationColorSelected(const QColor&) + KbfxApplicationColorSelected(const TQColor&) KbfxCommentColor - activated(const QColor&) + activated(const TQColor&) KbfxConfigDlgFonts - KbfxCommentColorSelected(const QColor&) + KbfxCommentColorSelected(const TQColor&) KbfxLineColor - activated(const QColor&) + activated(const TQColor&) KbfxConfigDlgFonts - KbfxLineColorSelected(const QColor&) + KbfxLineColorSelected(const TQColor&) KbfxCategoryColor - activated(const QColor&) + activated(const TQColor&) KbfxConfigDlgFonts - KbfxCategoryColorSelected(const QColor&) + KbfxCategoryColorSelected(const TQColor&) KbfxNameColor - activated(const QColor&) + activated(const TQColor&) KbfxConfigDlgFonts - KbfxNameColorSelected(const QColor&) + KbfxNameColorSelected(const TQColor&) KbfxSeparatorColor - activated(const QColor&) + activated(const TQColor&) KbfxConfigDlgFonts - KbfxSeparatorColorSelected(const QColor&) + KbfxSeparatorColorSelected(const TQColor&) KbfxExportFile @@ -1082,9 +1082,9 @@ KbfxPluginColor - activated(const QColor&) + activated(const TQColor&) KbfxConfigDlgFonts - KbfxPluginColorSelected(const QColor&) + KbfxPluginColorSelected(const TQColor&) KbfxFont_separator @@ -1100,9 +1100,9 @@ KbfxTooltipColor - activated(const QColor&) + activated(const TQColor&) KbfxConfigDlgFonts - KbfxTooltipColorSelected(const QColor&) + KbfxTooltipColorSelected(const TQColor&) KbfxFont_tooltip @@ -1144,24 +1144,24 @@ bool KbfxFormReady; - + ChangeForm() - KbfxApplicationColorSelected( const QColor & color ) - KbfxTooltipColorSelected( const QColor & ) - KbfxCommentColorSelected( const QColor & color ) - KbfxLineColorSelected( const QColor & color ) - KbfxCategoryColorSelected( const QColor & color ) - KbfxNameColorSelected( const QColor & color ) - KbfxSeparatorColorSelected( const QColor & color ) - KbfxPluginColorSelected( const QColor & color ) + KbfxApplicationColorSelected( const TQColor & color ) + KbfxTooltipColorSelected( const TQColor & ) + KbfxCommentColorSelected( const TQColor & color ) + KbfxLineColorSelected( const TQColor & color ) + KbfxCategoryColorSelected( const TQColor & color ) + KbfxNameColorSelected( const TQColor & color ) + KbfxSeparatorColorSelected( const TQColor & color ) + KbfxPluginColorSelected( const TQColor & color ) KbfxExportFileAction() FontChanged() KbfxBoldHover_toggled( bool state ) - + init() - + kactivelabel.h kactivelabel.h diff --git a/configdialog/kbfxconfigdlgfonts-old.ui.h b/configdialog/kbfxconfigdlgfonts-old.ui.h index 11ad864..49f12fa 100644 --- a/configdialog/kbfxconfigdlgfonts-old.ui.h +++ b/configdialog/kbfxconfigdlgfonts-old.ui.h @@ -2,7 +2,7 @@ ** ui.h extension file, included from the uic-generated form implementation. ** ** If you want to add, delete, or rename functions or slots, use -** Qt Designer to update this file, preserving your code. +** TQt Designer to update this file, preserving your code. ** ** You should not define a constructor or destructor in this file. ** Instead, write your code in functions called init() and destroy(). @@ -38,7 +38,7 @@ void KbfxConfigDlgFonts::ChangeForm() KbfxFormReady = TRUE; } -void KbfxConfigDlgFonts::KbfxApplicationColorSelected ( const QColor &color ) +void KbfxConfigDlgFonts::KbfxApplicationColorSelected ( const TQColor &color ) { ConfigInit().m_fontAppNameColor = color; @@ -47,7 +47,7 @@ void KbfxConfigDlgFonts::KbfxApplicationColorSelected ( const QColor &color ) << endl; } -void KbfxConfigDlgFonts::KbfxTooltipColorSelected ( const QColor &color ) +void KbfxConfigDlgFonts::KbfxTooltipColorSelected ( const TQColor &color ) { ConfigInit().m_fontTooltipColor = color; @@ -56,7 +56,7 @@ void KbfxConfigDlgFonts::KbfxTooltipColorSelected ( const QColor &color ) << endl; } -void KbfxConfigDlgFonts::KbfxCommentColorSelected ( const QColor &color ) +void KbfxConfigDlgFonts::KbfxCommentColorSelected ( const TQColor &color ) { ConfigInit().m_fontAppCommentColor = color; @@ -65,7 +65,7 @@ void KbfxConfigDlgFonts::KbfxCommentColorSelected ( const QColor &color ) << endl; } -void KbfxConfigDlgFonts::KbfxLineColorSelected ( const QColor & color ) +void KbfxConfigDlgFonts::KbfxLineColorSelected ( const TQColor & color ) { ConfigInit().m_lineColor = color; @@ -74,7 +74,7 @@ void KbfxConfigDlgFonts::KbfxLineColorSelected ( const QColor & color ) << endl; } -void KbfxConfigDlgFonts::KbfxCategoryColorSelected ( const QColor &color ) +void KbfxConfigDlgFonts::KbfxCategoryColorSelected ( const TQColor &color ) { ConfigInit().m_fontIndexColor = color; @@ -83,7 +83,7 @@ void KbfxConfigDlgFonts::KbfxCategoryColorSelected ( const QColor &color ) << endl; } -void KbfxConfigDlgFonts::KbfxNameColorSelected ( const QColor &color ) +void KbfxConfigDlgFonts::KbfxNameColorSelected ( const TQColor &color ) { ConfigInit().m_userNameColor = color; @@ -92,7 +92,7 @@ void KbfxConfigDlgFonts::KbfxNameColorSelected ( const QColor &color ) << endl; } -void KbfxConfigDlgFonts::KbfxSeparatorColorSelected ( const QColor &color ) +void KbfxConfigDlgFonts::KbfxSeparatorColorSelected ( const TQColor &color ) { ConfigInit().m_sepNameColor = color; @@ -101,7 +101,7 @@ void KbfxConfigDlgFonts::KbfxSeparatorColorSelected ( const QColor &color ) << endl; } -void KbfxConfigDlgFonts::KbfxPluginColorSelected( const QColor &color ) +void KbfxConfigDlgFonts::KbfxPluginColorSelected( const TQColor &color ) { ConfigInit().m_pluginNameColor = color; @@ -113,7 +113,7 @@ void KbfxConfigDlgFonts::KbfxPluginColorSelected( const QColor &color ) void KbfxConfigDlgFonts::KbfxExportFileAction() { /* - KFileDialog KbfxExportFontRcDialog(QString::null, + KFileDialog KbfxExportFontRcDialog(TQString(), "*.*|" + tr2i18n("All files"), 0, 0, @@ -124,11 +124,11 @@ void KbfxConfigDlgFonts::KbfxExportFileAction() if(!KbfxExportFontRcDialog.exec()) return; - QString KbfxExportFontRcDialogURL = KbfxExportFontRcDialog.selectedURL().path(); + TQString KbfxExportFontRcDialogURL = KbfxExportFontRcDialog.selectedURL().path(); */ - QString KbfxExportFontRcDialogURL = KFileDialog::getExistingDirectory ( - QString::null, + TQString KbfxExportFontRcDialogURL = KFileDialog::getExistingDirectory ( + TQString(), 0, tr2i18n ( "Select folder to export kbfxfontrc file" ) ).append ( "/kbfxfontrc" ); diff --git a/configdialog/kbfxconfigdlglayout.ui b/configdialog/kbfxconfigdlglayout.ui index f759df9..f536a7d 100644 --- a/configdialog/kbfxconfigdlglayout.ui +++ b/configdialog/kbfxconfigdlglayout.ui @@ -1,10 +1,10 @@ KbfxConfigDlgLayout - + KbfxConfigDlgLayout - + 0 0 @@ -51,13 +51,13 @@ 0 - + 0 29 - + 32767 29 @@ -83,9 +83,9 @@ <b><h3><p align="center">Layout options</p></h3></b> - + - layout14_2 + tqlayout14_2 @@ -101,14 +101,14 @@ Expanding - + 408 1 - + KbfxExportFile @@ -127,12 +127,12 @@ EXPORT KBFXLAYOUTRC FILE - Export the kbfxlayoutrc file to a folder + Export the kbfxtqlayoutrc file to a folder - + groupBox43 @@ -167,16 +167,16 @@ Minimum - + 23 1 - + - layout30 + tqlayout30 @@ -279,16 +279,16 @@ Minimum - + 16 1 - + - layout17 + tqlayout17 @@ -304,14 +304,14 @@ Expanding - + 1 1 - + Kbfx2PanelsLeft @@ -327,7 +327,7 @@ Make it 2 panels (Left "ON") - + Kbfx2PanelsRight @@ -343,7 +343,7 @@ Make it 2 panels (Right "ON") - + Kbfx3Panels @@ -369,7 +369,7 @@ Expanding - + 1 1 @@ -388,24 +388,24 @@ MinimumExpanding - + 16 1 - + - layout33 + tqlayout33 unnamed - + - layout28 + tqlayout28 @@ -417,9 +417,9 @@ 0 - + - layout21 + tqlayout21 @@ -431,9 +431,9 @@ 0 - + - layout16 + tqlayout16 @@ -445,7 +445,7 @@ 0 - + textLabel1 @@ -461,7 +461,7 @@ textLabel1 - + lineEdit1 @@ -479,15 +479,15 @@ StyledPanel - + AlignHCenter - + - layout16_2 + tqlayout16_2 @@ -499,7 +499,7 @@ 0 - + textLabel2 @@ -515,7 +515,7 @@ textLabel2 - + lineEdit2 @@ -533,15 +533,15 @@ StyledPanel - + AlignHCenter - + - layout16_3 + tqlayout16_3 @@ -553,7 +553,7 @@ 0 - + textLabel3 @@ -569,7 +569,7 @@ textLabel3 - + lineEdit3 @@ -587,15 +587,15 @@ StyledPanel - + AlignHCenter - + - layout16_4 + tqlayout16_4 @@ -607,7 +607,7 @@ 0 - + textLabel4 @@ -623,7 +623,7 @@ textLabel4 - + lineEdit4 @@ -641,7 +641,7 @@ StyledPanel - + AlignHCenter @@ -649,7 +649,7 @@ - + checkBox1 @@ -689,9 +689,9 @@ Vertical - + - layout29 + tqlayout29 @@ -703,9 +703,9 @@ 0 - + - layout21_2 + tqlayout21_2 @@ -717,9 +717,9 @@ 0 - + - layout16_5 + tqlayout16_5 @@ -731,7 +731,7 @@ 0 - + textLabel5 @@ -747,7 +747,7 @@ textLabel5 - + lineEdit5 @@ -765,15 +765,15 @@ StyledPanel - + AlignHCenter - + - layout16_2_2 + tqlayout16_2_2 @@ -785,7 +785,7 @@ 0 - + textLabel6 @@ -801,7 +801,7 @@ textLabel6 - + lineEdit6 @@ -819,15 +819,15 @@ StyledPanel - + AlignHCenter - + - layout16_3_2 + tqlayout16_3_2 @@ -839,7 +839,7 @@ 0 - + textLabel7 @@ -855,7 +855,7 @@ textLabel7 - + lineEdit7 @@ -873,15 +873,15 @@ StyledPanel - + AlignHCenter - + - layout16_4_2 + tqlayout16_4_2 @@ -893,7 +893,7 @@ 0 - + textLabel8 @@ -909,7 +909,7 @@ textLabel8 - + lineEdit8 @@ -927,7 +927,7 @@ StyledPanel - + AlignHCenter @@ -935,7 +935,7 @@ - + checkBox2 @@ -968,7 +968,7 @@ Minimum - + 23 1 @@ -1050,16 +1050,16 @@ kbfxthemesdata.h kbfxconfig.h kdebug.h - qstringlist.h + tqstringlist.h kstandarddirs.h kmessagebox.h kfiledialog.h - kbfxconfigdlglayout.ui.h + kbfxconfigdlgtqlayout.ui.h int previous_state; - + ChangeForm() KbfxLayoutProperty_activated( int index ) KbfxExportFileAction() @@ -1067,14 +1067,14 @@ Kbfx2PanelsLeft_clicked() Kbfx2PanelsRight_clicked() Kbfx3Panels_clicked() - + init() KbfxShowAll() KbfxMakePanel(int) KbfxMessage() - + kactivelabel.h kactivelabel.h diff --git a/configdialog/kbfxconfigdlglayout.ui.h b/configdialog/kbfxconfigdlglayout.ui.h index 0ce4a70..3d595d6 100644 --- a/configdialog/kbfxconfigdlglayout.ui.h +++ b/configdialog/kbfxconfigdlglayout.ui.h @@ -2,7 +2,7 @@ ** ui.h extension file, included from the uic-generated form implementation. ** ** If you want to add, delete, or rename functions or slots, use -** Qt Designer to update this file, preserving your code. +** TQt Designer to update this file, preserving your code. ** ** You should not define a constructor or destructor in this file. ** Instead, write your code in functions called init() and destroy(). @@ -187,7 +187,7 @@ void KbfxConfigDlgLayout::KbfxLayoutProperty_activated( int index ) break; } default: /* default action switch does nothing */ - kdDebug() << "Default action switch for saving layout changed..." << endl; + kdDebug() << "Default action switch for saving tqlayout changed..." << endl; } KbfxShowAll (); @@ -205,14 +205,14 @@ void KbfxConfigDlgLayout::KbfxLayoutProperty_activated( int index ) textLabel8->setText ( tr2i18n ( "Face Box Width" ) ); checkBox1->setText ( tr2i18n ( "Hide User Name" ) ); checkBox2->hide(); - lineEdit1->setText ( QString::number ( ConfigInit().m_facePos_x ) ); - lineEdit2->setText ( QString::number ( ConfigInit().m_facePos_y ) ); - lineEdit3->setText ( QString::number ( ConfigInit().m_userNamePos_x ) ); - lineEdit4->setText ( QString::number ( ConfigInit().m_userNamePos_y ) ); - lineEdit5->setText ( QString::number ( ConfigInit().m_faceIconX ) ); - lineEdit6->setText ( QString::number ( ConfigInit().m_faceIconY ) ); - lineEdit7->setText ( QString::number ( ConfigInit().m_faceIconH ) ); - lineEdit8->setText ( QString::number ( ConfigInit().m_faceIconW ) ); + lineEdit1->setText ( TQString::number ( ConfigInit().m_facePos_x ) ); + lineEdit2->setText ( TQString::number ( ConfigInit().m_facePos_y ) ); + lineEdit3->setText ( TQString::number ( ConfigInit().m_userNamePos_x ) ); + lineEdit4->setText ( TQString::number ( ConfigInit().m_userNamePos_y ) ); + lineEdit5->setText ( TQString::number ( ConfigInit().m_faceIconX ) ); + lineEdit6->setText ( TQString::number ( ConfigInit().m_faceIconY ) ); + lineEdit7->setText ( TQString::number ( ConfigInit().m_faceIconH ) ); + lineEdit8->setText ( TQString::number ( ConfigInit().m_faceIconW ) ); checkBox1->setChecked ( ConfigInit().m_faceBoxHideText ); previous_state = 0; break; @@ -233,15 +233,15 @@ void KbfxConfigDlgLayout::KbfxLayoutProperty_activated( int index ) textLabel8->hide(); checkBox1->hide(); checkBox2->hide(); -// lineEdit1->setText ( QString::number ( ConfigInit().m_topBar_x ) ); -// lineEdit2->setText ( QString::number ( ConfigInit().m_topBar_y ) ); - lineEdit1->setText ( QString::number ( ConfigInit().m_topBar_h ) ); +// lineEdit1->setText ( TQString::number ( ConfigInit().m_topBar_x ) ); +// lineEdit2->setText ( TQString::number ( ConfigInit().m_topBar_y ) ); + lineEdit1->setText ( TQString::number ( ConfigInit().m_topBar_h ) ); lineEdit2->hide(); lineEdit3->hide(); lineEdit4->hide(); -// lineEdit5->setText ( QString::number ( ConfigInit().m_topBar_h ) ); -// lineEdit6->setText ( QString::number ( ConfigInit().m_topBar_w ) ); - lineEdit5->setText ( QString::number ( ConfigInit().m_topBar_w ) ); +// lineEdit5->setText ( TQString::number ( ConfigInit().m_topBar_h ) ); +// lineEdit6->setText ( TQString::number ( ConfigInit().m_topBar_w ) ); + lineEdit5->setText ( TQString::number ( ConfigInit().m_topBar_w ) ); lineEdit6->hide(); lineEdit7->hide(); lineEdit8->hide(); @@ -264,15 +264,15 @@ void KbfxConfigDlgLayout::KbfxLayoutProperty_activated( int index ) textLabel8->hide(); checkBox1->hide(); checkBox2->hide(); -// lineEdit1->setText ( QString::number ( ConfigInit().m_botBar_x ) ); -// lineEdit2->setText ( QString::number ( ConfigInit().m_botBar_y ) ); - lineEdit1->setText ( QString::number ( ConfigInit().m_botBar_h ) ); +// lineEdit1->setText ( TQString::number ( ConfigInit().m_botBar_x ) ); +// lineEdit2->setText ( TQString::number ( ConfigInit().m_botBar_y ) ); + lineEdit1->setText ( TQString::number ( ConfigInit().m_botBar_h ) ); lineEdit2->hide(); lineEdit3->hide(); lineEdit4->hide(); -// lineEdit5->setText ( QString::number ( ConfigInit().m_botBar_h ) ); -// lineEdit6->setText ( QString::number ( ConfigInit().m_botBar_w ) ); - lineEdit5->setText ( QString::number ( ConfigInit().m_botBar_w ) ); +// lineEdit5->setText ( TQString::number ( ConfigInit().m_botBar_h ) ); +// lineEdit6->setText ( TQString::number ( ConfigInit().m_botBar_w ) ); + lineEdit5->setText ( TQString::number ( ConfigInit().m_botBar_w ) ); lineEdit6->hide(); lineEdit7->hide(); lineEdit8->hide(); @@ -293,12 +293,12 @@ void KbfxConfigDlgLayout::KbfxLayoutProperty_activated( int index ) textLabel8->hide(); checkBox1->hide(); checkBox2->hide(); - lineEdit1->setText ( QString::number ( ConfigInit().m_scrollBarTopX ) ); - lineEdit2->setText ( QString::number ( ConfigInit().m_scrollBarTopY ) ); + lineEdit1->setText ( TQString::number ( ConfigInit().m_scrollBarTopX ) ); + lineEdit2->setText ( TQString::number ( ConfigInit().m_scrollBarTopY ) ); lineEdit3->hide(); lineEdit4->hide(); - lineEdit5->setText ( QString::number ( ConfigInit().m_scrollBarBotX ) ); - lineEdit6->setText ( QString::number ( ConfigInit().m_scrollBarBotY ) ); + lineEdit5->setText ( TQString::number ( ConfigInit().m_scrollBarBotX ) ); + lineEdit6->setText ( TQString::number ( ConfigInit().m_scrollBarBotY ) ); lineEdit7->hide(); lineEdit8->hide(); previous_state = 3; @@ -318,12 +318,12 @@ void KbfxConfigDlgLayout::KbfxLayoutProperty_activated( int index ) textLabel8->hide(); checkBox1->hide(); checkBox2->hide(); - lineEdit1->setText ( QString::number ( ConfigInit().m_listBox_x ) ); - lineEdit2->setText ( QString::number ( ConfigInit().m_listBox_y ) ); + lineEdit1->setText ( TQString::number ( ConfigInit().m_listBox_x ) ); + lineEdit2->setText ( TQString::number ( ConfigInit().m_listBox_y ) ); lineEdit3->hide(); lineEdit4->hide(); - lineEdit5->setText ( QString::number ( ConfigInit().m_listBox_h ) ); - lineEdit6->setText ( QString::number ( ConfigInit().m_listBox_w ) ); + lineEdit5->setText ( TQString::number ( ConfigInit().m_listBox_h ) ); + lineEdit6->setText ( TQString::number ( ConfigInit().m_listBox_w ) ); lineEdit7->hide(); lineEdit8->hide(); previous_state = 3; @@ -341,12 +341,12 @@ void KbfxConfigDlgLayout::KbfxLayoutProperty_activated( int index ) textLabel8->hide(); checkBox1->hide(); checkBox2->hide(); - lineEdit1->setText ( QString::number ( ConfigInit().m_searchBox_x ) ); - lineEdit2->setText ( QString::number ( ConfigInit().m_searchBox_y ) ); + lineEdit1->setText ( TQString::number ( ConfigInit().m_searchBox_x ) ); + lineEdit2->setText ( TQString::number ( ConfigInit().m_searchBox_y ) ); lineEdit3->hide(); lineEdit4->hide(); - lineEdit5->setText ( QString::number ( ConfigInit().m_searchBox_h ) ); - lineEdit6->setText ( QString::number ( ConfigInit().m_searchBox_w ) ); + lineEdit5->setText ( TQString::number ( ConfigInit().m_searchBox_h ) ); + lineEdit6->setText ( TQString::number ( ConfigInit().m_searchBox_w ) ); lineEdit7->hide(); lineEdit8->hide(); previous_state = 4; @@ -364,13 +364,13 @@ void KbfxConfigDlgLayout::KbfxLayoutProperty_activated( int index ) textLabel8->hide(); checkBox1->setText ( tr2i18n ( "No Comments in Item" ) ); checkBox2->hide(); - lineEdit1->setText ( QString::number ( ConfigInit().m_itemView_x ) ); - lineEdit2->setText ( QString::number ( ConfigInit().m_itemView_y ) ); - lineEdit3->setText ( QString::number ( ConfigInit().m_iconSize ) ); + lineEdit1->setText ( TQString::number ( ConfigInit().m_itemView_x ) ); + lineEdit2->setText ( TQString::number ( ConfigInit().m_itemView_y ) ); + lineEdit3->setText ( TQString::number ( ConfigInit().m_iconSize ) ); lineEdit4->hide(); - lineEdit5->setText ( QString::number ( ConfigInit().m_itemView_h ) ); - lineEdit6->setText ( QString::number ( ConfigInit().m_itemView_w ) ); - lineEdit7->setText ( QString::number ( ConfigInit().m_commentMargine ) ); + lineEdit5->setText ( TQString::number ( ConfigInit().m_itemView_h ) ); + lineEdit6->setText ( TQString::number ( ConfigInit().m_itemView_w ) ); + lineEdit7->setText ( TQString::number ( ConfigInit().m_commentMargine ) ); lineEdit8->hide(); checkBox1->setChecked ( ConfigInit().m_noComments ); previous_state = 5; @@ -389,11 +389,11 @@ void KbfxConfigDlgLayout::KbfxLayoutProperty_activated( int index ) textLabel8->hide(); checkBox1->hide(); checkBox2->hide(); - lineEdit1->setText ( QString::number ( ConfigInit().m_toolBarButtonNormalSize ) ); + lineEdit1->setText ( TQString::number ( ConfigInit().m_toolBarButtonNormalSize ) ); lineEdit2->hide(); lineEdit3->hide(); lineEdit4->hide(); - lineEdit5->setText ( QString::number ( ConfigInit().m_toolBarButtonExpandSize ) ); + lineEdit5->setText ( TQString::number ( ConfigInit().m_toolBarButtonExpandSize ) ); lineEdit6->hide(); lineEdit7->hide(); lineEdit8->hide(); @@ -413,11 +413,11 @@ void KbfxConfigDlgLayout::KbfxLayoutProperty_activated( int index ) textLabel8->hide(); checkBox1->setText ( tr2i18n ( "Contracted Menues" ) ); checkBox2->hide(); - lineEdit1->setText ( QString::number ( ConfigInit().m_userMenuHeight ) ); + lineEdit1->setText ( TQString::number ( ConfigInit().m_userMenuHeight ) ); lineEdit2->hide(); lineEdit3->hide(); lineEdit4->hide(); - lineEdit5->setText ( QString::number ( ConfigInit().m_userMenuWidth ) ); + lineEdit5->setText ( TQString::number ( ConfigInit().m_userMenuWidth ) ); lineEdit6->hide(); lineEdit7->hide(); lineEdit8->hide(); @@ -426,7 +426,7 @@ void KbfxConfigDlgLayout::KbfxLayoutProperty_activated( int index ) break; } default: /* default action switch should never be reached */ - kdDebug() << "Default action switch for layout changed..." << endl; + kdDebug() << "Default action switch for tqlayout changed..." << endl; } } @@ -454,100 +454,100 @@ void KbfxConfigDlgLayout::KbfxShowAll() void KbfxConfigDlgLayout::KbfxExportFileAction() { - QString KbfxExportLayoutRcDialogURL = KFileDialog::getExistingDirectory ( - QString::null, + TQString KbfxExportLayoutRcDialogURL = KFileDialog::getExistingDirectory ( + TQString(), 0, - tr2i18n ( "Select folder to export kbfxlayoutrc file" ) ).append ( "/kbfxlayoutrc" ); + tr2i18n ( "Select folder to export kbfxtqlayoutrc file" ) ).append ( "/kbfxtqlayoutrc" ); - if ( KbfxExportLayoutRcDialogURL == "/kbfxlayoutrc") return; + if ( KbfxExportLayoutRcDialogURL == "/kbfxtqlayoutrc") return; kdDebug() << "Selected export file is: " << KbfxExportLayoutRcDialogURL << endl; - /* write layout theme configuration file */ - KConfig *layoutconfig = new KConfig ( KbfxExportLayoutRcDialogURL ); + /* write tqlayout theme configuration file */ + KConfig *tqlayoutconfig = new KConfig ( KbfxExportLayoutRcDialogURL ); - layoutconfig->setGroup ( "KbfxButton" ); - layoutconfig->writeEntry ( "FadeTime", ConfigInit().m_fadeTime ); + tqlayoutconfig->setGroup ( "KbfxButton" ); + tqlayoutconfig->writeEntry ( "FadeTime", ConfigInit().m_fadeTime ); /* // No need for this to be exported because it is user/installation specific - 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->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->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; + 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; KMessageBox::information ( 0, tr2i18n ( "

The Layout configuration of the KBFX Theme %1 has been exported successfully!

" ).arg ( ConfigInit().m_SpinxThemeName ), diff --git a/configdialog/kbfxconfigdlgmain.ui b/configdialog/kbfxconfigdlgmain.ui index c23db41..9dcf31c 100644 --- a/configdialog/kbfxconfigdlgmain.ui +++ b/configdialog/kbfxconfigdlgmain.ui @@ -1,13 +1,13 @@ KbfxConfigDlgMain - + tb_Main true - + 0 0 @@ -42,15 +42,15 @@ Minimum - + - layout4 + tqlayout4 unnamed - + Start Button @@ -126,13 +126,13 @@ 0 - + 150 265 - + 32767 32767 @@ -160,13 +160,13 @@ 0 - + 150 280 - + 32767 32767 @@ -194,9 +194,9 @@ - + - layout12 + tqlayout12 @@ -205,7 +205,7 @@ 2 - + btn_Help @@ -236,7 +236,7 @@ Open Help Documentation - + btn_Default @@ -277,14 +277,14 @@ Expanding - + 160 1 - + btn_SaveApply @@ -315,7 +315,7 @@ Save the configuration and Apply it - + btn_Exit @@ -348,17 +348,17 @@ - + - layout5 + tqlayout5 unnamed - + - layout3 + tqlayout3 @@ -378,7 +378,7 @@ 0 - + frame4 @@ -390,13 +390,13 @@ 0 - + 507 100 - + 32767 100 @@ -436,7 +436,7 @@ Minimum - + 61 25 @@ -453,7 +453,7 @@ Minimum - + 16 16 @@ -470,14 +470,14 @@ Expanding - + 56 7 - + KbfxLogoText @@ -501,7 +501,7 @@ - + frame3 @@ -513,13 +513,13 @@ 0 - + 114 100 - + 114 100 @@ -537,7 +537,7 @@ - + ws_Main @@ -549,7 +549,7 @@ 0 - + 32767 32767 @@ -640,10 +640,10 @@ kdebug.h - qstring.h - qpainter.h - qimage.h - qpixmap.h + tqstring.h + tqpainter.h + tqimage.h + tqpixmap.h kmessagebox.h kbfxconfigdlgmain.ui.h @@ -657,13 +657,13 @@ QPixmap img_plugins; QPixmap img_about; - + KbfxConfigDlgButtonChanged(const char * name, const QString & path) - + init() - + kactivelabel.h diff --git a/configdialog/kbfxconfigdlgmain.ui.h b/configdialog/kbfxconfigdlgmain.ui.h index ee5fe64..5c1ed94 100644 --- a/configdialog/kbfxconfigdlgmain.ui.h +++ b/configdialog/kbfxconfigdlgmain.ui.h @@ -2,7 +2,7 @@ ** ui.h extension file, included from the uic-generated form implementation. ** ** If you want to add, delete, or rename functions or slots, use -** Qt Designer to update this file, preserving your code. +** TQt Designer to update this file, preserving your code. ** ** You should not define a constructor or destructor in this file. ** Instead, write your code in functions called init() and destroy(). diff --git a/configdialog/kbfxconfigdlgplugins.ui b/configdialog/kbfxconfigdlgplugins.ui index 81db2aa..d187df0 100644 --- a/configdialog/kbfxconfigdlgplugins.ui +++ b/configdialog/kbfxconfigdlgplugins.ui @@ -1,10 +1,10 @@ KbfxConfigDlgPlugins - + KbfxConfigDlgPlugins - + 0 0 @@ -48,13 +48,13 @@ 0 - + 0 29 - + 32767 29 @@ -80,7 +80,7 @@ <b><h3><p align="center">Plugins options</p></h3></b> - + KbfxSelectPanel @@ -114,7 +114,7 @@ 0 - + 32767 44 @@ -130,7 +130,7 @@ Plugin to configure - + textLabel1 @@ -142,7 +142,7 @@ 0 - + 32767 44 @@ -179,9 +179,9 @@ SmallIcon - + - layout3 + tqlayout3 @@ -197,14 +197,14 @@ MinimumExpanding - + 1 1 - + KbfxConfigurePluginButton @@ -232,7 +232,7 @@ Configure the selected plugin - + KbfxPluginInfoButton @@ -270,7 +270,7 @@ MinimumExpanding - + 1 1 @@ -289,7 +289,7 @@ Minimum - + 1 1 @@ -326,27 +326,27 @@ KbfxPluginSelector - movedDown(QListBoxItem*) + movedDown(TQListBoxItem*) KbfxConfigDlgPlugins - KbfxPluginSelector_movedDown(QListBoxItem*) + KbfxPluginSelector_movedDown(TQListBoxItem*) KbfxPluginSelector - movedUp(QListBoxItem*) + movedUp(TQListBoxItem*) KbfxConfigDlgPlugins - KbfxPluginSelector_movedUp(QListBoxItem*) + KbfxPluginSelector_movedUp(TQListBoxItem*) KbfxPluginSelector - removed(QListBoxItem*) + removed(TQListBoxItem*) KbfxConfigDlgPlugins - KbfxPluginSelector_removed(QListBoxItem*) + KbfxPluginSelector_removed(TQListBoxItem*) KbfxPluginSelector - added(QListBoxItem*) + added(TQListBoxItem*) KbfxConfigDlgPlugins - KbfxPluginSelector_added(QListBoxItem*) + KbfxPluginSelector_added(TQListBoxItem*) @@ -359,29 +359,29 @@ kbfxthemesdata.h kbfxconfig.h kdebug.h - qstringlist.h + tqstringlist.h kstandarddirs.h kmessagebox.h - qlistbox.h + tqlistbox.h kbfxplasmapluginloader.h kbfxconfigdlgplugins.ui.h - + ChangeForm() KbfxConfigurePluginButton_clicked() KbfxPluginInfoButton_clicked() KbfxPanelSelected( int _sel ) - KbfxPluginSelector_movedDown( QListBoxItem * ) - KbfxPluginSelector_movedUp( QListBoxItem * ) - KbfxPluginSelector_removed( QListBoxItem * ) - KbfxPluginSelector_added( QListBoxItem * ) - + KbfxPluginSelector_movedDown( TQListBoxItem * ) + KbfxPluginSelector_movedUp( TQListBoxItem * ) + KbfxPluginSelector_removed( TQListBoxItem * ) + KbfxPluginSelector_added( TQListBoxItem * ) + init() - KbfxListPlugins( int panel ) + KbfxListPlugins( int panel ) KbfxSaveSelectedPlugins() - + kactivelabel.h kcombobox.h diff --git a/configdialog/kbfxconfigdlgplugins.ui.h b/configdialog/kbfxconfigdlgplugins.ui.h index 40153d9..176af80 100644 --- a/configdialog/kbfxconfigdlgplugins.ui.h +++ b/configdialog/kbfxconfigdlgplugins.ui.h @@ -2,7 +2,7 @@ ** ui.h extension file, included from the uic-generated form implementation. ** ** If you want to add, delete, or rename functions or slots, use -** Qt Designer to update this file, preserving your code. +** TQt Designer to update this file, preserving your code. ** ** You should not define a constructor or destructor in this file. ** Instead, write your code in functions called init() and destroy(). @@ -25,16 +25,16 @@ void KbfxConfigDlgPlugins::ChangeForm() KbfxPluginSelector-> availableListBox()-> insertStringList ( KbfxListPlugins ( 0 ) ); // list Left Panel Plugins } -QStringList KbfxConfigDlgPlugins::KbfxListPlugins ( int panel ) +TQStringList KbfxConfigDlgPlugins::KbfxListPlugins ( int panel ) { - QStringList _plugins; + TQStringList _plugins; _plugins.clear(); bool _not_present; - QStringList::Iterator it_available; - QStringList::Iterator it_requested; + TQStringList::Iterator it_available; + TQStringList::Iterator it_requested; KbfxPlasmaPluginLoader *_tmp = new KbfxPlasmaPluginLoader(); - QStringList allPlugins = _tmp -> scanPlugins(); + TQStringList allPlugins = _tmp -> scanPlugins(); delete _tmp; for ( it_available = allPlugins.begin(); it_available != allPlugins.end(); ++it_available ) @@ -45,7 +45,7 @@ QStringList KbfxConfigDlgPlugins::KbfxListPlugins ( int panel ) for ( it_requested = ConfigInit ().m_pluginsLeft.begin (); it_requested != ConfigInit ().m_pluginsLeft.end (); ++it_requested ) { - if ( ( *it_available ).contains ( *it_requested ) > 0 ) + if ( ( *it_available ).tqcontains ( *it_requested ) > 0 ) { _not_present = FALSE; break; @@ -57,7 +57,7 @@ QStringList KbfxConfigDlgPlugins::KbfxListPlugins ( int panel ) for ( it_requested = ConfigInit ().m_pluginsRight.begin (); it_requested != ConfigInit ().m_pluginsRight.end (); ++it_requested ) { - if ( ( *it_available ).contains ( *it_requested ) > 0 ) + if ( ( *it_available ).tqcontains ( *it_requested ) > 0 ) { _not_present = FALSE; break; @@ -88,7 +88,7 @@ void KbfxConfigDlgPlugins::KbfxPluginInfoButton_clicked() void KbfxConfigDlgPlugins::KbfxSaveSelectedPlugins() { int _selectedPanel = KbfxPanel->currentItem(); - QStringList _plugins; + TQStringList _plugins; _plugins.clear(); int it; int _num = KbfxPluginSelector-> selectedListBox()->count(); @@ -129,28 +129,28 @@ void KbfxConfigDlgPlugins::KbfxPanelSelected ( int _sel ) -void KbfxConfigDlgPlugins::KbfxPluginSelector_movedDown ( QListBoxItem * ) +void KbfxConfigDlgPlugins::KbfxPluginSelector_movedDown ( TQListBoxItem * ) { /* save current selection */ KbfxSaveSelectedPlugins(); } -void KbfxConfigDlgPlugins::KbfxPluginSelector_movedUp ( QListBoxItem * ) +void KbfxConfigDlgPlugins::KbfxPluginSelector_movedUp ( TQListBoxItem * ) { /* save current selection */ KbfxSaveSelectedPlugins(); } -void KbfxConfigDlgPlugins::KbfxPluginSelector_removed ( QListBoxItem * ) +void KbfxConfigDlgPlugins::KbfxPluginSelector_removed ( TQListBoxItem * ) { /* save current selection */ KbfxSaveSelectedPlugins(); } -void KbfxConfigDlgPlugins::KbfxPluginSelector_added ( QListBoxItem * ) +void KbfxConfigDlgPlugins::KbfxPluginSelector_added ( TQListBoxItem * ) { /* save current selection */ KbfxSaveSelectedPlugins(); diff --git a/configdialog/kbfxconfigdlgstyle.ui b/configdialog/kbfxconfigdlgstyle.ui index df866a9..498c42b 100644 --- a/configdialog/kbfxconfigdlgstyle.ui +++ b/configdialog/kbfxconfigdlgstyle.ui @@ -1,10 +1,10 @@ KbfxConfigDlgStyle - + KbfxConfigDlgStyle - + 0 0 @@ -45,13 +45,13 @@ 0 - + 0 29 - + 32767 29 @@ -77,7 +77,7 @@ <b><h3><p align="center">Menu type</p></h3></b> - + KbfxStyleGroupBox @@ -112,7 +112,7 @@ Minimum - + 53 1 @@ -129,7 +129,7 @@ Expanding - + 1 1 @@ -146,14 +146,14 @@ Minimum - + 38 1 - + KbfxRadioButtonKbfxStyle @@ -178,7 +178,7 @@ 0 - + KbfxRadioButtonKdeStyle @@ -202,7 +202,7 @@ - + groupBox4 @@ -230,7 +230,7 @@ 0 - + pixmapLabel1 @@ -242,13 +242,13 @@ 0 - + 293 334 - + 293 334 @@ -274,7 +274,7 @@ MinimumExpanding - + 1 1 @@ -291,7 +291,7 @@ MinimumExpanding - + 1 1 @@ -308,7 +308,7 @@ MinimumExpanding - + 1 1 @@ -325,7 +325,7 @@ MinimumExpanding - + 1 1 @@ -334,7 +334,7 @@ - + groupBox6 @@ -362,7 +362,7 @@ 0 - + pixmapLabel1_2 @@ -374,13 +374,13 @@ 0 - + 293 334 - + 293 334 @@ -406,7 +406,7 @@ MinimumExpanding - + 1 1 @@ -423,7 +423,7 @@ MinimumExpanding - + 1 1 @@ -440,7 +440,7 @@ MinimumExpanding - + 1 1 @@ -457,7 +457,7 @@ MinimumExpanding - + 1 1 @@ -494,11 +494,11 @@ kdebug.h kbfxconfigdlgstyle.ui.h - + KbfxStyleSelected( int ) ChangeForm() - - + + kactivelabel.h diff --git a/configdialog/kbfxconfigdlgstyle.ui.h b/configdialog/kbfxconfigdlgstyle.ui.h index eb8001c..44e8325 100644 --- a/configdialog/kbfxconfigdlgstyle.ui.h +++ b/configdialog/kbfxconfigdlgstyle.ui.h @@ -2,7 +2,7 @@ ** ui.h extension file, included from the uic-generated form implementation. ** ** If you want to add, delete, or rename functions or slots, use -** Qt Designer to update this file, preserving your code. +** TQt Designer to update this file, preserving your code. ** ** You should not define a constructor or destructor in this file. ** Instead, write your code in functions called init() and destroy(). diff --git a/configdialog/kbfxconfigdlgthemes.ui b/configdialog/kbfxconfigdlgthemes.ui index 9378b6a..d36e393 100644 --- a/configdialog/kbfxconfigdlgthemes.ui +++ b/configdialog/kbfxconfigdlgthemes.ui @@ -1,10 +1,10 @@ KbfxConfigDlgThemes - + KbfxConfigDlgThemes - + 0 0 @@ -36,7 +36,7 @@ Minimum - + groupBox8 @@ -77,7 +77,7 @@ 10 - + textLabel1 @@ -105,22 +105,22 @@ MinimumExpanding - + 28 16 - + - layout7 + tqlayout7 unnamed - + SpixBar @@ -137,7 +137,7 @@ 0 - + 200 0 @@ -153,15 +153,15 @@ Here are listed all the installed KBFX Themes - + - layout6 + tqlayout6 unnamed - + groupBox4 @@ -179,7 +179,7 @@ Selected Theme Preview - + AlignVCenter @@ -196,7 +196,7 @@ Minimum - + 17 21 @@ -213,7 +213,7 @@ MinimumExpanding - + 1 1 @@ -230,14 +230,14 @@ MinimumExpanding - + 1 1 - + KbfxPixmapPreview @@ -249,13 +249,13 @@ 0 - + 270 210 - + 270 210 @@ -267,7 +267,7 @@ false - + AlignCenter @@ -281,7 +281,7 @@ Minimum - + 17 21 @@ -290,23 +290,23 @@ - + - layout14 + tqlayout14 unnamed - + - layout12 + tqlayout12 unnamed - + KbfxDeleteTheme @@ -331,7 +331,7 @@ Pressing the button will delete the currently selected theme. <br><b>Warning!</b> You cannot delete the installed system wide themes! - + KbfxGetMoreThemes @@ -358,15 +358,15 @@ - + - layout13 + tqlayout13 unnamed - + KbfxInstallTheme @@ -391,7 +391,7 @@ Pressing the button will offer a dialog where you can choose KBFX Theme Package to install in your home folder - + KbfxThemeInfoBtn @@ -422,15 +422,15 @@ - + - layout10 + tqlayout10 unnamed - + groupBox18 @@ -462,14 +462,14 @@ Minimum - + 16 7 - + KbfxDeleteDudeImage @@ -494,7 +494,7 @@ Pressing the button will delete the personal image you have selected and install the theme's default personal image - + textLabel3 @@ -509,11 +509,11 @@ Maxsize 48 x 48 - + AlignCenter - + KbfxSelectDudeImage @@ -548,7 +548,7 @@ Minimum - + 18 54 @@ -565,14 +565,14 @@ Minimum - + 17 62 - + frame7 @@ -601,7 +601,7 @@ unnamed - + KbfxDudeImage @@ -613,13 +613,13 @@ 0 - + 48 48 - + 48 48 @@ -644,7 +644,7 @@ Minimum - + 16 16 @@ -661,14 +661,14 @@ Minimum - + 16 16 - + textLabel2 @@ -683,7 +683,7 @@ This is your personal image displayed at the KBFX menu. - + WordBreak|AlignCenter @@ -697,7 +697,7 @@ Minimum - + 16 10 @@ -706,7 +706,7 @@ - + groupBox4_2 @@ -724,7 +724,7 @@ Misc Options - + AlignVCenter @@ -741,14 +741,14 @@ MinimumExpanding - + 1 1 - + KbfxWatch @@ -770,7 +770,7 @@ Watch for applications installs and reload KBFX if any occurs - + KbfxShowOldThemes @@ -807,13 +807,13 @@ 0 - + 0 29 - + 32767 29 @@ -854,13 +854,13 @@ 0 - + 0 29 - + 32767 29 @@ -907,21 +907,21 @@ KbfxURLRequesterThemesPath - urlSelected(const QString&) + urlSelected(const TQString&) KbfxConfigDlgThemes - KbfxURLRequesterThemesPathUrlSelected(const QString&) + KbfxURLRequesterThemesPathUrlSelected(const TQString&) KbfxURLRequesterThemesPath - returnPressed(const QString&) + returnPressed(const TQString&) KbfxConfigDlgThemes - KbfxURLRequesterThemesPathUrlSelected(const QString&) + KbfxURLRequesterThemesPathUrlSelected(const TQString&) KbfxThemeList - highlighted(const QString&) + highlighted(const TQString&) KbfxConfigDlgThemes - KbfxThemeSelected(const QString&) + KbfxThemeSelected(const TQString&) KbfxDeleteTheme @@ -981,7 +981,7 @@ kbfxconfig.h kdebug.h - qstringlist.h + tqstringlist.h kmessagebox.h kio/netaccess.h kfiledialog.h @@ -996,32 +996,32 @@ bool KbfxFormReady; - QString KbfxInstallDialogURL; - QStringList KbfxThemes; + TQString KbfxInstallDialogURL; + TQStringList KbfxThemes; QPixmap img_nopreview; static KbfxThemeInfo * _info_box; - - KbfxThemeDoInstall( QString & installUrl ) - - - KbfxURLRequesterThemesPathUrlSelected( const QString & path ) - KbfxThemeSelected( const QString & name ) + + KbfxThemeDoInstall( TQString & installUrl ) + + + KbfxURLRequesterThemesPathUrlSelected( const TQString & path ) + KbfxThemeSelected( const TQString & name ) setKbfxThemePreview() ChangeForm() KbfxDeleteThemeClicked() KbfxInstallThemeClicked() - KbfxThemeInstall( QString & installUrl ) + KbfxThemeInstall( TQString & installUrl ) KbfxSelectDudeImageClicked() KbfxDeleteDudeImageClicked() KbfxThemeInfoClicked() KbfxShowOldThemes_toggled( bool ) KbfxWatch_toggled( bool ) - + init() - + kurlrequester.h klineedit.h diff --git a/configdialog/kbfxconfigdlgthemes.ui.h b/configdialog/kbfxconfigdlgthemes.ui.h index fe28790..7689989 100644 --- a/configdialog/kbfxconfigdlgthemes.ui.h +++ b/configdialog/kbfxconfigdlgthemes.ui.h @@ -2,7 +2,7 @@ ** ui.h extension file, included from the uic-generated form implementation. ** ** If you want to add, delete, or rename functions or slots, use -** Qt Designer to update this file, preserving your code. +** TQt Designer to update this file, preserving your code. ** ** You should not define a constructor or destructor in this file. ** Instead, write your code in functions called init() and destroy(). @@ -17,8 +17,8 @@ void KbfxConfigDlgThemes::init() KbfxFormReady = FALSE; img_nopreview = image0; - connect ( this, SIGNAL ( KbfxThemeDoInstall ( QString & ) ), - this, SLOT ( KbfxThemeInstall ( QString & ) ) ); + connect ( this, TQT_SIGNAL ( KbfxThemeDoInstall ( TQString & ) ), + this, TQT_SLOT ( KbfxThemeInstall ( TQString & ) ) ); } /* @@ -27,14 +27,14 @@ void KbfxConfigDlgThemes::KbfxDudeAnimationButtonToggled(bool) if(KbfxAnimationButton->state() == 2) { KbfxAnimationButton->setText(tr2i18n("Animation is ON")); - KbfxAnimationButton->setPaletteBackgroundColor(QColor(0,255,0)); + KbfxAnimationButton->setPaletteBackgroundColor(TQColor(0,255,0)); ConfigInit().m_SpinxDudeBlink = TRUE; } if(KbfxAnimationButton->state() == 0) { KbfxAnimationButton->setText(tr2i18n("Animation is OFF")); - KbfxAnimationButton->setPaletteBackgroundColor(QColor(221,223,228)); + KbfxAnimationButton->setPaletteBackgroundColor(TQColor(221,223,228)); ConfigInit().m_SpinxDudeBlink = FALSE; } @@ -44,15 +44,15 @@ void KbfxConfigDlgThemes::KbfxDudeAnimationButtonToggled(bool) } */ -void KbfxConfigDlgThemes::KbfxURLRequesterThemesPathUrlSelected ( const QString &path ) +void KbfxConfigDlgThemes::KbfxURLRequesterThemesPathUrlSelected ( const TQString &path ) { - QString tmppath = path; + TQString tmppath = path; if ( tmppath.startsWith ( "file://" ) ) tmppath.remove ( "file://" ); if ( !tmppath.endsWith ( "/" ) ) tmppath.append ( "/" ); - QDir d ( tmppath ); - d.setFilter ( QDir::Dirs ); + TQDir d ( tmppath ); + d.setFilter ( TQDir::Dirs ); if ( !d.exists() ) { kdDebug() << "Themes folder does not exist: " << tmppath << endl; @@ -78,7 +78,7 @@ void KbfxConfigDlgThemes::KbfxURLRequesterThemesPathUrlSelected ( const QString setKbfxThemePreview(); } -void KbfxConfigDlgThemes::KbfxThemeSelected ( const QString &name ) +void KbfxConfigDlgThemes::KbfxThemeSelected ( const TQString &name ) { if (KbfxFormReady) { @@ -102,16 +102,16 @@ void KbfxConfigDlgThemes::KbfxThemeSelected ( const QString &name ) void KbfxConfigDlgThemes::setKbfxThemePreview() { - QString path = ConfigInit().m_SpinxThemeBasePath + ConfigInit().m_SpinxThemeName + "/preview.png"; + TQString path = ConfigInit().m_SpinxThemeBasePath + ConfigInit().m_SpinxThemeName + "/preview.png"; - QImage tmp ( path ); + TQImage tmp ( path ); if ( tmp.isNull() ) { kdDebug() << "No preview available for theme: " << ConfigInit().m_SpinxThemeBasePath + ConfigInit().m_SpinxThemeName << endl; - // QString default_path = locate("data", "kbfx/images/nopreview.png"); + // TQString default_path = locate("data", "kbfx/images/nopreview.png"); KbfxPixmapPreview->setPixmap ( img_nopreview ); } else @@ -132,7 +132,7 @@ void KbfxConfigDlgThemes::ChangeForm() << KbfxThemesData().setThemeList ( ConfigInit().m_UserSpinxThemeBasePath ) [ConfigInit().m_SpinxThemeName] << endl; - KbfxThemeList->setSelected ( KbfxThemeList->findItem ( ConfigInit().m_SpinxThemeName ), TRUE ); + KbfxThemeList->setSelected ( KbfxThemeList->tqfindItem ( ConfigInit().m_SpinxThemeName ), TRUE ); setKbfxThemePreview(); @@ -163,7 +163,7 @@ void KbfxConfigDlgThemes::KbfxDeleteThemeClicked() { int messageBoxReturn; int messageBoxUserResReturn; - QString KbfxThemeRcDestination = KGlobal::dirs()->saveLocation ( "data", QString ( "kbfx/themerc/" ), TRUE ); + TQString KbfxThemeRcDestination = KGlobal::dirs()->saveLocation ( "data", TQString ( "kbfx/themerc/" ), TRUE ); KbfxThemeRcDestination.append( ConfigInit().m_SpinxThemeName ); messageBoxReturn = KMessageBox::warningContinueCancel ( 0, @@ -181,18 +181,18 @@ void KbfxConfigDlgThemes::KbfxDeleteThemeClicked() if ( messageBoxUserResReturn == KMessageBox::No ) { - if ( QFile::exists ( KbfxThemeRcDestination + "_fontrc" ) ) + if ( TQFile::exists ( KbfxThemeRcDestination + "_fontrc" ) ) { - QFile::remove ( KbfxThemeRcDestination + "_fontrc" ); + TQFile::remove ( KbfxThemeRcDestination + "_fontrc" ); kdDebug() << "Deleting user's fontrc file: " << KbfxThemeRcDestination + "_fontrc" << endl; } - if ( QFile::exists ( KbfxThemeRcDestination + "_layoutrc" ) ) + if ( TQFile::exists ( KbfxThemeRcDestination + "_layoutrc" ) ) { - QFile::remove ( KbfxThemeRcDestination + "_layoutrc" ); - kdDebug() << "Deleting user's layoutrc file: " + TQFile::remove ( KbfxThemeRcDestination + "_layoutrc" ); + kdDebug() << "Deleting user's tqlayoutrc file: " << KbfxThemeRcDestination + "_layoutrc" << endl; } @@ -219,7 +219,7 @@ void KbfxConfigDlgThemes::KbfxDeleteThemeClicked() void KbfxConfigDlgThemes::KbfxInstallThemeClicked() { - KFileDialog KbfxInstallDialog ( QString::null, + KFileDialog KbfxInstallDialog ( TQString(), "*.tar *.tar.bz2 *.tar.gz *.kbfxtheme|" + tr2i18n ( "KBFX theme packages (*.tar, *.tar.bz2, *.tar.gz, *.kbfxtheme)" ), 0, 0, @@ -234,7 +234,7 @@ void KbfxConfigDlgThemes::KbfxInstallThemeClicked() emit KbfxThemeDoInstall ( KbfxInstallDialogURL ); } -void KbfxConfigDlgThemes::KbfxThemeInstall ( QString &installUrl ) +void KbfxConfigDlgThemes::KbfxThemeInstall ( TQString &installUrl ) { KTar KbfxThemeArchive ( installUrl ); @@ -247,8 +247,8 @@ void KbfxConfigDlgThemes::KbfxThemeInstall ( QString &installUrl ) return; } - const QString KbfxThemeDestination = KGlobal::dirs()->saveLocation ( "data", - QString ( "kbfx/skins/" ), + const TQString KbfxThemeDestination = KGlobal::dirs()->saveLocation ( "data", + TQString ( "kbfx/skins/" ), TRUE ); kdDebug() << "Copying theme: " << KbfxThemeDestination << endl; @@ -261,7 +261,7 @@ void KbfxConfigDlgThemes::KbfxThemeInstall ( QString &installUrl ) void KbfxConfigDlgThemes::KbfxSelectDudeImageClicked() { - KFileDialog KbfxDudeImageDialog ( QString::null, + KFileDialog KbfxDudeImageDialog ( TQString(), "image/jpeg image/png image/x-xpm image/gif ", 0, 0, @@ -274,7 +274,7 @@ void KbfxConfigDlgThemes::KbfxSelectDudeImageClicked() ConfigInit().m_SpinxDudeImage = KbfxDudeImageDialog.selectedURL().path(); - QImage tmp ( ConfigInit().m_SpinxDudeImage ); + TQImage tmp ( ConfigInit().m_SpinxDudeImage ); if ( tmp.isNull() ) { KMessageBox::error ( 0, @@ -295,8 +295,8 @@ void KbfxConfigDlgThemes::KbfxSelectDudeImageClicked() void KbfxConfigDlgThemes::KbfxDeleteDudeImageClicked() { - QString tmp_dude = ConfigInit().m_SpinxThemeBasePath + ConfigInit().m_SpinxThemeName + "/menu_top_image_person.png"; - QFile tmp ( tmp_dude ); + TQString tmp_dude = ConfigInit().m_SpinxThemeBasePath + ConfigInit().m_SpinxThemeName + "/menu_top_image_person.png"; + TQFile tmp ( tmp_dude ); if ( tmp.exists() ) { ConfigInit().m_SpinxDudeImage = tmp_dude; @@ -312,10 +312,10 @@ void KbfxConfigDlgThemes::KbfxDeleteDudeImageClicked() void KbfxConfigDlgThemes::KbfxThemeInfoClicked() { - QPixmap _logo = QPixmap (ConfigInit ().m_SpinxThemeBasePath + ConfigInit ().m_SpinxThemeName + "/logo.png"); + TQPixmap _logo = TQPixmap (ConfigInit ().m_SpinxThemeBasePath + ConfigInit ().m_SpinxThemeName + "/logo.png"); ConfigInit().readThemeInfo ( ConfigInit().m_SpinxThemeBasePath, ConfigInit().m_SpinxThemeName ); - _info_box = new KbfxThemeInfo (this,"infodlg",Qt::WType_Modal); + _info_box = new KbfxThemeInfo (this,"infodlg",TQt::WType_Modal); if ( !_logo.isNull() ) { diff --git a/configdialog/kbfxconfigdlgtooltip.ui b/configdialog/kbfxconfigdlgtooltip.ui index 97d5218..b58a88d 100644 --- a/configdialog/kbfxconfigdlgtooltip.ui +++ b/configdialog/kbfxconfigdlgtooltip.ui @@ -1,13 +1,13 @@ KbfxConfigDlgTooltip - + KbfxConfigDlgTooltip true - + 0 0 @@ -48,13 +48,13 @@ 0 - + 0 29 - + 32767 29 @@ -80,7 +80,7 @@ <b><h3><p align="center">Tooltip ON or OFF</p></h3></b> - + groupBox24 @@ -98,7 +98,7 @@ Turn off or on the tooltip - + AlignVCenter @@ -108,17 +108,17 @@ 10 - + - layout21 + tqlayout21 unnamed - + - layout6 + tqlayout6 @@ -140,9 +140,9 @@ Turn your tooltip off or on. <br>You can see the current status of the tooltip to the right. - + - layout4 + tqlayout4 @@ -158,14 +158,14 @@ Minimum - + 24 1 - + KbfxTooltipOnButton @@ -200,7 +200,7 @@ Expanding - + 1 1 @@ -211,7 +211,7 @@ - + KbfxTooltipOnPixmapLabel @@ -223,13 +223,13 @@ 0 - + 120 80 - + 120 80 @@ -249,7 +249,7 @@ - + groupBox3 @@ -267,7 +267,7 @@ Tooltip Text - + AlignVCenter @@ -277,9 +277,9 @@ 10 - + - layout19 + tqlayout19 @@ -311,7 +311,7 @@ Minimum - + 1 19 @@ -332,13 +332,13 @@ 0 - + 0 100 - + 32767 100 @@ -374,13 +374,13 @@ 0 - + 0 29 - + 32767 29 @@ -406,7 +406,7 @@ <b><h3><p align="center">Tooltip personal text</p></h3></b> - + groupBox26 @@ -424,7 +424,7 @@ Tooltip animation - + AlignVCenter @@ -437,17 +437,17 @@ 0 - + - layout20 + tqlayout20 unnamed - + - layout9 + tqlayout9 @@ -469,9 +469,9 @@ Turn your tooltip animation off or on. <br>You can see the current status of the tooltip to the right. - + - layout8 + tqlayout8 @@ -487,14 +487,14 @@ Minimum - + 26 1 - + KbfxTooltipAnimationButton @@ -526,7 +526,7 @@ Expanding - + 1 1 @@ -537,7 +537,7 @@ - + KbfxTooltipAnimationPixmapLabel @@ -549,13 +549,13 @@ 0 - + 120 80 - + 120 80 @@ -585,7 +585,7 @@ MinimumExpanding - + 1 1 @@ -604,13 +604,13 @@ 0 - + 0 29 - + 32767 29 @@ -646,7 +646,7 @@ MinimumExpanding - + 1 1 @@ -697,16 +697,16 @@ QPixmap img_on; QPixmap img_off; - + KbfxTooltipAnimationButtonToggled( bool ) KbfxTooltipTextEditTextChanged() KbfxTooltipOnButtonToggled( bool ) ChangeForm() - + init() - + kactivelabel.h kactivelabel.h diff --git a/configdialog/kbfxconfigdlgtooltip.ui.h b/configdialog/kbfxconfigdlgtooltip.ui.h index 196c2d9..4f55e80 100644 --- a/configdialog/kbfxconfigdlgtooltip.ui.h +++ b/configdialog/kbfxconfigdlgtooltip.ui.h @@ -2,7 +2,7 @@ ** ui.h extension file, included from the uic-generated form implementation. ** ** If you want to add, delete, or rename functions or slots, use -** Qt Designer to update this file, preserving your code. +** TQt Designer to update this file, preserving your code. ** ** You should not define a constructor or destructor in this file. ** Instead, write your code in functions called init() and destroy(). diff --git a/configdialog/kbfxthemeinfo.ui b/configdialog/kbfxthemeinfo.ui index 69cd3e8..cf4b818 100644 --- a/configdialog/kbfxthemeinfo.ui +++ b/configdialog/kbfxthemeinfo.ui @@ -1,10 +1,10 @@ KbfxThemeInfo - + KbfxThemeInfo - + 0 0 @@ -42,9 +42,9 @@ Minimum - + - layout10 + tqlayout10 @@ -63,14 +63,14 @@ MinimumExpanding - + 54 6 - + KbfxOk @@ -99,7 +99,7 @@ MinimumExpanding - + 54 6 @@ -118,7 +118,7 @@ MinimumExpanding - + 16 16 @@ -135,16 +135,16 @@ MinimumExpanding - + 16 16 - + - layout7 + tqlayout7 @@ -156,9 +156,9 @@ 0 - + - layout11 + tqlayout11 @@ -174,14 +174,14 @@ MinimumExpanding - + 10 49 - + KbfxThemeLogo @@ -193,13 +193,13 @@ 0 - + 100 100 - + 100 100 @@ -211,7 +211,7 @@ true - + AlignCenter @@ -225,7 +225,7 @@ MinimumExpanding - + 10 49 @@ -244,16 +244,16 @@ MinimumExpanding - + 16 16 - + - layout21 + tqlayout21 @@ -262,9 +262,9 @@ 15 - + - layout19 + tqlayout19 @@ -352,9 +352,9 @@ - + - layout20 + tqlayout20 @@ -534,7 +534,7 @@ MinimumExpanding - + 16 16 @@ -551,7 +551,7 @@ MinimumExpanding - + 16 16 @@ -581,13 +581,13 @@ kbfxthemeinfo.ui.h - + hideSpacer() - + init() - + kactivelabel.h kactivelabel.h diff --git a/configdialog/kbfxthemeinfo.ui.h b/configdialog/kbfxthemeinfo.ui.h index e67a134..cd74ec3 100644 --- a/configdialog/kbfxthemeinfo.ui.h +++ b/configdialog/kbfxthemeinfo.ui.h @@ -2,7 +2,7 @@ ** ui.h extension file, included from the uic-generated form implementation. ** ** If you want to add, delete, or rename functions or slots, use -** Qt Designer to update this file, preserving your code. +** TQt Designer to update this file, preserving your code. ** ** You should not define a constructor or destructor in this file. ** Instead, write your code in functions called init() and destroy(). diff --git a/configdialog/main.cpp b/configdialog/main.cpp index fe5e508..09de452 100644 --- a/configdialog/main.cpp +++ b/configdialog/main.cpp @@ -58,11 +58,11 @@ class KbfxConfigApplication : public KUniqueApplication /* prepare kbfx theme cmdline option given */ if ( KbfxArgs->isSet ( "prepare" ) ) { - QString m_KbfxThemeFolderUrl = KbfxArgs->getOption ( "prepare" ); + TQString m_KbfxThemeFolderUrl = KbfxArgs->getOption ( "prepare" ); if ( m_KbfxThemeFolderUrl.endsWith ( "/" ) ) m_KbfxThemeFolderUrl.truncate ( m_KbfxThemeFolderUrl.length()-1 ); - QString theme_name = m_KbfxThemeFolderUrl.section ( '/', -1 ); - QString archive_dir = m_KbfxThemeFolderUrl.section ( '/', 0, -2 ); - QString archive_name = archive_dir+"/"+ theme_name+".kbfxtheme"; + TQString theme_name = m_KbfxThemeFolderUrl.section ( '/', -1 ); + TQString archive_dir = m_KbfxThemeFolderUrl.section ( '/', 0, -2 ); + TQString archive_name = archive_dir+"/"+ theme_name+".kbfxtheme"; kdDebug() << "Prepare option arguments: " << theme_name << endl @@ -95,14 +95,14 @@ class KbfxConfigApplication : public KUniqueApplication } kdDebug() << "KBFX theme prepared. Quitting..." << endl; - QTimer::singleShot ( 100, mainWin, SLOT ( deleteLater() ) ); + TQTimer::singleShot ( 100, mainWin, TQT_SLOT ( deleteLater() ) ); } else { /* install kbfx theme cmdline option given */ if ( KbfxArgs->isSet ( "install" ) ) { - QString m_KbfxThemeUrl = KbfxArgs->getOption ( "install" ); + TQString m_KbfxThemeUrl = KbfxArgs->getOption ( "install" ); kdDebug() << "Install option argument: " << m_KbfxThemeUrl << endl; 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 -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include #include @@ -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 #include #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include -class QLabel; -class QPushButton; -class QFont; +class TQLabel; +class TQPushButton; +class TQFont; /** @author Petri Damsten */ -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 */ -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 +#include #include -#include -#include +#include +#include -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 -#include -#include -#include -#include +#include +#include +#include +#include +#include #include @@ -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 -#include +#include #include #include -#include -#include -#include +#include +#include +#include #include "kbfxconfig.h" -typedef QMap ThemesMap; +typedef TQMap ThemesMap; /** * @author PhobosK @@ -43,7 +43,7 @@ class KbfxThemesData KbfxThemesData(); ~KbfxThemesData(); - ThemesMap setThemeList ( QString path ); + ThemesMap setThemeList ( TQString path ); private: ThemesMap m_themesMap; diff --git a/kbfxlib/data/kbfxdatagroup.cpp b/kbfxlib/data/kbfxdatagroup.cpp index 5c097a6..1866387 100644 --- a/kbfxlib/data/kbfxdatagroup.cpp +++ b/kbfxlib/data/kbfxdatagroup.cpp @@ -40,7 +40,7 @@ KbfxDataGroup::~KbfxDataGroup() } KbfxDataSource::DataSourceList -KbfxDataGroup::lookup ( QString str ) +KbfxDataGroup::lookup ( TQString str ) { //static KbfxDataGroup * _matching = new KbfxDataGroup(); KbfxDataSource::DataSourceList _matching; @@ -79,7 +79,7 @@ KbfxDataGroup::itemAt(int index) KbfxDataSource * -KbfxDataGroup::getItem ( QString name ) +KbfxDataGroup::getItem ( TQString name ) { return m_data[name]; } diff --git a/kbfxlib/data/kbfxdatagroup.h b/kbfxlib/data/kbfxdatagroup.h index 7587502..1e3eeef 100644 --- a/kbfxlib/data/kbfxdatagroup.h +++ b/kbfxlib/data/kbfxdatagroup.h @@ -22,16 +22,16 @@ #ifndef KBFX_DATA_GROUP_H #define KBFX_DATA_GROUP_H -#include -#include +#include +#include #include "kbfxdatasource.h" class KbfxDataGroup { public: - typedef QMap Data; - typedef QMap Index; + typedef TQMap Data; + typedef TQMap Index; /** * Construts a new data group and initialzes the group @@ -55,16 +55,16 @@ class KbfxDataGroup * "Unknown Group" . it is recomended that a name is always set * @param name The name that should be give to the group */ - void setName ( QString name ) {m_name = name;} + void setName ( TQString name ) {m_name = name;} /** * To access a datasource give the name of the datasource * @param The name othe datasource * @return pointer to a valid datasource */ - KbfxDataSource * getItem ( QString ); + KbfxDataSource * getItem ( TQString ); /** * use this to get all the items inside the datagroup - * @return a copy of the data Map (QMap) + * @return a copy of the data Map (TQMap) */ Data getData(); /** @@ -72,12 +72,12 @@ class KbfxDataGroup * @param keyword to search for * @return list of matching datasources */ - KbfxDataSource::DataSourceList lookup ( QString ); + KbfxDataSource::DataSourceList lookup ( TQString ); /** * The name of the group * @return Name of the group */ - QString name() {return m_name;} + TQString name() {return m_name;} /** * The number of datasources inside the datagroup * @return number of datasources @@ -92,7 +92,7 @@ class KbfxDataGroup private: Data m_data; - QString m_name; + TQString m_name; int m_count; Index m_index; }; diff --git a/kbfxlib/data/kbfxdatagrouplist.h b/kbfxlib/data/kbfxdatagrouplist.h index 711b7af..c21b011 100644 --- a/kbfxlib/data/kbfxdatagrouplist.h +++ b/kbfxlib/data/kbfxdatagrouplist.h @@ -22,29 +22,29 @@ #ifndef KBFX_DATA_GROUP_LIST_H #define KBFX_DATA_GROUP_LIST_H -#include +#include #include "kbfxdatagroup.h" class KbfxDataGroupList { public: - typedef QPtrList GroupList; + typedef TQPtrList GroupList; KbfxDataGroupList(); ~KbfxDataGroupList(); //in void addGroup ( KbfxDataGroup * group ); - void setName ( QString name ) { m_name = name;} - void setIcon ( QString path ) { m_iconPath = path;} + void setName ( TQString name ) { m_name = name;} + void setIcon ( TQString path ) { m_iconPath = path;} //out - QString name() {return m_name;} + TQString name() {return m_name;} GroupList getGroup() { return m_groupList;} - QString iconPath() { return m_iconPath;} + TQString iconPath() { return m_iconPath;} int count() {return m_count;} private: - QString m_name; - QString m_iconPath; + TQString m_name; + TQString m_iconPath; GroupList m_groupList; int m_count; }; diff --git a/kbfxlib/data/kbfxdatasource.cpp b/kbfxlib/data/kbfxdatasource.cpp index 8a44478..91d13c2 100644 --- a/kbfxlib/data/kbfxdatasource.cpp +++ b/kbfxlib/data/kbfxdatasource.cpp @@ -38,15 +38,15 @@ KbfxDataSource::~KbfxDataSource() } bool -KbfxDataSource::lookup ( QString str ) +KbfxDataSource::lookup ( TQString str ) { if ( str.isNull() ) return false; - QString _searchStr = m_text+m_comment+m_description+m_keyWords; + TQString _searchStr = m_text+m_comment+m_description+m_keyWords; - if ( _searchStr.contains ( str,false ) > 0 ) + if ( _searchStr.tqcontains ( str,false ) > 0 ) return true; return false; @@ -74,11 +74,11 @@ KbfxDataSource::exec() if ( type() == KbfxDataSource::DESKTOP ) { - QCString dcop; + TQCString dcop; int pid; - QString m_error; + TQString m_error; KApplication::startServiceByDesktopPath ( desktopFile(), - QString::null, &m_error,&dcop,&pid,"",true ); + TQString(), &m_error,&dcop,&pid,"",true ); } else diff --git a/kbfxlib/data/kbfxdatasource.h b/kbfxlib/data/kbfxdatasource.h index aba89ad..ea121a4 100644 --- a/kbfxlib/data/kbfxdatasource.h +++ b/kbfxlib/data/kbfxdatasource.h @@ -22,8 +22,8 @@ #ifndef KBFX_DATA_SOURCE_H #define KBFX_DATA_SOURCE_H -#include -#include +#include +#include class KbfxDataSource { @@ -32,7 +32,7 @@ class KbfxDataSource public: typedef enum { DESKTOP = 0, NONDESKTOP } Type; - typedef QValueList < KbfxDataSource > DataSourceList; + typedef TQValueList < KbfxDataSource > DataSourceList; /** * Constructs a new DataSource. Data source is a simple class that holds * a .desktop file and also you can include a custom commmand that can be @@ -47,7 +47,7 @@ class KbfxDataSource * a desktop file use KbfxDataSource::setDesktopPath() functions instead * @param name should be the name of the data source */ - void setName ( QString name ) + void setName ( TQString name ) { m_text = name; } @@ -57,24 +57,24 @@ class KbfxDataSource * abstracts such functions. * @param path should be the absolute path of a valid desktop file */ - void setDesktopPath ( QString path ) + void setDesktopPath ( TQString path ) { m_desktopPath = path; m_type = DESKTOP; loadDesktopFile (); } - virtual void setCommand ( QString cmd ) + virtual void setCommand ( TQString cmd ) { m_command = cmd; } - void setContentPath ( QString path ) + void setContentPath ( TQString path ) { m_contentPath = path; } - QString contentPath () + TQString contentPath () { return m_contentPath; } @@ -86,35 +86,35 @@ class KbfxDataSource virtual void exec (); - void setComment ( QString comment ) + void setComment ( TQString comment ) { m_comment = comment; }; - void setDescription ( QString desc ) + void setDescription ( TQString desc ) { m_description = desc; } - void setIconPath ( QString path ) + void setIconPath ( TQString path ) { m_iconPath = path; } - QString desktopFile () + TQString desktopFile () { return m_desktopPath; } //out - QString name () + TQString name () { return m_text; } - QString icon () + TQString icon () { return m_iconPath; }; - QString command () + TQString command () { return m_command; } @@ -127,24 +127,24 @@ class KbfxDataSource * functio will NOT return NULL so no checking needed * @return the comment of the data source or empty string */ - QString comment () + TQString comment () { return m_comment; } - bool lookup ( QString str ); + bool lookup ( TQString str ); private: //TODO //MOve to private D void loadDesktopFile (); - QString m_text; - QString m_desktopPath; - QString m_command; - QString m_iconPath; - QString m_comment; - QString m_description; - QString m_keyWords; + TQString m_text; + TQString m_desktopPath; + TQString m_command; + TQString m_iconPath; + TQString m_comment; + TQString m_description; + TQString m_keyWords; Type m_type; - QString m_contentPath; + TQString m_contentPath; }; diff --git a/kbfxlib/data/kbfxdatastack.cpp b/kbfxlib/data/kbfxdatastack.cpp index 2d84e02..2b28ba0 100644 --- a/kbfxlib/data/kbfxdatastack.cpp +++ b/kbfxlib/data/kbfxdatastack.cpp @@ -48,18 +48,18 @@ KbfxDataStack::addGroupList ( KbfxDataGroupList * list ) m_count++; } -QStringList +TQStringList KbfxDataStack::getStackIndex() { return m_nameList; } KbfxDataGroupList * -KbfxDataStack::getStack ( QString name ) +KbfxDataStack::getStack ( TQString name ) { - if ( m_nameList.contains ( name ) >0 ) + if ( m_nameList.tqcontains ( name ) >0 ) return m_stack[name]; else { @@ -68,7 +68,7 @@ KbfxDataStack::getStack ( QString name ) } -QString +TQString KbfxDataStack::getSubGroupName ( uint id ) { @@ -79,6 +79,6 @@ KbfxDataStack::getSubGroupName ( uint id ) return it.key(); } - return QString ( "Empty" ); + return TQString ( "Empty" ); } diff --git a/kbfxlib/data/kbfxdatastack.h b/kbfxlib/data/kbfxdatastack.h index 6d65810..c91f524 100644 --- a/kbfxlib/data/kbfxdatastack.h +++ b/kbfxlib/data/kbfxdatastack.h @@ -22,9 +22,9 @@ #ifndef KBFX_DATA_STACK_H #define KBFX_DATA_STACK_H -#include -#include -#include +#include +#include +#include #include "kbfxdatagrouplist.h" #include "kbfxplasmacanvasstackdata.h" //TODO:change the name here @@ -32,29 +32,29 @@ class KbfxDataStack { public: - typedef QMap StackMap; - typedef QMap Dict; - typedef QMap DataDict; + typedef TQMap StackMap; + typedef TQMap Dict; + typedef TQMap DataDict; KbfxDataStack(); ~KbfxDataStack(); - void setName ( QString name ) { m_name=name;} + void setName ( TQString name ) { m_name=name;} void addGroupList ( KbfxDataGroupList * list ); //out - KbfxDataGroupList * getGroupList ( QString name ); - QStringList getStackIndex(); - KbfxDataGroupList * getStack ( QString name ); + KbfxDataGroupList * getGroupList ( TQString name ); + TQStringList getStackIndex(); + KbfxDataGroupList * getStack ( TQString name ); Dict getDict() {return m_dict;} DataDict getDataDict() { return m_dataDict;} - QString name() {return m_name;} - uint getIndex ( QString name ) { return m_dict[name];} - QString getSubGroupName ( uint id ); + TQString name() {return m_name;} + uint getIndex ( TQString name ) { return m_dict[name];} + TQString getSubGroupName ( uint id ); int count() {return m_count;} private: StackMap m_stack; - QStringList m_nameList; - QString m_name; + TQStringList m_nameList; + TQString m_name; Dict m_dict; DataDict m_dataDict; uint m_count; diff --git a/kbfxlib/data/kbfxplasmapluginloader.cpp b/kbfxlib/data/kbfxplasmapluginloader.cpp index ebc992a..ed2c458 100644 --- a/kbfxlib/data/kbfxplasmapluginloader.cpp +++ b/kbfxlib/data/kbfxplasmapluginloader.cpp @@ -22,8 +22,8 @@ #include #include "kbfxplasmapluginloader.h" -#include -#include +#include +#include #include #include @@ -39,31 +39,31 @@ void KbfxPlasmaPluginLoader::init() { - QString libprefix = locate ( "lib","libkbfxdata.so" ); + TQString libprefix = locate ( "lib","libkbfxdata.so" ); libprefix.remove ( "libkbfxdata.so" ); -// QString libprefix = KBFX_LIB_INSTALL_DIR ; +// TQString libprefix = KBFX_LIB_INSTALL_DIR ; kdDebug() << "KBFX plugins lib is: " << libprefix << endl; - QDir * _dir = new QDir ( libprefix+"/kbfx/plugins/" ); - QStringList plugins; - _dir->setFilter ( QDir::Files ); + TQDir * _dir = new TQDir ( libprefix+"/kbfx/plugins/" ); + TQStringList plugins; + _dir->setFilter ( TQDir::Files ); _dir->setNameFilter ( "*.so" ); if ( !_dir->exists() ) { kdDebug() << "Invalid Plugin Prefix: " << libprefix << "/kbfx/plugins/" << endl; delete _dir; - return ;//QStringList("No Plugins found: Error in default Paths.Contact Package Manager"); + return ;//TQStringList("No Plugins found: Error in default Paths.Contact Package Manager"); } - const QFileInfoList *list = _dir->entryInfoList(); - QFileInfoListIterator it ( *list ); - QFileInfo *fi=0; + const TQFileInfoList *list = _dir->entryInfoList(); + TQFileInfoListIterator it ( *list ); + TQFileInfo *fi=0; int _index =0; while ( ( fi = it.current() ) != 0 ) { - QString * path = new QString ( libprefix+"/kbfx/plugins/"+fi->fileName() ); - QLibrary * _l = new QLibrary ( *path ); + TQString * path = new TQString ( libprefix+"/kbfx/plugins/"+fi->fileName() ); + TQLibrary * _l = new TQLibrary ( *path ); - typedef QString ( *getName ) (); + typedef TQString ( *getName ) (); getName nameFunc; nameFunc = ( getName ) _l->resolve ( "name" ); if ( nameFunc ) @@ -95,7 +95,7 @@ KbfxPlasmaPluginLoader::~KbfxPlasmaPluginLoader() } KbfxDataStack * -KbfxPlasmaPluginLoader::getView ( QString name ) +KbfxPlasmaPluginLoader::getView ( TQString name ) { PluginMap::Iterator it; for ( it = pluginMap().begin(); it != pluginMap().end(); ++it ) @@ -113,7 +113,7 @@ KbfxPlasmaPluginLoader::getView ( QString name ) } KbfxDataGroup * -KbfxPlasmaPluginLoader::search ( QString pname,QString keyword ) +KbfxPlasmaPluginLoader::search ( TQString pname,TQString keyword ) { if ( pname == NULL ) return NULL; @@ -142,12 +142,12 @@ KbfxPlasmaPluginLoader::pluginMap() -QStringList +TQStringList KbfxPlasmaPluginLoader::scanPlugins() { init(); - QStringList plugins; + TQStringList plugins; PluginMap::Iterator it; for ( it = pluginMap().begin(); it != pluginMap().end();++it ) diff --git a/kbfxlib/data/kbfxplasmapluginloader.h b/kbfxlib/data/kbfxplasmapluginloader.h index 2ae2f54..346be7f 100644 --- a/kbfxlib/data/kbfxplasmapluginloader.h +++ b/kbfxlib/data/kbfxplasmapluginloader.h @@ -22,18 +22,19 @@ #ifndef KBFX_PLASMA_PLUGIN_LOADER_H #define KBFX_PLASMA_PLUGIN_LOADER_H -#include +#include #include "kbfxplasmacanvasstack.h" #include "kbfxdatastack.h" #include "kbfxplugin.h" -#include +#include -class KbfxPlasmaPluginLoader:public QObject +class KbfxPlasmaPluginLoader:public TQObject { Q_OBJECT + TQ_OBJECT public: - typedef QMap PluginMap; + typedef TQMap PluginMap; /** * @@ -50,11 +51,11 @@ class KbfxPlasmaPluginLoader:public QObject * @param name * @return */ - KbfxDataStack * getView ( QString name ); + KbfxDataStack * getView ( TQString name ); /* look for all installed Plugins. returns a list of installed plugins */ - static QStringList scanPlugins(); + static TQStringList scanPlugins(); /** * Calls the search function of a given plugin and returns the result @@ -62,16 +63,16 @@ class KbfxPlasmaPluginLoader:public QObject * @param keyword the keyword to pass to the plugin * @return a valid KbfxDataGroup or -1 */ - static KbfxDataGroup * search ( QString pluginName,QString keyword ); + static KbfxDataGroup * search ( TQString pluginName,TQString keyword ); protected: static void init(); private: - QLibrary * m_plugin; + TQLibrary * m_plugin; static PluginMap& pluginMap(); - QString m_prefix; + TQString m_prefix; }; diff --git a/kbfxlib/data/kbfxplugin.cpp b/kbfxlib/data/kbfxplugin.cpp index ae53d67..198bde4 100644 --- a/kbfxlib/data/kbfxplugin.cpp +++ b/kbfxlib/data/kbfxplugin.cpp @@ -21,7 +21,7 @@ #include "kbfxplugin.h" -KbfxPlugin::KbfxPlugin ( QString name,QString lib,uint id ) +KbfxPlugin::KbfxPlugin ( TQString name,TQString lib,uint id ) { m_name = name; m_libName = lib; @@ -39,13 +39,13 @@ KbfxPlugin::~KbfxPlugin() // delete [] m_libName; } -QString +TQString KbfxPlugin::name() { return m_name; } -QString +TQString KbfxPlugin::libName() { return m_libName; @@ -69,7 +69,7 @@ KbfxPlugin::data() typedef KbfxDataStack * ( *KbfxPluginView ) (); KbfxDataStack * m_stack =0; KbfxPluginView m_hook; - QLibrary * m_plugin = new QLibrary ( m_libName ); + TQLibrary * m_plugin = new TQLibrary ( m_libName ); if ( m_plugin == NULL ) return new KbfxDataStack(); @@ -86,7 +86,7 @@ KbfxPlugin::data() } KbfxDataGroup * -KbfxPlugin::search ( QString keyword ) +KbfxPlugin::search ( TQString keyword ) { if ( keyword == 0 ) return NULL;//new KbfxDataGroup(); @@ -95,10 +95,10 @@ KbfxPlugin::search ( QString keyword ) return NULL;//KbfxDataGroup(); - typedef KbfxDataGroup * ( *KbfxPluginSearch ) ( QString key ); + typedef KbfxDataGroup * ( *KbfxPluginSearch ) ( TQString key ); KbfxDataGroup * m_group =0; KbfxPluginSearch m_hook; - QLibrary * m_plugin = new QLibrary ( m_libName ); + TQLibrary * m_plugin = new TQLibrary ( m_libName ); m_hook = ( KbfxPluginSearch ) m_plugin->resolve ( "search" ); m_group = m_hook ( keyword ); m_plugin->unload(); diff --git a/kbfxlib/data/kbfxplugin.h b/kbfxlib/data/kbfxplugin.h index 5868d14..f657d8a 100644 --- a/kbfxlib/data/kbfxplugin.h +++ b/kbfxlib/data/kbfxplugin.h @@ -23,9 +23,9 @@ #define KBFX_PLUGIN_H //#include "kbfxplasmacanvasstack.h" #include "kbfxdatastack.h" -#include -#include -#include +#include +#include +#include /** This class reprecentes a plugin written for kbfx menu this @@ -34,25 +34,26 @@ of the menu **/ -class KbfxPlugin:public QObject +class KbfxPlugin:public TQObject { Q_OBJECT + TQ_OBJECT public: KbfxPlugin(); - KbfxPlugin ( QString Name,QString lib,uint id ); + KbfxPlugin ( TQString Name,TQString lib,uint id ); ~KbfxPlugin(); - void setStatus ( bool ); + void settqStatus ( bool ); - QString name(); - QString libName(); + TQString name(); + TQString libName(); uint id(); bool status(); // KbfxPlasmaCanvasStack * data(); KbfxDataStack * data(); - KbfxDataGroup * search ( QString keyword ); + KbfxDataGroup * search ( TQString keyword ); // KbfxDataStack * data(); @@ -62,12 +63,12 @@ class KbfxPlugin:public QObject void loadComplete(); private: - QString m_name; - QString m_libName; + TQString m_name; + TQString m_libName; uint m_id; // KbfxPlasmaCanvasStack * m_data; KbfxDataStack m_data_R; -// QCanvas * m_canvas; +// TQCanvas * m_canvas; bool m_loaded; }; diff --git a/plugins/applications/kbfxplasmadataplugin.cpp b/plugins/applications/kbfxplasmadataplugin.cpp index cffb72f..070bda2 100644 --- a/plugins/applications/kbfxplasmadataplugin.cpp +++ b/plugins/applications/kbfxplasmadataplugin.cpp @@ -158,16 +158,16 @@ view () } -QString +TQString name () { - return QString ( "Applications" ); + return TQString ( "Applications" ); } -QString +TQString type () { - return QString ( "Stub Type" ); + return TQString ( "Stub Type" ); } @@ -180,7 +180,7 @@ id () #include KbfxDataGroup * -search ( QString _keyword ) +search ( TQString _keyword ) { @@ -192,7 +192,7 @@ search ( QString _keyword ) int *count = new int; *count = 0; - QValueListIterator < KService::Ptr > s = offers.begin (); + TQValueListIterator < KService::Ptr > s = offers.begin (); for ( ; s != offers.end (); ++s ) { @@ -201,10 +201,10 @@ search ( QString _keyword ) if ( (*s)->noDisplay () == true ) continue; - QString *sPtr = new QString (); + TQString *sPtr = new TQString (); ( *sPtr ) = ( *s )->name () + ( *s )->genericName () + ( *s )->comment (); - if ( ( !sPtr->isNull () ) && sPtr->contains ( _keyword, false ) > 0 ) + if ( ( !sPtr->isNull () ) && sPtr->tqcontains ( _keyword, false ) > 0 ) { KbfxDataSource *data = new KbfxDataSource (); data->setName ( ( *s )->name () ); diff --git a/plugins/common/kbfxplasmadataplugin-common.h b/plugins/common/kbfxplasmadataplugin-common.h index d446ef8..8777216 100644 --- a/plugins/common/kbfxplasmadataplugin-common.h +++ b/plugins/common/kbfxplasmadataplugin-common.h @@ -26,12 +26,12 @@ extern "C" { -// static QString check = "Static Check for Plugin"; +// static TQString check = "Static Check for Plugin"; KbfxDataStack * view(); - QString name(); //Name of the Plugin My Music .if TOM Create..Configure .. - QString type(); //Type of the plugin ex: Application : Amork : kio ..etc + TQString name(); //Name of the Plugin My Music .if TOM Create..Configure .. + TQString type(); //Type of the plugin ex: Application : Amork : kio ..etc uint id(); //A id for menus - KbfxDataGroup * search ( QString str ); + KbfxDataGroup * search ( TQString str ); } #endif diff --git a/plugins/plasmoids/kbfxplasmadatapluginplosmoid.cpp b/plugins/plasmoids/kbfxplasmadatapluginplosmoid.cpp index 998fafb..36d22e8 100644 --- a/plugins/plasmoids/kbfxplasmadatapluginplosmoid.cpp +++ b/plugins/plasmoids/kbfxplasmadatapluginplosmoid.cpp @@ -24,8 +24,8 @@ #include #include #include -#include -#include +#include +#include #include @@ -47,19 +47,19 @@ view () glist->setIcon ( "plasmagik" ); appGroup->setName ( "Plasmoids" ); - QString path = locate ( "data", "kicker/applets/lockout.desktop" ); + TQString path = locate ( "data", "kicker/applets/lockout.desktop" ); path.remove ( "lockout.desktop" ); - QDir d ( path ); - d.setFilter ( QDir::Files | QDir::Hidden | QDir::NoSymLinks ); - d.setSorting ( QDir::Size | QDir::Reversed ); + TQDir d ( path ); + d.setFilter ( TQDir::Files | TQDir::Hidden | TQDir::NoSymLinks ); + d.setSorting ( TQDir::Size | TQDir::Reversed ); d.setNameFilter ( "*.desktop" ); - const QFileInfoList *list = d.entryInfoList (); - QFileInfoListIterator it ( *list ); - QFileInfo *fi; + const TQFileInfoList *list = d.entryInfoList (); + TQFileInfoListIterator it ( *list ); + TQFileInfo *fi; while ( ( fi = it.current () ) != 0 ) { @@ -87,16 +87,16 @@ view () } -QString +TQString name () { - return QString ( "Plasmoids" ); + return TQString ( "Plasmoids" ); } -QString +TQString type () { - return QString ( "Stub Type" ); + return TQString ( "Stub Type" ); } @@ -110,28 +110,28 @@ id () #include KbfxDataGroup * -search ( QString _keyword ) +search ( TQString _keyword ) { KbfxDataGroup *appGroup = new KbfxDataGroup (); - QString path = locate ( "data", "kicker/applets/lockout.desktop" ); + TQString path = locate ( "data", "kicker/applets/lockout.desktop" ); path.remove ( "lockout.desktop" ); - QDir d ( path ); - d.setFilter ( QDir::Files | QDir::Hidden | QDir::NoSymLinks ); - d.setSorting ( QDir::Size | QDir::Reversed ); + TQDir d ( path ); + d.setFilter ( TQDir::Files | TQDir::Hidden | TQDir::NoSymLinks ); + d.setSorting ( TQDir::Size | TQDir::Reversed ); d.setNameFilter ( "*.desktop" ); - const QFileInfoList *list = d.entryInfoList (); - QFileInfoListIterator it ( *list ); - QFileInfo *fi; + const TQFileInfoList *list = d.entryInfoList (); + TQFileInfoListIterator it ( *list ); + TQFileInfo *fi; while ( ( fi = it.current () ) != 0 ) { - if ( fi->fileName ().contains ( _keyword ) > 0 ) + if ( fi->fileName ().tqcontains ( _keyword ) > 0 ) { KDesktopFile *desktop = new KDesktopFile ( fi->filePath () ); diff --git a/plugins/recentstuff/kbfxplasmarecentstuff.cpp b/plugins/recentstuff/kbfxplasmarecentstuff.cpp index b0c4f8c..0f1c8fb 100644 --- a/plugins/recentstuff/kbfxplasmarecentstuff.cpp +++ b/plugins/recentstuff/kbfxplasmarecentstuff.cpp @@ -24,8 +24,8 @@ #include #include #include -#include -#include +#include +#include #include #include @@ -42,19 +42,19 @@ view () glist->setIcon ( "newstuff" ); appGroup->setName ( "RecentStuff" ); - QString path = + TQString path = KStandardDirs ().localkdedir () + "/share/apps/RecentDocuments/"; - QDir d ( path ); - d.setFilter ( QDir::Files | QDir::Hidden | QDir::NoSymLinks ); - d.setSorting ( QDir::Size | QDir::Reversed ); + TQDir d ( path ); + d.setFilter ( TQDir::Files | TQDir::Hidden | TQDir::NoSymLinks ); + d.setSorting ( TQDir::Size | TQDir::Reversed ); d.setNameFilter ( "*.desktop" ); - const QFileInfoList *list = d.entryInfoList (); - QFileInfoListIterator it ( *list ); - QFileInfo *fi; + const TQFileInfoList *list = d.entryInfoList (); + TQFileInfoListIterator it ( *list ); + TQFileInfo *fi; while ( ( fi = it.current () ) != 0 ) { @@ -84,16 +84,16 @@ view () } -QString +TQString name () { - return QString ( "RecentStuff" ); + return TQString ( "RecentStuff" ); } -QString +TQString type () { - return QString ( "Stub Type" ); + return TQString ( "Stub Type" ); } @@ -107,7 +107,7 @@ id () #include KbfxDataGroup * -search ( QString _keyword ) +search ( TQString _keyword ) { KbfxDataGroup *appGroup = new KbfxDataGroup (); // KbfxDataGroupList *glist = new KbfxDataGroupList (); @@ -115,21 +115,21 @@ search ( QString _keyword ) - QString path = + TQString path = KStandardDirs ().localkdedir () + "/share/apps/RecentDocuments/"; - QDir d ( path ); - d.setFilter ( QDir::Files | QDir::Hidden | QDir::NoSymLinks ); - d.setSorting ( QDir::Size | QDir::Reversed ); + TQDir d ( path ); + d.setFilter ( TQDir::Files | TQDir::Hidden | TQDir::NoSymLinks ); + d.setSorting ( TQDir::Size | TQDir::Reversed ); d.setNameFilter ( "*.desktop" ); - const QFileInfoList *list = d.entryInfoList (); - QFileInfoListIterator it ( *list ); - QFileInfo *fi; + const TQFileInfoList *list = d.entryInfoList (); + TQFileInfoListIterator it ( *list ); + TQFileInfo *fi; while ( ( fi = it.current () ) != 0 ) { - if ( fi->fileName ().contains ( _keyword ) > 0 ) + if ( fi->fileName ().tqcontains ( _keyword ) > 0 ) { KDesktopFile *desktop = new KDesktopFile ( fi->filePath () ); diff --git a/plugins/settings/kbfxplasmadatapluginsettings.cpp b/plugins/settings/kbfxplasmadatapluginsettings.cpp index bc02003..e04df1e 100644 --- a/plugins/settings/kbfxplasmadatapluginsettings.cpp +++ b/plugins/settings/kbfxplasmadatapluginsettings.cpp @@ -159,16 +159,16 @@ view () } -QString +TQString name () { - return QString ( "Settings" ); + return TQString ( "Settings" ); } -QString +TQString type () { - return QString ( "Stub Type" ); + return TQString ( "Stub Type" ); } uint @@ -180,7 +180,7 @@ id () KbfxDataGroup * -search ( QString _keyword ) +search ( TQString _keyword ) { _keyword = _keyword; return new KbfxDataGroup(); diff --git a/plugins/strigi/kbfxstrigiplugin.cpp b/plugins/strigi/kbfxstrigiplugin.cpp index dd9471b..8039fa4 100644 --- a/plugins/strigi/kbfxstrigiplugin.cpp +++ b/plugins/strigi/kbfxstrigiplugin.cpp @@ -23,8 +23,8 @@ #include #include #include -#include -#include +#include +#include #include #include "kbfxstrigiplugin.h" @@ -107,16 +107,16 @@ view () } -QString +TQString name () { - return QString ( "Strigi" ); + return TQString ( "Strigi" ); } -QString +TQString type () { - return QString ( "Stub Type" ); + return TQString ( "Stub Type" ); } @@ -129,13 +129,13 @@ id () KbfxDataGroup * -search ( QString _keyword ) +search ( TQString _keyword ) { KbfxDataGroup *datagroup = new KbfxDataGroup (); datagroup->setName ( "Strigi" ); - QString socketpath = QDir::homeDirPath () + "/.strigi/socket"; + TQString socketpath = TQDir::homeDirPath () + "/.strigi/socket"; startDaemon (); kdDebug() << socketpath << endl; AsyncSocketClient socket; @@ -165,13 +165,13 @@ search ( QString _keyword ) jstreams::IndexedDocument hit = hits.hits[i]; KbfxDataSource *data = new KbfxDataSource (); - QString name; + TQString name; std::map < std::string, std::string >::const_iterator it = - hits.hits[i].properties.find ( "title" ); + hits.hits[i].properties.tqfind ( "title" ); - QString filename ( hits.hits[i].uri.c_str () ); + TQString filename ( hits.hits[i].uri.c_str () ); - if ( filename.contains ( ".tar." ) > 0 ) + if ( filename.tqcontains ( ".tar." ) > 0 ) { filename = "tar:" + filename; kdDebug() << filename << endl; @@ -183,7 +183,7 @@ search ( QString _keyword ) } else { - uint pos = hits.hits[i].uri.rfind ( '/' ); + uint pos = hits.hits[i].uri.rtqfind ( '/' ); if ( pos == std::string::npos ) { name = hits.hits[i].uri; @@ -203,9 +203,9 @@ search ( QString _keyword ) - QString iconname = + TQString iconname = KMimeType::mimeType ( hits.hits[i].mimetype.c_str () )-> - icon ( QString::null, 0 ); + icon ( TQString(), 0 ); data->setIconPath ( iconname ); datagroup->addItem ( data ); diff --git a/plugins/strigi/kbfxstrigiplugin.h b/plugins/strigi/kbfxstrigiplugin.h index a2e3137..5028593 100644 --- a/plugins/strigi/kbfxstrigiplugin.h +++ b/plugins/strigi/kbfxstrigiplugin.h @@ -32,11 +32,11 @@ extern "C" { KbfxDataStack * view(); - QString name(); //Name of the Plugin My Music .if TOM Create..Configure .. - QString type(); //Type of the plugin ex: Application : Amork : kio ..etc + TQString name(); //Name of the Plugin My Music .if TOM Create..Configure .. + TQString type(); //Type of the plugin ex: Application : Amork : kio ..etc uint id(); //A id for menus - KbfxDataGroup * search ( QString str ); -// KbfxPlasmaCanvasGroup * search(QString _keyword,QCanvas * canvas); //search and return a group + KbfxDataGroup * search ( TQString str ); +// KbfxPlasmaCanvasGroup * search(TQString _keyword,TQCanvas * canvas); //search and return a group } #endif diff --git a/src/kbfxbutton.cpp b/src/kbfxbutton.cpp index 5d3f8fd..0fe018c 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 ( QWidget * parent, const char *name) : - QLabel ( parent,name,Qt::WStaticContents | Qt::WNoAutoErase |Qt::WPaintDesktop ) +KbfxButton::KbfxButton ( TQWidget * tqparent, const char *name) : + TQLabel ( tqparent,name,TQt::WStaticContents | TQt::WNoAutoErase |TQt::WPaintDesktop ) { setLineWidth ( 0 ); setScaledContents ( false ); @@ -43,12 +43,12 @@ KbfxButton::KbfxButton ( QWidget * parent, const char *name) : m_kicker_auto_adjust = ConfigInit().m_ToolBarResize; m_toggle = false; - QTimer * timer = new QTimer ( this,"Update Timer" ); - connect ( timer,SIGNAL ( timeout() ),this,SLOT ( update() ) ); + TQTimer * timer = new TQTimer ( this,"Update Timer" ); + connect ( timer,TQT_SIGNAL ( timeout() ),this,TQT_SLOT ( update() ) ); timer->start ( 25,false ); - fade_timer = new QTimer ( this,"Fade Timer" ); - connect ( fade_timer,SIGNAL ( timeout() ),this,SLOT ( fade() ) ); + fade_timer = new TQTimer ( this,"Fade Timer" ); + connect ( fade_timer,TQT_SIGNAL ( timeout() ),this,TQT_SLOT ( fade() ) ); } KbfxButton::~KbfxButton() @@ -57,64 +57,64 @@ KbfxButton::~KbfxButton() void KbfxButton::loadSkins() { - QImage _tmpHover, _tmpPressed, _tmpNormal; + TQImage _tmpHover, _tmpPressed, _tmpNormal; _tmpHover = ( KbfxPlasmaPixmapProvider::PixmapPathCheck ( ConfigInit ().m_KbfxHoverButtonPath ) ) ? - QImage ( ConfigInit ().m_KbfxHoverButtonPath ) - : QImage ( ConfigInit ().m_KbfxHoverButtonPathDefault ); + TQImage ( ConfigInit ().m_KbfxHoverButtonPath ) + : TQImage ( ConfigInit ().m_KbfxHoverButtonPathDefault ); _tmpPressed = ( KbfxPlasmaPixmapProvider::PixmapPathCheck ( ConfigInit ().m_KbfxPressedButtonPath ) ) ? - QImage ( ConfigInit ().m_KbfxPressedButtonPath ) - : QImage ( ConfigInit ().m_KbfxPressedButtonPathDefault ); + TQImage ( ConfigInit ().m_KbfxPressedButtonPath ) + : TQImage ( ConfigInit ().m_KbfxPressedButtonPathDefault ); _tmpNormal = ( KbfxPlasmaPixmapProvider::PixmapPathCheck ( ConfigInit ().m_KbfxNormalButtonPath ) ) ? - QImage ( ConfigInit ().m_KbfxNormalButtonPath ) - : QImage ( ConfigInit ().m_KbfxNormalButtonPathDefault ); + TQImage ( ConfigInit ().m_KbfxNormalButtonPath ) + : TQImage ( ConfigInit ().m_KbfxNormalButtonPathDefault ); - QSize _sizeNormal = _tmpNormal.size(); - _tmpHover = _tmpHover.smoothScale ( _sizeNormal, QImage::ScaleFree ); - _tmpPressed = _tmpPressed.smoothScale ( _sizeNormal, QImage::ScaleFree ); + TQSize _sizeNormal = _tmpNormal.size(); + _tmpHover = _tmpHover.smoothScale ( _sizeNormal, TQ_ScaleFree ); + _tmpPressed = _tmpPressed.smoothScale ( _sizeNormal, TQ_ScaleFree ); if ( !m_kicker_auto_adjust ) { if ( m_sizeHeight ) { - _tmpHover = _tmpHover.smoothScale ( _tmpHover.width(), m_size, QImage::ScaleMin ); - _tmpPressed = _tmpPressed.smoothScale ( _tmpPressed.width(), m_size, QImage::ScaleMin ); - _tmpNormal = _tmpNormal.smoothScale ( _tmpNormal.width(), m_size, QImage::ScaleMin ); + _tmpHover = _tmpHover.smoothScale ( _tmpHover.width(), m_size, TQ_ScaleMin ); + _tmpPressed = _tmpPressed.smoothScale ( _tmpPressed.width(), m_size, TQ_ScaleMin ); + _tmpNormal = _tmpNormal.smoothScale ( _tmpNormal.width(), m_size, TQ_ScaleMin ); } else { - _tmpHover = _tmpHover.smoothScale ( m_size, _tmpHover.height(), QImage::ScaleMin ); - _tmpPressed = _tmpPressed.smoothScale ( m_size, _tmpPressed.height(), QImage::ScaleMin ); - _tmpNormal = _tmpNormal.smoothScale ( m_size, _tmpNormal.height(), QImage::ScaleMin ); + _tmpHover = _tmpHover.smoothScale ( m_size, _tmpHover.height(), TQ_ScaleMin ); + _tmpPressed = _tmpPressed.smoothScale ( m_size, _tmpPressed.height(), TQ_ScaleMin ); + _tmpNormal = _tmpNormal.smoothScale ( m_size, _tmpNormal.height(), TQ_ScaleMin ); } } - m_over_skin = QPixmap ( _tmpHover ); - m_normal_skin = QPixmap ( _tmpNormal ); - m_pressed_skin = QPixmap ( _tmpPressed ); + m_over_skin = TQPixmap ( _tmpHover ); + m_normal_skin = TQPixmap ( _tmpNormal ); + m_pressed_skin = TQPixmap ( _tmpPressed ); m_current_skin = m_normal_skin; this->resize ( m_current_skin.width(),m_current_skin.height() ); - this->repaint(); + this->tqrepaint(); } -QCString KbfxButton::findPanel() +TQCString KbfxButton::findPanel() { - QCString m_AppletPanel = QCString ("kicker"); + TQCString m_AppletPanel = TQCString ("kicker"); QCStringList objects=m_dcopClient->remoteObjects("kicker"); for( QCStringList::ConstIterator it = objects.begin(); it != objects.end(); ++it) { - if ( (*it).contains ( "Panel" ) > 0 ) + if ( (*it).tqcontains ( "Panel" ) > 0 ) { DCOPRef _dcop_obj ( "kicker", (*it) ); - QStringList _dcop_obj_applets =_dcop_obj.call ( "listApplets()" ); + TQStringList _dcop_obj_applets =_dcop_obj.call ( "listApplets()" ); - for ( QStringList::Iterator _it = _dcop_obj_applets.begin(); + for ( TQStringList::Iterator _it = _dcop_obj_applets.begin(); _it != _dcop_obj_applets.end(); _it++ ) { - if ( ( *_it ).contains ( "kbfx" ) ) + if ( ( *_it ).tqcontains ( "kbfx" ) ) { m_AppletPanel = (*it); break; @@ -129,7 +129,7 @@ QCString KbfxButton::findPanel() void KbfxButton::readjust( bool _how ) { /* _how = TRUE is for height, _how = FALSE is for width readjust */ - QCString _panel = findPanel(); + TQCString _panel = findPanel(); int _tmp_size; if ( _how ) { @@ -141,8 +141,8 @@ void KbfxButton::readjust( bool _how ) _tmp_size = this->width (); kdDebug () << "Readjusting " << _panel << " to width: " << _tmp_size << endl; } - QByteArray data; - QDataStream arg ( data, IO_WriteOnly ); + TQByteArray data; + TQDataStream arg ( data, IO_WriteOnly ); arg << _tmp_size ; if ( !m_dcopClient->send ( "kicker", _panel, "setPanelSize(int)", data ) ) kdWarning () @@ -151,7 +151,7 @@ void KbfxButton::readjust( bool _how ) << endl; } -void KbfxButton::enterEvent ( QEvent * e ) +void KbfxButton::enterEvent ( TQEvent * e ) { e = e; if ( m_toggle == true ) @@ -177,8 +177,8 @@ void KbfxButton::fade ( ) } else { - QImage _final = m_fadePix.convertToImage (); - QImage _current = m_current_skin.convertToImage (); + TQImage _final = m_fadePix.convertToImage (); + TQImage _current = m_current_skin.convertToImage (); if ( !fade_timer->isActive ()) { @@ -190,13 +190,13 @@ void KbfxButton::fade ( ) m_opacity += 0.1; KImageEffect::blend ( _final, _current, m_opacity); - m_current_skin = QPixmap ( _current ); + m_current_skin = TQPixmap ( _current ); } this->resize ( m_current_skin.size() ); this->update(); } -void KbfxButton::leaveEvent ( QEvent * e ) +void KbfxButton::leaveEvent ( TQEvent * e ) { e = e; @@ -234,10 +234,10 @@ void KbfxButton::toggleKMenu() m_toggle = false; } -void KbfxButton::mousePressEvent ( QMouseEvent * e ) +void KbfxButton::mousePressEvent ( TQMouseEvent * e ) { e->accept(); - if ( e->button() == QMouseEvent::LeftButton ) + if ( e->button() == Qt::LeftButton ) { if ( m_toggle == false ) { @@ -264,23 +264,23 @@ void KbfxButton::mousePressEvent ( QMouseEvent * e ) emit clicked (); } - if ( e->button() == QMouseEvent::RightButton ) + if ( e->button() == Qt::RightButton ) { m_fadePix = m_normal_skin; fade(); m_toggle = false; - QPopupMenu *popup = new QPopupMenu(); + TQPopupMenu *popup = new TQPopupMenu(); popup->insertItem ( SmallIcon ( "remove" ), i18n ( "Remove KBFX from Pannel" ), - this, SLOT ( selfDeleter() ) ); + this, TQT_SLOT ( selfDeleter() ) ); popup->insertItem ( SmallIcon ( "reload" ),i18n ( "Reload KBFX" ), - this, SLOT ( reloadConfig() ) ); + this, TQT_SLOT ( reloadConfig() ) ); popup->insertSeparator(); popup->insertItem ( SmallIcon ( "kbfxconfigapp" ), i18n ( "Configure KBFX" ), - this, SLOT ( openConfigDialog() ) ); + this, TQT_SLOT ( openConfigDialog() ) ); popup->insertItem ( SmallIcon ( "kmenuedit" ),i18n ( "Edit Applications Menu" ), - this, SLOT ( openKmenuEdit() ) ); + this, TQT_SLOT ( openKmenuEdit() ) ); popup->exec ( e->globalPos() ); delete popup; } @@ -301,14 +301,14 @@ void KbfxButton::reloadConfig() void KbfxButton::selfDeleter() { DCOPRef m_kickerPanel ( "kicker", findPanel() ); - QStringList returnQStringList =m_kickerPanel.call ( "listApplets()" ); + TQStringList returnTQStringList =m_kickerPanel.call ( "listApplets()" ); int _myIndex = 0; - QStringList::Iterator it; + TQStringList::Iterator it; - for ( it = returnQStringList.begin();it != returnQStringList.end();it++ ) + for ( it = returnTQStringList.begin();it != returnTQStringList.end();it++ ) { - if ( ( *it ).contains ( "kbfx" ) ) + if ( ( *it ).tqcontains ( "kbfx" ) ) { break; } @@ -333,18 +333,18 @@ void KbfxButton::openConfigDialog() KRun::runCommand ( "kbfxconfigapp" ); } -void KbfxButton::paintEvent ( QPaintEvent * pe ) +void KbfxButton::paintEvent ( TQPaintEvent * pe ) { - QPainter p; + TQPainter p; if ( !m_current_skin.isNull () ) { - QRect r = QRect ( pe->rect().x(),pe->rect().y(),m_current_skin.width(),m_current_skin.height() ); - m_buffer = new QPixmap(); + TQRect r = TQRect ( pe->rect().x(),pe->rect().y(),m_current_skin.width(),m_current_skin.height() ); + m_buffer = new TQPixmap(); m_buffer->resize ( r.size() ); m_buffer->fill ( this, r.topLeft() ); - p.begin ( m_buffer,this ); + p.tqbegin ( m_buffer,this ); p.translate ( -r.x(), -r.y() ); p.drawPixmap ( r,m_current_skin ); p.end (); @@ -354,37 +354,37 @@ void KbfxButton::paintEvent ( QPaintEvent * pe ) } -void KbfxButton::dragEnterEvent ( QDragEnterEvent * e ) +void KbfxButton::dragEnterEvent ( TQDragEnterEvent * e ) { - e->accept ( QUriDrag::canDecode ( e ) ); + e->accept ( TQUriDrag::canDecode ( e ) ); kdDebug() << "Accepting KBFX button drag..." << endl; } -void KbfxButton::dropEvent ( QDropEvent * e ) +void KbfxButton::dropEvent ( TQDropEvent * e ) { - QStringList filelist; - QString _hover, _normal, _pressed, _tmp; - QImage _hover_pix, _normal_pix, _pressed_pix; - QUriDrag::decodeLocalFiles ( e, filelist ); + TQStringList filelist; + TQString _hover, _normal, _pressed, _tmp; + TQImage _hover_pix, _normal_pix, _pressed_pix; + TQUriDrag::decodeLocalFiles ( e, filelist ); - for ( QStringList::Iterator it = filelist.begin(); it != filelist.end(); ++it ) + for ( TQStringList::Iterator it = filelist.begin(); it != filelist.end(); ++it ) { _tmp = ( *it ); kdDebug() << "KBFX button dropped file: " << _tmp << endl; - if ( _tmp.contains ( "hover", FALSE ) > 0 ) + if ( _tmp.tqcontains ( "hover", FALSE ) > 0 ) { _hover = _tmp; - _hover_pix = QImage ( _tmp ); + _hover_pix = TQImage ( _tmp ); } - if ( _tmp.contains ( "normal", FALSE ) > 0 ) + if ( _tmp.tqcontains ( "normal", FALSE ) > 0 ) { _normal = _tmp; - _normal_pix = QImage ( _tmp ); + _normal_pix = TQImage ( _tmp ); } - if ( _tmp.contains ( "pressed", FALSE ) > 0 ) + if ( _tmp.tqcontains ( "pressed", FALSE ) > 0 ) { _pressed = _tmp; - _pressed_pix = QImage ( _tmp ); + _pressed_pix = TQImage ( _tmp ); } } diff --git a/src/kbfxbutton.h b/src/kbfxbutton.h index d4ece12..a333b2d 100644 --- a/src/kbfxbutton.h +++ b/src/kbfxbutton.h @@ -22,12 +22,12 @@ #ifndef KBFX_BUTTON_H #define KBFX_BUTTON_H -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include #include @@ -42,26 +42,27 @@ #include -class QPixmap; -class QLabel; +class TQPixmap; +class TQLabel; -class KbfxButton:public QLabel +class KbfxButton:public TQLabel { Q_OBJECT + TQ_OBJECT public: - KbfxButton ( QWidget * parent, const char * name = 0 ); + KbfxButton ( TQWidget * tqparent, const char * name = 0 ); ~KbfxButton(); void kbfx_vista_button_setFx ( bool choice ); - virtual void paintEvent ( QPaintEvent *pe ); - virtual void enterEvent ( QEvent * e ) ; - virtual void leaveEvent ( QEvent * e ); - virtual void mousePressEvent ( QMouseEvent * e ); - virtual void dropEvent ( QDropEvent *e ); - virtual void dragEnterEvent ( QDragEnterEvent *e ); + virtual void paintEvent ( TQPaintEvent *pe ); + virtual void enterEvent ( TQEvent * e ) ; + virtual void leaveEvent ( TQEvent * e ); + virtual void mousePressEvent ( TQMouseEvent * e ); + virtual void dropEvent ( TQDropEvent *e ); + virtual void dragEnterEvent ( TQDragEnterEvent *e ); static bool m_sizeHeight; static int m_size; - QCString findPanel(); + TQCString findPanel(); void readjust( bool ); public slots: @@ -82,31 +83,31 @@ class KbfxButton:public QLabel void showToolTip (); protected: - QPixmap m_over_skin; - QPixmap m_pressed_skin; - QPixmap m_release_skin; - QPixmap m_normal_skin; - QPixmap m_current_skin; + TQPixmap m_over_skin; + TQPixmap m_pressed_skin; + TQPixmap m_release_skin; + TQPixmap m_normal_skin; + TQPixmap m_current_skin; // mng support ??? - QPixmap * m_buffer; - QTimer * m_anime_timer; - QMovie * m_normal_anime; - QMovie * m_pressed_anime; - QMovie * m_hover_anime; - QMovie * m_current_anime; - QString m_normal_path; - QString m_over_path; - QString m_pressed_path; + TQPixmap * m_buffer; + TQTimer * m_anime_timer; + TQMovie * m_normal_anime; + TQMovie * m_pressed_anime; + TQMovie * m_hover_anime; + TQMovie * m_current_anime; + TQString m_normal_path; + TQString m_over_path; + TQString m_pressed_path; bool m_anime_on; bool m_kicker_auto_adjust; DCOPClient * m_dcopClient; /* state of the button */ bool m_toggle; - QTimer * fade_timer; + TQTimer * fade_timer; float m_opacity; - QPixmap m_fadePix; + TQPixmap m_fadePix; int m_fadeTime; }; diff --git a/src/kbfxplasmacanvasabstractitem.cpp b/src/kbfxplasmacanvasabstractitem.cpp index 4655765..38e810e 100644 --- a/src/kbfxplasmacanvasabstractitem.cpp +++ b/src/kbfxplasmacanvasabstractitem.cpp @@ -35,8 +35,8 @@ #include "kbfxplasmacanvasabstractitem.h" -KbfxPlasmaCanvasAbstractItem::KbfxPlasmaCanvasAbstractItem ( QCanvasPixmapArray * a, QCanvas * canvas ) - : QCanvasSprite ( a,canvas ) +KbfxPlasmaCanvasAbstractItem::KbfxPlasmaCanvasAbstractItem ( TQCanvasPixmapArray * a, TQCanvas * canvas ) + : TQCanvasSprite ( a,canvas ) { m_source=0; @@ -65,24 +65,24 @@ KbfxPlasmaCanvasAbstractItem::isCurrent() } void -KbfxPlasmaCanvasAbstractItem::mousePressEvent ( QMouseEvent * e ) +KbfxPlasmaCanvasAbstractItem::mousePressEvent ( TQMouseEvent * e ) { e = e; } void -KbfxPlasmaCanvasAbstractItem::mouseMoveEvent ( QMouseEvent * e ) +KbfxPlasmaCanvasAbstractItem::mouseMoveEvent ( TQMouseEvent * e ) { e = e; } void -KbfxPlasmaCanvasAbstractItem::enterEvent ( QEvent * e ) +KbfxPlasmaCanvasAbstractItem::enterEvent ( TQEvent * e ) { e =e ; } -void KbfxPlasmaCanvasAbstractItem::mouseReleaseEvent ( QMouseEvent * e ) +void KbfxPlasmaCanvasAbstractItem::mouseReleaseEvent ( TQMouseEvent * e ) { e =e ; emit clicked(); @@ -104,25 +104,25 @@ void KbfxPlasmaCanvasAbstractItem::hideit() } void -KbfxPlasmaCanvasAbstractItem::draw ( QPainter& pe ) +KbfxPlasmaCanvasAbstractItem::draw ( TQPainter& pe ) { this->drawContent ( &pe ); } -void KbfxPlasmaCanvasAbstractItem::setLabelText ( QString s ) +void KbfxPlasmaCanvasAbstractItem::setLabelText ( TQString s ) { s = s; } -QPixmap +TQPixmap KbfxPlasmaCanvasAbstractItem::dragPixmap() { - return QPixmap(); + return TQPixmap(); } void -KbfxPlasmaCanvasAbstractItem::drawContent ( QPainter * p ) +KbfxPlasmaCanvasAbstractItem::drawContent ( TQPainter * p ) { p = p ; } diff --git a/src/kbfxplasmacanvasabstractitem.h b/src/kbfxplasmacanvasabstractitem.h index 7110486..c1c8ac5 100644 --- a/src/kbfxplasmacanvasabstractitem.h +++ b/src/kbfxplasmacanvasabstractitem.h @@ -22,33 +22,34 @@ #ifndef KBFX_PLASMA_CANVAS_ABSTRACT_ITEM_H #define KBFX_PLASMA_CANVAS_ABSTRACT_ITEM_H -#include -#include +#include +#include #include "kbfxplasmacanvasrtti.h" -#include +#include #include #include #include #include "kbfxdatasource.h" #include -class KbfxPlasmaCanvasAbstractItem:public QObject,public QCanvasSprite +class KbfxPlasmaCanvasAbstractItem:public TQObject,public TQCanvasSprite { Q_OBJECT + TQ_OBJECT public: typedef enum {EXECUTABLE=0,SEPARATOR,INDEX,OTHER} Type; // typedef enum {RASTER=0,VECTOR,NATIVE} SkinMode; - KbfxPlasmaCanvasAbstractItem ( QCanvasPixmapArray * a, QCanvas * canvas ); + KbfxPlasmaCanvasAbstractItem ( TQCanvasPixmapArray * a, TQCanvas * canvas ); virtual ~KbfxPlasmaCanvasAbstractItem (); void setCurrent ( bool ); virtual Type type() { return m_type; } virtual void setType ( Type t ) { m_type = t;} - QString name() { if ( m_source != 0 ) return m_source->name(); else return QString ( "Not Set" );}; + TQString name() { if ( m_source != 0 ) return m_source->name(); else return TQString ( "Not Set" );}; void setSource ( KbfxDataSource src ); bool isCurrent(); @@ -56,25 +57,25 @@ class KbfxPlasmaCanvasAbstractItem:public QObject,public QCanvasSprite virtual int width() { return m_width;} - virtual bool lookup ( QString str ) {str = str ; return false;} + virtual bool lookup ( TQString str ) {str = str ; return false;} virtual int rtti() const { return CANVASITEM;} - virtual void draw ( QPainter & pe ); + virtual void draw ( TQPainter & pe ); - virtual void drawContent ( QPainter * pe ); + virtual void drawContent ( TQPainter * pe ); - virtual QPixmap dragPixmap(); + virtual TQPixmap dragPixmap(); //Event Handling - virtual void mousePressEvent ( QMouseEvent * e ); - virtual void mouseMoveEvent ( QMouseEvent * e ); - virtual void enterEvent ( QEvent * e ); - virtual void mouseReleaseEvent ( QMouseEvent * e ); + virtual void mousePressEvent ( TQMouseEvent * e ); + virtual void mouseMoveEvent ( TQMouseEvent * e ); + virtual void enterEvent ( TQEvent * e ); + virtual void mouseReleaseEvent ( TQMouseEvent * e ); - virtual void setLabelText ( QString s ); + virtual void setLabelText ( TQString s ); public slots: virtual void hideit(); diff --git a/src/kbfxplasmacanvasgroup.cpp b/src/kbfxplasmacanvasgroup.cpp index 044fc18..371e622 100644 --- a/src/kbfxplasmacanvasgroup.cpp +++ b/src/kbfxplasmacanvasgroup.cpp @@ -27,7 +27,7 @@ KbfxPlasmaCanvasGroup::KbfxPlasmaCanvasGroup () m_height = 0; m_id = 0; // m_count = 0; - m_name = QString ( "Unknown" ); + m_name = TQString ( "Unknown" ); // bool m_visible = true; m_shaded = false; } @@ -96,7 +96,7 @@ KbfxPlasmaCanvasGroup::addItem ( KbfxPlasmaCanvasAbstractItem * it ) qDebug ( "Adding Failed bcos Name Missing" ); return false; } - ItemListMap::ConstIterator itn = itemListMap ().find ( it ); + ItemListMap::ConstIterator itn = itemListMap ().tqfind ( it ); if ( itn != itemListMap ().end () ) { qDebug ( "Adding Failed Due to Item not end" ); @@ -173,13 +173,13 @@ KbfxPlasmaCanvasGroup::hide() } void -KbfxPlasmaCanvasGroup::setGroupName ( QString name ) +KbfxPlasmaCanvasGroup::setGroupName ( TQString name ) { m_name = name; delete [] name; } -QString +TQString KbfxPlasmaCanvasGroup::name() { return m_name; @@ -271,13 +271,13 @@ KbfxPlasmaCanvasGroup::moveDown ( int y ) } } -QRect +TQRect KbfxPlasmaCanvasGroup::boundingRect () { if ( this->count () == 0 ) - return QRect ( 0, 0, 0, 0 ); + return TQRect ( 0, 0, 0, 0 ); - QRect r; + TQRect r; for ( ItemListIter it ( m_itemList ); *it; ++it ) r |= ( *it )->boundingRect (); return r; @@ -308,7 +308,7 @@ KbfxPlasmaCanvasGroup::width () KbfxPlasmaCanvasGroup * KbfxPlasmaCanvasGroup::groupContaining ( KbfxPlasmaCanvasAbstractItem * item ) { - ItemListMap::ConstIterator it = itemListMap ().find ( item ); + ItemListMap::ConstIterator it = itemListMap ().tqfind ( item ); if ( it == itemListMap ().end () ) return 0; else diff --git a/src/kbfxplasmacanvasgroup.h b/src/kbfxplasmacanvasgroup.h index 1d6e2da..5ee60be 100644 --- a/src/kbfxplasmacanvasgroup.h +++ b/src/kbfxplasmacanvasgroup.h @@ -22,22 +22,23 @@ #ifndef KBFX_PLASMA_CANVAS_GROUP_H #define KBFX_PLASMA_CANVAS_GROUP_H -#include -#include +#include +#include #include "kbfxplasmacanvasabstractitem.h" -#include -class QCanvasItem; -class QRect; +#include +class TQCanvasItem; +class TQRect; -class KbfxPlasmaCanvasGroup:public QObject +class KbfxPlasmaCanvasGroup:public TQObject { Q_OBJECT + TQ_OBJECT public: - typedef QPtrList ItemList; - typedef QPtrListIterator ItemListIter; + typedef TQPtrList ItemList; + typedef TQPtrListIterator ItemListIter; //a Global mapof Groups - typedef QMap ItemListMap; + typedef TQMap ItemListMap; KbfxPlasmaCanvasGroup(); virtual ~KbfxPlasmaCanvasGroup(); @@ -46,15 +47,15 @@ class KbfxPlasmaCanvasGroup:public QObject bool deleteItem ( KbfxPlasmaCanvasAbstractItem * ); void move ( int x,int y ); void moveBy ( int x,int y ); - QString name(); - QRect boundingRect(); + TQString name(); + TQRect boundingRect(); int count(); int height(); int width(); static KbfxPlasmaCanvasGroup * groupContaining ( KbfxPlasmaCanvasAbstractItem * ); - QString groupName(); + TQString groupName(); uint groupID(); - void setGroupName ( QString name ); + void setGroupName ( TQString name ); void setGroupID ( uint ); bool isShaded() {return m_shaded;}; virtual int rtti() { return 1005;} @@ -82,7 +83,7 @@ class KbfxPlasmaCanvasGroup:public QObject //state variables bool m_shaded; bool m_visible; - QString m_name; + TQString m_name; uint m_id; int m_sepheight; int m_count; diff --git a/src/kbfxplasmacanvasgroupview.cpp b/src/kbfxplasmacanvasgroupview.cpp index 04c7f8e..0f84605 100644 --- a/src/kbfxplasmacanvasgroupview.cpp +++ b/src/kbfxplasmacanvasgroupview.cpp @@ -27,7 +27,7 @@ KbfxPlasmaCanvasGroupView::KbfxPlasmaCanvasGroupView () m_count = 0; m_height = 0; m_width = 0; - m_name = QString ( "Unkown" ); + m_name = TQString ( "Unkown" ); m_fullExpand = false; } @@ -62,10 +62,10 @@ KbfxPlasmaCanvasGroupView::addGroup ( KbfxPlasmaCanvasGroup * gPtr ) // gPtr->show(); // qDebug("adding Groupy"); m_count++; - connect ( gPtr, SIGNAL ( groupShade ( uint ) ), this, - SLOT ( foldGroup ( uint ) ) ); - connect ( gPtr, SIGNAL ( groupUnShade ( uint ) ), this, - SLOT ( unFoldGroup ( uint ) ) ); + connect ( gPtr, TQT_SIGNAL ( groupShade ( uint ) ), this, + TQT_SLOT ( foldGroup ( uint ) ) ); + connect ( gPtr, TQT_SIGNAL ( groupUnShade ( uint ) ), this, + TQT_SLOT ( unFoldGroup ( uint ) ) ); } @@ -74,7 +74,7 @@ KbfxPlasmaCanvasGroupView::addGroup ( KbfxPlasmaCanvasGroup * gPtr ) } KbfxPlasmaCanvasGroupView * -KbfxPlasmaCanvasGroupView::contains ( KbfxPlasmaCanvasGroup * ) +KbfxPlasmaCanvasGroupView::tqcontains ( KbfxPlasmaCanvasGroup * ) { //maybe I don't need this return 0; @@ -82,13 +82,13 @@ KbfxPlasmaCanvasGroupView::contains ( KbfxPlasmaCanvasGroup * ) } void -KbfxPlasmaCanvasGroupView::setName ( QString name ) +KbfxPlasmaCanvasGroupView::setName ( TQString name ) { m_name = name; //delete [] name; } -QString +TQString KbfxPlasmaCanvasGroupView::name() { return m_name; diff --git a/src/kbfxplasmacanvasgroupview.h b/src/kbfxplasmacanvasgroupview.h index 2f79e2c..779d813 100644 --- a/src/kbfxplasmacanvasgroupview.h +++ b/src/kbfxplasmacanvasgroupview.h @@ -22,8 +22,8 @@ #ifndef KBFX_PLASMA_CANVAS_GROUP_VIEW_H #define KBFX_PLASMA_CANVAS_GROUP_VIEW_H -#include -#include +#include +#include #include "kbfxplasmacanvasgroup.h" /** @@ -31,20 +31,21 @@ This class will manager a list of Groups. **/ -class KbfxPlasmaCanvasGroupView:public QObject +class KbfxPlasmaCanvasGroupView:public TQObject { Q_OBJECT + TQ_OBJECT public: - typedef QPtrList groupPtrList; + typedef TQPtrList groupPtrList; KbfxPlasmaCanvasGroupView(); virtual ~KbfxPlasmaCanvasGroupView(); void addGroup ( KbfxPlasmaCanvasGroup* ); void deleteGroup ( KbfxPlasmaCanvasGroup* ); - KbfxPlasmaCanvasGroupView* contains ( KbfxPlasmaCanvasGroup* ); + KbfxPlasmaCanvasGroupView* tqcontains ( KbfxPlasmaCanvasGroup* ); virtual int rtti() {return 1006;} void predend ( KbfxPlasmaCanvasGroup* ); void append ( KbfxPlasmaCanvasGroup * ); @@ -56,8 +57,8 @@ class KbfxPlasmaCanvasGroupView:public QObject { return m_width; } - void setName ( QString name ); - QString name(); + void setName ( TQString name ); + TQString name(); bool expanded() { return m_fullExpand;} public slots: void foldGroupAll(); @@ -75,8 +76,8 @@ class KbfxPlasmaCanvasGroupView:public QObject int m_height; int m_width; bool m_fullExpand; - QString m_name; - QString m_iconPath; + TQString m_name; + TQString m_iconPath; KbfxPlasmaCanvasGroup * m_current; groupPtrList m_groupChain; //state variables diff --git a/src/kbfxplasmacanvasitem.cpp b/src/kbfxplasmacanvasitem.cpp index 4a5824f..98173d2 100644 --- a/src/kbfxplasmacanvasitem.cpp +++ b/src/kbfxplasmacanvasitem.cpp @@ -21,18 +21,18 @@ #include "kbfxplasmacanvasitem.h" -KbfxPlasmaCanvasItem::KbfxPlasmaCanvasItem ( QCanvasPixmapArray * a , QCanvas * canvas ) :KbfxPlasmaCanvasAbstractItem ( a, canvas ) +KbfxPlasmaCanvasItem::KbfxPlasmaCanvasItem ( TQCanvasPixmapArray * a , TQCanvas * canvas ) :KbfxPlasmaCanvasAbstractItem ( a, canvas ) { this->setItemMode ( 1 ); setAnimated ( false ); m_desktopFile = 0L; m_isCurrent = false; // m_pixmapArray = a; - QPixmap * _img = this->image ( 0 ); + TQPixmap * _img = this->image ( 0 ); m_commentText ="No Comment Set By Plugin"; m_height =_img->height(); m_width =_img->width(); - connect ( this,SIGNAL ( clicked() ),this,SLOT ( exec() ) ); + connect ( this,TQT_SIGNAL ( clicked() ),this,TQT_SLOT ( exec() ) ); m_type = OTHER; // ConfigInit().read(); m_noComments = ConfigInit().m_noComments; @@ -54,19 +54,19 @@ KbfxPlasmaCanvasItem::~KbfxPlasmaCanvasItem() setCanvas ( 0L ); } /* -QCanvasPixmapArray * KbfxPlasmaCanvasItem::getPixmapArray() +TQCanvasPixmapArray * KbfxPlasmaCanvasItem::getPixmapArray() { return m_pixmapArray; } */ void -KbfxPlasmaCanvasItem::setLabelText ( QString str ) +KbfxPlasmaCanvasItem::setLabelText ( TQString str ) { - QFont * _font = new QFont ( m_fontAppNameFont ); + TQFont * _font = new TQFont ( m_fontAppNameFont ); - QFontMetrics fm ( *_font ); + TQFontMetrics fm ( *_font ); int _commentWidth = fm.width ( str+"..." ); int _strLen = str.length(); @@ -88,7 +88,7 @@ KbfxPlasmaCanvasItem::setLabelText ( QString str ) bool -KbfxPlasmaCanvasItem::lookup ( QString str ) +KbfxPlasmaCanvasItem::lookup ( TQString str ) { if ( str.isNull() ) @@ -97,11 +97,11 @@ KbfxPlasmaCanvasItem::lookup ( QString str ) if ( m_type == SEPARATOR || m_type == INDEX ) return false; - if ( m_labelText.contains ( str,false ) > 0 ) + if ( m_labelText.tqcontains ( str,false ) > 0 ) return true; - if ( m_commentText.contains ( str,false ) > 0 ) + if ( m_commentText.tqcontains ( str,false ) > 0 ) return true; - if ( m_exec.contains ( str,false ) >0 ) + if ( m_exec.tqcontains ( str,false ) >0 ) return true; @@ -109,7 +109,7 @@ KbfxPlasmaCanvasItem::lookup ( QString str ) } void -KbfxPlasmaCanvasItem::setExec ( QString desktopfile ) +KbfxPlasmaCanvasItem::setExec ( TQString desktopfile ) { m_desktopFile = new KDesktopFile ( desktopfile ); m_desktopFilePath = desktopfile; @@ -130,12 +130,12 @@ KbfxPlasmaCanvasItem::setExec ( QString desktopfile ) } void -KbfxPlasmaCanvasItem::setIconPath ( QString str ) +KbfxPlasmaCanvasItem::setIconPath ( TQString str ) { KIconLoader *iconload = KGlobal::iconLoader (); m_iconPath = iconload->iconPath ( str, KIcon::Desktop, false ); // m_icon.load(m_iconPath); - QImage _img ( m_iconPath ); + TQImage _img ( m_iconPath ); if ( _img.height() > 128 ) { @@ -148,7 +148,7 @@ KbfxPlasmaCanvasItem::setIconPath ( QString str ) } void -KbfxPlasmaCanvasItem::setIcon ( QPixmap pixmap ) +KbfxPlasmaCanvasItem::setIcon ( TQPixmap pixmap ) { m_icon = pixmap; @@ -206,7 +206,7 @@ KbfxPlasmaCanvasItem::setItemMode ( bool mode ) void -KbfxPlasmaCanvasItem::drawBackDrop ( QPainter * pe,QRect & r ) +KbfxPlasmaCanvasItem::drawBackDrop ( TQPainter * pe,TQRect & r ) { r = r ; if ( pe == NULL ) @@ -218,7 +218,7 @@ KbfxPlasmaCanvasItem::drawBackDrop ( QPainter * pe,QRect & r ) /* void -KbfxPlasmaCanvasItem::drawText(QPainter * pe,QString str) +KbfxPlasmaCanvasItem::drawText(TQPainter * pe,TQString str) { @@ -226,21 +226,21 @@ KbfxPlasmaCanvasItem::drawText(QPainter * pe,QString str) */ void -KbfxPlasmaCanvasItem::draw ( QPainter & pe ) +KbfxPlasmaCanvasItem::draw ( TQPainter & pe ) { drawContent ( &pe ); } -QPixmap +TQPixmap KbfxPlasmaCanvasItem::dragPixmap() { double _x = x(); double _y = y(); setX ( 0.0 ); setY ( 0.0 ); - QPixmap dragpixmap ( this->width(),this->height() ); - dragpixmap.fill ( QColor ( 255,255,255 ) ); - QPainter p; + TQPixmap dragpixmap ( this->width(),this->height() ); + dragpixmap.fill ( TQColor ( 255,255,255 ) ); + TQPainter p; p.begin ( &dragpixmap ); this->drawContent ( &p ); p.end(); @@ -251,7 +251,7 @@ KbfxPlasmaCanvasItem::dragPixmap() } void -KbfxPlasmaCanvasItem::drawContent ( QPainter * pe ) +KbfxPlasmaCanvasItem::drawContent ( TQPainter * pe ) { if ( m_isCurrent ) { @@ -262,7 +262,7 @@ KbfxPlasmaCanvasItem::drawContent ( QPainter * pe ) this->setFrame ( 0 ); } //int _currentFrame = - QCanvasPixmap *cp = this->image ( this->frame () ); + TQCanvasPixmap *cp = this->image ( this->frame () ); m_height = cp->height(); m_width = cp->width(); //Draw the Background @@ -274,9 +274,9 @@ KbfxPlasmaCanvasItem::drawContent ( QPainter * pe ) } else { - pe->setPen ( QColor ( 91,178,62 ) ); + pe->setPen ( TQColor ( 91,178,62 ) ); pe->drawRect ( this->boundingRect() ); - pe->setPen ( QColor ( 0,10,0 ) ); + pe->setPen ( TQColor ( 0,10,0 ) ); } @@ -284,15 +284,15 @@ KbfxPlasmaCanvasItem::drawContent ( QPainter * pe ) We will split the Item box into two **/ - QRect tmp ( 0,0,0,0 ); + TQRect tmp ( 0,0,0,0 ); //TODO: Should be read from kbfxconfig.cpp // - QRect * rectTop = new QRect ( m_margin, ( int ) y(), cp->width() - m_margin, cp->height() /2 ); - QRect * rectBot = new QRect ( m_margin, ( int ) y() + rectTop->height(), cp->width() - m_margin, cp->height() /2 ); + TQRect * rectTop = new TQRect ( m_margin, ( int ) y(), cp->width() - m_margin, cp->height() /2 ); + TQRect * rectBot = new TQRect ( m_margin, ( int ) y() + rectTop->height(), cp->width() - m_margin, cp->height() /2 ); ///Draw Icon @@ -300,15 +300,15 @@ KbfxPlasmaCanvasItem::drawContent ( QPainter * pe ) //TODO::remover hard coded icon size : read from config if ( !m_isCurrent ) - pe->drawPixmap ( QRect ( ( m_margin-m_iconSize ) /2, ( int ) y() + ( cp->height()-m_iconSize ) /2,m_iconSize,m_iconSize ),m_icon ); + pe->drawPixmap ( TQRect ( ( m_margin-m_iconSize ) /2, ( int ) y() + ( cp->height()-m_iconSize ) /2,m_iconSize,m_iconSize ),m_icon ); else - pe->drawPixmap ( QRect ( ( m_margin-m_iconSize ) /2, ( int ) y() + ( cp->height()-m_iconSize ) /2,m_iconSize+2,m_iconSize+2 ),m_icon ); + pe->drawPixmap ( TQRect ( ( m_margin-m_iconSize ) /2, ( int ) y() + ( cp->height()-m_iconSize ) /2,m_iconSize+2,m_iconSize+2 ),m_icon ); //End of DrawIcon - QFont * _font = new QFont ( m_fontAppNameFont ); - QFont * _font_comment = new QFont ( m_commentFont ); - QFont * _font_separator = new QFont ( m_sepNameFont ); + TQFont * _font = new TQFont ( m_fontAppNameFont ); + TQFont * _font_comment = new TQFont ( m_commentFont ); + TQFont * _font_separator = new TQFont ( m_sepNameFont ); pe->setFont ( *_font ); if ( this->type() == EXECUTABLE ) @@ -317,17 +317,17 @@ KbfxPlasmaCanvasItem::drawContent ( QPainter * pe ) if ( m_noComments == false ) { if ( m_isCurrent && m_boldFonts == true ) { _font->setBold ( true );pe->setFont ( *_font ); } - pe->drawText ( *rectTop, Qt::AlignLeft| Qt::AlignBottom ,QString ( m_labelText ), -1, &tmp,0 ); + pe->drawText ( *rectTop, TQt::AlignLeft| TQt::AlignBottom ,TQString ( m_labelText ), -1, &tmp ); pe->setPen ( m_lineColor ); pe->drawLine ( m_margin, ( int ) y() + rectTop->height(), ( int ) cp->width() - 2, ( int ) y() + rectTop->height() ); pe->setFont ( *_font_comment ); pe->setPen ( m_commentColor ); - pe->drawText ( *rectBot, Qt::AlignLeft| Qt::AlignTop ,QString ( m_commentText ), -1, &tmp,0 ); + pe->drawText ( *rectBot, TQt::AlignLeft| TQt::AlignTop ,TQString ( m_commentText ), -1, &tmp ); } else { - pe->drawText ( QRect ( m_margin+1, ( int ) y()+1,cp->width(),cp->height() ), Qt::AlignLeft | Qt::AlignVCenter ,QString ( m_labelText ), -1, &tmp,0 ); -// pe->drawText ( QRect ( m_margin, ( int ) y(),cp->width(),cp->height() ), Qt::AlignLeft | Qt::AlignVCenter ,QString ( m_labelText ), -1, &tmp,0 ); + pe->drawText ( TQRect ( m_margin+1, ( int ) y()+1,cp->width(),cp->height() ), TQt::AlignLeft | TQt::AlignVCenter ,TQString ( m_labelText ), -1, &tmp ); +// pe->drawText ( TQRect ( m_margin, ( int ) y(),cp->width(),cp->height() ), TQt::AlignLeft | TQt::AlignVCenter ,TQString ( m_labelText ), -1, &tmp ); } } else @@ -341,7 +341,7 @@ KbfxPlasmaCanvasItem::drawContent ( QPainter * pe ) { pe->setPen ( m_fontAppNameColor ); } - pe->drawText ( QRect ( ( int ) x(), ( int ) y(),cp->width(),cp->height() ), Qt::AlignCenter ,QString ( m_labelText ), -1, &tmp,0 ); + pe->drawText ( TQRect ( ( int ) x(), ( int ) y(),cp->width(),cp->height() ), TQt::AlignCenter ,TQString ( m_labelText ), -1, &tmp ); } @@ -356,13 +356,13 @@ KbfxPlasmaCanvasItem::drawContent ( QPainter * pe ) } -void::KbfxPlasmaCanvasItem::setComment ( QString str ) +void::KbfxPlasmaCanvasItem::setComment ( TQString str ) { - QFont * _font = new QFont ( m_commentFont ); + TQFont * _font = new TQFont ( m_commentFont ); - QFontMetrics fm ( *_font ); + TQFontMetrics fm ( *_font ); int _commentWidth = fm.width ( str+"..." ); int _strLen = str.length(); diff --git a/src/kbfxplasmacanvasitem.h b/src/kbfxplasmacanvasitem.h index 92f1047..f240ef5 100644 --- a/src/kbfxplasmacanvasitem.h +++ b/src/kbfxplasmacanvasitem.h @@ -22,10 +22,10 @@ #ifndef KBFX_PLASMA_CANVAS_ITEM_H #define KBFX_PLASMA_CANVAS_ITEM_H -#include -#include -#include -#include +#include +#include +#include +#include #include #include @@ -41,6 +41,7 @@ class KbfxPlasmaCanvasItem:public KbfxPlasmaCanvasAbstractItem { Q_OBJECT + TQ_OBJECT public: @@ -48,7 +49,7 @@ class KbfxPlasmaCanvasItem:public KbfxPlasmaCanvasAbstractItem typedef enum {RASTER=0,VECTOR,NATIVE} SkinMode; - KbfxPlasmaCanvasItem ( QCanvasPixmapArray * a, QCanvas * canvas ); + KbfxPlasmaCanvasItem ( TQCanvasPixmapArray * a, TQCanvas * canvas ); KbfxPlasmaCanvasItem ( const KbfxPlasmaCanvasItem &t ); KbfxPlasmaCanvasItem &operator = ( const KbfxPlasmaCanvasItem &t ); virtual ~KbfxPlasmaCanvasItem (); @@ -57,39 +58,39 @@ class KbfxPlasmaCanvasItem:public KbfxPlasmaCanvasAbstractItem void setItemMode ( bool mode=true ); void setType ( Type ); void setCurrent ( bool ); - void setExec ( QString desktopfile ); - QString name() {return m_labelText;}; - QString desktopFile() { return m_desktopFilePath;} + void setExec ( TQString desktopfile ); + TQString name() {return m_labelText;}; + TQString desktopFile() { return m_desktopFilePath;} KbfxDataSource * source() { return m_source;} void setSource ( KbfxDataSource src ); - void setCommand ( QString cmd ); - void setComment ( QString comment ); - void setIcon ( QPixmap pixmap ); - void setIconPath ( QString path ); + void setCommand ( TQString cmd ); + void setComment ( TQString comment ); + void setIcon ( TQPixmap pixmap ); + void setIconPath ( TQString path ); bool isCurrent(); int height() { return m_height;} int width() { return m_width;} Type type() { return m_type;} - bool lookup ( QString str ); + bool lookup ( TQString str ); virtual void advance ( int phase ); virtual int rtti() const { return CANVASITEM;} - virtual void draw ( QPainter & pe ); - virtual void drawContent ( QPainter * pe ); - virtual QPixmap dragPixmap(); + virtual void draw ( TQPainter & pe ); + virtual void drawContent ( TQPainter * pe ); + virtual TQPixmap dragPixmap(); -// virtual void drawText(QPainter *pe,QString str); - virtual void drawBackDrop ( QPainter * pe,QRect & rect ); +// virtual void drawText(TQPainter *pe,TQString str); + virtual void drawBackDrop ( TQPainter * pe,TQRect & rect ); /* Event Handling */ - virtual void mousePressEvent ( QMouseEvent * e ); - virtual void mouseMoveEvent ( QMouseEvent * e ); - virtual void enterEvent ( QEvent * e ); - virtual void mouseReleaseEvent ( QMouseEvent * e ); + virtual void mousePressEvent ( TQMouseEvent * e ); + virtual void mouseMoveEvent ( TQMouseEvent * e ); + virtual void enterEvent ( TQEvent * e ); + virtual void mouseReleaseEvent ( TQMouseEvent * e ); - void setLabelText ( QString s ); + void setLabelText ( TQString s ); public slots: void updateAngle() {} @@ -102,32 +103,32 @@ class KbfxPlasmaCanvasItem:public KbfxPlasmaCanvasAbstractItem private: - void drawStar ( QPainter * pe ); + void drawStar ( TQPainter * pe ); int m_frameCount; int m_textWidth; - QString m_exec; - QString m_desktopFilePath; - QString m_labelText; - QString m_commentText; - QPixmap m_icon; - QString m_iconPath; + TQString m_exec; + TQString m_desktopFilePath; + TQString m_labelText; + TQString m_commentText; + TQPixmap m_icon; + TQString m_iconPath; KDesktopFile * m_desktopFile; KbfxDataSource * m_source; /* Theming stuff */ - QColor m_fontAppNameColor; - QFont m_fontAppNameFont; - QColor m_commentColor; - QFont m_commentFont; - QColor m_lineColor; - QFont m_sepNameFont; + TQColor m_fontAppNameColor; + TQFont m_fontAppNameFont; + TQColor m_commentColor; + TQFont m_commentFont; + TQColor m_lineColor; + TQFont m_sepNameFont; bool m_boldFonts; bool m_skined; bool m_restricted ; //KDE kiosk Type m_type; bool m_hidden; - QString m_error; + TQString m_error; bool m_isCurrent; bool m_noComments; int m_margin; diff --git a/src/kbfxplasmacanvasitem_events.cpp b/src/kbfxplasmacanvasitem_events.cpp index d268a9e..1804ca7 100644 --- a/src/kbfxplasmacanvasitem_events.cpp +++ b/src/kbfxplasmacanvasitem_events.cpp @@ -24,7 +24,7 @@ #include #include -void KbfxPlasmaCanvasItem::mousePressEvent ( QMouseEvent * e ) +void KbfxPlasmaCanvasItem::mousePressEvent ( TQMouseEvent * e ) { e = e; //TODO: @@ -34,21 +34,21 @@ void KbfxPlasmaCanvasItem::mousePressEvent ( QMouseEvent * e ) } void -KbfxPlasmaCanvasItem::mouseReleaseEvent ( QMouseEvent * e ) +KbfxPlasmaCanvasItem::mouseReleaseEvent ( TQMouseEvent * e ) { e = e; - // QPixmap pix = labelIcon(); + // TQPixmap pix = labelIcon(); emit clicked(); } -void KbfxPlasmaCanvasItem::mouseMoveEvent ( QMouseEvent * e ) +void KbfxPlasmaCanvasItem::mouseMoveEvent ( TQMouseEvent * e ) { e=e; //qDebug("Item revices Mouse Event"); } -void KbfxPlasmaCanvasItem::enterEvent ( QEvent * e ) +void KbfxPlasmaCanvasItem::enterEvent ( TQEvent * e ) { e=e; //qDebug("Mouse Enters"); @@ -62,7 +62,7 @@ KbfxPlasmaCanvasItem::exec() return; -// KIconEffect::visualActivate(new QWidget(), this->boundingRect()); +// KIconEffect::visualActivate(new TQWidget(), this->boundingRect()); m_source->exec(); } diff --git a/src/kbfxplasmacanvasitemwrapper.cpp b/src/kbfxplasmacanvasitemwrapper.cpp index 1c244f4..a39663c 100644 --- a/src/kbfxplasmacanvasitemwrapper.cpp +++ b/src/kbfxplasmacanvasitemwrapper.cpp @@ -20,10 +20,10 @@ */ #include "kbfxplasmacanvasitemwrapper.h" -#include +#include #include -KbfxPlasmaCanvasItemWrapper::KbfxPlasmaCanvasItemWrapper ( QCanvas * canvas ) +KbfxPlasmaCanvasItemWrapper::KbfxPlasmaCanvasItemWrapper ( TQCanvas * canvas ) { m_canvas = canvas; } @@ -31,48 +31,48 @@ KbfxPlasmaCanvasItemWrapper::KbfxPlasmaCanvasItemWrapper ( QCanvas * canvas ) KbfxPlasmaCanvasItemWrapper::~KbfxPlasmaCanvasItemWrapper () {} -QCanvasItem * +TQCanvasItem * KbfxPlasmaCanvasItemWrapper::item ( KbfxPlasmaCanvasItem::Type __type ) { - QPixmap _img_sep = ( *KbfxPlasmaPixmapProvider::pixmap ( "separator" ) ); - QImage _tmp_img = _img_sep.convertToImage(); - _tmp_img = _tmp_img.smoothScale ( ConfigInit().m_itemView_w, _img_sep.height (),QImage::ScaleFree ); - _img_sep = QPixmap ( _tmp_img ); + TQPixmap _img_sep = ( *KbfxPlasmaPixmapProvider::pixmap ( "separator" ) ); + TQImage _tmp_img = _img_sep.convertToImage(); + _tmp_img = _tmp_img.smoothScale ( ConfigInit().m_itemView_w, _img_sep.height (),TQ_ScaleFree ); + _img_sep = TQPixmap ( _tmp_img ); - QPixmap _img_tnorm = ( *KbfxPlasmaPixmapProvider::pixmap ( "tilenormal" ) ); + TQPixmap _img_tnorm = ( *KbfxPlasmaPixmapProvider::pixmap ( "tilenormal" ) ); _tmp_img = _img_tnorm.convertToImage(); - _tmp_img = _tmp_img.smoothScale ( ConfigInit().m_itemView_w, _img_tnorm.height (),QImage::ScaleFree ); - _img_tnorm = QPixmap ( _tmp_img ); + _tmp_img = _tmp_img.smoothScale ( ConfigInit().m_itemView_w, _img_tnorm.height (),TQ_ScaleFree ); + _img_tnorm = TQPixmap ( _tmp_img ); - QPixmap _img_thov = ( *KbfxPlasmaPixmapProvider::pixmap ( "tilehover" ) ); + TQPixmap _img_thov = ( *KbfxPlasmaPixmapProvider::pixmap ( "tilehover" ) ); _tmp_img = _img_thov.convertToImage(); - _tmp_img = _tmp_img.smoothScale ( ConfigInit().m_itemView_w, _img_thov.height (),QImage::ScaleFree ); - _img_thov = QPixmap ( _tmp_img ); + _tmp_img = _tmp_img.smoothScale ( ConfigInit().m_itemView_w, _img_thov.height (),TQ_ScaleFree ); + _img_thov = TQPixmap ( _tmp_img ); if ( __type == KbfxPlasmaCanvasItem::SEPARATOR ) { - QValueList list; + TQValueList list; list.append ( _img_sep ); KbfxPlasmaCanvasItem *_ret = - new KbfxPlasmaCanvasItem ( new QCanvasPixmapArray ( list ),m_canvas ); + new KbfxPlasmaCanvasItem ( new TQCanvasPixmapArray ( list ),m_canvas ); _ret->setType ( __type ); - return ( QCanvasItem * ) _ret; + return ( TQCanvasItem * ) _ret; } if ( __type == KbfxPlasmaCanvasItem::EXECUTABLE ) { - QValueList list; + TQValueList list; list.append ( _img_tnorm ); list.append ( _img_thov ); - QCanvasPixmapArray * _pArray = new QCanvasPixmapArray ( list ); + TQCanvasPixmapArray * _pArray = new TQCanvasPixmapArray ( list ); KbfxPlasmaCanvasItem *_ret = new KbfxPlasmaCanvasItem ( _pArray, m_canvas ); _ret->setType ( __type ); - return ( QCanvasItem * ) _ret; + return ( TQCanvasItem * ) _ret; } @@ -80,43 +80,43 @@ KbfxPlasmaCanvasItemWrapper::item ( KbfxPlasmaCanvasItem::Type __type ) } -QCanvasItem * +TQCanvasItem * KbfxPlasmaCanvasItemWrapper::itemIndex ( KbfxPlasmaCanvasItem::Type __type ) { - QPixmap _img_isep = ( *KbfxPlasmaPixmapProvider::pixmap ( "indexseparator" ) ); - QImage _tmp_img = _img_isep.convertToImage(); - _tmp_img = _tmp_img.smoothScale ( ConfigInit().m_listBox_w, _img_isep.height (),QImage::ScaleFree ); - _img_isep = QPixmap ( _tmp_img ); + TQPixmap _img_isep = ( *KbfxPlasmaPixmapProvider::pixmap ( "indexseparator" ) ); + TQImage _tmp_img = _img_isep.convertToImage(); + _tmp_img = _tmp_img.smoothScale ( ConfigInit().m_listBox_w, _img_isep.height (),TQ_ScaleFree ); + _img_isep = TQPixmap ( _tmp_img ); - QPixmap _img_r = ( *KbfxPlasmaPixmapProvider::pixmap ( "rhstile" ) ); + TQPixmap _img_r = ( *KbfxPlasmaPixmapProvider::pixmap ( "rhstile" ) ); _tmp_img = _img_r.convertToImage(); - _tmp_img = _tmp_img.smoothScale ( ConfigInit().m_listBox_w, _img_r.height (),QImage::ScaleFree ); - _img_r = QPixmap ( _tmp_img ); + _tmp_img = _tmp_img.smoothScale ( ConfigInit().m_listBox_w, _img_r.height (),TQ_ScaleFree ); + _img_r = TQPixmap ( _tmp_img ); - QPixmap _img_rhov = ( *KbfxPlasmaPixmapProvider::pixmap ( "rhshovertile" ) ); + TQPixmap _img_rhov = ( *KbfxPlasmaPixmapProvider::pixmap ( "rhshovertile" ) ); _tmp_img = _img_rhov.convertToImage(); - _tmp_img = _tmp_img.smoothScale ( ConfigInit().m_listBox_w, _img_rhov.height (),QImage::ScaleFree ); - _img_rhov = QPixmap ( _tmp_img ); + _tmp_img = _tmp_img.smoothScale ( ConfigInit().m_listBox_w, _img_rhov.height (),TQ_ScaleFree ); + _img_rhov = TQPixmap ( _tmp_img ); if ( __type == KbfxPlasmaCanvasItem::SEPARATOR ) { - QValueList list; + TQValueList list; list.append ( _img_isep ); KbfxPlasmaIndexItem *_ret = - new KbfxPlasmaIndexItem ( new QCanvasPixmapArray ( list ),m_canvas ); + new KbfxPlasmaIndexItem ( new TQCanvasPixmapArray ( list ),m_canvas ); _ret->setType ( __type ); - return ( QCanvasItem * ) _ret; + return ( TQCanvasItem * ) _ret; } if ( __type == KbfxPlasmaCanvasItem::INDEX ) { - QValueList list2; + TQValueList list2; list2.append ( _img_r ); list2.append ( _img_rhov ); - KbfxPlasmaIndexItem *_ret = new KbfxPlasmaIndexItem ( new QCanvasPixmapArray ( list2 ), + KbfxPlasmaIndexItem *_ret = new KbfxPlasmaIndexItem ( new TQCanvasPixmapArray ( list2 ), m_canvas ); _ret->setType ( __type ); - return ( QCanvasItem * ) _ret; + return ( TQCanvasItem * ) _ret; } return 0; diff --git a/src/kbfxplasmacanvasitemwrapper.h b/src/kbfxplasmacanvasitemwrapper.h index 54e70b2..ba1954b 100644 --- a/src/kbfxplasmacanvasitemwrapper.h +++ b/src/kbfxplasmacanvasitemwrapper.h @@ -24,23 +24,24 @@ #include "kbfxplasmacanvasitem.h" #include "kbfxplasmaindexitem.h" -#include +#include -class KbfxPlasmaCanvasItemWrapper:public QObject +class KbfxPlasmaCanvasItemWrapper:public TQObject { Q_OBJECT + TQ_OBJECT public: - KbfxPlasmaCanvasItemWrapper ( QCanvas * canvas ); + KbfxPlasmaCanvasItemWrapper ( TQCanvas * canvas ); ~KbfxPlasmaCanvasItemWrapper(); - QCanvasItem* item ( KbfxPlasmaCanvasItem::Type __type ); - QCanvasItem* itemIndex ( KbfxPlasmaCanvasItem::Type __type ); + TQCanvasItem* item ( KbfxPlasmaCanvasItem::Type __type ); + TQCanvasItem* itemIndex ( KbfxPlasmaCanvasItem::Type __type ); private: - QCanvas * m_canvas; + TQCanvas * m_canvas; //none diff --git a/src/kbfxplasmacanvasstack.cpp b/src/kbfxplasmacanvasstack.cpp index bfe5b36..4ce38cb 100644 --- a/src/kbfxplasmacanvasstack.cpp +++ b/src/kbfxplasmacanvasstack.cpp @@ -81,10 +81,10 @@ KbfxPlasmaCanvasStack::raise ( uint id ) bool -KbfxPlasmaCanvasStack::contains ( QString name ) +KbfxPlasmaCanvasStack::tqcontains ( TQString name ) { //FIXME:Depricated Data Structure Needs fixing - if ( m_dict.contains ( name ) == true ) + if ( m_dict.tqcontains ( name ) == true ) return true; else return false; @@ -131,7 +131,7 @@ KbfxPlasmaCanvasStack::hide() void -KbfxPlasmaCanvasStack::raiseByName ( QString name ) +KbfxPlasmaCanvasStack::raiseByName ( TQString name ) { for ( uint i = 0; i < m_groupChain.count (); ++i ) { @@ -154,7 +154,7 @@ KbfxPlasmaCanvasStack::raiseByName ( QString name ) KbfxPlasmaCanvasGroupView * -KbfxPlasmaCanvasStack::activeViewByName ( QString name ) +KbfxPlasmaCanvasStack::activeViewByName ( TQString name ) { @@ -170,7 +170,7 @@ KbfxPlasmaCanvasStack::activeViewByName ( QString name ) } -QString +TQString KbfxPlasmaCanvasStack::getItemName ( int id ) { return m_groupChain.at ( id )->name(); diff --git a/src/kbfxplasmacanvasstack.h b/src/kbfxplasmacanvasstack.h index 91ad67c..386c9b5 100644 --- a/src/kbfxplasmacanvasstack.h +++ b/src/kbfxplasmacanvasstack.h @@ -22,8 +22,8 @@ #ifndef KBFX_PLASMA_CANVAS_STACK_H #define KBFX_PLASMA_CANVAS_STACK_H -#include -#include +#include +#include #include //#include "kbfxplasmacanvasgroup.h" #include "kbfxplasmacanvasgroupview.h" @@ -33,22 +33,23 @@ This class will manager a list of Grouplists. **/ -class KbfxPlasmaCanvasStack:public QObject +class KbfxPlasmaCanvasStack:public TQObject { Q_OBJECT + TQ_OBJECT public: - typedef QPtrList groupPtrList; - typedef QMap Dict;//DEPRECATED - typedef QMap DataDict; + typedef TQPtrList groupPtrList; + typedef TQMap Dict;//DEPRECATED + typedef TQMap DataDict; KbfxPlasmaCanvasStack(); virtual ~KbfxPlasmaCanvasStack(); void addGroup ( KbfxPlasmaCanvasGroupView* ); void deleteGroup ( KbfxPlasmaCanvasGroupView* ); - KbfxPlasmaCanvasStack* contains ( KbfxPlasmaCanvasGroupView* ); - QString getItemName ( int ); + KbfxPlasmaCanvasStack* tqcontains ( KbfxPlasmaCanvasGroupView* ); + TQString getItemName ( int ); virtual int rtti() {return 1006;} void predend ( KbfxPlasmaCanvasGroupView* ); void append ( KbfxPlasmaCanvasGroupView* ); @@ -63,13 +64,13 @@ class KbfxPlasmaCanvasStack:public QObject { return m_width; } - QString name() {return m_name;} - void setName ( QString name ) { m_name = name;} - bool contains ( QString ); - KbfxPlasmaCanvasGroupView * activeViewByName ( QString name ); + TQString name() {return m_name;} + void setName ( TQString name ) { m_name = name;} + bool tqcontains ( TQString ); + KbfxPlasmaCanvasGroupView * activeViewByName ( TQString name ); public slots: void raise ( uint id ); - void raiseByName ( QString name ); + void raiseByName ( TQString name ); private: int m_x; int m_y; @@ -81,7 +82,7 @@ class KbfxPlasmaCanvasStack:public QObject groupPtrList m_groupChain; Dict m_dict; DataDict m_dataDict; - QString m_name; + TQString m_name; //state variables }; diff --git a/src/kbfxplasmacanvasstackdata.h b/src/kbfxplasmacanvasstackdata.h index 1783b77..4cbbb4b 100644 --- a/src/kbfxplasmacanvasstackdata.h +++ b/src/kbfxplasmacanvasstackdata.h @@ -29,8 +29,8 @@ class KbfxPlasmaCanvasStackData public: KbfxPlasmaCanvasStackData() {} ~KbfxPlasmaCanvasStackData() {} - QString name; - QString icon; + TQString name; + TQString icon; int id; }; diff --git a/src/kbfxplasmacanvasview.cpp b/src/kbfxplasmacanvasview.cpp index 013458e..b1943db 100644 --- a/src/kbfxplasmacanvasview.cpp +++ b/src/kbfxplasmacanvasview.cpp @@ -21,16 +21,16 @@ #include "kbfxplasmacanvasview.h" -KbfxPlasmaCanvasView::KbfxPlasmaCanvasView ( QWidget * parent, +KbfxPlasmaCanvasView::KbfxPlasmaCanvasView ( TQWidget * tqparent, const char *name, WFlags fl ) : - QCanvasView ( parent, name,fl ) + TQCanvasView ( tqparent, name,fl ) { viewport ()->setMouseTracking ( TRUE ); viewport ()->setAcceptDrops ( true ); - this->setVScrollBarMode ( QScrollView::AlwaysOff ); - this->setHScrollBarMode ( QScrollView::AlwaysOff ); - setFrameShape ( QFrame::NoFrame ); + this->setVScrollBarMode ( TQScrollView::AlwaysOff ); + this->setHScrollBarMode ( TQScrollView::AlwaysOff ); + setFrameShape ( TQFrame::NoFrame ); m_currentItem = 0L; m_stack = 0; m_currentView = new KbfxPlasmaCanvasGroupView (); @@ -39,17 +39,17 @@ KbfxPlasmaCanvasView::KbfxPlasmaCanvasView ( QWidget * parent, m_exeCandidate = 0; m_findDone = true; m_selectedItem = 0L; - m_search = new QCanvas ( this->width (), this->height () ); + m_search = new TQCanvas ( this->width (), this->height () ); m_scrollbar_top = new KbfxSpinxScrollBar ( this ); m_scrollbar_bot = new KbfxSpinxScrollBar ( this,"bottom",1); m_scrollbar_top->setType ( KbfxSpinxScrollBar::UP ); m_scrollbar_bot->setType ( KbfxSpinxScrollBar::DOWN ); - connect ( m_scrollbar_top, SIGNAL ( scroll ( int, int ) ), this, - SLOT ( scrollBy ( int, int ) ) ); - connect ( m_scrollbar_bot, SIGNAL ( scroll ( int, int ) ), this, - SLOT ( scrollBy ( int, int ) ) ); + connect ( m_scrollbar_top, TQT_SIGNAL ( scroll ( int, int ) ), this, + TQT_SLOT ( scrollBy ( int, int ) ) ); + connect ( m_scrollbar_bot, TQT_SIGNAL ( scroll ( int, int ) ), this, + TQT_SLOT ( scrollBy ( int, int ) ) ); placeScrollBars (); } @@ -66,9 +66,9 @@ KbfxPlasmaCanvasView::~KbfxPlasmaCanvasView () } void -KbfxPlasmaCanvasView::keyPressEvent ( QKeyEvent * ke ) +KbfxPlasmaCanvasView::keyPressEvent ( TQKeyEvent * ke ) { - qDebug ( "QCanvasView got Key events" ); + qDebug ( "TQCanvasView got Key events" ); ke->ignore(); } @@ -89,9 +89,9 @@ KbfxPlasmaCanvasView::clearAllButOne ( KbfxPlasmaCanvasItem * i ) { i = i; - QCanvasItemList list = canvas ()->allItems (); + TQCanvasItemList list = canvas ()->allItems (); - QCanvasItemList::Iterator it = list.begin (); + TQCanvasItemList::Iterator it = list.begin (); for ( ; it != list.end (); ++it ) { if ( *it ) @@ -127,29 +127,29 @@ KbfxPlasmaCanvasView::execAt ( int i ) } void -KbfxPlasmaCanvasView::leaveEvent ( QEvent * e ) +KbfxPlasmaCanvasView::leaveEvent ( TQEvent * e ) { e = e; clearAllButOne ( m_currentItem ); } void -KbfxPlasmaCanvasView::enterEvent ( QEvent * e ) +KbfxPlasmaCanvasView::enterEvent ( TQEvent * e ) { e = e; clearAllButOne ( m_currentItem ); } void -KbfxPlasmaCanvasView::mouseMoveEvent ( QMouseEvent * me ) +KbfxPlasmaCanvasView::mouseMoveEvent ( TQMouseEvent * me ) { - QPoint p = inverseWorldMatrix ().map ( viewportToContents ( me->pos () ) ); + TQPoint p = inverseWorldMatrix ().map ( viewportToContents ( me->pos () ) ); if ( canvas () == NULL ) return; // KbfxPlasmaCanvasGroup *tmp = 0; - QCanvasItemList l = canvas ()->collisions ( p ); - for ( QCanvasItemList::Iterator it = l.begin (); it != l.end (); ++it ) + TQCanvasItemList l = canvas ()->collisions ( p ); + for ( TQCanvasItemList::Iterator it = l.begin (); it != l.end (); ++it ) { if ( *it == 0 ) return; @@ -169,25 +169,25 @@ KbfxPlasmaCanvasView::mouseMoveEvent ( QMouseEvent * me ) } void -KbfxPlasmaCanvasView::contentsMouseMoveEvent ( QMouseEvent * me ) +KbfxPlasmaCanvasView::contentsMouseMoveEvent ( TQMouseEvent * me ) { if ( canvas () == NULL ) return; - if ( me->state () & LeftButton ) + if ( me->state () & Qt::LeftButton ) { int distance = ( me->pos () - m_dragPos ).manhattanLength (); - if ( distance > QApplication::startDragDistance () ) + if ( distance > TQApplication::startDragDistance () ) this->startDrag (); } - QScrollView::contentsMouseMoveEvent ( me ); + TQScrollView::contentsMouseMoveEvent ( me ); - QCanvasItemList l = canvas ()->collisions ( me->pos () ); + TQCanvasItemList l = canvas ()->collisions ( me->pos () ); if ( l.count () <= 0 ) return; - for ( QCanvasItemList::Iterator it = l.begin (); it != l.end (); ++it ) + for ( TQCanvasItemList::Iterator it = l.begin (); it != l.end (); ++it ) { if ( *it == 0 ) return; @@ -201,7 +201,7 @@ KbfxPlasmaCanvasView::contentsMouseMoveEvent ( QMouseEvent * me ) } m_currentItem = t; t->setCurrent ( true ); - this->setCursor ( QCursor ( Qt::PointingHandCursor ) ); + this->setCursor ( TQCursor ( TQt::PointingHandCursor ) ); } } canvas ()->update (); @@ -209,11 +209,11 @@ KbfxPlasmaCanvasView::contentsMouseMoveEvent ( QMouseEvent * me ) void -KbfxPlasmaCanvasView::contentsMousePressEvent ( QMouseEvent * me ) +KbfxPlasmaCanvasView::contentsMousePressEvent ( TQMouseEvent * me ) { KbfxPlasmaCanvasGroup *tmp = 0; - QCanvasItemList l = canvas ()->collisions ( me->pos () ); - for ( QCanvasItemList::Iterator it = l.begin (); it != l.end (); ++it ) + TQCanvasItemList l = canvas ()->collisions ( me->pos () ); + for ( TQCanvasItemList::Iterator it = l.begin (); it != l.end (); ++it ) { if ( ( *it )->rtti () == CANVASITEM ) { @@ -227,9 +227,9 @@ KbfxPlasmaCanvasView::contentsMousePressEvent ( QMouseEvent * me ) tmp->shade (); m_clickPos = me->pos (); - if ( me->button () == LeftButton ) + if ( me->button () == Qt::LeftButton ) m_dragPos = me->pos (); - QScrollView::contentsMousePressEvent ( me ); + TQScrollView::contentsMousePressEvent ( me ); canvas ()->update (); } @@ -245,10 +245,10 @@ KbfxPlasmaCanvasView::startDrag () qDebug ( "null source" ); return; } - QUriDrag *drag = - new QUriDrag ( QStrList ( src->contentPath () ), this, + TQUriDrag *drag = + new TQUriDrag ( TQStrList ( src->contentPath () ), this, src->name ().ascii () ); - drag->setFileNames ( QStringList ( src->contentPath () ) ); + drag->setFileNames ( TQStringList ( src->contentPath () ) ); drag->setPixmap ( m_currentItem->dragPixmap () ); drag->drag (); emit clicked (); @@ -256,24 +256,24 @@ KbfxPlasmaCanvasView::startDrag () } void -KbfxPlasmaCanvasView::resizeEvent ( QResizeEvent * ) +KbfxPlasmaCanvasView::resizeEvent ( TQResizeEvent * ) { placeScrollBars (); } /* void -KbfxPlasmaCanvasView::enterEvent ( QEvent * e ) +KbfxPlasmaCanvasView::enterEvent ( TQEvent * e ) { e = e; if ( canvas () == 0 ) return; // KbfxPlasmaCanvasGroup *tmp = 0; - QPoint _mPos = QCursor::pos (); - QCanvasItemList l = canvas ()->collisions ( this->mapFromGlobal ( _mPos ) ); + TQPoint _mPos = TQCursor::pos (); + TQCanvasItemList l = canvas ()->collisions ( this->mapFromGlobal ( _mPos ) ); - for ( QCanvasItemList::Iterator it = l.begin (); it != l.end (); ++it ) + for ( TQCanvasItemList::Iterator it = l.begin (); it != l.end (); ++it ) { if ( *it == 0 ) break; @@ -301,9 +301,9 @@ KbfxPlasmaCanvasView::clearAll () if ( canvas() != m_search ) return ; - QCanvasItemList list = canvas ()->allItems (); + TQCanvasItemList list = canvas ()->allItems (); - QCanvasItemList::Iterator it = list.begin (); + TQCanvasItemList::Iterator it = list.begin (); for ( ; it != list.end (); ++it ) { if ( *it ) @@ -318,18 +318,18 @@ KbfxPlasmaCanvasView::clearAll () } void -KbfxPlasmaCanvasView::setKbfxCanvas ( QCanvas * cnv ) +KbfxPlasmaCanvasView::setKbfxCanvas ( TQCanvas * cnv ) { m_default = cnv; setCanvas ( m_default ); // canvas ()->setBackgroundPixmap ( ( *KbfxPlasmaPixmapProvider::pixmap ( "appviewbg" )) ); - QPixmap * pixmap = KbfxPlasmaPixmapProvider::pixmap ( "middleboxbg" ); + TQPixmap * pixmap = KbfxPlasmaPixmapProvider::pixmap ( "middleboxbg" ); if ( pixmap != NULL ) { - QImage img = pixmap->convertToImage(); - img = img.smoothScale ( this->width(),pixmap->height(),QImage::ScaleFree ); + TQImage img = pixmap->convertToImage(); + img = img.smoothScale ( this->width(),pixmap->height(),TQ_ScaleFree ); pixmap->convertFromImage ( img ); - this->canvas ()->setBackgroundPixmap ( *pixmap ); + this->canvas ()->tqsetBackgroundPixmap ( *pixmap ); } } @@ -347,7 +347,7 @@ KbfxPlasmaCanvasView::expandAll () void KbfxPlasmaCanvasView::handleLoadRequest ( KbfxSignal signal ) { - QString tm = signal.name (); + TQString tm = signal.name (); KbfxDataStack *_stack = m_dataStack[signal.name () ]; if ( _stack == 0 ) @@ -356,7 +356,7 @@ KbfxPlasmaCanvasView::handleLoadRequest ( KbfxSignal signal ) return; } - QString _activateGroup = _stack->getSubGroupName ( signal.id () ); + TQString _activateGroup = _stack->getSubGroupName ( signal.id () ); KbfxDataGroupList *_dataList = _stack->getStack ( _activateGroup ); KbfxPlasmaCanvasGroupView *gview = new KbfxPlasmaCanvasGroupView (); @@ -376,7 +376,7 @@ KbfxPlasmaCanvasView::handleLoadRequest ( KbfxSignal signal ) ( *it )->hide (); } - if ( m_appletMap[signal.name () ]->contains ( _activateGroup ) != true ) + if ( m_appletMap[signal.name () ]->tqcontains ( _activateGroup ) != true ) { loadGroup ( _dataList, gview ); m_currentView = gview; @@ -391,7 +391,7 @@ KbfxPlasmaCanvasView::handleLoadRequest ( KbfxSignal signal ) else canvas ()->resize ( v_stack->width (), this->visibleHeight () ); canvas()->update(); - repaint(); + tqrepaint(); // return; } else @@ -408,18 +408,18 @@ KbfxPlasmaCanvasView::handleLoadRequest ( KbfxSignal signal ) canvas ()->resize ( m_appletMap[signal.name () ]->width (), this->visibleHeight () ); canvas()->update(); - repaint(); + tqrepaint(); } } void -KbfxPlasmaCanvasView::contentsMouseReleaseEvent ( QMouseEvent * me ) +KbfxPlasmaCanvasView::contentsMouseReleaseEvent ( TQMouseEvent * me ) { // KbfxPlasmaCanvasGroup *tmp = 0; - QCanvasItemList l = canvas ()->collisions ( me->pos () ); - for ( QCanvasItemList::Iterator it = l.begin (); it != l.end (); ++it ) + TQCanvasItemList l = canvas ()->collisions ( me->pos () ); + for ( TQCanvasItemList::Iterator it = l.begin (); it != l.end (); ++it ) { if ( ( *it )->rtti () == CANVASITEM ) { @@ -445,7 +445,7 @@ KbfxPlasmaCanvasView::clearSearch () void -KbfxPlasmaCanvasView::search_R ( const QString name ) +KbfxPlasmaCanvasView::search_R ( const TQString name ) { gstack = new KbfxPlasmaCanvasStack (); KbfxPlasmaCanvasGroup *visualGroup = new KbfxPlasmaCanvasGroup (); @@ -457,16 +457,16 @@ KbfxPlasmaCanvasView::search_R ( const QString name ) this->setCanvas ( m_search ); - QPixmap * pixmap = KbfxPlasmaPixmapProvider::pixmap ( "middleboxbg" ); + TQPixmap * pixmap = KbfxPlasmaPixmapProvider::pixmap ( "middleboxbg" ); if ( pixmap != NULL ) { - QImage img = pixmap->convertToImage(); - img = img.smoothScale ( this->width(),pixmap->height(),QImage::ScaleFree ); + TQImage img = pixmap->convertToImage(); + img = img.smoothScale ( this->width(),pixmap->height(),TQ_ScaleFree ); pixmap->convertFromImage ( img ); - this->canvas ()->setBackgroundPixmap ( *pixmap ); + this->canvas ()->tqsetBackgroundPixmap ( *pixmap ); } - this->setCursor ( QCursor ( Qt::BusyCursor ) ); + this->setCursor ( TQCursor ( TQt::BusyCursor ) ); clearAll (); dataStack::Iterator sit; @@ -516,7 +516,7 @@ KbfxPlasmaCanvasView::search_R ( const QString name ) for ( it = dat.begin(); it != dat.end (); it++ ) { - qApp->processEvents (); + tqApp->processEvents (); boxwrapper = new KbfxPlasmaCanvasItemWrapper ( m_search ); box = ( KbfxPlasmaCanvasItem * ) boxwrapper-> @@ -541,12 +541,12 @@ KbfxPlasmaCanvasView::search_R ( const QString name ) m_scrollbar_bot->height () ); m_search->update (); - this->setCursor ( QCursor ( Qt::ArrowCursor ) ); + this->setCursor ( TQCursor ( TQt::ArrowCursor ) ); } void -KbfxPlasmaCanvasView::search ( const QString & str ) +KbfxPlasmaCanvasView::search ( const TQString & str ) { if ( str.isEmpty () ) return; @@ -560,9 +560,9 @@ KbfxPlasmaCanvasView::search ( const QString & str ) void -KbfxPlasmaCanvasView::addStack ( KbfxPlasmaCanvasStack * stak, QString name ) +KbfxPlasmaCanvasView::addStack ( KbfxPlasmaCanvasStack * stak, TQString name ) { - if ( m_appletMap.contains ( name ) ) + if ( m_appletMap.tqcontains ( name ) ) { return; } @@ -570,9 +570,9 @@ KbfxPlasmaCanvasView::addStack ( KbfxPlasmaCanvasStack * stak, QString name ) } void -KbfxPlasmaCanvasView::addStack ( KbfxDataStack * stak, QString name ) +KbfxPlasmaCanvasView::addStack ( KbfxDataStack * stak, TQString name ) { - if ( m_dataStack.contains ( name ) ) + if ( m_dataStack.tqcontains ( name ) ) { return; } @@ -592,7 +592,7 @@ KbfxPlasmaCanvasView::loadGroup ( KbfxDataGroupList * src, KbfxPlasmaCanvasItem *box = 0; KbfxPlasmaCanvasItemWrapper *boxwrapper = 0; KbfxPlasmaCanvasGroup *appGroup = 0; //new KbfxPlasmaCanvasGroup (); - QString l_lastAdd = ""; + TQString l_lastAdd = ""; for ( int i = 0; i < src->count (); i++ ) { if ( list.at ( i ) != 0 ) @@ -651,13 +651,13 @@ KbfxPlasmaCanvasView::loadGroup ( KbfxDataGroupList * src, void -KbfxPlasmaCanvasView::contentsDragLeaveEvent ( QDragEnterEvent * event ) +KbfxPlasmaCanvasView::contentsDragLeaveEvent ( TQDragEnterEvent * event ) { event->accept ( true ); } void -KbfxPlasmaCanvasView::contentsDragEnterEvent ( QDragEnterEvent * event ) +KbfxPlasmaCanvasView::contentsDragEnterEvent ( TQDragEnterEvent * event ) { event->accept ( true ); } diff --git a/src/kbfxplasmacanvasview.h b/src/kbfxplasmacanvasview.h index 80c8a99..4d7df00 100644 --- a/src/kbfxplasmacanvasview.h +++ b/src/kbfxplasmacanvasview.h @@ -22,10 +22,10 @@ #ifndef KBFX_PLASMA_CANVAS_VIEW_H #define KBFX_PLASMA_CANVAS_VIEW_H -#include -#include -#include -#include +#include +#include +#include +#include #include @@ -46,45 +46,46 @@ #include "kbfxspinxscrollbar.h" -class QCanvasView; +class TQCanvasView; -class KbfxPlasmaCanvasView : public QCanvasView +class KbfxPlasmaCanvasView : public TQCanvasView { Q_OBJECT + TQ_OBJECT public: - typedef QMap stackMap; - typedef QMap dataStack; - typedef QMap searchMap; + typedef TQMap stackMap; + typedef TQMap dataStack; + typedef TQMap searchMap; - KbfxPlasmaCanvasView ( QWidget * parent = 0, const char * name = 0, WFlags f = 0 ); + KbfxPlasmaCanvasView ( TQWidget * tqparent = 0, const char * name = 0, WFlags f = 0 ); virtual ~KbfxPlasmaCanvasView(); - void addStack ( KbfxPlasmaCanvasStack*stk,QString name ); - void addStack ( KbfxDataStack*stk,QString name ); + void addStack ( KbfxPlasmaCanvasStack*stk,TQString name ); + void addStack ( KbfxDataStack*stk,TQString name ); - void setKbfxCanvas ( QCanvas*cnv ); + void setKbfxCanvas ( TQCanvas*cnv ); void loadGroup ( KbfxDataGroupList * src,KbfxPlasmaCanvasGroupView * dest ); - void contentsDragLeaveEvent ( QDragEnterEvent *event ); - void contentsDragEnterEvent ( QDragEnterEvent *event ); + void contentsDragLeaveEvent ( TQDragEnterEvent *event ); + void contentsDragEnterEvent ( TQDragEnterEvent *event ); public slots: void clearAll(); - virtual void contentsMousePressEvent ( QMouseEvent * me ); - virtual void contentsMouseMoveEvent ( QMouseEvent * e ); - virtual void contentsMouseReleaseEvent ( QMouseEvent * e ); - virtual void mouseMoveEvent ( QMouseEvent * me ); - virtual void enterEvent ( QEvent * e ); - virtual void keyPressEvent ( QKeyEvent * ke ); - virtual void emulatedKeyPress ( QKeyEvent * k ) {keyPressEvent ( k );} - virtual void resizeEvent ( QResizeEvent * ) ; - virtual void leaveEvent ( QEvent * e ); -// virtual void leaveEvent(QEvent e ); + virtual void contentsMousePressEvent ( TQMouseEvent * me ); + virtual void contentsMouseMoveEvent ( TQMouseEvent * e ); + virtual void contentsMouseReleaseEvent ( TQMouseEvent * e ); + virtual void mouseMoveEvent ( TQMouseEvent * me ); + virtual void enterEvent ( TQEvent * e ); + virtual void keyPressEvent ( TQKeyEvent * ke ); + virtual void emulatedKeyPress ( TQKeyEvent * k ) {keyPressEvent ( k );} + virtual void resizeEvent ( TQResizeEvent * ) ; + virtual void leaveEvent ( TQEvent * e ); +// virtual void leaveEvent(TQEvent e ); void handleLoadRequest ( KbfxSignal ); - void search ( const QString & ); - void search_R ( const QString key ); + void search ( const TQString & ); + void search_R ( const TQString key ); void execFirst(); void execAt ( int i ); void expandAll(); @@ -99,24 +100,24 @@ class KbfxPlasmaCanvasView : public QCanvasView void startDrag(); void placeScrollBars(); - QPoint m_clickPos; + TQPoint m_clickPos; KbfxPlasmaCanvasItem * m_currentItem; KbfxPlasmaCanvasStack * m_currentStack; KbfxPlasmaCanvasStack * m_stack; - QString m_lastSignalData; + TQString m_lastSignalData; stackMap m_appletMap; dataStack m_dataStack; searchMap m_searchMap; KbfxPlasmaCanvasStack * gstack ; KbfxPlasmaCanvasItem * m_exeCandidate; - QCanvas * m_default; - QCanvas * m_search; + TQCanvas * m_default; + TQCanvas * m_search; bool m_findDone; KbfxSpinxScrollBar * m_scrollbar_top; KbfxSpinxScrollBar * m_scrollbar_bot; - QPoint m_dragPos; + TQPoint m_dragPos; KbfxPlasmaCanvasGroupView * m_currentView; - QString m_currentViewName; + TQString m_currentViewName; KbfxPlasmaCanvasItem * m_selectedItem; }; diff --git a/src/kbfxplasmaindexitem.cpp b/src/kbfxplasmaindexitem.cpp index cbbfe91..3c08d3c 100644 --- a/src/kbfxplasmaindexitem.cpp +++ b/src/kbfxplasmaindexitem.cpp @@ -24,13 +24,13 @@ #include #include -KbfxPlasmaIndexItem::KbfxPlasmaIndexItem ( QCanvasPixmapArray * a, QCanvas * canvas ) :KbfxPlasmaCanvasAbstractItem ( a,canvas ) +KbfxPlasmaIndexItem::KbfxPlasmaIndexItem ( TQCanvasPixmapArray * a, TQCanvas * canvas ) :KbfxPlasmaCanvasAbstractItem ( a,canvas ) { //this->setItemMode (1); setAnimated ( false ); setCurrent ( false ); m_isSelected = false; - QPixmap * _img = this->image ( 0 ); + TQPixmap * _img = this->image ( 0 ); m_height =_img->height(); m_width= _img->width(); @@ -42,7 +42,7 @@ KbfxPlasmaIndexItem::~KbfxPlasmaIndexItem() {} void -KbfxPlasmaIndexItem::setIcon ( QString str ) +KbfxPlasmaIndexItem::setIcon ( TQString str ) { KIconLoader *iconload = KGlobal::iconLoader (); m_iconPath = iconload->iconPath ( str, KIcon::Desktop, false ); @@ -51,7 +51,7 @@ KbfxPlasmaIndexItem::setIcon ( QString str ) } void -KbfxPlasmaIndexItem::setText ( QString text ) +KbfxPlasmaIndexItem::setText ( TQString text ) { m_text = text; } @@ -71,7 +71,7 @@ KbfxPlasmaIndexItem::selected() void -KbfxPlasmaIndexItem::drawContent ( QPainter * pe ) +KbfxPlasmaIndexItem::drawContent ( TQPainter * pe ) { if ( this->isCurrent() || m_isSelected ) @@ -83,17 +83,17 @@ KbfxPlasmaIndexItem::drawContent ( QPainter * pe ) this->setFrame ( 0 ); } - QCanvasPixmap *cp = this->image ( this->frame () ); + TQCanvasPixmap *cp = this->image ( this->frame () ); m_height = cp->height(); m_width = cp->width(); pe->drawPixmap ( this->boundingRect (), *cp ); - QRect r ( ( int ) x(), ( int ) y(), m_width, m_height ); - QRect textRect ( m_height+1, ( int ) y(), m_width,m_height ); + TQRect r ( ( int ) x(), ( int ) y(), m_width, m_height ); + TQRect textRect ( m_height+1, ( int ) y(), m_width,m_height ); - QFont * _font_plugin = new QFont ( ConfigInit().m_pluginNameFont ); - QFont * _font_index = new QFont ( ConfigInit().m_fontIndexFont ); + TQFont * _font_plugin = new TQFont ( ConfigInit().m_pluginNameFont ); + TQFont * _font_index = new TQFont ( ConfigInit().m_fontIndexFont ); if ( this->type() != KbfxPlasmaIndexItem::SEPARATOR ) { @@ -106,8 +106,8 @@ KbfxPlasmaIndexItem::drawContent ( QPainter * pe ) pe->setPen ( ConfigInit().m_pluginNameColor); } - pe->drawText ( textRect, Qt::AlignVCenter | Qt::AlignLeft ,QString ( m_text ), -1, &r,0 ); - pe->drawPixmap ( QRect ( ( int ) x() +5 , ( int ) y() +6,m_height-12,m_height-12 ),m_icon ); + pe->drawText ( textRect, TQt::AlignVCenter | TQt::AlignLeft ,TQString ( m_text ), -1, &r ); + pe->drawPixmap ( TQRect ( ( int ) x() +5 , ( int ) y() +6,m_height-12,m_height-12 ),m_icon ); delete _font_plugin; delete _font_index; @@ -128,17 +128,17 @@ KbfxPlasmaIndexItem::setId ( int id ) void -KbfxPlasmaIndexItem::draw ( QPainter & p ) +KbfxPlasmaIndexItem::draw ( TQPainter & p ) { drawContent ( &p ); } void -KbfxPlasmaIndexItem::setLabelText ( QString str ) +KbfxPlasmaIndexItem::setLabelText ( TQString str ) { - QFont * _font = new QFont(ConfigInit().m_fontIndexFont); + TQFont * _font = new TQFont(ConfigInit().m_fontIndexFont); - QFontMetrics fm ( *_font ); + TQFontMetrics fm ( *_font ); int _commentWidth = fm.width ( str+"..." ); int _strLen = str.length(); @@ -160,7 +160,7 @@ KbfxPlasmaIndexItem::setLabelText ( QString str ) } -QString +TQString KbfxPlasmaIndexItem::belongsTo() { @@ -168,13 +168,13 @@ KbfxPlasmaIndexItem::belongsTo() } void -KbfxPlasmaIndexItem::setBelongsTo ( QString parent ) +KbfxPlasmaIndexItem::setBelongsTo ( TQString tqparent ) { - m_parent = parent; + m_parent = tqparent; } -void KbfxPlasmaIndexItem::mousePressEvent ( QMouseEvent * e ) +void KbfxPlasmaIndexItem::mousePressEvent ( TQMouseEvent * e ) { e = e; } diff --git a/src/kbfxplasmaindexitem.h b/src/kbfxplasmaindexitem.h index 9b68da8..cd58f81 100644 --- a/src/kbfxplasmaindexitem.h +++ b/src/kbfxplasmaindexitem.h @@ -27,35 +27,36 @@ class KbfxPlasmaIndexItem : public KbfxPlasmaCanvasAbstractItem { Q_OBJECT + TQ_OBJECT public: - KbfxPlasmaIndexItem ( QCanvasPixmapArray * a, QCanvas * canvas ); + KbfxPlasmaIndexItem ( TQCanvasPixmapArray * a, TQCanvas * canvas ); virtual ~KbfxPlasmaIndexItem(); - void setIcon ( QString path ); - void setText ( QString text ); + void setIcon ( TQString path ); + void setText ( TQString text ); void setId ( int id ); - //void setName(QString name); - void setLabelText ( QString text ); - void setBelongsTo ( QString parent ); - QString belongsTo(); + //void setName(TQString name); + void setLabelText ( TQString text ); + void setBelongsTo ( TQString tqparent ); + TQString belongsTo(); int height(); void setSelected ( bool select ); bool selected(); int Id() { return m_id;} - virtual void drawContent ( QPainter * pe ); - virtual void draw ( QPainter & pe ); - virtual void mousePressEvent ( QMouseEvent * e ); + virtual void drawContent ( TQPainter * pe ); + virtual void draw ( TQPainter & pe ); + virtual void mousePressEvent ( TQMouseEvent * e ); private: int m_id; - QString m_name; - QString m_text; - QString m_iconPath; - QPixmap m_icon; - QString m_parent; + TQString m_name; + TQString m_text; + TQString m_iconPath; + TQPixmap m_icon; + TQString m_parent; bool m_isCurrent; int m_height; int m_width; diff --git a/src/kbfxplasmaindexview.cpp b/src/kbfxplasmaindexview.cpp index ee50c9e..d7e80e1 100644 --- a/src/kbfxplasmaindexview.cpp +++ b/src/kbfxplasmaindexview.cpp @@ -21,9 +21,9 @@ #include "kbfxplasmaindexview.h" -KbfxPlasmaIndexView::KbfxPlasmaIndexView ( QWidget * parent, const char *name, +KbfxPlasmaIndexView::KbfxPlasmaIndexView ( TQWidget * tqparent, const char *name, WFlags l ) : - QCanvasView ( parent, name, l ) + TQCanvasView ( tqparent, name, l ) { m_itemGroup = new KbfxPlasmaCanvasGroup (); m_itemGroupList = new KbfxPlasmaCanvasGroupView (); @@ -32,19 +32,19 @@ KbfxPlasmaIndexView::KbfxPlasmaIndexView ( QWidget * parent, const char *name, m_itemStack->addGroup ( m_itemGroupList ); viewport ()->setMouseTracking ( TRUE ); - m_currentPos = QPoint ( 0, 0 ); - m_mousePollTimer = new QTimer ( this ); + m_currentPos = TQPoint ( 0, 0 ); + m_mousePollTimer = new TQTimer ( this ); m_pluginList = KbfxPlasmaPluginLoader::scanPlugins (); viewport ()->setAcceptDrops ( true ); - this->setVScrollBarMode ( QScrollView::AlwaysOff ); - this->setHScrollBarMode ( QScrollView::AlwaysOff ); - setFrameShape ( QFrame::NoFrame ); + this->setVScrollBarMode ( TQScrollView::AlwaysOff ); + this->setHScrollBarMode ( TQScrollView::AlwaysOff ); + setFrameShape ( TQFrame::NoFrame ); m_currentItem = 0L; m_selectedItem = 0L; // m_pluginList = ""; - connect ( this, SIGNAL ( clicked ( KbfxPlasmaIndexItem * ) ), this, - SLOT ( slotClicked ( KbfxPlasmaIndexItem * ) ) ); + connect ( this, TQT_SIGNAL ( clicked ( KbfxPlasmaIndexItem * ) ), this, + TQT_SLOT ( slotClicked ( KbfxPlasmaIndexItem * ) ) ); m_currentView = 0; setDragAutoScroll ( true ); } @@ -58,16 +58,16 @@ void KbfxPlasmaIndexView::checkMousePos () { KbfxPlasmaCanvasGroup *tmp = 0; - if ( QCursor::pos () == mapToGlobal ( contentsToViewport ( m_currentPos ) ) ) + if ( TQCursor::pos () == mapToGlobal ( contentsToViewport ( m_currentPos ) ) ) { - QMouseEvent me ( QEvent::MouseButtonPress, + TQMouseEvent me ( TQEvent::MouseButtonPress, this->mapToGlobal ( m_currentPos ), Qt::LeftButton, Qt::LeftButton ); clearAll (); - QCanvasItemList l = canvas ()->collisions ( m_currentPos ); - for ( QCanvasItemList::Iterator it = l.begin (); it != l.end (); ++it ) + TQCanvasItemList l = canvas ()->collisions ( m_currentPos ); + for ( TQCanvasItemList::Iterator it = l.begin (); it != l.end (); ++it ) { if ( ( *it )->rtti () == CANVASITEM ) { @@ -107,9 +107,9 @@ KbfxPlasmaIndexView::clearAllButOne ( KbfxPlasmaIndexItem * i ) { i = i; - QCanvasItemList list = canvas ()->allItems (); + TQCanvasItemList list = canvas ()->allItems (); - QCanvasItemList::Iterator it = list.begin (); + TQCanvasItemList::Iterator it = list.begin (); for ( ; it != list.end (); ++it ) { if ( *it ) @@ -127,9 +127,9 @@ KbfxPlasmaIndexView::clearAllButOne ( KbfxPlasmaIndexItem * i ) void KbfxPlasmaIndexView::clearSelection () { - QCanvasItemList list = canvas ()->allItems (); + TQCanvasItemList list = canvas ()->allItems (); - QCanvasItemList::Iterator it = list.begin (); + TQCanvasItemList::Iterator it = list.begin (); for ( ; it != list.end (); ++it ) { if ( *it ) @@ -143,7 +143,7 @@ KbfxPlasmaIndexView::clearSelection () } void -KbfxPlasmaIndexView::leaveEvent ( QEvent * e ) +KbfxPlasmaIndexView::leaveEvent ( TQEvent * e ) { e = e; clearAllButOne ( m_currentItem ); @@ -162,18 +162,18 @@ KbfxPlasmaIndexView::contextMenuSlot ( int id ) } void -KbfxPlasmaIndexView::contentsContextMenuEvent ( QContextMenuEvent * event ) +KbfxPlasmaIndexView::contentsContextMenuEvent ( TQContextMenuEvent * event ) { event = event; /* m_pluginMenu = new KPopupMenu ( this );; - connect ( m_pluginMenu, SIGNAL ( activated ( int ) ), this, - SLOT ( contextMenuSlot ( int ) ) ); + connect ( m_pluginMenu, TQT_SIGNAL ( activated ( int ) ), this, + TQT_SLOT ( contextMenuSlot ( int ) ) ); m_pluginMenu->insertTitle ( "Insert Plugin", 0, 0 ); int _index = 1; - for ( QStringList::Iterator it = m_pluginList.begin (); + for ( TQStringList::Iterator it = m_pluginList.begin (); it != m_pluginList.end (); ++it ) { @@ -246,7 +246,7 @@ KbfxPlasmaIndexView::loadList ( KbfxDataStack * stkPtr ) m_itemStack->raise ( 0 ); - for ( QStringList::Iterator it = m_pluginList.begin (); + for ( TQStringList::Iterator it = m_pluginList.begin (); it != m_pluginList.end (); ++it ) { if ( *it == stkPtr->name() ) @@ -258,20 +258,20 @@ KbfxPlasmaIndexView::loadList ( KbfxDataStack * stkPtr ) } void -KbfxPlasmaIndexView::setKbfxCanvas ( QCanvas * cnv ) +KbfxPlasmaIndexView::setKbfxCanvas ( TQCanvas * cnv ) { setCanvas ( cnv ); - canvas ()->setBackgroundPixmap ( ( *KbfxPlasmaPixmapProvider::pixmap ( "listboxbg" )) ); + canvas ()->tqsetBackgroundPixmap ( ( *KbfxPlasmaPixmapProvider::pixmap ( "listboxbg" )) ); canvas ()->update (); } void -KbfxPlasmaIndexView::loadPlugin ( QString name, KbfxPlasmaCanvasView * view ) +KbfxPlasmaIndexView::loadPlugin ( TQString name, KbfxPlasmaCanvasView * view ) { - if ( m_pluginList.contains ( name ) <= 0 ) + if ( m_pluginList.tqcontains ( name ) <= 0 ) { KbfxPlasmaPluginLoader *m_loader = new KbfxPlasmaPluginLoader (); KbfxDataStack *m_stack_R = m_loader->getView ( name ); @@ -298,7 +298,7 @@ KbfxPlasmaIndexView::loadPlugin ( QString name, KbfxPlasmaCanvasView * view ) void -KbfxPlasmaIndexView::mouseMoveEvent ( QMouseEvent * me ) +KbfxPlasmaIndexView::mouseMoveEvent ( TQMouseEvent * me ) { me = me; } @@ -306,7 +306,7 @@ KbfxPlasmaIndexView::mouseMoveEvent ( QMouseEvent * me ) void -KbfxPlasmaIndexView::contentsMouseMoveEvent ( QMouseEvent * me ) +KbfxPlasmaIndexView::contentsMouseMoveEvent ( TQMouseEvent * me ) { if ( canvas () == NULL ) return; @@ -315,9 +315,9 @@ KbfxPlasmaIndexView::contentsMouseMoveEvent ( QMouseEvent * me ) // TODO: Get wait time from config - this->setCursor ( QCursor ( Qt::PointingHandCursor ) ); + this->setCursor ( TQCursor ( TQt::PointingHandCursor ) ); - QTimer::singleShot ( 800, this, SLOT ( checkMousePos () ) ); + TQTimer::singleShot ( 800, this, TQT_SLOT ( checkMousePos () ) ); if ( contentsToViewport ( me->pos () ).y () < this->height () / 5 ) { @@ -328,16 +328,16 @@ KbfxPlasmaIndexView::contentsMouseMoveEvent ( QMouseEvent * me ) scrollBy ( 10, 10 ); } - QScrollView::contentsMouseMoveEvent ( me ); + TQScrollView::contentsMouseMoveEvent ( me ); // KbfxPlasmaCanvasGroup *tmp = 0; - QCanvasItemList l = canvas ()->collisions ( me->pos () ); + TQCanvasItemList l = canvas ()->collisions ( me->pos () ); if ( l.count () <= 0 ) return; - for ( QCanvasItemList::Iterator it = l.begin (); it != l.end (); ++it ) + for ( TQCanvasItemList::Iterator it = l.begin (); it != l.end (); ++it ) { if ( *it == 0 ) return; @@ -358,18 +358,18 @@ KbfxPlasmaIndexView::contentsMouseMoveEvent ( QMouseEvent * me ) } void -KbfxPlasmaIndexView::contentsMousePressEvent ( QMouseEvent * me ) +KbfxPlasmaIndexView::contentsMousePressEvent ( TQMouseEvent * me ) { - if ( me->button () == RightButton ) + if ( me->button () == Qt::RightButton ) return; clearAll (); - this->setCursor ( QCursor ( Qt::WaitCursor ) ); + this->setCursor ( TQCursor ( TQt::WaitCursor ) ); KbfxPlasmaCanvasGroup *tmp = 0; - QCanvasItemList l = canvas ()->collisions ( me->pos () ); - for ( QCanvasItemList::Iterator it = l.begin (); it != l.end (); ++it ) + TQCanvasItemList l = canvas ()->collisions ( me->pos () ); + for ( TQCanvasItemList::Iterator it = l.begin (); it != l.end (); ++it ) { if ( ( *it )->rtti () == CANVASITEM ) { @@ -393,10 +393,10 @@ KbfxPlasmaIndexView::contentsMousePressEvent ( QMouseEvent * me ) // m_clickPos = me->pos (); - QScrollView::contentsMousePressEvent ( me ); + TQScrollView::contentsMousePressEvent ( me ); canvas ()->update (); - this->setCursor ( QCursor ( Qt::PointingHandCursor ) ); + this->setCursor ( TQCursor ( TQt::PointingHandCursor ) ); } void @@ -409,17 +409,17 @@ KbfxPlasmaIndexView::slotClicked ( KbfxPlasmaIndexItem * it ) KbfxSignal signal ( _it->belongsTo (), _it->Id () ); - this->setCursor ( QCursor ( Qt::WaitCursor ) ); + this->setCursor ( TQCursor ( TQt::WaitCursor ) ); emit loadRequest ( signal ); - this->setCursor ( QCursor ( Qt::PointingHandCursor ) ); + this->setCursor ( TQCursor ( TQt::PointingHandCursor ) ); } void KbfxPlasmaIndexView::clearAll () { - QCanvasItemList list = canvas ()->allItems (); + TQCanvasItemList list = canvas ()->allItems (); - QCanvasItemList::Iterator it = list.begin (); + TQCanvasItemList::Iterator it = list.begin (); for ( ; it != list.end (); ++it ) { if ( *it ) diff --git a/src/kbfxplasmaindexview.h b/src/kbfxplasmaindexview.h index ebda368..59e44bf 100644 --- a/src/kbfxplasmaindexview.h +++ b/src/kbfxplasmaindexview.h @@ -22,7 +22,7 @@ #ifndef KBFX_PLASMA_INDEX_VIEW_H #define KBFX_PLASMA_INDEX_VIEW_H -#include +#include #include #include @@ -39,36 +39,37 @@ -class KbfxPlasmaIndexView : public QCanvasView +class KbfxPlasmaIndexView : public TQCanvasView { Q_OBJECT + TQ_OBJECT public: - KbfxPlasmaIndexView ( QWidget * parent = 0, const char * name = 0, WFlags l = 0 ); + KbfxPlasmaIndexView ( TQWidget * tqparent = 0, const char * name = 0, WFlags l = 0 ); virtual ~KbfxPlasmaIndexView(); void loadList ( KbfxDataStack * stkPtr ); int count() { return m_itemGroup->count() ; } void setView ( KbfxPlasmaCanvasView * view ); - virtual void contentsMouseMoveEvent ( QMouseEvent * e ); - virtual void contentsMousePressEvent ( QMouseEvent * me ); - virtual void contentsContextMenuEvent ( QContextMenuEvent * e ) ; - virtual void mouseMoveEvent ( QMouseEvent * e ); - virtual void leaveEvent ( QEvent * e ); - void setKbfxCanvas ( QCanvas * cnv ); + virtual void contentsMouseMoveEvent ( TQMouseEvent * e ); + virtual void contentsMousePressEvent ( TQMouseEvent * me ); + virtual void contentsContextMenuEvent ( TQContextMenuEvent * e ) ; + virtual void mouseMoveEvent ( TQMouseEvent * e ); + virtual void leaveEvent ( TQEvent * e ); + void setKbfxCanvas ( TQCanvas * cnv ); void clearAll(); public slots: void slotClicked ( KbfxPlasmaIndexItem * ); void contextMenuSlot ( int id ); - void loadPlugin ( QString name,KbfxPlasmaCanvasView * ); + void loadPlugin ( TQString name,KbfxPlasmaCanvasView * ); void checkMousePos(); void clearSelection(); signals: void loadRequest ( KbfxSignal signal ); - void pluginRequest ( QString pluginName,KbfxPlasmaCanvasView * ); + void pluginRequest ( TQString pluginName,KbfxPlasmaCanvasView * ); void clicked ( KbfxPlasmaIndexItem * item ); void expand(); void clearSelected(); @@ -83,12 +84,12 @@ class KbfxPlasmaIndexView : public QCanvasView KbfxPlasmaCanvasStack * m_itemStack; KbfxPlasmaIndexItem * m_currentItem; KbfxPlasmaIndexItem * m_selectedItem; - QStringList m_pluginList; - QStringList m_pluginLoaded; + TQStringList m_pluginList; + TQStringList m_pluginLoaded; KPopupMenu * m_pluginMenu; KbfxPlasmaCanvasView * m_currentView; - QPoint m_currentPos; - QTimer * m_mousePollTimer; + TQPoint m_currentPos; + TQTimer * m_mousePollTimer; }; #endif diff --git a/src/kbfxsignal.h b/src/kbfxsignal.h index 6f2dfd0..3931959 100644 --- a/src/kbfxsignal.h +++ b/src/kbfxsignal.h @@ -26,12 +26,12 @@ class KbfxSignal { public: KbfxSignal() {m_name="";} - KbfxSignal ( QString name,uint id ) { m_name = name;m_id = id;} + KbfxSignal ( TQString name,uint id ) { m_name = name;m_id = id;} ~KbfxSignal() {} - QString name() {return m_name;} + TQString name() {return m_name;} uint id() {return m_id;} private: - QString m_name; + TQString m_name; uint m_id; }; diff --git a/src/kbfxspinx.cpp b/src/kbfxspinx.cpp index 4208b21..af0e65f 100644 --- a/src/kbfxspinx.cpp +++ b/src/kbfxspinx.cpp @@ -25,10 +25,10 @@ bool KbfxSpinx::m_horizontal_position = TRUE; -KbfxSpinx::KbfxSpinx ( const QString& configFile, Type type, int actions, QWidget *parent, const char *name ) - : KPanelApplet ( configFile, type, actions, parent, name ),DCOPObject ( "KBFXInterface" ) +KbfxSpinx::KbfxSpinx ( const TQString& configFile, Type type, int actions, TQWidget *tqparent, const char *name ) + : KPanelApplet ( configFile, type, actions, tqparent, name ),DCOPObject ( "KBFXInterface" ) { - m_parent = parent; + m_parent = tqparent; createKbfx(); } @@ -36,9 +36,9 @@ KbfxSpinx::~KbfxSpinx() { } -void KbfxSpinx::dirtyReaload(const QString & dir) +void KbfxSpinx::dirtyReaload(const TQString & dir) { - QString _dir=dir; + TQString _dir=dir; notifyConfigChange(); } @@ -55,19 +55,19 @@ void KbfxSpinx::createKbfx() if ( ConfigInit ().m_KbfxMenuType == "kmenu" ) { kbfxBtn->show(); - kbfxBtn->repaint(); + kbfxBtn->tqrepaint(); } else { createRMenu(); - connect ( m_menu,SIGNAL ( aboutToHide () ),kbfxBtn,SLOT ( toggle() ) ); + connect ( m_menu,TQT_SIGNAL ( aboutToHide () ),kbfxBtn,TQT_SLOT ( toggle() ) ); } - kmenu_timer = new QTimer ( this,"Fade Timer" ); - connect ( kmenu_timer, SIGNAL ( timeout() ), kbfxBtn, SLOT ( toggleKMenu () ) ); + kmenu_timer = new TQTimer ( this,"Fade Timer" ); + connect ( kmenu_timer, TQT_SIGNAL ( timeout() ), kbfxBtn, TQT_SLOT ( toggleKMenu () ) ); - connect ( kbfxBtn , SIGNAL ( pressed() ),this,SLOT ( showKbfxMenu() ) ); - connect ( kbfxBtn , SIGNAL ( showToolTip() ),this,SLOT ( ToolTip() ) ); + connect ( kbfxBtn , TQT_SIGNAL ( pressed() ),this,TQT_SLOT ( showKbfxMenu() ) ); + connect ( kbfxBtn , TQT_SIGNAL ( showToolTip() ),this,TQT_SLOT ( ToolTip() ) ); if ( m_kicker_auto_adjust ) m_parent->resize ( m_parent->width(),kbfxBtn->height() ); @@ -75,15 +75,15 @@ void KbfxSpinx::createKbfx() if (m_KbfxWatcher) { - l_watch = new KDirWatch(this,"SyscocaWatch"); + l_watch = new KDirWatch(TQT_TQOBJECT(this),"SyscocaWatch"); KUser * l_user = new KUser(); - QString l_path("/var/tmp/kdecache-"); + TQString l_path("/var/tmp/kdecache-"); l_path.append(l_user->loginName()); l_path.append("/"); l_watch->addDir(l_path); l_watch->startScan( TRUE, FALSE); - connect ( l_watch, SIGNAL ( dirty(const QString&) ), - this, SLOT ( dirtyReaload(const QString&) ) ); + connect ( l_watch, TQT_SIGNAL ( dirty(const TQString&) ), + this, TQT_SLOT ( dirtyReaload(const TQString&) ) ); delete l_user; } } @@ -95,7 +95,7 @@ void KbfxSpinx::notifyConfigChange() /* FIXME The delete here does not reload everything. - Only the button and the parent menu. + Only the button and the tqparent menu. Carefull memory de-allocation is needed before deleteing further :-( Else be ready for a nice backtrace. Memleak is obvious. @@ -128,7 +128,7 @@ void KbfxSpinx::createRMenu() m_menuWidget = new KbfxSpinxMenuWidget ( m_menu,"KbfxSpinxMenu" ); m_menu->addItem ( m_menuWidget,0 ); kbfxBtn->show(); - kbfxBtn->repaint(); + kbfxBtn->tqrepaint(); menuPosition(); } @@ -151,7 +151,7 @@ void KbfxSpinx::ToolTip () KbfxToolTip *tooltip = new KbfxToolTip (); - QPoint xpoint = ( this->mapToGlobal ( QPoint ( 0, 0 ) ) ); + TQPoint xpoint = ( this->mapToGlobal ( TQPoint ( 0, 0 ) ) ); int popx = xpoint.x (); int popy = xpoint.y (); @@ -172,8 +172,8 @@ void KbfxSpinx::ToolTip () popx -= tooltip->width(); } - connect ( kbfxBtn, SIGNAL ( leave () ), tooltip, SLOT ( hideToolTip () ) ); - connect ( kbfxBtn, SIGNAL ( clicked () ), tooltip, SLOT ( hideToolTip () ) ); + connect ( kbfxBtn, TQT_SIGNAL ( leave () ), tooltip, TQT_SLOT ( hideToolTip () ) ); + connect ( kbfxBtn, TQT_SIGNAL ( clicked () ), tooltip, TQT_SLOT ( hideToolTip () ) ); tooltip->setStartPos ( popx, popy ); tooltip->show (); } @@ -186,40 +186,40 @@ void KbfxSpinx::showKmenu() height of the K-menu **/ - this->setCursor ( Qt::BlankCursor ); + this->setCursor ( TQt::BlankCursor ); - QByteArray data, rdata; - QDataStream arg ( data, IO_WriteOnly ); - QCString replytype; - QPoint _tmp ( QCursor::pos () ); + TQByteArray data, rdata; + TQDataStream arg ( data, IO_WriteOnly ); + TQCString replytype; + TQPoint _tmp ( TQCursor::pos () ); if ( position () == pTop || position () == pBottom ) { if ( _tmp.y () > 128 ) { - QCursor::setPos ( this->mapToGlobal ( QPoint ( 0, 0 ) ) ); + TQCursor::setPos ( this->mapToGlobal ( TQPoint ( 0, 0 ) ) ); } else { - QCursor::setPos ( this->mapToGlobal ( this->geometry ().bottomLeft () ) ); + TQCursor::setPos ( this->mapToGlobal ( this->tqgeometry ().bottomLeft () ) ); } } else { if ( _tmp.x () > 128 ) { - QCursor::setPos ( this->mapToGlobal ( QPoint ( 0, 0 ) ) ); + TQCursor::setPos ( this->mapToGlobal ( TQPoint ( 0, 0 ) ) ); } else { - QCursor::setPos ( this->mapToGlobal ( this->geometry ().topRight () ) ); + TQCursor::setPos ( this->mapToGlobal ( this->tqgeometry ().topRight () ) ); } } - arg << QPoint ( QCursor::pos () ); + arg << TQPoint ( TQCursor::pos () ); if ( !m_dcopClient-> - call ( "kicker", "kicker", "popupKMenu(QPoint)", data, replytype, rdata, + call ( "kicker", "kicker", "popupKMenu(TQPoint)", data, replytype, rdata, FALSE, -1 ) ) { kdWarning () @@ -227,8 +227,8 @@ void KbfxSpinx::showKmenu() << endl; } - this->setCursor ( Qt::ArrowCursor ); - QCursor::setPos ( _tmp ); + this->setCursor ( TQt::ArrowCursor ); + TQCursor::setPos ( _tmp ); if ( !kmenu_timer->isActive ()) kmenu_timer->start(5000,true); kdDebug () << "Kmenu Called" << endl; @@ -287,27 +287,27 @@ int KbfxSpinx::heightForWidth ( int width ) const return kbfxBtn->height(); } -QPoint KbfxSpinx::menuPosition() +TQPoint KbfxSpinx::menuPosition() { - QPoint xpoint = ( this->mapToGlobal ( QPoint ( 0, 0 ) ) ); + TQPoint xpoint = ( this->mapToGlobal ( TQPoint ( 0, 0 ) ) ); int popx = xpoint.x (); int popy = xpoint.y (); if ( position () == pTop ) { - return QPoint ( popx, ( popy + this->height() ) ); + return TQPoint ( popx, ( popy + this->height() ) ); } if ( position () == pBottom ) { - return QPoint ( popx, ( popy - m_menuWidget->height() ) ); + return TQPoint ( popx, ( popy - m_menuWidget->height() ) ); } if ( position () == pLeft ) { - return QPoint ( ( popx + this->width() ), popy ); + return TQPoint ( ( popx + this->width() ), popy ); } if ( position () == pRight ) { - return QPoint ( ( popx - m_menuWidget->width() ), popy ); + return TQPoint ( ( popx - m_menuWidget->width() ), popy ); } return xpoint; // Should never be reached? @@ -315,12 +315,12 @@ QPoint KbfxSpinx::menuPosition() extern "C" { - KPanelApplet* init ( QWidget *parent, const QString& configFile ) + KPanelApplet* init ( TQWidget *tqparent, const TQString& configFile ) { KGlobal::locale()->insertCatalogue ( "KbfxSpinx" ); return new KbfxSpinx ( configFile, KPanelApplet::Normal, KPanelApplet::About | KPanelApplet::Help | KPanelApplet::Preferences, - parent, "KbfxSpinx" ); + tqparent, "KbfxSpinx" ); } } diff --git a/src/kbfxspinx.h b/src/kbfxspinx.h index 3111cb2..8e02421 100644 --- a/src/kbfxspinx.h +++ b/src/kbfxspinx.h @@ -26,13 +26,13 @@ #include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include #include @@ -63,10 +63,11 @@ class KbfxSpinx : public KPanelApplet,public DCOPObject { K_DCOP Q_OBJECT +// TQ_OBJECT public: - KbfxSpinx ( const QString& configFile, Type t = Normal, int actions = 0, - QWidget *parent = 0, const char *name = 0 ); + KbfxSpinx ( const TQString& configFile, Type t = Normal, int actions = 0, + TQWidget *tqparent = 0, const char *name = 0 ); ~KbfxSpinx(); virtual int widthForHeight ( int height ) const; @@ -74,7 +75,7 @@ class KbfxSpinx : public KPanelApplet,public DCOPObject virtual void about(); virtual void help(); virtual void preferences(); - QPoint menuPosition(); + TQPoint menuPosition(); void resizeRequest() { emit(updateLayout()); } k_dcop: ASYNC showMenu(); @@ -84,7 +85,7 @@ class KbfxSpinx : public KPanelApplet,public DCOPObject void showKbfxMenu(); void showKmenu(); void ToolTip(); - void dirtyReaload(const QString&); + void dirtyReaload(const TQString&); protected: void createRMenu(); @@ -96,12 +97,12 @@ class KbfxSpinx : public KPanelApplet,public DCOPObject KbfxButton * kbfxBtn; KbfxSpinxMenuWidget * m_menuWidget; KbfxSpinxPopUp * m_menu; - QWidget * m_parent; + TQWidget * m_parent; bool m_kicker_auto_adjust; bool m_KbfxWatcher; static bool m_horizontal_position; DCOPClient * m_dcopClient; - QTimer * kmenu_timer; + TQTimer * kmenu_timer; KDirWatch * l_watch; }; diff --git a/src/kbfxspinxmenu.cpp b/src/kbfxspinxmenu.cpp index 0d016ac..6af42ef 100644 --- a/src/kbfxspinxmenu.cpp +++ b/src/kbfxspinxmenu.cpp @@ -21,13 +21,13 @@ #include "kbfxspinxmenu.h" -KbfxSpinxMenuWidget::KbfxSpinxMenuWidget ( QWidget * parent, const char *name, +KbfxSpinxMenuWidget::KbfxSpinxMenuWidget ( TQWidget * tqparent, const char *name, WFlags fl ) : - QWidget ( parent, "MenuWidget", - fl | Qt::WStyle_Customize | Qt::WStyle_NoBorder | Qt::WStyle_StaysOnTop ) + TQWidget ( tqparent, "MenuWidget", + fl | TQt::WStyle_Customize | TQt::WStyle_NoBorder | TQt::WStyle_StaysOnTop ) { - m_parent = parent; - QString _name=name; + m_parent = tqparent; + TQString _name=name; init(); } @@ -45,7 +45,7 @@ KbfxSpinxMenuWidget::init() { createMask (); - QWidget *main = new QWidget ( this ); + TQWidget *main = new TQWidget ( this ); m_kbfxSpinxTop = new KbfxSpinxTop ( main ); m_toolBarBot = new KbfxSpinxToolBar ( main ); @@ -54,11 +54,11 @@ KbfxSpinxMenuWidget::init() m_kbfxSpinxTop->setMaximumHeight ( ConfigInit ().m_topBar_h ); m_kbfxSpinxTop->setMinimumHeight ( ConfigInit ().m_topBar_h ); - QWidget *middle = new QWidget ( main ); + TQWidget *middle = new TQWidget ( main ); - middle->setPalette ( QPalette ( QColor ( 24, 233, 233 ) ) ); + middle->setPalette ( TQPalette ( TQColor ( 24, 233, 233 ) ) ); -// m_middleFrame = new QHBoxLayout(middle); +// m_middleFrame = new TQHBoxLayout(middle); m_canvasView = new KbfxPlasmaCanvasView ( this ); m_indexView = new KbfxPlasmaIndexView ( this ); @@ -66,28 +66,28 @@ KbfxSpinxMenuWidget::init() /* Search Box */ m_searchTag = new KbfxPixmapLabel ( this, "Search:" ); - QToolTip::add( m_searchTag, tr2i18n( "Double click to clear..." ) ); + TQToolTip::add( m_searchTag, tr2i18n( "Double click to clear..." ) ); m_searchTag->normalize (); m_searchTag->move ( ConfigInit ().m_searchBox_x, ConfigInit ().m_searchBox_y ); - QPixmap m_searchPixmap = ( *KbfxPlasmaPixmapProvider::pixmap ( "find" ) ); + TQPixmap m_searchPixmap = ( *KbfxPlasmaPixmapProvider::pixmap ( "tqfind" ) ); m_searchTag->setPixmap ( m_searchPixmap ); m_searchTag->resize ( m_searchPixmap.width (), ConfigInit ().m_searchBox_h ); - m_search = new QLineEdit ( this, "Search BOX" ); - QToolTip::add( m_search, tr2i18n( "Type here to search..." ) ); - m_search->setFrameShape ( QFrame::NoFrame ); - m_search->setFocusPolicy ( QWidget::StrongFocus ); + m_search = new TQLineEdit ( this, "Search BOX" ); + TQToolTip::add( m_search, tr2i18n( "Type here to search..." ) ); + m_search->setFrameShape ( TQFrame::NoFrame ); + m_search->setFocusPolicy ( TQ_StrongFocus ); m_search->move ( ConfigInit ().m_searchBox_x + m_searchTag->width (), ConfigInit ().m_searchBox_y ); m_search->resize ( ConfigInit ().m_searchBox_w - m_searchTag->width (), ConfigInit ().m_searchBox_h ); - connect (m_searchTag, SIGNAL (mouseDoubleClicked ( const ButtonState & )), this, - SLOT (search_clear ( const ButtonState & ))); + connect (m_searchTag, TQT_SIGNAL (mouseDoubleClicked ( const ButtonState & )), this, + TQT_SLOT (search_clear ( const ButtonState & ))); int frameHeight = ConfigInit().m_listBox_h; @@ -101,7 +101,7 @@ KbfxSpinxMenuWidget::init() m_canvasView->setMinimumHeight ( ConfigInit().m_itemView_h ); m_canvasView->setMaximumWidth ( ConfigInit ().m_itemView_w ); m_canvasView->setMinimumWidth ( ConfigInit ().m_itemView_w ); - m_appCanvas = new QCanvas ( m_canvasView->width (), m_canvasView->height () ); + m_appCanvas = new TQCanvas ( m_canvasView->width (), m_canvasView->height () ); m_canvasView->setKbfxCanvas ( m_appCanvas ); m_appCanvas->setDoubleBuffering ( true ); @@ -109,7 +109,7 @@ KbfxSpinxMenuWidget::init() m_indexView->setMinimumHeight ( frameHeight ); m_indexView->setMaximumWidth ( ConfigInit ().m_listBox_w ); m_indexView->setMinimumWidth ( ConfigInit ().m_listBox_w ); - m_indexCanvas = new QCanvas ( m_indexView->width (), m_indexView->height () ); + m_indexCanvas = new TQCanvas ( m_indexView->width (), m_indexView->height () ); m_indexView->setKbfxCanvas ( m_indexCanvas ); m_indexCanvas->setDoubleBuffering ( true ); m_indexView->setView ( m_canvasView ); @@ -119,7 +119,7 @@ KbfxSpinxMenuWidget::init() m_indexLeftView->setMaximumWidth ( ConfigInit ().m_listBox_w ); m_indexLeftView->setMinimumWidth ( ConfigInit ().m_listBox_w ); m_indexLeftCanvas = - new QCanvas ( m_indexLeftView->width (), m_indexLeftView->height () ); + new TQCanvas ( m_indexLeftView->width (), m_indexLeftView->height () ); m_indexLeftView->setKbfxCanvas ( m_indexLeftCanvas ); m_indexLeftCanvas->setDoubleBuffering ( true ); m_indexLeftView->setView ( m_canvasView ); @@ -130,8 +130,8 @@ KbfxSpinxMenuWidget::init() m_indexLeftView->move ( ConfigInit ().m_listBox_w + ConfigInit ().m_itemView_w, ConfigInit ().m_listBox_y ); - m_fixedFrame = new QVBoxLayout ( main ); - m_fixedFrame->setResizeMode ( QLayout::Minimum ); + m_fixedFrame = new TQVBoxLayout ( main ); + m_fixedFrame->setResizeMode ( TQLayout::Minimum ); m_fixedFrame->addWidget ( m_kbfxSpinxTop ); m_fixedFrame->addWidget ( middle ); m_fixedFrame->addWidget ( m_toolBarBot ); @@ -143,37 +143,37 @@ KbfxSpinxMenuWidget::init() loadHistory (); - connect ( m_indexView, SIGNAL ( loadRequest ( KbfxSignal ) ), m_canvasView, - SLOT ( handleLoadRequest ( KbfxSignal ) ) ); + connect ( m_indexView, TQT_SIGNAL ( loadRequest ( KbfxSignal ) ), m_canvasView, + TQT_SLOT ( handleLoadRequest ( KbfxSignal ) ) ); - connect ( m_indexLeftView, SIGNAL ( loadRequest ( KbfxSignal ) ), m_canvasView, - SLOT ( handleLoadRequest ( KbfxSignal ) ) ); + connect ( m_indexLeftView, TQT_SIGNAL ( loadRequest ( KbfxSignal ) ), m_canvasView, + TQT_SLOT ( handleLoadRequest ( KbfxSignal ) ) ); - connect ( m_canvasView, SIGNAL ( clicked () ), this, SLOT ( hideMenu () ) ); + connect ( m_canvasView, TQT_SIGNAL ( clicked () ), this, TQT_SLOT ( hideMenu () ) ); - connect ( m_search, SIGNAL ( textChanged ( const QString & ) ), m_canvasView, - SLOT ( search ( const QString & ) ) ); + connect ( m_search, TQT_SIGNAL ( textChanged ( const TQString & ) ), m_canvasView, + TQT_SLOT ( search ( const TQString & ) ) ); connect ( m_indexView, - SIGNAL ( pluginRequest ( QString, KbfxPlasmaCanvasView * ) ), - m_indexView, SLOT ( loadPlugin ( QString, KbfxPlasmaCanvasView * ) ) ); + TQT_SIGNAL ( pluginRequest ( TQString, KbfxPlasmaCanvasView * ) ), + m_indexView, TQT_SLOT ( loadPlugin ( TQString, KbfxPlasmaCanvasView * ) ) ); connect ( m_indexLeftView, - SIGNAL ( pluginRequest ( QString, KbfxPlasmaCanvasView * ) ), + TQT_SIGNAL ( pluginRequest ( TQString, KbfxPlasmaCanvasView * ) ), m_indexLeftView, - SLOT ( loadPlugin ( QString, KbfxPlasmaCanvasView * ) ) ); + TQT_SLOT ( loadPlugin ( TQString, KbfxPlasmaCanvasView * ) ) ); connect ( m_indexView, - SIGNAL ( clearSelected() ), - m_indexLeftView, SLOT ( clearSelection() ) ); + TQT_SIGNAL ( clearSelected() ), + m_indexLeftView, TQT_SLOT ( clearSelection() ) ); connect ( m_indexLeftView, - SIGNAL ( clearSelected() ), + TQT_SIGNAL ( clearSelected() ), m_indexView, - SLOT ( clearSelection() ) ); + TQT_SLOT ( clearSelection() ) ); - connect (this,SIGNAL(refresh()),m_canvasView,SLOT(reload())); - connect (this,SIGNAL(runItem()),m_canvasView,SLOT(execFirst())); + connect (this,TQT_SIGNAL(refresh()),m_canvasView,TQT_SLOT(reload())); + connect (this,TQT_SIGNAL(runItem()),m_canvasView,TQT_SLOT(execFirst())); KbfxSpinxToolButton *logout = new KbfxSpinxToolButton ( m_toolBarBot ); KbfxSpinxToolButton *lock = new KbfxSpinxToolButton ( m_toolBarBot ); @@ -200,8 +200,8 @@ KbfxSpinxMenuWidget::init() m_toolBarBot->addButton ( logout ); m_toolBarBot->addButton ( lock ); - connect ( logout,SIGNAL ( clicked() ),this , SLOT ( hideMenu() ) ); - connect ( lock ,SIGNAL ( clicked() ),this , SLOT ( hideMenu() ) ); + connect ( logout,TQT_SIGNAL ( clicked() ),this , TQT_SLOT ( hideMenu() ) ); + connect ( lock ,TQT_SIGNAL ( clicked() ),this , TQT_SLOT ( hideMenu() ) ); } @@ -232,36 +232,36 @@ KbfxSpinxMenuWidget::changeHeight (int het) void KbfxSpinxMenuWidget::createMask () { - QPixmap maskpng = ( *KbfxPlasmaPixmapProvider::pixmap ( "mask" ) ); - QImage rawimg = maskpng.convertToImage (); + TQPixmap tqmaskpng = ( *KbfxPlasmaPixmapProvider::pixmap ( "tqmask" ) ); + TQImage rawimg = tqmaskpng.convertToImage (); rawimg = rawimg.smoothScale ( ConfigInit ().m_userMenuWidth, ConfigInit ().m_userMenuHeight, - QImage::ScaleFree ); + TQ_ScaleFree ); - maskpng.convertFromImage ( rawimg ); + tqmaskpng.convertFromImage ( rawimg ); - setMinimumWidth ( maskpng.width () ); - setMinimumHeight ( maskpng.height () ); -// setMaximumWidth ( maskpng.width () ); -// setMaximumHeight ( maskpng.height () ); - if ( !maskpng.mask () ) + setMinimumWidth ( tqmaskpng.width () ); + setMinimumHeight ( tqmaskpng.height () ); +// setMaximumWidth ( tqmaskpng.width () ); +// setMaximumHeight ( tqmaskpng.height () ); + if ( !tqmaskpng.tqmask () ) if ( rawimg.hasAlphaBuffer () ) { - QBitmap bm; - bm = rawimg.createAlphaMask (); - maskpng.setMask ( bm ); + TQBitmap bm; + bm.convertFromImage(rawimg.createAlphaMask ()); + tqmaskpng.setMask ( bm ); } else { - QBitmap bm; - bm = rawimg.createHeuristicMask (); - // maskpng.setMask ( bm ); + TQBitmap bm; + bm.convertFromImage(rawimg.createHeuristicMask ()); + // tqmaskpng.setMask ( bm ); } - if ( maskpng.mask () && m_parent ) - m_parent->setMask ( *maskpng.mask () ); + if ( tqmaskpng.tqmask () && m_parent ) + m_parent->setMask ( *tqmaskpng.tqmask () ); } void @@ -271,7 +271,7 @@ KbfxSpinxMenuWidget::resizeContent () void KbfxSpinxMenuWidget::loadHistory () { - QStringList::Iterator it; + TQStringList::Iterator it; for ( it = ConfigInit ().m_pluginsLeft.begin (); it != ConfigInit ().m_pluginsLeft.end (); ++it ) { @@ -294,7 +294,7 @@ KbfxSpinxMenuWidget::enterPressed () /* void -KbfxSpinxMenuWidget::propergateMove (QMouseEvent * me) +KbfxSpinxMenuWidget::propergateMove (TQMouseEvent * me) { } */ @@ -308,19 +308,19 @@ KbfxSpinxMenuWidget::hideMenu () /* void -KbfxSpinxMenuWidget::mouseMoveEvent (QMouseEvent * me) +KbfxSpinxMenuWidget::mouseMoveEvent (TQMouseEvent * me) { // m_listBox->setFocus(); } */ void -KbfxSpinxMenuWidget::loadPluginLeft ( QString name ) +KbfxSpinxMenuWidget::loadPluginLeft ( TQString name ) { if (name == NULL) { return; } - if ( m_loadedListLeft.contains ( name ) <= 0 ) + if ( m_loadedListLeft.tqcontains ( name ) <= 0 ) { m_loader = new KbfxPlasmaPluginLoader (); m_stack_R = m_loader->getView ( name ); @@ -342,9 +342,9 @@ KbfxSpinxMenuWidget::loadPluginLeft ( QString name ) } void -KbfxSpinxMenuWidget::loadPluginRight ( QString name ) +KbfxSpinxMenuWidget::loadPluginRight ( TQString name ) { -if ( m_loadedListRight.contains ( name ) <= 0 ) +if ( m_loadedListRight.tqcontains ( name ) <= 0 ) { m_loader = new KbfxPlasmaPluginLoader (); m_stack_R = m_loader->getView ( name ); @@ -367,28 +367,28 @@ if ( m_loadedListRight.contains ( name ) <= 0 ) /* void -KbfxSpinxMenuWidget::focusInEvent (QFocusEvent * te) +KbfxSpinxMenuWidget::focusInEvent (TQFocusEvent * te) { kdDebug() << "TODO: Handle Focus Event" << endl; } */ void -KbfxSpinxMenuWidget::keyPressEvent ( QKeyEvent * e ) +KbfxSpinxMenuWidget::keyPressEvent ( TQKeyEvent * e ) { - if ( e->key () == Qt::Key_Backspace ) + if ( e->key () == TQt::Key_Backspace ) { m_search->backspace (); return; } - else if ( e->key () == Qt::Key_Escape ) + else if ( e->key () == TQt::Key_Escape ) { hideMenu (); return; } - else if ( e->key() == Qt::Key_Return ) + else if ( e->key() == TQt::Key_Return ) { hideMenu (); m_canvasView->setFocus (); @@ -396,77 +396,77 @@ KbfxSpinxMenuWidget::keyPressEvent ( QKeyEvent * e ) return; } - else if ( e->key () == Qt::Key_Up ) + else if ( e->key () == TQt::Key_Up ) { m_search->setFocus (); return; } - else if ( e->key () == Qt::Key_Down ) + else if ( e->key () == TQt::Key_Down ) { m_canvasView->setFocus (); return; } - else if ( e->key () == Qt::Key_Control - || e->key () == Qt::Key_Alt - || e->key () == Qt::Key_Pause - || e->key () == Qt::Key_Print - || e->key () == Qt::Key_SysReq - || e->key () == Qt::Key_Meta - || e->key () == Qt::Key_CapsLock - || e->key () == Qt::Key_NumLock - || e->key () == Qt::Key_ScrollLock - || e->key () == Qt::Key_F1 - || e->key () == Qt::Key_F2 - || e->key () == Qt::Key_F3 - || e->key () == Qt::Key_F4 - || e->key () == Qt::Key_F5 - || e->key () == Qt::Key_F6 - || e->key () == Qt::Key_F7 - || e->key () == Qt::Key_F8 - || e->key () == Qt::Key_F9 - || e->key () == Qt::Key_F10 - || e->key () == Qt::Key_F11 - || e->key () == Qt::Key_F12 - || e->key () == Qt::Key_F13 - || e->key () == Qt::Key_F14 - || e->key () == Qt::Key_F15 - || e->key () == Qt::Key_F16 - || e->key () == Qt::Key_F17 - || e->key () == Qt::Key_F18 - || e->key () == Qt::Key_F19 - || e->key () == Qt::Key_F20 - || e->key () == Qt::Key_Super_L - || e->key () == Qt::Key_Super_R - || e->key () == Qt::Key_Menu - || e->key () == Qt::Key_Hyper_L - || e->key () == Qt::Key_Hyper_R - || e->key () == Qt::Key_Help - || e->key () == Qt::Key_Back - || e->key () == Qt::Key_Forward - || e->key () == Qt::Key_Stop - || e->key () == Qt::Key_Refresh - || e->key () == Qt::Key_VolumeDown - || e->key () == Qt::Key_VolumeMute - || e->key () == Qt::Key_VolumeUp - || e->key () == Qt::Key_BassBoost - || e->key () == Qt::Key_BassUp - || e->key () == Qt::Key_BassDown - || e->key () == Qt::Key_TrebleUp - || e->key () == Qt::Key_TrebleDown - || e->key () == Qt::Key_MediaPlay - || e->key () == Qt::Key_MediaStop - || e->key () == Qt::Key_MediaPrev - || e->key () == Qt::Key_MediaNext - || e->key () == Qt::Key_MediaRecord - || e->key () == Qt::Key_HomePage - || e->key () == Qt::Key_Favorites - || e->key () == Qt::Key_Search - || e->key () == Qt::Key_Standby - || e->key () == Qt::Key_OpenUrl - || e->key () == Qt::Key_LaunchMail - || e->key () == Qt::Key_LaunchMedia + else if ( e->key () == TQt::Key_Control + || e->key () == TQt::Key_Alt + || e->key () == TQt::Key_Pause + || e->key () == TQt::Key_Print + || e->key () == TQt::Key_SysReq + || e->key () == TQt::Key_Meta + || e->key () == TQt::Key_CapsLock + || e->key () == TQt::Key_NumLock + || e->key () == TQt::Key_ScrollLock + || e->key () == TQt::Key_F1 + || e->key () == TQt::Key_F2 + || e->key () == TQt::Key_F3 + || e->key () == TQt::Key_F4 + || e->key () == TQt::Key_F5 + || e->key () == TQt::Key_F6 + || e->key () == TQt::Key_F7 + || e->key () == TQt::Key_F8 + || e->key () == TQt::Key_F9 + || e->key () == TQt::Key_F10 + || e->key () == TQt::Key_F11 + || e->key () == TQt::Key_F12 + || e->key () == TQt::Key_F13 + || e->key () == TQt::Key_F14 + || e->key () == TQt::Key_F15 + || e->key () == TQt::Key_F16 + || e->key () == TQt::Key_F17 + || e->key () == TQt::Key_F18 + || e->key () == TQt::Key_F19 + || e->key () == TQt::Key_F20 + || e->key () == TQt::Key_Super_L + || e->key () == TQt::Key_Super_R + || e->key () == TQt::Key_Menu + || e->key () == TQt::Key_Hyper_L + || e->key () == TQt::Key_Hyper_R + || e->key () == TQt::Key_Help + || e->key () == TQt::Key_Back + || e->key () == TQt::Key_Forward + || e->key () == TQt::Key_Stop + || e->key () == TQt::Key_Refresh + || e->key () == TQt::Key_VolumeDown + || e->key () == TQt::Key_VolumeMute + || e->key () == TQt::Key_VolumeUp + || e->key () == TQt::Key_BassBoost + || e->key () == TQt::Key_BassUp + || e->key () == TQt::Key_BassDown + || e->key () == TQt::Key_TrebleUp + || e->key () == TQt::Key_TrebleDown + || e->key () == TQt::Key_MediaPlay + || e->key () == TQt::Key_MediaStop + || e->key () == TQt::Key_MediaPrev + || e->key () == TQt::Key_MediaNext + || e->key () == TQt::Key_MediaRecord + || e->key () == TQt::Key_HomePage + || e->key () == TQt::Key_Favorites + || e->key () == TQt::Key_Search + || e->key () == TQt::Key_Standby + || e->key () == TQt::Key_OpenUrl + || e->key () == TQt::Key_LaunchMail + || e->key () == TQt::Key_LaunchMedia ) { hideMenu (); @@ -475,7 +475,7 @@ KbfxSpinxMenuWidget::keyPressEvent ( QKeyEvent * e ) } /* - else if ( e->key() == Qt::Key_Alt ) + else if ( e->key() == TQt::Key_Alt ) { hideMenu (); m_canvasView->setFocus (); @@ -484,20 +484,20 @@ KbfxSpinxMenuWidget::keyPressEvent ( QKeyEvent * e ) } - else if ( e->key () == Qt::Key_Tab ) + else if ( e->key () == TQt::Key_Tab ) { // m_listBox->setFocus (); return; } - else if ( e->key () >= Qt::Key_0 && e->key () <= Qt::Key_9 ) + else if ( e->key () >= TQt::Key_0 && e->key () <= TQt::Key_9 ) { printf ( "%d \n", e->key () ); emit runItemAt ( e->key () ); return; } - else if ( e->key () == Qt::Key_Left ) + else if ( e->key () == TQt::Key_Left ) { m_canvasView->setFocus (); m_canvasView->emulatedKeyPress ( e ); diff --git a/src/kbfxspinxmenu.h b/src/kbfxspinxmenu.h index 19986cc..f897691 100644 --- a/src/kbfxspinxmenu.h +++ b/src/kbfxspinxmenu.h @@ -22,19 +22,19 @@ #ifndef KBFX_SPINX_MENU_WIDGET_H #define KBFX_SPINX_MENU_WIDGET_H -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include @@ -59,24 +59,25 @@ #include "kbfxspinxview.h" -class KbfxSpinxMenuWidget:public QWidget +class KbfxSpinxMenuWidget:public TQWidget { Q_OBJECT + TQ_OBJECT public : - KbfxSpinxMenuWidget ( QWidget * parent = 0, const char * name = 0,WFlags fl =0 ); + KbfxSpinxMenuWidget ( TQWidget * tqparent = 0, const char * name = 0,WFlags fl =0 ); virtual ~KbfxSpinxMenuWidget(); -// virtual void mouseMoveEvent(QMouseEvent * me); -// virtual void focusInEvent ( QFocusEvent * ) ; - virtual void keyPressEvent ( QKeyEvent * e ) ; - void grabEvent ( QKeyEvent * e ) { keyPressEvent ( e );} +// virtual void mouseMoveEvent(TQMouseEvent * me); +// virtual void focusInEvent ( TQFocusEvent * ) ; + virtual void keyPressEvent ( TQKeyEvent * e ) ; + void grabEvent ( TQKeyEvent * e ) { keyPressEvent ( e );} void loadHistory(); void resizeContent(); void reinit(); public slots: void hideMenu(); -// void propergateMove(QMouseEvent * me); - void loadPluginLeft ( QString name ); - void loadPluginRight ( QString name ); +// void propergateMove(TQMouseEvent * me); + void loadPluginLeft ( TQString name ); + void loadPluginRight ( TQString name ); void enterPressed(); void search_clear ( const ButtonState & ); // void changeHeight(int h); @@ -89,21 +90,21 @@ class KbfxSpinxMenuWidget:public QWidget private: void init(); - QPoint menuPosition(); + TQPoint menuPosition(); void createMask(); KbfxPlasmaCanvasView * m_canvasView; // KbfxPlasmaCanvasView * m_indexView; - QCanvas * m_canvas ; + TQCanvas * m_canvas ; // KbfxPlasmaListBox * m_listBox; KbfxPlasmaPluginLoader * m_loader; KbfxSpinxTop * m_menuTop; - QString m_loadedListLeft; - QString m_loadedListRight; + TQString m_loadedListLeft; + TQString m_loadedListRight; // FIXME: canvasstack is depricated Interface KbfxPlasmaCanvasStack * m_stack; KbfxDataStack * m_stack_R; - QWidget * m_parent; - QLineEdit * m_search; + TQWidget * m_parent; + TQLineEdit * m_search; KbfxPixmapLabel * m_searchTag; KbfxSpinxToolBar * m_toolBarBot; KbfxSpinxToolBar * m_toolBarSide; @@ -111,11 +112,11 @@ class KbfxSpinxMenuWidget:public QWidget /* SUPER NEW LAYOUT FIX HERE */ - QBoxLayout * m_fixedFrame; - QBoxLayout * m_middleFrame; - QCanvas * m_appCanvas; - QCanvas * m_indexCanvas; - QCanvas * m_indexLeftCanvas; + TQBoxLayout * m_fixedFrame; + TQBoxLayout * m_middleFrame; + TQCanvas * m_appCanvas; + TQCanvas * m_indexCanvas; + TQCanvas * m_indexLeftCanvas; KbfxPlasmaIndexView * m_indexView; diff --git a/src/kbfxspinxpopup.cpp b/src/kbfxspinxpopup.cpp index 2270eb8..677687d 100644 --- a/src/kbfxspinxpopup.cpp +++ b/src/kbfxspinxpopup.cpp @@ -32,7 +32,7 @@ // #include "kbfxspinxpopup.h" -KbfxSpinxPopUp::KbfxSpinxPopUp ( QWidget * parent, const char * name ) :QPopupMenu ( parent,name ) +KbfxSpinxPopUp::KbfxSpinxPopUp ( TQWidget * tqparent, const char * name ) :TQPopupMenu ( tqparent,name ) { m_mainItem = 0L; } @@ -43,14 +43,14 @@ KbfxSpinxPopUp::~KbfxSpinxPopUp() } void -KbfxSpinxPopUp::keyPressEvent ( QKeyEvent * e ) +KbfxSpinxPopUp::keyPressEvent ( TQKeyEvent * e ) { /* - if ( e->key() == Qt::Key_Tab ) + if ( e->key() == TQt::Key_Tab ) { return ; } - if ( e->key() == Qt::Key_Up ) + if ( e->key() == TQt::Key_Up ) { m_mainItem->grabEvent ( e ); // e->ignore(); @@ -61,7 +61,7 @@ KbfxSpinxPopUp::keyPressEvent ( QKeyEvent * e ) } void -KbfxSpinxPopUp::addItem ( QWidget * item,int index ) +KbfxSpinxPopUp::addItem ( TQWidget * item,int index ) { m_mainItem = ( KbfxSpinxMenuWidget* ) item; this->insertItem ( item,index ); diff --git a/src/kbfxspinxpopup.h b/src/kbfxspinxpopup.h index 882d665..821d829 100644 --- a/src/kbfxspinxpopup.h +++ b/src/kbfxspinxpopup.h @@ -33,7 +33,7 @@ #ifndef KBFX_SPINX_POP_UP_H #define KBFX_SPINX_POP_UP_H -#include +#include #include "kbfxspinxmenu.h" @@ -41,16 +41,17 @@ /** @author Siraj Razick */ -class KbfxSpinxPopUp : public QPopupMenu +class KbfxSpinxPopUp : public TQPopupMenu { Q_OBJECT + TQ_OBJECT public: - KbfxSpinxPopUp ( QWidget * parent = 0, const char * name = 0 ) ; + KbfxSpinxPopUp ( TQWidget * tqparent = 0, const char * name = 0 ) ; ~KbfxSpinxPopUp(); - virtual void keyPressEvent ( QKeyEvent * ke ); - void addItem ( QWidget * item,int index ); + virtual void keyPressEvent ( TQKeyEvent * ke ); + void addItem ( TQWidget * item,int index ); private: KbfxSpinxMenuWidget * m_mainItem; }; diff --git a/src/kbfxspinxscrollbar.cpp b/src/kbfxspinxscrollbar.cpp index 6fcff50..c2f7d08 100644 --- a/src/kbfxspinxscrollbar.cpp +++ b/src/kbfxspinxscrollbar.cpp @@ -21,17 +21,17 @@ #include "kbfxspinxscrollbar.h" -KbfxSpinxScrollBar::KbfxSpinxScrollBar ( QWidget * parent, const char *name, int type ) : - QWidget ( parent, name ) +KbfxSpinxScrollBar::KbfxSpinxScrollBar ( TQWidget * tqparent, const char *name, int type ) : + TQWidget ( tqparent, name ) { if (type == 0){ m_normal = ( *KbfxPlasmaPixmapProvider::pixmap ( "scrollnormal" ) ); } else { m_normal = ( *KbfxPlasmaPixmapProvider::pixmap ( "scrollnormalbot" ) ); } - QImage _tmp_img = m_normal.convertToImage(); - _tmp_img = _tmp_img.smoothScale ( ConfigInit().m_itemView_w, m_normal.height (),QImage::ScaleFree ); - m_normal = QPixmap ( _tmp_img ); + TQImage _tmp_img = m_normal.convertToImage(); + _tmp_img = _tmp_img.smoothScale ( ConfigInit().m_itemView_w, m_normal.height (),TQ_ScaleFree ); + m_normal = TQPixmap ( _tmp_img ); this->resize ( m_normal.width (), m_normal.height () ); @@ -41,10 +41,10 @@ KbfxSpinxScrollBar::KbfxSpinxScrollBar ( QWidget * parent, const char *name, int h = this->height () / 2; _x += ( this->width () - w ) / 2; _y += ( this->height () - h ) / 2; - m_triAngle = QPointArray ( 3 ); + m_triAngle = TQPointArray ( 3 ); m_dir = DOWN; - m_timer = new QTimer ( this,"ScrollTimer" ); - connect ( m_timer,SIGNAL ( timeout() ),this,SLOT ( timeoutslot() ) ); + m_timer = new TQTimer ( this,"ScrollTimer" ); + connect ( m_timer,TQT_SIGNAL ( timeout() ),this,TQT_SLOT ( timeoutslot() ) ); m_pressed = false; } @@ -53,18 +53,18 @@ KbfxSpinxScrollBar::~KbfxSpinxScrollBar () {} void -KbfxSpinxScrollBar::paintEvent ( QPaintEvent * pe ) +KbfxSpinxScrollBar::paintEvent ( TQPaintEvent * pe ) { - QRect r = pe->rect(); - QPainter p; + TQRect r = pe->rect(); + TQPainter p; p.begin ( this ); - p.drawPixmap ( QRect ( 0, 0, m_normal.width (), m_normal.height () ), + p.drawPixmap ( TQRect ( 0, 0, m_normal.width (), m_normal.height () ), m_normal ); - p.setPen ( QColor ( 255,255,255 ) ); + p.setPen ( TQColor ( 255,255,255 ) ); if ( m_pressed == false ) - p.setBrush ( QColor ( 255,255,255 ) ); + p.setBrush ( TQColor ( 255,255,255 ) ); else - p.setBrush ( QColor ( 0,0,0 ) ); + p.setBrush ( TQColor ( 0,0,0 ) ); p.drawPolygon ( m_triAngle ); p.end (); @@ -92,7 +92,7 @@ KbfxSpinxScrollBar::setType ( Direction dir ) void -KbfxSpinxScrollBar::mousePressEvent ( QMouseEvent * me ) +KbfxSpinxScrollBar::mousePressEvent ( TQMouseEvent * me ) { me = me; m_pressed = true; @@ -101,7 +101,7 @@ KbfxSpinxScrollBar::mousePressEvent ( QMouseEvent * me ) } void -KbfxSpinxScrollBar::mouseReleaseEvent ( QMouseEvent * me ) +KbfxSpinxScrollBar::mouseReleaseEvent ( TQMouseEvent * me ) { me = me; m_pressed = false; @@ -111,7 +111,7 @@ KbfxSpinxScrollBar::mouseReleaseEvent ( QMouseEvent * me ) void -KbfxSpinxScrollBar::enterEvent ( QEvent * e ) +KbfxSpinxScrollBar::enterEvent ( TQEvent * e ) { e = e; m_pressed = true; @@ -120,7 +120,7 @@ KbfxSpinxScrollBar::enterEvent ( QEvent * e ) } void -KbfxSpinxScrollBar::leaveEvent ( QEvent *e ) +KbfxSpinxScrollBar::leaveEvent ( TQEvent *e ) { e =e ; m_pressed = false; diff --git a/src/kbfxspinxscrollbar.h b/src/kbfxspinxscrollbar.h index c159bc3..8ed7b73 100644 --- a/src/kbfxspinxscrollbar.h +++ b/src/kbfxspinxscrollbar.h @@ -22,31 +22,32 @@ #ifndef KBFX_SPINX_SCROLL_BAR_H #define KBFX_SPINX_SCROLL_BAR_H -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include -class QWidget; +class TQWidget; -class KbfxSpinxScrollBar:public QWidget +class KbfxSpinxScrollBar:public TQWidget { Q_OBJECT + TQ_OBJECT public: typedef enum {UP,DOWN,LEFT,RIGHT} Direction; - KbfxSpinxScrollBar ( QWidget * parent = 0,const char * name = 0,int type = 0 ); + KbfxSpinxScrollBar ( TQWidget * tqparent = 0,const char * name = 0,int type = 0 ); ~KbfxSpinxScrollBar(); - virtual void paintEvent ( QPaintEvent * ev ); - virtual void mousePressEvent ( QMouseEvent * me ); - virtual void mouseReleaseEvent ( QMouseEvent * me ); - virtual void enterEvent ( QEvent * e ); - virtual void leaveEvent ( QEvent * e ); + virtual void paintEvent ( TQPaintEvent * ev ); + virtual void mousePressEvent ( TQMouseEvent * me ); + virtual void mouseReleaseEvent ( TQMouseEvent * me ); + virtual void enterEvent ( TQEvent * e ); + virtual void leaveEvent ( TQEvent * e ); void setType ( Direction dir ); public slots: void timeoutslot(); @@ -57,12 +58,12 @@ class KbfxSpinxScrollBar:public QWidget void scroll ( int , int ); private: - QPixmap m_normal; - QPixmap m_hover; - QPixmap m_presseod; - QPointArray m_triAngle; + TQPixmap m_normal; + TQPixmap m_hover; + TQPixmap m_presseod; + TQPointArray m_triAngle; Direction m_dir; - QTimer * m_timer; + TQTimer * m_timer; bool m_pressed; diff --git a/src/kbfxspinxtoolbar.cpp b/src/kbfxspinxtoolbar.cpp index 8a35f15..bd8b029 100644 --- a/src/kbfxspinxtoolbar.cpp +++ b/src/kbfxspinxtoolbar.cpp @@ -21,7 +21,7 @@ #include "kbfxspinxtoolbar.h" -KbfxSpinxToolBar::KbfxSpinxToolBar ( QWidget * parent , const char * name , WFlags l ) :QWidget ( parent,name,l ) +KbfxSpinxToolBar::KbfxSpinxToolBar ( TQWidget * tqparent , const char * name , WFlags l ) :TQWidget ( tqparent,name,l ) { _y = 0; @@ -35,7 +35,7 @@ KbfxSpinxToolBar::~KbfxSpinxToolBar() {} void -KbfxSpinxToolBar::setSize ( QSize size ) +KbfxSpinxToolBar::setSize ( TQSize size ) { this->resize ( size ); _x = size.width(); @@ -54,12 +54,12 @@ void KbfxSpinxToolBar::addButton ( KbfxSpinxToolButton * btn ) btn->update(); } -void KbfxSpinxToolBar::paintEvent ( QPaintEvent * pe ) +void KbfxSpinxToolBar::paintEvent ( TQPaintEvent * pe ) { pe = pe ; - QPainter p; + TQPainter p; p.begin ( this ); - p.drawPixmap ( QRect ( 0,0,ConfigInit().m_botBar_w,ConfigInit().m_botBar_h ),m_bg ); + p.drawPixmap ( TQRect ( 0,0,ConfigInit().m_botBar_w,ConfigInit().m_botBar_h ),m_bg ); p.end(); } diff --git a/src/kbfxspinxtoolbar.h b/src/kbfxspinxtoolbar.h index 7ad8539..802c137 100644 --- a/src/kbfxspinxtoolbar.h +++ b/src/kbfxspinxtoolbar.h @@ -22,34 +22,35 @@ #ifndef KBFX_SPINX_TOOL_BAR_H #define KBFX_SPINX_TOOL_BAR_H -#include -#include -#include -#include +#include +#include +#include +#include #include #include #include "kbfxspinxtoolbutton.h" -class KbfxSpinxToolBar:public QWidget +class KbfxSpinxToolBar:public TQWidget { Q_OBJECT + TQ_OBJECT public: - KbfxSpinxToolBar ( QWidget * parent = 0, const char * name = 0, WFlags f = 0 ); + KbfxSpinxToolBar ( TQWidget * tqparent = 0, const char * name = 0, WFlags f = 0 ); virtual ~KbfxSpinxToolBar(); - virtual void paintEvent ( QPaintEvent * pe ); + virtual void paintEvent ( TQPaintEvent * pe ); void addButton ( KbfxSpinxToolButton * btn ); - void setSize ( QSize s ); + void setSize ( TQSize s ); private: int _x; int _y; int m_buttonWidth; int m_buttonHeight; - QPixmap m_bg; + TQPixmap m_bg; }; diff --git a/src/kbfxspinxtoolbutton.cpp b/src/kbfxspinxtoolbutton.cpp index 3230e14..ec69685 100644 --- a/src/kbfxspinxtoolbutton.cpp +++ b/src/kbfxspinxtoolbutton.cpp @@ -21,14 +21,14 @@ #include "kbfxspinxtoolbutton.h" -KbfxSpinxToolButton::KbfxSpinxToolButton ( QWidget * parent , const char * name ) :QLabel ( parent,name,Qt::WStaticContents | Qt::WNoAutoErase |Qt::WPaintDesktop ) +KbfxSpinxToolButton::KbfxSpinxToolButton ( TQWidget * tqparent , const char * name ) :TQLabel ( tqparent,name,TQt::WStaticContents | TQt::WNoAutoErase |TQt::WPaintDesktop ) { m_dataSource = 0; m_dataGroup = 0; m_fadeTime = ConfigInit().m_fadeTime; - fade_timer = new QTimer ( this,"Fade Timer" ); - connect ( fade_timer,SIGNAL ( timeout() ),this,SLOT ( fade() ) ); + fade_timer = new TQTimer ( this,"Fade Timer" ); + connect ( fade_timer,TQT_SIGNAL ( timeout() ),this,TQT_SLOT ( fade() ) ); } @@ -43,8 +43,8 @@ void KbfxSpinxToolButton::fade ( ) } else { - QImage _final = m_fadePix.convertToImage (); - QImage _current = m_current.convertToImage (); + TQImage _final = m_fadePix.convertToImage (); + TQImage _current = m_current.convertToImage (); if ( !fade_timer->isActive ()) { @@ -56,43 +56,43 @@ void KbfxSpinxToolButton::fade ( ) m_opacity += 0.1; KImageEffect::blend ( _final, _current, m_opacity); - m_current = QPixmap ( _current ); + m_current = TQPixmap ( _current ); } this->resize ( m_current.size() ); this->update(); } void -KbfxSpinxToolButton::enterEvent ( QEvent * e ) +KbfxSpinxToolButton::enterEvent ( TQEvent * e ) { e = e; m_fadePix = m_hover; fade(); - this->setCursor ( QCursor ( Qt::PointingHandCursor ) ); + this->setCursor ( TQCursor ( TQt::PointingHandCursor ) ); } void -KbfxSpinxToolButton::leaveEvent ( QEvent * e ) +KbfxSpinxToolButton::leaveEvent ( TQEvent * e ) { e = e; m_fadePix = m_normal; fade(); - this->setCursor ( QCursor ( Qt::ArrowCursor ) ); + this->setCursor ( TQCursor ( TQt::ArrowCursor ) ); } void -KbfxSpinxToolButton::setPixmaps ( QPixmap normal, QPixmap hover ) +KbfxSpinxToolButton::setPixmaps ( TQPixmap normal, TQPixmap hover ) { - QSize _sizeNormal = normal.size(); - QImage _tmpHover = hover.convertToImage (); - _tmpHover = _tmpHover.smoothScale ( _sizeNormal, QImage::ScaleFree ); + TQSize _sizeNormal = normal.size(); + TQImage _tmpHover = hover.convertToImage (); + _tmpHover = _tmpHover.smoothScale ( _sizeNormal, TQ_ScaleFree ); m_normal = normal; - m_hover = QPixmap ( _tmpHover ); + m_hover = TQPixmap ( _tmpHover ); m_current = m_normal; resize ( m_current.size () ); - this->repaint(); + this->tqrepaint(); this->update(); } @@ -106,26 +106,26 @@ KbfxSpinxToolButton::setDataSource ( KbfxDataSource * src ) m_dataSource = new KbfxDataSource(); *m_dataSource = *src; // copy KIconLoader *iconload = KGlobal::iconLoader (); - QString m_iconPath = iconload->iconPath ( m_icon, KIcon::Desktop, false ); - m_iconPixmap = QPixmap ( m_iconPath ); + TQString m_iconPath = iconload->iconPath ( m_icon, KIcon::Desktop, false ); + m_iconPixmap = TQPixmap ( m_iconPath ); } void -KbfxSpinxToolButton::paintEvent ( QPaintEvent * e ) +KbfxSpinxToolButton::paintEvent ( TQPaintEvent * e ) { - QRect r = e->rect(); - QPainter p; - QPixmap buffer ( m_current.size() ); + TQRect r = e->rect(); + TQPainter p; + TQPixmap buffer ( m_current.size() ); buffer.fill(); p.begin ( this ); - p.setPen ( QColor ( 255,255,255 ) ); - p.drawPixmap ( QRect ( 0, 0, m_current.width(), m_current.height() ), m_current ); + p.setPen ( TQColor ( 255,255,255 ) ); + p.drawPixmap ( TQRect ( 0, 0, m_current.width(), m_current.height() ), m_current ); p.end(); } void -KbfxSpinxToolButton::mouseReleaseEvent ( QMouseEvent * me ) +KbfxSpinxToolButton::mouseReleaseEvent ( TQMouseEvent * me ) { me = me; if ( m_dataSource == 0 ) diff --git a/src/kbfxspinxtoolbutton.h b/src/kbfxspinxtoolbutton.h index 2c3d9bf..a8a73dd 100644 --- a/src/kbfxspinxtoolbutton.h +++ b/src/kbfxspinxtoolbutton.h @@ -22,14 +22,14 @@ #ifndef KBFX_SPINX_TOOL_BUTTON_H #define KBFX_SPINX_TOOL_BUTTON_H -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include @@ -40,30 +40,31 @@ #include #include -class KbfxSpinxToolButton:public QLabel +class KbfxSpinxToolButton:public TQLabel { Q_OBJECT + TQ_OBJECT public: typedef enum{SINGLE=0,EXPANDABLE} ButtonType; - KbfxSpinxToolButton ( QWidget * parent = 0, const char * name = 0 ); + KbfxSpinxToolButton ( TQWidget * tqparent = 0, const char * name = 0 ); virtual ~KbfxSpinxToolButton(); - virtual void paintEvent ( QPaintEvent * pe ); + virtual void paintEvent ( TQPaintEvent * pe ); - virtual void enterEvent ( QEvent * e ); - virtual void leaveEvent ( QEvent * l ); - virtual void mouseReleaseEvent ( QMouseEvent * me ); + virtual void enterEvent ( TQEvent * e ); + virtual void leaveEvent ( TQEvent * l ); + virtual void mouseReleaseEvent ( TQMouseEvent * me ); /* - virtual void mousePressEvent(QMouseEvent * me); + virtual void mousePressEvent(TQMouseEvent * me); */ void setDataSource ( KbfxDataSource * src ); // void setDataGroup(KbfxDataGroup * gsrc); - void setName ( QString name ) {m_name =name;} - void setExec ( QString cmd ) { m_exe = cmd;} + void setName ( TQString name ) {m_name =name;} + void setExec ( TQString cmd ) { m_exe = cmd;} void setType ( KbfxSpinxToolButton::ButtonType type ) { m_type = type;} - void setIcon ( QString path ); - void setPixmaps ( QPixmap , QPixmap ); + void setIcon ( TQString path ); + void setPixmaps ( TQPixmap , TQPixmap ); public slots: void fade(); @@ -71,23 +72,23 @@ class KbfxSpinxToolButton:public QLabel signals: void clicked(); private: - QString m_name; - QString m_exe; - QString m_icon; - QString m_tooltip; + TQString m_name; + TQString m_exe; + TQString m_icon; + TQString m_tooltip; - QPixmap m_normal; - QPixmap m_pressed; - QPixmap m_hover; - QPixmap m_current; - QPixmap m_iconPixmap; + TQPixmap m_normal; + TQPixmap m_pressed; + TQPixmap m_hover; + TQPixmap m_current; + TQPixmap m_iconPixmap; KbfxDataSource * m_dataSource; KbfxDataGroup * m_dataGroup; ButtonType m_type; bool m_statePressed; - QTimer * fade_timer; + TQTimer * fade_timer; float m_opacity; - QPixmap m_fadePix; + TQPixmap m_fadePix; int m_fadeTime; }; diff --git a/src/kbfxspinxtop.cpp b/src/kbfxspinxtop.cpp index 617e884..5a4fdf3 100644 --- a/src/kbfxspinxtop.cpp +++ b/src/kbfxspinxtop.cpp @@ -21,7 +21,7 @@ #include "kbfxspinxtop.h" -KbfxSpinxTop::KbfxSpinxTop ( QWidget * parent,const char * name ) :QWidget ( parent,name,Qt::WNoAutoErase | WStaticContents | Qt::WPaintClever | Qt::WNoAutoErase ) +KbfxSpinxTop::KbfxSpinxTop ( TQWidget * tqparent,const char * name ) :TQWidget ( tqparent,name,TQt::WNoAutoErase | WStaticContents | TQt::WPaintClever | TQt::WNoAutoErase ) { m_background = ( *KbfxPlasmaPixmapProvider::pixmap ( "topbg" ) ); @@ -39,7 +39,7 @@ KbfxSpinxTop::~KbfxSpinxTop() {} void -KbfxSpinxTop::mousePressEvent ( QMouseEvent * e ) +KbfxSpinxTop::mousePressEvent ( TQMouseEvent * e ) { e = e; emit sizeChange ( 10 ); @@ -51,23 +51,23 @@ KbfxSpinxTop::createDudeBox() m_dudeBox = ( *KbfxPlasmaPixmapProvider::pixmap ( "dudebox" ) ); // int padding = ((m_dudeBox.height()-m_faceIcon.height()))/2; - QPainter p; + TQPainter p; p.begin ( &m_dudeBox ); -// p.drawPixmap(QRect(padding,padding,m_faceIcon.width(),m_faceIcon.height()),m_faceIcon); - p.drawPixmap ( QRect ( ConfigInit().m_faceIconX,ConfigInit().m_faceIconY,ConfigInit().m_faceIconW,ConfigInit().m_faceIconH ),m_faceIcon ); +// p.drawPixmap(TQRect(padding,padding,m_faceIcon.width(),m_faceIcon.height()),m_faceIcon); + p.drawPixmap ( TQRect ( ConfigInit().m_faceIconX,ConfigInit().m_faceIconY,ConfigInit().m_faceIconW,ConfigInit().m_faceIconH ),m_faceIcon ); p.end(); } -QString +TQString KbfxSpinxTop::getUserName () { KUser *user = new KUser (); - QString logInName ( user->fullName () ); + TQString logInName ( user->fullName () ); // Nookie says some might find it discriminating... We don't want that. if ( logInName == "root" ) - logInName = QString ( "Administrator" ); + logInName = TQString ( "Administrator" ); delete user; return logInName.upper (); } @@ -77,36 +77,36 @@ KbfxSpinxTop::getUserName () void KbfxSpinxTop::loadFaceIcon() { - QImage UserImage ( ConfigInit().m_SpinxDudeImage ); + TQImage UserImage ( ConfigInit().m_SpinxDudeImage ); UserImage = UserImage.smoothScale ( 48, 48 ); - m_faceIcon = QPixmap ( UserImage ); + m_faceIcon = TQPixmap ( UserImage ); } void -KbfxSpinxTop::paintEvent ( QPaintEvent * pe ) +KbfxSpinxTop::paintEvent ( TQPaintEvent * pe ) { pe = pe; - QRect * r = new QRect ( 0,0,ConfigInit().m_topBar_w,ConfigInit().m_topBar_h ); + TQRect * r = new TQRect ( 0,0,ConfigInit().m_topBar_w,ConfigInit().m_topBar_h ); - m_pixmapbuff = new QPixmap(); + m_pixmapbuff = new TQPixmap(); m_pixmapbuff->resize ( r->size() ); m_pixmapbuff->fill ( this, r->topLeft() ); - QPainter p; - p.begin ( m_pixmapbuff,this ); + TQPainter p; + p.tqbegin ( m_pixmapbuff,this ); // Draw commands are here p.drawPixmap ( *r,m_background ); - p.setPen ( QColor ( ConfigInit().m_userNameColor ) ); + p.setPen ( TQColor ( ConfigInit().m_userNameColor ) ); - p.drawPixmap ( QRect ( ConfigInit().m_facePos_x,ConfigInit().m_facePos_y,m_dudeBox.width(),m_dudeBox.height() ),m_dudeBox ); + p.drawPixmap ( TQRect ( ConfigInit().m_facePos_x,ConfigInit().m_facePos_y,m_dudeBox.width(),m_dudeBox.height() ),m_dudeBox ); if ( !ConfigInit().m_faceBoxHideText ) { - QFont * _font = new QFont(ConfigInit().m_userNameFont); + TQFont * _font = new TQFont(ConfigInit().m_userNameFont); p.setFont ( *_font ); -// p.setPen(QColor(199,187,206)); +// p.setPen(TQColor(199,187,206)); // p.drawText(ConfigInit().m_userNamePos_x+1,ConfigInit().m_userNamePos_y+2,m_userName); - p.setPen ( QColor ( ConfigInit().m_userNameColor ) ); + p.setPen ( TQColor ( ConfigInit().m_userNameColor ) ); p.drawText ( ConfigInit().m_userNamePos_x,ConfigInit().m_userNamePos_y,m_userName ); delete _font; } diff --git a/src/kbfxspinxtop.h b/src/kbfxspinxtop.h index b6cf811..cf5460e 100644 --- a/src/kbfxspinxtop.h +++ b/src/kbfxspinxtop.h @@ -22,10 +22,10 @@ #ifndef KBFX_SPINX_TOP_H #define KBFX_SPINX_TOP_H -#include -#include -#include -#include +#include +#include +#include +#include #include #include @@ -34,36 +34,37 @@ #include #include -class KbfxSpinxTop:public QWidget +class KbfxSpinxTop:public TQWidget { Q_OBJECT + TQ_OBJECT public: - KbfxSpinxTop ( QWidget * parent = 0,const char * name = 0 ); + KbfxSpinxTop ( TQWidget * tqparent = 0,const char * name = 0 ); virtual ~KbfxSpinxTop(); - virtual void paintEvent ( QPaintEvent * ); - virtual void mousePressEvent ( QMouseEvent * e ) ; + virtual void paintEvent ( TQPaintEvent * ); + virtual void mousePressEvent ( TQMouseEvent * e ) ; public slots: signals: - void textChanged ( QString ); + void textChanged ( TQString ); void sizeChange ( int ); private: void loadFaceIcon(); void createDudeBox(); - QString getUserName(); + TQString getUserName(); - QPixmap m_background; - QPixmap * m_pixmapbuff; - QPixmap m_faceIcon; - QPixmap m_dudeBox; - QString m_currentTextBuffer; - QString m_userName; - QPixmap m_iconPixmap; - QTimer * m_fadeTimer; + TQPixmap m_background; + TQPixmap * m_pixmapbuff; + TQPixmap m_faceIcon; + TQPixmap m_dudeBox; + TQString m_currentTextBuffer; + TQString m_userName; + TQPixmap m_iconPixmap; + TQTimer * m_fadeTimer; }; diff --git a/src/kbfxspinxview.cpp b/src/kbfxspinxview.cpp index 65c01bc..5ff5776 100644 --- a/src/kbfxspinxview.cpp +++ b/src/kbfxspinxview.cpp @@ -21,7 +21,7 @@ #include "kbfxspinxview.h" -KbfxSpinxView::KbfxSpinxView ( QWidget * parent , const char * name,WFlags flag ) :QFrame ( parent,name,flag ) +KbfxSpinxView::KbfxSpinxView ( TQWidget * tqparent , const char * name,WFlags flag ) :TQFrame ( tqparent,name,flag ) { setMinimumWidth ( 300 ); setMinimumHeight ( 365 ); diff --git a/src/kbfxspinxview.h b/src/kbfxspinxview.h index 42d1cb6..8ca1a7a 100644 --- a/src/kbfxspinxview.h +++ b/src/kbfxspinxview.h @@ -22,15 +22,16 @@ #ifndef KBFX_SPINX_VIEW_H #define KBFX_SPINX_VIEW_H -#include +#include -class KbfxSpinxView:public QFrame +class KbfxSpinxView:public TQFrame { Q_OBJECT + TQ_OBJECT public: - KbfxSpinxView ( QWidget * parent = 0, const char * name = 0, WFlags f = 0 ); + KbfxSpinxView ( TQWidget * tqparent = 0, const char * name = 0, WFlags f = 0 ); ~KbfxSpinxView(); public slots: diff --git a/src/kbfxtooltip.cpp b/src/kbfxtooltip.cpp index bce755c..28a4167 100644 --- a/src/kbfxtooltip.cpp +++ b/src/kbfxtooltip.cpp @@ -23,51 +23,51 @@ #include "kbfxtooltip.h" -KbfxToolTip::KbfxToolTip ( QWidget * parent, const char *name, WFlags fl ) : - QWidget ( parent, name, +KbfxToolTip::KbfxToolTip ( TQWidget * tqparent, const char *name, WFlags fl ) : + TQWidget ( tqparent, name, fl | WStyle_Customize | WRepaintNoErase | WStyle_NoBorder | - WDestructiveClose | Qt::WPaintDesktop | Qt::WType_Popup | Qt:: - WPaintClever | Qt::WNoAutoErase | Qt::WResizeNoErase | Qt:: - WStaticContents | Qt::WNoAutoErase ) + WDestructiveClose | TQt::WPaintDesktop | TQt::WType_Popup | TQt:: + WPaintClever | TQt::WNoAutoErase | TQt::WResizeNoErase | TQt:: + WStaticContents | TQt::WNoAutoErase ) { _animate = ConfigInit ().m_ToolTipAnimation; m_fontTooltipFont = ConfigInit ().m_fontTooltipFont; logo = ( KbfxPlasmaPixmapProvider::PixmapPathCheck ( ConfigInit().m_SpinxTooltipLogo ) ) ? - QImage ( ConfigInit().m_SpinxTooltipLogo ) - : QImage ( ConfigInit().m_SpinxTooltipLogoDefault ); + TQImage ( ConfigInit().m_SpinxTooltipLogo ) + : TQImage ( ConfigInit().m_SpinxTooltipLogoDefault ); tooltip_win = ( KbfxPlasmaPixmapProvider::PixmapPathCheck ( ConfigInit ().m_SpinxTooltipWindow ) ) ? - QImage ( ConfigInit ().m_SpinxTooltipWindow ) - : QImage ( ConfigInit ().m_SpinxTooltipWindowDefault ); + TQImage ( ConfigInit ().m_SpinxTooltipWindow ) + : TQImage ( ConfigInit ().m_SpinxTooltipWindowDefault ); - tooltip_mask = ( KbfxPlasmaPixmapProvider::PixmapPathCheck ( ConfigInit().m_SpinxTooltipMask ) ) ? - QImage ( ConfigInit().m_SpinxTooltipMask ) - : QImage ( ConfigInit().m_SpinxTooltipMaskDefault ); + tooltip_tqmask = ( KbfxPlasmaPixmapProvider::PixmapPathCheck ( ConfigInit().m_SpinxTooltipMask ) ) ? + TQImage ( ConfigInit().m_SpinxTooltipMask ) + : TQImage ( ConfigInit().m_SpinxTooltipMaskDefault ); dude_img = ( KbfxPlasmaPixmapProvider::PixmapPathCheck ( ConfigInit ().m_SpinxDudeImage ) ) ? - QImage ( ConfigInit ().m_SpinxDudeImage ) - : QImage ( ConfigInit ().m_SpinxDudeImageDefault ); + TQImage ( ConfigInit ().m_SpinxDudeImage ) + : TQImage ( ConfigInit ().m_SpinxDudeImageDefault ); setUserImage (); setBoundBox (); - setBackground ( QPixmap () ); - setWindow ( QPixmap () ); + setBackground ( TQPixmap () ); + setWindow ( TQPixmap () ); KbfxPlasmaPixmapProvider::PixmapPathCheck ( ConfigInit ().m_ToolTipAvatar ) ? setAnimationImage ( ConfigInit ().m_ToolTipAvatar ) : setAnimationImage ( ConfigInit ().m_ToolTipAvatarDefault ); - _hide_timer = new QTimer ( this ); - _update_timer = new QTimer ( this ); - _move_timer = new QTimer ( this ); + _hide_timer = new TQTimer ( this ); + _update_timer = new TQTimer ( this ); + _move_timer = new TQTimer ( this ); - connect ( _hide_timer, SIGNAL ( timeout () ), this, SLOT ( hide () ) ); - connect ( _hide_timer, SIGNAL ( timeout () ), _agent, SLOT ( hide () ) ); - connect ( _update_timer, SIGNAL ( timeout () ), this, SLOT ( logoMove () ) ); + connect ( _hide_timer, TQT_SIGNAL ( timeout () ), this, TQT_SLOT ( hide () ) ); + connect ( _hide_timer, TQT_SIGNAL ( timeout () ), _agent, TQT_SLOT ( hide () ) ); + connect ( _update_timer, TQT_SIGNAL ( timeout () ), this, TQT_SLOT ( logoMove () ) ); - QCursor kbfxCursor; + TQCursor kbfxCursor; kbfxCursor.setShape ( Qt::PointingHandCursor ); - this->setCursor ( ( const QCursor ) kbfxCursor ); + this->setCursor ( ( const TQCursor ) kbfxCursor ); } KbfxToolTip::~KbfxToolTip () @@ -81,19 +81,21 @@ KbfxToolTip::~KbfxToolTip () } void -KbfxToolTip::setWindow ( QPixmap win ) +KbfxToolTip::setWindow ( TQPixmap win ) { - QImage m_win_img; + TQImage m_win_img; ( win.isNull () ) ? m_win_img = tooltip_win : m_win_img = win.convertToImage (); m_win_img = m_win_img.smoothScale ( _bg.width (), 13 ); -// _window = new QLabel (this, "", Qt::WStaticContents | Qt::WNoAutoErase); - _window = new QLabel ( this, "" ); +// _window = new TQLabel (this, "", TQt::WStaticContents | TQt::WNoAutoErase); + _window = new TQLabel ( this, "" ); _window->resize ( _bg.width (), 13 ); - _window->setBackgroundPixmap ( m_win_img ); + TQPixmap pm; + pm.convertFromImage(m_win_img); + _window->setBackgroundPixmap ( pm ); if ( _animate ) _window->show (); else @@ -101,22 +103,22 @@ KbfxToolTip::setWindow ( QPixmap win ) } void -KbfxToolTip::setAnimationImage ( QString path ) +KbfxToolTip::setAnimationImage ( TQString path ) { /* - _agent = new QLabel (this, "", - Qt::WStaticContents | - Qt::WNoAutoErase | Qt::WPaintDesktop); + _agent = new TQLabel (this, "", + TQt::WStaticContents | + TQt::WNoAutoErase | TQt::WPaintDesktop); */ - _agent = new QLabel ( this,"" ); + _agent = new TQLabel ( this,"" ); _agent->resize ( 100, 100 ); - _agent_anim = new QMovie ( path ); - QPixmap agent_mask = _agent_anim->framePixmap (); - _agent->setBackgroundPixmap ( agent_mask ); - if ( agent_mask.mask () ) - _agent->setMask ( *agent_mask.mask () ); - _agent->repaint (); + _agent_anim = new TQMovie ( path ); + TQPixmap agent_tqmask = _agent_anim->framePixmap (); + _agent->setBackgroundPixmap ( agent_tqmask ); + if ( agent_tqmask.tqmask () ) + _agent->setMask ( *agent_tqmask.tqmask () ); + _agent->tqrepaint (); /*FIXME:Need to remove Hard Coded Values */ _agent->move ( 200, 0 ); @@ -129,25 +131,27 @@ KbfxToolTip::setAnimationImage ( QString path ) void -KbfxToolTip::setBackground ( QPixmap bg ) +KbfxToolTip::setBackground ( TQPixmap bg ) { ( bg.isNull () ) ? - _bg = tooltip_mask + _bg = tooltip_tqmask : _bg = bg.convertToImage (); /* animation check : Auto streatch */ if ( _animate ) { - QImage m_tmp = _bg; + TQImage m_tmp = _bg; _bg = m_tmp.smoothScale ( _bg.width () + 100, _bg.height () ); } - this->setBackgroundPixmap ( _bg ); + TQPixmap pm; + pm.convertFromImage(_bg); + this->setBackgroundPixmap ( pm ); - QPixmap m_tmp ( _bg ); - if ( m_tmp.mask () ) - this->setMask ( ( *m_tmp.mask () ) ); + TQPixmap m_tmp ( _bg ); + if ( m_tmp.tqmask () ) + this->setMask ( ( *m_tmp.tqmask () ) ); this->resize ( _bg.width (), _bg.height () ); _maxW = _bg.width (); } @@ -172,31 +176,31 @@ KbfxToolTip::setStartPos ( int _x_, int _y_ ) void KbfxToolTip::logoMove () { - QPainter p; + TQPainter p; if ( _logo_move_x < _bg.width () - 68 ) { _logo_move_x += 1; - _window->repaint (); + _window->tqrepaint (); p.begin ( _window ); - p.drawPixmap ( QRect ( _logo_move_x, 0, logo.width (), logo.height () ), - QPixmap ( logo ) ); + p.drawPixmap ( TQRect ( _logo_move_x, 0, logo.width (), logo.height () ), + TQPixmap ( logo ) ); p.end (); } else { p.begin ( _window ); - p.drawPixmap ( QRect ( _bg.width () - 68, 0, logo.width (), logo.height () ), - QPixmap ( logo ) ); + p.drawPixmap ( TQRect ( _bg.width () - 68, 0, logo.width (), logo.height () ), + TQPixmap ( logo ) ); p.end (); } - QPixmap agent_mask = _agent_anim->framePixmap (); - _agent->setBackgroundPixmap ( agent_mask ); - if ( agent_mask.mask () ) - _agent->setMask ( *agent_mask.mask () ); - _agent->repaint (); + TQPixmap agent_tqmask = _agent_anim->framePixmap (); + _agent->setBackgroundPixmap ( agent_tqmask ); + if ( agent_tqmask.tqmask () ) + _agent->setMask ( *agent_tqmask.tqmask () ); + _agent->tqrepaint (); } void @@ -207,19 +211,19 @@ KbfxToolTip::setAnimated ( bool b ) void -KbfxToolTip::setLabelText ( QString str ) +KbfxToolTip::setLabelText ( TQString str ) { _label_text = str; } void -KbfxToolTip::setHeadingText ( QString str ) +KbfxToolTip::setHeadingText ( TQString str ) { _heading_text = str; } void -KbfxToolTip::setVersionText ( QString str ) +KbfxToolTip::setVersionText ( TQString str ) { _version_text = str; } @@ -239,34 +243,34 @@ KbfxToolTip::hideToolTip () void KbfxToolTip::setUserImage () { - QImage userimage = dude_img; + TQImage userimage = dude_img; userimage = userimage.smoothScale ( 48, 48 ); - _dude = QPixmap ( userimage ); + _dude = TQPixmap ( userimage ); } void KbfxToolTip::setBoundBox () { _dude_box = ( KbfxPlasmaPixmapProvider::PixmapPathCheck ( ConfigInit ().m_SpinxTooltipDudebox ) ) ? - QPixmap ( ConfigInit ().m_SpinxTooltipDudebox ) - : QPixmap ( ConfigInit ().m_SpinxTooltipDudeboxDefault ); + TQPixmap ( ConfigInit ().m_SpinxTooltipDudebox ) + : TQPixmap ( ConfigInit ().m_SpinxTooltipDudeboxDefault ); } void -KbfxToolTip::paintEvent ( QPaintEvent * pe ) +KbfxToolTip::paintEvent ( TQPaintEvent * pe ) { - const QRect r = pe->rect (); - QFont *let = new QFont (m_fontTooltipFont); + const TQRect r = pe->rect (); + TQFont *let = new TQFont (m_fontTooltipFont); - QPainter p; + TQPainter p; p.begin ( this ); p.setBackgroundMode ( Qt::TransparentMode ); - p.drawPixmap ( QRect ( 7, 16, _dude_box.width (), _dude_box.height () ), + p.drawPixmap ( TQRect ( 7, 16, _dude_box.width (), _dude_box.height () ), _dude_box ); int _paddingX = ( ( _dude_box.height () - _dude.height () ) / 2 ) + 16; - p.drawPixmap ( QRect + p.drawPixmap ( TQRect ( _paddingX - ( 55 - 48 ), _paddingX, _dude.width (), _dude.height () ), _dude ); @@ -275,22 +279,22 @@ KbfxToolTip::paintEvent ( QPaintEvent * pe ) else { - p.drawPixmap ( QRect ( 126, 0, logo.width (), logo.height () ), - QPixmap ( QImage (ConfigInit ().m_SpinxTooltipLogo ) ) ); + p.drawPixmap ( TQRect ( 126, 0, logo.width (), logo.height () ), + TQPixmap ( TQImage (ConfigInit ().m_SpinxTooltipLogo ) ) ); } let->setBold ( TRUE ); let->setPointSize ( 10 ); p.setFont ( *let ); - p.setPen ( QColor ( 61, 94, 129 ) ); - p.drawText ( _dude_box.width () + 15, 30, "KBFX" ); + p.setPen ( TQColor ( 61, 94, 129 ) ); + p.drawText ( _dude_box.width () + 15, 30, TQString("KBFX") ); - p.setPen ( QColor ( 0, 0, 0 ) ); + p.setPen ( TQColor ( 0, 0, 0 ) ); let->setBold ( FALSE ); let->setPointSize ( 8 ); p.setFont ( *let ); p.drawText ( ( _animate ) ? _dude_box.width () + 50 : _dude_box.width () + 4, - _dude_box.height () + 30, QString ( "Version " ).append ( APPLICATION_VERSION ) ); + _dude_box.height () + 30, TQString ( "Version " ).append ( APPLICATION_VERSION ) ); p.setPen ( ConfigInit ().m_fontTooltipColor ); let->setBold ( TRUE ); diff --git a/src/kbfxtooltip.h b/src/kbfxtooltip.h index b358f5a..0bdd00c 100644 --- a/src/kbfxtooltip.h +++ b/src/kbfxtooltip.h @@ -22,14 +22,14 @@ #ifndef KBFX_TOOL_TIP #define KBFX_TOOL_TIP -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include @@ -42,18 +42,19 @@ #include -class KbfxToolTip:public QWidget +class KbfxToolTip:public TQWidget { Q_OBJECT + TQ_OBJECT public: - KbfxToolTip ( QWidget * parent=0,const char * name=0,WFlags fl=WType_TopLevel ); + KbfxToolTip ( TQWidget * tqparent=0,const char * name=0,WFlags fl=WType_TopLevel ); ~KbfxToolTip(); void setStartPos ( int x=0, int y=0 ); - virtual void paintEvent ( QPaintEvent *pe ); - void setBackground ( QPixmap bg ); - void setAnimationImage ( QString path ); - void setWindow ( QPixmap win ); + virtual void paintEvent ( TQPaintEvent *pe ); + void setBackground ( TQPixmap bg ); + void setAnimationImage ( TQString path ); + void setWindow ( TQPixmap win ); public slots: void hideToolTip(); @@ -61,33 +62,33 @@ class KbfxToolTip:public QWidget void setUserImage(); void setBoundBox(); void setAnimated ( bool ); - void setLabelText ( QString ); - void setHeadingText ( QString ); - void setVersionText ( QString ); + void setLabelText ( TQString ); + void setHeadingText ( TQString ); + void setVersionText ( TQString ); private: - QTimer * _hide_timer; - QTimer * _move_timer; - QTimer * _update_timer; + TQTimer * _hide_timer; + TQTimer * _move_timer; + TQTimer * _update_timer; int _x,_y; int _maxW; int _width; int _height; int _logo_move_x; - QPixmap _dude; - QPixmap _dude_box; - QImage _bg; - QLabel * _window; - QLabel * _agent; - QMovie * _agent_anim; + TQPixmap _dude; + TQPixmap _dude_box; + TQImage _bg; + TQLabel * _window; + TQLabel * _agent; + TQMovie * _agent_anim; bool _animate; - QString _label_text; - QString _heading_text; - QString _version_text; - QFont m_fontTooltipFont; - QImage logo; - QImage tooltip_win; - QImage tooltip_mask; - QImage dude_img; + TQString _label_text; + TQString _heading_text; + TQString _version_text; + TQFont m_fontTooltipFont; + TQImage logo; + TQImage tooltip_win; + TQImage tooltip_tqmask; + TQImage dude_img; }; #endif