diff options
Diffstat (limited to 'kicker/kicker')
99 files changed, 1942 insertions, 1942 deletions
diff --git a/kicker/kicker/buttons/bookmarksbutton.cpp b/kicker/kicker/buttons/bookmarksbutton.cpp index b351af263..e267848ef 100644 --- a/kicker/kicker/buttons/bookmarksbutton.cpp +++ b/kicker/kicker/buttons/bookmarksbutton.cpp @@ -21,7 +21,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ******************************************************************/ -#include <qtooltip.h> +#include <tqtooltip.h> #include <kaction.h> #include <kbookmark.h> @@ -33,7 +33,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "bookmarksbutton.h" #include "bookmarksbutton.moc" -BookmarksButton::BookmarksButton(QWidget* parent) +BookmarksButton::BookmarksButton(TQWidget* parent) : PanelPopupButton(parent, "BookmarksButton"), bookmarkParent(0), bookmarkMenu(0), @@ -49,7 +49,7 @@ BookmarksButton::BookmarksButton(QWidget* parent) actionCollection, true, false); setPopup(bookmarkParent); - QToolTip::add(this, i18n("Bookmarks")); + TQToolTip::add(this, i18n("Bookmarks")); setTitle(i18n("Bookmarks")); setIcon("bookmark"); } diff --git a/kicker/kicker/buttons/bookmarksbutton.h b/kicker/kicker/buttons/bookmarksbutton.h index 95ffa9609..3d8518519 100644 --- a/kicker/kicker/buttons/bookmarksbutton.h +++ b/kicker/kicker/buttons/bookmarksbutton.h @@ -39,14 +39,14 @@ class BookmarksButton : public PanelPopupButton Q_OBJECT public: - BookmarksButton(QWidget* parent); + BookmarksButton(TQWidget* parent); ~BookmarksButton(); void loadConfig(const KConfigGroup& config); virtual void properties(); protected: - virtual QString tileName() { return "WindowList"; } + virtual TQString tileName() { return "WindowList"; } virtual void initPopup(); KPopupMenu* bookmarkParent; diff --git a/kicker/kicker/buttons/browserbutton.cpp b/kicker/kicker/buttons/browserbutton.cpp index 9a445d218..950882696 100644 --- a/kicker/kicker/buttons/browserbutton.cpp +++ b/kicker/kicker/buttons/browserbutton.cpp @@ -21,9 +21,9 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ******************************************************************/ -#include <qtimer.h> -#include <qtooltip.h> -#include <qdragobject.h> +#include <tqtimer.h> +#include <tqtooltip.h> +#include <tqdragobject.h> #include <kconfig.h> #include <klocale.h> @@ -38,14 +38,14 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "browserbutton.h" #include "browserbutton.moc" -BrowserButton::BrowserButton( const QString& icon, const QString& startDir, QWidget* parent ) +BrowserButton::BrowserButton( const TQString& icon, const TQString& startDir, TQWidget* parent ) : PanelPopupButton( parent, "BrowserButton" ) , topMenu( 0 ) { initialize( icon, startDir ); } -BrowserButton::BrowserButton( const KConfigGroup& config, QWidget* parent ) +BrowserButton::BrowserButton( const KConfigGroup& config, TQWidget* parent ) : PanelPopupButton( parent, "BrowserButton" ) , topMenu( 0 ) { @@ -57,7 +57,7 @@ BrowserButton::~BrowserButton() delete topMenu; } -void BrowserButton::initialize( const QString& icon, const QString& path ) +void BrowserButton::initialize( const TQString& icon, const TQString& path ) { _icon = icon; @@ -65,10 +65,10 @@ void BrowserButton::initialize( const QString& icon, const QString& path ) topMenu = new PanelBrowserMenu( path ); setPopup(topMenu); - _menuTimer = new QTimer( this ); - connect( _menuTimer, SIGNAL(timeout()), SLOT(slotDelayedPopup()) ); + _menuTimer = new TQTimer( this ); + connect( _menuTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotDelayedPopup()) ); - QToolTip::add(this, i18n("Browse: %1").arg(path)); + TQToolTip::add(this, i18n("Browse: %1").arg(path)); setTitle( path ); setIcon ( _icon ); } @@ -79,7 +79,7 @@ void BrowserButton::saveConfig( KConfigGroup& config ) const config.writePathEntry("Path", topMenu->path()); } -void BrowserButton::dragEnterEvent( QDragEnterEvent *ev ) +void BrowserButton::dragEnterEvent( TQDragEnterEvent *ev ) { if ((ev->source() != this) && KURLDrag::canDecode(ev)) { @@ -93,17 +93,17 @@ void BrowserButton::dragEnterEvent( QDragEnterEvent *ev ) PanelButton::dragEnterEvent(ev); } -void BrowserButton::dragLeaveEvent( QDragLeaveEvent *ev ) +void BrowserButton::dragLeaveEvent( TQDragLeaveEvent *ev ) { _menuTimer->stop(); PanelButton::dragLeaveEvent(ev); } -void BrowserButton::dropEvent( QDropEvent *ev ) +void BrowserButton::dropEvent( TQDropEvent *ev ) { KURL path ( topMenu->path() ); _menuTimer->stop(); - KFileItem item( path, QString::fromLatin1( "inode/directory" ), KFileItem::Unknown ); + KFileItem item( path, TQString::fromLatin1( "inode/directory" ), KFileItem::Unknown ); KonqOperations::doDrop( &item, path, ev, this ); PanelButton::dropEvent(ev); } @@ -124,9 +124,9 @@ void BrowserButton::properties() { PanelBrowserDialog dlg( topMenu->path(), _icon, this ); - if( dlg.exec() == QDialog::Accepted ){ + if( dlg.exec() == TQDialog::Accepted ){ _icon = dlg.icon(); - QString path = dlg.path(); + TQString path = dlg.path(); if ( path != topMenu->path() ) { delete topMenu; diff --git a/kicker/kicker/buttons/browserbutton.h b/kicker/kicker/buttons/browserbutton.h index 00ff0abea..bb08801d9 100644 --- a/kicker/kicker/buttons/browserbutton.h +++ b/kicker/kicker/buttons/browserbutton.h @@ -36,8 +36,8 @@ class BrowserButton : public PanelPopupButton Q_OBJECT public: - BrowserButton( const QString& icon, const QString& startDir, QWidget* parent ); - BrowserButton( const KConfigGroup& config, QWidget* parent ); + BrowserButton( const TQString& icon, const TQString& startDir, TQWidget* parent ); + BrowserButton( const KConfigGroup& config, TQWidget* parent ); virtual ~BrowserButton(); void saveConfig( KConfigGroup& config ) const; @@ -49,17 +49,17 @@ protected slots: virtual void startDrag(); protected: - void initialize( const QString& icon, const QString& startDir ); - virtual QString tileName() { return "Browser"; } + void initialize( const TQString& icon, const TQString& startDir ); + virtual TQString tileName() { return "Browser"; } virtual void initPopup(); - virtual void dropEvent(QDropEvent *ev); - virtual void dragEnterEvent(QDragEnterEvent *ev); - virtual void dragLeaveEvent(QDragLeaveEvent *ev); - virtual QString defaultIcon() const { return "kdisknav"; }; + virtual void dropEvent(TQDropEvent *ev); + virtual void dragEnterEvent(TQDragEnterEvent *ev); + virtual void dragLeaveEvent(TQDragLeaveEvent *ev); + virtual TQString defaultIcon() const { return "kdisknav"; }; PanelBrowserMenu* topMenu; - QString _icon; - QTimer *_menuTimer; + TQString _icon; + TQTimer *_menuTimer; }; #endif diff --git a/kicker/kicker/buttons/desktopbutton.cpp b/kicker/kicker/buttons/desktopbutton.cpp index 3831303d7..9f23741e5 100644 --- a/kicker/kicker/buttons/desktopbutton.cpp +++ b/kicker/kicker/buttons/desktopbutton.cpp @@ -21,8 +21,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ******************************************************************/ -#include <qtooltip.h> -#include <qdragobject.h> +#include <tqtooltip.h> +#include <tqdragobject.h> #include <klocale.h> #include <kglobalsettings.h> @@ -36,17 +36,17 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "desktopbutton.h" #include "desktopbutton.moc" -DesktopButton::DesktopButton( QWidget* parent ) +DesktopButton::DesktopButton( TQWidget* parent ) : PanelButton( parent, "DesktopButton" ) { setToggleButton(true); - QToolTip::add(this, i18n("Show desktop")); + TQToolTip::add(this, i18n("Show desktop")); setTitle(i18n("Desktop Access")); setIcon("desktop"); - connect( this, SIGNAL(toggled(bool)), this, SLOT(showDesktop(bool)) ); - connect( ShowDesktop::the(), SIGNAL(desktopShown(bool)), this, SLOT(toggle(bool)) ); + connect( this, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(showDesktop(bool)) ); + connect( ShowDesktop::the(), TQT_SIGNAL(desktopShown(bool)), this, TQT_SLOT(toggle(bool)) ); setOn( ShowDesktop::the()->desktopShowing() ); } @@ -65,7 +65,7 @@ void DesktopButton::showDesktop(bool showDesktop) KickerTip::enableTipping(true); } -void DesktopButton::dragEnterEvent( QDragEnterEvent *ev ) +void DesktopButton::dragEnterEvent( TQDragEnterEvent *ev ) { if ((ev->source() != this) && KURLDrag::canDecode(ev)) ev->accept(rect()); @@ -74,10 +74,10 @@ void DesktopButton::dragEnterEvent( QDragEnterEvent *ev ) PanelButton::dragEnterEvent(ev); } -void DesktopButton::dropEvent( QDropEvent *ev ) +void DesktopButton::dropEvent( TQDropEvent *ev ) { KURL dPath ( KGlobalSettings::desktopPath() ); - KFileItem item( dPath, QString::fromLatin1( "inode/directory" ), KFileItem::Unknown ); + KFileItem item( dPath, TQString::fromLatin1( "inode/directory" ), KFileItem::Unknown ); KonqOperations::doDrop( &item, dPath, ev, this ); PanelButton::dropEvent(ev); } diff --git a/kicker/kicker/buttons/desktopbutton.h b/kicker/kicker/buttons/desktopbutton.h index 62de4c342..c896bdf92 100644 --- a/kicker/kicker/buttons/desktopbutton.h +++ b/kicker/kicker/buttons/desktopbutton.h @@ -34,12 +34,12 @@ class DesktopButton : public PanelButton Q_OBJECT public: - DesktopButton( QWidget* parent ); + DesktopButton( TQWidget* parent ); protected: - virtual QString tileName() { return "DesktopButton"; } - virtual void dragEnterEvent(QDragEnterEvent *ev); - virtual void dropEvent(QDropEvent *ev); + virtual TQString tileName() { return "DesktopButton"; } + virtual void dragEnterEvent(TQDragEnterEvent *ev); + virtual void dropEvent(TQDropEvent *ev); protected slots: void toggle(bool); diff --git a/kicker/kicker/buttons/extensionbutton.cpp b/kicker/kicker/buttons/extensionbutton.cpp index 004e0d47b..d4590a024 100644 --- a/kicker/kicker/buttons/extensionbutton.cpp +++ b/kicker/kicker/buttons/extensionbutton.cpp @@ -21,7 +21,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ******************************************************************/ -#include <qtooltip.h> +#include <tqtooltip.h> #include <kconfig.h> #include <kpanelmenu.h> @@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "extensionbutton.h" #include "extensionbutton.moc" -ExtensionButton::ExtensionButton( const QString& desktopFile, QWidget* parent ) +ExtensionButton::ExtensionButton( const TQString& desktopFile, TQWidget* parent ) : PanelPopupButton( parent, "ExtensionButton" ) , info( 0 ) , menu( 0 ) @@ -39,13 +39,13 @@ ExtensionButton::ExtensionButton( const QString& desktopFile, QWidget* parent ) initialize( desktopFile ); } -ExtensionButton::ExtensionButton( const KConfigGroup& config, QWidget* parent ) +ExtensionButton::ExtensionButton( const KConfigGroup& config, TQWidget* parent ) : PanelPopupButton( parent, "extensionbuttton" ) { initialize( config.readPathEntry("DesktopFile") ); } -void ExtensionButton::initialize( const QString& desktopFile ) +void ExtensionButton::initialize( const TQString& desktopFile ) { info = new MenuInfo(desktopFile); if (!info->isValid()) @@ -56,7 +56,7 @@ void ExtensionButton::initialize( const QString& desktopFile ) menu = info->load(this); setPopup(menu); - QToolTip::add(this, info->comment()); + TQToolTip::add(this, info->comment()); setTitle(info->name()); setIcon(info->icon()); } diff --git a/kicker/kicker/buttons/extensionbutton.h b/kicker/kicker/buttons/extensionbutton.h index 0d489f706..48854323e 100644 --- a/kicker/kicker/buttons/extensionbutton.h +++ b/kicker/kicker/buttons/extensionbutton.h @@ -34,15 +34,15 @@ class ExtensionButton : public PanelPopupButton Q_OBJECT public: - ExtensionButton( const QString& desktopFile, QWidget* parent ); - ExtensionButton( const KConfigGroup& config, QWidget* parent ); + ExtensionButton( const TQString& desktopFile, TQWidget* parent ); + ExtensionButton( const KConfigGroup& config, TQWidget* parent ); ~ExtensionButton(); void saveConfig( KConfigGroup& config ) const; protected: - void initialize( const QString& desktopFile ); - virtual QString tileName() { return "URL"; } + void initialize( const TQString& desktopFile ); + virtual TQString tileName() { return "URL"; } virtual void initPopup(); MenuInfo* info; diff --git a/kicker/kicker/buttons/kbutton.cpp b/kicker/kicker/buttons/kbutton.cpp index 320a45842..73454b99f 100644 --- a/kicker/kicker/buttons/kbutton.cpp +++ b/kicker/kicker/buttons/kbutton.cpp @@ -21,7 +21,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ******************************************************************/ -#include <qtooltip.h> +#include <tqtooltip.h> #include <klocale.h> #include <kapplication.h> @@ -37,10 +37,10 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "kbutton.h" #include "kbutton.moc" -KButton::KButton( QWidget* parent ) +KButton::KButton( TQWidget* parent ) : PanelPopupButton( parent, "KButton" ) { - QToolTip::add(this, i18n("Applications, tasks and desktop sessions")); + TQToolTip::add(this, i18n("Applications, tasks and desktop sessions")); setTitle(i18n("K Menu")); setPopup(MenuManager::the()->kmenu()); @@ -64,7 +64,7 @@ KButton::~KButton() void KButton::properties() { - KApplication::startServiceByDesktopName("kmenuedit", QStringList(), + KApplication::startServiceByDesktopName("kmenuedit", TQStringList(), 0, 0, 0, "", true); } diff --git a/kicker/kicker/buttons/kbutton.h b/kicker/kicker/buttons/kbutton.h index 6de61181f..bf98e74f8 100644 --- a/kicker/kicker/buttons/kbutton.h +++ b/kicker/kicker/buttons/kbutton.h @@ -34,7 +34,7 @@ class KButton : public PanelPopupButton Q_OBJECT public: - KButton( QWidget *parent ); + KButton( TQWidget *parent ); ~KButton(); void loadConfig( const KConfigGroup& config ); @@ -42,9 +42,9 @@ public: virtual void properties(); protected: - virtual QString tileName() { return "KMenu"; } + virtual TQString tileName() { return "KMenu"; } virtual void initPopup(); - virtual QString defaultIcon() const { return "go"; } + virtual TQString defaultIcon() const { return "go"; } }; #endif diff --git a/kicker/kicker/buttons/nonkdeappbutton.cpp b/kicker/kicker/buttons/nonkdeappbutton.cpp index 9413e8aaa..29b7ddb2e 100644 --- a/kicker/kicker/buttons/nonkdeappbutton.cpp +++ b/kicker/kicker/buttons/nonkdeappbutton.cpp @@ -21,8 +21,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ******************************************************************/ -#include <qtooltip.h> -#include <qdragobject.h> +#include <tqtooltip.h> +#include <tqdragobject.h> #include <kconfig.h> #include <kdesktopfile.h> @@ -47,11 +47,11 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // this is one of the two constructors. gets called when creating a new button // e.g. via the "non-KDE Application" dialog, not one that was saved and then // restored. -NonKDEAppButton::NonKDEAppButton(const QString& name, - const QString& description, - const QString& filePath, const QString& icon, - const QString &cmdLine, bool inTerm, - QWidget* parent) +NonKDEAppButton::NonKDEAppButton(const TQString& name, + const TQString& description, + const TQString& filePath, const TQString& icon, + const TQString &cmdLine, bool inTerm, + TQWidget* parent) : PanelButton(parent, "NonKDEAppButton") // call our superclass's constructor { // call the initialization method @@ -61,11 +61,11 @@ NonKDEAppButton::NonKDEAppButton(const QString& name, // to the slotExec() slot // we do this here instead of in initialize(...) since initialize(...) may // get called later, e.g after reconfiguring it - connect(this, SIGNAL(clicked()), SLOT(slotExec())); + connect(this, TQT_SIGNAL(clicked()), TQT_SLOT(slotExec())); } // this constructor is used when restoring a button, usually at startup -NonKDEAppButton::NonKDEAppButton( const KConfigGroup& config, QWidget* parent ) +NonKDEAppButton::NonKDEAppButton( const KConfigGroup& config, TQWidget* parent ) : PanelButton(parent, "NonKDEAppButton") // call our superclass's constructor { // call the initialization method, this time with values from a config file @@ -77,13 +77,13 @@ NonKDEAppButton::NonKDEAppButton( const KConfigGroup& config, QWidget* parent ) config.readBoolEntry("RunInTerminal")); // see comment on connect in above constructor - connect(this, SIGNAL(clicked()), SLOT(slotExec())); + connect(this, TQT_SIGNAL(clicked()), TQT_SLOT(slotExec())); } -void NonKDEAppButton::initialize(const QString& name, - const QString& description, - const QString& filePath, const QString& icon, - const QString &cmdLine, bool inTerm ) +void NonKDEAppButton::initialize(const TQString& name, + const TQString& description, + const TQString& filePath, const TQString& icon, + const TQString &cmdLine, bool inTerm ) { // and now we actually set up most of the member variables with the // values passed in here. by doing this all in an initialize() method @@ -98,8 +98,8 @@ void NonKDEAppButton::initialize(const QString& name, // now we set the buttons tooltip, title and icon using the appropriate // set*() methods from the PanelButton class from which we subclass - // assign the name or the description to a QString called tooltip - QString tooltip = description.isEmpty() ? nameStr : descStr; + // assign the name or the description to a TQString called tooltip + TQString tooltip = description.isEmpty() ? nameStr : descStr; if (tooltip.isEmpty()) { @@ -123,7 +123,7 @@ void NonKDEAppButton::initialize(const QString& name, } // set the tooltip - QToolTip::add(this, tooltip); + TQToolTip::add(this, tooltip); // set the icon setIcon(iconStr); @@ -142,7 +142,7 @@ void NonKDEAppButton::saveConfig( KConfigGroup& config ) const config.writePathEntry("CommandLine", cmdStr); } -void NonKDEAppButton::dragEnterEvent(QDragEnterEvent *ev) +void NonKDEAppButton::dragEnterEvent(TQDragEnterEvent *ev) { // when something is dragged onto this button, we'll accept it // if we aren't dragged onto ourselves, and if it's a URL @@ -159,11 +159,11 @@ void NonKDEAppButton::dragEnterEvent(QDragEnterEvent *ev) PanelButton::dragEnterEvent(ev); } -void NonKDEAppButton::dropEvent(QDropEvent *ev) +void NonKDEAppButton::dropEvent(TQDropEvent *ev) { // something has been droped on us! KURL::List fileList; - QString execStr; + TQString execStr; if (KURLDrag::decode(ev, fileList)) { // according to KURLDrag, we've successfully retrieved @@ -205,7 +205,7 @@ void NonKDEAppButton::slotExec() runCommand(); } -void NonKDEAppButton::runCommand(const QString& execStr) +void NonKDEAppButton::runCommand(const TQString& execStr) { // run our command! this method is used both by the drag 'n drop // facilities as well as when the button is activated (usualy w/a click) @@ -225,7 +225,7 @@ void NonKDEAppButton::runCommand(const QString& execStr) // get merged into the application config automagically for us KConfig *config = KGlobal::config(); config->setGroup("misc"); - QString termStr = config->readPathEntry("Terminal", "konsole"); + TQString termStr = config->readPathEntry("Terminal", "konsole"); // and now we run the darn thing and store how we fared in result result = KRun::runCommand(termStr + " -e " + pathStr + " " + @@ -269,7 +269,7 @@ void NonKDEAppButton::properties() { // the user has requested to configure this button // this method gets called by the ButtonContainer that houses the button - // see ButtonContainer::eventFilter(QObject *o, QEvent *e), where the + // see ButtonContainer::eventFilter(TQObject *o, TQEvent *e), where the // context menu is created and dealt with. // so we create a new config dialog .... @@ -278,8 +278,8 @@ void NonKDEAppButton::properties() // ... connect the signal it emits when it has data for us to save // to our updateSettings slot (see above) ... - connect(dlg, SIGNAL(updateSettings(PanelExeDialog*)), this, - SLOT(updateSettings(PanelExeDialog*))); + connect(dlg, TQT_SIGNAL(updateSettings(PanelExeDialog*)), this, + TQT_SLOT(updateSettings(PanelExeDialog*))); // ... and then show it to the user dlg->show(); diff --git a/kicker/kicker/buttons/nonkdeappbutton.h b/kicker/kicker/buttons/nonkdeappbutton.h index bbb74c892..217f2c22c 100644 --- a/kicker/kicker/buttons/nonkdeappbutton.h +++ b/kicker/kicker/buttons/nonkdeappbutton.h @@ -42,12 +42,12 @@ class NonKDEAppButton : public PanelButton public: // define our two constructors, one used for creating new buttons... - NonKDEAppButton(const QString& name, const QString& description, - const QString& filePath, const QString& icon, - const QString& cmdLine, bool inTerm, QWidget* parent); + NonKDEAppButton(const TQString& name, const TQString& description, + const TQString& filePath, const TQString& icon, + const TQString& cmdLine, bool inTerm, TQWidget* parent); // ... and once for restoring them at start up - NonKDEAppButton(const KConfigGroup& config, QWidget* parent); + NonKDEAppButton(const KConfigGroup& config, TQWidget* parent); // reimplemented from PanelButton virtual void saveConfig(KConfigGroup& config) const; @@ -63,29 +63,29 @@ protected slots: protected: // used to set up our internal state, either when creating the button // or after reconfiguration - void initialize(const QString& name, const QString& description, - const QString& filePath, const QString& icon, - const QString& cmdLine, bool inTerm); + void initialize(const TQString& name, const TQString& description, + const TQString& filePath, const TQString& icon, + const TQString& cmdLine, bool inTerm); // run the command! // the execStr parameter, which default to an empty string, // is used to provide additional command line options aside // from the ones in our config file; for instance a URL drag'd onto us - void runCommand(const QString& execStr = QString::null); + void runCommand(const TQString& execStr = TQString::null); // reimplemented from PanelButton - virtual QString tileName() { return "URL"; } - QString defaultIcon() const { return "exec"; }; + virtual TQString tileName() { return "URL"; } + TQString defaultIcon() const { return "exec"; }; // handle drag and drop actions - virtual void dropEvent(QDropEvent *ev); - virtual void dragEnterEvent(QDragEnterEvent *ev); - - QString nameStr; // the name given this button by the user - QString descStr; // the description given this button by the user - QString pathStr; // the path to the command - QString iconStr; // the path to the icon for this button - QString cmdStr; // command line flags, if any + virtual void dropEvent(TQDropEvent *ev); + virtual void dragEnterEvent(TQDragEnterEvent *ev); + + TQString nameStr; // the name given this button by the user + TQString descStr; // the description given this button by the user + TQString pathStr; // the path to the command + TQString iconStr; // the path to the icon for this button + TQString cmdStr; // command line flags, if any bool term; // whether to run this in a terminal or not }; // all done defining the class! diff --git a/kicker/kicker/buttons/servicebutton.cpp b/kicker/kicker/buttons/servicebutton.cpp index a5ec7c9a2..f7322a976 100644 --- a/kicker/kicker/buttons/servicebutton.cpp +++ b/kicker/kicker/buttons/servicebutton.cpp @@ -21,8 +21,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ******************************************************************/ -#include <qdragobject.h> -#include <qtooltip.h> +#include <tqdragobject.h> +#include <tqtooltip.h> #include <kdesktopfile.h> #include <klocale.h> @@ -39,7 +39,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "servicebutton.h" #include "servicebutton.moc" -ServiceButton::ServiceButton(const QString& desktopFile, QWidget* parent) +ServiceButton::ServiceButton(const TQString& desktopFile, TQWidget* parent) : PanelButton(parent, "ServiceButton"), _service(0) { @@ -47,25 +47,25 @@ ServiceButton::ServiceButton(const QString& desktopFile, QWidget* parent) initialize(); } -ServiceButton::ServiceButton(const KService::Ptr &service, QWidget* parent) +ServiceButton::ServiceButton(const KService::Ptr &service, TQWidget* parent) : PanelButton(parent, "ServiceButton"), _service(service), _id(service->storageId()) { if (_id.startsWith("/")) { - QString tmp = KGlobal::dirs()->relativeLocation("appdata", _id); + TQString tmp = KGlobal::dirs()->relativeLocation("appdata", _id); if (!tmp.startsWith("/")) _id = ":"+tmp; } initialize(); } -ServiceButton::ServiceButton( const KConfigGroup& config, QWidget* parent ) +ServiceButton::ServiceButton( const KConfigGroup& config, TQWidget* parent ) : PanelButton(parent, "ServiceButton"), _service(0) { - QString id; + TQString id; if (config.hasKey("StorageId")) id = config.readPathEntry("StorageId"); else @@ -78,7 +78,7 @@ ServiceButton::~ServiceButton() { } -void ServiceButton::loadServiceFromId(const QString &id) +void ServiceButton::loadServiceFromId(const TQString &id) { _id = id; /* this is a KService::Ptr @@ -112,7 +112,7 @@ void ServiceButton::loadServiceFromId(const QString &id) if (_id.startsWith("/")) { - QString tmp = KGlobal::dirs()->relativeLocation("appdata", _id); + TQString tmp = KGlobal::dirs()->relativeLocation("appdata", _id); if (!tmp.startsWith("/")) _id = ":"+tmp; } @@ -121,7 +121,7 @@ void ServiceButton::loadServiceFromId(const QString &id) void ServiceButton::initialize() { readDesktopFile(); - connect(this, SIGNAL(clicked()), SLOT(slotExec())); + connect(this, TQT_SIGNAL(clicked()), TQT_SLOT(slotExec())); } void ServiceButton::readDesktopFile() @@ -134,15 +134,15 @@ void ServiceButton::readDesktopFile() if (!_service->genericName().isEmpty()) { - QToolTip::add(this, _service->genericName()); + TQToolTip::add(this, _service->genericName()); } else if (_service->comment().isEmpty()) { - QToolTip::add(this, _service->name()); + TQToolTip::add(this, _service->name()); } else { - QToolTip::add(this, _service->name() + " - " + _service->comment()); + TQToolTip::add(this, _service->name() + " - " + _service->comment()); } setTitle( _service->name() ); @@ -156,7 +156,7 @@ void ServiceButton::saveConfig( KConfigGroup& config ) const config.writePathEntry("DesktopFile", _service->desktopEntryPath()); } -void ServiceButton::dragEnterEvent(QDragEnterEvent *ev) +void ServiceButton::dragEnterEvent(TQDragEnterEvent *ev) { if ((ev->source() != this) && KURLDrag::canDecode(ev)) ev->accept(rect()); @@ -165,7 +165,7 @@ void ServiceButton::dragEnterEvent(QDragEnterEvent *ev) PanelButton::dragEnterEvent(ev); } -void ServiceButton::dropEvent( QDropEvent* ev ) +void ServiceButton::dropEvent( TQDropEvent* ev ) { KURL::List uriList; if( KURLDrag::decode( ev, uriList ) && _service ) { @@ -177,7 +177,7 @@ void ServiceButton::dropEvent( QDropEvent* ev ) void ServiceButton::startDrag() { - QString path = _service->desktopEntryPath(); + TQString path = _service->desktopEntryPath(); // If the path to the desktop file is relative, try to get the full // path from KStdDirs. @@ -192,7 +192,7 @@ void ServiceButton::slotExec() { // this allows the button to return to a non-pressed state // before launching - QTimer::singleShot(0, this, SLOT(performExec())); + TQTimer::singleShot(0, this, TQT_SLOT(performExec())); } void ServiceButton::performExec() @@ -211,7 +211,7 @@ void ServiceButton::properties() return; } - QString path = _service->desktopEntryPath(); + TQString path = _service->desktopEntryPath(); // If the path to the desktop file is relative, try to get the full // path from KStdDirs. @@ -223,10 +223,10 @@ void ServiceButton::properties() KPropertiesDialog* dialog = new KPropertiesDialog(serviceURL, 0, 0, false, false); dialog->setFileNameReadOnly(true); - connect(dialog, SIGNAL(saveAs(const KURL &, KURL &)), - this, SLOT(slotSaveAs(const KURL &, KURL &))); - connect(dialog, SIGNAL(propertiesClosed()), - this, SLOT(slotUpdate())); + connect(dialog, TQT_SIGNAL(saveAs(const KURL &, KURL &)), + this, TQT_SLOT(slotSaveAs(const KURL &, KURL &))); + connect(dialog, TQT_SIGNAL(propertiesClosed()), + this, TQT_SLOT(slotUpdate())); dialog->show(); } @@ -239,10 +239,10 @@ void ServiceButton::slotUpdate() void ServiceButton::slotSaveAs(const KURL &oldUrl, KURL &newUrl) { - QString oldPath = oldUrl.path(); + TQString oldPath = oldUrl.path(); if (locateLocal("appdata", oldUrl.fileName()) != oldPath) { - QString path = KickerLib::newDesktopFile(oldUrl); + TQString path = KickerLib::newDesktopFile(oldUrl); newUrl.setPath(path); _id = path; } @@ -250,7 +250,7 @@ void ServiceButton::slotSaveAs(const KURL &oldUrl, KURL &newUrl) bool ServiceButton::checkForBackingFile() { - QString id = _id; + TQString id = _id; loadServiceFromId(_id); // we need to reset the _id back to whatever it was diff --git a/kicker/kicker/buttons/servicebutton.h b/kicker/kicker/buttons/servicebutton.h index 26f32791a..2d881d72c 100644 --- a/kicker/kicker/buttons/servicebutton.h +++ b/kicker/kicker/buttons/servicebutton.h @@ -33,9 +33,9 @@ class ServiceButton : public PanelButton Q_OBJECT public: - ServiceButton( const QString& desktopFile, QWidget* parent ); - ServiceButton( const KService::Ptr& service, QWidget* parent ); - ServiceButton( const KConfigGroup& config, QWidget* parent ); + ServiceButton( const TQString& desktopFile, TQWidget* parent ); + ServiceButton( const KService::Ptr& service, TQWidget* parent ); + ServiceButton( const KConfigGroup& config, TQWidget* parent ); ~ServiceButton(); @@ -50,17 +50,17 @@ protected slots: protected: void initialize(); - void loadServiceFromId(const QString &id); + void loadServiceFromId(const TQString &id); void readDesktopFile(); - virtual QString tileName() { return "URL"; } + virtual TQString tileName() { return "URL"; } virtual void startDrag(); - virtual void dropEvent(QDropEvent *); - virtual void dragEnterEvent(QDragEnterEvent *); - QString defaultIcon() const { return "exec"; }; + virtual void dropEvent(TQDropEvent *); + virtual void dragEnterEvent(TQDragEnterEvent *); + TQString defaultIcon() const { return "exec"; }; bool checkForBackingFile(); KService::Ptr _service; - QString _id; + TQString _id; }; #endif diff --git a/kicker/kicker/buttons/servicemenubutton.cpp b/kicker/kicker/buttons/servicemenubutton.cpp index e3fc41185..7a036e796 100644 --- a/kicker/kicker/buttons/servicemenubutton.cpp +++ b/kicker/kicker/buttons/servicemenubutton.cpp @@ -21,7 +21,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ******************************************************************/ -#include <qtooltip.h> +#include <tqtooltip.h> #include <kconfig.h> #include <kservicegroup.h> @@ -32,21 +32,21 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "servicemenubutton.h" #include "servicemenubutton.moc" -ServiceMenuButton::ServiceMenuButton( const QString& relPath, QWidget* parent ) +ServiceMenuButton::ServiceMenuButton( const TQString& relPath, TQWidget* parent ) : PanelPopupButton( parent, "ServiceMenuButton" ) , topMenu( 0 ) { initialize( relPath ); } -ServiceMenuButton::ServiceMenuButton( const KConfigGroup& config, QWidget* parent ) +ServiceMenuButton::ServiceMenuButton( const KConfigGroup& config, TQWidget* parent ) : PanelPopupButton( parent, "ServiceMenuButton" ) , topMenu( 0 ) { initialize( config.readPathEntry("RelPath") ); } -void ServiceMenuButton::initialize( const QString& relPath ) +void ServiceMenuButton::initialize( const TQString& relPath ) { KServiceGroup::Ptr group = KServiceGroup::group( relPath ); @@ -56,13 +56,13 @@ void ServiceMenuButton::initialize( const QString& relPath ) return; } - QString caption = group->caption(); + TQString caption = group->caption(); if (caption.isEmpty()) { caption = i18n("Applications"); } - QString comment = group->comment(); + TQString comment = group->comment(); if (comment.isEmpty()) { comment = caption; @@ -70,7 +70,7 @@ void ServiceMenuButton::initialize( const QString& relPath ) topMenu = new PanelServiceMenu(caption, relPath); setPopup(topMenu); - QToolTip::add(this, comment); + TQToolTip::add(this, comment); setTitle(caption); setIcon(group->icon()); } diff --git a/kicker/kicker/buttons/servicemenubutton.h b/kicker/kicker/buttons/servicemenubutton.h index 1bd9d1885..0bd05b8ee 100644 --- a/kicker/kicker/buttons/servicemenubutton.h +++ b/kicker/kicker/buttons/servicemenubutton.h @@ -36,15 +36,15 @@ class ServiceMenuButton : public PanelPopupButton Q_OBJECT public: - ServiceMenuButton( const QString& relPath, QWidget* parent ); - ServiceMenuButton( const KConfigGroup& config, QWidget* parent ); + ServiceMenuButton( const TQString& relPath, TQWidget* parent ); + ServiceMenuButton( const KConfigGroup& config, TQWidget* parent ); void saveConfig( KConfigGroup& config ) const; protected: - void initialize( const QString& relPath ); - virtual QString tileName() { return "Browser"; } - virtual QString defaultIcon() const { return "folder"; } + void initialize( const TQString& relPath ); + virtual TQString tileName() { return "Browser"; } + virtual TQString defaultIcon() const { return "folder"; } virtual void startDrag(); virtual void initPopup(); diff --git a/kicker/kicker/buttons/urlbutton.cpp b/kicker/kicker/buttons/urlbutton.cpp index 007b0cc00..a61b5d775 100644 --- a/kicker/kicker/buttons/urlbutton.cpp +++ b/kicker/kicker/buttons/urlbutton.cpp @@ -21,8 +21,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ******************************************************************/ -#include <qtooltip.h> -#include <qfile.h> +#include <tqtooltip.h> +#include <tqfile.h> #include <kdesktopfile.h> #include <kfileitem.h> @@ -44,7 +44,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "urlbutton.h" #include "urlbutton.moc" -URLButton::URLButton( const QString& url, QWidget* parent ) +URLButton::URLButton( const TQString& url, TQWidget* parent ) : PanelButton( parent, "URLButton" ) , fileItem( 0 ) , pDlg( 0 ) @@ -52,7 +52,7 @@ URLButton::URLButton( const QString& url, QWidget* parent ) initialize( url ); } -URLButton::URLButton( const KConfigGroup& config, QWidget* parent ) +URLButton::URLButton( const KConfigGroup& config, TQWidget* parent ) : PanelButton( parent, "URLButton" ) , fileItem( 0 ) , pDlg( 0 ) @@ -65,12 +65,12 @@ URLButton::~URLButton() delete fileItem; } -void URLButton::initialize( const QString& _url ) +void URLButton::initialize( const TQString& _url ) { KURL url(_url); if (!url.isLocalFile() || !url.path().endsWith(".desktop")) { - QString file = KickerLib::newDesktopFile(url); + TQString file = KickerLib::newDesktopFile(url); KDesktopFile df(file); df.writeEntry("Encoding", "UTF-8"); df.writeEntry("Type","Link"); @@ -90,7 +90,7 @@ void URLButton::initialize( const QString& _url ) } fileItem = new KFileItem( KFileItem::Unknown, KFileItem::Unknown, url ); setIcon( fileItem->iconName() ); - connect( this, SIGNAL(clicked()), SLOT(slotExec()) ); + connect( this, TQT_SIGNAL(clicked()), TQT_SLOT(slotExec()) ); setToolTip(); if (url.isLocalFile()) @@ -113,23 +113,23 @@ void URLButton::setToolTip() if (df.readComment().isEmpty()) { - QToolTip::add(this, df.readName()); + TQToolTip::add(this, df.readName()); } else { - QToolTip::add(this, df.readName() + " - " + df.readComment()); + TQToolTip::add(this, df.readName() + " - " + df.readComment()); } setTitle(df.readName()); } else { - QToolTip::add(this, fileItem->url().prettyURL()); + TQToolTip::add(this, fileItem->url().prettyURL()); setTitle(fileItem->url().prettyURL()); } } -void URLButton::dragEnterEvent(QDragEnterEvent *ev) +void URLButton::dragEnterEvent(TQDragEnterEvent *ev) { if ((ev->source() != this) && fileItem->acceptsDrops() && KURLDrag::canDecode(ev)) ev->accept(rect()); @@ -138,7 +138,7 @@ void URLButton::dragEnterEvent(QDragEnterEvent *ev) PanelButton::dragEnterEvent(ev); } -void URLButton::dropEvent(QDropEvent *ev) +void URLButton::dropEvent(TQDropEvent *ev) { kapp->propagateSessionManager(); KURL::List execList; @@ -186,7 +186,7 @@ void URLButton::updateURL() void URLButton::properties() { - if ( (fileItem->isLocalFile() && !QFile::exists(fileItem->url().path()) ) + if ( (fileItem->isLocalFile() && !TQFile::exists(fileItem->url().path()) ) || !fileItem->url().isValid()) { KMessageBox::error( 0L, i18n("The file %1 does not exist") @@ -196,6 +196,6 @@ void URLButton::properties() pDlg = new KPropertiesDialog(fileItem, 0L, 0L, false, false); // will delete itself pDlg->setFileNameReadOnly(true); - connect(pDlg, SIGNAL(applied()), SLOT(updateURL())); + connect(pDlg, TQT_SIGNAL(applied()), TQT_SLOT(updateURL())); pDlg->show(); } diff --git a/kicker/kicker/buttons/urlbutton.h b/kicker/kicker/buttons/urlbutton.h index e6f6b12e0..c2cbd2a19 100644 --- a/kicker/kicker/buttons/urlbutton.h +++ b/kicker/kicker/buttons/urlbutton.h @@ -37,8 +37,8 @@ class URLButton : public PanelButton Q_OBJECT public: - URLButton( const QString& url, QWidget* parent ); - URLButton( const KConfigGroup& config, QWidget* parent ); + URLButton( const TQString& url, TQWidget* parent ); + URLButton( const KConfigGroup& config, TQWidget* parent ); virtual ~URLButton(); @@ -51,11 +51,11 @@ protected slots: void updateURL(); protected: - void initialize( const QString& url ); - virtual QString tileName() { return "URL"; } + void initialize( const TQString& url ); + virtual TQString tileName() { return "URL"; } virtual void startDrag(); - virtual void dropEvent(QDropEvent *); - virtual void dragEnterEvent(QDragEnterEvent *); + virtual void dropEvent(TQDropEvent *); + virtual void dragEnterEvent(TQDragEnterEvent *); void setToolTip(); KFileItem *fileItem; diff --git a/kicker/kicker/buttons/windowlistbutton.cpp b/kicker/kicker/buttons/windowlistbutton.cpp index 8a60ca5e8..0b413d880 100644 --- a/kicker/kicker/buttons/windowlistbutton.cpp +++ b/kicker/kicker/buttons/windowlistbutton.cpp @@ -21,7 +21,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ******************************************************************/ -#include <qtooltip.h> +#include <tqtooltip.h> #include <kwindowlistmenu.h> #include <klocale.h> @@ -29,7 +29,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "windowlistbutton.h" #include "windowlistbutton.moc" -WindowListButton::WindowListButton( QWidget* parent ) +WindowListButton::WindowListButton( TQWidget* parent ) : PanelPopupButton( parent, "WindowListButton" ) , topMenu( 0 ) { @@ -37,7 +37,7 @@ WindowListButton::WindowListButton( QWidget* parent ) setPopup(topMenu); setTitle(i18n("Window List")); - QToolTip::add(this, i18n("Window list")); + TQToolTip::add(this, i18n("Window list")); setIcon("window_list"); } diff --git a/kicker/kicker/buttons/windowlistbutton.h b/kicker/kicker/buttons/windowlistbutton.h index 23dc26c19..d8b57c62e 100644 --- a/kicker/kicker/buttons/windowlistbutton.h +++ b/kicker/kicker/buttons/windowlistbutton.h @@ -36,10 +36,10 @@ class WindowListButton : public PanelPopupButton Q_OBJECT public: - WindowListButton( QWidget* parent ); + WindowListButton( TQWidget* parent ); protected: - virtual QString tileName() { return "WindowList"; } + virtual TQString tileName() { return "WindowList"; } virtual void initPopup(); KWindowListMenu* topMenu; diff --git a/kicker/kicker/core/applethandle.cpp b/kicker/kicker/core/applethandle.cpp index cd9de3c62..251cbc1bd 100644 --- a/kicker/kicker/core/applethandle.cpp +++ b/kicker/kicker/core/applethandle.cpp @@ -21,14 +21,14 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ******************************************************************/ -#include <qcursor.h> -#include <qlayout.h> -#include <qpainter.h> -#include <qstyle.h> -#include <qpixmapcache.h> -#include <qtimer.h> -#include <qtooltip.h> -#include <qimage.h> +#include <tqcursor.h> +#include <tqlayout.h> +#include <tqpainter.h> +#include <tqstyle.h> +#include <tqpixmapcache.h> +#include <tqtimer.h> +#include <tqtooltip.h> +#include <tqimage.h> #include <kpushbutton.h> #include <kapplication.h> @@ -43,7 +43,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "applethandle.h" AppletHandle::AppletHandle(AppletContainer* parent) - : QWidget(parent), + : TQWidget(parent), m_applet(parent), m_menuButton(0), m_drawHandle(false), @@ -52,7 +52,7 @@ AppletHandle::AppletHandle(AppletContainer* parent) { setBackgroundOrigin(AncestorOrigin); setMinimumSize(widthForHeight(0), heightForWidth(0)); - m_layout = new QBoxLayout(this, QBoxLayout::BottomToTop, 0, 0); + m_layout = new TQBoxLayout(this, TQBoxLayout::BottomToTop, 0, 0); m_dragBar = new AppletHandleDrag(this); m_dragBar->installEventFilter(this); @@ -64,25 +64,25 @@ AppletHandle::AppletHandle(AppletContainer* parent) m_menuButton->installEventFilter(this); m_layout->addWidget(m_menuButton); - connect(m_menuButton, SIGNAL(pressed()), - this, SLOT(menuButtonPressed())); - QToolTip::add(m_menuButton, i18n("%1 menu").arg(parent->info().name())); + connect(m_menuButton, TQT_SIGNAL(pressed()), + this, TQT_SLOT(menuButtonPressed())); + TQToolTip::add(m_menuButton, i18n("%1 menu").arg(parent->info().name())); } - QToolTip::add(this, i18n("%1 applet handle").arg(parent->info().name())); + TQToolTip::add(this, i18n("%1 applet handle").arg(parent->info().name())); resetLayout(); } int AppletHandle::heightForWidth( int /* w */ ) const { - int size = style().pixelMetric(QStyle::PM_DockWindowHandleExtent, this); + int size = style().pixelMetric(TQStyle::PM_DockWindowHandleExtent, this); return size; } int AppletHandle::widthForHeight( int /* h */ ) const { - int size = style().pixelMetric(QStyle::PM_DockWindowHandleExtent, this); + int size = style().pixelMetric(TQStyle::PM_DockWindowHandleExtent, this); return size; } @@ -101,19 +101,19 @@ void AppletHandle::setPopupDirection(KPanelApplet::Direction d) switch (m_popupDirection) { case KPanelApplet::Up: - m_layout->setDirection(QBoxLayout::BottomToTop); + m_layout->setDirection(TQBoxLayout::BottomToTop); a = Qt::UpArrow; break; case KPanelApplet::Down: - m_layout->setDirection(QBoxLayout::TopToBottom); + m_layout->setDirection(TQBoxLayout::TopToBottom); a = Qt::DownArrow; break; case KPanelApplet::Left: - m_layout->setDirection(QBoxLayout::RightToLeft); + m_layout->setDirection(TQBoxLayout::RightToLeft); a = Qt::LeftArrow; break; case KPanelApplet::Right: - m_layout->setDirection(QBoxLayout::LeftToRight); + m_layout->setDirection(TQBoxLayout::LeftToRight); a = Qt::RightArrow; break; } @@ -150,9 +150,9 @@ void AppletHandle::setFadeOutHandle(bool fadeOut) { if (!m_handleHoverTimer) { - m_handleHoverTimer = new QTimer(this); - connect(m_handleHoverTimer, SIGNAL(timeout()), - this, SLOT(checkHandleHover())); + m_handleHoverTimer = new TQTimer(this); + connect(m_handleHoverTimer, TQT_SIGNAL(timeout()), + this, TQT_SLOT(checkHandleHover())); m_applet->installEventFilter(this); } } @@ -166,13 +166,13 @@ void AppletHandle::setFadeOutHandle(bool fadeOut) resetLayout(); } -bool AppletHandle::eventFilter(QObject *o, QEvent *e) +bool AppletHandle::eventFilter(TQObject *o, TQEvent *e) { if (o == parent()) { switch (e->type()) { - case QEvent::Enter: + case TQEvent::Enter: { m_drawHandle = true; resetLayout(); @@ -184,14 +184,14 @@ bool AppletHandle::eventFilter(QObject *o, QEvent *e) break; } - case QEvent::Leave: + case TQEvent::Leave: { if (m_menuButton && m_menuButton->isOn()) { break; } - QWidget* w = dynamic_cast<QWidget*>(o); + TQWidget* w = dynamic_cast<TQWidget*>(o); bool nowDrawIt = false; if (w) @@ -199,7 +199,7 @@ bool AppletHandle::eventFilter(QObject *o, QEvent *e) // a hack for applets that have out-of-process // elements (e.g the systray) so that the handle // doesn't flicker when moving over those elements - if (w->rect().contains(w->mapFromGlobal(QCursor::pos()))) + if (w->rect().contains(w->mapFromGlobal(TQCursor::pos()))) { nowDrawIt = true; } @@ -222,13 +222,13 @@ bool AppletHandle::eventFilter(QObject *o, QEvent *e) break; } - return QWidget::eventFilter( o, e ); + return TQWidget::eventFilter( o, e ); } else if (o == m_dragBar) { - if (e->type() == QEvent::MouseButtonPress) + if (e->type() == TQEvent::MouseButtonPress) { - QMouseEvent* ev = static_cast<QMouseEvent*>(e); + TQMouseEvent* ev = static_cast<TQMouseEvent*>(e); if (ev->button() == LeftButton || ev->button() == MidButton) { emit moveApplet(m_applet->mapFromGlobal(ev->globalPos())); @@ -236,9 +236,9 @@ bool AppletHandle::eventFilter(QObject *o, QEvent *e) } } - if (m_menuButton && e->type() == QEvent::MouseButtonPress) + if (m_menuButton && e->type() == TQEvent::MouseButtonPress) { - QMouseEvent* ev = static_cast<QMouseEvent*>(e); + TQMouseEvent* ev = static_cast<TQMouseEvent*>(e); if (ev->button() == RightButton) { if (!m_menuButton->isDown()) @@ -251,7 +251,7 @@ bool AppletHandle::eventFilter(QObject *o, QEvent *e) } } - return QWidget::eventFilter(o, e); // standard event processing + return TQWidget::eventFilter(o, e); // standard event processing } void AppletHandle::menuButtonPressed() @@ -263,7 +263,7 @@ void AppletHandle::menuButtonPressed() emit showAppletMenu(); - if (!onMenuButton(QCursor::pos())) + if (!onMenuButton(TQCursor::pos())) { toggleMenuButtonOff(); } @@ -274,7 +274,7 @@ void AppletHandle::checkHandleHover() if (!m_handleHoverTimer || (m_menuButton && m_menuButton->isOn()) || m_applet->geometry().contains(m_applet->mapToParent( - m_applet->mapFromGlobal(QCursor::pos())))) + m_applet->mapFromGlobal(TQCursor::pos())))) { return; } @@ -284,7 +284,7 @@ void AppletHandle::checkHandleHover() resetLayout(); } -bool AppletHandle::onMenuButton(const QPoint& point) const +bool AppletHandle::onMenuButton(const TQPoint& point) const { return m_menuButton && (childAt(mapFromGlobal(point)) == m_menuButton); } @@ -300,78 +300,78 @@ void AppletHandle::toggleMenuButtonOff() } AppletHandleDrag::AppletHandleDrag(AppletHandle* parent) - : QWidget(parent), + : TQWidget(parent), m_parent(parent), m_inside(false) { setBackgroundOrigin( AncestorOrigin ); } -QSize AppletHandleDrag::minimumSizeHint() const +TQSize AppletHandleDrag::minimumSizeHint() const { - int wh = style().pixelMetric(QStyle::PM_DockWindowHandleExtent, this); + int wh = style().pixelMetric(TQStyle::PM_DockWindowHandleExtent, this); if (m_parent->orientation() == Horizontal) { - return QSize(wh, 0); + return TQSize(wh, 0); } - return QSize(0, wh); + return TQSize(0, wh); } -QSizePolicy AppletHandleDrag::sizePolicy() const +TQSizePolicy AppletHandleDrag::sizePolicy() const { if (m_parent->orientation() == Horizontal) { - return QSizePolicy( QSizePolicy::Fixed, QSizePolicy::Preferred ); + return TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Preferred ); } - return QSizePolicy( QSizePolicy::Preferred, QSizePolicy::Fixed ); + return TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Fixed ); } -void AppletHandleDrag::enterEvent( QEvent *e ) +void AppletHandleDrag::enterEvent( TQEvent *e ) { m_inside = true; - QWidget::enterEvent( e ); + TQWidget::enterEvent( e ); update(); } -void AppletHandleDrag::leaveEvent( QEvent *e ) +void AppletHandleDrag::leaveEvent( TQEvent *e ) { m_inside = false; - QWidget::enterEvent( e ); + TQWidget::enterEvent( e ); update(); } -void AppletHandleDrag::paintEvent(QPaintEvent *) +void AppletHandleDrag::paintEvent(TQPaintEvent *) { - QPainter p(this); + TQPainter p(this); if (!KickerSettings::transparent()) { if (paletteBackgroundPixmap()) { - QPoint offset = backgroundOffset(); + TQPoint offset = backgroundOffset(); int ox = offset.x(); int oy = offset.y(); p.drawTiledPixmap( 0, 0, width(), height(),*paletteBackgroundPixmap(), ox, oy); } - QStyle::SFlags flags = QStyle::Style_Default; - flags |= QStyle::Style_Enabled; + TQStyle::SFlags flags = TQStyle::Style_Default; + flags |= TQStyle::Style_Enabled; if (m_parent->orientation() == Horizontal) { - flags |= QStyle::Style_Horizontal; + flags |= TQStyle::Style_Horizontal; } - QRect r = rect(); + TQRect r = rect(); - style().drawPrimitive(QStyle::PE_DockWindowHandle, &p, r, + style().drawPrimitive(TQStyle::PE_DockWindowHandle, &p, r, colorGroup(), flags); } else { - KickerLib::drawBlendedRect(&p, QRect(0, 0, width(), height()), paletteForegroundColor(), m_inside ? 0x40 : 0x20); + KickerLib::drawBlendedRect(&p, TQRect(0, 0, width(), height()), paletteForegroundColor(), m_inside ? 0x40 : 0x20); } } @@ -381,22 +381,22 @@ AppletHandleButton::AppletHandleButton(AppletHandle *parent) { } -QSize AppletHandleButton::minimumSizeHint() const +TQSize AppletHandleButton::minimumSizeHint() const { - int height = style().pixelMetric(QStyle::PM_DockWindowHandleExtent, this); + int height = style().pixelMetric(TQStyle::PM_DockWindowHandleExtent, this); int width = height; if (m_parent->orientation() == Horizontal) { - return QSize(width, height); + return TQSize(width, height); } - return QSize(height, width); + return TQSize(height, width); } -QSizePolicy AppletHandleButton::sizePolicy() const +TQSizePolicy AppletHandleButton::sizePolicy() const { - return QSizePolicy( QSizePolicy::Fixed, QSizePolicy::Fixed ); + return TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ); } #include "applethandle.moc" diff --git a/kicker/kicker/core/applethandle.h b/kicker/kicker/core/applethandle.h index 2158756cb..ab340af06 100644 --- a/kicker/kicker/core/applethandle.h +++ b/kicker/kicker/core/applethandle.h @@ -24,8 +24,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #ifndef __applethandle_h__ #define __applethandle_h__ -#include <qwidget.h> -#include <qpushbutton.h> +#include <tqwidget.h> +#include <tqpushbutton.h> #include "container_applet.h" #include "simplebutton.h" @@ -45,7 +45,7 @@ class AppletHandle : public QWidget void resetLayout(); void setFadeOutHandle(bool); - bool eventFilter (QObject *, QEvent *); + bool eventFilter (TQObject *, TQEvent *); int widthForHeight( int h ) const; int heightForWidth( int w ) const; @@ -61,10 +61,10 @@ class AppletHandle : public QWidget return m_applet->orientation(); } - bool onMenuButton(const QPoint& point) const; + bool onMenuButton(const TQPoint& point) const; signals: - void moveApplet( const QPoint& moveOffset ); + void moveApplet( const TQPoint& moveOffset ); void showAppletMenu(); public slots: @@ -76,12 +76,12 @@ class AppletHandle : public QWidget private: AppletContainer* m_applet; - QBoxLayout* m_layout; + TQBoxLayout* m_layout; AppletHandleDrag* m_dragBar; AppletHandleButton* m_menuButton; bool m_drawHandle; KPanelApplet::Direction m_popupDirection; - QTimer* m_handleHoverTimer; + TQTimer* m_handleHoverTimer; bool m_inside; }; @@ -92,15 +92,15 @@ class AppletHandleDrag : public QWidget public: AppletHandleDrag(AppletHandle* parent); - QSize minimumSizeHint() const; - QSize minimumSize() const { return minimumSizeHint(); } - QSize sizeHint() const { return minimumSize(); } - QSizePolicy sizePolicy() const; + TQSize minimumSizeHint() const; + TQSize minimumSize() const { return minimumSizeHint(); } + TQSize sizeHint() const { return minimumSize(); } + TQSizePolicy sizePolicy() const; protected: - void paintEvent( QPaintEvent* ); - void enterEvent( QEvent* ); - void leaveEvent( QEvent* ); + void paintEvent( TQPaintEvent* ); + void enterEvent( TQEvent* ); + void leaveEvent( TQEvent* ); const AppletHandle* m_parent; private: @@ -113,10 +113,10 @@ class AppletHandleButton : public SimpleArrowButton public: AppletHandleButton(AppletHandle *parent); - QSize minimumSizeHint() const; - QSize minimumSize() const { return minimumSizeHint(); } - QSize sizeHint() const { return minimumSize(); } - QSizePolicy sizePolicy() const; + TQSize minimumSizeHint() const; + TQSize minimumSize() const { return minimumSizeHint(); } + TQSize sizeHint() const { return minimumSize(); } + TQSizePolicy sizePolicy() const; private: bool m_moveMouse; diff --git a/kicker/kicker/core/container_applet.cpp b/kicker/kicker/core/container_applet.cpp index 390b934d3..77c6d1912 100644 --- a/kicker/kicker/core/container_applet.cpp +++ b/kicker/kicker/core/container_applet.cpp @@ -21,14 +21,14 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ******************************************************************/ -#include <qcursor.h> +#include <tqcursor.h> #include <qxembed.h> -#include <qframe.h> -#include <qlayout.h> -#include <qhbox.h> -#include <qfile.h> -#include <qtimer.h> -#include <qtooltip.h> +#include <tqframe.h> +#include <tqlayout.h> +#include <tqhbox.h> +#include <tqfile.h> +#include <tqtimer.h> +#include <tqtooltip.h> #include <dcopclient.h> #include <kapplication.h> @@ -57,12 +57,12 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #define APPLET_MARGIN 1 AppletContainer::AppletContainer(const AppletInfo& info, - QPopupMenu* opMenu, + TQPopupMenu* opMenu, bool immutable, - QWidget* parent ) + TQWidget* parent ) : BaseContainer(opMenu, parent, - QString(info.library() + "container").latin1()), + TQString(info.library() + "container").latin1()), _info(info), _handle(0), _layout(0), @@ -74,28 +74,28 @@ AppletContainer::AppletContainer(const AppletInfo& info, setBackgroundOrigin(AncestorOrigin); //setup appletframe - _appletframe = new QHBox(this); + _appletframe = new TQHBox(this); _appletframe->setBackgroundOrigin( AncestorOrigin ); - _appletframe->setFrameStyle(QFrame::NoFrame); + _appletframe->setFrameStyle(TQFrame::NoFrame); _appletframe->installEventFilter(this); if (orientation() == Horizontal) { - _layout = new QBoxLayout(this, QBoxLayout::LeftToRight, 0, 0); + _layout = new TQBoxLayout(this, TQBoxLayout::LeftToRight, 0, 0); } else { - _layout = new QBoxLayout(this, QBoxLayout::TopToBottom, 0, 0); + _layout = new TQBoxLayout(this, TQBoxLayout::TopToBottom, 0, 0); } - _layout->setResizeMode( QLayout::FreeResize ); + _layout->setResizeMode( TQLayout::FreeResize ); _layout->addSpacing(APPLET_MARGIN); _handle = new AppletHandle(this); _layout->addWidget(_handle, 0); - connect(_handle, SIGNAL(moveApplet(const QPoint&)), - this, SLOT(moveApplet(const QPoint&))); - connect(_handle, SIGNAL(showAppletMenu()), this, SLOT(showAppletMenu())); + connect(_handle, TQT_SIGNAL(moveApplet(const TQPoint&)), + this, TQT_SLOT(moveApplet(const TQPoint&))); + connect(_handle, TQT_SIGNAL(showAppletMenu()), this, TQT_SLOT(showAppletMenu())); _layout->addWidget(_appletframe, 1); _layout->activate(); @@ -124,12 +124,12 @@ AppletContainer::AppletContainer(const AppletInfo& info, setImmutable(immutable); - connect(_applet, SIGNAL(updateLayout()), SLOT(slotUpdateLayout())); - connect(_applet, SIGNAL(requestFocus()), SLOT(activateWindow())); - connect(_applet, SIGNAL(requestFocus(bool)), SLOT(focusRequested(bool))); + connect(_applet, TQT_SIGNAL(updateLayout()), TQT_SLOT(slotUpdateLayout())); + connect(_applet, TQT_SIGNAL(requestFocus()), TQT_SLOT(activateWindow())); + connect(_applet, TQT_SIGNAL(requestFocus(bool)), TQT_SLOT(focusRequested(bool))); - connect(Kicker::the(), SIGNAL(configurationChanged()), - this, SLOT(slotReconfigure())); + connect(Kicker::the(), TQT_SIGNAL(configurationChanged()), + this, TQT_SLOT(slotReconfigure())); } void AppletContainer::configure() @@ -193,17 +193,17 @@ void AppletContainer::resetLayout() if (orientation() == Horizontal) { - _layout->setDirection( QBoxLayout::LeftToRight ); + _layout->setDirection( TQBoxLayout::LeftToRight ); } else { - _layout->setDirection( QBoxLayout::TopToBottom ); + _layout->setDirection( TQBoxLayout::TopToBottom ); } _layout->activate(); } -void AppletContainer::moveApplet( const QPoint& moveOffset ) +void AppletContainer::moveApplet( const TQPoint& moveOffset ) { _moveOffset = moveOffset; emit moveme(this); @@ -221,7 +221,7 @@ void AppletContainer::showAppletMenu() return; } - QPopupMenu *menu = opMenu(); + TQPopupMenu *menu = opMenu(); Kicker::the()->setInsertionPoint(_handle->mapToGlobal(_handle->rect().center())); @@ -231,7 +231,7 @@ void AppletContainer::showAppletMenu() moveApplet(_handle->mapToParent(_handle->rect().center())); break; case PanelAppletOpMenu::Remove: - Kicker::the()->setInsertionPoint(QPoint()); + Kicker::the()->setInsertionPoint(TQPoint()); emit removeme(this); return; // Above signal will cause this to be deleted. break; @@ -251,7 +251,7 @@ void AppletContainer::showAppletMenu() break; } - Kicker::the()->setInsertionPoint(QPoint()); + Kicker::the()->setInsertionPoint(TQPoint()); clearOpMenu(); } @@ -270,7 +270,7 @@ void AppletContainer::slotRemoved(KConfig* config) return; } - QFile::remove(locateLocal("config", _configFile)); + TQFile::remove(locateLocal("config", _configFile)); } void AppletContainer::activateWindow() @@ -314,15 +314,15 @@ void AppletContainer::doSaveConfiguration( KConfigGroup& config, } } -QPopupMenu* AppletContainer::createOpMenu() +TQPopupMenu* AppletContainer::createOpMenu() { - QPopupMenu* opMenu = new PanelAppletOpMenu(_actions, appletOpMenu(), + TQPopupMenu* opMenu = new PanelAppletOpMenu(_actions, appletOpMenu(), appletsOwnMenu(), _info.name(), _info.icon(), this); - connect(opMenu, SIGNAL(escapePressed()), - _handle, SLOT(toggleMenuButtonOff())); + connect(opMenu, TQT_SIGNAL(escapePressed()), + _handle, TQT_SLOT(toggleMenuButtonOff())); return opMenu; } @@ -339,7 +339,7 @@ void AppletContainer::slotUpdateLayout() } -const QPopupMenu* AppletContainer::appletsOwnMenu() const +const TQPopupMenu* AppletContainer::appletsOwnMenu() const { if (!_applet) { @@ -447,8 +447,8 @@ void AppletContainer::setBackground() if (KickerSettings::transparent()) { // Trick to tell applets that they must refresh their transparent background if they need. - QMoveEvent e(_applet->pos(), _applet->pos()); - QApplication::sendEvent(_applet, &e); + TQMoveEvent e(_applet->pos(), _applet->pos()); + TQApplication::sendEvent(_applet, &e); } } @@ -471,7 +471,7 @@ void AppletContainer::setImmutable(bool immutable) } else if (!_handle->isVisibleTo(this)) { - QToolTip::add(_handle, _info.name()); + TQToolTip::add(_handle, _info.name()); _handle->show(); setBackground(); } diff --git a/kicker/kicker/core/container_applet.h b/kicker/kicker/core/container_applet.h index 8c364c09f..11eed1bfe 100644 --- a/kicker/kicker/core/container_applet.h +++ b/kicker/kicker/core/container_applet.h @@ -43,11 +43,11 @@ class AppletContainer : public BaseContainer Q_OBJECT public: - AppletContainer(const AppletInfo& info, QPopupMenu* opMenu, bool isImmutable = false, QWidget* parent = 0); + AppletContainer(const AppletInfo& info, TQPopupMenu* opMenu, bool isImmutable = false, TQWidget* parent = 0); KPanelApplet::Type type() const { return _type; } const AppletInfo& info() const { return _info; } - const QPopupMenu* appletsOwnMenu() const; + const TQPopupMenu* appletsOwnMenu() const; bool isStretch() const { return type() == KPanelApplet::Stretch; } void resetLayout(); @@ -58,9 +58,9 @@ public: virtual void reportBug(); virtual void setBackground(); virtual bool isValid() const { return _valid; } - virtual QString appletType() const { return "Applet"; } - virtual QString icon() const { return _info.icon(); } - virtual QString visibleName() const { return _info.name(); } + virtual TQString appletType() const { return "Applet"; } + virtual TQString icon() const { return _info.icon(); } + virtual TQString visibleName() const { return _info.name(); } int widthForHeight(int height) const; int heightForWidth(int width) const; @@ -76,7 +76,7 @@ public slots: virtual void setPopupDirection(KPanelApplet::Direction d); virtual void setOrientation(KPanelExtension::Orientation o); virtual void setImmutable(bool immutable); - void moveApplet( const QPoint& moveOffset ); + void moveApplet( const TQPoint& moveOffset ); void showAppletMenu(); void slotReconfigure(); void activateWindow(); @@ -86,18 +86,18 @@ protected: virtual void doSaveConfiguration( KConfigGroup&, bool layoutOnly ) const; virtual void alignmentChange(KPanelExtension::Alignment a); - virtual QPopupMenu* createOpMenu(); + virtual TQPopupMenu* createOpMenu(); AppletInfo _info; AppletHandle *_handle; - QHBox *_appletframe; - QBoxLayout *_layout; + TQHBox *_appletframe; + TQBoxLayout *_layout; KPanelApplet::Type _type; int _widthForHeightHint; int _heightForWidthHint; - QString _deskFile, _configFile; + TQString _deskFile, _configFile; bool _firstuse; - QCString _id; + TQCString _id; KPanelApplet * _applet; bool _valid; diff --git a/kicker/kicker/core/container_base.cpp b/kicker/kicker/core/container_base.cpp index cadbe592a..bb3d7d984 100644 --- a/kicker/kicker/core/container_base.cpp +++ b/kicker/kicker/core/container_base.cpp @@ -21,7 +21,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ******************************************************************/ -#include <qpopupmenu.h> +#include <tqpopupmenu.h> #include <kglobal.h> #include <kconfig.h> @@ -34,14 +34,14 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "container_base.h" #include "container_base.moc" -BaseContainer::BaseContainer( QPopupMenu* appletOpMenu, QWidget* parent, const char * name ) - : QWidget( parent, name ) +BaseContainer::BaseContainer( TQPopupMenu* appletOpMenu, TQWidget* parent, const char * name ) + : TQWidget( parent, name ) , _dir(KPanelApplet::Up) , _orient(Horizontal) , _alignment(KPanelExtension::LeftTop) , _fspace(0) - , _moveOffset(QPoint(0,0)) - , _aid(QString::null) + , _moveOffset(TQPoint(0,0)) + , _aid(TQString::null) , _actions(0) , m_immutable(false) , _opMnu(0) @@ -53,10 +53,10 @@ BaseContainer::~BaseContainer() delete _opMnu; } -void BaseContainer::reparent(QWidget* parent, WFlags f, const QPoint& p, bool showIt) +void BaseContainer::reparent(TQWidget* parent, WFlags f, const TQPoint& p, bool showIt) { emit takeme(this); - QWidget::reparent(parent, f, p, showIt); + TQWidget::reparent(parent, f, p, showIt); } bool BaseContainer::isImmutable() const @@ -121,7 +121,7 @@ void BaseContainer::setAlignment(KPanelExtension::Alignment a) alignmentChange(a); } -QPopupMenu* BaseContainer::opMenu() +TQPopupMenu* BaseContainer::opMenu() { if (_opMnu == 0) { diff --git a/kicker/kicker/core/container_base.h b/kicker/kicker/core/container_base.h index aa3efeb98..1da1500cd 100644 --- a/kicker/kicker/core/container_base.h +++ b/kicker/kicker/core/container_base.h @@ -24,9 +24,9 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #ifndef __container_base_h__ #define __container_base_h__ -#include <qwidget.h> -#include <qpoint.h> -#include <qvaluelist.h> +#include <tqwidget.h> +#include <tqpoint.h> +#include <tqvaluelist.h> #include <kpanelextension.h> #include <kpanelapplet.h> @@ -39,14 +39,14 @@ class BaseContainer : public QWidget Q_OBJECT public: - typedef QValueList<BaseContainer*> List; - typedef QValueListIterator<BaseContainer*> Iterator; - typedef QValueListConstIterator<BaseContainer*> ConstIterator; + typedef TQValueList<BaseContainer*> List; + typedef TQValueListIterator<BaseContainer*> Iterator; + typedef TQValueListConstIterator<BaseContainer*> ConstIterator; - BaseContainer( QPopupMenu* appletOpMenu, QWidget* parent = 0, const char * name = 0 ); + BaseContainer( TQPopupMenu* appletOpMenu, TQWidget* parent = 0, const char * name = 0 ); ~BaseContainer(); - virtual void reparent(QWidget * parent, WFlags f, const QPoint & p, bool showIt = false); + virtual void reparent(TQWidget * parent, WFlags f, const TQPoint & p, bool showIt = false); virtual int widthForHeight(int height) const = 0; virtual int heightForWidth(int width) const = 0; @@ -66,8 +66,8 @@ public: double freeSpace() const { return _fspace; } void setFreeSpace(double f) { _fspace = f; } - QString appletId() const { return _aid; } - void setAppletId(const QString& s) { _aid = s; } + TQString appletId() const { return _aid; } + void setAppletId(const TQString& s) { _aid = s; } virtual int actions() const { return _actions; } @@ -77,7 +77,7 @@ public: virtual void setBackground() {} - QPopupMenu* opMenu(); + TQPopupMenu* opMenu(); void clearOpMenu(); void loadConfiguration( KConfigGroup& ); @@ -86,11 +86,11 @@ public: void configure(KPanelExtension::Orientation, KPanelApplet::Direction); virtual void configure() {} - QPoint moveOffset() const { return _moveOffset; } + TQPoint moveOffset() const { return _moveOffset; } - virtual QString appletType() const = 0; - virtual QString icon() const { return "unknown"; } - virtual QString visibleName() const = 0; + virtual TQString appletType() const = 0; + virtual TQString icon() const { return "unknown"; } + virtual TQString visibleName() const = 0; public slots: virtual void slotRemoved(KConfig* config); @@ -113,21 +113,21 @@ protected: bool /* layoutOnly */ ) const {} virtual void alignmentChange(KPanelExtension::Alignment) {} - virtual QPopupMenu* createOpMenu() = 0; - QPopupMenu *appletOpMenu() const { return _appletOpMnu; } + virtual TQPopupMenu* createOpMenu() = 0; + TQPopupMenu *appletOpMenu() const { return _appletOpMnu; } KPanelApplet::Direction _dir; KPanelExtension::Orientation _orient; KPanelExtension::Alignment _alignment; double _fspace; - QPoint _moveOffset; - QString _aid; + TQPoint _moveOffset; + TQString _aid; int _actions; bool m_immutable; private: - QPopupMenu *_opMnu; - QPopupMenu *_appletOpMnu; + TQPopupMenu *_opMnu; + TQPopupMenu *_appletOpMnu; }; #endif diff --git a/kicker/kicker/core/container_button.cpp b/kicker/kicker/core/container_button.cpp index b050f371d..8ac39a47f 100644 --- a/kicker/kicker/core/container_button.cpp +++ b/kicker/kicker/core/container_button.cpp @@ -23,7 +23,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <algorithm> -#include <qlayout.h> +#include <tqlayout.h> #include <kapplication.h> #include <kconfig.h> @@ -56,7 +56,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "container_button.h" #include "container_button.moc" -ButtonContainer::ButtonContainer(QPopupMenu* opMenu, QWidget* parent) +ButtonContainer::ButtonContainer(TQPopupMenu* opMenu, TQWidget* parent) : BaseContainer(opMenu, parent) , _button(0) , _layout(0) @@ -145,21 +145,21 @@ void ButtonContainer::embedButton(PanelButton* b) if (!b) return; delete _layout; - _layout = new QVBoxLayout(this); + _layout = new TQVBoxLayout(this); _button = b; _button->installEventFilter(this); _layout->add(_button); - connect(_button, SIGNAL(requestSave()), SIGNAL(requestSave())); - connect(_button, SIGNAL(hideme(bool)), SLOT(hideRequested(bool))); - connect(_button, SIGNAL(removeme()), SLOT(removeRequested())); - connect(_button, SIGNAL(dragme(const QPixmap)), - SLOT(dragButton(const QPixmap))); - connect(_button, SIGNAL(dragme(const KURL::List, const QPixmap)), - SLOT(dragButton(const KURL::List, const QPixmap))); + connect(_button, TQT_SIGNAL(requestSave()), TQT_SIGNAL(requestSave())); + connect(_button, TQT_SIGNAL(hideme(bool)), TQT_SLOT(hideRequested(bool))); + connect(_button, TQT_SIGNAL(removeme()), TQT_SLOT(removeRequested())); + connect(_button, TQT_SIGNAL(dragme(const TQPixmap)), + TQT_SLOT(dragButton(const TQPixmap))); + connect(_button, TQT_SIGNAL(dragme(const KURL::List, const TQPixmap)), + TQT_SLOT(dragButton(const KURL::List, const TQPixmap))); } -QPopupMenu* ButtonContainer::createOpMenu() +TQPopupMenu* ButtonContainer::createOpMenu() { return new PanelAppletOpMenu(_actions, appletOpMenu(), 0, _button->title(), _button->icon(), this); @@ -187,7 +187,7 @@ void ButtonContainer::hideRequested(bool shouldHide) } } -void ButtonContainer::dragButton(const KURL::List urls, const QPixmap icon) +void ButtonContainer::dragButton(const KURL::List urls, const TQPixmap icon) { if (isImmutable()) { @@ -203,7 +203,7 @@ void ButtonContainer::dragButton(const KURL::List urls, const QPixmap icon) releaseKeyboard(); } -void ButtonContainer::dragButton(const QPixmap icon) +void ButtonContainer::dragButton(const TQPixmap icon) { PanelDrag* dd = new PanelDrag(this, this); dd->setPixmap(icon); @@ -212,9 +212,9 @@ void ButtonContainer::dragButton(const QPixmap icon) releaseKeyboard(); } -bool ButtonContainer::eventFilter(QObject *o, QEvent *e) +bool ButtonContainer::eventFilter(TQObject *o, TQEvent *e) { - if (o == _button && e->type() == QEvent::MouseButtonPress) + if (o == _button && e->type() == TQEvent::MouseButtonPress) { static bool sentinal = false; @@ -224,7 +224,7 @@ bool ButtonContainer::eventFilter(QObject *o, QEvent *e) } sentinal = true; - QMouseEvent* me = static_cast<QMouseEvent*>(e); + TQMouseEvent* me = static_cast<TQMouseEvent*>(e); switch (me->button()) { case MidButton: @@ -249,11 +249,11 @@ bool ButtonContainer::eventFilter(QObject *o, QEvent *e) break; } - QPopupMenu* menu = opMenu(); - connect( menu, SIGNAL( aboutToHide() ), this, SLOT( slotMenuClosed() ) ); - QPoint pos = KickerLib::popupPosition(popupDirection(), menu, this, + TQPopupMenu* menu = opMenu(); + connect( menu, TQT_SIGNAL( aboutToHide() ), this, TQT_SLOT( slotMenuClosed() ) ); + TQPoint pos = KickerLib::popupPosition(popupDirection(), menu, this, (orientation() == Horizontal) ? - QPoint(0, 0) : me->pos()); + TQPoint(0, 0) : me->pos()); Kicker::the()->setInsertionPoint(me->globalPos()); @@ -284,7 +284,7 @@ bool ButtonContainer::eventFilter(QObject *o, QEvent *e) } KickerTip::enableTipping(true); - Kicker::the()->setInsertionPoint(QPoint()); + Kicker::the()->setInsertionPoint(TQPoint()); clearOpMenu(); sentinal = false; return true; @@ -322,7 +322,7 @@ void ButtonContainer::checkImmutability(const KConfigGroup& config) } // KMenuButton containerpan -KMenuButtonContainer::KMenuButtonContainer(const KConfigGroup& config, QPopupMenu *opMenu, QWidget* parent) +KMenuButtonContainer::KMenuButtonContainer(const KConfigGroup& config, TQPopupMenu *opMenu, TQWidget* parent) : ButtonContainer(opMenu, parent) { checkImmutability(config); @@ -330,7 +330,7 @@ KMenuButtonContainer::KMenuButtonContainer(const KConfigGroup& config, QPopupMen _actions = PanelAppletOpMenu::KMenuEditor; } -KMenuButtonContainer::KMenuButtonContainer(QPopupMenu *opMenu, QWidget* parent) +KMenuButtonContainer::KMenuButtonContainer(TQPopupMenu *opMenu, TQWidget* parent) : ButtonContainer(opMenu, parent) { embedButton( new KButton(this) ); @@ -346,14 +346,14 @@ int KMenuButtonContainer::heightForWidth( int width ) const } // DesktopButton container -DesktopButtonContainer::DesktopButtonContainer(QPopupMenu *opMenu, QWidget* parent) +DesktopButtonContainer::DesktopButtonContainer(TQPopupMenu *opMenu, TQWidget* parent) : ButtonContainer(opMenu, parent) { embedButton( new DesktopButton(this) ); } DesktopButtonContainer::DesktopButtonContainer(const KConfigGroup& config, - QPopupMenu *opMenu, QWidget* parent) + TQPopupMenu *opMenu, TQWidget* parent) : ButtonContainer(opMenu, parent) { checkImmutability(config); @@ -361,8 +361,8 @@ DesktopButtonContainer::DesktopButtonContainer(const KConfigGroup& config, } // ServiceButton container -ServiceButtonContainer::ServiceButtonContainer( const QString& desktopFile, - QPopupMenu* opMenu, QWidget* parent) +ServiceButtonContainer::ServiceButtonContainer( const TQString& desktopFile, + TQPopupMenu* opMenu, TQWidget* parent) : ButtonContainer(opMenu, parent) { embedButton( new ServiceButton( desktopFile, this ) ); @@ -370,7 +370,7 @@ ServiceButtonContainer::ServiceButtonContainer( const QString& desktopFile, } ServiceButtonContainer::ServiceButtonContainer( const KService::Ptr &service, - QPopupMenu* opMenu, QWidget* parent) + TQPopupMenu* opMenu, TQWidget* parent) : ButtonContainer(opMenu, parent) { embedButton( new ServiceButton( service, this ) ); @@ -378,7 +378,7 @@ ServiceButtonContainer::ServiceButtonContainer( const KService::Ptr &service, } ServiceButtonContainer::ServiceButtonContainer( const KConfigGroup& config, - QPopupMenu* opMenu, QWidget* parent) + TQPopupMenu* opMenu, TQWidget* parent) : ButtonContainer(opMenu, parent) { checkImmutability(config); @@ -386,25 +386,25 @@ ServiceButtonContainer::ServiceButtonContainer( const KConfigGroup& config, _actions = KPanelApplet::Preferences; } -QString ServiceButtonContainer::icon() const +TQString ServiceButtonContainer::icon() const { return button()->icon(); } -QString ServiceButtonContainer::visibleName() const +TQString ServiceButtonContainer::visibleName() const { return button()->title(); } // URLButton container -URLButtonContainer::URLButtonContainer( const QString& url, QPopupMenu* opMenu, QWidget* parent ) +URLButtonContainer::URLButtonContainer( const TQString& url, TQPopupMenu* opMenu, TQWidget* parent ) : ButtonContainer(opMenu, parent) { embedButton( new URLButton( url, this ) ); _actions = KPanelApplet::Preferences; } -URLButtonContainer::URLButtonContainer( const KConfigGroup& config, QPopupMenu* opMenu, QWidget* parent) +URLButtonContainer::URLButtonContainer( const KConfigGroup& config, TQPopupMenu* opMenu, TQWidget* parent) : ButtonContainer(opMenu, parent) { checkImmutability(config); @@ -412,25 +412,25 @@ URLButtonContainer::URLButtonContainer( const KConfigGroup& config, QPopupMenu* _actions = KPanelApplet::Preferences; } -QString URLButtonContainer::icon() const +TQString URLButtonContainer::icon() const { return button()->icon(); } -QString URLButtonContainer::visibleName() const +TQString URLButtonContainer::visibleName() const { return button()->title(); } // BrowserButton container -BrowserButtonContainer::BrowserButtonContainer(const QString &startDir, QPopupMenu* opMenu, const QString& icon, QWidget* parent) +BrowserButtonContainer::BrowserButtonContainer(const TQString &startDir, TQPopupMenu* opMenu, const TQString& icon, TQWidget* parent) : ButtonContainer(opMenu, parent) { embedButton( new BrowserButton(icon, startDir, this) ); _actions = KPanelApplet::Preferences; } -BrowserButtonContainer::BrowserButtonContainer( const KConfigGroup& config, QPopupMenu* opMenu, QWidget* parent) +BrowserButtonContainer::BrowserButtonContainer( const KConfigGroup& config, TQPopupMenu* opMenu, TQWidget* parent) : ButtonContainer(opMenu, parent) { checkImmutability(config); @@ -439,45 +439,45 @@ BrowserButtonContainer::BrowserButtonContainer( const KConfigGroup& config, QPop } // ServiceMenuButton container -ServiceMenuButtonContainer::ServiceMenuButtonContainer(const QString& relPath, QPopupMenu* opMenu, QWidget* parent) +ServiceMenuButtonContainer::ServiceMenuButtonContainer(const TQString& relPath, TQPopupMenu* opMenu, TQWidget* parent) : ButtonContainer(opMenu, parent) { embedButton( new ServiceMenuButton(relPath, this) ); } -ServiceMenuButtonContainer::ServiceMenuButtonContainer( const KConfigGroup& config, QPopupMenu* opMenu, QWidget* parent) +ServiceMenuButtonContainer::ServiceMenuButtonContainer( const KConfigGroup& config, TQPopupMenu* opMenu, TQWidget* parent) : ButtonContainer(opMenu, parent) { checkImmutability(config); embedButton( new ServiceMenuButton(config, this) ); } -QString ServiceMenuButtonContainer::icon() const +TQString ServiceMenuButtonContainer::icon() const { return button()->icon(); } -QString ServiceMenuButtonContainer::visibleName() const +TQString ServiceMenuButtonContainer::visibleName() const { return button()->title(); } // WindowListButton container -WindowListButtonContainer::WindowListButtonContainer(const KConfigGroup& config, QPopupMenu *opMenu, QWidget* parent) +WindowListButtonContainer::WindowListButtonContainer(const KConfigGroup& config, TQPopupMenu *opMenu, TQWidget* parent) : ButtonContainer(opMenu, parent) { checkImmutability(config); embedButton( new WindowListButton(this) ); } -WindowListButtonContainer::WindowListButtonContainer(QPopupMenu *opMenu, QWidget* parent) +WindowListButtonContainer::WindowListButtonContainer(TQPopupMenu *opMenu, TQWidget* parent) : ButtonContainer(opMenu, parent) { embedButton( new WindowListButton(this) ); } // BookmarkButton container -BookmarksButtonContainer::BookmarksButtonContainer(const KConfigGroup& config, QPopupMenu *opMenu, QWidget* parent) +BookmarksButtonContainer::BookmarksButtonContainer(const KConfigGroup& config, TQPopupMenu *opMenu, TQWidget* parent) : ButtonContainer(opMenu, parent) { checkImmutability(config); @@ -485,7 +485,7 @@ BookmarksButtonContainer::BookmarksButtonContainer(const KConfigGroup& config, Q _actions = PanelAppletOpMenu::BookmarkEditor; } -BookmarksButtonContainer::BookmarksButtonContainer(QPopupMenu *opMenu, QWidget* parent) +BookmarksButtonContainer::BookmarksButtonContainer(TQPopupMenu *opMenu, TQWidget* parent) : ButtonContainer(opMenu, parent) { embedButton( new BookmarksButton(this) ); @@ -493,14 +493,14 @@ BookmarksButtonContainer::BookmarksButtonContainer(QPopupMenu *opMenu, QWidget* } // NonKDEAppButton container -NonKDEAppButtonContainer::NonKDEAppButtonContainer(const QString &name, - const QString &description, - const QString &filePath, - const QString &icon, - const QString &cmdLine, +NonKDEAppButtonContainer::NonKDEAppButtonContainer(const TQString &name, + const TQString &description, + const TQString &filePath, + const TQString &icon, + const TQString &cmdLine, bool inTerm, - QPopupMenu* opMenu, - QWidget* parent) + TQPopupMenu* opMenu, + TQWidget* parent) : ButtonContainer(opMenu, parent) { embedButton(new NonKDEAppButton(name, description, filePath, icon, cmdLine, @@ -508,7 +508,7 @@ NonKDEAppButtonContainer::NonKDEAppButtonContainer(const QString &name, _actions = KPanelApplet::Preferences; } -NonKDEAppButtonContainer::NonKDEAppButtonContainer( const KConfigGroup& config, QPopupMenu* opMenu, QWidget *parent) +NonKDEAppButtonContainer::NonKDEAppButtonContainer( const KConfigGroup& config, TQPopupMenu* opMenu, TQWidget *parent) : ButtonContainer(opMenu, parent) { checkImmutability(config); @@ -517,25 +517,25 @@ NonKDEAppButtonContainer::NonKDEAppButtonContainer( const KConfigGroup& config, } // ExtensionButton container -ExtensionButtonContainer::ExtensionButtonContainer(const QString& df, QPopupMenu* opMenu, QWidget *parent) +ExtensionButtonContainer::ExtensionButtonContainer(const TQString& df, TQPopupMenu* opMenu, TQWidget *parent) : ButtonContainer(opMenu, parent) { embedButton( new ExtensionButton(df, this) ); } -ExtensionButtonContainer::ExtensionButtonContainer( const KConfigGroup& config, QPopupMenu* opMenu, QWidget *parent) +ExtensionButtonContainer::ExtensionButtonContainer( const KConfigGroup& config, TQPopupMenu* opMenu, TQWidget *parent) : ButtonContainer(opMenu, parent) { checkImmutability(config); embedButton( new ExtensionButton(config, this) ); } -QString ExtensionButtonContainer::icon() const +TQString ExtensionButtonContainer::icon() const { return button()->icon(); } -QString ExtensionButtonContainer::visibleName() const +TQString ExtensionButtonContainer::visibleName() const { return button()->title(); } diff --git a/kicker/kicker/core/container_button.h b/kicker/kicker/core/container_button.h index 737271216..3d8592a6d 100644 --- a/kicker/kicker/core/container_button.h +++ b/kicker/kicker/core/container_button.h @@ -39,7 +39,7 @@ class ButtonContainer : public BaseContainer Q_OBJECT public: - ButtonContainer(QPopupMenu* opMenu, QWidget* parent = 0); + ButtonContainer(TQPopupMenu* opMenu, TQWidget* parent = 0); virtual bool isValid() const; virtual bool isAMenu() const { return false; } @@ -51,7 +51,7 @@ public: virtual void configure(); - bool eventFilter (QObject *, QEvent *); + bool eventFilter (TQObject *, TQEvent *); virtual void completeMoveOperation(); PanelButton* button() const { return _button; } @@ -64,29 +64,29 @@ protected slots: void slotMenuClosed(); void removeRequested(); void hideRequested(bool); - void dragButton(const KURL::List urls, const QPixmap icon); - void dragButton(const QPixmap icon); + void dragButton(const KURL::List urls, const TQPixmap icon); + void dragButton(const TQPixmap icon); protected: virtual void doSaveConfiguration( KConfigGroup&, bool layoutOnly ) const; void embedButton(PanelButton* p); - QPopupMenu* createOpMenu(); + TQPopupMenu* createOpMenu(); void checkImmutability(const KConfigGroup&); protected: PanelButton *_button; - QLayout *_layout; - QPoint _oldpos; + TQLayout *_layout; + TQPoint _oldpos; }; class KMenuButtonContainer : public ButtonContainer { public: - KMenuButtonContainer(const KConfigGroup& config, QPopupMenu* opMenu, QWidget* parent = 0); - KMenuButtonContainer(QPopupMenu* opMenu, QWidget* parent = 0); - virtual QString appletType() const { return "KMenuButton"; } - virtual QString icon() const { return "kmenu"; } - virtual QString visibleName() const { return i18n("K Menu"); } + KMenuButtonContainer(const KConfigGroup& config, TQPopupMenu* opMenu, TQWidget* parent = 0); + KMenuButtonContainer(TQPopupMenu* opMenu, TQWidget* parent = 0); + virtual TQString appletType() const { return "KMenuButton"; } + virtual TQString icon() const { return "kmenu"; } + virtual TQString visibleName() const { return i18n("K Menu"); } virtual int heightForWidth( int width ) const; bool isAMenu() const { return true; } @@ -95,99 +95,99 @@ public: class DesktopButtonContainer : public ButtonContainer { public: - DesktopButtonContainer(const KConfigGroup& config, QPopupMenu* opMenu, QWidget* parent = 0); - DesktopButtonContainer(QPopupMenu* opMenu, QWidget* parent = 0); - QString appletType() const { return "DesktopButton"; } - virtual QString icon() const { return "desktop"; } - virtual QString visibleName() const { return i18n("Desktop Access"); } + DesktopButtonContainer(const KConfigGroup& config, TQPopupMenu* opMenu, TQWidget* parent = 0); + DesktopButtonContainer(TQPopupMenu* opMenu, TQWidget* parent = 0); + TQString appletType() const { return "DesktopButton"; } + virtual TQString icon() const { return "desktop"; } + virtual TQString visibleName() const { return i18n("Desktop Access"); } }; class ServiceButtonContainer : public ButtonContainer { public: - ServiceButtonContainer(const KConfigGroup& config, QPopupMenu* opMenu, QWidget* parent = 0); - ServiceButtonContainer(const KService::Ptr & service, QPopupMenu* opMenu,QWidget* parent = 0); - ServiceButtonContainer(const QString& desktopFile, QPopupMenu* opMenu,QWidget* parent = 0); - QString appletType() const { return "ServiceButton"; } - virtual QString icon() const; - virtual QString visibleName() const; + ServiceButtonContainer(const KConfigGroup& config, TQPopupMenu* opMenu, TQWidget* parent = 0); + ServiceButtonContainer(const KService::Ptr & service, TQPopupMenu* opMenu,TQWidget* parent = 0); + ServiceButtonContainer(const TQString& desktopFile, TQPopupMenu* opMenu,TQWidget* parent = 0); + TQString appletType() const { return "ServiceButton"; } + virtual TQString icon() const; + virtual TQString visibleName() const; }; class URLButtonContainer : public ButtonContainer { public: - URLButtonContainer(const KConfigGroup& config, QPopupMenu* opMenu, QWidget* parent = 0); - URLButtonContainer(const QString& url, QPopupMenu* opMenu, QWidget* parent = 0); - QString appletType() const { return "URLButton"; } - virtual QString icon() const; - virtual QString visibleName() const; + URLButtonContainer(const KConfigGroup& config, TQPopupMenu* opMenu, TQWidget* parent = 0); + URLButtonContainer(const TQString& url, TQPopupMenu* opMenu, TQWidget* parent = 0); + TQString appletType() const { return "URLButton"; } + virtual TQString icon() const; + virtual TQString visibleName() const; }; class BrowserButtonContainer : public ButtonContainer { public: - BrowserButtonContainer(const KConfigGroup& config, QPopupMenu* opMenu, QWidget* parent = 0); - BrowserButtonContainer(const QString& startDir, QPopupMenu* opMenu, const QString& icon = "kdisknav", QWidget* parent = 0); - QString appletType() const { return "BrowserButton"; } - virtual QString icon() const { return "kdisknav"; } - virtual QString visibleName() const { return i18n("Quick Browser"); } + BrowserButtonContainer(const KConfigGroup& config, TQPopupMenu* opMenu, TQWidget* parent = 0); + BrowserButtonContainer(const TQString& startDir, TQPopupMenu* opMenu, const TQString& icon = "kdisknav", TQWidget* parent = 0); + TQString appletType() const { return "BrowserButton"; } + virtual TQString icon() const { return "kdisknav"; } + virtual TQString visibleName() const { return i18n("Quick Browser"); } bool isAMenu() const { return true; } }; class ServiceMenuButtonContainer : public ButtonContainer { public: - ServiceMenuButtonContainer(const KConfigGroup& config, QPopupMenu* opMenu, QWidget* parent = 0); - ServiceMenuButtonContainer(const QString& relPath, QPopupMenu* opMenu, QWidget* parent = 0); - QString appletType() const { return "ServiceMenuButton"; } - virtual QString icon() const; - virtual QString visibleName() const; + ServiceMenuButtonContainer(const KConfigGroup& config, TQPopupMenu* opMenu, TQWidget* parent = 0); + ServiceMenuButtonContainer(const TQString& relPath, TQPopupMenu* opMenu, TQWidget* parent = 0); + TQString appletType() const { return "ServiceMenuButton"; } + virtual TQString icon() const; + virtual TQString visibleName() const; bool isAMenu() const { return true; } }; class WindowListButtonContainer : public ButtonContainer { public: - WindowListButtonContainer(const KConfigGroup& config, QPopupMenu* opMenu, QWidget* parent = 0); - WindowListButtonContainer(QPopupMenu* opMenu, QWidget* parent = 0); - QString appletType() const { return "WindowListButton"; } - virtual QString icon() const { return "window_list"; } - virtual QString visibleName() const { return i18n("Windowlist"); } + WindowListButtonContainer(const KConfigGroup& config, TQPopupMenu* opMenu, TQWidget* parent = 0); + WindowListButtonContainer(TQPopupMenu* opMenu, TQWidget* parent = 0); + TQString appletType() const { return "WindowListButton"; } + virtual TQString icon() const { return "window_list"; } + virtual TQString visibleName() const { return i18n("Windowlist"); } bool isAMenu() const { return true; } }; class BookmarksButtonContainer : public ButtonContainer { public: - BookmarksButtonContainer(const KConfigGroup& config, QPopupMenu* opMenu, QWidget* parent = 0); - BookmarksButtonContainer(QPopupMenu* opMenu, QWidget* parent = 0); - QString appletType() const { return "BookmarksButton"; } - virtual QString icon() const { return "bookmark"; } - virtual QString visibleName() const { return i18n("Bookmarks"); } + BookmarksButtonContainer(const KConfigGroup& config, TQPopupMenu* opMenu, TQWidget* parent = 0); + BookmarksButtonContainer(TQPopupMenu* opMenu, TQWidget* parent = 0); + TQString appletType() const { return "BookmarksButton"; } + virtual TQString icon() const { return "bookmark"; } + virtual TQString visibleName() const { return i18n("Bookmarks"); } bool isAMenu() const { return true; } }; class NonKDEAppButtonContainer : public ButtonContainer { public: - NonKDEAppButtonContainer(const KConfigGroup& config, QPopupMenu* opMenu, QWidget *parent=0); - NonKDEAppButtonContainer(const QString &name, const QString &description, - const QString &filePath, const QString &icon, - const QString &cmdLine, bool inTerm, - QPopupMenu* opMenu, QWidget* parent = 0); - QString appletType() const { return "ExecButton"; } - virtual QString icon() const { return "exec"; } - virtual QString visibleName() const { return i18n("Non-KDE Application"); } + NonKDEAppButtonContainer(const KConfigGroup& config, TQPopupMenu* opMenu, TQWidget *parent=0); + NonKDEAppButtonContainer(const TQString &name, const TQString &description, + const TQString &filePath, const TQString &icon, + const TQString &cmdLine, bool inTerm, + TQPopupMenu* opMenu, TQWidget* parent = 0); + TQString appletType() const { return "ExecButton"; } + virtual TQString icon() const { return "exec"; } + virtual TQString visibleName() const { return i18n("Non-KDE Application"); } }; class ExtensionButtonContainer : public ButtonContainer { public: - ExtensionButtonContainer(const KConfigGroup& config, QPopupMenu* opMenu, QWidget *parent=0); - ExtensionButtonContainer(const QString& desktopFile, QPopupMenu* opMenu, QWidget *parent= 0); - QString appletType() const { return "ExtensionButton"; } - virtual QString icon() const; - virtual QString visibleName() const; + ExtensionButtonContainer(const KConfigGroup& config, TQPopupMenu* opMenu, TQWidget *parent=0); + ExtensionButtonContainer(const TQString& desktopFile, TQPopupMenu* opMenu, TQWidget *parent= 0); + TQString appletType() const { return "ExtensionButton"; } + virtual TQString icon() const; + virtual TQString visibleName() const; bool isAMenu() const { return true; } }; diff --git a/kicker/kicker/core/container_extension.cpp b/kicker/kicker/core/container_extension.cpp index 694513109..7aee673f1 100644 --- a/kicker/kicker/core/container_extension.cpp +++ b/kicker/kicker/core/container_extension.cpp @@ -24,16 +24,16 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <stdlib.h> #include <math.h> -#include <qcursor.h> -#include <qfile.h> -#include <qlayout.h> -#include <qmovie.h> -#include <qpainter.h> -#include <qtimer.h> -#include <qtooltip.h> -#include <qvbox.h> +#include <tqcursor.h> +#include <tqfile.h> +#include <tqlayout.h> +#include <tqmovie.h> +#include <tqpainter.h> +#include <tqtimer.h> +#include <tqtooltip.h> +#include <tqvbox.h> #include <qxembed.h> -#include <qcolor.h> +#include <tqcolor.h> #include <dcopclient.h> #include <kconfig.h> @@ -66,9 +66,9 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #define PANEL_SPEED(x, c) (int)((1.0-2.0*fabs((x)-(c)/2.0)/c)*m_settings.hideAnimationSpeed()+1.0) ExtensionContainer::ExtensionContainer(const AppletInfo& info, - const QString& extensionId, - QWidget *parent) - : QFrame(parent, ("ExtensionContainer#" + extensionId).latin1(), WStyle_Customize | WStyle_NoBorder), + const TQString& extensionId, + TQWidget *parent) + : TQFrame(parent, ("ExtensionContainer#" + extensionId).latin1(), WStyle_Customize | WStyle_NoBorder), m_settings(KSharedConfig::openConfig(info.configFile())), m_hideMode(ManualHide), m_unhideTriggeredAt(UnhideTrigger::None), @@ -93,9 +93,9 @@ ExtensionContainer::ExtensionContainer(const AppletInfo& info, ExtensionContainer::ExtensionContainer(KPanelExtension* extension, const AppletInfo& info, - const QString& extensionId, - QWidget *parent) - : QFrame(parent, ("ExtensionContainer#" + extensionId).latin1(), WStyle_Customize | WStyle_NoBorder), + const TQString& extensionId, + TQWidget *parent) + : TQFrame(parent, ("ExtensionContainer#" + extensionId).latin1(), WStyle_Customize | WStyle_NoBorder), m_settings(KSharedConfig::openConfig(info.configFile())), _autoHidden(false), _userHidden(Unhidden), @@ -111,7 +111,7 @@ ExtensionContainer::ExtensionContainer(KPanelExtension* extension, m_maintainFocus(0), m_panelOrder(ExtensionManager::the()->nextPanelOrder()) { - m_extension->reparent(this, QPoint(0, 0)); + m_extension->reparent(this, TQPoint(0, 0)); init(); } @@ -122,38 +122,38 @@ void ExtensionContainer::init() KWin::setState(winId(), NET::Sticky); KWin::setOnAllDesktops(winId(), true); - connect(Kicker::the()->kwinModule(), SIGNAL(strutChanged()), this, SLOT(strutChanged())); - connect(Kicker::the()->kwinModule(), SIGNAL(currentDesktopChanged(int)), - this, SLOT( currentDesktopChanged(int))); + connect(Kicker::the()->kwinModule(), TQT_SIGNAL(strutChanged()), this, TQT_SLOT(strutChanged())); + connect(Kicker::the()->kwinModule(), TQT_SIGNAL(currentDesktopChanged(int)), + this, TQT_SLOT( currentDesktopChanged(int))); setBackgroundOrigin(AncestorOrigin); setFrameStyle(NoFrame); setLineWidth(0); setMargin(0); - connect(UnhideTrigger::the(), SIGNAL(triggerUnhide(UnhideTrigger::Trigger,int)), - this, SLOT(unhideTriggered(UnhideTrigger::Trigger,int))); + connect(UnhideTrigger::the(), TQT_SIGNAL(triggerUnhide(UnhideTrigger::Trigger,int)), + this, TQT_SLOT(unhideTriggered(UnhideTrigger::Trigger,int))); _popupWidgetFilter = new PopupWidgetFilter( this ); - connect(_popupWidgetFilter, SIGNAL(popupWidgetHiding()), SLOT(maybeStartAutoHideTimer())); + connect(_popupWidgetFilter, TQT_SIGNAL(popupWidgetHiding()), TQT_SLOT(maybeStartAutoHideTimer())); // layout - _layout = new QGridLayout(this, 3, 3, 0, 0); - _layout->setResizeMode(QLayout::FreeResize); + _layout = new TQGridLayout(this, 3, 3, 0, 0); + _layout->setResizeMode(TQLayout::FreeResize); _layout->setRowStretch(1,10); _layout->setColStretch(1,10); // instantiate the autohide timer - _autohideTimer = new QTimer(this, "_autohideTimer"); - connect(_autohideTimer, SIGNAL(timeout()), SLOT(autoHideTimeout())); + _autohideTimer = new TQTimer(this, "_autohideTimer"); + connect(_autohideTimer, TQT_SIGNAL(timeout()), TQT_SLOT(autoHideTimeout())); // instantiate the updateLayout event compressor timer - _updateLayoutTimer = new QTimer(this, "_updateLayoutTimer"); - connect(_updateLayoutTimer, SIGNAL(timeout()), SLOT(actuallyUpdateLayout())); + _updateLayoutTimer = new TQTimer(this, "_updateLayoutTimer"); + connect(_updateLayoutTimer, TQT_SIGNAL(timeout()), TQT_SLOT(actuallyUpdateLayout())); installEventFilter(this); // for mouse event handling - connect(Kicker::the(), SIGNAL(kdisplayPaletteChanged()), this, SLOT(updateHighlightColor())); + connect(Kicker::the(), TQT_SIGNAL(kdisplayPaletteChanged()), this, TQT_SLOT(updateHighlightColor())); updateHighlightColor(); // if we were hidden when kicker quit, let's start out hidden as well! @@ -192,9 +192,9 @@ void ExtensionContainer::init() item->setDefaultValue(m_extension->customSize()); } - connect(m_extension, SIGNAL(updateLayout()), SLOT(updateLayout())); - connect(m_extension, SIGNAL(maintainFocus(bool)), - SLOT(maintainFocus(bool))); + connect(m_extension, TQT_SIGNAL(updateLayout()), TQT_SLOT(updateLayout())); + connect(m_extension, TQT_SIGNAL(maintainFocus(bool)), + TQT_SLOT(maintainFocus(bool))); _layout->addWidget(m_extension, 1, 1); } @@ -210,7 +210,7 @@ ExtensionContainer::~ExtensionContainer() { } -QSize ExtensionContainer::sizeHint(KPanelExtension::Position p, const QSize &maxSize) const +TQSize ExtensionContainer::sizeHint(KPanelExtension::Position p, const TQSize &maxSize) const { int width = 0; int height = 0; @@ -255,7 +255,7 @@ QSize ExtensionContainer::sizeHint(KPanelExtension::Position p, const QSize &max height += _layout->rowSpacing(0) + _layout->rowSpacing(2); } - QSize size(width, height); + TQSize size(width, height); size = size.boundedTo(maxSize); if (m_extension) @@ -342,7 +342,7 @@ void ExtensionContainer::writeConfig() m_settings.writeConfig(); } -void ExtensionContainer::showPanelMenu( const QPoint& globalPos ) +void ExtensionContainer::showPanelMenu( const TQPoint& globalPos ) { if (!kapp->authorizeKAction("kicker_rmb")) { @@ -354,7 +354,7 @@ void ExtensionContainer::showPanelMenu( const QPoint& globalPos ) // use the extenion's own custom menu Kicker::the()->setInsertionPoint(globalPos); m_extension->customMenu()->exec(globalPos); - Kicker::the()->setInsertionPoint(QPoint()); + Kicker::the()->setInsertionPoint(TQPoint()); return; } @@ -366,7 +366,7 @@ void ExtensionContainer::showPanelMenu( const QPoint& globalPos ) this); } - QPopupMenu *menu = KickerLib::reduceMenu(_opMnu); + TQPopupMenu *menu = KickerLib::reduceMenu(_opMnu); Kicker::the()->setInsertionPoint(globalPos); @@ -390,7 +390,7 @@ void ExtensionContainer::showPanelMenu( const QPoint& globalPos ) default: break; } - Kicker::the()->setInsertionPoint(QPoint()); + Kicker::the()->setInsertionPoint(TQPoint()); } void ExtensionContainer::about() @@ -440,9 +440,9 @@ void ExtensionContainer::removeSessionConfigFile() return; } - if (QFile::exists(locate("config", _info.configFile()))) + if (TQFile::exists(locate("config", _info.configFile()))) { - QFile::remove(locate("config", _info.configFile())); + TQFile::remove(locate("config", _info.configFile())); } } @@ -462,7 +462,7 @@ void ExtensionContainer::moveMe() stopAutoHideTimer(); - QApplication::syncX(); + TQApplication::syncX(); UserRectSel::RectList rects; KPanelExtension::Position positions[] = { KPanelExtension::Left, @@ -473,7 +473,7 @@ void ExtensionContainer::moveMe() KPanelExtension::Center, KPanelExtension::RightBottom }; - for (int s = 0; s < QApplication::desktop()->numScreens(); s++) + for (int s = 0; s < TQApplication::desktop()->numScreens(); s++) { for (int i = 0; i < 4; i++) { @@ -552,13 +552,13 @@ void ExtensionContainer::actuallyUpdateLayout() void ExtensionContainer::enableMouseOverEffects() { KickerTip::enableTipping(true); - QPoint globalPos = QCursor::pos(); - QPoint localPos = mapFromGlobal(globalPos); - QWidget* child = childAt(localPos); + TQPoint globalPos = TQCursor::pos(); + TQPoint localPos = mapFromGlobal(globalPos); + TQWidget* child = childAt(localPos); if (child) { - QMouseEvent* e = new QMouseEvent(QEvent::Enter, localPos, globalPos, 0, 0); + TQMouseEvent* e = new TQMouseEvent(TQEvent::Enter, localPos, globalPos, 0, 0); qApp->sendEvent(child, e); } } @@ -656,11 +656,11 @@ void ExtensionContainer::unhideTriggered(UnhideTrigger::Trigger tr, int Xinerama // Otherwise hide mode is automatic. The code below is slightly // complex so as to keep the same behavior as it has always had: // only unhide when the cursor position is within the widget geometry. - // We can't just do geometry().contains(QCursor::pos()) because + // We can't just do geometry().contains(TQCursor::pos()) because // now we hide the panel completely off screen. - int x = QCursor::pos().x(); - int y = QCursor::pos().y(); + int x = TQCursor::pos().x(); + int y = TQCursor::pos().y(); int t = geometry().top(); int b = geometry().bottom(); int r = geometry().right(); @@ -700,7 +700,7 @@ void ExtensionContainer::autoHideTimeout() { // kdDebug(1210) << "PanelContainer::autoHideTimeout() " << name() << endl; // Hack: If there is a popup open, don't autohide until it closes. - QWidget* popup = QApplication::activePopupWidget(); + TQWidget* popup = TQApplication::activePopupWidget(); if (popup) { @@ -728,8 +728,8 @@ void ExtensionContainer::autoHideTimeout() return; } - QRect r = geometry(); - QPoint p = QCursor::pos(); + TQRect r = geometry(); + TQPoint p = TQCursor::pos(); if (!r.contains(p) && (m_settings.unhideLocation() == UnhideTrigger::None || !shouldUnhideForTrigger(m_unhideTriggeredAt))) @@ -763,21 +763,21 @@ void ExtensionContainer::autoHide(bool hide) blockUserInput(true); - QPoint oldpos = pos(); - QRect newextent = initialGeometry( position(), alignment(), xineramaScreen(), hide, Unhidden ); - QPoint newpos = newextent.topLeft(); + TQPoint oldpos = pos(); + TQRect newextent = initialGeometry( position(), alignment(), xineramaScreen(), hide, Unhidden ); + TQPoint newpos = newextent.topLeft(); if (hide) { /* bail out if we are unable to hide */ - for (int s=0; s < QApplication::desktop()->numScreens(); s++) + for (int s=0; s < TQApplication::desktop()->numScreens(); s++) { /* don't let it intersect with any screen in the hidden position * that it doesn't intesect in the shown position. Should prevent * panels from hiding by sliding onto other screens, while still * letting them show reveal buttons onscreen */ - QRect desktopGeom = QApplication::desktop()->screenGeometry(s); + TQRect desktopGeom = TQApplication::desktop()->screenGeometry(s); if (desktopGeom.intersects(newextent) && !desktopGeom.intersects(geometry())) { @@ -848,11 +848,11 @@ void ExtensionContainer::autoHide(bool hide) updateLayout(); // Sometimes tooltips don't get hidden - QToolTip::hide(); + TQToolTip::hide(); _in_autohide = false; - QTimer::singleShot(100, this, SLOT(enableMouseOverEffects())); + TQTimer::singleShot(100, this, TQT_SLOT(enableMouseOverEffects())); } void ExtensionContainer::animatedHide(bool left) @@ -875,24 +875,24 @@ void ExtensionContainer::animatedHide(bool left) newState = RightBottom; } - QPoint oldpos = pos(); - QRect newextent = initialGeometry(position(), alignment(), xineramaScreen(), false, newState); - QPoint newpos(newextent.topLeft()); + TQPoint oldpos = pos(); + TQRect newextent = initialGeometry(position(), alignment(), xineramaScreen(), false, newState); + TQPoint newpos(newextent.topLeft()); if (newState != Unhidden) { /* bail out if we are unable to hide */ - for(int s=0; s < QApplication::desktop()->numScreens(); s++) + for(int s=0; s < TQApplication::desktop()->numScreens(); s++) { /* don't let it intersect with any screen in the hidden position * that it doesn't intesect in the shown position. Should prevent * panels from hiding by sliding onto other screens, while still * letting them show reveal buttons onscreen */ - if (QApplication::desktop()->screenGeometry(s).intersects(newextent) && - !QApplication::desktop()->screenGeometry(s).intersects(geometry())) + if (TQApplication::desktop()->screenGeometry(s).intersects(newextent) && + !TQApplication::desktop()->screenGeometry(s).intersects(geometry())) { blockUserInput(false); - QTimer::singleShot(100, this, SLOT(enableMouseOverEffects())); + TQTimer::singleShot(100, this, TQT_SLOT(enableMouseOverEffects())); return; } } @@ -955,7 +955,7 @@ void ExtensionContainer::animatedHide(bool left) config->setGroup(extensionId()); config->writeEntry("UserHidden", userHidden()); - QTimer::singleShot(100, this, SLOT(enableMouseOverEffects())); + TQTimer::singleShot(100, this, TQT_SLOT(enableMouseOverEffects())); } bool ExtensionContainer::reserveStrut() const @@ -981,9 +981,9 @@ void ExtensionContainer::updateWindowManager() int w = 0; int h = 0; - QRect geom = initialGeometry(position(), alignment(), xineramaScreen()); - QRect virtRect(QApplication::desktop()->geometry()); - QRect screenRect(QApplication::desktop()->screenGeometry(xineramaScreen())); + TQRect geom = initialGeometry(position(), alignment(), xineramaScreen()); + TQRect virtRect(TQApplication::desktop()->geometry()); + TQRect screenRect(TQApplication::desktop()->screenGeometry(xineramaScreen())); if (m_hideMode == ManualHide && !userHidden()) { @@ -1083,7 +1083,7 @@ void ExtensionContainer::currentDesktopChanged(int) void ExtensionContainer::strutChanged() { //kdDebug(1210) << "PanelContainer::strutChanged()" << endl; - QRect ig = currentGeometry(); + TQRect ig = currentGeometry(); if (ig != geometry()) { @@ -1265,8 +1265,8 @@ int ExtensionContainer::setupBorderSpace() } int layoutOffset = 0; - QRect r = QApplication::desktop()->screenGeometry(xineramaScreen()); - QRect h = geometry(); + TQRect r = TQApplication::desktop()->screenGeometry(xineramaScreen()); + TQRect h = geometry(); if (orientation() == Vertical) { @@ -1340,28 +1340,28 @@ void ExtensionContainer::updateHighlightColor() { KConfig *config = KGlobal::config(); config->setGroup("WM"); - QColor color = QApplication::palette().active().highlight(); + TQColor color = TQApplication::palette().active().highlight(); m_highlightColor = config->readColorEntry("activeBackground", &color); update(); } -void ExtensionContainer::paintEvent(QPaintEvent *e) +void ExtensionContainer::paintEvent(TQPaintEvent *e) { - QFrame::paintEvent(e); + TQFrame::paintEvent(e); if (needsBorder()) { // draw border - QPainter p(this); + TQPainter p(this); if (KickerSettings::useBackgroundTheme() && KickerSettings::colorizeBackground()) p.setPen(m_highlightColor); else - p.setPen(palette().color(QPalette::Active, QColorGroup::Mid)); + p.setPen(palette().color(TQPalette::Active, TQColorGroup::Mid)); p.drawRect(0, 0, width(), height()); } } -void ExtensionContainer::leaveEvent(QEvent*) +void ExtensionContainer::leaveEvent(TQEvent*) { maybeStartAutoHideTimer(); } @@ -1405,8 +1405,8 @@ void ExtensionContainer::unhideIfHidden(int showForAtLeastHowManyMS) if (_autoHidden) { autoHide(false); - QTimer::singleShot(showForAtLeastHowManyMS, - this, SLOT(maybeStartAutoHideTimer())); + TQTimer::singleShot(showForAtLeastHowManyMS, + this, TQT_SLOT(maybeStartAutoHideTimer())); return; } @@ -1433,19 +1433,19 @@ void ExtensionContainer::setHideButtons(bool showLeft, bool showRight) resetLayout(); } -bool ExtensionContainer::event(QEvent* e) +bool ExtensionContainer::event(TQEvent* e) { // Update the layout when we receive a LayoutHint. This way we can adjust // to changes of the layout of the main widget. - if (e->type() == QEvent::LayoutHint) + if (e->type() == TQEvent::LayoutHint) { updateLayout(); } - return QFrame::event(e); + return TQFrame::event(e); } -void ExtensionContainer::closeEvent(QCloseEvent* e) +void ExtensionContainer::closeEvent(TQCloseEvent* e) { // Prevent being closed via Alt-F4 e->ignore(); @@ -1519,7 +1519,7 @@ KPanelExtension::Position ExtensionContainer::position() const void ExtensionContainer::resetLayout() { - QRect g = initialGeometry(position(), alignment(), xineramaScreen(), + TQRect g = initialGeometry(position(), alignment(), xineramaScreen(), autoHidden(), userHidden()); // Disable the layout while we rearrange the panel. @@ -1547,7 +1547,7 @@ void ExtensionContainer::resetLayout() _ltHB = new HideButton(this); _ltHB->installEventFilter(this); _ltHB->setEnabled(true); - connect(_ltHB, SIGNAL(clicked()), this, SLOT(hideLeft())); + connect(_ltHB, TQT_SIGNAL(clicked()), this, TQT_SLOT(hideLeft())); haveToArrangeButtons = true; } @@ -1578,7 +1578,7 @@ void ExtensionContainer::resetLayout() _rbHB = new HideButton(this); _rbHB->installEventFilter(this); _rbHB->setEnabled(true); - connect(_rbHB, SIGNAL(clicked()), this, SLOT(hideRight())); + connect(_rbHB, TQT_SIGNAL(clicked()), this, TQT_SLOT(hideRight())); haveToArrangeButtons = true; } @@ -1602,27 +1602,27 @@ void ExtensionContainer::resetLayout() if (_ltHB) { - QToolTip::remove(_ltHB); + TQToolTip::remove(_ltHB); if (userHidden()) { - QToolTip::add(_ltHB, i18n("Show panel")); + TQToolTip::add(_ltHB, i18n("Show panel")); } else { - QToolTip::add(_ltHB, i18n("Hide panel")); + TQToolTip::add(_ltHB, i18n("Hide panel")); } } if (_rbHB) { - QToolTip::remove( _rbHB ); + TQToolTip::remove( _rbHB ); if (userHidden()) { - QToolTip::add(_rbHB, i18n("Show panel")); + TQToolTip::add(_rbHB, i18n("Show panel")); } else { - QToolTip::add(_rbHB, i18n("Hide panel")); + TQToolTip::add(_rbHB, i18n("Hide panel")); } } @@ -1692,13 +1692,13 @@ bool ExtensionContainer::needsBorder() const //&& !KickerSettings::useBackgroundTheme(); } -QSize ExtensionContainer::initialSize(KPanelExtension::Position p, QRect workArea) const +TQSize ExtensionContainer::initialSize(KPanelExtension::Position p, TQRect workArea) const { /*kdDebug(1210) << "initialSize() Work Area: (" << workArea.topLeft().x() << ", " << workArea.topLeft().y() << ") to (" << workArea.bottomRight().x() << ", " << workArea.bottomRight().y() << ")" << endl;*/ - QSize hint = sizeHint(p, workArea.size()).boundedTo(workArea.size()); + TQSize hint = sizeHint(p, workArea.size()).boundedTo(workArea.size()); int width = 0; int height = 0; @@ -1723,25 +1723,25 @@ QSize ExtensionContainer::initialSize(KPanelExtension::Position p, QRect workAre } } - return QSize(width, height); + return TQSize(width, height); } -QPoint ExtensionContainer::initialLocation(KPanelExtension::Position p, +TQPoint ExtensionContainer::initialLocation(KPanelExtension::Position p, KPanelExtension::Alignment a, int XineramaScreen, - const QSize &s, - QRect workArea, + const TQSize &s, + TQRect workArea, bool autohidden, UserHidden userHidden) const { - QRect wholeScreen; + TQRect wholeScreen; if (XineramaScreen == XineramaAllScreens) { - wholeScreen = QApplication::desktop()->geometry(); + wholeScreen = TQApplication::desktop()->geometry(); } else { - wholeScreen = QApplication::desktop()->screenGeometry(XineramaScreen); + wholeScreen = TQApplication::desktop()->screenGeometry(XineramaScreen); } /*kdDebug(1210) << "initialLocation() Work Area: (" << @@ -1890,7 +1890,7 @@ QPoint ExtensionContainer::initialLocation(KPanelExtension::Position p, } } - return QPoint( left, top ); + return TQPoint( left, top ); } int ExtensionContainer::xineramaScreen() const @@ -1900,14 +1900,14 @@ int ExtensionContainer::xineramaScreen() const /* -2 means all screens, -1 primary screens, the rest are valid screen numbers */ if (XineramaAllScreens <= m_settings.xineramaScreen() && - m_settings.xineramaScreen() < QApplication::desktop()->numScreens()) + m_settings.xineramaScreen() < TQApplication::desktop()->numScreens()) { return m_settings.xineramaScreen(); } else { /* force invalid screen locations onto the primary screen */ - return QApplication::desktop()->primaryScreen(); + return TQApplication::desktop()->primaryScreen(); } } @@ -1921,13 +1921,13 @@ void ExtensionContainer::setXineramaScreen(int screen) arrange(position(),alignment(), screen); } -QRect ExtensionContainer::currentGeometry() const +TQRect ExtensionContainer::currentGeometry() const { return initialGeometry(position(), alignment(), xineramaScreen(), autoHidden(), userHidden()); } -QRect ExtensionContainer::initialGeometry(KPanelExtension::Position p, +TQRect ExtensionContainer::initialGeometry(KPanelExtension::Position p, KPanelExtension::Alignment a, int XineramaScreen, bool autoHidden, @@ -1937,54 +1937,54 @@ QRect ExtensionContainer::initialGeometry(KPanelExtension::Position p, /*kdDebug(1210) << "initialGeometry() Computing geometry for " << name() << " on screen " << XineramaScreen << endl;*/ - QRect workArea = ExtensionManager::the()->workArea(XineramaScreen, this); - QSize size = initialSize(p, workArea); - QPoint point = initialLocation(p, a, XineramaScreen, + TQRect workArea = ExtensionManager::the()->workArea(XineramaScreen, this); + TQSize size = initialSize(p, workArea); + TQPoint point = initialLocation(p, a, XineramaScreen, size, workArea, autoHidden, userHidden); //kdDebug(1210) << "Size: " << size.width() << " x " << size.height() << endl; //kdDebug(1210) << "Pos: (" << point.x() << ", " << point.y() << ")" << endl; - return QRect(point, size); + return TQRect(point, size); } -bool ExtensionContainer::eventFilter( QObject*, QEvent * e) +bool ExtensionContainer::eventFilter( TQObject*, TQEvent * e) { if (autoHidden()) { switch ( e->type() ) { - case QEvent::MouseButtonPress: - case QEvent::MouseButtonRelease: - case QEvent::MouseButtonDblClick: - case QEvent::MouseMove: - case QEvent::KeyPress: - case QEvent::KeyRelease: + case TQEvent::MouseButtonPress: + case TQEvent::MouseButtonRelease: + case TQEvent::MouseButtonDblClick: + case TQEvent::MouseMove: + case TQEvent::KeyPress: + case TQEvent::KeyRelease: return true; // ignore; default: break; } } - QEvent::Type eventType = e->type(); + TQEvent::Type eventType = e->type(); if (_block_user_input) { - return (eventType == QEvent::MouseButtonPress || - eventType == QEvent::MouseButtonRelease || - eventType == QEvent::MouseButtonDblClick || - eventType == QEvent::MouseMove || - eventType == QEvent::KeyPress || - eventType == QEvent::KeyRelease || - eventType == QEvent::Enter || - eventType == QEvent::Leave); + return (eventType == TQEvent::MouseButtonPress || + eventType == TQEvent::MouseButtonRelease || + eventType == TQEvent::MouseButtonDblClick || + eventType == TQEvent::MouseMove || + eventType == TQEvent::KeyPress || + eventType == TQEvent::KeyRelease || + eventType == TQEvent::Enter || + eventType == TQEvent::Leave); } switch (eventType) { - case QEvent::MouseButtonPress: + case TQEvent::MouseButtonPress: { - QMouseEvent* me = static_cast<QMouseEvent*>(e); + TQMouseEvent* me = static_cast<TQMouseEvent*>(e); if ( me->button() == LeftButton ) { _last_lmb_press = me->globalPos(); @@ -1998,9 +1998,9 @@ bool ExtensionContainer::eventFilter( QObject*, QEvent * e) } break; - case QEvent::MouseButtonRelease: + case TQEvent::MouseButtonRelease: { - QMouseEvent* me = static_cast<QMouseEvent*>(e); + TQMouseEvent* me = static_cast<TQMouseEvent*>(e); if ( me->button() == LeftButton ) { _is_lmb_down = false; @@ -2008,16 +2008,16 @@ bool ExtensionContainer::eventFilter( QObject*, QEvent * e) } break; - case QEvent::MouseMove: + case TQEvent::MouseMove: { - QMouseEvent* me = (QMouseEvent*) e; + TQMouseEvent* me = (TQMouseEvent*) e; if (_is_lmb_down && ((me->state() & LeftButton) == LeftButton) && !Kicker::the()->isImmutable() && !m_settings.config()->isImmutable() && !ExtensionManager::the()->isMenuBar(this)) { - QPoint p(me->globalPos() - _last_lmb_press); + TQPoint p(me->globalPos() - _last_lmb_press); int x_threshold = width(); int y_threshold = height(); @@ -2049,14 +2049,14 @@ bool ExtensionContainer::eventFilter( QObject*, QEvent * e) return false; } -PopupWidgetFilter::PopupWidgetFilter( QObject *parent ) - : QObject( parent, "PopupWidgetFilter" ) +PopupWidgetFilter::PopupWidgetFilter( TQObject *parent ) + : TQObject( parent, "PopupWidgetFilter" ) { } -bool PopupWidgetFilter::eventFilter( QObject*, QEvent* e ) +bool PopupWidgetFilter::eventFilter( TQObject*, TQEvent* e ) { - if (e->type() == QEvent::Hide) + if (e->type() == TQEvent::Hide) { emit popupWidgetHiding(); } diff --git a/kicker/kicker/core/container_extension.h b/kicker/kicker/core/container_extension.h index aebe048e6..cdc608392 100644 --- a/kicker/kicker/core/container_extension.h +++ b/kicker/kicker/core/container_extension.h @@ -24,8 +24,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #ifndef __container_extension_h__ #define __container_extension_h__ -#include <qframe.h> -#include <qptrlist.h> +#include <tqframe.h> +#include <tqptrlist.h> #include <kpanelextension.h> #include <dcopobject.h> @@ -58,24 +58,24 @@ public: enum HideMode { ManualHide, AutomaticHide, BackgroundHide }; ExtensionContainer(const AppletInfo& info, - const QString& extensionId, - QWidget *parent = 0); + const TQString& extensionId, + TQWidget *parent = 0); ExtensionContainer(KPanelExtension* extension, const AppletInfo& info, - const QString& extensionId, - QWidget *parent = 0); + const TQString& extensionId, + TQWidget *parent = 0); virtual ~ExtensionContainer(); - virtual QSize sizeHint(KPanelExtension::Position, const QSize &maxSize) const; + virtual TQSize sizeHint(KPanelExtension::Position, const TQSize &maxSize) const; const AppletInfo& info() const { return _info; } - QString extensionId() const { return _id; } + TQString extensionId() const { return _id; } void readConfig(); void writeConfig(); - virtual QString panelId() const { return extensionId(); } + virtual TQString panelId() const { return extensionId(); } virtual void about(); virtual void help(); @@ -103,12 +103,12 @@ public: KPanelExtension::Alignment alignment() const; void setAlignment(KPanelExtension::Alignment a) { arrange( position(), a, xineramaScreen() ); } - QRect currentGeometry() const; - QRect initialGeometry(KPanelExtension::Position p, KPanelExtension::Alignment a, + TQRect currentGeometry() const; + TQRect initialGeometry(KPanelExtension::Position p, KPanelExtension::Alignment a, int XineramaScreen, bool autoHidden = false, UserHidden userHidden = Unhidden) const; - bool eventFilter( QObject *, QEvent * ); + bool eventFilter( TQObject *, TQEvent * ); int panelOrder() const { return m_panelOrder; } void setPanelOrder(int order) { m_panelOrder = order; } @@ -117,7 +117,7 @@ signals: void removeme(ExtensionContainer*); protected slots: - virtual void showPanelMenu( const QPoint& pos ); + virtual void showPanelMenu( const TQPoint& pos ); void moveMe(); void updateLayout(); void actuallyUpdateLayout(); @@ -125,10 +125,10 @@ protected slots: void updateHighlightColor(); protected: - bool event(QEvent*); - void closeEvent( QCloseEvent* e ); - void paintEvent(QPaintEvent*); - void leaveEvent(QEvent*); + bool event(TQEvent*); + void closeEvent( TQCloseEvent* e ); + void paintEvent(TQPaintEvent*); + void leaveEvent(TQEvent*); void arrange(KPanelExtension::Position p, KPanelExtension::Alignment a, int XineramaScreen); bool autoHidden() const { return _autoHidden; }; @@ -154,9 +154,9 @@ private slots: private: bool shouldUnhideForTrigger(UnhideTrigger::Trigger t) const; void init(); - QSize initialSize(KPanelExtension::Position p, QRect workArea) const; - QPoint initialLocation(KPanelExtension::Position p, KPanelExtension::Alignment a, - int XineramaScreen, const QSize &s, QRect workArea, + TQSize initialSize(KPanelExtension::Position p, TQRect workArea) const; + TQPoint initialLocation(KPanelExtension::Position p, KPanelExtension::Alignment a, + int XineramaScreen, const TQSize &s, TQRect workArea, bool autohidden = false, UserHidden userHidden = Unhidden) const; void positionChange(KPanelExtension::Position p); void alignmentChange(KPanelExtension::Alignment a); @@ -172,17 +172,17 @@ private: bool _autoHidden; UserHidden _userHidden; bool _block_user_input; - QPoint _last_lmb_press; + TQPoint _last_lmb_press; bool _is_lmb_down; bool _in_autohide; // Misc objects - QTimer *_autohideTimer; - QTimer *_updateLayoutTimer; + TQTimer *_autohideTimer; + TQTimer *_updateLayoutTimer; NETExtendedStrut _strut; PopupWidgetFilter *_popupWidgetFilter; - QString _id; + TQString _id; PanelExtensionOpMenu *_opMnu; AppletInfo _info; KPanelExtension::Type _type; @@ -190,12 +190,12 @@ private: // Widgets HideButton *_ltHB; // Left Hide Button HideButton *_rbHB; // Right Hide Button - QGridLayout *_layout; + TQGridLayout *_layout; KPanelExtension *m_extension; int m_maintainFocus; int m_panelOrder; - QColor m_highlightColor; + TQColor m_highlightColor; }; class PopupWidgetFilter : public QObject @@ -203,13 +203,13 @@ class PopupWidgetFilter : public QObject Q_OBJECT public: - PopupWidgetFilter( QObject *parent ); + PopupWidgetFilter( TQObject *parent ); ~PopupWidgetFilter() {} - bool eventFilter( QObject *obj, QEvent* e ); + bool eventFilter( TQObject *obj, TQEvent* e ); signals: void popupWidgetHiding(); }; -typedef QValueList<ExtensionContainer*> ExtensionList; +typedef TQValueList<ExtensionContainer*> ExtensionList; #endif diff --git a/kicker/kicker/core/containerarea.cpp b/kicker/kicker/core/containerarea.cpp index 23732e684..7d63d562a 100644 --- a/kicker/kicker/core/containerarea.cpp +++ b/kicker/kicker/core/containerarea.cpp @@ -23,15 +23,15 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <unistd.h> -#include <qdir.h> -#include <qfile.h> -#include <qfileinfo.h> -#include <qpainter.h> -#include <qpixmap.h> -#include <qstyle.h> -#include <qtextstream.h> -#include <qtimer.h> -#include <qwmatrix.h> +#include <tqdir.h> +#include <tqfile.h> +#include <tqfileinfo.h> +#include <tqpainter.h> +#include <tqpixmap.h> +#include <tqstyle.h> +#include <tqtextstream.h> +#include <tqtimer.h> +#include <tqwmatrix.h> #include <kapplication.h> #include <kglobal.h> @@ -69,8 +69,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. extern int kicker_screen_number; ContainerArea::ContainerArea(KConfig* _c, - QWidget* parent, - QPopupMenu* opMenu, + TQWidget* parent, + TQPopupMenu* opMenu, const char* name) : Panner(parent, name), _moveAC(0), @@ -78,7 +78,7 @@ ContainerArea::ContainerArea(KConfig* _c, _config(_c), _dragIndicator(0), _dragMoveAC(0), - _dragMoveOffset(QPoint(0,0)), + _dragMoveOffset(TQPoint(0,0)), m_opMenu(opMenu), _rootPixmap(0), _useBgTheme(false), @@ -100,11 +100,11 @@ ContainerArea::ContainerArea(KConfig* _c, setBackground(); - connect(&_autoScrollTimer, SIGNAL(timeout()), SLOT(autoScroll())); - connect(kapp, SIGNAL(kdisplayPaletteChanged()), SLOT(setBackground())); - connect(Kicker::the(), SIGNAL(immutabilityChanged(bool)), - SLOT(immutabilityChanged(bool))); - connect(this, SIGNAL(contentsMoving(int, int)), SLOT(setBackground())); + connect(&_autoScrollTimer, TQT_SIGNAL(timeout()), TQT_SLOT(autoScroll())); + connect(kapp, TQT_SIGNAL(kdisplayPaletteChanged()), TQT_SLOT(setBackground())); + connect(Kicker::the(), TQT_SIGNAL(immutabilityChanged(bool)), + TQT_SLOT(immutabilityChanged(bool))); + connect(this, TQT_SIGNAL(contentsMoving(int, int)), TQT_SLOT(setBackground())); } ContainerArea::~ContainerArea() @@ -139,7 +139,7 @@ void ContainerArea::initialize(bool useDefaultConfig) } setAcceptDrops(!isImmutable()); - QTimer::singleShot(0, this, SLOT(resizeContents())); + TQTimer::singleShot(0, this, TQT_SLOT(resizeContents())); } void ContainerArea::defaultContainerConfig() @@ -160,12 +160,12 @@ void ContainerArea::defaultContainerConfig() } dsize -= 560; - QStringList buttons; + TQStringList buttons; - QFile f(locate("data", "kicker/default-apps")); + TQFile f(locate("data", "kicker/default-apps")); if (f.open(IO_ReadOnly)) { - QTextStream is(&f); + TQTextStream is(&f); while (!is.eof()) buttons << is.readLine(); @@ -179,7 +179,7 @@ void ContainerArea::defaultContainerConfig() } //int size = dsize; - for (QStringList::ConstIterator it = buttons.begin(); it != buttons.end(); ++it) + for (TQStringList::ConstIterator it = buttons.begin(); it != buttons.end(); ++it) { /*size -= 42; if (size <= 0) @@ -190,9 +190,9 @@ void ContainerArea::defaultContainerConfig() if (!service) { // look for a special button - QString s = locate("appdata", *it); + TQString s = locate("appdata", *it); if (s.isEmpty()) continue; - QString itExt = (*it).section('/', 1); + TQString itExt = (*it).section('/', 1); button = new ExtensionButtonContainer(itExt, m_opMenu, m_contents); } else @@ -216,7 +216,7 @@ void ContainerArea::defaultContainerConfig() AppletContainer* a = manager->createAppletContainer( "minipagerapplet.desktop", true, - QString::null, + TQString::null, m_opMenu, m_contents); if (a) @@ -229,7 +229,7 @@ void ContainerArea::defaultContainerConfig() a = manager->createAppletContainer( "taskbarapplet.desktop", true, - QString::null, + TQString::null, m_opMenu, m_contents); if (a) @@ -242,7 +242,7 @@ void ContainerArea::defaultContainerConfig() a = manager->createAppletContainer( "systemtrayapplet.desktop", true, - QString::null, + TQString::null, m_opMenu, m_contents ); if (a) @@ -255,7 +255,7 @@ void ContainerArea::defaultContainerConfig() a = manager->createAppletContainer( "clockapplet.desktop", true, - QString::null, + TQString::null, m_opMenu, m_contents ); if (a) @@ -274,17 +274,17 @@ void ContainerArea::defaultContainerConfig() saveContainerConfig(); } -void ContainerArea::loadContainers(const QStringList& containers) +void ContainerArea::loadContainers(const TQStringList& containers) { // read applet list bool badApplets = false; // now restore the applets - QStringList::const_iterator it = containers.constBegin(); - QStringList::const_iterator itEnd = containers.constEnd(); + TQStringList::const_iterator it = containers.constBegin(); + TQStringList::const_iterator itEnd = containers.constEnd(); for (; it != itEnd; ++it) { - QString appletId(*it); + TQString appletId(*it); // is there a config group for this applet? if (!_config->hasGroup(appletId)) @@ -298,7 +298,7 @@ void ContainerArea::loadContainers(const QStringList& containers) int sep = appletId.findRev('_'); Q_ASSERT(sep != -1); - QString appletType = appletId.left(sep); + TQString appletType = appletId.left(sep); // create a matching applet container if (appletType == "KMenuButton") @@ -359,7 +359,7 @@ void ContainerArea::loadContainers(const QStringList& containers) // it gets executed too soon. we need to wait until the containers are // actually resized, but we enter the event loop prior to that happening // above. - QTimer::singleShot(0, this, SLOT(updateContainersBackground())); + TQTimer::singleShot(0, this, TQT_SLOT(updateContainersBackground())); } void ContainerArea::saveContainerConfig(bool layoutOnly) @@ -370,8 +370,8 @@ void ContainerArea::saveContainerConfig(bool layoutOnly) } // Save the applet list - QStringList alist; - QLayoutIterator it2 = m_layout->iterator(); + TQStringList alist; + TQLayoutIterator it2 = m_layout->iterator(); for (; it2.current(); ++it2) { BaseContainer* a = dynamic_cast<BaseContainer*>(it2.current()->widget()); @@ -414,9 +414,9 @@ void ContainerArea::configure() resizeContents(); } -const QWidget* ContainerArea::addButton(const AppletInfo& info) +const TQWidget* ContainerArea::addButton(const AppletInfo& info) { - QString buttonType = info.library(); + TQString buttonType = info.library(); if (buttonType == "BookmarksButton") { @@ -453,7 +453,7 @@ const QWidget* ContainerArea::addButton(const AppletInfo& info) return 0; } -const QWidget* ContainerArea::addKMenuButton() +const TQWidget* ContainerArea::addKMenuButton() { if (!canAddContainers()) { @@ -465,7 +465,7 @@ const QWidget* ContainerArea::addKMenuButton() return b; } -const QWidget* ContainerArea::addDesktopButton() +const TQWidget* ContainerArea::addDesktopButton() { if (!canAddContainers()) { @@ -477,7 +477,7 @@ const QWidget* ContainerArea::addDesktopButton() return b; } -const QWidget* ContainerArea::addWindowListButton() +const TQWidget* ContainerArea::addWindowListButton() { if (!canAddContainers()) { @@ -489,7 +489,7 @@ const QWidget* ContainerArea::addWindowListButton() return b; } -const QWidget* ContainerArea::addBookmarksButton() +const TQWidget* ContainerArea::addBookmarksButton() { if (!canAddContainers()) { @@ -501,7 +501,7 @@ const QWidget* ContainerArea::addBookmarksButton() return b; } -const QWidget* ContainerArea::addServiceButton(const QString& desktopFile) +const TQWidget* ContainerArea::addServiceButton(const TQString& desktopFile) { if (!canAddContainers()) { @@ -514,7 +514,7 @@ const QWidget* ContainerArea::addServiceButton(const QString& desktopFile) return b; } -const QWidget* ContainerArea::addURLButton(const QString &url) +const TQWidget* ContainerArea::addURLButton(const TQString &url) { if (!canAddContainers()) { @@ -526,17 +526,17 @@ const QWidget* ContainerArea::addURLButton(const QString &url) return b; } -const QWidget* ContainerArea::addBrowserButton() +const TQWidget* ContainerArea::addBrowserButton() { if (!canAddContainers()) { return 0; } - PanelBrowserDialog *dlg = new PanelBrowserDialog(QDir::home().path(), + PanelBrowserDialog *dlg = new PanelBrowserDialog(TQDir::home().path(), "kdisknav"); - if (dlg->exec() == QDialog::Accepted) + if (dlg->exec() == TQDialog::Accepted) { return addBrowserButton(dlg->path(), dlg->icon()); } @@ -544,8 +544,8 @@ const QWidget* ContainerArea::addBrowserButton() return 0; } -const QWidget* ContainerArea::addBrowserButton(const QString &startDir, - const QString& icon) +const TQWidget* ContainerArea::addBrowserButton(const TQString &startDir, + const TQString& icon) { if (!canAddContainers()) { @@ -558,7 +558,7 @@ const QWidget* ContainerArea::addBrowserButton(const QString &startDir, return b; } -const QWidget* ContainerArea::addServiceMenuButton(const QString& relPath) +const TQWidget* ContainerArea::addServiceMenuButton(const TQString& relPath) { if (!canAddContainers()) { @@ -571,17 +571,17 @@ const QWidget* ContainerArea::addServiceMenuButton(const QString& relPath) return b; } -const QWidget* ContainerArea::addNonKDEAppButton() +const TQWidget* ContainerArea::addNonKDEAppButton() { if (!canAddContainers()) { return 0; } - PanelExeDialog dlg(QString::null, QString::null, QString::null, - QString::null, QString::null, false, 0); + PanelExeDialog dlg(TQString::null, TQString::null, TQString::null, + TQString::null, TQString::null, false, 0); - if (dlg.exec() == QDialog::Accepted) + if (dlg.exec() == TQDialog::Accepted) { return addNonKDEAppButton(dlg.title(), dlg.description(), dlg.command(), dlg.iconPath(), @@ -592,11 +592,11 @@ const QWidget* ContainerArea::addNonKDEAppButton() return 0; } -const QWidget* ContainerArea::addNonKDEAppButton(const QString &name, - const QString &description, - const QString& filePath, - const QString &icon, - const QString &cmdLine, +const TQWidget* ContainerArea::addNonKDEAppButton(const TQString &name, + const TQString &description, + const TQString& filePath, + const TQString &icon, + const TQString &cmdLine, bool inTerm) { if (!canAddContainers()) @@ -613,7 +613,7 @@ const QWidget* ContainerArea::addNonKDEAppButton(const QString &name, return b; } -const QWidget* ContainerArea::addExtensionButton(const QString& df) +const TQWidget* ContainerArea::addExtensionButton(const TQString& df) { if (!canAddContainers()) { @@ -651,7 +651,7 @@ AppletContainer* ContainerArea::addApplet(const AppletInfo& info, AppletContainer* a = PluginManager::the()->createAppletContainer( info.desktopFile(), false, // not startup - QString::null, // no config + TQString::null, // no config m_opMenu, m_contents, isImmutable); @@ -682,8 +682,8 @@ void ContainerArea::addContainer(BaseContainer* a, bool arrange, int index) if (arrange) { - QWidget* w = m_layout->widgetAt(index); - QPoint oldInsertionPoint = Kicker::the()->insertionPoint(); + TQWidget* w = m_layout->widgetAt(index); + TQPoint oldInsertionPoint = Kicker::the()->insertionPoint(); if (w) { // let's set the insertion point to where the widget asked to be @@ -693,7 +693,7 @@ void ContainerArea::addContainer(BaseContainer* a, bool arrange, int index) if (Kicker::the()->insertionPoint().isNull()) { - m_layout->insertIntoFreeSpace(a, QPoint()); + m_layout->insertIntoFreeSpace(a, TQPoint()); } else { @@ -710,20 +710,20 @@ void ContainerArea::addContainer(BaseContainer* a, bool arrange, int index) m_layout->add(a); } - connect(a, SIGNAL(moveme(BaseContainer*)), - SLOT(startContainerMove(BaseContainer*))); - connect(a, SIGNAL(removeme(BaseContainer*)), - SLOT(removeContainer(BaseContainer*))); - connect(a, SIGNAL(takeme(BaseContainer*)), - SLOT(takeContainer(BaseContainer*))); - connect(a, SIGNAL(requestSave()), - SLOT(slotSaveContainerConfig())); - connect(a, SIGNAL(maintainFocus(bool)), - this, SIGNAL(maintainFocus(bool))); + connect(a, TQT_SIGNAL(moveme(BaseContainer*)), + TQT_SLOT(startContainerMove(BaseContainer*))); + connect(a, TQT_SIGNAL(removeme(BaseContainer*)), + TQT_SLOT(removeContainer(BaseContainer*))); + connect(a, TQT_SIGNAL(takeme(BaseContainer*)), + TQT_SLOT(takeContainer(BaseContainer*))); + connect(a, TQT_SIGNAL(requestSave()), + TQT_SLOT(slotSaveContainerConfig())); + connect(a, TQT_SIGNAL(maintainFocus(bool)), + this, TQT_SIGNAL(maintainFocus(bool))); if (dynamic_cast<AppletContainer*>(a)) { - connect(a, SIGNAL(updateLayout()), SLOT(resizeContents())); + connect(a, TQT_SIGNAL(updateLayout()), TQT_SLOT(resizeContents())); } a->configure(orientation(), popupDirection()); @@ -806,16 +806,16 @@ void ContainerArea::takeContainer(BaseContainer* a) return; } - disconnect(a, SIGNAL(moveme(BaseContainer*)), - this, SLOT(startContainerMove(BaseContainer*))); - disconnect(a, SIGNAL(removeme(BaseContainer*)), - this, SLOT(removeContainer(BaseContainer*))); - disconnect(a, SIGNAL(takeme(BaseContainer*)), - this, SLOT(takeContainer(BaseContainer*))); - disconnect(a, SIGNAL(requestSave()), - this, SLOT(slotSaveContainerConfig())); - disconnect(a, SIGNAL(maintainFocus(bool)), - this, SIGNAL(maintainFocus(bool))); + disconnect(a, TQT_SIGNAL(moveme(BaseContainer*)), + this, TQT_SLOT(startContainerMove(BaseContainer*))); + disconnect(a, TQT_SIGNAL(removeme(BaseContainer*)), + this, TQT_SLOT(removeContainer(BaseContainer*))); + disconnect(a, TQT_SIGNAL(takeme(BaseContainer*)), + this, TQT_SLOT(takeContainer(BaseContainer*))); + disconnect(a, TQT_SIGNAL(requestSave()), + this, TQT_SLOT(slotSaveContainerConfig())); + disconnect(a, TQT_SIGNAL(maintainFocus(bool)), + this, TQT_SIGNAL(maintainFocus(bool))); // Just remove the group from our own config file. Leave separate config // files untouched. @@ -859,10 +859,10 @@ void ContainerArea::resizeContents() } } -QString ContainerArea::createUniqueId(const QString& appletType) const +TQString ContainerArea::createUniqueId(const TQString& appletType) const { - QString idBase = appletType + "_%1"; - QString newId; + TQString idBase = appletType + "_%1"; + TQString newId; int i = 0; bool unique = false; @@ -911,7 +911,7 @@ void ContainerArea::startContainerMove(BaseContainer *a) a->raise(); } -void ContainerArea::mouseReleaseEvent(QMouseEvent *) +void ContainerArea::mouseReleaseEvent(TQMouseEvent *) { if (!_moveAC) { @@ -936,7 +936,7 @@ void ContainerArea::mouseReleaseEvent(QMouseEvent *) saveContainerConfig(true); } -void ContainerArea::mouseMoveEvent(QMouseEvent *ev) +void ContainerArea::mouseMoveEvent(TQMouseEvent *ev) { if (!_moveAC) { @@ -1035,7 +1035,7 @@ bool ContainerArea::isImmutable() const return m_immutable || Kicker::the()->isImmutable(); } -void ContainerArea::dragEnterEvent(QDragEnterEvent *ev) +void ContainerArea::dragEnterEvent(TQDragEnterEvent *ev) { bool canAccept = !isImmutable() && (PanelDrag::canDecode(ev) || @@ -1066,13 +1066,13 @@ void ContainerArea::dragEnterEvent(QDragEnterEvent *ev) if (orientation() == Horizontal) { - _dragIndicator->setPreferredSize(QSize(preferedWidth, height())); + _dragIndicator->setPreferredSize(TQSize(preferedWidth, height())); } else { - _dragIndicator->setPreferredSize(QSize(width(), preferedHeight)); + _dragIndicator->setPreferredSize(TQSize(width(), preferedHeight)); } - _dragMoveOffset = QPoint(_dragIndicator->width()/2, + _dragMoveOffset = TQPoint(_dragIndicator->width()/2, _dragIndicator->height()/2); // Find the container before the position of the dragindicator. @@ -1108,7 +1108,7 @@ void ContainerArea::dragEnterEvent(QDragEnterEvent *ev) _dragIndicator->show(); } -void ContainerArea::dragMoveEvent(QDragMoveEvent* ev) +void ContainerArea::dragMoveEvent(TQDragMoveEvent* ev) { if (ev->source() == this) { @@ -1117,10 +1117,10 @@ void ContainerArea::dragMoveEvent(QDragMoveEvent* ev) // then it does work only on every second event. // Cancel the drag by faking an Escape keystroke. - QKeyEvent fakedKeyPress(QEvent::KeyPress, Key_Escape, 0, 0); - QKeyEvent fakedKeyRelease(QEvent::KeyRelease, Key_Escape, 0, 0); - QApplication::sendEvent(this, &fakedKeyPress); - QApplication::sendEvent(this, &fakedKeyRelease); + TQKeyEvent fakedKeyPress(TQEvent::KeyPress, Key_Escape, 0, 0); + TQKeyEvent fakedKeyRelease(TQEvent::KeyRelease, Key_Escape, 0, 0); + TQApplication::sendEvent(this, &fakedKeyPress); + TQApplication::sendEvent(this, &fakedKeyRelease); qApp->processEvents(); startContainerMove(_moveAC); @@ -1151,7 +1151,7 @@ void ContainerArea::dragMoveEvent(QDragMoveEvent* ev) } } -void ContainerArea::dragLeaveEvent(QDragLeaveEvent*) +void ContainerArea::dragLeaveEvent(TQDragLeaveEvent*) { if (_dragIndicator) { @@ -1161,7 +1161,7 @@ void ContainerArea::dragLeaveEvent(QDragLeaveEvent*) _dragMoveAC = 0; } -void ContainerArea::dropEvent(QDropEvent *ev) +void ContainerArea::dropEvent(TQDropEvent *ev) { if (!_dragIndicator) { @@ -1182,7 +1182,7 @@ void ContainerArea::dropEvent(QDropEvent *ev) return; } - QObject *parent = ev->source() ? ev->source()->parent() : 0; + TQObject *parent = ev->source() ? ev->source()->parent() : 0; while (parent && (parent != this)) { parent = parent->parent(); @@ -1217,7 +1217,7 @@ void ContainerArea::dropEvent(QDropEvent *ev) a->reparent(m_contents, 0, _dragIndicator->pos(), true); a->setAppletId(createUniqueId(a->appletType())); addContainer(a, true); - Kicker::the()->setInsertionPoint(QPoint()); + Kicker::the()->setInsertionPoint(TQPoint()); m_layout->updateFreeSpaceValues(); _dragMoveAC = 0; _dragIndicator->hide(); @@ -1243,7 +1243,7 @@ void ContainerArea::dropEvent(QDropEvent *ev) addApplet(info); } - Kicker::the()->setInsertionPoint(QPoint()); + Kicker::the()->setInsertionPoint(TQPoint()); return; } @@ -1269,7 +1269,7 @@ void ContainerArea::dropEvent(QDropEvent *ev) // see if it's a executable or directory if (url.protocol() == "programs") { - QString relPath = url.path(); + TQString relPath = url.path(); if (relPath[0] == '/') { relPath = relPath.right(relPath.length() - 1); @@ -1278,7 +1278,7 @@ void ContainerArea::dropEvent(QDropEvent *ev) } else if (url.isLocalFile()) { - QFileInfo fi(url.path()); + TQFileInfo fi(url.path()); if (fi.isDir()) { // directory switch (PanelDirDropMenu().exec(mapToGlobal(ev->pos()))) @@ -1308,15 +1308,15 @@ void ContainerArea::dropEvent(QDropEvent *ev) else if (fi.isExecutable()) { // non-KDE executable - QString pixmapFile; + TQString pixmapFile; KMimeType::pixmapForURL(url, 0, KIcon::Panel, 0, KIcon::DefaultState, &pixmapFile); - PanelExeDialog dlg(QString::null, QString::null, url.path(), - pixmapFile, QString::null, false, 0); - if (dlg.exec() == QDialog::Accepted) + PanelExeDialog dlg(TQString::null, TQString::null, url.path(), + pixmapFile, TQString::null, false, 0); + if (dlg.exec() == TQDialog::Accepted) { // KIconloader returns a full path, we only want the name - QFileInfo iconfi(dlg.iconPath()); + TQFileInfo iconfi(dlg.iconPath()); a = new NonKDEAppButtonContainer(dlg.title(), dlg.description(), dlg.command(), @@ -1340,7 +1340,7 @@ void ContainerArea::dropEvent(QDropEvent *ev) if (!a) { _dragIndicator->hide(); - Kicker::the()->setInsertionPoint(QPoint()); + Kicker::the()->setInsertionPoint(TQPoint()); m_layout->setStretchEnabled(true); return; } @@ -1352,11 +1352,11 @@ void ContainerArea::dropEvent(QDropEvent *ev) saveContainerConfig(); _dragMoveAC = 0; _dragIndicator->hide(); - Kicker::the()->setInsertionPoint(QPoint()); + Kicker::the()->setInsertionPoint(TQPoint()); m_layout->setStretchEnabled(true); } -bool ContainerArea::eventFilter(QObject* o, QEvent* e) +bool ContainerArea::eventFilter(TQObject* o, TQEvent* e) { // Propagate the layout hints which m_contents receives. This way widgets // which contain a ContainerArea can react to layout changes of its @@ -1364,7 +1364,7 @@ bool ContainerArea::eventFilter(QObject* o, QEvent* e) // want to grow as well. if (o == m_contents) { - if (e->type() == QEvent::LayoutHint) + if (e->type() == TQEvent::LayoutHint) { updateGeometry(); // Posts a new layout hint to our parent. } @@ -1374,13 +1374,13 @@ bool ContainerArea::eventFilter(QObject* o, QEvent* e) return Panner::eventFilter(o, e); } -void ContainerArea::resizeEvent(QResizeEvent *ev) +void ContainerArea::resizeEvent(TQResizeEvent *ev) { Panner::resizeEvent(ev); setBackground(); } -void ContainerArea::viewportResizeEvent(QResizeEvent* ev) +void ContainerArea::viewportResizeEvent(TQResizeEvent* ev) { Panner::viewportResizeEvent(ev); if (orientation() == Horizontal) @@ -1411,8 +1411,8 @@ void ContainerArea::setBackground() { _rootPixmap = new KRootPixmap(this); _rootPixmap->setCustomPainting(true); - connect(_rootPixmap, SIGNAL(backgroundUpdated(const QPixmap&)), - SLOT(updateBackground(const QPixmap&))); + connect(_rootPixmap, TQT_SIGNAL(backgroundUpdated(const TQPixmap&)), + TQT_SLOT(updateBackground(const TQPixmap&))); } else { @@ -1438,9 +1438,9 @@ void ContainerArea::setBackground() // by keeping the src image static, we can share it among panels and only // reload from disk when it actually changes in the config, not every time we // get a resize or configure event - static QString bgStr; - static QImage srcImage; - QString newBgStr = locate("appdata", KickerSettings::backgroundTheme()); + static TQString bgStr; + static TQImage srcImage; + TQString newBgStr = locate("appdata", KickerSettings::backgroundTheme()); if (bgStr != newBgStr) { @@ -1454,13 +1454,13 @@ void ContainerArea::setBackground() } else { - QImage bgImage = srcImage; + TQImage bgImage = srcImage; if (orientation() == Vertical) { if (KickerSettings::rotateBackground()) { - QWMatrix matrix; + TQWMatrix matrix; matrix.rotate(position() == KPanelExtension::Left ? 90: 270); bgImage = bgImage.xForm(matrix); } @@ -1472,7 +1472,7 @@ void ContainerArea::setBackground() if (position() == KPanelExtension::Top && KickerSettings::rotateBackground()) { - QWMatrix matrix; + TQWMatrix matrix; matrix.rotate(180); bgImage = bgImage.xForm(matrix); } @@ -1484,8 +1484,8 @@ void ContainerArea::setBackground() { KickerLib::colorize(bgImage); } - setPaletteBackgroundPixmap(QPixmap(bgImage)); - QTimer::singleShot(0, this, SLOT(updateContainersBackground())); + setPaletteBackgroundPixmap(TQPixmap(bgImage)); + TQTimer::singleShot(0, this, TQT_SLOT(updateContainersBackground())); } } @@ -1507,12 +1507,12 @@ void ContainerArea::immutabilityChanged(bool immutable) } setAcceptDrops(!isImmutable()); - QTimer::singleShot(0, this, SLOT(setBackground())); + TQTimer::singleShot(0, this, TQT_SLOT(setBackground())); } -QRect ContainerArea::availableSpaceFollowing(BaseContainer* a) +TQRect ContainerArea::availableSpaceFollowing(BaseContainer* a) { - QRect availableSpace = rect(); + TQRect availableSpace = rect(); BaseContainer* b = 0; if (a) @@ -1564,7 +1564,7 @@ QRect ContainerArea::availableSpaceFollowing(BaseContainer* a) void ContainerArea::moveDragIndicator(int pos) { - QRect availableSpace = availableSpaceFollowing(_dragMoveAC); + TQRect availableSpace = availableSpaceFollowing(_dragMoveAC); // Move _dragIndicator to position pos, restricted by availableSpace. // Resize _dragIndicator if necessary. @@ -1606,11 +1606,11 @@ void ContainerArea::moveDragIndicator(int pos) } } -void ContainerArea::updateBackground( const QPixmap& pm ) +void ContainerArea::updateBackground( const TQPixmap& pm ) { - QBrush bgBrush(colorGroup().background(), pm); - QPalette pal = kapp->palette(); - pal.setBrush(QColorGroup::Background, bgBrush); + TQBrush bgBrush(colorGroup().background(), pm); + TQPalette pal = kapp->palette(); + pal.setBrush(TQColorGroup::Background, bgBrush); setPalette(pal); // because the Pixmap can be smaller as the containerarea @@ -1632,7 +1632,7 @@ void ContainerArea::resizeContents(int w, int h) if (!m_updateBackgroundsCalled) { m_updateBackgroundsCalled = true; - QTimer::singleShot(0, this, SLOT(updateContainersBackground())); + TQTimer::singleShot(0, this, TQT_SLOT(updateContainersBackground())); } } @@ -1761,8 +1761,8 @@ void ContainerArea::updateContainersBackground() // case the cached is cleared). if( !m_cachedGeometry.contains( *it )) { - m_cachedGeometry[ *it ] = QRect(); - connect( *it, SIGNAL( destroyed()), SLOT( destroyCachedGeometry())); + m_cachedGeometry[ *it ] = TQRect(); + connect( *it, TQT_SIGNAL( destroyed()), TQT_SLOT( destroyCachedGeometry())); } if( m_cachedGeometry[ *it ] != (*it)->geometry()) { @@ -1774,10 +1774,10 @@ void ContainerArea::updateContainersBackground() void ContainerArea::destroyCachedGeometry() { - m_cachedGeometry.remove(const_cast<QWidget*>(static_cast<const QWidget*>(sender()))); + m_cachedGeometry.remove(const_cast<TQWidget*>(static_cast<const TQWidget*>(sender()))); } -BaseContainer::List ContainerArea::containers(const QString& type) const +BaseContainer::List ContainerArea::containers(const TQString& type) const { if (type.isEmpty() || type == "All") { @@ -1792,7 +1792,7 @@ BaseContainer::List ContainerArea::containers(const QString& type) const it != m_containers.constEnd(); ++it) { - QString type = (*it)->appletType(); + TQString type = (*it)->appletType(); if (type == "KMenuButton" || type == "WindowListButton" || type == "BookmarksButton" || @@ -1821,7 +1821,7 @@ BaseContainer::List ContainerArea::containers(const QString& type) const return list; } -int ContainerArea::containerCount(const QString& type) const +int ContainerArea::containerCount(const TQString& type) const { if (type.isEmpty() || type == "All") { @@ -1835,7 +1835,7 @@ int ContainerArea::containerCount(const QString& type) const it != m_containers.end(); ++it) { - QString type = (*it)->appletType(); + TQString type = (*it)->appletType(); if (type == "KMenuButton" || type == "WindowListButton" || type == "BookmarksButton" || @@ -1864,7 +1864,7 @@ int ContainerArea::containerCount(const QString& type) const return count; } -QStringList ContainerArea::listContainers() const +TQStringList ContainerArea::listContainers() const { return m_layout->listItems(); } @@ -1879,7 +1879,7 @@ void ContainerArea::showAddAppletDialog() if (!m_addAppletDialog) { m_addAppletDialog = new AddAppletDialog(this, this, 0); - connect(m_addAppletDialog, SIGNAL(finished()), this, SLOT(addAppletDialogDone())); + connect(m_addAppletDialog, TQT_SIGNAL(finished()), this, TQT_SLOT(addAppletDialogDone())); } else { @@ -1900,7 +1900,7 @@ void ContainerArea::addAppletDialogDone() m_addAppletDialog = 0; } -const QPixmap* ContainerArea::completeBackgroundPixmap() const +const TQPixmap* ContainerArea::completeBackgroundPixmap() const { return &_completeBg; } @@ -1916,22 +1916,22 @@ int ContainerArea::heightForWidth(int w) const } -DragIndicator::DragIndicator(QWidget* parent, const char* name) - : QWidget(parent, name) +DragIndicator::DragIndicator(TQWidget* parent, const char* name) + : TQWidget(parent, name) { setBackgroundOrigin(AncestorOrigin); } -void DragIndicator::paintEvent(QPaintEvent*) +void DragIndicator::paintEvent(TQPaintEvent*) { - QPainter painter(this); - QRect rect(0, 0, width(), height()); - style().drawPrimitive( QStyle::PE_FocusRect, &painter, rect, colorGroup(), - QStyle::Style_Default, colorGroup().base() ); + TQPainter painter(this); + TQRect rect(0, 0, width(), height()); + style().drawPrimitive( TQStyle::PE_FocusRect, &painter, rect, colorGroup(), + TQStyle::Style_Default, colorGroup().base() ); } -void DragIndicator::mousePressEvent(QMouseEvent*) +void DragIndicator::mousePressEvent(TQMouseEvent*) { hide(); } diff --git a/kicker/kicker/core/containerarea.h b/kicker/kicker/core/containerarea.h index 8b17c8ae9..a43cd8c9c 100644 --- a/kicker/kicker/core/containerarea.h +++ b/kicker/kicker/core/containerarea.h @@ -24,9 +24,9 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #ifndef __containerarea_h__ #define __containerarea_h__ -#include <qpixmap.h> -#include <qptrlist.h> -#include <qtimer.h> +#include <tqpixmap.h> +#include <tqptrlist.h> +#include <tqtimer.h> #include <appletinfo.h> @@ -48,7 +48,7 @@ class ContainerArea : public Panner Q_OBJECT public: - ContainerArea( KConfig* config, QWidget* parent, QPopupMenu* opMenu, const char* name = 0 ); + ContainerArea( KConfig* config, TQWidget* parent, TQPopupMenu* opMenu, const char* name = 0 ); ~ContainerArea(); void initialize(bool useDefaultConfig); @@ -56,24 +56,24 @@ public: KPanelApplet::Direction popupDirection() const; bool isImmutable() const; - const QWidget* addButton(const AppletInfo& info); - const QWidget* addKMenuButton(); - const QWidget* addDesktopButton(); - const QWidget* addWindowListButton(); - const QWidget* addBookmarksButton(); - const QWidget* addServiceButton(const QString& desktopFile); - const QWidget* addURLButton(const QString &url); - const QWidget* addBrowserButton(); - const QWidget* addBrowserButton(const QString &startDir, - const QString& icon = QString("kdisknav")); - const QWidget* addServiceMenuButton(const QString& relPath); - const QWidget* addNonKDEAppButton(); - const QWidget* addNonKDEAppButton(const QString &name, - const QString &description, - const QString &filePath, - const QString &icon, - const QString &cmdLine, bool inTerm); - const QWidget* addExtensionButton(const QString& desktopFile); + const TQWidget* addButton(const AppletInfo& info); + const TQWidget* addKMenuButton(); + const TQWidget* addDesktopButton(); + const TQWidget* addWindowListButton(); + const TQWidget* addBookmarksButton(); + const TQWidget* addServiceButton(const TQString& desktopFile); + const TQWidget* addURLButton(const TQString &url); + const TQWidget* addBrowserButton(); + const TQWidget* addBrowserButton(const TQString &startDir, + const TQString& icon = TQString("kdisknav")); + const TQWidget* addServiceMenuButton(const TQString& relPath); + const TQWidget* addNonKDEAppButton(); + const TQWidget* addNonKDEAppButton(const TQString &name, + const TQString &description, + const TQString &filePath, + const TQString &icon, + const TQString &cmdLine, bool inTerm); + const TQWidget* addExtensionButton(const TQString& desktopFile); AppletContainer* addApplet(const AppletInfo& info, bool isImmutable = false, int insertionIndex = -1); @@ -84,11 +84,11 @@ public: int widthForHeight(int height) const; int heightForWidth(int width) const; - const QPixmap* completeBackgroundPixmap() const; + const TQPixmap* completeBackgroundPixmap() const; - BaseContainer::List containers(const QString& type) const; - int containerCount(const QString& type) const; - QStringList listContainers() const; + BaseContainer::List containers(const TQString& type) const; + int containerCount(const TQString& type) const; + TQStringList listContainers() const; bool canAddContainers() const; signals: @@ -108,25 +108,25 @@ public slots: void addAppletDialogDone(); protected: - QString createUniqueId(const QString& appletType) const; + TQString createUniqueId(const TQString& appletType) const; void completeContainerAddition(BaseContainer* container, int insertionIndex = -1); - bool eventFilter(QObject*, QEvent*); - void mouseMoveEvent(QMouseEvent*); - void mouseReleaseEvent(QMouseEvent *); - void dragEnterEvent(QDragEnterEvent*); - void dragMoveEvent(QDragMoveEvent*); - void dragLeaveEvent(QDragLeaveEvent*); - void dropEvent(QDropEvent*); - void resizeEvent(QResizeEvent*); - void viewportResizeEvent(QResizeEvent*); + bool eventFilter(TQObject*, TQEvent*); + void mouseMoveEvent(TQMouseEvent*); + void mouseReleaseEvent(TQMouseEvent *); + void dragEnterEvent(TQDragEnterEvent*); + void dragMoveEvent(TQDragMoveEvent*); + void dragLeaveEvent(TQDragLeaveEvent*); + void dropEvent(TQDropEvent*); + void resizeEvent(TQResizeEvent*); + void viewportResizeEvent(TQResizeEvent*); void defaultContainerConfig(); - void loadContainers(const QStringList& containers); + void loadContainers(const TQStringList& containers); void saveContainerConfig(bool layoutOnly = false); - QRect availableSpaceFollowing(BaseContainer*); + TQRect availableSpaceFollowing(BaseContainer*); void moveDragIndicator(int pos); void scrollTo(BaseContainer*); @@ -138,7 +138,7 @@ protected: protected slots: void autoScroll(); - void updateBackground(const QPixmap&); + void updateBackground(const TQPixmap&); void setBackground(); void immutabilityChanged(bool); void updateContainersBackground(); @@ -154,21 +154,21 @@ private: DragIndicator* _dragIndicator; BaseContainer* _dragMoveAC; QPoint _dragMoveOffset; - QPopupMenu* m_opMenu; + TQPopupMenu* m_opMenu; KRootPixmap* _rootPixmap; bool _transparent; bool _useBgTheme; bool _bgSet; - QPixmap _completeBg; - QTimer _autoScrollTimer; + TQPixmap _completeBg; + TQTimer _autoScrollTimer; bool m_canAddContainers; bool m_immutable; bool m_updateBackgroundsCalled; - QWidget* m_contents; + TQWidget* m_contents; ContainerAreaLayout* m_layout; AddAppletDialog* m_addAppletDialog; - QMap< QWidget*, QRect > m_cachedGeometry; + TQMap< TQWidget*, TQRect > m_cachedGeometry; }; @@ -177,18 +177,18 @@ class DragIndicator : public QWidget Q_OBJECT public: - DragIndicator(QWidget* parent = 0, const char* name = 0); + DragIndicator(TQWidget* parent = 0, const char* name = 0); ~DragIndicator() {} - QSize preferredSize() const { return _preferredSize; } - void setPreferredSize(const QSize& size) { _preferredSize = size; } + TQSize preferredSize() const { return _preferredSize; } + void setPreferredSize(const TQSize& size) { _preferredSize = size; } protected: - void paintEvent(QPaintEvent*); - void mousePressEvent(QMouseEvent*); + void paintEvent(TQPaintEvent*); + void mousePressEvent(TQMouseEvent*); private: - QSize _preferredSize; + TQSize _preferredSize; }; #endif diff --git a/kicker/kicker/core/containerarealayout.cpp b/kicker/kicker/core/containerarealayout.cpp index a865bec86..12a09c8e6 100644 --- a/kicker/kicker/core/containerarealayout.cpp +++ b/kicker/kicker/core/containerarealayout.cpp @@ -24,7 +24,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <assert.h> #include <math.h> -#include <qapplication.h> +#include <tqapplication.h> #include <kdebug.h> #include <kglobal.h> @@ -41,20 +41,20 @@ class ContainerAreaLayoutIterator : public QGLayoutIterator { } - QLayoutItem* current() + TQLayoutItem* current() { return m_idx < int(m_list->count()) ? (*m_list->at(m_idx))->item : 0; } - QLayoutItem* next() + TQLayoutItem* next() { m_idx++; return current(); } - QLayoutItem* takeCurrent() + TQLayoutItem* takeCurrent() { - QLayoutItem* item = 0; + TQLayoutItem* item = 0; ContainerAreaLayout::ItemList::iterator b = m_list->at(m_idx); if (b != m_list->end()) { @@ -128,12 +128,12 @@ Qt::Orientation ContainerAreaLayoutItem::orientation() const return m_layout->orientation(); } -QRect ContainerAreaLayoutItem::geometryR() const +TQRect ContainerAreaLayoutItem::geometryR() const { return m_layout->transform(geometry()); } -void ContainerAreaLayoutItem::setGeometryR(const QRect& r) +void ContainerAreaLayoutItem::setGeometryR(const TQRect& r) { setGeometry(m_layout->transform(r)); } @@ -178,7 +178,7 @@ int ContainerAreaLayoutItem::leftR() const { if (orientation() == Horizontal) { - if (QApplication::reverseLayout()) + if (TQApplication::reverseLayout()) return m_layout->geometry().right() - geometry().right(); else return geometry().left(); @@ -193,7 +193,7 @@ int ContainerAreaLayoutItem::rightR() const { if (orientation() == Horizontal) { - if (QApplication::reverseLayout()) + if (TQApplication::reverseLayout()) return m_layout->geometry().right() - geometry().left(); else return geometry().right(); @@ -205,19 +205,19 @@ int ContainerAreaLayoutItem::rightR() const } -ContainerAreaLayout::ContainerAreaLayout(QWidget* parent) - : QLayout(parent), +ContainerAreaLayout::ContainerAreaLayout(TQWidget* parent) + : TQLayout(parent), m_orientation(Horizontal), m_stretchEnabled(true) { } -void ContainerAreaLayout::addItem(QLayoutItem* item) +void ContainerAreaLayout::addItem(TQLayoutItem* item) { m_items.append(new ContainerAreaLayoutItem(item, this)); } -void ContainerAreaLayout::insertIntoFreeSpace(QWidget* widget, QPoint insertionPoint) +void ContainerAreaLayout::insertIntoFreeSpace(TQWidget* widget, TQPoint insertionPoint) { if (!widget) { @@ -247,7 +247,7 @@ void ContainerAreaLayout::insertIntoFreeSpace(QWidget* widget, QPoint insertionP if (nextIt == m_items.end()) { // first item in! - item->setGeometryR(QRect(insertionPoint.x(), insertionPoint.y(), widget->width(), widget->height())); + item->setGeometryR(TQRect(insertionPoint.x(), insertionPoint.y(), widget->width(), widget->height())); updateFreeSpaceValues(); return; } @@ -311,7 +311,7 @@ void ContainerAreaLayout::insertIntoFreeSpace(QWidget* widget, QPoint insertionP } } - QRect geom = item->geometryR(); + TQRect geom = item->geometryR(); geom.moveLeft(insPos); item->setGeometryR(geom); widget->setGeometry(transform(geom)); // widget isn't shown, layout not active yet @@ -341,13 +341,13 @@ void ContainerAreaLayout::insertIntoFreeSpace(QWidget* widget, QPoint insertionP updateFreeSpaceValues(); } -QStringList ContainerAreaLayout::listItems() const +TQStringList ContainerAreaLayout::listItems() const { - QStringList items; + TQStringList items; for (ItemList::const_iterator it = m_items.constBegin(); it != m_items.constEnd(); ++it) { - QLayoutItem* item = (*it)->item; + TQLayoutItem* item = (*it)->item; BaseContainer* container = dynamic_cast<BaseContainer*>(item->widget()); if (!container) @@ -374,7 +374,7 @@ QStringList ContainerAreaLayout::listItems() const return items; } -QWidget* ContainerAreaLayout::widgetAt(int index) const +TQWidget* ContainerAreaLayout::widgetAt(int index) const { if (index < 0 || index >= (int)m_items.count()) { @@ -384,46 +384,46 @@ QWidget* ContainerAreaLayout::widgetAt(int index) const return m_items[index]->item->widget(); } -QSize ContainerAreaLayout::sizeHint() const +TQSize ContainerAreaLayout::sizeHint() const { const int size = KickerLib::sizeValue(KPanelExtension::SizeNormal); if (orientation() == Horizontal) { - return QSize(widthForHeight(size), size); + return TQSize(widthForHeight(size), size); } else { - return QSize(size, heightForWidth(size)); + return TQSize(size, heightForWidth(size)); } } -QSize ContainerAreaLayout::minimumSize() const +TQSize ContainerAreaLayout::minimumSize() const { const int size = KickerLib::sizeValue(KPanelExtension::SizeTiny); if (orientation() == Horizontal) { - return QSize(widthForHeight(size), size); + return TQSize(widthForHeight(size), size); } else { - return QSize(size, heightForWidth(size)); + return TQSize(size, heightForWidth(size)); } } -QLayoutIterator ContainerAreaLayout::iterator() +TQLayoutIterator ContainerAreaLayout::iterator() { - return QLayoutIterator(new ContainerAreaLayoutIterator(&m_items)); + return TQLayoutIterator(new ContainerAreaLayoutIterator(&m_items)); } -void ContainerAreaLayout::setGeometry(const QRect& rect) +void ContainerAreaLayout::setGeometry(const TQRect& rect) { //RESEARCH: when can we short curcuit this? // maybe a dirty flag to be set when we have containers // that needs laying out? - QLayout::setGeometry(rect); + TQLayout::setGeometry(rect); float totalFreeSpace = kMax(0, widthR() - widthForHeightR(heightR())); int occupiedSpace = 0; @@ -453,7 +453,7 @@ void ContainerAreaLayout::setGeometry(const QRect& rect) w = widthR() - pos; } } - cur->setGeometryR(QRect(pos, 0, w, heightR())); + cur->setGeometryR(TQRect(pos, 0, w, heightR())); } } @@ -520,10 +520,10 @@ int ContainerAreaLayout::distanceToPreviousItem(ItemList::const_iterator it) con cur->leftR() - leftR(); } -void ContainerAreaLayout::moveContainerSwitch(QWidget* container, int distance) +void ContainerAreaLayout::moveContainerSwitch(TQWidget* container, int distance) { const bool horizontal = orientation() == Horizontal; - const bool reverseLayout = QApplication::reverseLayout(); + const bool reverseLayout = TQApplication::reverseLayout(); if (horizontal && reverseLayout) distance = - distance; @@ -566,7 +566,7 @@ void ContainerAreaLayout::moveContainerSwitch(QWidget* container, int distance) break; // Move 'next' to the other side of 'moving'. - QRect geom = next->geometryR(); + TQRect geom = next->geometryR(); if (forward) geom.moveLeft(geom.left() - moving->widthR()); else @@ -630,7 +630,7 @@ void ContainerAreaLayout::moveContainerSwitch(QWidget* container, int distance) } // Move the container to its new position and prevent it from moving outside the panel. - QRect geom = moving->geometryR(); + TQRect geom = moving->geometryR(); distance = kClamp(newPos, 0, widthR() - moving->widthR()); geom.moveLeft(distance); moving->setGeometryR(geom); @@ -645,7 +645,7 @@ void ContainerAreaLayout::moveContainerSwitch(QWidget* container, int distance) if(AppletContainer* applet = dynamic_cast<AppletContainer*>(container)) if( applet->info().desktopFile() == "menuapplet.desktop" ) { - QRect geom = (*it)->geometryR(); + TQRect geom = (*it)->geometryR(); if( prev != m_items.constEnd()) geom.moveLeft( (*prev)->rightR() + 1 ); else @@ -657,10 +657,10 @@ void ContainerAreaLayout::moveContainerSwitch(QWidget* container, int distance) updateFreeSpaceValues(); } -int ContainerAreaLayout::moveContainerPush(QWidget* a, int distance) +int ContainerAreaLayout::moveContainerPush(TQWidget* a, int distance) { const bool horizontal = orientation() == Horizontal; - const bool reverseLayout = QApplication::reverseLayout(); + const bool reverseLayout = TQApplication::reverseLayout(); // Get the iterator 'it' pointing to the layoutitem representing 'a'. ItemList::const_iterator it = m_items.constBegin(); @@ -721,20 +721,20 @@ int ContainerAreaLayout::moveContainerPushRecursive(ItemList::const_iterator it, moved = forward ? kMin(distance, available) : kMax(distance, available); - QRect geom = cur->geometryR(); + TQRect geom = cur->geometryR(); geom.moveLeft(geom.left() + moved); cur->setGeometryR(geom); return moved; } -QRect ContainerAreaLayout::transform(const QRect& r) const +TQRect ContainerAreaLayout::transform(const TQRect& r) const { if (orientation() == Horizontal) { - if (QApplication::reverseLayout()) + if (TQApplication::reverseLayout()) { - QRect t = r; + TQRect t = r; t.moveLeft(geometry().right() - r.right()); return t; } @@ -745,7 +745,7 @@ QRect ContainerAreaLayout::transform(const QRect& r) const } else { - return QRect(r.y(), r.x(), r.height(), r.width()); + return TQRect(r.y(), r.x(), r.height(), r.width()); } } diff --git a/kicker/kicker/core/containerarealayout.h b/kicker/kicker/core/containerarealayout.h index 4d4e0561d..995497268 100644 --- a/kicker/kicker/core/containerarealayout.h +++ b/kicker/kicker/core/containerarealayout.h @@ -24,14 +24,14 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #ifndef __containerarealayout_h__ #define __containerarealayout_h__ -#include <qlayout.h> +#include <tqlayout.h> class ContainerAreaLayout; class ContainerAreaLayoutItem : public Qt { public: - ContainerAreaLayoutItem(QLayoutItem* i, ContainerAreaLayout* layout) + ContainerAreaLayoutItem(TQLayoutItem* i, ContainerAreaLayout* layout) : item(i), m_freeSpaceRatio(0.0), m_layout(layout) @@ -45,9 +45,9 @@ class ContainerAreaLayoutItem : public Qt bool isStretch() const; - QRect geometry() const + TQRect geometry() const { return item->geometry(); } - void setGeometry(const QRect& geometry) + void setGeometry(const TQRect& geometry) { item->setGeometry(geometry); } double freeSpaceRatio() const; @@ -56,15 +56,15 @@ class ContainerAreaLayoutItem : public Qt Orientation orientation() const; // Relative geometry - QRect geometryR() const; - void setGeometryR(const QRect&); + TQRect geometryR() const; + void setGeometryR(const TQRect&); int widthForHeightR(int w) const; int widthR() const; int heightR() const; int leftR() const; int rightR() const; - QLayoutItem* item; + TQLayoutItem* item; private: double m_freeSpaceRatio; @@ -75,18 +75,18 @@ class ContainerAreaLayout : public QLayout { public: typedef ContainerAreaLayoutItem Item; - typedef QValueList<Item*> ItemList; + typedef TQValueList<Item*> ItemList; - ContainerAreaLayout(QWidget* parent); + ContainerAreaLayout(TQWidget* parent); - void addItem(QLayoutItem* item); - void insertIntoFreeSpace(QWidget* item, QPoint insertionPoint); - QStringList listItems() const; - QWidget* widgetAt(int index) const; - QSize sizeHint() const; - QSize minimumSize() const; - QLayoutIterator iterator(); - void setGeometry(const QRect& rect); + void addItem(TQLayoutItem* item); + void insertIntoFreeSpace(TQWidget* item, TQPoint insertionPoint); + TQStringList listItems() const; + TQWidget* widgetAt(int index) const; + TQSize sizeHint() const; + TQSize minimumSize() const; + TQLayoutIterator iterator(); + void setGeometry(const TQRect& rect); Orientation orientation() const { return m_orientation; } void setOrientation(Orientation o) { m_orientation = o; } @@ -97,11 +97,11 @@ class ContainerAreaLayout : public QLayout void setStretchEnabled(bool enable); - void moveContainerSwitch(QWidget* container, int distance); - int moveContainerPush(QWidget* container, int distance); + void moveContainerSwitch(TQWidget* container, int distance); + int moveContainerPush(TQWidget* container, int distance); // Relative geometry - QRect transform(const QRect&) const; + TQRect transform(const TQRect&) const; int widthForHeightR(int w) const; int widthR() const; int heightR() const; diff --git a/kicker/kicker/core/extensionmanager.cpp b/kicker/kicker/core/extensionmanager.cpp index e1c2c0c57..e0f68ce8a 100644 --- a/kicker/kicker/core/extensionmanager.cpp +++ b/kicker/kicker/core/extensionmanager.cpp @@ -59,7 +59,7 @@ ExtensionManager* ExtensionManager::the() } ExtensionManager::ExtensionManager() - : QObject(0, "ExtensionManager"), + : TQObject(0, "ExtensionManager"), m_menubarPanel(0), m_mainPanel(0), m_panelCounter(-1) @@ -108,7 +108,7 @@ void ExtensionManager::initialize() m_mainPanel = pm->createExtensionContainer( "childpanelextension.desktop", true, - QString(kapp->aboutData()->appName()) + "rc", + TQString(kapp->aboutData()->appName()) + "rc", "Main Panel"); } @@ -130,14 +130,14 @@ void ExtensionManager::initialize() // read extension list config->setGroup("General"); - QStringList elist = config->readListEntry("Extensions2"); + TQStringList elist = config->readListEntry("Extensions2"); // now restore the extensions - QStringList::iterator itEnd = elist.end(); - for (QStringList::iterator it = elist.begin(); it != elist.end(); ++it) + TQStringList::iterator itEnd = elist.end(); + for (TQStringList::iterator it = elist.begin(); it != elist.end(); ++it) { // extension id - QString extensionId(*it); + TQString extensionId(*it); // create a matching applet container if (extensionId.find("Extension") == -1) @@ -168,9 +168,9 @@ void ExtensionManager::initialize() } pm->clearUntrustedLists(); - connect(Kicker::the(), SIGNAL(configurationChanged()), SLOT(configurationChanged())); + connect(Kicker::the(), TQT_SIGNAL(configurationChanged()), TQT_SLOT(configurationChanged())); DCOPRef r( "ksmserver", "ksmserver" ); - r.send( "resumeStartup", QCString( "kicker" )); + r.send( "resumeStartup", TQCString( "kicker" )); } void ExtensionManager::configureMenubar(bool duringInit) @@ -187,7 +187,7 @@ void ExtensionManager::configureMenubar(bool duringInit) if (duringInit) { - AppletInfo menubarInfo("menuapplet.desktop", QString::null, AppletInfo::Applet); + AppletInfo menubarInfo("menuapplet.desktop", TQString::null, AppletInfo::Applet); if (PluginManager::the()->hasInstance(menubarInfo)) { // it's already there, in the main panel! @@ -211,7 +211,7 @@ void ExtensionManager::configureMenubar(bool duringInit) updateMenubar(); m_menubarPanel->show(); - connect(kapp, SIGNAL(kdisplayFontChanged()), SLOT(updateMenubar())); + connect(kapp, TQT_SIGNAL(kdisplayFontChanged()), TQT_SLOT(updateMenubar())); } else if (m_menubarPanel) { @@ -253,11 +253,11 @@ void ExtensionManager::migrateMenubar() return; } - QStringList elist = config->readListEntry("Extensions2"); - QStringList::iterator itEnd = elist.end(); - for (QStringList::iterator it = elist.begin(); it != elist.end(); ++it) + TQStringList elist = config->readListEntry("Extensions2"); + TQStringList::iterator itEnd = elist.end(); + for (TQStringList::iterator it = elist.begin(); it != elist.end(); ++it) { - QString extensionId(*it); + TQString extensionId(*it); if (extensionId.find("Extension") == -1) { @@ -271,18 +271,18 @@ void ExtensionManager::migrateMenubar() } config->setGroup(extensionId); - QString extension = config->readPathEntry("ConfigFile"); + TQString extension = config->readPathEntry("ConfigFile"); KConfig extensionConfig(locate("config", extension)); extensionConfig.setGroup("General"); if (extensionConfig.hasKey("Applets2")) { - QStringList containers = extensionConfig.readListEntry("Applets2"); - QStringList::iterator cit = containers.begin(); - QStringList::iterator citEnd = containers.end(); + TQStringList containers = extensionConfig.readListEntry("Applets2"); + TQStringList::iterator cit = containers.begin(); + TQStringList::iterator citEnd = containers.end(); for (; cit != citEnd; ++cit) { - QString appletId(*cit); + TQString appletId(*cit); // is there a config group for this applet? if (!extensionConfig.hasGroup(appletId)) @@ -291,14 +291,14 @@ void ExtensionManager::migrateMenubar() } KConfigGroup group(&extensionConfig, appletId.latin1()); - QString appletType = appletId.left(appletId.findRev('_')); + TQString appletType = appletId.left(appletId.findRev('_')); if (appletType == "Applet") { - QString appletFile = group.readPathEntry("DesktopFile"); + TQString appletFile = group.readPathEntry("DesktopFile"); if (appletFile.find("menuapplet.desktop") != -1) { - QString menubarConfig = locate("config", extension); + TQString menubarConfig = locate("config", extension); KIO::NetAccess::copy(menubarConfig, locateLocal("config", "kicker_menubarpanelrc"), 0); @@ -325,7 +325,7 @@ void ExtensionManager::saveContainerConfig() KConfig *config = KGlobal::config(); // build the extension list - QStringList elist; + TQStringList elist; ExtensionList::iterator itEnd = _containers.end(); for (ExtensionList::iterator it = _containers.begin(); it != itEnd; ++it) { @@ -378,22 +378,22 @@ void ExtensionManager::updateMenubar() m_menubarPanel->xineramaScreen()); } -bool ExtensionManager::isMainPanel(const QWidget* panel) const +bool ExtensionManager::isMainPanel(const TQWidget* panel) const { return m_mainPanel == panel; } -bool ExtensionManager::isMenuBar(const QWidget* panel) const +bool ExtensionManager::isMenuBar(const TQWidget* panel) const { return m_menubarPanel == panel; } -void ExtensionManager::addExtension( const QString& desktopFile ) +void ExtensionManager::addExtension( const TQString& desktopFile ) { PluginManager* pm = PluginManager::the(); ExtensionContainer *e = pm->createExtensionContainer(desktopFile, false, // is not startup - QString::null, // no config + TQString::null, // no config uniqueId()); @@ -422,8 +422,8 @@ void ExtensionManager::addContainer(ExtensionContainer* e) _containers.append(e); - connect(e, SIGNAL(removeme(ExtensionContainer*)), - this, SLOT(removeContainer(ExtensionContainer*))); + connect(e, TQT_SIGNAL(removeme(ExtensionContainer*)), + this, TQT_SLOT(removeContainer(ExtensionContainer*))); emit desktopIconsAreaChanged(desktopIconsArea(e->xineramaScreen()), e->xineramaScreen()); @@ -457,10 +457,10 @@ void ExtensionManager::removeAllContainers() saveContainerConfig(); } -QString ExtensionManager::uniqueId() +TQString ExtensionManager::uniqueId() { - QString idBase = "Extension_%1"; - QString newId; + TQString idBase = "Extension_%1"; + TQString newId; int i = 0; bool unique = false; @@ -621,14 +621,14 @@ bool ExtensionManager::shouldExclude(int XineramaScreen, return true; } -QRect ExtensionManager::workArea(int XineramaScreen, const ExtensionContainer* extension) +TQRect ExtensionManager::workArea(int XineramaScreen, const ExtensionContainer* extension) { if (!extension) { return Kicker::the()->kwinModule()->workArea(XineramaScreen); } - QValueList<WId> list; + TQValueList<WId> list; ExtensionList::iterator itEnd = _containers.end(); ExtensionList::iterator it = _containers.begin(); @@ -672,7 +672,7 @@ QRect ExtensionManager::workArea(int XineramaScreen, const ExtensionContainer* e } } - QRect workArea; + TQRect workArea; if ((XineramaScreen == XineramaAllScreens) || (kapp->desktop()->numScreens() < 2)) { /* special value for all screens */ @@ -681,7 +681,7 @@ QRect ExtensionManager::workArea(int XineramaScreen, const ExtensionContainer* e else { workArea = Kicker::the()->kwinModule()->workArea(list, XineramaScreen) - .intersect(QApplication::desktop()->screenGeometry(XineramaScreen)); + .intersect(TQApplication::desktop()->screenGeometry(XineramaScreen)); } return workArea; @@ -693,7 +693,7 @@ int ExtensionManager::nextPanelOrder() return m_panelCounter; } -void ExtensionManager::reduceArea(QRect &area, const ExtensionContainer *extension) const +void ExtensionManager::reduceArea(TQRect &area, const ExtensionContainer *extension) const { if (!extension || extension->hideMode() == ExtensionContainer::AutomaticHide || @@ -702,10 +702,10 @@ void ExtensionManager::reduceArea(QRect &area, const ExtensionContainer *extensi return; } - QRect geom = extension->initialGeometry(extension->position(), extension->alignment(), + TQRect geom = extension->initialGeometry(extension->position(), extension->alignment(), extension->xineramaScreen()); - // reduce given area (QRect) to the space not covered by the given extension + // reduce given area (TQRect) to the space not covered by the given extension // As simplification: the length of the extension is not taken into account // which means that even a small extension e.g. on the left side of the desktop // will remove the available area with its with @@ -736,12 +736,12 @@ void ExtensionManager::reduceArea(QRect &area, const ExtensionContainer *extensi } } -QRect ExtensionManager::desktopIconsArea(int screen) const +TQRect ExtensionManager::desktopIconsArea(int screen) const { // This is pretty broken, mixes Xinerama and non-Xinerama multihead // and generally doesn't seem to be required anyway => ignore screen. -// QRect area = QApplication::desktop()->screenGeometry(screen); - QRect area = QApplication::desktop()->geometry(); +// TQRect area = TQApplication::desktop()->screenGeometry(screen); + TQRect area = TQApplication::desktop()->geometry(); reduceArea(area, m_mainPanel); reduceArea(area, m_menubarPanel); diff --git a/kicker/kicker/core/extensionmanager.h b/kicker/kicker/core/extensionmanager.h index 2885df01f..6de7b35e1 100644 --- a/kicker/kicker/core/extensionmanager.h +++ b/kicker/kicker/core/extensionmanager.h @@ -24,8 +24,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #ifndef __extensionmanager_h__ #define __extensionmanager_h__ -#include <qvaluelist.h> -#include <qobject.h> +#include <tqvaluelist.h> +#include <tqobject.h> #include "container_extension.h" @@ -39,20 +39,20 @@ public: static ExtensionManager* the(); void configureMenubar(bool duringInit); - void addExtension( const QString &desktopFile ); - bool isMainPanel(const QWidget* panel) const; - bool isMenuBar(const QWidget* panel) const; + void addExtension( const TQString &desktopFile ); + bool isMainPanel(const TQWidget* panel) const; + bool isMenuBar(const TQWidget* panel) const; void addContainer( ExtensionContainer* ); void removeAllContainers(); ExtensionList containers() const { return _containers; } KPanelExtension::Position initialPanelPosition(KPanelExtension::Position preferred); - QRect workArea(int XineramaScreen, const ExtensionContainer* container); + TQRect workArea(int XineramaScreen, const ExtensionContainer* container); int nextPanelOrder(); // return the space available for all icons on the desktop // subtracts all panels from XineramaScreen's geometry - QRect desktopIconsArea(int xineramaScreen) const; + TQRect desktopIconsArea(int xineramaScreen) const; public slots: void removeContainer( ExtensionContainer* ); @@ -60,14 +60,14 @@ public slots: void extensionSizeChanged(ExtensionContainer *); signals: - void desktopIconsAreaChanged(const QRect &, int xineramaScreen); + void desktopIconsAreaChanged(const TQRect &, int xineramaScreen); protected: friend class Kicker; ExtensionManager(); ~ExtensionManager(); - QString uniqueId(); + TQString uniqueId(); void saveContainerConfig(); bool shouldExclude(int XineramaScreen, const ExtensionContainer* container, @@ -79,7 +79,7 @@ protected slots: private: void migrateMenubar(); - void reduceArea(QRect &area, const ExtensionContainer *panel) const; + void reduceArea(TQRect &area, const ExtensionContainer *panel) const; ExtensionList _containers; ExtensionContainer* m_menubarPanel; diff --git a/kicker/kicker/core/kicker.cpp b/kicker/kicker/core/kicker.cpp index 65e059c5b..de37c609e 100644 --- a/kicker/kicker/core/kicker.cpp +++ b/kicker/kicker/core/kicker.cpp @@ -24,9 +24,9 @@ #include <stdlib.h> #include <unistd.h> -#include <qfile.h> -#include <qtimer.h> -#include <qtooltip.h> +#include <tqfile.h> +#include <tqtimer.h> +#include <tqtooltip.h> #include <dcopclient.h> #include <kconfig.h> @@ -74,7 +74,7 @@ Kicker::Kicker() // this means we've most likely crashed once. so let's see if we // stay up for more than 2 minutes time, and if so reset the // crash handler since the crash isn't a frequent offender - QTimer::singleShot(120000, this, SLOT(setCrashHandler())); + TQTimer::singleShot(120000, this, TQT_SLOT(setCrashHandler())); } else { @@ -93,7 +93,7 @@ Kicker::Kicker() dcopClient()->setDefaultObject("Panel"); disableSessionManagement(); - QString dataPathBase = KStandardDirs::kde_default("data").append("kicker/"); + TQString dataPathBase = KStandardDirs::kde_default("data").append("kicker/"); KGlobal::dirs()->addResourceType("mini", dataPathBase + "pics/mini"); KGlobal::dirs()->addResourceType("icon", dataPathBase + "pics"); KGlobal::dirs()->addResourceType("builtinbuttons", dataPathBase + "builtins"); @@ -121,19 +121,19 @@ Kicker::Kicker() // set up our global settings configure(); - connect(this, SIGNAL(settingsChanged(int)), SLOT(slotSettingsChanged(int))); - connect(this, SIGNAL(kdisplayPaletteChanged()), SLOT(paletteChanged())); - connect(this, SIGNAL(kdisplayStyleChanged()), SLOT(slotStyleChanged())); + connect(this, TQT_SIGNAL(settingsChanged(int)), TQT_SLOT(slotSettingsChanged(int))); + connect(this, TQT_SIGNAL(kdisplayPaletteChanged()), TQT_SLOT(paletteChanged())); + connect(this, TQT_SIGNAL(kdisplayStyleChanged()), TQT_SLOT(slotStyleChanged())); #if (QT_VERSION-0 >= 0x030200) // XRANDR support - connect(desktop(), SIGNAL(resized(int)), SLOT(slotDesktopResized())); + connect(desktop(), TQT_SIGNAL(resized(int)), TQT_SLOT(slotDesktopResized())); #endif // the panels, aka extensions - QTimer::singleShot(0, ExtensionManager::the(), SLOT(initialize())); + TQTimer::singleShot(0, ExtensionManager::the(), TQT_SLOT(initialize())); - connect(ExtensionManager::the(), SIGNAL(desktopIconsAreaChanged(const QRect &, int)), - this, SLOT(slotDesktopIconsAreaChanged(const QRect &, int))); + connect(ExtensionManager::the(), TQT_SIGNAL(desktopIconsAreaChanged(const TQRect &, int)), + this, TQT_SLOT(slotDesktopIconsAreaChanged(const TQRect &, int))); } Kicker::~Kicker() @@ -205,7 +205,7 @@ void Kicker::slotStyleChanged() restart(); } -bool Kicker::highlightMenuItem(const QString &menuId) +bool Kicker::highlightMenuItem(const TQString &menuId) { return MenuManager::the()->kmenu()->highlightMenuItem( menuId ); } @@ -215,7 +215,7 @@ void Kicker::showKMenu() MenuManager::the()->showKMenu(); } -void Kicker::popupKMenu(const QPoint &p) +void Kicker::popupKMenu(const TQPoint &p) { MenuManager::the()->popupKMenu(p); } @@ -231,13 +231,13 @@ void Kicker::configure() KickerSettings::self()->readConfig(); - QToolTip::setGloballyEnabled(KickerSettings::showToolTips()); + TQToolTip::setGloballyEnabled(KickerSettings::showToolTips()); if (notFirstConfig) { emit configurationChanged(); { - QByteArray data; + TQByteArray data; emitDCOPSignal("configurationChanged()", data); } } @@ -254,7 +254,7 @@ void Kicker::quit() void Kicker::restart() { // do this on a timer to give us time to return true - QTimer::singleShot(0, this, SLOT(slotRestart())); + TQTimer::singleShot(0, this, TQT_SLOT(slotRestart())); } void Kicker::slotRestart() @@ -267,7 +267,7 @@ void Kicker::slotRestart() char ** o_argv = new char*[2]; o_argv[0] = strdup("kicker"); o_argv[1] = 0L; - execv(QFile::encodeName(locate("exe", "kdeinit_wrapper")), o_argv); + execv(TQFile::encodeName(locate("exe", "kdeinit_wrapper")), o_argv); exit(1); } @@ -282,14 +282,14 @@ bool Kicker::isKioskImmutable() const return config()->isImmutable(); } -void Kicker::addExtension( const QString &desktopFile ) +void Kicker::addExtension( const TQString &desktopFile ) { ExtensionManager::the()->addExtension( desktopFile ); } -QStringList Kicker::configModules(bool controlCenter) +TQStringList Kicker::configModules(bool controlCenter) { - QStringList args; + TQStringList args; if (controlCenter) { @@ -306,39 +306,39 @@ QStringList Kicker::configModules(bool controlCenter) return args; } -QPoint Kicker::insertionPoint() +TQPoint Kicker::insertionPoint() { return m_insertionPoint; } -void Kicker::setInsertionPoint(const QPoint &p) +void Kicker::setInsertionPoint(const TQPoint &p) { m_insertionPoint = p; } -void Kicker::showConfig(const QString& configPath, int page) +void Kicker::showConfig(const TQString& configPath, int page) { if (!m_configDialog) { m_configDialog = new KCMultiDialog(0); - QStringList modules = configModules(false); - QStringList::ConstIterator end(modules.end()); - for (QStringList::ConstIterator it = modules.begin(); it != end; ++it) + TQStringList modules = configModules(false); + TQStringList::ConstIterator end(modules.end()); + for (TQStringList::ConstIterator it = modules.begin(); it != end; ++it) { m_configDialog->addModule(*it); } - connect(m_configDialog, SIGNAL(finished()), SLOT(configDialogFinished())); + connect(m_configDialog, TQT_SIGNAL(finished()), TQT_SLOT(configDialogFinished())); } if (!configPath.isEmpty()) { - QByteArray data; - QDataStream stream(data, IO_WriteOnly); + TQByteArray data; + TQDataStream stream(data, IO_WriteOnly); stream << configPath; - emitDCOPSignal("configSwitchToPanel(QString)", data); + emitDCOPSignal("configSwitchToPanel(TQString)", data); } KWin::setOnDesktop(m_configDialog->winId(), KWin::currentDesktop()); @@ -352,7 +352,7 @@ void Kicker::showConfig(const QString& configPath, int page) void Kicker::showTaskBarConfig() { - showConfig(QString(), 4); + showConfig(TQString(), 4); } void Kicker::configureMenubar() @@ -386,16 +386,16 @@ KWinModule* Kicker::kwinModule() return m_kwinModule; } -QRect Kicker::desktopIconsArea(int screen) const +TQRect Kicker::desktopIconsArea(int screen) const { return ExtensionManager::the()->desktopIconsArea(screen); } -void Kicker::slotDesktopIconsAreaChanged(const QRect &area, int screen) +void Kicker::slotDesktopIconsAreaChanged(const TQRect &area, int screen) { - QByteArray params; - QDataStream stream(params, IO_WriteOnly); + TQByteArray params; + TQDataStream stream(params, IO_WriteOnly); stream << area; stream << screen; - emitDCOPSignal("desktopIconsAreaChanged(QRect, int)", params); + emitDCOPSignal("desktopIconsAreaChanged(TQRect, int)", params); } diff --git a/kicker/kicker/core/kicker.h b/kicker/kicker/core/kicker.h index 9ac1d3eac..6bb071007 100644 --- a/kicker/kicker/core/kicker.h +++ b/kicker/kicker/core/kicker.h @@ -24,7 +24,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #ifndef __kicker_h__ #define __kicker_h__ -#include <qcolor.h> +#include <tqcolor.h> #include <kuniqueapplication.h> #include <kicontheme.h> @@ -49,22 +49,22 @@ k_dcop: void configure(); void quit(); void restart(); - void addExtension( const QString &desktopFile ); - void popupKMenu( const QPoint &globalPos ); + void addExtension( const TQString &desktopFile ); + void popupKMenu( const TQPoint &globalPos ); void clearQuickStartMenu(); - bool highlightMenuItem( const QString &menuId ); + bool highlightMenuItem( const TQString &menuId ); void showKMenu(); void toggleShowDesktop(); bool desktopShowing(); - void showConfig(const QString& config, int page = -1); + void showConfig(const TQString& config, int page = -1); void showTaskBarConfig(); void configureMenubar(); // return the region on the desktop, which is not covered by panels // and therefore allowed to be used by icons placed on the desktop - QRect desktopIconsArea(int screen) const; + TQRect desktopIconsArea(int screen) const; k_dcop_signals: - void desktopIconsAreaChanged(QRect area, int screen); + void desktopIconsAreaChanged(TQRect area, int screen); public: static Kicker* the(); @@ -75,12 +75,12 @@ public: bool isKioskImmutable() const; bool canAddContainers() const { return m_canAddContainers && !isImmutable(); } - static QStringList configModules(bool controlCenter); + static TQStringList configModules(bool controlCenter); /** * Global position where to insert a new item */ - QPoint insertionPoint(); + TQPoint insertionPoint(); /** * Set the global position where to insert a new item @@ -90,14 +90,14 @@ public: * * Kicker::the()->setInsertionPoint(p); * ... - * QPoint where = Kicker::the()->insertionPoint(); + * TQPoint where = Kicker::the()->insertionPoint(); * ... - * Kicker::the()->setInsertionPoint(QPoint()); + * Kicker::the()->setInsertionPoint(TQPoint()); * * this is not pretty, but it's pragmatic and does everything * that is needed */ - void setInsertionPoint(const QPoint &p); + void setInsertionPoint(const TQPoint &p); public slots: @@ -116,7 +116,7 @@ private slots: void slotStyleChanged(); void paletteChanged(); void setCrashHandler(); - void slotDesktopIconsAreaChanged(const QRect &area, int screen); + void slotDesktopIconsAreaChanged(const TQRect &area, int screen); private: static void crashHandler(int signal); @@ -125,7 +125,7 @@ private: KWinModule* m_kwinModule; KCMultiDialog* m_configDialog; bool m_canAddContainers; - QPoint m_insertionPoint; + TQPoint m_insertionPoint; }; #endif diff --git a/kicker/kicker/core/kickerbindings.cpp b/kicker/kicker/core/kickerbindings.cpp index 2134fb975..bc62df231 100644 --- a/kicker/kicker/core/kickerbindings.cpp +++ b/kicker/kicker/core/kickerbindings.cpp @@ -23,10 +23,10 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #ifndef NOSLOTS # define DEF( name, key3, key4, target, fnSlot ) \ - keys->insert( name, i18n(name), QString::null, key3, key4, target, SLOT(fnSlot) ) + keys->insert( name, i18n(name), TQString::null, key3, key4, target, TQT_SLOT(fnSlot) ) #else # define DEF( name, key3, key4, target, fnSlot ) \ - keys->insert( name, i18n(name), QString::null, key3, key4 ) + keys->insert( name, i18n(name), TQString::null, key3, key4 ) #endif #define WIN KKey::QtWIN diff --git a/kicker/kicker/core/main.cpp b/kicker/kicker/core/main.cpp index aa49f90aa..16090b9af 100644 --- a/kicker/kicker/core/main.cpp +++ b/kicker/kicker/core/main.cpp @@ -51,13 +51,13 @@ static const char version[] = VERSION; static void sighandler(int) { fprintf(stderr, "kicker: sighandler called\n"); - QApplication::exit(); + TQApplication::exit(); } extern "C" KDE_EXPORT int kdemain( int argc, char ** argv ) { { - QCString multiHead = getenv("KDE_MULTIHEAD"); + TQCString multiHead = getenv("KDE_MULTIHEAD"); if (multiHead.lower() == "true") { Display *dpy = XOpenDisplay(NULL); if (! dpy) { @@ -69,14 +69,14 @@ extern "C" KDE_EXPORT int kdemain( int argc, char ** argv ) int number_of_screens = ScreenCount(dpy); kicker_screen_number = DefaultScreen(dpy); int pos; - QCString display_name = XDisplayString(dpy); + TQCString display_name = XDisplayString(dpy); XCloseDisplay(dpy); dpy = 0; if ((pos = display_name.findRev('.')) != -1) display_name.remove(pos, 10); - QCString env; + TQCString env; if (number_of_screens != 1) { for (int i = 0; i < number_of_screens; i++) { if (i != kicker_screen_number && fork() == 0) { @@ -101,7 +101,7 @@ extern "C" KDE_EXPORT int kdemain( int argc, char ** argv ) KGlobal::locale()->setMainCatalogue("kicker"); - QCString appname; + TQCString appname; if (kicker_screen_number == 0) appname = "kicker"; else @@ -140,12 +140,12 @@ extern "C" KDE_EXPORT int kdemain( int argc, char ** argv ) signal(SIGHUP, SIG_IGN); // send it even before KApplication ctor, because ksmserver will launch another app as soon - // as QApplication registers with it + // as TQApplication registers with it DCOPClient* cl = new DCOPClient; cl->attach(); DCOPRef r( "ksmserver", "ksmserver" ); r.setDCOPClient( cl ); - r.send( "suspendStartup", QCString( "kicker" )); + r.send( "suspendStartup", TQCString( "kicker" )); delete cl; Kicker* kicker = new Kicker; int rv = kicker->exec(); diff --git a/kicker/kicker/core/menumanager.cpp b/kicker/kicker/core/menumanager.cpp index 9e4a91f97..908f6bdf9 100644 --- a/kicker/kicker/core/menumanager.cpp +++ b/kicker/kicker/core/menumanager.cpp @@ -21,9 +21,9 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ******************************************************************/ -#include <qcursor.h> -#include <qpixmap.h> -#include <qtimer.h> +#include <tqcursor.h> +#include <tqpixmap.h> +#include <tqtimer.h> #include <kapplication.h> #include <dcopclient.h> @@ -59,13 +59,13 @@ MenuManager* MenuManager::the() return m_self; } -MenuManager::MenuManager(QObject *parent) - : QObject(parent, "MenuManager"), DCOPObject("MenuManager") +MenuManager::MenuManager(TQObject *parent) + : TQObject(parent, "MenuManager"), DCOPObject("MenuManager") { m_kmenu = new PanelKMenu; kapp->dcopClient()->setNotifications(true); - connect(kapp->dcopClient(), SIGNAL(applicationRemoved(const QCString&)), - this, SLOT(applicationRemoved(const QCString&))); + connect(kapp->dcopClient(), TQT_SIGNAL(applicationRemoved(const TQCString&)), + this, TQT_SLOT(applicationRemoved(const TQCString&))); } MenuManager::~MenuManager() @@ -88,7 +88,7 @@ void MenuManager::showKMenu() m_kmenu->showMenu(); } -void MenuManager::popupKMenu(const QPoint &p) +void MenuManager::popupKMenu(const TQPoint &p) { // kdDebug(1210) << "popupKMenu()" << endl; if (m_kmenu->isVisible()) @@ -97,7 +97,7 @@ void MenuManager::popupKMenu(const QPoint &p) } else if (p.isNull()) { - m_kmenu->popup(QCursor::pos()); + m_kmenu->popup(TQCursor::pos()); } else { @@ -120,7 +120,7 @@ void MenuManager::unregisterKButton(PanelPopupButton *button) m_kbuttons.remove(button); } -PanelPopupButton* MenuManager::findKButtonFor(QPopupMenu* menu) +PanelPopupButton* MenuManager::findKButtonFor(TQPopupMenu* menu) { KButtonList::const_iterator itEnd = m_kbuttons.constEnd(); for (KButtonList::const_iterator it = m_kbuttons.constBegin(); it != itEnd; ++it) @@ -147,37 +147,37 @@ void MenuManager::kmenuAccelActivated() if (m_kbuttons.isEmpty()) { // no button to use, make it behave like a desktop menu - QPoint p; + TQPoint p; // Popup the K-menu at the center of the screen. - QDesktopWidget* desktop = KApplication::desktop(); - QRect r; + TQDesktopWidget* desktop = KApplication::desktop(); + TQRect r; if (desktop->numScreens() < 2) r = desktop->geometry(); else - r = desktop->screenGeometry(desktop->screenNumber(QCursor::pos())); + r = desktop->screenGeometry(desktop->screenNumber(TQCursor::pos())); // kMenu->rect() is not valid before showing, use sizeHint() - p = r.center() - QRect( QPoint( 0, 0 ), m_kmenu->sizeHint()).center(); + p = r.center() - TQRect( TQPoint( 0, 0 ), m_kmenu->sizeHint()).center(); m_kmenu->popup(p); // when the cursor is in the area where the menu pops up, // the item under the cursor gets selected. The single shot // avoids this from happening by allowing the item to be selected // when the event loop is enterred, and then resetting it. - QTimer::singleShot(0, this, SLOT(slotSetKMenuItemActive())); + TQTimer::singleShot(0, this, TQT_SLOT(slotSetKMenuItemActive())); } else { // We need the kmenu's size to place it at the right position. // We cannot rely on the popup menu's current size(), if it wasn't // shown before, so we resize it here according to its sizeHint(). - const QSize size = m_kmenu->sizeHint(); + const TQSize size = m_kmenu->sizeHint(); m_kmenu->resize(size.width(),size.height()); PanelPopupButton* button = findKButtonFor(m_kmenu); // let's unhide the panel while we're at it. traverse the widget // hierarchy until we find the panel, if any - QObject* menuParent = button->parent(); + TQObject* menuParent = button->parent(); while (menuParent) { ExtensionContainer* ext = dynamic_cast<ExtensionContainer*>(menuParent); @@ -198,11 +198,11 @@ void MenuManager::kmenuAccelActivated() } } -QCString MenuManager::createMenu(QPixmap icon, QString text) +TQCString MenuManager::createMenu(TQPixmap icon, TQString text) { static int menucount = 0; menucount++; - QCString name; + TQCString name; name.sprintf("kickerclientmenu-%d", menucount ); KickerClientMenu* p = new KickerClientMenu( 0, name ); clientmenus.append(p); @@ -215,7 +215,7 @@ QCString MenuManager::createMenu(QPixmap icon, QString text) return name; } -void MenuManager::removeMenu(QCString menu) +void MenuManager::removeMenu(TQCString menu) { bool iterate = true; ClientMenuList::iterator it = clientmenus.begin(); @@ -234,7 +234,7 @@ void MenuManager::removeMenu(QCString menu) } -void MenuManager::applicationRemoved(const QCString& appRemoved) +void MenuManager::applicationRemoved(const TQCString& appRemoved) { bool iterate = true; ClientMenuList::iterator it = clientmenus.begin(); @@ -252,21 +252,21 @@ void MenuManager::applicationRemoved(const QCString& appRemoved) m_kmenu->adjustSize(); } -bool MenuManager::process(const QCString &fun, const QByteArray &data, - QCString &replyType, QByteArray &replyData) +bool MenuManager::process(const TQCString &fun, const TQByteArray &data, + TQCString &replyType, TQByteArray &replyData) { - if ( fun == "createMenu(QPixmap,QString)" ) { - QDataStream dataStream( data, IO_ReadOnly ); - QPixmap icon; - QString text; + if ( fun == "createMenu(TQPixmap,TQString)" ) { + TQDataStream dataStream( data, IO_ReadOnly ); + TQPixmap icon; + TQString text; dataStream >> icon >> text; - QDataStream reply( replyData, IO_WriteOnly ); + TQDataStream reply( replyData, IO_WriteOnly ); reply << createMenu( icon, text ); - replyType = "QCString"; + replyType = "TQCString"; return true; - } else if ( fun == "removeMenu(QCString)" ) { - QDataStream dataStream( data, IO_ReadOnly ); - QCString menu; + } else if ( fun == "removeMenu(TQCString)" ) { + TQDataStream dataStream( data, IO_ReadOnly ); + TQCString menu; dataStream >> menu; removeMenu( menu ); replyType = "void"; diff --git a/kicker/kicker/core/menumanager.h b/kicker/kicker/core/menumanager.h index ed0e5d225..e9d7dfef4 100644 --- a/kicker/kicker/core/menumanager.h +++ b/kicker/kicker/core/menumanager.h @@ -25,38 +25,38 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #define KICKER_MENU_MANAGER_H #include <dcopobject.h> -#include <qvaluelist.h> +#include <tqvaluelist.h> class PanelKMenu; class KickerClientMenu; class PanelPopupButton; -typedef QValueList<PanelPopupButton*> KButtonList; +typedef TQValueList<PanelPopupButton*> KButtonList; /** * The factory for menus created by other applications. Also the owner of these menus. */ -class MenuManager : public QObject, DCOPObject +class MenuManager : public TQObject, DCOPObject { Q_OBJECT public: static MenuManager* the(); // dcop exported - QCString createMenu(QPixmap icon, QString text); - void removeMenu(QCString menu); + TQCString createMenu(TQPixmap icon, TQString text); + void removeMenu(TQCString menu); // dcop internal - bool process(const QCString &fun, const QByteArray &data, QCString& replyType, QByteArray &reply); + bool process(const TQCString &fun, const TQByteArray &data, TQCString& replyType, TQByteArray &reply); // KMenu controls PanelKMenu* kmenu() { return m_kmenu; } void showKMenu(); - void popupKMenu(const QPoint &p); + void popupKMenu(const TQPoint &p); void registerKButton(PanelPopupButton *button); void unregisterKButton(PanelPopupButton *button); - PanelPopupButton* findKButtonFor(QPopupMenu* menu); + PanelPopupButton* findKButtonFor(TQPopupMenu* menu); ~MenuManager(); public slots: @@ -64,15 +64,15 @@ public slots: void kmenuAccelActivated(); protected slots: - void applicationRemoved(const QCString&); + void applicationRemoved(const TQCString&); protected: PanelKMenu* m_kmenu; - typedef QValueList<KickerClientMenu*> ClientMenuList; + typedef TQValueList<KickerClientMenu*> ClientMenuList; ClientMenuList clientmenus; private: - MenuManager(QObject *parent = 0); + MenuManager(TQObject *parent = 0); static MenuManager* m_self; KButtonList m_kbuttons; diff --git a/kicker/kicker/core/panelextension.cpp b/kicker/kicker/core/panelextension.cpp index 70b7b407d..2bd70c82b 100644 --- a/kicker/kicker/core/panelextension.cpp +++ b/kicker/kicker/core/panelextension.cpp @@ -22,11 +22,11 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ******************************************************************/ -#include <qframe.h> -#include <qvalidator.h> -#include <qlayout.h> -#include <qpainter.h> -#include <qstyle.h> +#include <tqframe.h> +#include <tqvalidator.h> +#include <tqlayout.h> +#include <tqpainter.h> +#include <tqstyle.h> #include <kdebug.h> #include <khelpmenu.h> @@ -53,8 +53,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "panelextension.moc" // KDE4: make these say Panel_(somenumber) -PanelExtension::PanelExtension(const QString& configFile, QWidget *parent, const char *name) - : DCOPObject(QCString("ChildPanel_") + QString::number((ulong)this).latin1()), +PanelExtension::PanelExtension(const TQString& configFile, TQWidget *parent, const char *name) + : DCOPObject(TQCString("ChildPanel_") + TQString::number((ulong)this).latin1()), KPanelExtension(configFile, KPanelExtension::Stretch, 0, parent, name), _opMnu(0), m_panelAddMenu(0), @@ -67,11 +67,11 @@ PanelExtension::PanelExtension(const QString& configFile, QWidget *parent, const setAcceptDrops(!Kicker::the()->isImmutable()); setCustomMenu(opMenu()); - QVBoxLayout* _layout = new QVBoxLayout(this); + TQVBoxLayout* _layout = new TQVBoxLayout(this); // container area _containerArea = new ContainerArea( config(), this, opMenu() ); - connect(_containerArea, SIGNAL(maintainFocus(bool)), this, SIGNAL(maintainFocus(bool))); + connect(_containerArea, TQT_SIGNAL(maintainFocus(bool)), this, TQT_SIGNAL(maintainFocus(bool))); _layout->addWidget(_containerArea); _containerArea->viewport()->installEventFilter(this); @@ -81,15 +81,15 @@ PanelExtension::PanelExtension(const QString& configFile, QWidget *parent, const // beginning. positionChange(position()); - connect(Kicker::the(), SIGNAL(configurationChanged()), - SLOT(configurationChanged())); - connect(Kicker::the(), SIGNAL(immutabilityChanged(bool)), - SLOT(immutabilityChanged(bool))); + connect(Kicker::the(), TQT_SIGNAL(configurationChanged()), + TQT_SLOT(configurationChanged())); + connect(Kicker::the(), TQT_SIGNAL(immutabilityChanged(bool)), + TQT_SLOT(immutabilityChanged(bool))); // we wait to get back to the event loop to start up the container area so that // the main panel in ExtensionManager will be assigned and we can tell in a // relatively non-hackish way that we are (or aren't) the "main panel" - QTimer::singleShot(0, this, SLOT(populateContainerArea())); + TQTimer::singleShot(0, this, TQT_SLOT(populateContainerArea())); } PanelExtension::~PanelExtension() @@ -121,15 +121,15 @@ void PanelExtension::immutabilityChanged(bool) m_opMenuBuilt = false; } -QPopupMenu* PanelExtension::opMenu() +TQPopupMenu* PanelExtension::opMenu() { if (_opMnu) { return _opMnu; } - _opMnu = new QPopupMenu(this); - connect(_opMnu, SIGNAL(aboutToShow()), this, SLOT(slotBuildOpMenu())); + _opMnu = new TQPopupMenu(this); + connect(_opMnu, TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(slotBuildOpMenu())); return _opMnu; } @@ -139,39 +139,39 @@ void PanelExtension::positionChange(Position p) _containerArea->setPosition(p); } -QSize PanelExtension::sizeHint(Position p, QSize maxSize) const +TQSize PanelExtension::sizeHint(Position p, TQSize maxSize) const { - QSize size; + TQSize size; if (p == Left || p == Right) { - size = QSize(sizeInPixels(), + size = TQSize(sizeInPixels(), _containerArea->heightForWidth(sizeInPixels())); } else { - size = QSize(_containerArea->widthForHeight(sizeInPixels()), + size = TQSize(_containerArea->widthForHeight(sizeInPixels()), sizeInPixels()); } return size.boundedTo( maxSize ); } -bool PanelExtension::eventFilter(QObject*, QEvent * e) +bool PanelExtension::eventFilter(TQObject*, TQEvent * e) { - if ( e->type() == QEvent::MouseButtonPress ) + if ( e->type() == TQEvent::MouseButtonPress ) { - QMouseEvent* me = (QMouseEvent*) e; + TQMouseEvent* me = (TQMouseEvent*) e; if ( me->button() == RightButton && kapp->authorize("action/kicker_rmb")) { Kicker::the()->setInsertionPoint(me->globalPos()); opMenu()->exec(me->globalPos()); - Kicker::the()->setInsertionPoint(QPoint()); + Kicker::the()->setInsertionPoint(TQPoint()); return true; } } else - if ( e->type() == QEvent::Resize ) + if ( e->type() == TQEvent::Resize ) { emit updateLayout(); } @@ -211,72 +211,72 @@ void PanelExtension::addWindowListButton() _containerArea->addWindowListButton(); } -void PanelExtension::addURLButton(const QString &url) +void PanelExtension::addURLButton(const TQString &url) { _containerArea->addURLButton(url); } -void PanelExtension::addBrowserButton(const QString &startDir) +void PanelExtension::addBrowserButton(const TQString &startDir) { _containerArea->addBrowserButton(startDir); } -void PanelExtension::addServiceButton(const QString& desktopEntry) +void PanelExtension::addServiceButton(const TQString& desktopEntry) { _containerArea->addServiceButton(desktopEntry); } -void PanelExtension::addServiceMenuButton(const QString &, - const QString& relPath) +void PanelExtension::addServiceMenuButton(const TQString &, + const TQString& relPath) { _containerArea->addServiceMenuButton(relPath); } -void PanelExtension::addNonKDEAppButton(const QString &filePath, - const QString &icon, - const QString &cmdLine, bool inTerm) +void PanelExtension::addNonKDEAppButton(const TQString &filePath, + const TQString &icon, + const TQString &cmdLine, bool inTerm) { - _containerArea->addNonKDEAppButton(filePath, QString::null, filePath, icon, + _containerArea->addNonKDEAppButton(filePath, TQString::null, filePath, icon, cmdLine, inTerm); } -void PanelExtension::addNonKDEAppButton(const QString &title, - const QString &description, - const QString &filePath, - const QString &icon, - const QString &cmdLine, bool inTerm) +void PanelExtension::addNonKDEAppButton(const TQString &title, + const TQString &description, + const TQString &filePath, + const TQString &icon, + const TQString &cmdLine, bool inTerm) { _containerArea->addNonKDEAppButton(title, description, filePath, icon, cmdLine, inTerm); } -void PanelExtension::addApplet(const QString &desktopFile) +void PanelExtension::addApplet(const TQString &desktopFile) { - _containerArea->addApplet(AppletInfo(desktopFile, QString::null, AppletInfo::Applet)); + _containerArea->addApplet(AppletInfo(desktopFile, TQString::null, AppletInfo::Applet)); } -void PanelExtension::addAppletContainer(const QString &desktopFile) +void PanelExtension::addAppletContainer(const TQString &desktopFile) { // KDE4: this appears in the DCOP interface. // but it's such a bad name, can this go away? addApplet(desktopFile); } -bool PanelExtension::insertApplet(const QString& desktopFile, int index) +bool PanelExtension::insertApplet(const TQString& desktopFile, int index) { return _containerArea->addApplet(desktopFile, false, index) != 0; } -bool PanelExtension::insertImmutableApplet(const QString& desktopFile, int index) +bool PanelExtension::insertImmutableApplet(const TQString& desktopFile, int index) { return _containerArea->addApplet(desktopFile, true, index) != 0; } -QStringList PanelExtension::listApplets() +TQStringList PanelExtension::listApplets() { return _containerArea->listContainers(); BaseContainer::List containers = _containerArea->containers("All"); - QStringList names; + TQStringList names; for (BaseContainer::List::const_iterator it = containers.constBegin(); it != containers.constEnd(); @@ -330,7 +330,7 @@ void PanelExtension::slotBuildOpMenu() m_opMenuBuilt = true; bool kickerImmutable = Kicker::the()->isImmutable(); - bool isMenuBar = ExtensionManager::the()->isMenuBar(dynamic_cast<QWidget*>(parent())); + bool isMenuBar = ExtensionManager::the()->isMenuBar(dynamic_cast<TQWidget*>(parent())); if (!kickerImmutable) { @@ -339,7 +339,7 @@ void PanelExtension::slotBuildOpMenu() { _opMnu->insertItem(isMenuBar ? i18n("Add &Applet to Menubar...") : i18n("Add &Applet to Panel..."), - _containerArea, SLOT(showAddAppletDialog())); + _containerArea, TQT_SLOT(showAddAppletDialog())); m_panelAddMenu = new PanelAddButtonMenu(_containerArea, this); _opMnu->insertItem(isMenuBar ? i18n("Add Appli&cation to Menubar") : i18n("Add Appli&cation to Panel"), @@ -362,7 +362,7 @@ void PanelExtension::slotBuildOpMenu() } _opMnu->insertItem(SmallIconSet("lock"), i18n("&Lock Panels"), - Kicker::the(), SLOT(toggleLock())); + Kicker::the(), TQT_SLOT(toggleLock())); } else if (!Kicker::the()->isKioskImmutable()) { @@ -370,20 +370,20 @@ void PanelExtension::slotBuildOpMenu() SmallIconSet("lock"), kickerImmutable ? i18n("Un&lock Panels") : i18n("&Lock Panels"), - Kicker::the(), SLOT(toggleLock())); + Kicker::the(), TQT_SLOT(toggleLock())); } if (!isMenuBar && !Kicker::the()->isKioskImmutable()) { _opMnu->insertItem(SmallIconSet("configure"), i18n("&Configure Panel..."), - this, SLOT(showConfig())); + this, TQT_SLOT(showConfig())); _opMnu->insertSeparator(); } _opMnu->insertItem(SmallIconSet("fork"), i18n("&Launch Process Manager..."), - this, SLOT(showProcessManager())); + this, TQT_SLOT(showProcessManager())); _opMnu->insertSeparator(); if (kapp->authorize("action/help")) @@ -441,7 +441,7 @@ void MenubarExtension::populateContainerArea() if (!m_menubar) { m_menubar = _containerArea->addApplet(AppletInfo("menuapplet.desktop", - QString::null, + TQString::null, AppletInfo::Applet)); } diff --git a/kicker/kicker/core/panelextension.h b/kicker/kicker/core/panelextension.h index 9f50fb9ae..5c753c316 100644 --- a/kicker/kicker/core/panelextension.h +++ b/kicker/kicker/core/panelextension.h @@ -44,10 +44,10 @@ class PanelExtension : public KPanelExtension, virtual public DCOPObject K_DCOP public: - PanelExtension(const QString& configFile, QWidget *parent = 0, const char *name = 0); + PanelExtension(const TQString& configFile, TQWidget *parent = 0, const char *name = 0); virtual ~PanelExtension(); - QPopupMenu* opMenu(); + TQPopupMenu* opMenu(); k_dcop: int panelSize() { return sizeInPixels(); } @@ -58,31 +58,31 @@ k_dcop: void addKMenuButton(); void addDesktopButton(); void addWindowListButton(); - void addURLButton(const QString &url); - void addBrowserButton(const QString &startDir); - void addServiceButton(const QString &desktopEntry); - void addServiceMenuButton(const QString &name, const QString& relPath); - void addNonKDEAppButton(const QString &filePath, const QString &icon, - const QString &cmdLine, bool inTerm); - void addNonKDEAppButton(const QString &title, const QString &description, - const QString &filePath, const QString &icon, - const QString &cmdLine, bool inTerm); - - void addApplet(const QString &desktopFile); - void addAppletContainer(const QString &desktopFile); // KDE4: remove, useless - - bool insertApplet(const QString& desktopFile, int index); - bool insertImmutableApplet(const QString& desktopFile, int index); - QStringList listApplets(); + void addURLButton(const TQString &url); + void addBrowserButton(const TQString &startDir); + void addServiceButton(const TQString &desktopEntry); + void addServiceMenuButton(const TQString &name, const TQString& relPath); + void addNonKDEAppButton(const TQString &filePath, const TQString &icon, + const TQString &cmdLine, bool inTerm); + void addNonKDEAppButton(const TQString &title, const TQString &description, + const TQString &filePath, const TQString &icon, + const TQString &cmdLine, bool inTerm); + + void addApplet(const TQString &desktopFile); + void addAppletContainer(const TQString &desktopFile); // KDE4: remove, useless + + bool insertApplet(const TQString& desktopFile, int index); + bool insertImmutableApplet(const TQString& desktopFile, int index); + TQStringList listApplets(); bool removeApplet(int index); void restart(); // KDE4: remove, moved to Kicker void configure(); // KDE4: remove, moved to Kikcker public: - QSize sizeHint(Position, QSize maxSize) const; + TQSize sizeHint(Position, TQSize maxSize) const; Position preferedPosition() const { return Bottom; } - bool eventFilter( QObject *, QEvent * ); + bool eventFilter( TQObject *, TQEvent * ); protected: void positionChange(Position); @@ -98,12 +98,12 @@ protected slots: virtual void populateContainerArea(); private: - QPopupMenu* _opMnu; - QPopupMenu* m_panelAddMenu; - QPopupMenu* m_removeMnu; - QPopupMenu* m_addExtensionMenu; - QPopupMenu* m_removeExtensionMenu; - QString _configFile; + TQPopupMenu* _opMnu; + TQPopupMenu* m_panelAddMenu; + TQPopupMenu* m_removeMnu; + TQPopupMenu* m_addExtensionMenu; + TQPopupMenu* m_removeExtensionMenu; + TQString _configFile; bool m_opMenuBuilt; }; diff --git a/kicker/kicker/core/pluginmanager.cpp b/kicker/kicker/core/pluginmanager.cpp index e392959ad..81975ccae 100644 --- a/kicker/kicker/core/pluginmanager.cpp +++ b/kicker/kicker/core/pluginmanager.cpp @@ -21,8 +21,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ******************************************************************/ -#include <qfile.h> -#include <qtimer.h> +#include <tqfile.h> +#include <tqtimer.h> #include <kapplication.h> #include <kdebug.h> @@ -54,33 +54,33 @@ PluginManager* PluginManager::the() AppletInfo::List PluginManager::applets(bool sort, AppletInfo::List* list) { - QStringList rel; + TQStringList rel; KGlobal::dirs()->findAllResources("applets", "*.desktop", false, true, rel); return plugins(rel, AppletInfo::Applet, sort, list); } AppletInfo::List PluginManager::extensions(bool sort, AppletInfo::List* list) { - QStringList rel; + TQStringList rel; KGlobal::dirs()->findAllResources("extensions", "*.desktop", false, true, rel); return plugins(rel, AppletInfo::Extension, sort, list); } AppletInfo::List PluginManager::builtinButtons(bool sort, AppletInfo::List* list) { - QStringList rel; + TQStringList rel; KGlobal::dirs()->findAllResources("builtinbuttons", "*.desktop", false, true, rel); return plugins(rel, AppletInfo::BuiltinButton, sort, list); } AppletInfo::List PluginManager::specialButtons(bool sort, AppletInfo::List* list) { - QStringList rel; + TQStringList rel; KGlobal::dirs()->findAllResources("specialbuttons", "*.desktop", false, true, rel); return plugins(rel, AppletInfo::SpecialButton, sort, list); } -AppletInfo::List PluginManager::plugins(const QStringList& desktopFiles, +AppletInfo::List PluginManager::plugins(const TQStringList& desktopFiles, AppletInfo::AppletType type, bool sort, AppletInfo::List* list) @@ -92,10 +92,10 @@ AppletInfo::List PluginManager::plugins(const QStringList& desktopFiles, plugins = *list; } - for (QStringList::ConstIterator it = desktopFiles.constBegin(); + for (TQStringList::ConstIterator it = desktopFiles.constBegin(); it != desktopFiles.constEnd(); ++it) { - AppletInfo info(*it, QString::null, type); + AppletInfo info(*it, TQString::null, type); if (!info.isHidden()) { @@ -123,8 +123,8 @@ PluginManager::~PluginManager() AppletInfo::Dict::const_iterator it = _dict.constBegin(); for (; it != _dict.constEnd(); ++it) { - disconnect(it.key(), SIGNAL(destroyed( QObject*)), - this, SLOT(slotPluginDestroyed(QObject*))); + disconnect(it.key(), TQT_SIGNAL(destroyed( TQObject*)), + this, TQT_SLOT(slotPluginDestroyed(TQObject*))); delete it.data(); } @@ -133,10 +133,10 @@ PluginManager::~PluginManager() } KPanelApplet* PluginManager::loadApplet(const AppletInfo& info, - QWidget* parent ) + TQWidget* parent ) { KLibLoader* loader = KLibLoader::self(); - KLibrary* lib = loader->library( QFile::encodeName(info.library()) ); + KLibrary* lib = loader->library( TQFile::encodeName(info.library()) ); if (!lib) { @@ -145,13 +145,13 @@ KPanelApplet* PluginManager::loadApplet(const AppletInfo& info, return 0; } - KPanelApplet* (*init_ptr)(QWidget *, const QString&); - init_ptr = (KPanelApplet* (*)(QWidget *, const QString&))lib->symbol( "init" ); + KPanelApplet* (*init_ptr)(TQWidget *, const TQString&); + init_ptr = (KPanelApplet* (*)(TQWidget *, const TQString&))lib->symbol( "init" ); if (!init_ptr) { kdWarning() << info.library() << " is not a kicker extension!" << endl; - loader->unloadLibrary( QFile::encodeName(info.library()) ); + loader->unloadLibrary( TQFile::encodeName(info.library()) ); return 0; } @@ -160,15 +160,15 @@ KPanelApplet* PluginManager::loadApplet(const AppletInfo& info, if (applet) { _dict.insert( applet, new AppletInfo( info ) ); - connect( applet, SIGNAL( destroyed( QObject* ) ), - SLOT( slotPluginDestroyed( QObject* ) ) ); + connect( applet, TQT_SIGNAL( destroyed( TQObject* ) ), + TQT_SLOT( slotPluginDestroyed( TQObject* ) ) ); } return applet; } KPanelExtension* PluginManager::loadExtension( - const AppletInfo& info, QWidget* parent ) + const AppletInfo& info, TQWidget* parent ) { if (info.library() == "childpanel_panelextension" /* KDE4? || info.library() == "panel" */) @@ -177,7 +177,7 @@ KPanelExtension* PluginManager::loadExtension( } KLibLoader* loader = KLibLoader::self(); - KLibrary* lib = loader->library( QFile::encodeName(info.library()) ); + KLibrary* lib = loader->library( TQFile::encodeName(info.library()) ); if( !lib ) { kdWarning() << "cannot open extension: " << info.library() @@ -185,12 +185,12 @@ KPanelExtension* PluginManager::loadExtension( return 0; } - KPanelExtension* (*init_ptr)(QWidget *, const QString&); - init_ptr = (KPanelExtension* (*)(QWidget *, const QString&))lib->symbol( "init" ); + KPanelExtension* (*init_ptr)(TQWidget *, const TQString&); + init_ptr = (KPanelExtension* (*)(TQWidget *, const TQString&))lib->symbol( "init" ); if(!init_ptr){ kdWarning() << info.library() << " is not a kicker extension!" << endl; - loader->unloadLibrary( QFile::encodeName(info.library()) ); + loader->unloadLibrary( TQFile::encodeName(info.library()) ); return 0; } @@ -198,8 +198,8 @@ KPanelExtension* PluginManager::loadExtension( if( extension ) { _dict.insert( extension, new AppletInfo( info ) ); - connect( extension, SIGNAL( destroyed( QObject* ) ), - SLOT( slotPluginDestroyed( QObject* ) ) ); + connect( extension, TQT_SIGNAL( destroyed( TQObject* ) ), + TQT_SLOT( slotPluginDestroyed( TQObject* ) ) ); } return extension; @@ -219,7 +219,7 @@ bool PluginManager::hasInstance( const AppletInfo& info ) const return false; } -void PluginManager::slotPluginDestroyed(QObject* object) +void PluginManager::slotPluginDestroyed(TQObject* object) { AppletInfo* info = 0; AppletInfo::Dict::iterator it = _dict.begin(); @@ -243,14 +243,14 @@ void PluginManager::slotPluginDestroyed(QObject* object) } AppletContainer* PluginManager::createAppletContainer( - const QString& desktopFile, + const TQString& desktopFile, bool isStartup, - const QString& configFile, - QPopupMenu* opMenu, - QWidget* parent, + const TQString& configFile, + TQPopupMenu* opMenu, + TQWidget* parent, bool isImmutable) { - QString desktopPath = KGlobal::dirs()->findResource( "applets", desktopFile ); + TQString desktopPath = KGlobal::dirs()->findResource( "applets", desktopFile ); // KDE4: remove // support the old (KDE 2.2) nameing scheme @@ -298,17 +298,17 @@ AppletContainer* PluginManager::createAppletContainer( return container; } -ExtensionContainer* PluginManager::createExtensionContainer(const QString& desktopFile, +ExtensionContainer* PluginManager::createExtensionContainer(const TQString& desktopFile, bool isStartup, - const QString& configFile, - const QString& extensionId) + const TQString& configFile, + const TQString& extensionId) { if (desktopFile.isEmpty()) { return 0; } - QString desktopPath = KGlobal::dirs()->findResource("extensions", desktopFile); + TQString desktopPath = KGlobal::dirs()->findResource("extensions", desktopFile); if (desktopPath.isEmpty()) { return 0; @@ -355,22 +355,22 @@ void PluginManager::clearUntrustedLists() generalGroup.sync(); } -LibUnloader::LibUnloader( const QString &libName, QObject *parent ) - : QObject( parent ), _libName( libName ) +LibUnloader::LibUnloader( const TQString &libName, TQObject *parent ) + : TQObject( parent ), _libName( libName ) { // NOTE: this doesn't work on kicker shutdown because the timer never gets // fired. - QTimer::singleShot( 0, this, SLOT( unload() ) ); + TQTimer::singleShot( 0, this, TQT_SLOT( unload() ) ); } -void LibUnloader::unload( const QString &libName ) +void LibUnloader::unload( const TQString &libName ) { (void)new LibUnloader( libName, kapp ); } void LibUnloader::unload() { - KLibLoader::self()->unloadLibrary( QFile::encodeName( _libName ) ); + KLibLoader::self()->unloadLibrary( TQFile::encodeName( _libName ) ); deleteLater(); } diff --git a/kicker/kicker/core/pluginmanager.h b/kicker/kicker/core/pluginmanager.h index bbea87b30..7be94c2ac 100644 --- a/kicker/kicker/core/pluginmanager.h +++ b/kicker/kicker/core/pluginmanager.h @@ -24,9 +24,9 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #ifndef __PLUGIN_MANAGER_H__ #define __PLUGIN_MANAGER_H__ -#include <qmap.h> -#include <qobject.h> -#include <qstringlist.h> +#include <tqmap.h> +#include <tqobject.h> +#include <tqstringlist.h> #include <kdemacros.h> #include <kstaticdeleter.h> @@ -49,19 +49,19 @@ public: static AppletInfo::List builtinButtons(bool sort = true, AppletInfo::List* list = 0); static AppletInfo::List specialButtons(bool sort = true, AppletInfo::List* list = 0); - AppletContainer* createAppletContainer(const QString& desktopFile, + AppletContainer* createAppletContainer(const TQString& desktopFile, bool isStartup, - const QString& configFile, - QPopupMenu* opMenu, - QWidget* parent, + const TQString& configFile, + TQPopupMenu* opMenu, + TQWidget* parent, bool isImmutable = false); - ExtensionContainer* createExtensionContainer(const QString& desktopFile, + ExtensionContainer* createExtensionContainer(const TQString& desktopFile, bool isStartup, - const QString& configFile, - const QString& extensionId); + const TQString& configFile, + const TQString& extensionId); - KPanelApplet* loadApplet(const AppletInfo& info, QWidget* parent); - KPanelExtension* loadExtension(const AppletInfo& info, QWidget* parent); + KPanelApplet* loadApplet(const AppletInfo& info, TQWidget* parent); + KPanelExtension* loadExtension(const AppletInfo& info, TQWidget* parent); bool hasInstance(const AppletInfo&) const; @@ -69,13 +69,13 @@ public slots: void clearUntrustedLists(); protected: - static AppletInfo::List plugins(const QStringList& desktopFiles, + static AppletInfo::List plugins(const TQStringList& desktopFiles, AppletInfo::AppletType, bool sort, AppletInfo::List* list); private slots: - void slotPluginDestroyed(QObject* plugin); + void slotPluginDestroyed(TQObject* plugin); private: friend class KStaticDeleter<PluginManager>; @@ -84,23 +84,23 @@ private: AppletInfo::Dict _dict; static PluginManager* m_self; - QStringList m_untrustedApplets; - QStringList m_untrustedExtensions; + TQStringList m_untrustedApplets; + TQStringList m_untrustedExtensions; }; class LibUnloader : public QObject { Q_OBJECT public: - static void unload( const QString &libName ); + static void unload( const TQString &libName ); private slots: void unload(); private: - LibUnloader( const QString &libName, QObject *parent ); + LibUnloader( const TQString &libName, TQObject *parent ); - QString _libName; + TQString _libName; }; #endif diff --git a/kicker/kicker/core/showdesktop.cpp b/kicker/kicker/core/showdesktop.cpp index 5575b3b28..7f75ba1b9 100644 --- a/kicker/kicker/core/showdesktop.cpp +++ b/kicker/kicker/core/showdesktop.cpp @@ -40,7 +40,7 @@ ShowDesktop* ShowDesktop::the() } ShowDesktop::ShowDesktop() - : QObject(), + : TQObject(), m_showingDesktop(false) { // This feature is implemented in KWin. Keep old code in Kicker for the case @@ -49,8 +49,8 @@ ShowDesktop::ShowDesktop() m_wmSupport = i.isSupported( NET::WM2ShowingDesktop ); if( m_wmSupport ) { - connect( Kicker::the()->kwinModule(), SIGNAL( showingDesktopChanged( bool )), - SLOT( showingDesktopChanged( bool ))); + connect( Kicker::the()->kwinModule(), TQT_SIGNAL( showingDesktopChanged( bool )), + TQT_SLOT( showingDesktopChanged( bool ))); showingDesktopChanged( m_showingDesktop = Kicker::the()->kwinModule()->showingDesktop()); } } @@ -133,8 +133,8 @@ void ShowDesktop::showDesktop( bool b ) m_activeWindow = Kicker::the()->kwinModule()->activeWindow(); m_iconifiedList.clear(); - const QValueList<WId> windows = Kicker::the()->kwinModule()->windows(); - for (QValueList<WId>::ConstIterator it = windows.begin(); + const TQValueList<WId> windows = Kicker::the()->kwinModule()->windows(); + for (TQValueList<WId>::ConstIterator it = windows.begin(); it != windows.end(); ++it) { @@ -153,7 +153,7 @@ void ShowDesktop::showDesktop( bool b ) // find first, hide later, otherwise transients may get minimized // with the window they're transient for - for (QValueVector<WId>::Iterator it = m_iconifiedList.begin(); + for (TQValueVector<WId>::Iterator it = m_iconifiedList.begin(); it != m_iconifiedList.end(); ++it) { @@ -161,23 +161,23 @@ void ShowDesktop::showDesktop( bool b ) } // on desktop changes or when a window is deiconified, we abort the show desktop mode - connect(Kicker::the()->kwinModule(), SIGNAL(currentDesktopChanged(int)), - SLOT(slotCurrentDesktopChanged(int))); - connect(Kicker::the()->kwinModule(), SIGNAL(windowChanged(WId,unsigned int)), - SLOT(slotWindowChanged(WId,unsigned int))); - connect(Kicker::the()->kwinModule(), SIGNAL(windowAdded(WId)), - SLOT(slotWindowAdded(WId))); + connect(Kicker::the()->kwinModule(), TQT_SIGNAL(currentDesktopChanged(int)), + TQT_SLOT(slotCurrentDesktopChanged(int))); + connect(Kicker::the()->kwinModule(), TQT_SIGNAL(windowChanged(WId,unsigned int)), + TQT_SLOT(slotWindowChanged(WId,unsigned int))); + connect(Kicker::the()->kwinModule(), TQT_SIGNAL(windowAdded(WId)), + TQT_SLOT(slotWindowAdded(WId))); } else { - disconnect(Kicker::the()->kwinModule(), SIGNAL(currentDesktopChanged(int)), - this, SLOT(slotCurrentDesktopChanged(int))); - disconnect(Kicker::the()->kwinModule(), SIGNAL(windowChanged(WId,unsigned int)), - this, SLOT(slotWindowChanged(WId,unsigned int))); - disconnect(Kicker::the()->kwinModule(), SIGNAL(windowAdded(WId)), - this, SLOT(slotWindowAdded(WId))); - - for (QValueVector<WId>::ConstIterator it = m_iconifiedList.begin(); + disconnect(Kicker::the()->kwinModule(), TQT_SIGNAL(currentDesktopChanged(int)), + this, TQT_SLOT(slotCurrentDesktopChanged(int))); + disconnect(Kicker::the()->kwinModule(), TQT_SIGNAL(windowChanged(WId,unsigned int)), + this, TQT_SLOT(slotWindowChanged(WId,unsigned int))); + disconnect(Kicker::the()->kwinModule(), TQT_SIGNAL(windowAdded(WId)), + this, TQT_SLOT(slotWindowAdded(WId))); + + for (TQValueVector<WId>::ConstIterator it = m_iconifiedList.begin(); it != m_iconifiedList.end(); ++it) { diff --git a/kicker/kicker/core/showdesktop.h b/kicker/kicker/core/showdesktop.h index bebf62007..8d4d2546c 100644 --- a/kicker/kicker/core/showdesktop.h +++ b/kicker/kicker/core/showdesktop.h @@ -26,7 +26,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. class KWinModule; -#include <qvaluevector.h> +#include <tqvaluevector.h> /** * Singleton class that handles desktop access (minimizing all windows) @@ -56,7 +56,7 @@ private: ShowDesktop(); bool m_showingDesktop; - QValueVector<WId> m_iconifiedList; + TQValueVector<WId> m_iconifiedList; WId m_activeWindow; bool m_wmSupport; }; diff --git a/kicker/kicker/core/unhidetrigger.cpp b/kicker/kicker/core/unhidetrigger.cpp index bd0e0a0f8..7dcf1a127 100644 --- a/kicker/kicker/core/unhidetrigger.cpp +++ b/kicker/kicker/core/unhidetrigger.cpp @@ -21,8 +21,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ******************************************************************/ -#include <qtimer.h> -#include <qcursor.h> +#include <tqtimer.h> +#include <tqcursor.h> #include <kdebug.h> #include "unhidetrigger.h" @@ -39,8 +39,8 @@ UnhideTrigger::UnhideTrigger() , _lastXineramaScreen( -1 ) , enabledCount( 0 ) { - _timer = new QTimer( this ); - connect( _timer, SIGNAL(timeout()), SLOT(pollMouse()) ); + _timer = new TQTimer( this ); + connect( _timer, TQT_SIGNAL(timeout()), TQT_SLOT(pollMouse()) ); } void UnhideTrigger::setEnabled( bool enable ) @@ -65,10 +65,10 @@ bool UnhideTrigger::isEnabled() const void UnhideTrigger::pollMouse() { - QPoint pos = QCursor::pos(); - for(int s = 0; s < QApplication::desktop()->numScreens(); s++) + TQPoint pos = TQCursor::pos(); + for(int s = 0; s < TQApplication::desktop()->numScreens(); s++) { - QRect r = QApplication::desktop()->screenGeometry(s); + TQRect r = TQApplication::desktop()->screenGeometry(s); if (pos.x() == r.left()) { if (pos.y() == r.top()) diff --git a/kicker/kicker/core/unhidetrigger.h b/kicker/kicker/core/unhidetrigger.h index 7e13a0e1d..af05a43f5 100644 --- a/kicker/kicker/core/unhidetrigger.h +++ b/kicker/kicker/core/unhidetrigger.h @@ -30,7 +30,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #endif -#include <qobject.h> +#include <tqobject.h> class UnhideTrigger : public QObject { @@ -55,7 +55,7 @@ private: void emitTrigger( Trigger t , int XineramaScreen ); Trigger _lastTrigger; int _lastXineramaScreen; - QTimer *_timer; + TQTimer *_timer; int enabledCount; }; diff --git a/kicker/kicker/core/userrectsel.cpp b/kicker/kicker/core/userrectsel.cpp index 5654b1eb3..d4b54f04a 100644 --- a/kicker/kicker/core/userrectsel.cpp +++ b/kicker/kicker/core/userrectsel.cpp @@ -21,14 +21,14 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ******************************************************************/ -#include <qapplication.h> -#include <qpainter.h> +#include <tqapplication.h> +#include <tqpainter.h> #include "userrectsel.h" #include "userrectsel.moc" -UserRectSel::UserRectSel(const RectList& rects, const QPoint& _offset, const QColor& color) - : QWidget(0, 0, WStyle_Customize | WX11BypassWM), +UserRectSel::UserRectSel(const RectList& rects, const TQPoint& _offset, const TQColor& color) + : TQWidget(0, 0, WStyle_Customize | WX11BypassWM), rectangles(rects), offset(_offset) { @@ -44,7 +44,7 @@ UserRectSel::~UserRectSel() delete _frame[i]; } -void UserRectSel::mouseReleaseEvent(QMouseEvent * e) +void UserRectSel::mouseReleaseEvent(TQMouseEvent * e) { if (e->button() == LeftButton) { @@ -52,11 +52,11 @@ void UserRectSel::mouseReleaseEvent(QMouseEvent * e) } } -void UserRectSel::mouseMoveEvent(QMouseEvent * e) +void UserRectSel::mouseMoveEvent(TQMouseEvent * e) { PanelStrut nearest = current; int diff = -1; - QPoint p = e->globalPos(); // + offset; + TQPoint p = e->globalPos(); // + offset; for (RectList::const_iterator it = rectangles.constBegin(); it != rectangles.constEnd(); ++it) @@ -88,12 +88,12 @@ void UserRectSel::paintCurrent() { for (i = 0; i < 4; i++) { - _frame[i] = new QWidget(0, 0, Qt::WStyle_Customize | Qt::WStyle_NoBorder | Qt::WX11BypassWM); + _frame[i] = new TQWidget(0, 0, Qt::WStyle_Customize | Qt::WStyle_NoBorder | Qt::WX11BypassWM); _frame[i]->setPaletteBackgroundColor(Qt::black); } for (i = 4; i < 8; i++) { - _frame[i] = new QWidget(0, 0, Qt::WStyle_Customize | Qt::WStyle_NoBorder | Qt::WX11BypassWM); + _frame[i] = new TQWidget(0, 0, Qt::WStyle_Customize | Qt::WStyle_NoBorder | Qt::WX11BypassWM); _frame[i]->setPaletteBackgroundColor(_color); } } @@ -132,7 +132,7 @@ void UserRectSel::paintCurrent() } -UserRectSel::PanelStrut UserRectSel::select(const RectList& rects, const QPoint& offset, const QColor& color) +UserRectSel::PanelStrut UserRectSel::select(const RectList& rects, const TQPoint& offset, const TQColor& color) { UserRectSel sel(rects, offset, color); sel.show(); diff --git a/kicker/kicker/core/userrectsel.h b/kicker/kicker/core/userrectsel.h index 724f39818..63ba47fd5 100644 --- a/kicker/kicker/core/userrectsel.h +++ b/kicker/kicker/core/userrectsel.h @@ -24,9 +24,9 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #ifndef __userrectsel_h__ #define __userrectsel_h__ -#include <qwidget.h> -#include <qvaluevector.h> -#include <qcolor.h> +#include <tqwidget.h> +#include <tqvaluevector.h> +#include <tqcolor.h> #include <kpanelextension.h> @@ -47,7 +47,7 @@ class UserRectSel : public QWidget { } - PanelStrut(const QRect& rect, int XineramaScreen, + PanelStrut(const TQRect& rect, int XineramaScreen, KPanelExtension::Position pos, KPanelExtension::Alignment alignment) : m_rect(rect), @@ -69,29 +69,29 @@ class UserRectSel : public QWidget return !(*this == rhs); } - QRect m_rect; + TQRect m_rect; int m_screen; KPanelExtension::Position m_pos; KPanelExtension::Alignment m_alignment; }; - typedef QValueVector<PanelStrut> RectList; - static PanelStrut select(const RectList& rects, const QPoint& _offset, const QColor& color); + typedef TQValueVector<PanelStrut> RectList; + static PanelStrut select(const RectList& rects, const TQPoint& _offset, const TQColor& color); protected: - void mouseReleaseEvent(QMouseEvent *); - void mouseMoveEvent(QMouseEvent *); + void mouseReleaseEvent(TQMouseEvent *); + void mouseMoveEvent(TQMouseEvent *); private: - UserRectSel(const RectList& rects, const QPoint& _offset, const QColor& color); + UserRectSel(const RectList& rects, const TQPoint& _offset, const TQColor& color); ~UserRectSel(); void paintCurrent(); const RectList rectangles; PanelStrut current; - QPoint offset; - QWidget *_frame[8]; - QColor _color; + TQPoint offset; + TQWidget *_frame[8]; + TQColor _color; friend class ShutUpCompiler; }; diff --git a/kicker/kicker/kicker-3.4-reverseLayout.cpp b/kicker/kicker/kicker-3.4-reverseLayout.cpp index bfcea5629..97a35aff6 100644 --- a/kicker/kicker/kicker-3.4-reverseLayout.cpp +++ b/kicker/kicker/kicker-3.4-reverseLayout.cpp @@ -1,8 +1,8 @@ -#include <qfile.h> -#include <qmap.h> -#include <qregexp.h> -#include <qstring.h> -#include <qtextstream.h> +#include <tqfile.h> +#include <tqmap.h> +#include <tqregexp.h> +#include <tqstring.h> +#include <tqtextstream.h> #include <kapplication.h> #include <kcmdlineargs.h> @@ -14,10 +14,10 @@ struct AppletInfo { double freeSpace; - QString configFile; - QString desktopFile; + TQString configFile; + TQString desktopFile; }; -typedef QMap<QString, AppletInfo> AppletInfoMap; +typedef TQMap<TQString, AppletInfo> AppletInfoMap; int main(int argc, char** argv) { @@ -25,20 +25,20 @@ int main(int argc, char** argv) KCmdLineArgs::init(argc, argv, "kicker", "", "", "", false); KApplication app(false, false); - QStringList stretchableApplets; + TQStringList stretchableApplets; stretchableApplets << "taskbarapplet.desktop"; - QTextStream in (stdin, IO_ReadOnly); - QTextStream out(stdout, IO_WriteOnly); + TQTextStream in (stdin, IO_ReadOnly); + TQTextStream out(stdout, IO_WriteOnly); - QStringList appletIds; + TQStringList appletIds; AppletInfoMap applets; - QRegExp rxGroup("^\\[(.+)\\]$"); - QRegExp rxKeyValue("([^=]+)=[ \t]*([^\n]+)"); - QString currentGroup; + TQRegExp rxGroup("^\\[(.+)\\]$"); + TQRegExp rxKeyValue("([^=]+)=[ \t]*([^\n]+)"); + TQString currentGroup; - QString line; + TQString line; while (!(line = in.readLine()).isNull()) { if (rxGroup.search(line) != -1) @@ -49,12 +49,12 @@ int main(int argc, char** argv) if (rxKeyValue.search(line) != -1) { - QString key = rxKeyValue.cap(1); - QString value = rxKeyValue.cap(2); + TQString key = rxKeyValue.cap(1); + TQString value = rxKeyValue.cap(2); if (key == "Applets") { - appletIds = QStringList::split(",", value); + appletIds = TQStringList::split(",", value); } else if (key == "FreeSpace") { @@ -71,11 +71,11 @@ int main(int argc, char** argv) } } - if (QApplication::reverseLayout()) + if (TQApplication::reverseLayout()) { // Reverse appletIds - QStringList appletIdsRev; - QStringList::ConstIterator it; + TQStringList appletIdsRev; + TQStringList::ConstIterator it; for (it = appletIds.begin(); it != appletIds.end(); ++it) { appletIdsRev.prepend(*it); @@ -108,7 +108,7 @@ int main(int argc, char** argv) { out << "[General]" << endl; out << "Applets2=" << appletIds.join(",") << endl; - QStringList::ConstIterator it; + TQStringList::ConstIterator it; for (it = appletIds.begin(); it != appletIds.end(); ++it) { out << "[" << *it << "]" << endl; @@ -117,9 +117,9 @@ int main(int argc, char** argv) } // Build a list of childpanel config files. - QStringList childPanelConfigFiles; + TQStringList childPanelConfigFiles; AppletInfoMap::ConstIterator it2; - QStringList::ConstIterator it; + TQStringList::ConstIterator it; for (it2 = applets.begin(); it2 != applets.end(); ++it2) { if (it2.data().desktopFile == "childpanelextension.desktop") @@ -131,8 +131,8 @@ int main(int argc, char** argv) if (!childPanelConfigFiles.isEmpty()) { // Create a temporary kconf_update .upd file for updating the childpanels - KTempFile tempFile(QString::null, ".upd"); - QTextStream* upd = tempFile.textStream(); + KTempFile tempFile(TQString::null, ".upd"); + TQTextStream* upd = tempFile.textStream(); for (it = childPanelConfigFiles.begin(); it != childPanelConfigFiles.end(); ++it) { *upd << "Id=kde_3.4_reverseLayout" << endl; diff --git a/kicker/kicker/ui/addapplet.cpp b/kicker/kicker/ui/addapplet.cpp index e7ac47c9c..796920ed4 100644 --- a/kicker/kicker/ui/addapplet.cpp +++ b/kicker/kicker/ui/addapplet.cpp @@ -22,17 +22,17 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ******************************************************************/ -#include <qapplication.h> -#include <qcombobox.h> -#include <qdir.h> -#include <qframe.h> -#include <qlabel.h> -#include <qlayout.h> -#include <qlineedit.h> -#include <qpalette.h> -#include <qscrollview.h> -#include <qtimer.h> -#include <qsizepolicy.h> +#include <tqapplication.h> +#include <tqcombobox.h> +#include <tqdir.h> +#include <tqframe.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqlineedit.h> +#include <tqpalette.h> +#include <tqscrollview.h> +#include <tqtimer.h> +#include <tqsizepolicy.h> #include <kiconloader.h> #include <kdebug.h> @@ -55,13 +55,13 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "menuinfo.h" #include "pluginmanager.h" -AppletWidget::AppletWidget(const AppletInfo& info, bool odd, QWidget *parent) +AppletWidget::AppletWidget(const AppletInfo& info, bool odd, TQWidget *parent) : AppletItem(parent), m_appletInfo(info), m_odd(odd), m_selected(false) { - setFocusPolicy(QWidget::StrongFocus); + setFocusPolicy(TQWidget::StrongFocus); setSelected(m_selected); itemTitle->setText("<h3>" + info.name() + "</h3>"); @@ -75,16 +75,16 @@ AppletWidget::AppletWidget(const AppletInfo& info, bool odd, QWidget *parent) itemDescription->installEventFilter(this); KIconLoader * ldr = KGlobal::iconLoader(); - QPixmap icon = ldr->loadIcon(info.icon(), KIcon::Panel, KIcon::SizeLarge); + TQPixmap icon = ldr->loadIcon(info.icon(), KIcon::Panel, KIcon::SizeLarge); itemPixmap->setPixmap(icon); itemPixmap->installEventFilter(this); } -bool AppletWidget::eventFilter(QObject*, QEvent* e) +bool AppletWidget::eventFilter(TQObject*, TQEvent* e) { - if (e->type() == QEvent::MouseButtonPress) + if (e->type() == TQEvent::MouseButtonPress) { - QMouseEvent* me = static_cast<QMouseEvent*>(e); + TQMouseEvent* me = static_cast<TQMouseEvent*>(e); if (me->button() & LeftButton) { m_dragStart = me->pos(); @@ -95,9 +95,9 @@ bool AppletWidget::eventFilter(QObject*, QEvent* e) return false; } - if (e->type() == QEvent::MouseMove) + if (e->type() == TQEvent::MouseMove) { - QMouseEvent* me = static_cast<QMouseEvent*>(e); + TQMouseEvent* me = static_cast<TQMouseEvent*>(e); if ((me->pos() - m_dragStart).manhattanLength() > KGlobalSettings::dndEventDelay()) { @@ -113,15 +113,15 @@ bool AppletWidget::eventFilter(QObject*, QEvent* e) return true; } } - else if (e->type() == QEvent::MouseButtonRelease) + else if (e->type() == TQEvent::MouseButtonRelease) { - m_dragStart = QPoint(); + m_dragStart = TQPoint(); } return false; } -void AppletWidget::keyPressEvent(QKeyEvent *e) +void AppletWidget::keyPressEvent(TQKeyEvent *e) { if (e->key() == Qt::Key_Enter || e->key() == Qt::Key_Return) @@ -130,17 +130,17 @@ void AppletWidget::keyPressEvent(QKeyEvent *e) } else if (e->key() == Qt::Key_Up) { - QKeyEvent fakedKeyPress(QEvent::KeyPress, Qt::Key_BackTab, 0, 0); - QKeyEvent fakedKeyRelease(QEvent::KeyRelease, Key_BackTab, 0, 0); - QApplication::sendEvent(this, &fakedKeyPress); - QApplication::sendEvent(this, &fakedKeyRelease); + TQKeyEvent fakedKeyPress(TQEvent::KeyPress, Qt::Key_BackTab, 0, 0); + TQKeyEvent fakedKeyRelease(TQEvent::KeyRelease, Key_BackTab, 0, 0); + TQApplication::sendEvent(this, &fakedKeyPress); + TQApplication::sendEvent(this, &fakedKeyRelease); } else if (e->key() == Qt::Key_Down) { - QKeyEvent fakedKeyPress(QEvent::KeyPress, Qt::Key_Tab, 0, 0); - QKeyEvent fakedKeyRelease(QEvent::KeyRelease, Key_Escape, 0, 0); - QApplication::sendEvent(this, &fakedKeyPress); - QApplication::sendEvent(this, &fakedKeyRelease); + TQKeyEvent fakedKeyPress(TQEvent::KeyPress, Qt::Key_Tab, 0, 0); + TQKeyEvent fakedKeyRelease(TQEvent::KeyRelease, Key_Escape, 0, 0); + TQApplication::sendEvent(this, &fakedKeyPress); + TQApplication::sendEvent(this, &fakedKeyRelease); } else { @@ -148,21 +148,21 @@ void AppletWidget::keyPressEvent(QKeyEvent *e) } } -void AppletWidget::mousePressEvent(QMouseEvent *e) +void AppletWidget::mousePressEvent(TQMouseEvent *e) { - if (e->button() == QMouseEvent::LeftButton) + if (e->button() == TQMouseEvent::LeftButton) { emit clicked(this); m_dragStart = e->pos(); } setFocus(); - QWidget::mousePressEvent(e); + TQWidget::mousePressEvent(e); } -void AppletWidget::mouseMoveEvent(QMouseEvent *e) +void AppletWidget::mouseMoveEvent(TQMouseEvent *e) { - if (e->button() == QMouseEvent::LeftButton && + if (e->button() == TQMouseEvent::LeftButton && !m_dragStart.isNull() && (e->pos() - m_dragStart).manhattanLength() > KGlobalSettings::dndEventDelay()) @@ -178,15 +178,15 @@ void AppletWidget::mouseMoveEvent(QMouseEvent *e) } } -void AppletWidget::mouseReleaseEvent(QMouseEvent *e) +void AppletWidget::mouseReleaseEvent(TQMouseEvent *e) { - m_dragStart = QPoint(); - QWidget::mouseReleaseEvent(e); + m_dragStart = TQPoint(); + TQWidget::mouseReleaseEvent(e); } -void AppletWidget::mouseDoubleClickEvent(QMouseEvent *e) +void AppletWidget::mouseDoubleClickEvent(TQMouseEvent *e) { - if (!e->button() == QMouseEvent::LeftButton) + if (!e->button() == TQMouseEvent::LeftButton) { AppletItem::mouseDoubleClickEvent(e); return; @@ -223,24 +223,24 @@ void AppletWidget::setOdd(bool odd) setSelected(m_selected); } -void AppletWidget::focusInEvent(QFocusEvent*) +void AppletWidget::focusInEvent(TQFocusEvent*) { emit clicked(this); } AddAppletDialog::AddAppletDialog(ContainerArea* cArea, - QWidget* parent, + TQWidget* parent, const char* name) : KDialogBase(parent, name, false, i18n("Add Applet"), 0), m_selectedApplet(0), m_containerArea(cArea), m_insertionPoint(Kicker::the()->insertionPoint()), m_closing(false), - m_searchDelay(new QTimer(this)) + m_searchDelay(new TQTimer(this)) { m_mainWidget = new AppletView(this, "AddAppletDialog::m_mainWidget"); - m_mainWidget->appletScrollView->setResizePolicy(QScrollView::Manual); - m_mainWidget->appletScrollView->setHScrollBarMode(QScrollView::AlwaysOff); + m_mainWidget->appletScrollView->setResizePolicy(TQScrollView::Manual); + m_mainWidget->appletScrollView->setHScrollBarMode(TQScrollView::AlwaysOff); m_mainWidget->appletScrollView->viewport()->setPaletteBackgroundColor(KGlobalSettings::baseColor()); setMainWidget(m_mainWidget); @@ -254,16 +254,16 @@ AddAppletDialog::AddAppletDialog(ContainerArea* cArea, m_mainWidget->appletInstall->setGuiItem(addGuiItem); m_mainWidget->closeButton->setGuiItem(KStdGuiItem::close()); - connect(m_mainWidget->appletSearch, SIGNAL(textChanged(const QString&)), this, SLOT(delayedSearch())); - connect(m_searchDelay, SIGNAL(timeout()), this, SLOT(search())); - connect(m_mainWidget->appletFilter, SIGNAL(activated(int)), this, SLOT(filter(int))); - connect(m_mainWidget->appletInstall, SIGNAL(clicked()), this, SLOT(addCurrentApplet())); - connect(m_mainWidget->closeButton, SIGNAL(clicked()), this, SLOT(close())); + connect(m_mainWidget->appletSearch, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(delayedSearch())); + connect(m_searchDelay, TQT_SIGNAL(timeout()), this, TQT_SLOT(search())); + connect(m_mainWidget->appletFilter, TQT_SIGNAL(activated(int)), this, TQT_SLOT(filter(int))); + connect(m_mainWidget->appletInstall, TQT_SIGNAL(clicked()), this, TQT_SLOT(addCurrentApplet())); + connect(m_mainWidget->closeButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(close())); m_selectedType = AppletInfo::Undefined; m_appletBox = 0; - QTimer::singleShot(0, this, SLOT(populateApplets())); + TQTimer::singleShot(0, this, TQT_SLOT(populateApplets())); } void AddAppletDialog::updateInsertionPoint() @@ -272,7 +272,7 @@ void AddAppletDialog::updateInsertionPoint() } -void AddAppletDialog::closeEvent(QCloseEvent* e) +void AddAppletDialog::closeEvent(TQCloseEvent* e) { m_closing = true; saveDialogSize("AddAppletDialog Settings"); @@ -282,7 +282,7 @@ void AddAppletDialog::closeEvent(QCloseEvent* e) void AddAppletDialog::resizeAppletView() { int w, h; - QScrollView *v = m_mainWidget->appletScrollView; + TQScrollView *v = m_mainWidget->appletScrollView; if (m_closing) return; @@ -300,21 +300,21 @@ void AddAppletDialog::resizeAppletView() } } -bool AddAppletDialog::eventFilter(QObject *o, QEvent *e) +bool AddAppletDialog::eventFilter(TQObject *o, TQEvent *e) { - if (e->type() == QEvent::Resize) - QTimer::singleShot(0, this, SLOT(resizeAppletView())); + if (e->type() == TQEvent::Resize) + TQTimer::singleShot(0, this, TQT_SLOT(resizeAppletView())); - return QObject::eventFilter(o, e); + return TQObject::eventFilter(o, e); } void AddAppletDialog::populateApplets() { - m_appletBox = new QWidget(m_mainWidget->appletScrollView->viewport()); + m_appletBox = new TQWidget(m_mainWidget->appletScrollView->viewport()); m_appletBox->setPaletteBackgroundColor(KGlobalSettings::baseColor()); m_mainWidget->appletScrollView->addChild(m_appletBox, 0, 0); m_appletBox->show(); - QVBoxLayout* layout = new QVBoxLayout(m_appletBox); + TQVBoxLayout* layout = new TQVBoxLayout(m_appletBox); layout->setMargin(0); m_mainWidget->appletScrollView->installEventFilter(this); @@ -339,7 +339,7 @@ void AddAppletDialog::populateApplets() int i = 0; bool odd = true; - QWidget* prevTabWidget = m_mainWidget->appletFilter; + TQWidget* prevTabWidget = m_mainWidget->appletFilter; for (AppletInfo::List::iterator it = appletInfoList.begin(); !m_closing && it != appletInfoList.end(); @@ -372,10 +372,10 @@ void AddAppletDialog::populateApplets() setTabOrder(prevTabWidget, itemWidget); prevTabWidget = itemWidget; - connect(itemWidget, SIGNAL(clicked(AppletWidget*)), - this, SLOT(selectApplet(AppletWidget*))); - connect(itemWidget, SIGNAL(doubleClicked(AppletWidget*)), - this, SLOT(addApplet(AppletWidget*))); + connect(itemWidget, TQT_SIGNAL(clicked(AppletWidget*)), + this, TQT_SLOT(selectApplet(AppletWidget*))); + connect(itemWidget, TQT_SIGNAL(doubleClicked(AppletWidget*)), + this, TQT_SLOT(addApplet(AppletWidget*))); if (m_closing) { @@ -419,10 +419,10 @@ void AddAppletDialog::addApplet(AppletWidget* applet) return; } - QPoint prevInsertionPoint = Kicker::the()->insertionPoint(); + TQPoint prevInsertionPoint = Kicker::the()->insertionPoint(); Kicker::the()->setInsertionPoint(m_insertionPoint); - const QWidget* appletContainer = 0; + const TQWidget* appletContainer = 0; if (applet->info().type() == AppletInfo::Applet) { @@ -473,7 +473,7 @@ void AddAppletDialog::addApplet(AppletWidget* applet) } bool AddAppletDialog::appletMatchesSearch(const AppletWidget* w, - const QString& s) + const TQString& s) { if (w->info().type() == AppletInfo::Applet && w->info().isUniqueApplet() && @@ -498,7 +498,7 @@ void AddAppletDialog::delayedSearch() void AddAppletDialog::search() { - QString s = m_mainWidget->appletSearch->text(); + TQString s = m_mainWidget->appletSearch->text(); bool odd = true; AppletWidget::List::const_iterator it = m_appletWidgetList.constBegin(); AppletWidget::List::const_iterator itEnd = m_appletWidgetList.constEnd(); @@ -518,7 +518,7 @@ void AddAppletDialog::search() } } - QTimer::singleShot(0, this, SLOT(resizeAppletView())); + TQTimer::singleShot(0, this, TQT_SLOT(resizeAppletView())); } void AddAppletDialog::filter(int i) diff --git a/kicker/kicker/ui/addapplet.h b/kicker/kicker/ui/addapplet.h index d2ce50a00..d359d97c3 100644 --- a/kicker/kicker/ui/addapplet.h +++ b/kicker/kicker/ui/addapplet.h @@ -25,9 +25,9 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #ifndef __addapplet_h__ #define __addapplet_h__ -#include <qstringlist.h> -#include <qpixmap.h> -#include <qvaluelist.h> +#include <tqstringlist.h> +#include <tqpixmap.h> +#include <tqvaluelist.h> #include <klocale.h> #include <kdialogbase.h> @@ -44,12 +44,12 @@ class AddAppletDialog : public KDialogBase Q_OBJECT public: - AddAppletDialog(ContainerArea* cArea, QWidget* parent, const char* name); + AddAppletDialog(ContainerArea* cArea, TQWidget* parent, const char* name); void updateInsertionPoint(); protected: - void closeEvent(QCloseEvent*); - bool eventFilter(QObject *o, QEvent *e); + void closeEvent(TQCloseEvent*); + bool eventFilter(TQObject *o, TQEvent *e); private slots: void populateApplets(); @@ -62,21 +62,21 @@ class AddAppletDialog : public KDialogBase void resizeAppletView(); private: - bool appletMatchesSearch(const AppletWidget* w, const QString& s); + bool appletMatchesSearch(const AppletWidget* w, const TQString& s); AppletView *m_mainWidget; - QWidget *m_appletBox; + TQWidget *m_appletBox; AppletInfo::List m_applets; - QValueList<AppletWidget*> m_appletWidgetList; + TQValueList<AppletWidget*> m_appletWidgetList; AppletWidget* m_selectedApplet; ContainerArea* m_containerArea; AppletInfo::AppletType m_selectedType; - QPoint m_insertionPoint; + TQPoint m_insertionPoint; bool m_closing; - QTimer *m_searchDelay; + TQTimer *m_searchDelay; }; #endif diff --git a/kicker/kicker/ui/addapplet_mnu.cpp b/kicker/kicker/ui/addapplet_mnu.cpp index 3c3a3db87..6d5c4482f 100644 --- a/kicker/kicker/ui/addapplet_mnu.cpp +++ b/kicker/kicker/ui/addapplet_mnu.cpp @@ -29,12 +29,12 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "addapplet_mnu.h" #include "addapplet_mnu.moc" -PanelAddAppletMenu::PanelAddAppletMenu(ContainerArea* cArea, QWidget *parent, const char *name) - : QPopupMenu(parent, name), containerArea(cArea) +PanelAddAppletMenu::PanelAddAppletMenu(ContainerArea* cArea, TQWidget *parent, const char *name) + : TQPopupMenu(parent, name), containerArea(cArea) { setCheckable(true); - connect(this, SIGNAL(activated(int)), SLOT(slotExec(int))); - connect(this, SIGNAL(aboutToShow()), SLOT(slotAboutToShow())); + connect(this, TQT_SIGNAL(activated(int)), TQT_SLOT(slotExec(int))); + connect(this, TQT_SIGNAL(aboutToShow()), TQT_SLOT(slotAboutToShow())); } void PanelAddAppletMenu::slotAboutToShow() diff --git a/kicker/kicker/ui/addapplet_mnu.h b/kicker/kicker/ui/addapplet_mnu.h index 260de26dd..caedb4fdb 100644 --- a/kicker/kicker/ui/addapplet_mnu.h +++ b/kicker/kicker/ui/addapplet_mnu.h @@ -24,8 +24,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #ifndef __addapplet_mnu_h__ #define __addapplet_mnu_h__ -#include <qvaluelist.h> -#include <qpopupmenu.h> +#include <tqvaluelist.h> +#include <tqpopupmenu.h> #include "appletinfo.h" @@ -36,7 +36,7 @@ class PanelAddAppletMenu : public QPopupMenu Q_OBJECT public: - PanelAddAppletMenu(ContainerArea *cArea, QWidget *parent=0, const char *name=0); + PanelAddAppletMenu(ContainerArea *cArea, TQWidget *parent=0, const char *name=0); protected slots: virtual void slotExec(int id); diff --git a/kicker/kicker/ui/addappletvisualfeedback.cpp b/kicker/kicker/ui/addappletvisualfeedback.cpp index ce6e618a7..38b48fe8e 100644 --- a/kicker/kicker/ui/addappletvisualfeedback.cpp +++ b/kicker/kicker/ui/addappletvisualfeedback.cpp @@ -23,11 +23,11 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ******************************************************************/ -#include <qapplication.h> -#include <qlabel.h> -#include <qpainter.h> -#include <qsimplerichtext.h> -#include <qtimer.h> +#include <tqapplication.h> +#include <tqlabel.h> +#include <tqpainter.h> +#include <tqsimplerichtext.h> +#include <tqtimer.h> #include <kdialog.h> #include <klocale.h> @@ -42,9 +42,9 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #define DEFAULT_FRAMES_PER_SECOND 30 AddAppletVisualFeedback::AddAppletVisualFeedback(AppletWidget* widget, - const QWidget* target, + const TQWidget* target, KPanelApplet::Direction direction) - : QWidget(0, "animtt", WX11BypassWM), + : TQWidget(0, "animtt", WX11BypassWM), m_target(target), m_direction(direction), m_icon(*widget->itemPixmap->pixmap()), @@ -55,22 +55,22 @@ AddAppletVisualFeedback::AddAppletVisualFeedback(AppletWidget* widget, { setFocusPolicy(NoFocus); setBackgroundMode(NoBackground); - connect(&m_moveTimer, SIGNAL(timeout()), SLOT(swoopCloser())); + connect(&m_moveTimer, TQT_SIGNAL(timeout()), TQT_SLOT(swoopCloser())); - QString m = "<qt><h3>" + i18n("%1 Added").arg(widget->info().name()); + TQString m = "<qt><h3>" + i18n("%1 Added").arg(widget->info().name()); if (widget->info().name() != widget->info().comment()) { m += "</h3><p>" + widget->info().comment() + "</p></qt>"; } - m_richText = new QSimpleRichText(m, font()); + m_richText = new TQSimpleRichText(m, font()); m_richText->setWidth(400); displayInternal(); m_destination = KickerLib::popupPosition(m_direction, this, m_target); - QPoint startAt = widget->itemPixmap->geometry().topLeft(); + TQPoint startAt = widget->itemPixmap->geometry().topLeft(); startAt = widget->itemPixmap->mapToGlobal(startAt); move(startAt); @@ -85,7 +85,7 @@ AddAppletVisualFeedback::~AddAppletVisualFeedback() delete m_richText; } -void AddAppletVisualFeedback::paintEvent(QPaintEvent * e) +void AddAppletVisualFeedback::paintEvent(TQPaintEvent * e) { if (m_dirty) { @@ -93,11 +93,11 @@ void AddAppletVisualFeedback::paintEvent(QPaintEvent * e) m_dirty = false; } - QPainter p(this); + TQPainter p(this); p.drawPixmap(e->rect().topLeft(), m_pixmap, e->rect()); } -void AddAppletVisualFeedback::mousePressEvent(QMouseEvent *) +void AddAppletVisualFeedback::mousePressEvent(TQMouseEvent *) { m_moveTimer.stop(); hide(); @@ -106,7 +106,7 @@ void AddAppletVisualFeedback::mousePressEvent(QMouseEvent *) void AddAppletVisualFeedback::makeMask() { - QPainter maskPainter(&m_mask); + TQPainter maskPainter(&m_mask); m_mask.fill(Qt::black); @@ -120,7 +120,7 @@ void AddAppletVisualFeedback::makeMask() void AddAppletVisualFeedback::displayInternal() { // determine text rectangle - QRect textRect(0, 0, 0, 0); + TQRect textRect(0, 0, 0, 0); if (m_frames < 1) { @@ -154,7 +154,7 @@ void AddAppletVisualFeedback::displayInternal() makeMask(); // draw background - QPainter bufferPainter(&m_pixmap); + TQPainter bufferPainter(&m_pixmap); bufferPainter.setPen(Qt::black); bufferPainter.setBrush(colorGroup().background()); bufferPainter.drawRoundRect(0, 0, width, height, @@ -174,11 +174,11 @@ void AddAppletVisualFeedback::displayInternal() int textY = (height - textRect.height()) / 2; // draw text shadow - QColorGroup cg = colorGroup(); - cg.setColor(QColorGroup::Text, cg.background().dark(115)); - int shadowOffset = QApplication::reverseLayout() ? -1 : 1; + TQColorGroup cg = colorGroup(); + cg.setColor(TQColorGroup::Text, cg.background().dark(115)); + int shadowOffset = TQApplication::reverseLayout() ? -1 : 1; m_richText->draw(&bufferPainter, 5 + textX + shadowOffset, - textY + 1, QRect(), cg); + textY + 1, TQRect(), cg); // draw text cg = colorGroup(); @@ -193,7 +193,7 @@ void AddAppletVisualFeedback::swoopCloser() return; } - QPoint loc = geometry().topLeft(); + TQPoint loc = geometry().topLeft(); bool isLeft = m_destination.x() > loc.x(); if (loc.x() != m_destination.x()) { @@ -217,7 +217,7 @@ void AddAppletVisualFeedback::swoopCloser() { m_moveTimer.stop(); displayInternal(); - QTimer::singleShot(2000, this, SLOT(deleteLater())); + TQTimer::singleShot(2000, this, TQT_SLOT(deleteLater())); } } diff --git a/kicker/kicker/ui/addappletvisualfeedback.h b/kicker/kicker/ui/addappletvisualfeedback.h index 084154704..98d2cb0fe 100644 --- a/kicker/kicker/ui/addappletvisualfeedback.h +++ b/kicker/kicker/ui/addappletvisualfeedback.h @@ -26,10 +26,10 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #ifndef ADDAPPLETVISUALFEEDBACK_H #define ADDAPPLETVISUALFEEDBACK_H -#include <qbitmap.h> -#include <qpixmap.h> -#include <qtimer.h> -#include <qwidget.h> +#include <tqbitmap.h> +#include <tqpixmap.h> +#include <tqtimer.h> +#include <tqwidget.h> #include <kpanelapplet.h> @@ -44,7 +44,7 @@ class AddAppletVisualFeedback : QWidget public: AddAppletVisualFeedback(AppletWidget* parent, - const QWidget* destination, + const TQWidget* destination, KPanelApplet::Direction direction); ~AddAppletVisualFeedback(); @@ -53,28 +53,28 @@ class AddAppletVisualFeedback : QWidget void swoopCloser(); protected: - void paintEvent(QPaintEvent * e); - void mousePressEvent(QMouseEvent * e); + void paintEvent(TQPaintEvent * e); + void mousePressEvent(TQMouseEvent * e); void makeMask(); void displayInternal(); private: - const QWidget* m_target; + const TQWidget* m_target; KPanelApplet::Direction m_direction; - QBitmap m_mask; - QPixmap m_pixmap; - QPixmap m_icon; - QSimpleRichText* m_richText; + TQBitmap m_mask; + TQPixmap m_pixmap; + TQPixmap m_icon; + TQSimpleRichText* m_richText; int m_dissolveSize; int m_dissolveDelta; int m_frames; - QTimer m_moveTimer; + TQTimer m_moveTimer; bool m_dirty; - QPoint m_destination; + TQPoint m_destination; }; #endif diff --git a/kicker/kicker/ui/addbutton_mnu.cpp b/kicker/kicker/ui/addbutton_mnu.cpp index 65a60eea4..02c4718d4 100644 --- a/kicker/kicker/ui/addbutton_mnu.cpp +++ b/kicker/kicker/ui/addbutton_mnu.cpp @@ -21,7 +21,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ******************************************************************/ -#include <qdragobject.h> +#include <tqdragobject.h> #include <ksycocaentry.h> #include <kservice.h> @@ -33,14 +33,14 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "addbutton_mnu.moc" #include "containerarea.h" -PanelAddButtonMenu::PanelAddButtonMenu(ContainerArea* cArea, const QString & label, - const QString & relPath, QWidget * parent, const char * name, const QString& _inlineHeader) +PanelAddButtonMenu::PanelAddButtonMenu(ContainerArea* cArea, const TQString & label, + const TQString & relPath, TQWidget * parent, const char * name, const TQString& _inlineHeader) : PanelServiceMenu(label, relPath, parent, name, true, _inlineHeader), containerArea(cArea) { } -PanelAddButtonMenu::PanelAddButtonMenu(ContainerArea* cArea, QWidget * parent, const char * name, const QString& _inlineHeader) - : PanelServiceMenu(QString::null, QString::null, parent, name, true, _inlineHeader), containerArea(cArea) +PanelAddButtonMenu::PanelAddButtonMenu(ContainerArea* cArea, TQWidget * parent, const char * name, const TQString& _inlineHeader) + : PanelServiceMenu(TQString::null, TQString::null, parent, name, true, _inlineHeader), containerArea(cArea) { } @@ -60,8 +60,8 @@ void PanelAddButtonMenu::slotExec(int id) } } -PanelServiceMenu * PanelAddButtonMenu::newSubMenu(const QString & label, const QString & relPath, - QWidget * parent, const char * name, const QString& _inlineHeader) +PanelServiceMenu * PanelAddButtonMenu::newSubMenu(const TQString & label, const TQString & relPath, + TQWidget * parent, const char * name, const TQString& _inlineHeader) { return new PanelAddButtonMenu(containerArea, label, relPath, parent, name, _inlineHeader); } diff --git a/kicker/kicker/ui/addbutton_mnu.h b/kicker/kicker/ui/addbutton_mnu.h index 8a9a7e348..209e7e9a3 100644 --- a/kicker/kicker/ui/addbutton_mnu.h +++ b/kicker/kicker/ui/addbutton_mnu.h @@ -33,17 +33,17 @@ class PanelAddButtonMenu : public PanelServiceMenu Q_OBJECT public: - PanelAddButtonMenu(ContainerArea* cArea, const QString & label, const QString & relPath, - QWidget * parent = 0, const char * name = 0,const QString& _inlineHeader= QString::null); - PanelAddButtonMenu(ContainerArea* cArea, QWidget * parent = 0, const char * name = 0, const QString& _inlineHeader= QString::null); + PanelAddButtonMenu(ContainerArea* cArea, const TQString & label, const TQString & relPath, + TQWidget * parent = 0, const char * name = 0,const TQString& _inlineHeader= TQString::null); + PanelAddButtonMenu(ContainerArea* cArea, TQWidget * parent = 0, const char * name = 0, const TQString& _inlineHeader= TQString::null); protected slots: virtual void slotExec(int id); virtual void addNonKDEApp(); protected: - virtual PanelServiceMenu * newSubMenu(const QString & label, const QString & relPath, - QWidget * parent, const char * name, const QString & _inlineHeader=QString::null); + virtual PanelServiceMenu * newSubMenu(const TQString & label, const TQString & relPath, + TQWidget * parent, const char * name, const TQString & _inlineHeader=TQString::null); private: ContainerArea *containerArea; }; diff --git a/kicker/kicker/ui/addextension_mnu.cpp b/kicker/kicker/ui/addextension_mnu.cpp index 4ca467f46..b22187443 100644 --- a/kicker/kicker/ui/addextension_mnu.cpp +++ b/kicker/kicker/ui/addextension_mnu.cpp @@ -27,12 +27,12 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "addextension_mnu.h" #include "addextension_mnu.moc" -PanelAddExtensionMenu::PanelAddExtensionMenu(QWidget *parent, const char *name) - : QPopupMenu(parent, name) +PanelAddExtensionMenu::PanelAddExtensionMenu(TQWidget *parent, const char *name) + : TQPopupMenu(parent, name) { setCheckable(true); - connect(this, SIGNAL(activated(int)), SLOT(slotExec(int))); - connect(this, SIGNAL(aboutToShow()), SLOT(slotAboutToShow())); + connect(this, TQT_SIGNAL(activated(int)), TQT_SLOT(slotExec(int))); + connect(this, TQT_SIGNAL(aboutToShow()), TQT_SLOT(slotAboutToShow())); } void PanelAddExtensionMenu::slotAboutToShow() diff --git a/kicker/kicker/ui/addextension_mnu.h b/kicker/kicker/ui/addextension_mnu.h index 60db0c201..a91986e19 100644 --- a/kicker/kicker/ui/addextension_mnu.h +++ b/kicker/kicker/ui/addextension_mnu.h @@ -24,8 +24,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #ifndef __addextension_mnu_h__ #define __addextension_mnu_h__ -#include <qvaluelist.h> -#include <qpopupmenu.h> +#include <tqvaluelist.h> +#include <tqpopupmenu.h> #include "appletinfo.h" @@ -34,7 +34,7 @@ class PanelAddExtensionMenu : public QPopupMenu Q_OBJECT public: - PanelAddExtensionMenu(QWidget *parent=0, const char *name=0); + PanelAddExtensionMenu(TQWidget *parent=0, const char *name=0); protected slots: virtual void slotExec(int id); diff --git a/kicker/kicker/ui/appletop_mnu.cpp b/kicker/kicker/ui/appletop_mnu.cpp index 435911bbe..59ca9c89e 100644 --- a/kicker/kicker/ui/appletop_mnu.cpp +++ b/kicker/kicker/ui/appletop_mnu.cpp @@ -31,15 +31,15 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "container_button.h" #include "containerarea.h" -PanelAppletOpMenu::PanelAppletOpMenu(int actions, QPopupMenu *opMenu, const QPopupMenu* appletsMenu, - const QString & title, const QString &icon, - QWidget *parent, const char *name) - : QPopupMenu(parent, name) +PanelAppletOpMenu::PanelAppletOpMenu(int actions, TQPopupMenu *opMenu, const TQPopupMenu* appletsMenu, + const TQString & title, const TQString &icon, + TQWidget *parent, const char *name) + : TQPopupMenu(parent, name) { bool needSeparator = false; bool isButton = (parent && parent->inherits("ButtonContainer")); bool isMenu = false; - QString titleText = title; + TQString titleText = title; titleText = titleText.replace('&', "&&"); if (isButton) { @@ -48,7 +48,7 @@ PanelAppletOpMenu::PanelAppletOpMenu(int actions, QPopupMenu *opMenu, const QPop if (!Kicker::the()->isImmutable()) { - QString text = isButton ? (isMenu ? i18n("&Move %1 Menu") : + TQString text = isButton ? (isMenu ? i18n("&Move %1 Menu") : i18n("&Move %1 Button")) : i18n("&Move %1"); insertItem(SmallIcon("move"), text.arg(titleText), Move); @@ -57,7 +57,7 @@ PanelAppletOpMenu::PanelAppletOpMenu(int actions, QPopupMenu *opMenu, const QPop // this is part of the kiosk support in kicker, allowing // one to block users from adding new containers ContainerArea* area = 0; - QObject* findTheArea = parent ? parent->parent() : 0; + TQObject* findTheArea = parent ? parent->parent() : 0; while (findTheArea) { area = dynamic_cast<ContainerArea*>(findTheArea); @@ -98,7 +98,7 @@ PanelAppletOpMenu::PanelAppletOpMenu(int actions, QPopupMenu *opMenu, const QPop insertSeparator(); } - QPixmap iconPix(kapp->iconLoader()->loadIcon(icon, + TQPixmap iconPix(kapp->iconLoader()->loadIcon(icon, KIcon::Small, 0, KIcon::DefaultState, 0, true)); @@ -140,22 +140,22 @@ PanelAppletOpMenu::PanelAppletOpMenu(int actions, QPopupMenu *opMenu, const QPop needSeparator = false; } - QString text = title.isEmpty() ? i18n("Applet Menu") : + TQString text = title.isEmpty() ? i18n("Applet Menu") : i18n("%1 Menu").arg(titleText); // the 2 const_cast's below prevents const_cast'ing in multiple places // elsewhere in the kicker code base. it's ugly, but unavoidable - // unless either QPopupMenu one day allows inserting const + // unless either TQPopupMenu one day allows inserting const // QPopupMenu's or we uglify other bits of kicker's API, // notably KPanelApplet::customMeu() if (icon.isEmpty()) { - insertItem(text, const_cast<QPopupMenu*>(appletsMenu)); + insertItem(text, const_cast<TQPopupMenu*>(appletsMenu)); } else { insertItem(SmallIcon(icon), text, - const_cast<QPopupMenu*>(appletsMenu)); + const_cast<TQPopupMenu*>(appletsMenu)); } } @@ -195,14 +195,14 @@ PanelAppletOpMenu::PanelAppletOpMenu(int actions, QPopupMenu *opMenu, const QPop adjustSize(); } -void PanelAppletOpMenu::keyPressEvent(QKeyEvent* e) +void PanelAppletOpMenu::keyPressEvent(TQKeyEvent* e) { if (e->key() == Qt::Key_Escape) { emit escapePressed(); } - QPopupMenu::keyPressEvent(e); + TQPopupMenu::keyPressEvent(e); } #include "appletop_mnu.moc" diff --git a/kicker/kicker/ui/appletop_mnu.h b/kicker/kicker/ui/appletop_mnu.h index 25f03ada6..e0b219552 100644 --- a/kicker/kicker/ui/appletop_mnu.h +++ b/kicker/kicker/ui/appletop_mnu.h @@ -24,7 +24,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #ifndef PANEL_APPLET_OP_MENU_H #define PANEL_APPLET_OP_MENU_H -#include <qpopupmenu.h> +#include <tqpopupmenu.h> class AppletInfo; @@ -40,15 +40,15 @@ public: // they also are treated just like KPanelApplet::Preferences on selection // KDE4: look at merging them there? perhaps under a generic "Editor" option? enum { KMenuEditor = 1048576, BookmarkEditor = 2097152 }; - PanelAppletOpMenu(int actions, QPopupMenu *opMenu, const QPopupMenu* appletsMenu = 0, - const QString &title = 0, const QString &icon = 0, - QWidget *parent=0, const char *name=0); + PanelAppletOpMenu(int actions, TQPopupMenu *opMenu, const TQPopupMenu* appletsMenu = 0, + const TQString &title = 0, const TQString &icon = 0, + TQWidget *parent=0, const char *name=0); signals: void escapePressed(); protected: - void keyPressEvent(QKeyEvent* e); + void keyPressEvent(TQKeyEvent* e); }; diff --git a/kicker/kicker/ui/appletwidget.h b/kicker/kicker/ui/appletwidget.h index 77d05c2b3..6323f538e 100644 --- a/kicker/kicker/ui/appletwidget.h +++ b/kicker/kicker/ui/appletwidget.h @@ -25,8 +25,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #ifndef _appletwidget_h_ #define _appletwidget_h_ -#include <qpoint.h> -#include <qvaluelist.h> +#include <tqpoint.h> +#include <tqvaluelist.h> #include <klocale.h> #include <kdialogbase.h> @@ -39,11 +39,11 @@ class AppletWidget: public AppletItem Q_OBJECT public: - typedef QValueList<AppletWidget*> List; + typedef TQValueList<AppletWidget*> List; - AppletWidget(const AppletInfo& info, bool odd, QWidget *parent); + AppletWidget(const AppletInfo& info, bool odd, TQWidget *parent); const AppletInfo& info() const { return m_appletInfo; } - virtual bool eventFilter(QObject* watched, QEvent* e); + virtual bool eventFilter(TQObject* watched, TQEvent* e); void setSelected(bool selected); void setOdd(bool odd); @@ -54,18 +54,18 @@ class AppletWidget: public AppletItem void doubleClicked(AppletWidget*); protected: - void keyPressEvent(QKeyEvent *e); - void mousePressEvent(QMouseEvent *e); - void mouseMoveEvent(QMouseEvent *e); - void mouseReleaseEvent(QMouseEvent *e); - void mouseDoubleClickEvent(QMouseEvent *e); - void focusInEvent(QFocusEvent* e); + void keyPressEvent(TQKeyEvent *e); + void mousePressEvent(TQMouseEvent *e); + void mouseMoveEvent(TQMouseEvent *e); + void mouseReleaseEvent(TQMouseEvent *e); + void mouseDoubleClickEvent(TQMouseEvent *e); + void focusInEvent(TQFocusEvent* e); private: AppletInfo m_appletInfo; bool m_odd; bool m_selected; - QPoint m_dragStart; + TQPoint m_dragStart; }; #endif diff --git a/kicker/kicker/ui/browser_dlg.cpp b/kicker/kicker/ui/browser_dlg.cpp index 1fd5d47f6..01e72d9ee 100644 --- a/kicker/kicker/ui/browser_dlg.cpp +++ b/kicker/kicker/ui/browser_dlg.cpp @@ -21,9 +21,9 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ******************************************************************/ -#include <qlabel.h> -#include <qlayout.h> -#include <qvbox.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqvbox.h> #include <kglobal.h> #include <klocale.h> @@ -35,32 +35,32 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "browser_dlg.h" #include "browser_dlg.moc" -PanelBrowserDialog::PanelBrowserDialog( const QString& path, const QString &icon, QWidget *parent, const char *name ) +PanelBrowserDialog::PanelBrowserDialog( const TQString& path, const TQString &icon, TQWidget *parent, const char *name ) : KDialogBase( parent, name, true, i18n( "Quick Browser Configuration" ), Ok|Cancel, Ok, true ) { setMinimumWidth( 300 ); - QVBox *page = makeVBoxMainWidget(); + TQVBox *page = makeVBoxMainWidget(); - QHBox *hbox2 = new QHBox( page ); + TQHBox *hbox2 = new TQHBox( page ); hbox2->setSpacing( KDialog::spacingHint() ); - QLabel *label1 = new QLabel( i18n( "Button icon:" ), hbox2 ); + TQLabel *label1 = new TQLabel( i18n( "Button icon:" ), hbox2 ); iconBtn = new KIconButton( hbox2 ); iconBtn->setFixedSize( 50, 50 ); iconBtn->setIconType( KIcon::Panel, KIcon::FileSystem ); label1->setBuddy( iconBtn ); - QHBox *hbox1 = new QHBox( page ); + TQHBox *hbox1 = new TQHBox( page ); hbox1->setSpacing( KDialog::spacingHint() ); - QLabel *label2 = new QLabel( i18n ( "Path:" ), hbox1 ); + TQLabel *label2 = new TQLabel( i18n ( "Path:" ), hbox1 ); pathInput = new KLineEdit( hbox1 ); - connect( pathInput, SIGNAL( textChanged ( const QString & )), this, SLOT( slotPathChanged( const QString & ))); + connect( pathInput, TQT_SIGNAL( textChanged ( const TQString & )), this, TQT_SLOT( slotPathChanged( const TQString & ))); pathInput->setText( path ); pathInput->setFocus(); label2->setBuddy( pathInput ); - browseBtn = new QPushButton( i18n( "&Browse..." ), hbox1 ); + browseBtn = new TQPushButton( i18n( "&Browse..." ), hbox1 ); if ( icon.isEmpty() ) { KURL u; u.setPath( path ); @@ -69,7 +69,7 @@ PanelBrowserDialog::PanelBrowserDialog( const QString& path, const QString &icon else iconBtn->setIcon( icon ); - connect( browseBtn, SIGNAL( clicked() ), this, SLOT( browse() ) ); + connect( browseBtn, TQT_SIGNAL( clicked() ), this, TQT_SLOT( browse() ) ); } PanelBrowserDialog::~PanelBrowserDialog() @@ -77,14 +77,14 @@ PanelBrowserDialog::~PanelBrowserDialog() } -void PanelBrowserDialog::slotPathChanged( const QString &_text ) +void PanelBrowserDialog::slotPathChanged( const TQString &_text ) { enableButtonOK( !_text.isEmpty() ); } void PanelBrowserDialog::browse() { - QString dir = KFileDialog::getExistingDirectory( pathInput->text(), 0, i18n( "Select Folder" ) ); + TQString dir = KFileDialog::getExistingDirectory( pathInput->text(), 0, i18n( "Select Folder" ) ); if ( !dir.isEmpty() ) { pathInput->setText( dir ); KURL u; @@ -95,7 +95,7 @@ void PanelBrowserDialog::browse() void PanelBrowserDialog::slotOk() { - QDir dir(path()); + TQDir dir(path()); if( !dir.exists() ) { KMessageBox::sorry( this, i18n("'%1' is not a valid folder.").arg(path()) ); return; @@ -103,12 +103,12 @@ void PanelBrowserDialog::slotOk() KDialogBase::slotOk(); } -const QString PanelBrowserDialog::icon() +const TQString PanelBrowserDialog::icon() { return iconBtn->icon(); } -QString PanelBrowserDialog::path() +TQString PanelBrowserDialog::path() { return pathInput->text(); } diff --git a/kicker/kicker/ui/browser_dlg.h b/kicker/kicker/ui/browser_dlg.h index dc675c11c..113a7b83a 100644 --- a/kicker/kicker/ui/browser_dlg.h +++ b/kicker/kicker/ui/browser_dlg.h @@ -34,20 +34,20 @@ class PanelBrowserDialog : public KDialogBase Q_OBJECT public: - PanelBrowserDialog( const QString &path = QString::null, const QString &icon = QString::null, QWidget *parent = 0, const char *name = 0 ); + PanelBrowserDialog( const TQString &path = TQString::null, const TQString &icon = TQString::null, TQWidget *parent = 0, const char *name = 0 ); ~PanelBrowserDialog(); - const QString icon(); - QString path(); + const TQString icon(); + TQString path(); protected slots: void browse(); virtual void slotOk(); - void slotPathChanged( const QString &_text ); + void slotPathChanged( const TQString &_text ); protected: KIconButton *iconBtn; KLineEdit *pathInput; - QPushButton *browseBtn; + TQPushButton *browseBtn; }; #endif diff --git a/kicker/kicker/ui/browser_mnu.cpp b/kicker/kicker/ui/browser_mnu.cpp index 9561881eb..6802e6388 100644 --- a/kicker/kicker/ui/browser_mnu.cpp +++ b/kicker/kicker/ui/browser_mnu.cpp @@ -21,8 +21,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ******************************************************************/ -#include <qdir.h> -#include <qpixmap.h> +#include <tqdir.h> +#include <tqpixmap.h> #include <kapplication.h> #include <kdebug.h> @@ -49,26 +49,26 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #define CICON(a) (*_icons)[a] -QMap<QString, QPixmap> *PanelBrowserMenu::_icons = 0; +TQMap<TQString, TQPixmap> *PanelBrowserMenu::_icons = 0; -PanelBrowserMenu::PanelBrowserMenu(QString path, QWidget *parent, const char *name, int startid) +PanelBrowserMenu::PanelBrowserMenu(TQString path, TQWidget *parent, const char *name, int startid) : KPanelMenu(path, parent, name) , _mimecheckTimer(0) , _startid(startid) , _dirty(false) , _filesOnly(false) { - _lastpress = QPoint(-1, -1); + _lastpress = TQPoint(-1, -1); setAcceptDrops(true); // Should depend on permissions of path. // we are not interested for dirty events on files inside the // directory (see slotClearIfNeeded) - connect( &_dirWatch, SIGNAL(dirty(const QString&)), - this, SLOT(slotClearIfNeeded(const QString&)) ); - connect( &_dirWatch, SIGNAL(created(const QString&)), - this, SLOT(slotClear()) ); - connect( &_dirWatch, SIGNAL(deleted(const QString&)), - this, SLOT(slotClear()) ); + connect( &_dirWatch, TQT_SIGNAL(dirty(const TQString&)), + this, TQT_SLOT(slotClearIfNeeded(const TQString&)) ); + connect( &_dirWatch, TQT_SIGNAL(created(const TQString&)), + this, TQT_SLOT(slotClear()) ); + connect( &_dirWatch, TQT_SIGNAL(deleted(const TQString&)), + this, TQT_SLOT(slotClear()) ); kdDebug() << "PanelBrowserMenu Constructor " << path << endl; } @@ -78,7 +78,7 @@ PanelBrowserMenu::~PanelBrowserMenu() kdDebug() << "PanelBrowserMenu Destructor " << path() << endl; } -void PanelBrowserMenu::slotClearIfNeeded(const QString& p) +void PanelBrowserMenu::slotClearIfNeeded(const TQString& p) { if (p == path()) slotClear(); @@ -86,7 +86,7 @@ void PanelBrowserMenu::slotClearIfNeeded(const QString& p) void PanelBrowserMenu::initialize() { - _lastpress = QPoint(-1, -1); + _lastpress = TQPoint(-1, -1); // don't change menu if already visible if (isVisible()) @@ -113,13 +113,13 @@ void PanelBrowserMenu::initialize() _filemap.clear(); _mimemap.clear(); - int filter = QDir::Dirs | QDir::Files; + int filter = TQDir::Dirs | TQDir::Files; if (KickerSettings::showHiddenFiles()) { - filter |= QDir::Hidden; + filter |= TQDir::Hidden; } - QDir dir(path(), QString::null, QDir::DirsFirst | QDir::Name | QDir::IgnoreCase, filter); + TQDir dir(path(), TQString::null, TQDir::DirsFirst | TQDir::Name | TQDir::IgnoreCase, filter); // does the directory exist? if (!dir.exists()) { @@ -148,9 +148,9 @@ void PanelBrowserMenu::initialize() // only the first part menu got them if(_startid == 0 && !_filesOnly) { insertTitle(path()); - insertItem(CICON("kfm"), i18n("Open in File Manager"), this, SLOT(slotOpenFileManager())); + insertItem(CICON("kfm"), i18n("Open in File Manager"), this, TQT_SLOT(slotOpenFileManager())); if (kapp->authorize("shell_access")) - insertItem(CICON("terminal"), i18n("Open in Terminal"), this, SLOT(slotOpenTerminal())); + insertItem(CICON("terminal"), i18n("Open in Terminal"), this, TQT_SLOT(slotOpenTerminal())); } @@ -171,24 +171,24 @@ void PanelBrowserMenu::initialize() // bump id run_id++; - QFileInfo *fi = it.current(); + TQFileInfo *fi = it.current(); // handle directories if (fi->isDir()) { - QString name = fi->fileName(); + TQString name = fi->fileName(); // ignore . and .. entries if (name == "." || name == "..") continue; - QPixmap icon; - QString path = fi->absFilePath(); + TQPixmap icon; + TQString path = fi->absFilePath(); // parse .directory if it does exist - if (QFile::exists(path + "/.directory")) { + if (TQFile::exists(path + "/.directory")) { KSimpleConfig c(path + "/.directory", true); c.setDesktopGroup(); - QString iconPath = c.readEntry("Icon"); + TQString iconPath = c.readEntry("Icon"); if ( iconPath.startsWith("./") ) iconPath = path + '/' + iconPath.mid(2); @@ -225,11 +225,11 @@ void PanelBrowserMenu::initialize() // handle files else if(fi->isFile()) { - QString name = fi->fileName(); - QString title = KIO::decodeFileName(name); + TQString name = fi->fileName(); + TQString title = KIO::decodeFileName(name); - QPixmap icon; - QString path = fi->absFilePath(); + TQPixmap icon; + TQString path = fi->absFilePath(); bool mimecheck = false; @@ -240,13 +240,13 @@ void PanelBrowserMenu::initialize() c.setDesktopGroup(); title = c.readEntry("Name", title); - QString s = c.readEntry("Icon"); + TQString s = c.readEntry("Icon"); if(!_icons->contains(s)) { icon = KGlobal::iconLoader()->loadIcon(s, KIcon::Small, KIcon::SizeSmall, KIcon::DefaultState, 0, true); if(icon.isNull()) { - QString type = c.readEntry("Type", "Application"); + TQString type = c.readEntry("Type", "Application"); if (type == "Directory") icon = CICON("folder"); else if (type == "Mimetype") @@ -312,7 +312,7 @@ void PanelBrowserMenu::initialize() adjustSize(); - QString dirname = path(); + TQString dirname = path(); int maxlen = contentsRect().width() - 40; if(item_count == 0) @@ -329,17 +329,17 @@ void PanelBrowserMenu::initialize() if(_mimemap.count() > 0) { if(!_mimecheckTimer) - _mimecheckTimer = new QTimer(this); + _mimecheckTimer = new TQTimer(this); - connect(_mimecheckTimer, SIGNAL(timeout()), SLOT(slotMimeCheck())); + connect(_mimecheckTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotMimeCheck())); _mimecheckTimer->start(0); } } -void PanelBrowserMenu::append(const QPixmap &pixmap, const QString &title, const QString &file, bool mimecheck) +void PanelBrowserMenu::append(const TQPixmap &pixmap, const TQString &title, const TQString &file, bool mimecheck) { // avoid &'s being converted to accelerators - QString newTitle = title; + TQString newTitle = title; newTitle = KStringHandler::cEmSqueeze( newTitle, fontMetrics(), 20 ); newTitle.replace("&", "&&"); @@ -354,10 +354,10 @@ void PanelBrowserMenu::append(const QPixmap &pixmap, const QString &title, const _mimemap.insert(id, true); } -void PanelBrowserMenu::append(const QPixmap &pixmap, const QString &title, PanelBrowserMenu *subMenu) +void PanelBrowserMenu::append(const TQPixmap &pixmap, const TQString &title, PanelBrowserMenu *subMenu) { // avoid &'s being converted to accelerators - QString newTitle = title; + TQString newTitle = title; newTitle = KStringHandler::cEmSqueeze( newTitle, fontMetrics(), 20 ); newTitle.replace("&", "&&"); @@ -367,18 +367,18 @@ void PanelBrowserMenu::append(const QPixmap &pixmap, const QString &title, Panel _subMenus.append(subMenu); } -void PanelBrowserMenu::mousePressEvent(QMouseEvent *e) +void PanelBrowserMenu::mousePressEvent(TQMouseEvent *e) { - QPopupMenu::mousePressEvent(e); + TQPopupMenu::mousePressEvent(e); _lastpress = e->pos(); } -void PanelBrowserMenu::mouseMoveEvent(QMouseEvent *e) +void PanelBrowserMenu::mouseMoveEvent(TQMouseEvent *e) { - QPopupMenu::mouseMoveEvent(e); + TQPopupMenu::mouseMoveEvent(e); if (!(e->state() & LeftButton)) return; - if(_lastpress == QPoint(-1, -1)) return; + if(_lastpress == TQPoint(-1, -1)) return; // DND delay if((_lastpress - e->pos()).manhattanLength() < 12) return; @@ -388,14 +388,14 @@ void PanelBrowserMenu::mouseMoveEvent(QMouseEvent *e) if(!_filemap.contains(id)) return; // reset _lastpress - _lastpress = QPoint(-1, -1); + _lastpress = TQPoint(-1, -1); // start drag KURL url; url.setPath(path() + "/" + _filemap[id]); KURL::List files(url); KURLDrag *d = new KURLDrag(files, this); - connect(d, SIGNAL(destroyed()), this, SLOT(slotDragObjectDestroyed())); + connect(d, TQT_SIGNAL(destroyed()), this, TQT_SLOT(slotDragObjectDestroyed())); d->setPixmap(iconSet(id)->pixmap()); d->drag(); } @@ -408,7 +408,7 @@ void PanelBrowserMenu::slotDragObjectDestroyed() } } -void PanelBrowserMenu::dragEnterEvent( QDragEnterEvent *ev ) +void PanelBrowserMenu::dragEnterEvent( TQDragEnterEvent *ev ) { if (KURLDrag::canDecode(ev)) { @@ -417,16 +417,16 @@ void PanelBrowserMenu::dragEnterEvent( QDragEnterEvent *ev ) KPanelMenu::dragEnterEvent(ev); } -void PanelBrowserMenu::dragMoveEvent(QDragMoveEvent *ev) +void PanelBrowserMenu::dragMoveEvent(TQDragMoveEvent *ev) { - QMouseEvent mev(QEvent::MouseMove, ev->pos(), Qt::NoButton, Qt::LeftButton); - QPopupMenu::mouseMoveEvent(&mev); + TQMouseEvent mev(TQEvent::MouseMove, ev->pos(), Qt::NoButton, Qt::LeftButton); + TQPopupMenu::mouseMoveEvent(&mev); } -void PanelBrowserMenu::dropEvent( QDropEvent *ev ) +void PanelBrowserMenu::dropEvent( TQDropEvent *ev ) { KURL u( path() ); - KFileItem item( u, QString::fromLatin1( "inode/directory" ), KFileItem::Unknown ); + KFileItem item( u, TQString::fromLatin1( "inode/directory" ), KFileItem::Unknown ); KonqOperations::doDrop( &item, u, ev, this ); KPanelMenu::dropEvent(ev); // ### TODO: Update list @@ -441,14 +441,14 @@ void PanelBrowserMenu::slotExec(int id) KURL url; url.setPath(path() + "/" + _filemap[id]); new KRun(url, 0, true); // will delete itself - _lastpress = QPoint(-1, -1); + _lastpress = TQPoint(-1, -1); } void PanelBrowserMenu::slotOpenTerminal() { KConfig * config = kapp->config(); config->setGroup("General"); - QString term = config->readPathEntry("TerminalApplication", "konsole"); + TQString term = config->readPathEntry("TerminalApplication", "konsole"); KProcess proc; proc << term; @@ -467,7 +467,7 @@ void PanelBrowserMenu::slotOpenFileManager() void PanelBrowserMenu::slotMimeCheck() { // get the first map entry - QMap<int, bool>::Iterator it = _mimemap.begin(); + TQMap<int, bool>::Iterator it = _mimemap.begin(); // no mime types left to check -> stop timer if(it == _mimemap.end()) { @@ -478,7 +478,7 @@ void PanelBrowserMenu::slotMimeCheck() } int id = it.key(); - QString file = _filemap[id]; + TQString file = _filemap[id]; _mimemap.remove(it); @@ -486,18 +486,18 @@ void PanelBrowserMenu::slotMimeCheck() url.setPath( path() + '/' + file ); // KMimeType::Ptr mt = KMimeType::findByURL(url, 0, true, false); -// QString icon(mt->icon(url, true)); - QString icon = KMimeType::iconForURL( url ); +// TQString icon(mt->icon(url, true)); + TQString icon = KMimeType::iconForURL( url ); // kdDebug() << url.url() << ": " << icon << endl; file = KStringHandler::cEmSqueeze( file, fontMetrics(), 20 ); file.replace("&", "&&"); if(!_icons->contains(icon)) { - QPixmap pm = SmallIcon(icon); + TQPixmap pm = SmallIcon(icon); if( pm.height() > 16 ) { - QPixmap cropped( 16, 16 ); + TQPixmap cropped( 16, 16 ); copyBlt( &cropped, 0, 0, &pm, 0, 0, 16, 16 ); pm = cropped; } @@ -521,7 +521,7 @@ void PanelBrowserMenu::slotClear() } KPanelMenu::slotClear(); - for (QValueVector<PanelBrowserMenu*>::iterator it = _subMenus.begin(); + for (TQValueVector<PanelBrowserMenu*>::iterator it = _subMenus.begin(); it != _subMenus.end(); ++it) { @@ -536,7 +536,7 @@ void PanelBrowserMenu::initIconMap() // kdDebug() << "PanelBrowserMenu::initIconMap" << endl; - _icons = new QMap<QString, QPixmap>; + _icons = new TQMap<TQString, TQPixmap>; _icons->insert("folder", SmallIcon("folder")); _icons->insert("unknown", SmallIcon("mime_empty")); diff --git a/kicker/kicker/ui/browser_mnu.h b/kicker/kicker/ui/browser_mnu.h index 5999db2cb..38f9b9690 100644 --- a/kicker/kicker/ui/browser_mnu.h +++ b/kicker/kicker/ui/browser_mnu.h @@ -24,8 +24,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #ifndef __browser_mnu_h__ #define __browser_mnu_h__ -#include <qmap.h> -#include <qvaluevector.h> +#include <tqmap.h> +#include <tqvaluevector.h> #include <kpanelmenu.h> #include <kdirwatch.h> @@ -34,11 +34,11 @@ class PanelBrowserMenu : public KPanelMenu Q_OBJECT public: - PanelBrowserMenu(QString path, QWidget *parent = 0, const char *name = 0, int startid = 0); + PanelBrowserMenu(TQString path, TQWidget *parent = 0, const char *name = 0, int startid = 0); ~PanelBrowserMenu(); - void append(const QPixmap &pixmap, const QString &title, const QString &filename, bool mimecheck); - void append(const QPixmap &pixmap, const QString &title, PanelBrowserMenu *subMenu); + void append(const TQPixmap &pixmap, const TQString &title, const TQString &filename, bool mimecheck); + void append(const TQPixmap &pixmap, const TQString &title, PanelBrowserMenu *subMenu); public slots: void initialize(); @@ -48,24 +48,24 @@ protected slots: void slotOpenTerminal(); void slotOpenFileManager(); void slotMimeCheck(); - void slotClearIfNeeded(const QString&); + void slotClearIfNeeded(const TQString&); void slotClear(); void slotDragObjectDestroyed(); protected: - void mousePressEvent(QMouseEvent *); - void mouseMoveEvent(QMouseEvent *); - void dropEvent(QDropEvent *ev); - void dragEnterEvent(QDragEnterEvent *ev); - void dragMoveEvent(QDragMoveEvent *); + void mousePressEvent(TQMouseEvent *); + void mouseMoveEvent(TQMouseEvent *); + void dropEvent(TQDropEvent *ev); + void dragEnterEvent(TQDragEnterEvent *ev); + void dragMoveEvent(TQDragMoveEvent *); void initIconMap(); - QPoint _lastpress; - QMap<int, QString> _filemap; - QMap<int, bool> _mimemap; - QTimer *_mimecheckTimer; + TQPoint _lastpress; + TQMap<int, TQString> _filemap; + TQMap<int, bool> _mimemap; + TQTimer *_mimecheckTimer; KDirWatch _dirWatch; - QValueVector<PanelBrowserMenu*> _subMenus; + TQValueVector<PanelBrowserMenu*> _subMenus; int _startid; bool _dirty; @@ -75,7 +75,7 @@ protected: // entries are not inserted in the menu and its submenus. bool _filesOnly; - static QMap<QString, QPixmap> *_icons; + static TQMap<TQString, TQPixmap> *_icons; }; #endif diff --git a/kicker/kicker/ui/client_mnu.cpp b/kicker/kicker/ui/client_mnu.cpp index f098e40d4..9736351e1 100644 --- a/kicker/kicker/ui/client_mnu.cpp +++ b/kicker/kicker/ui/client_mnu.cpp @@ -21,7 +21,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ******************************************************************/ -#include <qpixmap.h> +#include <tqpixmap.h> #include <kapplication.h> #include <kdebug.h> @@ -30,8 +30,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "client_mnu.h" #include "client_mnu.moc" -KickerClientMenu::KickerClientMenu( QWidget * parent, const char *name ) - : QPopupMenu( parent, name), DCOPObject( name ) +KickerClientMenu::KickerClientMenu( TQWidget * parent, const char *name ) + : TQPopupMenu( parent, name), DCOPObject( name ) { } @@ -41,33 +41,33 @@ KickerClientMenu::~KickerClientMenu() void KickerClientMenu::clear() { - QPopupMenu::clear(); + TQPopupMenu::clear(); } -void KickerClientMenu::insertItem( QPixmap icon, QString text, int id ) +void KickerClientMenu::insertItem( TQPixmap icon, TQString text, int id ) { - int globalid = QPopupMenu::insertItem( icon, text, this, SLOT( slotActivated(int) ) ); + int globalid = TQPopupMenu::insertItem( icon, text, this, TQT_SLOT( slotActivated(int) ) ); setItemParameter( globalid, id ); } -void KickerClientMenu::insertItem( QString text, int id ) +void KickerClientMenu::insertItem( TQString text, int id ) { - int globalid = QPopupMenu::insertItem( text, this, SLOT( slotActivated(int) ) ); + int globalid = TQPopupMenu::insertItem( text, this, TQT_SLOT( slotActivated(int) ) ); setItemParameter( globalid, id ); } -QCString KickerClientMenu::insertMenu( QPixmap icon, QString text, int id ) +TQCString KickerClientMenu::insertMenu( TQPixmap icon, TQString text, int id ) { - QString subname("%1-submenu%2"); - QCString subid = subname.arg(objId()).arg(id).local8Bit(); + TQString subname("%1-submenu%2"); + TQCString subid = subname.arg(objId()).arg(id).local8Bit(); KickerClientMenu *sub = new KickerClientMenu(this, subid); - int globalid = QPopupMenu::insertItem( icon, text, sub, id); + int globalid = TQPopupMenu::insertItem( icon, text, sub, id); setItemParameter( globalid, id ); return subid; } -void KickerClientMenu::connectDCOPSignal( QCString signal, QCString appId, QCString objId ) +void KickerClientMenu::connectDCOPSignal( TQCString signal, TQCString appId, TQCString objId ) { // very primitive right now if ( signal == "activated(int)" ) { @@ -78,48 +78,48 @@ void KickerClientMenu::connectDCOPSignal( QCString signal, QCString appId, QCStr } } -bool KickerClientMenu::process(const QCString &fun, const QByteArray &data, - QCString &replyType, QByteArray &replyData) +bool KickerClientMenu::process(const TQCString &fun, const TQByteArray &data, + TQCString &replyType, TQByteArray &replyData) { if ( fun == "clear()" ) { clear(); replyType = "void"; return true; } - else if ( fun == "insertItem(QPixmap,QString,int)" ) { - QDataStream dataStream( data, IO_ReadOnly ); - QPixmap icon; - QString text; + else if ( fun == "insertItem(TQPixmap,TQString,int)" ) { + TQDataStream dataStream( data, IO_ReadOnly ); + TQPixmap icon; + TQString text; int id; dataStream >> icon >> text >> id; insertItem( icon, text, id ); replyType = "void"; return true; } - else if ( fun == "insertMenu(QPixmap,QString,int)" ) { - QDataStream dataStream( data, IO_ReadOnly ); - QPixmap icon; - QString text; + else if ( fun == "insertMenu(TQPixmap,TQString,int)" ) { + TQDataStream dataStream( data, IO_ReadOnly ); + TQPixmap icon; + TQString text; int id; dataStream >> icon >> text >> id; - QCString ref = insertMenu( icon, text, id ); - replyType = "QCString"; - QDataStream replyStream( replyData, IO_WriteOnly ); + TQCString ref = insertMenu( icon, text, id ); + replyType = "TQCString"; + TQDataStream replyStream( replyData, IO_WriteOnly ); replyStream << ref; return true; } - else if ( fun == "insertItem(QString,int)" ) { - QDataStream dataStream( data, IO_ReadOnly ); - QString text; + else if ( fun == "insertItem(TQString,int)" ) { + TQDataStream dataStream( data, IO_ReadOnly ); + TQString text; int id; dataStream >> text >> id; insertItem( text, id ); replyType = "void"; return true; } - else if ( fun == "connectDCOPSignal(QCString,QCString,QCString)" ) { - QDataStream dataStream( data, IO_ReadOnly ); - QCString signal, appId, objId; + else if ( fun == "connectDCOPSignal(TQCString,TQCString,TQCString)" ) { + TQDataStream dataStream( data, IO_ReadOnly ); + TQCString signal, appId, objId; dataStream >> signal >> appId >> objId; connectDCOPSignal( signal, appId, objId ); replyType = "void"; @@ -131,8 +131,8 @@ bool KickerClientMenu::process(const QCString &fun, const QByteArray &data, void KickerClientMenu::slotActivated(int id) { if ( !app.isEmpty() ) { - QByteArray data; - QDataStream dataStream( data, IO_WriteOnly ); + TQByteArray data; + TQDataStream dataStream( data, IO_WriteOnly ); dataStream << id; kapp->dcopClient()->send( app, obj, "activated(int)", data ); } diff --git a/kicker/kicker/ui/client_mnu.h b/kicker/kicker/ui/client_mnu.h index fe8e4a113..272f6364f 100644 --- a/kicker/kicker/ui/client_mnu.h +++ b/kicker/kicker/ui/client_mnu.h @@ -24,8 +24,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #ifndef PANEL_CLIENTMENU_H #define PANEL_CLIENTMENU_H -#include <qstringlist.h> -#include <qpopupmenu.h> +#include <tqstringlist.h> +#include <tqpopupmenu.h> #include <dcopobject.h> @@ -36,46 +36,46 @@ class PanelKMenu; // also manages the toplevel K Button Menu. /** - * Small additions to QPopupMenu to contain data we need for DCop handling + * Small additions to TQPopupMenu to contain data we need for DCop handling */ -class KickerClientMenu : public QPopupMenu, DCOPObject +class KickerClientMenu : public TQPopupMenu, DCOPObject { Q_OBJECT public: - KickerClientMenu( QWidget *parent=0, const char *name=0); + KickerClientMenu( TQWidget *parent=0, const char *name=0); ~KickerClientMenu(); // dcop exported void clear(); - void insertItem( QPixmap icon, QString text, int id ); - void insertItem( QString text, int id ); + void insertItem( TQPixmap icon, TQString text, int id ); + void insertItem( TQString text, int id ); - QCString insertMenu( QPixmap icon, QString test, int id ); + TQCString insertMenu( TQPixmap icon, TQString test, int id ); // dcop signals: // void activated(int) - void connectDCOPSignal( QCString signal, QCString appId, QCString objId ); + void connectDCOPSignal( TQCString signal, TQCString appId, TQCString objId ); // dcop internal - virtual bool process(const QCString &fun, const QByteArray &data, - QCString &replyType, QByteArray &reply); + virtual bool process(const TQCString &fun, const TQByteArray &data, + TQCString &replyType, TQByteArray &reply); protected slots: void slotActivated(int id); private: - QCString app, obj; // for the signal + TQCString app, obj; // for the signal // for the panel menu, internal friend class PanelKMenu; - QString text; - QPixmap icon; + TQString text; + TQPixmap icon; // for the KickerClientMenu, internal friend class MenuManager; int idInParentMenu; - QCString createdBy; + TQCString createdBy; }; #endif diff --git a/kicker/kicker/ui/dirdrop_mnu.cpp b/kicker/kicker/ui/dirdrop_mnu.cpp index 2f64fdd12..cd814f42b 100644 --- a/kicker/kicker/ui/dirdrop_mnu.cpp +++ b/kicker/kicker/ui/dirdrop_mnu.cpp @@ -26,8 +26,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "dirdrop_mnu.h" -PanelDirDropMenu::PanelDirDropMenu(QWidget *parent, const char *name) - :QPopupMenu(parent, name) +PanelDirDropMenu::PanelDirDropMenu(TQWidget *parent, const char *name) + :TQPopupMenu(parent, name) { insertItem(SmallIconSet("folder"), i18n("Add as &File Manager URL"), Url); setAccel(CTRL+Key_F, Url); diff --git a/kicker/kicker/ui/dirdrop_mnu.h b/kicker/kicker/ui/dirdrop_mnu.h index 15fa799c2..d05187400 100644 --- a/kicker/kicker/ui/dirdrop_mnu.h +++ b/kicker/kicker/ui/dirdrop_mnu.h @@ -24,14 +24,14 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #ifndef __dirdrop_mnu_h__ #define __dirdrop_mnu_h__ -#include <qpopupmenu.h> +#include <tqpopupmenu.h> // The directory dropped menu class PanelDirDropMenu : public QPopupMenu { public: enum OpButton{Url=1, Browser}; - PanelDirDropMenu(QWidget *parent=0, const char *name=0); + PanelDirDropMenu(TQWidget *parent=0, const char *name=0); }; #endif diff --git a/kicker/kicker/ui/exe_dlg.cpp b/kicker/kicker/ui/exe_dlg.cpp index 19583444e..cb0d42c56 100644 --- a/kicker/kicker/ui/exe_dlg.cpp +++ b/kicker/kicker/ui/exe_dlg.cpp @@ -21,16 +21,16 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ******************************************************************/ -#include <qfileinfo.h> +#include <tqfileinfo.h> #include <klocale.h> #include <kiconloader.h> -#include <qcheckbox.h> -#include <qdir.h> -#include <qfileinfo.h> -#include <qlineedit.h> -#include <qvbox.h> +#include <tqcheckbox.h> +#include <tqdir.h> +#include <tqfileinfo.h> +#include <tqlineedit.h> +#include <tqvbox.h> #include <kicondialog.h> #include <kmessagebox.h> @@ -45,16 +45,16 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "exe_dlg.h" #include "nonKDEButtonSettings.h" -PanelExeDialog::PanelExeDialog(const QString& title, const QString& description, - const QString &path, const QString &icon, - const QString &cmd, bool inTerm, - QWidget *parent, const char *name) +PanelExeDialog::PanelExeDialog(const TQString& title, const TQString& description, + const TQString &path, const TQString &icon, + const TQString &cmd, bool inTerm, + TQWidget *parent, const char *name) : KDialogBase(parent, name, false, i18n("Non-KDE Application Configuration"), Ok|Cancel, Ok, true), m_icon(icon.isEmpty() ? "exec" : icon), m_iconChanged(false) { setCaption(i18n("Non-KDE Application Configuration")); - QFileInfo fi(path); + TQFileInfo fi(path); ui = new NonKDEButtonSettings(makeVBoxMainWidget()); fillCompletion(); @@ -68,14 +68,14 @@ PanelExeDialog::PanelExeDialog(const QString& title, const QString& description, updateIcon(); - connect(ui->m_exec, SIGNAL(urlSelected(const QString &)), - this, SLOT(slotSelect(const QString &))); - connect(ui->m_exec, SIGNAL(textChanged(const QString &)), - this, SLOT(slotTextChanged(const QString &))); - connect(ui->m_exec, SIGNAL(returnPressed()), - this, SLOT(slotReturnPressed())); - connect(ui->m_icon, SIGNAL(iconChanged(QString)), - this, SLOT(slotIconChanged(QString))); + connect(ui->m_exec, TQT_SIGNAL(urlSelected(const TQString &)), + this, TQT_SLOT(slotSelect(const TQString &))); + connect(ui->m_exec, TQT_SIGNAL(textChanged(const TQString &)), + this, TQT_SLOT(slotTextChanged(const TQString &))); + connect(ui->m_exec, TQT_SIGNAL(returnPressed()), + this, TQT_SLOT(slotReturnPressed())); + connect(ui->m_icon, TQT_SIGNAL(iconChanged(TQString)), + this, TQT_SLOT(slotIconChanged(TQString))); // leave decent space for the commandline resize(sizeHint().width() > 300 ? sizeHint().width() : 300, @@ -94,27 +94,27 @@ bool PanelExeDialog::useTerminal() const return ui->m_inTerm->isChecked(); } -QString PanelExeDialog::title() const +TQString PanelExeDialog::title() const { return ui->m_title->text(); } -QString PanelExeDialog::description() const +TQString PanelExeDialog::description() const { return ui->m_description->text(); } -QString PanelExeDialog::commandLine() const +TQString PanelExeDialog::commandLine() const { return ui->m_commandLine->text(); } -QString PanelExeDialog::iconPath() const +TQString PanelExeDialog::iconPath() const { return ui->m_icon->icon(); } -QString PanelExeDialog::command() const +TQString PanelExeDialog::command() const { return ui->m_exec->url(); } @@ -128,19 +128,19 @@ void PanelExeDialog::updateIcon() void PanelExeDialog::fillCompletion() { KCompletion *comp = ui->m_exec->completionObject(); - QStringList exePaths = KStandardDirs::systemPaths(); + TQStringList exePaths = KStandardDirs::systemPaths(); - for (QStringList::ConstIterator it = exePaths.begin(); it != exePaths.end(); it++) + for (TQStringList::ConstIterator it = exePaths.begin(); it != exePaths.end(); it++) { - QDir d( (*it) ); - d.setFilter( QDir::Files | QDir::Executable ); + TQDir d( (*it) ); + d.setFilter( TQDir::Files | TQDir::Executable ); const QFileInfoList *list = d.entryInfoList(); if (!list) continue; QFileInfoListIterator it2( *list ); - QFileInfo *fi; + TQFileInfo *fi; while ( (fi = it2.current()) != 0 ) { m_partialPath2full.insert(fi->fileName(), fi->filePath(), false); @@ -151,20 +151,20 @@ void PanelExeDialog::fillCompletion() } } -void PanelExeDialog::slotIconChanged(QString) +void PanelExeDialog::slotIconChanged(TQString) { m_iconChanged = true; } -void PanelExeDialog::slotTextChanged(const QString &str) +void PanelExeDialog::slotTextChanged(const TQString &str) { if (m_iconChanged) { return; } - QString exeLocation = str; - QMap<QString, QString>::iterator it = m_partialPath2full.find(str); + TQString exeLocation = str; + TQMap<TQString, TQString>::iterator it = m_partialPath2full.find(str); if (it != m_partialPath2full.end()) exeLocation = it.data(); @@ -178,12 +178,12 @@ void PanelExeDialog::slotReturnPressed() ui->m_exec->setURL(m_partialPath2full[ui->m_exec->url()]); } -void PanelExeDialog::slotSelect(const QString& exec) +void PanelExeDialog::slotSelect(const TQString& exec) { if ( exec.isEmpty() ) return; - QFileInfo fi(exec); + TQFileInfo fi(exec); if (!fi.isExecutable()) { if(KMessageBox::warningYesNo(0, i18n("The selected file is not executable.\n" diff --git a/kicker/kicker/ui/exe_dlg.h b/kicker/kicker/ui/exe_dlg.h index f7624fa35..ef96fe9d0 100644 --- a/kicker/kicker/ui/exe_dlg.h +++ b/kicker/kicker/ui/exe_dlg.h @@ -31,25 +31,25 @@ class PanelExeDialog : public KDialogBase { Q_OBJECT public: - PanelExeDialog(const QString& title, const QString& description, - const QString &path, const QString &pixmap=QString::null, - const QString &cmd=QString::null, bool inTerm=false, - QWidget *parent=0, const char *name=0); - QString iconPath() const; - QString command() const; - QString commandLine() const; - QString title() const; - QString description() const; + PanelExeDialog(const TQString& title, const TQString& description, + const TQString &path, const TQString &pixmap=TQString::null, + const TQString &cmd=TQString::null, bool inTerm=false, + TQWidget *parent=0, const char *name=0); + TQString iconPath() const; + TQString command() const; + TQString commandLine() const; + TQString title() const; + TQString description() const; bool useTerminal() const; signals: void updateSettings(PanelExeDialog*); protected slots: - void slotSelect(const QString& exec); - void slotTextChanged(const QString &); + void slotSelect(const TQString& exec); + void slotTextChanged(const TQString &); void slotReturnPressed(); - void slotIconChanged(QString); + void slotIconChanged(TQString); void slotOk(); protected: @@ -57,8 +57,8 @@ protected: void updateIcon(); NonKDEButtonSettings* ui; - QString m_icon; - QMap<QString, QString> m_partialPath2full; + TQString m_icon; + TQMap<TQString, TQString> m_partialPath2full; bool m_iconChanged; }; diff --git a/kicker/kicker/ui/extensionop_mnu.cpp b/kicker/kicker/ui/extensionop_mnu.cpp index 9389f9cd4..a30434a48 100644 --- a/kicker/kicker/ui/extensionop_mnu.cpp +++ b/kicker/kicker/ui/extensionop_mnu.cpp @@ -29,8 +29,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "kicker.h" #include "extensionop_mnu.h" -PanelExtensionOpMenu::PanelExtensionOpMenu(const QString& extension, int actions, QWidget *parent, const char *name) - : QPopupMenu(parent, name) +PanelExtensionOpMenu::PanelExtensionOpMenu(const TQString& extension, int actions, TQWidget *parent, const char *name) + : TQPopupMenu(parent, name) { if (!Kicker::the()->isImmutable()) { diff --git a/kicker/kicker/ui/extensionop_mnu.h b/kicker/kicker/ui/extensionop_mnu.h index 85bf914af..01bda4340 100644 --- a/kicker/kicker/ui/extensionop_mnu.h +++ b/kicker/kicker/ui/extensionop_mnu.h @@ -24,13 +24,13 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #ifndef __extensionop_mnu_h__ #define __extensionop_mnu_h__ -#include <qpopupmenu.h> +#include <tqpopupmenu.h> class PanelExtensionOpMenu : public QPopupMenu { public: enum OpButton{Move = 9900, Remove = 9901, Help = 9902, About = 9903, Preferences = 9904, ReportBug = 9905, Shade = 9906 }; - PanelExtensionOpMenu(const QString& extension, int actions, QWidget *parent=0, const char *name=0); + PanelExtensionOpMenu(const TQString& extension, int actions, TQWidget *parent=0, const char *name=0); }; #endif diff --git a/kicker/kicker/ui/hidebutton.cpp b/kicker/kicker/ui/hidebutton.cpp index 31d614006..a73e0a48d 100644 --- a/kicker/kicker/ui/hidebutton.cpp +++ b/kicker/kicker/ui/hidebutton.cpp @@ -20,7 +20,7 @@ #include "hidebutton.h" -#include <qpainter.h> +#include <tqpainter.h> #include <kapplication.h> #include <kcursor.h> @@ -31,15 +31,15 @@ #include <kipc.h> #include <kstandarddirs.h> -HideButton::HideButton(QWidget *parent, const char *name) - : QButton(parent, name), +HideButton::HideButton(TQWidget *parent, const char *name) + : TQButton(parent, name), m_highlight(false), m_arrow(Qt::LeftArrow) { setBackgroundOrigin(AncestorOrigin); - connect(kapp, SIGNAL(settingsChanged(int)), SLOT(slotSettingsChanged(int))); - connect(kapp, SIGNAL(iconChanged(int)), SLOT(slotIconChanged(int))); + connect(kapp, TQT_SIGNAL(settingsChanged(int)), TQT_SLOT(slotSettingsChanged(int))); + connect(kapp, TQT_SIGNAL(iconChanged(int)), TQT_SLOT(slotIconChanged(int))); kapp->addKipcEventMask(KIPC::SettingsChanged); kapp->addKipcEventMask(KIPC::IconChanged); @@ -47,7 +47,7 @@ HideButton::HideButton(QWidget *parent, const char *name) slotSettingsChanged(KApplication::SETTINGS_MOUSE); } -void HideButton::drawButton(QPainter *p) +void HideButton::drawButton(TQPainter *p) { if (m_arrow == Qt::LeftArrow) { @@ -73,18 +73,18 @@ void HideButton::drawButton(QPainter *p) drawButtonLabel(p); } -void HideButton::drawButtonLabel(QPainter *p) +void HideButton::drawButtonLabel(TQPainter *p) { if (pixmap()) { - QPixmap pix = m_highlight? m_activeIcon : m_normalIcon; + TQPixmap pix = m_highlight? m_activeIcon : m_normalIcon; if (isOn() || isDown()) { p->translate(2, 2); } - QPoint origin(2, 2); + TQPoint origin(2, 2); if (pix.height() < (height() - 4)) { @@ -100,9 +100,9 @@ void HideButton::drawButtonLabel(QPainter *p) } } -void HideButton::setPixmap(const QPixmap &pix) +void HideButton::setPixmap(const TQPixmap &pix) { - QButton::setPixmap(pix); + TQButton::setPixmap(pix); generateIcons(); } @@ -137,8 +137,8 @@ void HideButton::generateIcons() return; } - QImage image = pixmap()->convertToImage(); - image = image.smoothScale(size() - QSize(4, 4), QImage::ScaleMin); + TQImage image = pixmap()->convertToImage(); + image = image.smoothScale(size() - TQSize(4, 4), TQImage::ScaleMin); KIconEffect effect; @@ -176,23 +176,23 @@ void HideButton::slotIconChanged(int group) repaint(false); } -void HideButton::enterEvent(QEvent *e) +void HideButton::enterEvent(TQEvent *e) { m_highlight = true; repaint(false); - QButton::enterEvent(e); + TQButton::enterEvent(e); } -void HideButton::leaveEvent(QEvent *e) +void HideButton::leaveEvent(TQEvent *e) { m_highlight = false; repaint(false); - QButton::enterEvent(e); + TQButton::enterEvent(e); } -void HideButton::resizeEvent(QResizeEvent *) +void HideButton::resizeEvent(TQResizeEvent *) { generateIcons(); } diff --git a/kicker/kicker/ui/hidebutton.h b/kicker/kicker/ui/hidebutton.h index da387cde7..9a6c4612e 100644 --- a/kicker/kicker/ui/hidebutton.h +++ b/kicker/kicker/ui/hidebutton.h @@ -20,30 +20,30 @@ #ifndef HIDEBUTTON_H #define HIDEBUTTON_H -#include <qbutton.h> -#include <qpixmap.h> +#include <tqbutton.h> +#include <tqpixmap.h> class HideButton : public QButton { Q_OBJECT public: - HideButton(QWidget *parent, const char *name = 0); + HideButton(TQWidget *parent, const char *name = 0); void setArrowType(Qt::ArrowType arrow); - void setPixmap(const QPixmap &pix); + void setPixmap(const TQPixmap &pix); protected: - void drawButton(QPainter *p); - void drawButtonLabel(QPainter *p); + void drawButton(TQPainter *p); + void drawButtonLabel(TQPainter *p); void generateIcons(); - void enterEvent(QEvent *e); - void leaveEvent( QEvent *e ); - void resizeEvent(QResizeEvent *e); + void enterEvent(TQEvent *e); + void leaveEvent( TQEvent *e ); + void resizeEvent(TQResizeEvent *e); bool m_highlight; - QPixmap m_normalIcon; - QPixmap m_activeIcon; + TQPixmap m_normalIcon; + TQPixmap m_activeIcon; Qt::ArrowType m_arrow; protected slots: diff --git a/kicker/kicker/ui/k_mnu.cpp b/kicker/kicker/ui/k_mnu.cpp index 609ce84be..b2e3d59bb 100644 --- a/kicker/kicker/ui/k_mnu.cpp +++ b/kicker/kicker/ui/k_mnu.cpp @@ -26,9 +26,9 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <unistd.h> #include <dmctl.h> -#include <qimage.h> -#include <qpainter.h> -#include <qstyle.h> +#include <tqimage.h> +#include <tqpainter.h> +#include <tqstyle.h> #include <dcopclient.h> #include <kapplication.h> @@ -62,11 +62,11 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "k_mnu.moc" PanelKMenu::PanelKMenu() - : PanelServiceMenu(QString::null, QString::null, 0, "KMenu") + : PanelServiceMenu(TQString::null, TQString::null, 0, "KMenu") , bookmarkMenu(0) , bookmarkOwner(0) { - static const QCString dcopObjId("KMenu"); + static const TQCString dcopObjId("KMenu"); DCOPObject::setObjId(dcopObjId); // set the first client id to some arbitrarily large value. client_id = 10000; @@ -74,13 +74,13 @@ PanelKMenu::PanelKMenu() disableAutoClear(); actionCollection = new KActionCollection(this); setCaption(i18n("K Menu")); - connect(Kicker::the(), SIGNAL(configurationChanged()), - this, SLOT(configChanged())); + connect(Kicker::the(), TQT_SIGNAL(configurationChanged()), + this, TQT_SLOT(configChanged())); DCOPClient *dcopClient = KApplication::dcopClient(); dcopClient->connectDCOPSignal(0, "appLauncher", - "serviceStartedByStorageId(QString,QString)", + "serviceStartedByStorageId(TQString,TQString)", dcopObjId, - "slotServiceStartedByStorageId(QString,QString)", + "slotServiceStartedByStorageId(TQString,TQString)", false); } @@ -91,8 +91,8 @@ PanelKMenu::~PanelKMenu() delete bookmarkOwner; } -void PanelKMenu::slotServiceStartedByStorageId(QString starter, - QString storageId) +void PanelKMenu::slotServiceStartedByStorageId(TQString starter, + TQString storageId) { if (starter != "kmenu") { @@ -111,10 +111,10 @@ bool PanelKMenu::loadSidePixmap() return false; } - QString sideName = KickerSettings::sidePixmapName(); - QString sideTileName = KickerSettings::sideTileName(); + TQString sideName = KickerSettings::sidePixmapName(); + TQString sideTileName = KickerSettings::sideTileName(); - QImage image; + TQImage image; image.load(locate("data", "kicker/pics/" + sideName)); if (image.isNull()) @@ -147,8 +147,8 @@ bool PanelKMenu::loadSidePixmap() if (sideTilePixmap.height() < 100) { int tiles = (int)(100 / sideTilePixmap.height()) + 1; - QPixmap preTiledPixmap(sideTilePixmap.width(), sideTilePixmap.height() * tiles); - QPainter p(&preTiledPixmap); + TQPixmap preTiledPixmap(sideTilePixmap.width(), sideTilePixmap.height() * tiles); + TQPainter p(&preTiledPixmap); p.drawTiledPixmap(preTiledPixmap.rect(), sideTilePixmap); sideTilePixmap = preTiledPixmap; } @@ -160,7 +160,7 @@ void PanelKMenu::paletteChanged() { if (!loadSidePixmap()) { - sidePixmap = sideTilePixmap = QPixmap(); + sidePixmap = sideTilePixmap = TQPixmap(); setMinimumSize( sizeHint() ); } } @@ -178,14 +178,14 @@ void PanelKMenu::initialize() if (loadSidePixmap()) { // in case we've been through here before, let's disconnect - disconnect(kapp, SIGNAL(kdisplayPaletteChanged()), - this, SLOT(paletteChanged())); - connect(kapp, SIGNAL(kdisplayPaletteChanged()), - this, SLOT(paletteChanged())); + disconnect(kapp, TQT_SIGNAL(kdisplayPaletteChanged()), + this, TQT_SLOT(paletteChanged())); + connect(kapp, TQT_SIGNAL(kdisplayPaletteChanged()), + this, TQT_SLOT(paletteChanged())); } else { - sidePixmap = sideTilePixmap = QPixmap(); + sidePixmap = sideTilePixmap = TQPixmap(); } // add services @@ -235,10 +235,10 @@ void PanelKMenu::initialize() } // insert dynamic menus - QStringList menu_ext = KickerSettings::menuExtensions(); + TQStringList menu_ext = KickerSettings::menuExtensions(); if (!menu_ext.isEmpty()) { - for (QStringList::ConstIterator it=menu_ext.begin(); it!=menu_ext.end(); ++it) + for (TQStringList::ConstIterator it=menu_ext.begin(); it!=menu_ext.end(); ++it) { MenuInfo info(*it); if (!info.isValid()) @@ -259,7 +259,7 @@ void PanelKMenu::initialize() // insert client menus, if any if (clients.count() > 0) { - QIntDictIterator<KickerClientMenu> it(clients); + TQIntDictIterator<KickerClientMenu> it(clients); while (it){ if (it.current()->text.at(0) != '.') insertItem( @@ -279,16 +279,16 @@ void PanelKMenu::initialize() insertItem(KickerLib::menuIconSet("run"), i18n("Run Command..."), this, - SLOT( slotRunCommand())); + TQT_SLOT( slotRunCommand())); insertSeparator(); } if (DM().isSwitchable() && kapp->authorize("switch_user")) { - sessionsMenu = new QPopupMenu( this ); + sessionsMenu = new TQPopupMenu( this ); insertItem(KickerLib::menuIconSet("switchuser"), i18n("Switch User"), sessionsMenu); - connect( sessionsMenu, SIGNAL(aboutToShow()), SLOT(slotPopulateSessions()) ); - connect( sessionsMenu, SIGNAL(activated(int)), SLOT(slotSessionActivated(int)) ); + connect( sessionsMenu, TQT_SIGNAL(aboutToShow()), TQT_SLOT(slotPopulateSessions()) ); + connect( sessionsMenu, TQT_SIGNAL(activated(int)), TQT_SLOT(slotSessionActivated(int)) ); } /* @@ -298,17 +298,17 @@ void PanelKMenu::initialize() ksmserver.setGroup("General"); if (ksmserver.readEntry( "loginMode" ) == "restoreSavedSession") { - insertItem(KickerLib::menuIconSet("filesave"), i18n("Save Session"), this, SLOT(slotSaveSession())); + insertItem(KickerLib::menuIconSet("filesave"), i18n("Save Session"), this, TQT_SLOT(slotSaveSession())); } if (kapp->authorize("lock_screen")) { - insertItem(KickerLib::menuIconSet("lock"), i18n("Lock Session"), this, SLOT(slotLock())); + insertItem(KickerLib::menuIconSet("lock"), i18n("Lock Session"), this, TQT_SLOT(slotLock())); } if (kapp->authorize("logout")) { - insertItem(KickerLib::menuIconSet("exit"), i18n("Log Out..."), this, SLOT(slotLogout())); + insertItem(KickerLib::menuIconSet("exit"), i18n("Log Out..."), this, TQT_SLOT(slotLogout())); } #if 0 @@ -341,7 +341,7 @@ extern int kicker_screen_number; void PanelKMenu::slotLock() { - QCString appname( "kdesktop" ); + TQCString appname( "kdesktop" ); if ( kicker_screen_number ) appname.sprintf("kdesktop-screen-%d", kicker_screen_number); kapp->dcopClient()->send(appname, "KScreensaverIface", "lock()", ""); @@ -421,15 +421,15 @@ void PanelKMenu::doNewSession( bool lock ) void PanelKMenu::slotSaveSession() { - QByteArray data; + TQByteArray data; kapp->dcopClient()->send( "ksmserver", "default", "saveCurrentSession()", data ); } void PanelKMenu::slotRunCommand() { - QByteArray data; - QCString appname( "kdesktop" ); + TQByteArray data; + TQCString appname( "kdesktop" ); if ( kicker_screen_number ) appname.sprintf("kdesktop-screen-%d", kicker_screen_number); @@ -442,12 +442,12 @@ void PanelKMenu::slotEditUserContact() { } -void PanelKMenu::setMinimumSize(const QSize & s) +void PanelKMenu::setMinimumSize(const TQSize & s) { KPanelMenu::setMinimumSize(s.width() + sidePixmap.width(), s.height()); } -void PanelKMenu::setMaximumSize(const QSize & s) +void PanelKMenu::setMaximumSize(const TQSize & s) { KPanelMenu::setMaximumSize(s.width() + sidePixmap.width(), s.height()); } @@ -477,20 +477,20 @@ void PanelKMenu::showMenu() } } -QRect PanelKMenu::sideImageRect() +TQRect PanelKMenu::sideImageRect() { - return QStyle::visualRect( QRect( frameWidth(), frameWidth(), sidePixmap.width(), + return TQStyle::visualRect( TQRect( frameWidth(), frameWidth(), sidePixmap.width(), height() - 2*frameWidth() ), this ); } -void PanelKMenu::resizeEvent(QResizeEvent * e) +void PanelKMenu::resizeEvent(TQResizeEvent * e) { // kdDebug(1210) << "PanelKMenu::resizeEvent():" << endl; // kdDebug(1210) << geometry().width() << ", " << geometry().height() << endl; PanelServiceMenu::resizeEvent(e); - setFrameRect( QStyle::visualRect( QRect( sidePixmap.width(), 0, + setFrameRect( TQStyle::visualRect( TQRect( sidePixmap.width(), 0, width() - sidePixmap.width(), height() ), this ) ); } @@ -501,30 +501,30 @@ void PanelKMenu::resize(int width, int height) PanelServiceMenu::resize(width, height); } -QSize PanelKMenu::sizeHint() const +TQSize PanelKMenu::sizeHint() const { - QSize s = PanelServiceMenu::sizeHint(); + TQSize s = PanelServiceMenu::sizeHint(); // kdDebug(1210) << "PanelKMenu::sizeHint()" << endl; // kdDebug(1210) << s.width() << ", " << s.height() << endl; return s; } -void PanelKMenu::paintEvent(QPaintEvent * e) +void PanelKMenu::paintEvent(TQPaintEvent * e) { if (sidePixmap.isNull()) { PanelServiceMenu::paintEvent(e); return; } - QPainter p(this); + TQPainter p(this); p.setClipRegion(e->region()); - style().drawPrimitive( QStyle::PE_PanelPopup, &p, - QRect( 0, 0, width(), height() ), - colorGroup(), QStyle::Style_Default, - QStyleOption( frameWidth(), 0 ) ); + style().drawPrimitive( TQStyle::PE_PanelPopup, &p, + TQRect( 0, 0, width(), height() ), + colorGroup(), TQStyle::Style_Default, + TQStyleOption( frameWidth(), 0 ) ); - QRect r = sideImageRect(); + TQRect r = sideImageRect(); r.setBottom( r.bottom() - sidePixmap.height() ); if ( r.intersects( e->rect() ) ) { @@ -535,8 +535,8 @@ void PanelKMenu::paintEvent(QPaintEvent * e) r.setTop( r.bottom() - sidePixmap.height() ); if ( r.intersects( e->rect() ) ) { - QRect drawRect = r.intersect( e->rect() ); - QRect pixRect = drawRect; + TQRect drawRect = r.intersect( e->rect() ); + TQRect pixRect = drawRect; pixRect.moveBy( -r.left(), -r.top() ); p.drawPixmap( drawRect.topLeft(), sidePixmap, pixRect ); } @@ -544,40 +544,40 @@ void PanelKMenu::paintEvent(QPaintEvent * e) drawContents( &p ); } -QMouseEvent PanelKMenu::translateMouseEvent( QMouseEvent* e ) +TQMouseEvent PanelKMenu::translateMouseEvent( TQMouseEvent* e ) { - QRect side = sideImageRect(); + TQRect side = sideImageRect(); if ( !side.contains( e->pos() ) ) return *e; - QPoint newpos( e->pos() ); - QApplication::reverseLayout() ? + TQPoint newpos( e->pos() ); + TQApplication::reverseLayout() ? newpos.setX( newpos.x() - side.width() ) : newpos.setX( newpos.x() + side.width() ); - QPoint newglobal( e->globalPos() ); - QApplication::reverseLayout() ? + TQPoint newglobal( e->globalPos() ); + TQApplication::reverseLayout() ? newglobal.setX( newpos.x() - side.width() ) : newglobal.setX( newpos.x() + side.width() ); - return QMouseEvent( e->type(), newpos, newglobal, e->button(), e->state() ); + return TQMouseEvent( e->type(), newpos, newglobal, e->button(), e->state() ); } -void PanelKMenu::mousePressEvent(QMouseEvent * e) +void PanelKMenu::mousePressEvent(TQMouseEvent * e) { - QMouseEvent newEvent = translateMouseEvent(e); + TQMouseEvent newEvent = translateMouseEvent(e); PanelServiceMenu::mousePressEvent( &newEvent ); } -void PanelKMenu::mouseReleaseEvent(QMouseEvent *e) +void PanelKMenu::mouseReleaseEvent(TQMouseEvent *e) { - QMouseEvent newEvent = translateMouseEvent(e); + TQMouseEvent newEvent = translateMouseEvent(e); PanelServiceMenu::mouseReleaseEvent( &newEvent ); } -void PanelKMenu::mouseMoveEvent(QMouseEvent *e) +void PanelKMenu::mouseMoveEvent(TQMouseEvent *e) { - QMouseEvent newEvent = translateMouseEvent(e); + TQMouseEvent newEvent = translateMouseEvent(e); PanelServiceMenu::mouseMoveEvent( &newEvent ); } @@ -593,7 +593,7 @@ void PanelKMenu::createRecentMenuItems() { RecentlyLaunchedApps::the().m_nNumMenuItems = 0; - QStringList RecentApps; + TQStringList RecentApps; RecentlyLaunchedApps::the().getRecentApps(RecentApps); if (RecentApps.count() > 0) @@ -602,7 +602,7 @@ void PanelKMenu::createRecentMenuItems() int nId = serviceMenuEndId() + 1; int nIndex = KickerSettings::showMenuTitles() ? 1 : 0; - for (QValueList<QString>::ConstIterator it = + for (TQValueList<TQString>::ConstIterator it = RecentApps.fromLast(); /*nop*/; --it) { KService::Ptr s = KService::serviceByDesktopPath(*it); @@ -642,7 +642,7 @@ void PanelKMenu::clearSubmenus() { // we don't need to delete these on the way out since the libloader // handles them for us - if (QApplication::closingDown()) + if (TQApplication::closingDown()) { return; } @@ -688,13 +688,13 @@ void PanelKMenu::updateRecent() } // insert new items - QStringList RecentApps; + TQStringList RecentApps; RecentlyLaunchedApps::the().getRecentApps(RecentApps); if (RecentApps.count() > 0) { bool bNeedSeparator = KickerSettings::showMenuTitles(); - for (QValueList<QString>::ConstIterator it = RecentApps.fromLast(); + for (TQValueList<TQString>::ConstIterator it = RecentApps.fromLast(); /*nop*/; --it) { KService::Ptr s = KService::serviceByDesktopPath(*it); diff --git a/kicker/kicker/ui/k_mnu.h b/kicker/kicker/ui/k_mnu.h index f20cde06d..412648f1b 100644 --- a/kicker/kicker/ui/k_mnu.h +++ b/kicker/kicker/ui/k_mnu.h @@ -25,8 +25,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #define __k_mnu_h__ #include <dcopobject.h> -#include <qintdict.h> -#include <qpixmap.h> +#include <tqintdict.h> +#include <tqpixmap.h> #include "service_mnu.h" @@ -42,7 +42,7 @@ class PanelKMenu : public PanelServiceMenu, public DCOPObject K_DCOP k_dcop: - void slotServiceStartedByStorageId(QString starter, QString desktopPath); + void slotServiceStartedByStorageId(TQString starter, TQString desktopPath); public: PanelKMenu(); @@ -51,9 +51,9 @@ public: int insertClientMenu(KickerClientMenu *p); void removeClientMenu(int id); - virtual QSize sizeHint() const; - virtual void setMinimumSize(const QSize &); - virtual void setMaximumSize(const QSize &); + virtual TQSize sizeHint() const; + virtual void setMinimumSize(const TQSize &); + virtual void setMaximumSize(const TQSize &); virtual void setMinimumSize(int, int); virtual void setMaximumSize(int, int); virtual void showMenu(); @@ -78,25 +78,25 @@ protected slots: void updateRecent(); protected: - QRect sideImageRect(); - QMouseEvent translateMouseEvent(QMouseEvent* e); - void resizeEvent(QResizeEvent *); - void paintEvent(QPaintEvent *); - void mousePressEvent(QMouseEvent *); - void mouseReleaseEvent(QMouseEvent *); - void mouseMoveEvent(QMouseEvent *); + TQRect sideImageRect(); + TQMouseEvent translateMouseEvent(TQMouseEvent* e); + void resizeEvent(TQResizeEvent *); + void paintEvent(TQPaintEvent *); + void mousePressEvent(TQMouseEvent *); + void mouseReleaseEvent(TQMouseEvent *); + void mouseMoveEvent(TQMouseEvent *); bool loadSidePixmap(); void doNewSession(bool lock); void createRecentMenuItems(); virtual void clearSubmenus(); private: - QPopupMenu *sessionsMenu; - QPixmap sidePixmap; - QPixmap sideTilePixmap; + TQPopupMenu *sessionsMenu; + TQPixmap sidePixmap; + TQPixmap sideTilePixmap; int client_id; bool delay_init; - QIntDict<KickerClientMenu> clients; + TQIntDict<KickerClientMenu> clients; KBookmarkMenu *bookmarkMenu; KActionCollection *actionCollection; KBookmarkOwner *bookmarkOwner; diff --git a/kicker/kicker/ui/panelmenuiteminfo.h b/kicker/kicker/ui/panelmenuiteminfo.h index 29faca50f..66d0f7d9c 100644 --- a/kicker/kicker/ui/panelmenuiteminfo.h +++ b/kicker/kicker/ui/panelmenuiteminfo.h @@ -24,8 +24,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #ifndef PANELMENUITEMINFO_H #define PANELMENUITEMINFO_H -#include <qpopupmenu.h> -#include <qstring.h> +#include <tqpopupmenu.h> +#include <tqstring.h> #include <kiconloader.h> @@ -38,10 +38,10 @@ class PanelMenuItemInfo PanelMenuItemInfo() : m_recvr(0), m_id(-1) {} - PanelMenuItemInfo(const QString& iconName, const QString& visibleName, const QObject* recvr, const QCString& slot, int id = -1) + PanelMenuItemInfo(const TQString& iconName, const TQString& visibleName, const TQObject* recvr, const TQCString& slot, int id = -1) : m_icon(iconName), m_name(visibleName), m_slot_(slot), m_recvr(recvr), m_id(id) {} - PanelMenuItemInfo(const QString& iconName, const QString& visibleName, int id = -1) + PanelMenuItemInfo(const TQString& iconName, const TQString& visibleName, int id = -1) : m_icon(iconName), m_name(visibleName), m_recvr(0), m_id(id) {} PanelMenuItemInfo(const PanelMenuItemInfo& c) @@ -72,7 +72,7 @@ class PanelMenuItemInfo return m_name.lower() > rh.m_name.lower(); } - int plug(QPopupMenu* menu) + int plug(TQPopupMenu* menu) { if (!m_icon.isEmpty() && m_icon != "unknown") { @@ -92,10 +92,10 @@ class PanelMenuItemInfo } private: - QString m_icon; - QString m_name; - QCString m_slot_; // HPUX namespace is polluted with m_slot - const QObject* m_recvr; + TQString m_icon; + TQString m_name; + TQCString m_slot_; // HPUX namespace is polluted with m_slot + const TQObject* m_recvr; int m_id; }; diff --git a/kicker/kicker/ui/popupmenutitle.cpp b/kicker/kicker/ui/popupmenutitle.cpp index adf44b802..3ea63f2be 100644 --- a/kicker/kicker/ui/popupmenutitle.cpp +++ b/kicker/kicker/ui/popupmenutitle.cpp @@ -24,8 +24,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "popupmenutitle.h" -PopupMenuTitle::PopupMenuTitle(const QString &name, const QFont &font) : - QCustomMenuItem(), +PopupMenuTitle::PopupMenuTitle(const TQString &name, const TQFont &font) : + TQCustomMenuItem(), m_desktopName(name), m_font(font) { diff --git a/kicker/kicker/ui/popupmenutitle.h b/kicker/kicker/ui/popupmenutitle.h index 4724c88c7..439fc195f 100644 --- a/kicker/kicker/ui/popupmenutitle.h +++ b/kicker/kicker/ui/popupmenutitle.h @@ -25,28 +25,28 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #ifndef POPUPMENUTITLE_H #define POPUPMENUTITLE_H -#include <qfont.h> -#include <qstring.h> -#include <qstyle.h> -#include <qpainter.h> -#include <qmenudata.h> +#include <tqfont.h> +#include <tqstring.h> +#include <tqstyle.h> +#include <tqpainter.h> +#include <tqmenudata.h> #include <kapplication.h> class PopupMenuTitle : public QCustomMenuItem { public: - PopupMenuTitle(const QString &name, const QFont &font); + PopupMenuTitle(const TQString &name, const TQFont &font); bool fullSpan () const { return true; } - void paint(QPainter* p, const QColorGroup& cg, + void paint(TQPainter* p, const TQColorGroup& cg, bool /* act */, bool /*enabled*/, int x, int y, int w, int h) { p->save(); - QRect r(x, y, w, h); - kapp->style().drawPrimitive(QStyle::PE_HeaderSection, + TQRect r(x, y, w, h); + kapp->style().drawPrimitive(TQStyle::PE_HeaderSection, p, r, cg); if (!m_desktopName.isEmpty()) @@ -63,23 +63,23 @@ public: p->restore(); } - void setFont(const QFont &font) + void setFont(const TQFont &font) { m_font = font; m_font.setBold(true); } - QSize sizeHint() + TQSize sizeHint() { - QSize size = QFontMetrics(m_font).size(AlignHCenter, m_desktopName); + TQSize size = TQFontMetrics(m_font).size(AlignHCenter, m_desktopName); size.setHeight(size.height() + - (kapp->style().pixelMetric(QStyle::PM_DefaultFrameWidth) * 2 + 1)); + (kapp->style().pixelMetric(TQStyle::PM_DefaultFrameWidth) * 2 + 1)); return size; } private: - QString m_desktopName; - QFont m_font; + TQString m_desktopName; + TQFont m_font; }; #endif diff --git a/kicker/kicker/ui/quickbrowser_mnu.cpp b/kicker/kicker/ui/quickbrowser_mnu.cpp index 583fc1deb..1776f4876 100644 --- a/kicker/kicker/ui/quickbrowser_mnu.cpp +++ b/kicker/kicker/ui/quickbrowser_mnu.cpp @@ -21,7 +21,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ******************************************************************/ -#include <qdir.h> +#include <tqdir.h> #include <kapplication.h> #include <klocale.h> @@ -33,7 +33,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "quickbrowser_mnu.h" #include "quickbrowser_mnu.moc" -PanelQuickBrowser::PanelQuickBrowser(QWidget *parent, const char *name) +PanelQuickBrowser::PanelQuickBrowser(TQWidget *parent, const char *name) : KPanelMenu("", parent, name) {} void PanelQuickBrowser::initialize() @@ -43,17 +43,17 @@ void PanelQuickBrowser::initialize() KURL url; - url.setPath(QDir::homeDirPath()); + url.setPath(TQDir::homeDirPath()); if (kapp->authorizeURLAction("list", KURL(), url)) insertItem(SmallIcon("kfm_home"), i18n("&Home Folder"), new PanelBrowserMenu(url.path(), this)); - url.setPath(QDir::rootDirPath()); + url.setPath(TQDir::rootDirPath()); if (kapp->authorizeURLAction("list", KURL(), url)) insertItem(SmallIcon("folder_red"), i18n("&Root Folder"), new PanelBrowserMenu(url.path(), this)); - url.setPath(QDir::rootDirPath() + "etc"); + url.setPath(TQDir::rootDirPath() + "etc"); if (kapp->authorizeURLAction("list", KURL(), url)) insertItem(SmallIcon("folder_yellow"), i18n("System &Configuration"), new PanelBrowserMenu(url.path(), this)); diff --git a/kicker/kicker/ui/quickbrowser_mnu.h b/kicker/kicker/ui/quickbrowser_mnu.h index 9d9582a8b..01b12d09d 100644 --- a/kicker/kicker/ui/quickbrowser_mnu.h +++ b/kicker/kicker/ui/quickbrowser_mnu.h @@ -31,7 +31,7 @@ class PanelQuickBrowser : public KPanelMenu Q_OBJECT public: - PanelQuickBrowser(QWidget *parent=0, const char *name=0); + PanelQuickBrowser(TQWidget *parent=0, const char *name=0); public slots: virtual void initialize(); diff --git a/kicker/kicker/ui/recentapps.cpp b/kicker/kicker/ui/recentapps.cpp index 54241cb29..473b0cdf2 100644 --- a/kicker/kicker/ui/recentapps.cpp +++ b/kicker/kicker/ui/recentapps.cpp @@ -23,8 +23,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <time.h> -#include <qregexp.h> -#include <qstringlist.h> +#include <tqregexp.h> +#include <tqstringlist.h> #include <dcopclient.h> #include <kapplication.h> @@ -63,17 +63,17 @@ void RecentlyLaunchedApps::init() configChanged(); - QStringList recentApps = KickerSettings::recentAppsStat(); + TQStringList recentApps = KickerSettings::recentAppsStat(); - for (QStringList::ConstIterator it = recentApps.begin(); + for (TQStringList::ConstIterator it = recentApps.begin(); it != recentApps.end(); ++it ) { - QRegExp re( "(\\d*) (\\d*) (.*)" ); + TQRegExp re( "(\\d*) (\\d*) (.*)" ); if (re.search(*it) != -1) { int nCount = re.cap(1).toInt(); long lTime = re.cap(2).toLong(); - QString szPath = re.cap(3); + TQString szPath = re.cap(3); m_appInfos.append(RecentlyLaunchedAppInfo( szPath, nCount, time_t(lTime))); } @@ -91,12 +91,12 @@ void RecentlyLaunchedApps::configChanged() void RecentlyLaunchedApps::save() { - QStringList recentApps; + TQStringList recentApps; - for (QValueList<RecentlyLaunchedAppInfo>::const_iterator it = + for (TQValueList<RecentlyLaunchedAppInfo>::const_iterator it = m_appInfos.constBegin(); it != m_appInfos.constEnd(); ++it) { - recentApps.append(QString("%1 %2 %3").arg((*it).getLaunchCount()) + recentApps.append(TQString("%1 %2 %3").arg((*it).getLaunchCount()) .arg((*it).getLastLaunchTime()) .arg((*it).getDesktopPath())); } @@ -105,17 +105,17 @@ void RecentlyLaunchedApps::save() KickerSettings::writeConfig(); } -void RecentlyLaunchedApps::appLaunched(const QString& strApp) +void RecentlyLaunchedApps::appLaunched(const TQString& strApp) { // Inform other applications (like the quickstarter applet) // that an application was started - QByteArray params; - QDataStream stream(params, IO_WriteOnly); + TQByteArray params; + TQDataStream stream(params, IO_WriteOnly); stream << launchDCOPSignalSource() << strApp; KApplication::kApplication()->dcopClient()->emitDCOPSignal("appLauncher", - "serviceStartedByStorageId(QString,QString)", params); + "serviceStartedByStorageId(TQString,TQString)", params); - for (QValueList<RecentlyLaunchedAppInfo>::iterator it = m_appInfos.begin(); + for (TQValueList<RecentlyLaunchedAppInfo>::iterator it = m_appInfos.begin(); it != m_appInfos.end(); ++it) { if ((*it).getDesktopPath() == strApp) @@ -131,13 +131,13 @@ void RecentlyLaunchedApps::appLaunched(const QString& strApp) qHeapSort(m_appInfos); } -void RecentlyLaunchedApps::getRecentApps(QStringList& recentApps) +void RecentlyLaunchedApps::getRecentApps(TQStringList& recentApps) { recentApps.clear(); int maximumNum = KickerSettings::numVisibleEntries(); int i = 0; - for (QValueList<RecentlyLaunchedAppInfo>::const_iterator it = + for (TQValueList<RecentlyLaunchedAppInfo>::const_iterator it = m_appInfos.constBegin(); it != m_appInfos.constEnd() && i < maximumNum; ++it, ++i) @@ -146,9 +146,9 @@ void RecentlyLaunchedApps::getRecentApps(QStringList& recentApps) } } -void RecentlyLaunchedApps::removeItem( const QString& strName ) +void RecentlyLaunchedApps::removeItem( const TQString& strName ) { - for (QValueList<RecentlyLaunchedAppInfo>::iterator it = m_appInfos.begin(); + for (TQValueList<RecentlyLaunchedAppInfo>::iterator it = m_appInfos.begin(); it != m_appInfos.end(); ++it) { if ((*it).getDesktopPath() == strName) @@ -164,7 +164,7 @@ void RecentlyLaunchedApps::clearRecentApps() m_appInfos.clear(); } -QString RecentlyLaunchedApps::caption() const +TQString RecentlyLaunchedApps::caption() const { return KickerSettings::recentVsOften() ? i18n("Recently Used Applications") : diff --git a/kicker/kicker/ui/recentapps.h b/kicker/kicker/ui/recentapps.h index 0582cc166..4539d86a4 100644 --- a/kicker/kicker/ui/recentapps.h +++ b/kicker/kicker/ui/recentapps.h @@ -24,7 +24,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #ifndef __recentapps_h__ #define __recentapps_h__ -#include <qvaluelist.h> +#include <tqvaluelist.h> class RecentlyLaunchedApps; @@ -37,7 +37,7 @@ public: m_lastLaunchTime = 0; } - RecentlyLaunchedAppInfo(const QString& desktopPath, int nLaunchCount, time_t lastLaunchTime) + RecentlyLaunchedAppInfo(const TQString& desktopPath, int nLaunchCount, time_t lastLaunchTime) { m_desktopPath = desktopPath; m_launchCount = nLaunchCount; @@ -59,7 +59,7 @@ public: m_launchCount > rhs.m_launchCount; } - QString getDesktopPath() const { return m_desktopPath; } + TQString getDesktopPath() const { return m_desktopPath; } int getLaunchCount() const { return m_launchCount; }; time_t getLastLaunchTime() const { return m_lastLaunchTime; }; void increaseLaunchCount() { m_launchCount++; }; @@ -67,7 +67,7 @@ public: void setLastLaunchTime(time_t lastLaunch) { m_lastLaunchTime = lastLaunch; }; private: - QString m_desktopPath; + TQString m_desktopPath; int m_launchCount; time_t m_lastLaunchTime; }; @@ -80,19 +80,19 @@ public: void configChanged(); void save(); void clearRecentApps(); - void appLaunched(const QString & strApp); - void getRecentApps(QStringList & RecentApps); - void removeItem(const QString &strName); - QString caption() const; + void appLaunched(const TQString & strApp); + void getRecentApps(TQStringList & RecentApps); + void removeItem(const TQString &strName); + TQString caption() const; int m_nNumMenuItems; bool m_bNeedToUpdate; private: - QString launchDCOPSignalSource() { return "kmenu"; } + TQString launchDCOPSignalSource() { return "kmenu"; } RecentlyLaunchedApps(); - QValueList<RecentlyLaunchedAppInfo> m_appInfos; + TQValueList<RecentlyLaunchedAppInfo> m_appInfos; bool m_bInitialised; }; diff --git a/kicker/kicker/ui/removeapplet_mnu.cpp b/kicker/kicker/ui/removeapplet_mnu.cpp index fce885f39..2e0543dae 100644 --- a/kicker/kicker/ui/removeapplet_mnu.cpp +++ b/kicker/kicker/ui/removeapplet_mnu.cpp @@ -33,12 +33,12 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "removeapplet_mnu.moc" PanelRemoveAppletMenu::PanelRemoveAppletMenu(ContainerArea* cArea, - QWidget *parent, + TQWidget *parent, const char *name) - : QPopupMenu(parent, name), m_containerArea(cArea) + : TQPopupMenu(parent, name), m_containerArea(cArea) { - connect(this, SIGNAL(activated(int)), SLOT(slotExec(int))); - connect(this, SIGNAL(aboutToShow()), SLOT(slotAboutToShow())); + connect(this, TQT_SIGNAL(activated(int)), TQT_SLOT(slotExec(int))); + connect(this, TQT_SIGNAL(aboutToShow()), TQT_SLOT(slotAboutToShow())); } void PanelRemoveAppletMenu::slotAboutToShow() @@ -49,7 +49,7 @@ void PanelRemoveAppletMenu::slotAboutToShow() m_containers = m_containerArea->containers("Applet") + m_containerArea->containers("Special Button"); - QValueList<PanelMenuItemInfo> items; + TQValueList<PanelMenuItemInfo> items; for (BaseContainer::List::const_iterator it = m_containers.constBegin(); it != m_containers.constEnd();) @@ -71,7 +71,7 @@ void PanelRemoveAppletMenu::slotAboutToShow() qHeapSort(items); - for (QValueList<PanelMenuItemInfo>::iterator it = items.begin(); + for (TQValueList<PanelMenuItemInfo>::iterator it = items.begin(); it != items.end(); ++it) { @@ -81,7 +81,7 @@ void PanelRemoveAppletMenu::slotAboutToShow() if (m_containers.count() > 1) { insertSeparator(); - insertItem(i18n("All"), this, SLOT(slotRemoveAll()), 0, id); + insertItem(i18n("All"), this, TQT_SLOT(slotRemoveAll()), 0, id); } } diff --git a/kicker/kicker/ui/removeapplet_mnu.h b/kicker/kicker/ui/removeapplet_mnu.h index 455a93afd..b444b8540 100644 --- a/kicker/kicker/ui/removeapplet_mnu.h +++ b/kicker/kicker/ui/removeapplet_mnu.h @@ -24,8 +24,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #ifndef __removeapplet_mnu_h__ #define __removeapplet_mnu_h__ -#include <qptrlist.h> -#include <qpopupmenu.h> +#include <tqptrlist.h> +#include <tqpopupmenu.h> #include "appletinfo.h" #include "container_base.h" @@ -37,7 +37,7 @@ class PanelRemoveAppletMenu : public QPopupMenu Q_OBJECT public: - PanelRemoveAppletMenu(ContainerArea* cArea, QWidget* parent = 0, const char* name = 0); + PanelRemoveAppletMenu(ContainerArea* cArea, TQWidget* parent = 0, const char* name = 0); protected slots: void slotExec( int id ); diff --git a/kicker/kicker/ui/removebutton_mnu.cpp b/kicker/kicker/ui/removebutton_mnu.cpp index 33dc48e14..8f02abd67 100644 --- a/kicker/kicker/ui/removebutton_mnu.cpp +++ b/kicker/kicker/ui/removebutton_mnu.cpp @@ -21,7 +21,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ******************************************************************/ -#include <qregexp.h> +#include <tqregexp.h> #include <kiconloader.h> #include <klocale.h> #include <kglobal.h> @@ -37,14 +37,14 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "removebutton_mnu.moc" PanelRemoveButtonMenu::PanelRemoveButtonMenu( ContainerArea* cArea, - QWidget *parent, const char *name ) - : QPopupMenu( parent, name ), containerArea( cArea ) + TQWidget *parent, const char *name ) + : TQPopupMenu( parent, name ), containerArea( cArea ) { - connect(this, SIGNAL(activated(int)), SLOT(slotExec(int))); - connect(this, SIGNAL(aboutToShow()), SLOT(slotAboutToShow())); + connect(this, TQT_SIGNAL(activated(int)), TQT_SLOT(slotExec(int))); + connect(this, TQT_SIGNAL(aboutToShow()), TQT_SLOT(slotAboutToShow())); } -void PanelRemoveButtonMenu::addToContainers(const QString& type) +void PanelRemoveButtonMenu::addToContainers(const TQString& type) { BaseContainer::List list = containerArea->containers(type); for (BaseContainer::Iterator it = list.begin(); @@ -70,7 +70,7 @@ void PanelRemoveButtonMenu::slotAboutToShow() addToContainers("ExecButton"); int id = 0; - QValueList<PanelMenuItemInfo> items; + TQValueList<PanelMenuItemInfo> items; for (BaseContainer::Iterator it = containers.begin(); it != containers.end(); ++it) { items.append(PanelMenuItemInfo((*it)->icon(), (*it)->visibleName(), id)); @@ -79,7 +79,7 @@ void PanelRemoveButtonMenu::slotAboutToShow() qHeapSort(items); - for (QValueList<PanelMenuItemInfo>::iterator it = items.begin(); + for (TQValueList<PanelMenuItemInfo>::iterator it = items.begin(); it != items.end(); ++it) { @@ -89,7 +89,7 @@ void PanelRemoveButtonMenu::slotAboutToShow() if (containers.count() > 1) { insertSeparator(); - insertItem(i18n("All"), this, SLOT(slotRemoveAll()), 0, id); + insertItem(i18n("All"), this, TQT_SLOT(slotRemoveAll()), 0, id); } } diff --git a/kicker/kicker/ui/removebutton_mnu.h b/kicker/kicker/ui/removebutton_mnu.h index 20d29c171..d326a2f62 100644 --- a/kicker/kicker/ui/removebutton_mnu.h +++ b/kicker/kicker/ui/removebutton_mnu.h @@ -24,8 +24,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #ifndef __removebutton_mnu_h__ #define __removebutton_mnu_h__ -#include <qptrlist.h> -#include <qpopupmenu.h> +#include <tqptrlist.h> +#include <tqpopupmenu.h> #include "appletinfo.h" #include "container_base.h" @@ -37,7 +37,7 @@ class PanelRemoveButtonMenu : public QPopupMenu Q_OBJECT public: - PanelRemoveButtonMenu( ContainerArea *cArea, QWidget *parent=0, const char *name=0 ); + PanelRemoveButtonMenu( ContainerArea *cArea, TQWidget *parent=0, const char *name=0 ); ~PanelRemoveButtonMenu(); protected slots: @@ -46,7 +46,7 @@ protected slots: void slotRemoveAll(); private: - void addToContainers(const QString& type); + void addToContainers(const TQString& type); BaseContainer::List containers; ContainerArea* containerArea; diff --git a/kicker/kicker/ui/removecontainer_mnu.cpp b/kicker/kicker/ui/removecontainer_mnu.cpp index ddce1f2df..9d6d19eaf 100644 --- a/kicker/kicker/ui/removecontainer_mnu.cpp +++ b/kicker/kicker/ui/removecontainer_mnu.cpp @@ -36,15 +36,15 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "containerarea.h" RemoveContainerMenu::RemoveContainerMenu( ContainerArea* cArea, - QWidget *parent, const char *name) - : QPopupMenu( parent, name ), containerArea( cArea ) + TQWidget *parent, const char *name) + : TQPopupMenu( parent, name ), containerArea( cArea ) { appletId = insertItem(i18n("&Applet"), new PanelRemoveAppletMenu(containerArea, this)); buttonId = insertItem(i18n("Appli&cation"), new PanelRemoveButtonMenu( containerArea, this ) ); adjustSize(); - connect( this, SIGNAL( aboutToShow() ), SLOT( slotAboutToShow() ) ); + connect( this, TQT_SIGNAL( aboutToShow() ), TQT_SLOT( slotAboutToShow() ) ); } RemoveContainerMenu::~RemoveContainerMenu() diff --git a/kicker/kicker/ui/removecontainer_mnu.h b/kicker/kicker/ui/removecontainer_mnu.h index 9d7142671..6dd28dc30 100644 --- a/kicker/kicker/ui/removecontainer_mnu.h +++ b/kicker/kicker/ui/removecontainer_mnu.h @@ -24,7 +24,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #ifndef __removecontainer_mnu_h__ #define __removecontainer_mnu_h__ -#include <qpopupmenu.h> +#include <tqpopupmenu.h> class ContainerArea; @@ -33,7 +33,7 @@ class RemoveContainerMenu : public QPopupMenu Q_OBJECT public: - RemoveContainerMenu(ContainerArea* cArea, QWidget *parent=0, const char *name=0); + RemoveContainerMenu(ContainerArea* cArea, TQWidget *parent=0, const char *name=0); ~RemoveContainerMenu(); protected slots: diff --git a/kicker/kicker/ui/removeextension_mnu.cpp b/kicker/kicker/ui/removeextension_mnu.cpp index 7f7d09075..9d5d80d2b 100644 --- a/kicker/kicker/ui/removeextension_mnu.cpp +++ b/kicker/kicker/ui/removeextension_mnu.cpp @@ -34,11 +34,11 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. static const int REMOVEALLID = 1000; -PanelRemoveExtensionMenu::PanelRemoveExtensionMenu( QWidget *parent, const char *name ) - : QPopupMenu( parent, name ) +PanelRemoveExtensionMenu::PanelRemoveExtensionMenu( TQWidget *parent, const char *name ) + : TQPopupMenu( parent, name ) { - connect(this, SIGNAL(activated(int)), SLOT(slotExec(int))); - connect(this, SIGNAL(aboutToShow()), SLOT(slotAboutToShow())); + connect(this, TQT_SIGNAL(activated(int)), TQT_SLOT(slotExec(int))); + connect(this, TQT_SIGNAL(aboutToShow()), TQT_SLOT(slotAboutToShow())); } PanelRemoveExtensionMenu::PanelRemoveExtensionMenu() @@ -51,13 +51,13 @@ void PanelRemoveExtensionMenu::slotAboutToShow() clear(); m_containers = ExtensionManager::the()->containers(); - QValueList<PanelMenuItemInfo> items; + TQValueList<PanelMenuItemInfo> items; ExtensionList::iterator itEnd = m_containers.end(); for (ExtensionList::iterator it = m_containers.begin(); it != itEnd; ++it) { const AppletInfo info = (*it)->info(); - QString name = info.name().replace("&", "&&"); + TQString name = info.name().replace("&", "&&"); switch ((*it)->position()) { case KPanelExtension::Top: @@ -76,13 +76,13 @@ void PanelRemoveExtensionMenu::slotAboutToShow() name = i18n("%1 (Floating)").arg(name); break; } - items.append(PanelMenuItemInfo(QString::null, name, id)); + items.append(PanelMenuItemInfo(TQString::null, name, id)); ++id; } qHeapSort(items); - QValueList<PanelMenuItemInfo>::iterator itEnd2 = items.end(); - for (QValueList<PanelMenuItemInfo>::iterator it = items.begin(); it != itEnd2; ++it) + TQValueList<PanelMenuItemInfo>::iterator itEnd2 = items.end(); + for (TQValueList<PanelMenuItemInfo>::iterator it = items.begin(); it != itEnd2; ++it) { (*it).plug(this); } diff --git a/kicker/kicker/ui/removeextension_mnu.h b/kicker/kicker/ui/removeextension_mnu.h index bc0e08b00..2fc83008a 100644 --- a/kicker/kicker/ui/removeextension_mnu.h +++ b/kicker/kicker/ui/removeextension_mnu.h @@ -24,8 +24,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #ifndef __removeextension_mnu_h__ #define __removeextension_mnu_h__ -#include <qptrlist.h> -#include <qpopupmenu.h> +#include <tqptrlist.h> +#include <tqpopupmenu.h> #include "container_extension.h" @@ -34,7 +34,7 @@ class PanelRemoveExtensionMenu : public QPopupMenu Q_OBJECT public: - PanelRemoveExtensionMenu( QWidget *parent=0, const char *name=0 ); + PanelRemoveExtensionMenu( TQWidget *parent=0, const char *name=0 ); PanelRemoveExtensionMenu(); protected slots: diff --git a/kicker/kicker/ui/service_mnu.cpp b/kicker/kicker/ui/service_mnu.cpp index a59c14ce8..9b46b2396 100644 --- a/kicker/kicker/ui/service_mnu.cpp +++ b/kicker/kicker/ui/service_mnu.cpp @@ -22,10 +22,10 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ******************************************************************/ #include <typeinfo> -#include <qcursor.h> -#include <qbitmap.h> -#include <qpixmap.h> -#include <qimage.h> +#include <tqcursor.h> +#include <tqbitmap.h> +#include <tqpixmap.h> +#include <tqimage.h> #include <dcopclient.h> #include <kapplication.h> @@ -55,8 +55,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "service_mnu.h" #include "service_mnu.moc" -PanelServiceMenu::PanelServiceMenu(const QString & label, const QString & relPath, QWidget * parent, - const char * name, bool addmenumode, const QString & insertInlineHeader) +PanelServiceMenu::PanelServiceMenu(const TQString & label, const TQString & relPath, TQWidget * parent, + const char * name, bool addmenumode, const TQString & insertInlineHeader) : KPanelMenu(label, parent, name), relPath_(relPath), insertInlineHeader_( insertInlineHeader ), @@ -66,9 +66,9 @@ PanelServiceMenu::PanelServiceMenu(const QString & label, const QString & relPat { excludeNoDisplay_=true; - connect(KSycoca::self(), SIGNAL(databaseChanged()), - SLOT(slotClearOnClose())); - connect(this, SIGNAL(aboutToHide()), this, SLOT(slotClose())); + connect(KSycoca::self(), TQT_SIGNAL(databaseChanged()), + TQT_SLOT(slotClearOnClose())); + connect(this, TQT_SIGNAL(aboutToHide()), this, TQT_SLOT(slotClose())); } PanelServiceMenu::~PanelServiceMenu() @@ -84,7 +84,7 @@ void PanelServiceMenu::setExcludeNoDisplay( bool flag ) void PanelServiceMenu::showMenu() { - activateParent(QString::null); + activateParent(TQString::null); } // the initialization is split in initialize() and @@ -105,10 +105,10 @@ void PanelServiceMenu::initialize() void PanelServiceMenu::fillMenu(KServiceGroup::Ptr& _root, KServiceGroup::List& _list, - const QString& /* _relPath */, + const TQString& /* _relPath */, int& id) { - QStringList suppressGenericNames = _root->suppressGenericNames(); + TQStringList suppressGenericNames = _root->suppressGenericNames(); KServiceGroup::List::ConstIterator it = _list.begin(); bool separatorNeeded = false; @@ -120,7 +120,7 @@ void PanelServiceMenu::fillMenu(KServiceGroup::Ptr& _root, { KServiceGroup::Ptr g(static_cast<KServiceGroup *>(e)); - QString groupCaption = g->caption(); + TQString groupCaption = g->caption(); // Avoid adding empty groups. KServiceGroup::Ptr subMenuRoot = KServiceGroup::group(g->relPath()); @@ -131,7 +131,7 @@ void PanelServiceMenu::fillMenu(KServiceGroup::Ptr& _root, continue; } - QString inlineHeaderName = g->showInlineHeader() ? groupCaption : ""; + TQString inlineHeaderName = g->showInlineHeader() ? groupCaption : ""; // Item names may contain ampersands. To avoid them being converted // to accelerators, replace them with two ampersands. groupCaption.replace("&", "&&"); @@ -192,7 +192,7 @@ void PanelServiceMenu::fillMenu(KServiceGroup::Ptr& _root, newSubMenu(g->name(), g->relPath(), this, g->name().utf8(), inlineHeaderName); m->setCaption(groupCaption); - QIconSet iconset = KickerLib::menuIconSet(g->icon()); + TQIconSet iconset = KickerLib::menuIconSet(g->icon()); if (separatorNeeded) { @@ -248,7 +248,7 @@ void PanelServiceMenu::doInitialize() // Set the startposition outside the panel, so there is no drag initiated // when we use drag and click to select items. A drag is only initiated when // you click to open the menu, and then press and drag an item. - startPos_ = QPoint(-1,-1); + startPos_ = TQPoint(-1,-1); // We ask KSycoca to give us all services (sorted). KServiceGroup::Ptr root = KServiceGroup::group(relPath_); @@ -272,7 +272,7 @@ void PanelServiceMenu::doInitialize() if (relPath_ == "") { insertItem(KickerLib::menuIconSet("exec"), i18n("Add Non-KDE Application"), - this, SLOT(addNonKDEApp())); + this, TQT_SLOT(addNonKDEApp())); } if (list.count() > 0) { @@ -295,11 +295,11 @@ void PanelServiceMenu::configChanged() void PanelServiceMenu::insertMenuItem(KService::Ptr & s, int nId, int nIndex/*= -1*/, - const QStringList *suppressGenericNames /* = 0 */, - const QString & aliasname) + const TQStringList *suppressGenericNames /* = 0 */, + const TQString & aliasname) { - QString serviceName = (aliasname.isEmpty() ? s->name() : aliasname).simplifyWhiteSpace(); - QString comment = s->genericName().simplifyWhiteSpace(); + TQString serviceName = (aliasname.isEmpty() ? s->name() : aliasname).simplifyWhiteSpace(); + TQString comment = s->genericName().simplifyWhiteSpace(); if (!comment.isEmpty()) { @@ -351,7 +351,7 @@ void PanelServiceMenu::insertMenuItem(KService::Ptr & s, int nId, entryMap_.insert(newId, static_cast<KSycocaEntry*>(s)); } -void PanelServiceMenu::activateParent(const QString &child) +void PanelServiceMenu::activateParent(const TQString &child) { PanelServiceMenu *parentMenu = dynamic_cast<PanelServiceMenu*>(parent()); if (parentMenu) @@ -389,7 +389,7 @@ void PanelServiceMenu::activateParent(const QString &child) } } -bool PanelServiceMenu::highlightMenuItem( const QString &menuItemId ) +bool PanelServiceMenu::highlightMenuItem( const TQString &menuItemId ) { initialize(); @@ -406,13 +406,13 @@ bool PanelServiceMenu::highlightMenuItem( const QString &menuItemId ) static_cast<KSycocaEntry*>(mapIt.data())); if (s && (s->menuId() == menuItemId)) { - activateParent(QString::null); + activateParent(TQString::null); int index = indexOf(mapIt.key()); setActiveItem(index); // Warp mouse pointer to location of active item - QRect r = itemGeometry(index); - QCursor::setPos(mapToGlobal(QPoint(r.x()+ r.width() - 15, + TQRect r = itemGeometry(index); + TQCursor::setPos(mapToGlobal(TQPoint(r.x()+ r.width() - 15, r.y() + r.height() - 5))); return true; } @@ -442,19 +442,19 @@ void PanelServiceMenu::slotExec(int id) KService::Ptr service = static_cast<KService *>(e); KApplication::startServiceByDesktopPath(service->desktopEntryPath(), - QStringList(), 0, 0, 0, "", true); + TQStringList(), 0, 0, 0, "", true); updateRecentlyUsedApps(service); - startPos_ = QPoint(-1,-1); + startPos_ = TQPoint(-1,-1); } -void PanelServiceMenu::mousePressEvent(QMouseEvent * ev) +void PanelServiceMenu::mousePressEvent(TQMouseEvent * ev) { startPos_ = ev->pos(); KPanelMenu::mousePressEvent(ev); } -void PanelServiceMenu::mouseReleaseEvent(QMouseEvent * ev) +void PanelServiceMenu::mouseReleaseEvent(TQMouseEvent * ev) { if (ev->button() == RightButton && !Kicker::the()->isKioskImmutable()) { @@ -475,7 +475,7 @@ void PanelServiceMenu::mouseReleaseEvent(QMouseEvent * ev) delete popupMenu_; popupMenu_ = new KPopupMenu(this); - connect(popupMenu_, SIGNAL(activated(int)), SLOT(slotContextMenu(int))); + connect(popupMenu_, TQT_SIGNAL(activated(int)), TQT_SLOT(slotContextMenu(int))); bool hasEntries = false; switch (contextKSycocaEntry_->sycocaType()) @@ -552,8 +552,8 @@ void PanelServiceMenu::slotContextMenu(int selected) KProcess *proc; KService::Ptr service; KServiceGroup::Ptr g; - QByteArray ba; - QDataStream ds(ba, IO_WriteOnly); + TQByteArray ba; + TQDataStream ds(ba, IO_WriteOnly); KURL src,dest; KIO::CopyJob *job; @@ -572,29 +572,29 @@ void PanelServiceMenu::slotContextMenu(int selected) break; case AddItemToPanel: { - QCString appname = "kicker"; + TQCString appname = "kicker"; if ( kicker_screen_number ) appname.sprintf("kicker-screen-%d", kicker_screen_number); service = static_cast<KService *>(contextKSycocaEntry_); - kapp->dcopClient()->send(appname, "Panel", "addServiceButton(QString)", service->desktopEntryPath()); + kapp->dcopClient()->send(appname, "Panel", "addServiceButton(TQString)", service->desktopEntryPath()); break; } case EditItem: proc = new KProcess(this); - *proc << KStandardDirs::findExe(QString::fromLatin1("kmenuedit")); + *proc << KStandardDirs::findExe(TQString::fromLatin1("kmenuedit")); *proc << "/"+relPath_ << static_cast<KService *>(contextKSycocaEntry_)->menuId(); proc->start(); break; case PutIntoRunDialog: { close(); - QCString appname = "kdesktop"; + TQCString appname = "kdesktop"; if ( kicker_screen_number ) appname.sprintf("kdesktop-screen-%d", kicker_screen_number); service = static_cast<KService *>(contextKSycocaEntry_); kapp->updateRemoteUserTimestamp( appname ); - kapp->dcopClient()->send(appname, "default", "popupExecuteCommand(QString)", service->exec()); + kapp->dcopClient()->send(appname, "default", "popupExecuteCommand(TQString)", service->exec()); break; } @@ -614,19 +614,19 @@ void PanelServiceMenu::slotContextMenu(int selected) break; case AddMenuToPanel: { - QCString appname = "kicker"; + TQCString appname = "kicker"; if ( kicker_screen_number ) appname.sprintf("kicker-screen-%d", kicker_screen_number); g = static_cast<KServiceGroup *>(contextKSycocaEntry_); ds << "foo" << g->relPath(); - kapp->dcopClient()->send("kicker", "Panel", "addServiceMenuButton(QString,QString)", ba); + kapp->dcopClient()->send("kicker", "Panel", "addServiceMenuButton(TQString,TQString)", ba); break; } case EditMenu: proc = new KProcess(this); - *proc << KStandardDirs::findExe(QString::fromLatin1("kmenuedit")); + *proc << KStandardDirs::findExe(TQString::fromLatin1("kmenuedit")); *proc << "/"+static_cast<KServiceGroup *>(contextKSycocaEntry_)->relPath(); proc->start(); break; @@ -636,7 +636,7 @@ void PanelServiceMenu::slotContextMenu(int selected) } } -void PanelServiceMenu::mouseMoveEvent(QMouseEvent * ev) +void PanelServiceMenu::mouseMoveEvent(TQMouseEvent * ev) { KPanelMenu::mouseMoveEvent(ev); @@ -646,8 +646,8 @@ void PanelServiceMenu::mouseMoveEvent(QMouseEvent * ev) if ( (ev->state() & LeftButton ) != LeftButton ) return; - QPoint p = ev->pos() - startPos_; - if (p.manhattanLength() <= QApplication::startDragDistance() ) + TQPoint p = ev->pos() - startPos_; + if (p.manhattanLength() <= TQApplication::startDragDistance() ) return; int id = idAt(startPos_); @@ -663,7 +663,7 @@ void PanelServiceMenu::mouseMoveEvent(QMouseEvent * ev) KSycocaEntry * e = entryMap_[id]; - QPixmap icon; + TQPixmap icon; KURL url; switch (e->sycocaType()) { @@ -671,7 +671,7 @@ void PanelServiceMenu::mouseMoveEvent(QMouseEvent * ev) case KST_KService: { icon = static_cast<KService *>(e)->pixmap(KIcon::Small); - QString filePath = static_cast<KService *>(e)->desktopEntryPath(); + TQString filePath = static_cast<KService *>(e)->desktopEntryPath(); if (filePath[0] != '/') { filePath = locate("apps", filePath); @@ -699,17 +699,17 @@ void PanelServiceMenu::mouseMoveEvent(QMouseEvent * ev) // path from KStdDirs. KURLDrag *d = new KURLDrag(KURL::List(url), this); - connect(d, SIGNAL(destroyed()), this, SLOT(slotDragObjectDestroyed())); + connect(d, TQT_SIGNAL(destroyed()), this, TQT_SLOT(slotDragObjectDestroyed())); d->setPixmap(icon); d->dragCopy(); // Set the startposition outside the panel, so there is no drag initiated // when we use drag and click to select items. A drag is only initiated when // you click to open the menu, and then press and drag an item. - startPos_ = QPoint(-1,-1); + startPos_ = TQPoint(-1,-1); } -void PanelServiceMenu::dragEnterEvent(QDragEnterEvent *event) +void PanelServiceMenu::dragEnterEvent(TQDragEnterEvent *event) { // Set the DragObject's target to this widget. This is needed because the // widget doesn't accept drops, but we want to determine if the drag object @@ -722,10 +722,10 @@ void PanelServiceMenu::dragEnterEvent(QDragEnterEvent *event) event->ignore(); } -void PanelServiceMenu::dragLeaveEvent(QDragLeaveEvent *) +void PanelServiceMenu::dragLeaveEvent(TQDragLeaveEvent *) { // see PanelServiceMenu::dragEnterEvent why this is nescessary - if (!frameGeometry().contains(QCursor::pos())) + if (!frameGeometry().contains(TQCursor::pos())) { KURLDrag::setTarget(0); } @@ -742,12 +742,12 @@ void PanelServiceMenu::slotDragObjectDestroyed() // the execution of any code after the original exec() statement // though the panels themselves continue on otherwise normally // (we just have some sort of nested event loop) - QTimer::singleShot(0, this, SLOT(close())); + TQTimer::singleShot(0, this, TQT_SLOT(close())); } } -PanelServiceMenu *PanelServiceMenu::newSubMenu(const QString & label, const QString & relPath, - QWidget * parent, const char * name, const QString& _inlineHeader) +PanelServiceMenu *PanelServiceMenu::newSubMenu(const TQString & label, const TQString & relPath, + TQWidget * parent, const char * name, const TQString& _inlineHeader) { return new PanelServiceMenu(label, relPath, parent, name, false,_inlineHeader); } @@ -783,7 +783,7 @@ void PanelServiceMenu::slotClear() // QPopupMenu's aboutToHide() is emitted before the popup is really hidden, // and also before a click in the menu is handled, so do the clearing // only after that has been handled - QTimer::singleShot(100, this, SLOT(slotClear())); + TQTimer::singleShot(100, this, TQT_SLOT(slotClear())); return; } @@ -807,7 +807,7 @@ void PanelServiceMenu::selectFirstItem() // updates "recent" section of KMenu void PanelServiceMenu::updateRecentlyUsedApps(KService::Ptr &service) { - QString strItem(service->desktopEntryPath()); + TQString strItem(service->desktopEntryPath()); // don't add an item from root kmenu level if (!strItem.contains('/')) diff --git a/kicker/kicker/ui/service_mnu.h b/kicker/kicker/ui/service_mnu.h index 9e28acd3f..3bc112348 100644 --- a/kicker/kicker/ui/service_mnu.h +++ b/kicker/kicker/ui/service_mnu.h @@ -24,8 +24,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #ifndef SERVICE_MENU_H #define SERVICE_MENU_H -#include <qmap.h> -#include <qvaluevector.h> +#include <tqmap.h> +#include <tqvaluevector.h> #include <ksycocaentry.h> #include <kservice.h> @@ -41,32 +41,32 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * @author Rik Hemsley <rik@kde.org> */ -typedef QMap<int, KSycocaEntry::Ptr> EntryMap; -typedef QValueVector<QPopupMenu*> PopupMenuList; +typedef TQMap<int, KSycocaEntry::Ptr> EntryMap; +typedef TQValueVector<TQPopupMenu*> PopupMenuList; class KDE_EXPORT PanelServiceMenu : public KPanelMenu { Q_OBJECT public: - PanelServiceMenu(const QString & label, const QString & relPath, - QWidget* parent = 0, const char* name = 0, + PanelServiceMenu(const TQString & label, const TQString & relPath, + TQWidget* parent = 0, const char* name = 0, bool addmenumode = false, - const QString &insertInlineHeader = QString::null); + const TQString &insertInlineHeader = TQString::null); virtual ~PanelServiceMenu(); - QString relPath() { return relPath_; } + TQString relPath() { return relPath_; } void setExcludeNoDisplay( bool flag ); virtual void showMenu(); - bool highlightMenuItem( const QString &menuId ); + bool highlightMenuItem( const TQString &menuId ); void selectFirstItem(); private: void fillMenu( KServiceGroup::Ptr &_root, KServiceGroup::List &_list, - const QString &_relPath, int & id ); + const TQString &_relPath, int & id ); protected slots: virtual void initialize(); @@ -82,37 +82,37 @@ protected slots: protected: void insertMenuItem(KService::Ptr & s, int nId, int nIndex = -1, - const QStringList *suppressGenericNames=0, - const QString &aliasname = QString::null); - virtual PanelServiceMenu * newSubMenu(const QString & label, - const QString & relPath, - QWidget * parent, const char * name, - const QString & _inlineHeader = - QString::null); - - virtual void mousePressEvent(QMouseEvent *); - virtual void mouseReleaseEvent(QMouseEvent *); - virtual void mouseMoveEvent(QMouseEvent *); - virtual void dragEnterEvent(QDragEnterEvent *); - virtual void dragLeaveEvent(QDragLeaveEvent *); + const TQStringList *suppressGenericNames=0, + const TQString &aliasname = TQString::null); + virtual PanelServiceMenu * newSubMenu(const TQString & label, + const TQString & relPath, + TQWidget * parent, const char * name, + const TQString & _inlineHeader = + TQString::null); + + virtual void mousePressEvent(TQMouseEvent *); + virtual void mouseReleaseEvent(TQMouseEvent *); + virtual void mouseMoveEvent(TQMouseEvent *); + virtual void dragEnterEvent(TQDragEnterEvent *); + virtual void dragLeaveEvent(TQDragLeaveEvent *); virtual void updateRecentlyUsedApps(KService::Ptr &s); - void activateParent(const QString &child); + void activateParent(const TQString &child); int serviceMenuStartId() { return 4242; } int serviceMenuEndId() { return 5242; } virtual void clearSubmenus(); void doInitialize(); - QString relPath_; + TQString relPath_; EntryMap entryMap_; bool loaded_; bool excludeNoDisplay_; - QString insertInlineHeader_; - QPopupMenu * opPopup_; + TQString insertInlineHeader_; + TQPopupMenu * opPopup_; bool clearOnClose_; bool addmenumode_; - QPoint startPos_; + TQPoint startPos_; PopupMenuList subMenus; private slots: |