Fix to include latest TQt API changes

Signed-off-by: Mavridis Philippe <mavridisf@gmail.com>
pull/2/head
Mavridis Philippe 2 months ago
parent e8fc33e1df
commit 0c35ccad36
No known key found for this signature in database
GPG Key ID: F8D2D7E2F989A494

@ -21,7 +21,7 @@ class MalloryClient;
class MalloryButton : public TQButton class MalloryButton : public TQButton
{ {
Q_OBJECT TQ_OBJECT
public: public:
MalloryButton(MalloryClient *parent = 0, const char *name = 0, const TQString &tip=NULL, ButtonType type = (ButtonType)0); MalloryButton(MalloryClient *parent = 0, const char *name = 0, const TQString &tip=NULL, ButtonType type = (ButtonType)0);
~MalloryButton(); ~MalloryButton();

@ -149,7 +149,7 @@ void MalloryClient::addButtons(TQBoxLayout *layout, const TQString &s)
if (!m_button[ButtonMenu]) if (!m_button[ButtonMenu])
{ {
m_button[ButtonMenu] = new MalloryButton(this, "menu", i18n("Menu"), ButtonMenu); m_button[ButtonMenu] = new MalloryButton(this, "menu", i18n("Menu"), ButtonMenu);
connect(m_button[ButtonMenu], SIGNAL(pressed()), this, SLOT(menuButtonPressed())); connect(m_button[ButtonMenu], TQ_SIGNAL(pressed()), this, TQ_SLOT(menuButtonPressed()));
layout->addWidget(m_button[ButtonMenu], 0, TQt::AlignHCenter | TQt::AlignTop); layout->addWidget(m_button[ButtonMenu], 0, TQt::AlignHCenter | TQt::AlignTop);
} }
break; break;
@ -157,7 +157,7 @@ void MalloryClient::addButtons(TQBoxLayout *layout, const TQString &s)
if (!m_button[ButtonHelp] && providesContextHelp()) if (!m_button[ButtonHelp] && providesContextHelp())
{ {
m_button[ButtonHelp] = new MalloryButton(this, "help", i18n("Help"), ButtonHelp); m_button[ButtonHelp] = new MalloryButton(this, "help", i18n("Help"), ButtonHelp);
connect(m_button[ButtonHelp], SIGNAL(clicked()), this, SLOT(showContextHelp())); connect(m_button[ButtonHelp], TQ_SIGNAL(clicked()), this, TQ_SLOT(showContextHelp()));
layout->addWidget(m_button[ButtonHelp], 0, TQt::AlignHCenter | TQt::AlignTop); layout->addWidget(m_button[ButtonHelp], 0, TQt::AlignHCenter | TQt::AlignTop);
} }
break; break;
@ -165,7 +165,7 @@ void MalloryClient::addButtons(TQBoxLayout *layout, const TQString &s)
if ((!m_button[ButtonMin]) && isMinimizable()) if ((!m_button[ButtonMin]) && isMinimizable())
{ {
m_button[ButtonMin] = new MalloryButton(this, "minimize", i18n("Minimize"), ButtonMin); m_button[ButtonMin] = new MalloryButton(this, "minimize", i18n("Minimize"), ButtonMin);
connect(m_button[ButtonMin], SIGNAL(clicked()), this, SLOT(minimize())); connect(m_button[ButtonMin], TQ_SIGNAL(clicked()), this, TQ_SLOT(minimize()));
layout->addWidget(m_button[ButtonMin], 0, TQt::AlignHCenter | TQt::AlignTop); layout->addWidget(m_button[ButtonMin], 0, TQt::AlignHCenter | TQt::AlignTop);
} }
break; break;
@ -173,7 +173,7 @@ void MalloryClient::addButtons(TQBoxLayout *layout, const TQString &s)
if ((!m_button[ButtonMax]) && isMaximizable()) if ((!m_button[ButtonMax]) && isMaximizable())
{ {
m_button[ButtonMax] = new MalloryButton(this, "maximize", (maximizeMode()!=MaximizeRestore)?i18n("Minimize"):i18n("Maximize"), ButtonMax); m_button[ButtonMax] = new MalloryButton(this, "maximize", (maximizeMode()!=MaximizeRestore)?i18n("Minimize"):i18n("Maximize"), ButtonMax);
connect(m_button[ButtonMax], SIGNAL(clicked()), this, SLOT(maxButtonPressed())); connect(m_button[ButtonMax], TQ_SIGNAL(clicked()), this, TQ_SLOT(maxButtonPressed()));
layout->addWidget(m_button[ButtonMax], 0, TQt::AlignHCenter | TQt::AlignTop); layout->addWidget(m_button[ButtonMax], 0, TQt::AlignHCenter | TQt::AlignTop);
} }
break; break;
@ -181,7 +181,7 @@ void MalloryClient::addButtons(TQBoxLayout *layout, const TQString &s)
if ((!m_button[ButtonClose]) && isCloseable()) if ((!m_button[ButtonClose]) && isCloseable())
{ {
m_button[ButtonClose] = new MalloryButton(this, "close", i18n("Close"), ButtonClose); m_button[ButtonClose] = new MalloryButton(this, "close", i18n("Close"), ButtonClose);
connect(m_button[ButtonClose], SIGNAL(clicked()), this, SLOT(closeWindow())); connect(m_button[ButtonClose], TQ_SIGNAL(clicked()), this, TQ_SLOT(closeWindow()));
layout->addWidget(m_button[ButtonClose], 0, TQt::AlignHCenter | TQt::AlignTop); layout->addWidget(m_button[ButtonClose], 0, TQt::AlignHCenter | TQt::AlignTop);
} }
break; break;
@ -190,7 +190,7 @@ void MalloryClient::addButtons(TQBoxLayout *layout, const TQString &s)
{ {
m_button[ButtonOnAllDesktops] = new MalloryButton(this, "onAllDesktops", isOnAllDesktops() ? i18n("Not On All Desktops") : i18n("On All Desktops"), ButtonOnAllDesktops); m_button[ButtonOnAllDesktops] = new MalloryButton(this, "onAllDesktops", isOnAllDesktops() ? i18n("Not On All Desktops") : i18n("On All Desktops"), ButtonOnAllDesktops);
m_button[ButtonOnAllDesktops]->setOnAllDesktops(isOnAllDesktops()); m_button[ButtonOnAllDesktops]->setOnAllDesktops(isOnAllDesktops());
connect(m_button[ButtonOnAllDesktops], SIGNAL(clicked()), this, SLOT(toggleOnAllDesktops())); connect(m_button[ButtonOnAllDesktops], TQ_SIGNAL(clicked()), this, TQ_SLOT(toggleOnAllDesktops()));
layout->addWidget(m_button[ButtonOnAllDesktops], 0, TQt::AlignHCenter | TQt::AlignTop); layout->addWidget(m_button[ButtonOnAllDesktops], 0, TQt::AlignHCenter | TQt::AlignTop);
} }
break; break;
@ -198,7 +198,7 @@ void MalloryClient::addButtons(TQBoxLayout *layout, const TQString &s)
if (!m_button[ButtonAbove]) if (!m_button[ButtonAbove])
{ {
m_button[ButtonAbove] = new MalloryButton(this, "above", i18n("Keep Above Others"), ButtonAbove); m_button[ButtonAbove] = new MalloryButton(this, "above", i18n("Keep Above Others"), ButtonAbove);
connect(m_button[ButtonAbove], SIGNAL(clicked()), this, SLOT(slotKeepAbove())); connect(m_button[ButtonAbove], TQ_SIGNAL(clicked()), this, TQ_SLOT(slotKeepAbove()));
layout->addWidget(m_button[ButtonAbove], 0, TQt::AlignHCenter | TQt::AlignTop); layout->addWidget(m_button[ButtonAbove], 0, TQt::AlignHCenter | TQt::AlignTop);
} }
break; break;
@ -206,7 +206,7 @@ void MalloryClient::addButtons(TQBoxLayout *layout, const TQString &s)
if (!m_button[ButtonBelow]) if (!m_button[ButtonBelow])
{ {
m_button[ButtonBelow] = new MalloryButton(this, "below", i18n("Keep Below Others"), ButtonBelow); m_button[ButtonBelow] = new MalloryButton(this, "below", i18n("Keep Below Others"), ButtonBelow);
connect(m_button[ButtonBelow], SIGNAL(clicked()), this, SLOT(slotKeepBelow())); connect(m_button[ButtonBelow], TQ_SIGNAL(clicked()), this, TQ_SLOT(slotKeepBelow()));
layout->addWidget(m_button[ButtonBelow], 0, TQt::AlignHCenter | TQt::AlignTop); layout->addWidget(m_button[ButtonBelow], 0, TQt::AlignHCenter | TQt::AlignTop);
} }
break; break;

@ -23,7 +23,7 @@ class MalloryButton;
class MalloryClient : public KDecoration class MalloryClient : public KDecoration
{ {
Q_OBJECT TQ_OBJECT
public: public:
MalloryClient(KDecorationBridge* bridge, KDecorationFactory* factory); MalloryClient(KDecorationBridge* bridge, KDecorationFactory* factory);
~MalloryClient(); ~MalloryClient();

@ -23,7 +23,7 @@ const char default_right[] = "HIAX";
class MalloryHandler : public TQObject, public KDecorationFactory class MalloryHandler : public TQObject, public KDecorationFactory
{ {
Q_OBJECT TQ_OBJECT
public: public:
MalloryHandler(); MalloryHandler();
~MalloryHandler(); ~MalloryHandler();

Loading…
Cancel
Save