diff options
Diffstat (limited to 'kicker/kicker/ui')
46 files changed, 681 insertions, 681 deletions
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: |