summaryrefslogtreecommitdiffstats
path: root/kicker/kicker/buttons
diff options
context:
space:
mode:
Diffstat (limited to 'kicker/kicker/buttons')
-rw-r--r--kicker/kicker/buttons/bookmarksbutton.h2
-rw-r--r--kicker/kicker/buttons/browserbutton.cpp2
-rw-r--r--kicker/kicker/buttons/browserbutton.h2
-rw-r--r--kicker/kicker/buttons/desktopbutton.cpp4
-rw-r--r--kicker/kicker/buttons/desktopbutton.h2
-rw-r--r--kicker/kicker/buttons/extensionbutton.h2
-rw-r--r--kicker/kicker/buttons/kbutton.h2
-rw-r--r--kicker/kicker/buttons/knewbutton.cpp8
-rw-r--r--kicker/kicker/buttons/knewbutton.h2
-rw-r--r--kicker/kicker/buttons/nontdeappbutton.cpp8
-rw-r--r--kicker/kicker/buttons/nontdeappbutton.h4
-rw-r--r--kicker/kicker/buttons/servicebutton.cpp12
-rw-r--r--kicker/kicker/buttons/servicebutton.h2
-rw-r--r--kicker/kicker/buttons/servicemenubutton.h2
-rw-r--r--kicker/kicker/buttons/urlbutton.cpp4
-rw-r--r--kicker/kicker/buttons/urlbutton.h2
-rw-r--r--kicker/kicker/buttons/windowlistbutton.h2
17 files changed, 31 insertions, 31 deletions
diff --git a/kicker/kicker/buttons/bookmarksbutton.h b/kicker/kicker/buttons/bookmarksbutton.h
index bb6d450e1..18d03214c 100644
--- a/kicker/kicker/buttons/bookmarksbutton.h
+++ b/kicker/kicker/buttons/bookmarksbutton.h
@@ -36,7 +36,7 @@ class KBookmarkOwner;
*/
class BookmarksButton : public PanelPopupButton
{
- Q_OBJECT
+ TQ_OBJECT
public:
BookmarksButton(TQWidget* parent);
diff --git a/kicker/kicker/buttons/browserbutton.cpp b/kicker/kicker/buttons/browserbutton.cpp
index 71f2d0504..7ab5de6de 100644
--- a/kicker/kicker/buttons/browserbutton.cpp
+++ b/kicker/kicker/buttons/browserbutton.cpp
@@ -66,7 +66,7 @@ void BrowserButton::initialize( const TQString& icon, const TQString& path )
setPopup(topMenu);
_menuTimer = new TQTimer( this, "_menuTimer" );
- connect( _menuTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotDelayedPopup()) );
+ connect( _menuTimer, TQ_SIGNAL(timeout()), TQ_SLOT(slotDelayedPopup()) );
TQToolTip::add(this, i18n("Browse: %1").arg(path));
setTitle( path );
diff --git a/kicker/kicker/buttons/browserbutton.h b/kicker/kicker/buttons/browserbutton.h
index 507a764ed..627368472 100644
--- a/kicker/kicker/buttons/browserbutton.h
+++ b/kicker/kicker/buttons/browserbutton.h
@@ -33,7 +33,7 @@ class PanelBrowserMenu;
*/
class BrowserButton : public PanelPopupButton
{
- Q_OBJECT
+ TQ_OBJECT
public:
BrowserButton( const TQString& icon, const TQString& startDir, TQWidget* parent );
diff --git a/kicker/kicker/buttons/desktopbutton.cpp b/kicker/kicker/buttons/desktopbutton.cpp
index fe70954f9..b548579f6 100644
--- a/kicker/kicker/buttons/desktopbutton.cpp
+++ b/kicker/kicker/buttons/desktopbutton.cpp
@@ -45,8 +45,8 @@ DesktopButton::DesktopButton( TQWidget* parent )
setTitle(i18n("Desktop Access"));
setIcon("desktop");
- connect( this, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(showDesktop(bool)) );
- connect( ShowDesktop::the(), TQT_SIGNAL(desktopShown(bool)), this, TQT_SLOT(toggle(bool)) );
+ connect( this, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(showDesktop(bool)) );
+ connect( ShowDesktop::the(), TQ_SIGNAL(desktopShown(bool)), this, TQ_SLOT(toggle(bool)) );
setOn( ShowDesktop::the()->desktopShowing() );
}
diff --git a/kicker/kicker/buttons/desktopbutton.h b/kicker/kicker/buttons/desktopbutton.h
index c896bdf92..3ea98a49e 100644
--- a/kicker/kicker/buttons/desktopbutton.h
+++ b/kicker/kicker/buttons/desktopbutton.h
@@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
class DesktopButton : public PanelButton
{
- Q_OBJECT
+ TQ_OBJECT
public:
DesktopButton( TQWidget* parent );
diff --git a/kicker/kicker/buttons/extensionbutton.h b/kicker/kicker/buttons/extensionbutton.h
index 2d2d2d1f2..3c9932655 100644
--- a/kicker/kicker/buttons/extensionbutton.h
+++ b/kicker/kicker/buttons/extensionbutton.h
@@ -31,7 +31,7 @@ class KPanelMenu;
class ExtensionButton : public PanelPopupButton
{
- Q_OBJECT
+ TQ_OBJECT
public:
ExtensionButton( const TQString& desktopFile, TQWidget* parent );
diff --git a/kicker/kicker/buttons/kbutton.h b/kicker/kicker/buttons/kbutton.h
index 896bf56c2..fd34e5104 100644
--- a/kicker/kicker/buttons/kbutton.h
+++ b/kicker/kicker/buttons/kbutton.h
@@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
class KButton : public PanelPopupButton
{
- Q_OBJECT
+ TQ_OBJECT
public:
KButton( TQWidget *parent );
diff --git a/kicker/kicker/buttons/knewbutton.cpp b/kicker/kicker/buttons/knewbutton.cpp
index ee5fa9c1f..ee3a942e5 100644
--- a/kicker/kicker/buttons/knewbutton.cpp
+++ b/kicker/kicker/buttons/knewbutton.cpp
@@ -100,7 +100,7 @@ void KNewButton::show()
KButton::show();
if (KickerSettings::firstRun()) {
- TQTimer::singleShot(0,this,TQT_SLOT(slotExecMenu()));
+ TQTimer::singleShot(0,this,TQ_SLOT(slotExecMenu()));
KickerSettings::setFirstRun(false);
KickerSettings::writeConfig();
}
@@ -112,11 +112,11 @@ bool KNewButton::eventFilter(TQObject *o, TQEvent *e)
e->type() == TQEvent::MouseButtonPress ||
e->type() == TQEvent::MouseButtonDblClick )
{
- TQMouseEvent *me = TQT_TQMOUSEEVENT(e);
- if (TQT_TQRECT_OBJECT(rect()).contains(mapFromGlobal(me->globalPos())))
+ TQMouseEvent *me = static_cast<TQMouseEvent*>(e);
+ if (rect().contains(mapFromGlobal(me->globalPos())))
{
if (m_pressedDuringPopup && m_popup && m_openTimer != -1
- && (me->button() & Qt::LeftButton) )
+ && (me->button() & TQt::LeftButton) )
return true;
}
}
diff --git a/kicker/kicker/buttons/knewbutton.h b/kicker/kicker/buttons/knewbutton.h
index 1bdbbafbd..d38df07c6 100644
--- a/kicker/kicker/buttons/knewbutton.h
+++ b/kicker/kicker/buttons/knewbutton.h
@@ -35,7 +35,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
class KNewButton : public KButton
{
- Q_OBJECT
+ TQ_OBJECT
public:
KNewButton( TQWidget *parent );
diff --git a/kicker/kicker/buttons/nontdeappbutton.cpp b/kicker/kicker/buttons/nontdeappbutton.cpp
index 4f88f2d37..972944897 100644
--- a/kicker/kicker/buttons/nontdeappbutton.cpp
+++ b/kicker/kicker/buttons/nontdeappbutton.cpp
@@ -61,7 +61,7 @@ NonKDEAppButton::NonKDEAppButton(const TQString& name,
// to the slotExec() slot
// we do this here instead of in initialize(...) since initialize(...) may
// get called later, e.g after reconfiguring it
- connect(this, TQT_SIGNAL(clicked()), TQT_SLOT(slotExec()));
+ connect(this, TQ_SIGNAL(clicked()), TQ_SLOT(slotExec()));
}
// this constructor is used when restoring a button, usually at startup
@@ -77,7 +77,7 @@ NonKDEAppButton::NonKDEAppButton( const TDEConfigGroup& config, TQWidget* parent
config.readBoolEntry("RunInTerminal"));
// see comment on connect in above constructor
- connect(this, TQT_SIGNAL(clicked()), TQT_SLOT(slotExec()));
+ connect(this, TQ_SIGNAL(clicked()), TQ_SLOT(slotExec()));
}
void NonKDEAppButton::initialize(const TQString& name,
@@ -278,8 +278,8 @@ void NonKDEAppButton::properties()
// ... connect the signal it emits when it has data for us to save
// to our updateSettings slot (see above) ...
- connect(dlg, TQT_SIGNAL(updateSettings(PanelExeDialog*)), this,
- TQT_SLOT(updateSettings(PanelExeDialog*)));
+ connect(dlg, TQ_SIGNAL(updateSettings(PanelExeDialog*)), this,
+ TQ_SLOT(updateSettings(PanelExeDialog*)));
// ... and then show it to the user
dlg->show();
diff --git a/kicker/kicker/buttons/nontdeappbutton.h b/kicker/kicker/buttons/nontdeappbutton.h
index 94c7cb59d..eac6ce412 100644
--- a/kicker/kicker/buttons/nontdeappbutton.h
+++ b/kicker/kicker/buttons/nontdeappbutton.h
@@ -37,8 +37,8 @@ class PanelExeDialog;
*/
class NonKDEAppButton : public PanelButton
{
- // the Q_OBJECT macro provides the magic glue for signals 'n slots
- Q_OBJECT
+ // the TQ_OBJECT macro provides the magic glue for signals 'n slots
+ TQ_OBJECT
public:
// define our two constructors, one used for creating new buttons...
diff --git a/kicker/kicker/buttons/servicebutton.cpp b/kicker/kicker/buttons/servicebutton.cpp
index 716a750ed..9b368407e 100644
--- a/kicker/kicker/buttons/servicebutton.cpp
+++ b/kicker/kicker/buttons/servicebutton.cpp
@@ -121,7 +121,7 @@ void ServiceButton::loadServiceFromId(const TQString &id)
void ServiceButton::initialize()
{
readDesktopFile();
- connect(this, TQT_SIGNAL(clicked()), TQT_SLOT(slotExec()));
+ connect(this, TQ_SIGNAL(clicked()), TQ_SLOT(slotExec()));
}
void ServiceButton::readDesktopFile()
@@ -192,7 +192,7 @@ void ServiceButton::slotExec()
{
// this allows the button to return to a non-pressed state
// before launching
- TQTimer::singleShot(0, this, TQT_SLOT(performExec()));
+ TQTimer::singleShot(0, this, TQ_SLOT(performExec()));
}
void ServiceButton::performExec()
@@ -223,10 +223,10 @@ void ServiceButton::properties()
KPropertiesDialog* dialog = new KPropertiesDialog(serviceURL, 0, 0,
false, false);
dialog->setFileNameReadOnly(true);
- connect(dialog, TQT_SIGNAL(saveAs(const KURL &, KURL &)),
- this, TQT_SLOT(slotSaveAs(const KURL &, KURL &)));
- connect(dialog, TQT_SIGNAL(propertiesClosed()),
- this, TQT_SLOT(slotUpdate()));
+ connect(dialog, TQ_SIGNAL(saveAs(const KURL &, KURL &)),
+ this, TQ_SLOT(slotSaveAs(const KURL &, KURL &)));
+ connect(dialog, TQ_SIGNAL(propertiesClosed()),
+ this, TQ_SLOT(slotUpdate()));
dialog->show();
}
diff --git a/kicker/kicker/buttons/servicebutton.h b/kicker/kicker/buttons/servicebutton.h
index ac551adb5..a2d7939e8 100644
--- a/kicker/kicker/buttons/servicebutton.h
+++ b/kicker/kicker/buttons/servicebutton.h
@@ -30,7 +30,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
class ServiceButton : public PanelButton
{
- Q_OBJECT
+ TQ_OBJECT
public:
ServiceButton( const TQString& desktopFile, TQWidget* parent );
diff --git a/kicker/kicker/buttons/servicemenubutton.h b/kicker/kicker/buttons/servicemenubutton.h
index da512105d..bef038859 100644
--- a/kicker/kicker/buttons/servicemenubutton.h
+++ b/kicker/kicker/buttons/servicemenubutton.h
@@ -33,7 +33,7 @@ class PanelServiceMenu;
*/
class ServiceMenuButton : public PanelPopupButton
{
- Q_OBJECT
+ TQ_OBJECT
public:
ServiceMenuButton( const TQString& relPath, TQWidget* parent );
diff --git a/kicker/kicker/buttons/urlbutton.cpp b/kicker/kicker/buttons/urlbutton.cpp
index 13ff95323..d398b07b0 100644
--- a/kicker/kicker/buttons/urlbutton.cpp
+++ b/kicker/kicker/buttons/urlbutton.cpp
@@ -90,7 +90,7 @@ void URLButton::initialize( const TQString& _url )
}
fileItem = new KFileItem( KFileItem::Unknown, KFileItem::Unknown, url );
setIcon( fileItem->iconName() );
- connect( this, TQT_SIGNAL(clicked()), TQT_SLOT(slotExec()) );
+ connect( this, TQ_SIGNAL(clicked()), TQ_SLOT(slotExec()) );
setToolTip();
if (url.isLocalFile())
@@ -196,6 +196,6 @@ void URLButton::properties()
pDlg = new KPropertiesDialog(fileItem, 0L, 0L, false, false); // will delete itself
pDlg->setFileNameReadOnly(true);
- connect(pDlg, TQT_SIGNAL(applied()), TQT_SLOT(updateURL()));
+ connect(pDlg, TQ_SIGNAL(applied()), TQ_SLOT(updateURL()));
pDlg->show();
}
diff --git a/kicker/kicker/buttons/urlbutton.h b/kicker/kicker/buttons/urlbutton.h
index ba4a1b43d..dd55d78b4 100644
--- a/kicker/kicker/buttons/urlbutton.h
+++ b/kicker/kicker/buttons/urlbutton.h
@@ -34,7 +34,7 @@ class KPropertiesDialog;
*/
class URLButton : public PanelButton
{
- Q_OBJECT
+ TQ_OBJECT
public:
URLButton( const TQString& url, TQWidget* parent );
diff --git a/kicker/kicker/buttons/windowlistbutton.h b/kicker/kicker/buttons/windowlistbutton.h
index d8b57c62e..d9b67fb67 100644
--- a/kicker/kicker/buttons/windowlistbutton.h
+++ b/kicker/kicker/buttons/windowlistbutton.h
@@ -33,7 +33,7 @@ class KWindowListMenu;
*/
class WindowListButton : public PanelPopupButton
{
- Q_OBJECT
+ TQ_OBJECT
public:
WindowListButton( TQWidget* parent );