TQt4 port yakuake

This enables compilation under both Qt3 and Qt4


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/yakuake@1239058 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
v3.5.13-sru
tpearson 12 years ago
parent 44cf1a2066
commit f9a9340723

@ -33,10 +33,10 @@ class DCOPInterface : virtual public DCOPObject
virtual void slotRemoveTerminal(int session_id) = 0;
virtual void slotRemoveTerminal(int session_id, int terminal_id) = 0;
virtual void slotRenameSession(int session_id, const QString & name) = 0;
virtual void slotRenameSession(int session_id, const TQString & name) = 0;
virtual const QString sessionIdList() = 0;
virtual const QString terminalIdList(int session_id) = 0;
virtual const TQString sessionIdList() = 0;
virtual const TQString terminalIdList(int session_id) = 0;
virtual int tabPositionForSessionId(int session_id) = 0;
virtual int sessionIdForTabPosition(int position) = 0;
@ -47,16 +47,16 @@ class DCOPInterface : virtual public DCOPObject
virtual void slotSelectSession(int session_id) = 0;
virtual void slotSelectTabPosition(int position) = 0;
virtual const QString slotSessionName() = 0;
virtual const QString slotSessionName(int session_id) = 0;
virtual const TQString slotSessionName() = 0;
virtual const TQString slotSessionName(int session_id) = 0;
virtual const QString slotSessionTitle() = 0;
virtual const QString slotSessionTitle(int session_id) = 0;
virtual const QString slotSessionTitle(int session_id, int terminal_id) = 0;
virtual const TQString slotSessionTitle() = 0;
virtual const TQString slotSessionTitle(int session_id) = 0;
virtual const TQString slotSessionTitle(int session_id, int terminal_id) = 0;
virtual void slotSetSessionTitleText(const QString& title) = 0;
virtual void slotSetSessionTitleText(int session_id, const QString& title) = 0;
virtual void slotSetSessionTitleText(int session_id, int terminal_id, const QString& title) = 0;
virtual void slotSetSessionTitleText(const TQString& title) = 0;
virtual void slotSetSessionTitleText(int session_id, const TQString& title) = 0;
virtual void slotSetSessionTitleText(int session_id, int terminal_id, const TQString& title) = 0;
virtual void slotPasteClipboard() = 0;
virtual void slotPasteClipboard(int session_id) = 0;
@ -66,9 +66,9 @@ class DCOPInterface : virtual public DCOPObject
virtual void slotPasteSelection(int session_id) = 0;
virtual void slotPasteSelection(int session_id, int terminal_id) = 0;
virtual void slotRunCommandInSession(const QString& command) = 0;
virtual void slotRunCommandInSession(int session_id, const QString& command) = 0;
virtual void slotRunCommandInSession(int session_id, int terminal_id, const QString& command) = 0;
virtual void slotRunCommandInSession(const TQString& command) = 0;
virtual void slotRunCommandInSession(int session_id, const TQString& command) = 0;
virtual void slotRunCommandInSession(int session_id, int terminal_id, const TQString& command) = 0;
virtual void slotSplitHorizontally() = 0;
virtual void slotSplitHorizontally(int session_id) = 0;

@ -18,11 +18,11 @@
#include <kkeydialog.h>
FirstRunDialog::FirstRunDialog(QWidget* parent, const char* name)
: FirstRunDialogUI(parent, name)
FirstRunDialog::FirstRunDialog(TQWidget* tqparent, const char* name)
: FirstRunDialogUI(tqparent, name)
{
connect(key_button, SIGNAL(capturedShortcut(const KShortcut&)),
this, SLOT(validateShortcut(const KShortcut&)));
connect(key_button, TQT_SIGNAL(capturedShortcut(const KShortcut&)),
this, TQT_SLOT(validateShortcut(const KShortcut&)));
}
FirstRunDialog::~FirstRunDialog()

@ -22,9 +22,10 @@ class KShortcut;
class FirstRunDialog : public FirstRunDialogUI
{
Q_OBJECT
TQ_OBJECT
public:
explicit FirstRunDialog(QWidget* parent, const char* name=NULL);
explicit FirstRunDialog(TQWidget* tqparent, const char* name=NULL);
~FirstRunDialog();
KShortcut shortcut();

@ -1,6 +1,6 @@
<!DOCTYPE UI><UI version="3.2" stdsetdef="1">
<class>FirstRunDialogUI</class>
<widget class="QWidget">
<widget class="TQWidget">
<property name="name">
<cstring>FirstRunDialogUI</cstring>
</property>
@ -27,7 +27,7 @@
<property name="margin">
<number>0</number>
</property>
<widget class="QLabel" row="0" column="0" rowspan="1" colspan="3">
<widget class="TQLabel" row="0" column="0" rowspan="1" colspan="3">
<property name="name">
<cstring>welcome_label</cstring>
</property>
@ -42,7 +42,7 @@
<property name="text">
<string>&lt;b&gt;Welcome to Yakuake&lt;/b&gt;</string>
</property>
<property name="alignment">
<property name="tqalignment">
<set>AlignVCenter</set>
</property>
</widget>
@ -57,14 +57,14 @@
<enum>Plain</enum>
</property>
</widget>
<widget class="QLabel" row="6" column="0" rowspan="1" colspan="3">
<widget class="TQLabel" row="6" column="0" rowspan="1" colspan="3">
<property name="name">
<cstring>outro_label</cstring>
</property>
<property name="text">
<string>You can change the shortcut later at any time via the menu.</string>
</property>
<property name="alignment">
<property name="tqalignment">
<set>WordBreak|AlignVCenter</set>
</property>
</widget>
@ -78,7 +78,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="sizeHint">
<property name="tqsizeHint">
<size>
<width>80</width>
<height>21</height>
@ -103,21 +103,21 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="sizeHint">
<property name="tqsizeHint">
<size>
<width>80</width>
<height>21</height>
</size>
</property>
</spacer>
<widget class="QLabel" row="2" column="0" rowspan="1" colspan="3">
<widget class="TQLabel" row="2" column="0" rowspan="1" colspan="3">
<property name="name">
<cstring>intro_label</cstring>
</property>
<property name="text">
<string>Before using the application, you might want to change the keyboard shortcut used to open and close the Yakuake window:</string>
</property>
<property name="alignment">
<property name="tqalignment">
<set>WordBreak|AlignVCenter</set>
</property>
</widget>
@ -131,7 +131,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
<property name="sizeHint">
<property name="tqsizeHint">
<size>
<width>21</width>
<height>16</height>
@ -148,7 +148,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
<property name="sizeHint">
<property name="tqsizeHint">
<size>
<width>21</width>
<height>20</height>
@ -157,8 +157,8 @@
</spacer>
</grid>
</widget>
<layoutdefaults spacing="6" margin="11"/>
<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
<tqlayoutdefaults spacing="6" margin="11"/>
<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
<includehints>
<includehint>kseparator.h</includehint>
<includehint>kkeybutton.h</includehint>

@ -13,43 +13,43 @@
#include "general_settings.h"
#include "general_settings.moc"
#include <qapplication.h>
#include <qslider.h>
#include <qspinbox.h>
#include <qcombobox.h>
#include <qlabel.h>
#include <tqapplication.h>
#include <tqslider.h>
#include <tqspinbox.h>
#include <tqcombobox.h>
#include <tqlabel.h>
#include <knuminput.h>
#include <klocale.h>
GeneralSettings::GeneralSettings(QWidget* parent, const char* name)
: GeneralSettingsUI(parent, name)
GeneralSettings::GeneralSettings(TQWidget* tqparent, const char* name)
: GeneralSettingsUI(tqparent, name)
{
kcfg_width->setSuffix("%");
kcfg_height->setSuffix("%");
steps_spinbox->setPrefix("~");
steps_spinbox->setSuffix("ms");
for (int i = 2; i <= QApplication::desktop()->numScreens(); i++)
kcfg_screen->insertItem(i18n("Screen %1").arg(QString::number(i)));
for (int i = 2; i <= TQApplication::desktop()->numScreens(); i++)
kcfg_screen->insertItem(i18n("Screen %1").tqarg(TQString::number(i)));
if (QApplication::desktop()->numScreens() > 1)
if (TQApplication::desktop()->numScreens() > 1)
{
screen_label->setEnabled(true);
kcfg_screen->setEnabled(true);
}
connect(kcfg_width, SIGNAL(valueChanged(int)), this, SLOT(updateWidthSlider(int)));
connect(width_slider, SIGNAL(valueChanged(int)), this, SLOT(updateWidthSpinbox(int)));
connect(kcfg_width, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(updateWidthSlider(int)));
connect(width_slider, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(updateWidthSpinbox(int)));
connect(kcfg_height, SIGNAL(valueChanged(int)), this, SLOT(updateHeightSlider(int)));
connect(height_slider, SIGNAL(valueChanged(int)), this, SLOT(updateHeightSpinbox(int)));
connect(kcfg_height, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(updateHeightSlider(int)));
connect(height_slider, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(updateHeightSpinbox(int)));
connect(kcfg_steps, SIGNAL(valueChanged(int)), this, SLOT(updateStepsSpinbox(int)));
connect(steps_spinbox, SIGNAL(valueChanged(int)), this, SLOT(updateStepsSlider(int)));
connect(kcfg_steps, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(updateStepsSpinbox(int)));
connect(steps_spinbox, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(updateStepsSlider(int)));
connect(kcfg_location, SIGNAL(valueChanged(int)), this, SLOT(updateLocation(int)));
connect(kcfg_location, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(updateLocation(int)));
}
GeneralSettings::~GeneralSettings()

@ -20,9 +20,10 @@
class GeneralSettings : public GeneralSettingsUI
{
Q_OBJECT
TQ_OBJECT
public:
explicit GeneralSettings(QWidget* parent, const char* name=NULL);
explicit GeneralSettings(TQWidget* tqparent, const char* name=NULL);
~GeneralSettings();

@ -1,6 +1,6 @@
<!DOCTYPE UI><UI version="3.2" stdsetdef="1">
<class>GeneralSettingsUI</class>
<widget class="QWidget">
<widget class="TQWidget">
<property name="name">
<cstring>GeneralSettingsUI</cstring>
</property>
@ -19,7 +19,7 @@
<property name="margin">
<number>0</number>
</property>
<widget class="QGroupBox">
<widget class="TQGroupBox">
<property name="name">
<cstring>behavior_box</cstring>
</property>
@ -38,7 +38,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
<widget class="QCheckBox" row="0" column="0" rowspan="1" colspan="3">
<widget class="TQCheckBox" row="0" column="0" rowspan="1" colspan="3">
<property name="name">
<cstring>kcfg_popup</cstring>
</property>
@ -46,7 +46,7 @@
<string>Show notification popup at application startup</string>
</property>
</widget>
<widget class="QCheckBox" row="1" column="0" rowspan="1" colspan="3">
<widget class="TQCheckBox" row="1" column="0" rowspan="1" colspan="3">
<property name="name">
<cstring>kcfg_confirmquit</cstring>
</property>
@ -54,7 +54,7 @@
<string>Confirm quit when closing more than one session</string>
</property>
</widget>
<widget class="QCheckBox" row="2" column="0" rowspan="1" colspan="3">
<widget class="TQCheckBox" row="2" column="0" rowspan="1" colspan="3">
<property name="name">
<cstring>kcfg_tabs</cstring>
</property>
@ -72,7 +72,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
<property name="sizeHint">
<property name="tqsizeHint">
<size>
<width>16</width>
<height>20</height>
@ -89,14 +89,14 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
<property name="sizeHint">
<property name="tqsizeHint">
<size>
<width>16</width>
<height>20</height>
</size>
</property>
</spacer>
<widget class="QCheckBox" row="5" column="1" rowspan="1" colspan="2">
<widget class="TQCheckBox" row="5" column="1" rowspan="1" colspan="2">
<property name="name">
<cstring>kcfg_keepabove</cstring>
</property>
@ -110,7 +110,7 @@
<string>Enable this option if you want the Yakuake window to keep on top of other windows even when it loses focus.</string>
</property>
</widget>
<widget class="QCheckBox" row="4" column="0" rowspan="1" colspan="2">
<widget class="TQCheckBox" row="4" column="0" rowspan="1" colspan="2">
<property name="name">
<cstring>kcfg_focus</cstring>
</property>
@ -124,7 +124,7 @@
<string>Enable this option if you want the Yakuake window to stay open when it loses focus.</string>
</property>
</widget>
<widget class="QCheckBox" row="6" column="1" rowspan="1" colspan="2">
<widget class="TQCheckBox" row="6" column="1" rowspan="1" colspan="2">
<property name="name">
<cstring>kcfg_focusontoggle</cstring>
</property>
@ -138,7 +138,7 @@
<string>Enable this option if you want the Open/Retract shortcut to focus the Yakuake window when it is already open but lacks focus. Disable this option to have the Open/Retract shortcut retract the Yakuake window regardless of whether or not it has focus.</string>
</property>
</widget>
<widget class="QCheckBox" row="3" column="0" rowspan="1" colspan="2">
<widget class="TQCheckBox" row="3" column="0" rowspan="1" colspan="2">
<property name="name">
<cstring>kcfg_poll</cstring>
</property>
@ -154,7 +154,7 @@
</widget>
</grid>
</widget>
<widget class="QGroupBox">
<widget class="TQGroupBox">
<property name="name">
<cstring>size_box</cstring>
</property>
@ -165,7 +165,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
<widget class="QLabel" row="0" column="0">
<widget class="TQLabel" row="0" column="0">
<property name="name">
<cstring>width_label</cstring>
</property>
@ -173,7 +173,7 @@
<string>Width:</string>
</property>
</widget>
<widget class="QLabel" row="1" column="0">
<widget class="TQLabel" row="1" column="0">
<property name="name">
<cstring>height_label</cstring>
</property>
@ -181,7 +181,7 @@
<string>Height:</string>
</property>
</widget>
<widget class="QLabel" row="2" column="0">
<widget class="TQLabel" row="2" column="0">
<property name="name">
<cstring>speed_label</cstring>
</property>
@ -189,7 +189,7 @@
<string>Speed:</string>
</property>
</widget>
<widget class="QSlider" row="0" column="1">
<widget class="TQSlider" row="0" column="1">
<property name="name">
<cstring>width_slider</cstring>
</property>
@ -218,7 +218,7 @@
<number>1</number>
</property>
</widget>
<widget class="QSlider" row="1" column="1">
<widget class="TQSlider" row="1" column="1">
<property name="name">
<cstring>height_slider</cstring>
</property>
@ -247,7 +247,7 @@
<number>1</number>
</property>
</widget>
<widget class="QSlider" row="2" column="1">
<widget class="TQSlider" row="2" column="1">
<property name="name">
<cstring>kcfg_steps</cstring>
</property>
@ -353,7 +353,7 @@
</widget>
</grid>
</widget>
<widget class="QGroupBox">
<widget class="TQGroupBox">
<property name="name">
<cstring>position_box</cstring>
</property>
@ -364,15 +364,15 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
<widget class="QLayoutWidget">
<widget class="TQLayoutWidget">
<property name="name">
<cstring>layout10</cstring>
<cstring>tqlayout10</cstring>
</property>
<hbox>
<property name="name">
<cstring>unnamed</cstring>
</property>
<widget class="QLabel">
<widget class="TQLabel">
<property name="name">
<cstring>left_label</cstring>
</property>
@ -388,7 +388,7 @@
<string>Left</string>
</property>
</widget>
<widget class="QSlider">
<widget class="TQSlider">
<property name="name">
<cstring>kcfg_location</cstring>
</property>
@ -408,7 +408,7 @@
<number>10</number>
</property>
</widget>
<widget class="QLabel">
<widget class="TQLabel">
<property name="name">
<cstring>right_label</cstring>
</property>
@ -426,15 +426,15 @@
</widget>
</hbox>
</widget>
<widget class="QLayoutWidget">
<widget class="TQLayoutWidget">
<property name="name">
<cstring>layout20</cstring>
<cstring>tqlayout20</cstring>
</property>
<hbox>
<property name="name">
<cstring>unnamed</cstring>
</property>
<widget class="QLabel">
<widget class="TQLabel">
<property name="name">
<cstring>screen_label</cstring>
</property>
@ -445,7 +445,7 @@
<string>Open on screen:</string>
</property>
</widget>
<widget class="QComboBox">
<widget class="TQComboBox">
<item>
<property name="text">
<string>At mouse location</string>
@ -473,7 +473,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="sizeHint">
<property name="tqsizeHint">
<size>
<width>210</width>
<height>26</height>
@ -494,7 +494,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="sizeHint">
<property name="tqsizeHint">
<size>
<width>21</width>
<height>20</height>
@ -536,8 +536,8 @@
<tabstop>kcfg_location</tabstop>
<tabstop>kcfg_screen</tabstop>
</tabstops>
<layoutdefaults spacing="6" margin="11"/>
<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
<tqlayoutdefaults spacing="6" margin="11"/>
<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
<includehints>
<includehint>knuminput.h</includehint>
<includehint>knuminput.h</includehint>

@ -15,13 +15,13 @@
#include "image_button.moc"
#include "settings.h"
#include <qwhatsthis.h>
#include <qtimer.h>
#include <tqwhatsthis.h>
#include <tqtimer.h>
#include <kglobalsettings.h>
ImageButton::ImageButton(QWidget* parent, const char* name, bool translucency) : TranslucentWidget(parent, name, translucency)
ImageButton::ImageButton(TQWidget* tqparent, const char* name, bool translucency) : TranslucentWidget(tqparent, name, translucency)
{
state = 0;
toggle = false;
@ -55,83 +55,83 @@ void ImageButton::setToggled(bool enable)
else
pressed = false;
repaint();
tqrepaint();
}
}
void ImageButton::setPopupMenu(QPopupMenu* menu)
void ImageButton::setPopupMenu(TQPopupMenu* menu)
{
popup_menu = menu;
popup_timer = new QTimer(this);
connect(popup_timer, SIGNAL(timeout()), this, SLOT(showPopupMenu()));
popup_timer = new TQTimer(this);
connect(popup_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(showPopupMenu()));
}
void ImageButton::showPopupMenu()
{
popup_menu->exec(mapToGlobal(QPoint(0, height())));
popup_menu->exec(mapToGlobal(TQPoint(0, height())));
}
void ImageButton::setUpPixmap(const QString& path, bool use_alpha_mask)
void ImageButton::setUpPixmap(const TQString& path, bool use_alpha_tqmask)
{
up_pixmap.load(path);
resize(up_pixmap.size());
if (up_pixmap.hasAlphaChannel()) setMask(*up_pixmap.mask());
if (up_pixmap.hasAlphaChannel()) setMask(*up_pixmap.tqmask());
if (use_alpha_mask)
if (use_alpha_tqmask)
setUseTranslucency(true);
else
setMask(QRegion(up_pixmap.rect()));
setMask(TQRegion(up_pixmap.rect()));
}
void ImageButton::setOverPixmap(const QString& path)
void ImageButton::setOverPixmap(const TQString& path)
{
over_pixmap.load(path);
}
void ImageButton::setDownPixmap(const QString& path)
void ImageButton::setDownPixmap(const TQString& path)
{
down_pixmap.load(path);
}
void ImageButton::enterEvent(QEvent*)
void ImageButton::enterEvent(TQEvent*)
{
state = pressed ? 2 : 1;
repaint();
tqrepaint();
}
void ImageButton::leaveEvent(QEvent*)
void ImageButton::leaveEvent(TQEvent*)
{
state = 0;
if (popup_timer) popup_timer->stop();
repaint();
tqrepaint();
}
void ImageButton::mousePressEvent(QMouseEvent*)
void ImageButton::mousePressEvent(TQMouseEvent*)
{
if (QWhatsThis::inWhatsThisMode()) return;
if (TQWhatsThis::inWhatsThisMode()) return;
state = 2;
if (popup_timer) popup_timer->stop();
repaint();
tqrepaint();
if (popup_menu)
{
if (delay_popup)
popup_timer->start(600, true);
else
popup_menu->exec(mapToGlobal(QPoint(0, height())));
popup_menu->exec(mapToGlobal(TQPoint(0, height())));
}
}
void ImageButton::mouseReleaseEvent(QMouseEvent*)
void ImageButton::mouseReleaseEvent(TQMouseEvent*)
{
if (QWhatsThis::inWhatsThisMode()) return;
if (TQWhatsThis::inWhatsThisMode()) return;
// Don't process event if press and release didn't
// occur within the button.
@ -142,7 +142,7 @@ void ImageButton::mouseReleaseEvent(QMouseEvent*)
if (popup_timer) popup_timer->stop();
repaint();
tqrepaint();
if (toggle)
emit toggled(pressed);
@ -150,9 +150,9 @@ void ImageButton::mouseReleaseEvent(QMouseEvent*)
emit clicked();
}
void ImageButton::paintEvent(QPaintEvent*)
void ImageButton::paintEvent(TQPaintEvent*)
{
QPainter painter(this);
TQPainter painter(this);
erase();

@ -17,13 +17,13 @@
#include "translucent_widget.h"
#include <qurl.h>
#include <qcolor.h>
#include <qpoint.h>
#include <qbitmap.h>
#include <qpixmap.h>
#include <qpainter.h>
#include <qpopupmenu.h>
#include <tqurl.h>
#include <tqcolor.h>
#include <tqpoint.h>
#include <tqbitmap.h>
#include <tqpixmap.h>
#include <tqpainter.h>
#include <tqpopupmenu.h>
#include <krootpixmap.h>
@ -31,9 +31,10 @@
class ImageButton : public TranslucentWidget
{
Q_OBJECT
TQ_OBJECT
public:
explicit ImageButton(QWidget* parent = 0, const char* name = 0, bool translucency = false);
explicit ImageButton(TQWidget* tqparent = 0, const char* name = 0, bool translucency = false);
~ImageButton();
/* Creates a toggle button */
@ -41,13 +42,13 @@ class ImageButton : public TranslucentWidget
void setToggled(bool enable);
/* Sets the configuration menu */
void setPopupMenu(QPopupMenu* menu);
void setPopupMenu(TQPopupMenu* menu);
void setDelayedPopup(bool delay) { delay_popup = delay; }
/* Sets the widget's pixmaps */
void setUpPixmap(const QString& path, bool use_alpha_mask = false);
void setOverPixmap(const QString& path);
void setDownPixmap(const QString& path);
void setUpPixmap(const TQString& path, bool use_alpha_tqmask = false);
void setOverPixmap(const TQString& path);
void setDownPixmap(const TQString& path);
signals:
@ -56,13 +57,13 @@ class ImageButton : public TranslucentWidget
protected:
virtual void enterEvent(QEvent*);
virtual void leaveEvent(QEvent*);
virtual void enterEvent(TQEvent*);
virtual void leaveEvent(TQEvent*);
virtual void paintEvent(QPaintEvent*);
virtual void paintEvent(TQPaintEvent*);
virtual void mousePressEvent(QMouseEvent*);
virtual void mouseReleaseEvent(QMouseEvent*);
virtual void mousePressEvent(TQMouseEvent*);
virtual void mouseReleaseEvent(TQMouseEvent*);
private:
@ -71,21 +72,21 @@ class ImageButton : public TranslucentWidget
bool pressed;
bool delay_popup;
QTimer* popup_timer;
TQTimer* popup_timer;
/* Widget's mask */
QRegion mask;
/* Widget's tqmask */
TQRegion tqmask;
/* Widget's tip */
QString tooltip;
TQString tooltip;
/* Widget's pixmaps */
QPixmap up_pixmap;
QPixmap over_pixmap;
QPixmap down_pixmap;
TQPixmap up_pixmap;
TQPixmap over_pixmap;
TQPixmap down_pixmap;
/* Widget's popup menu */
QPopupMenu* popup_menu;
TQPopupMenu* popup_menu;
private slots:

@ -19,8 +19,8 @@
#include "first_run_dialog.h"
#include "session.h"
#include <qsignalmapper.h>
#include <qwhatsthis.h>
#include <tqsignalmapper.h>
#include <tqwhatsthis.h>
#include <kaboutapplication.h>
#include <kaboutkde.h>
@ -30,9 +30,9 @@
#include <kwin.h>
#include <dcopref.h>
MainWindow::MainWindow(QWidget * parent, const char * name) :
MainWindow::MainWindow(TQWidget * tqparent, const char * name) :
DCOPObject("DCOPInterface"),
KMainWindow(parent, name, Qt::WStyle_Customize | Qt::WStyle_NoBorder),
KMainWindow(tqparent, name, TQt::WStyle_Customize | TQt::WStyle_NoBorder),
step(0)
{
first_run_dialog = 0;
@ -45,8 +45,8 @@ MainWindow::MainWindow(QWidget * parent, const char * name) :
KConfig config(CONFIG_FILE);
back_widget = new QWidget(this);
widgets_stack = new QWidgetStack(this);
back_widget = new TQWidget(this);
widgets_stack = new TQWidgetStack(this);
// Register with DCOP.
if (!kapp->dcopClient()->isRegistered())
@ -66,10 +66,10 @@ MainWindow::MainWindow(QWidget * parent, const char * name) :
Settings::setSkin("default");
// Initialize access key.
global_key = new KGlobalAccel(this);
global_key = new KGlobalAccel(TQT_TQOBJECT(this));
global_key->insert("AccessKey", i18n("Open/Retract Yakuake"),
i18n("Slides the Yakuake window in and out"),
Key_F12, 0, this, SLOT(slotToggleState()));
Key_F12, 0, TQT_TQOBJECT(this), TQT_SLOT(slotToggleState()));
global_key->readSettings(&config);
global_key->updateConnections();
@ -79,73 +79,73 @@ MainWindow::MainWindow(QWidget * parent, const char * name) :
// Initialize shortcuts.
KAction* action;
KShortcut shortcut(Qt::CTRL+Qt::ALT+Qt::Key_N);
shortcut.append(KShortcut(Qt::CTRL+Qt::SHIFT+Qt::Key_N));
KShortcut shortcut(TQt::CTRL+TQt::ALT+TQt::Key_N);
shortcut.append(KShortcut(TQt::CTRL+TQt::SHIFT+TQt::Key_N));
action = new KAction(i18n("New Session"), SmallIcon("tab_new"), shortcut,
this, SLOT(slotAddSession()),
TQT_TQOBJECT(this), TQT_SLOT(slotAddSession()),
actionCollection(), "add_tab");
action = new KAction(i18n("Two Terminals, Horizontal"), SmallIcon("tab_new"),
0, this, SLOT(slotAddSessionTwoVertical()),
action = new KAction(i18n("Two Terminals,Qt::Horizontal"), SmallIcon("tab_new"),
0, TQT_TQOBJECT(this), TQT_SLOT(slotAddSessionTwoVertical()),
actionCollection(), "add_tab_twohorizontal");
action = new KAction(i18n("Two Terminals, Vertical"), SmallIcon("tab_new"),
0, this, SLOT(slotAddSessionTwoHorizontal()),
action = new KAction(i18n("Two Terminals,Qt::Vertical"), SmallIcon("tab_new"),
0, TQT_TQOBJECT(this), TQT_SLOT(slotAddSessionTwoHorizontal()),
actionCollection(), "add_tab_twovertical");
action = new KAction(i18n("Four Terminals, Quad"), SmallIcon("tab_new"),
0, this, SLOT(slotAddSessionQuad()),
0, TQT_TQOBJECT(this), TQT_SLOT(slotAddSessionQuad()),
actionCollection(), "add_tab_quad");
action = new KAction(i18n("Go to Next Terminal"), SmallIcon("next"),
"Ctrl+Shift+Up", this, SLOT(slotFocusNextSplit()),
"Ctrl+Shift+Up", TQT_TQOBJECT(this), TQT_SLOT(slotFocusNextSplit()),
actionCollection(), "focus_next_terminal");
action = new KAction(i18n("Go to Previous Terminal"), SmallIcon("previous"),
"Ctrl+Shift+Down", this, SLOT(slotFocusPreviousSplit()),
"Ctrl+Shift+Down", TQT_TQOBJECT(this), TQT_SLOT(slotFocusPreviousSplit()),
actionCollection(), "focus_previous_terminal");
action = new KAction(i18n("Paste"), SmallIcon("editpaste"), SHIFT+Key_Insert,
this, SLOT(slotPasteClipboard()),
TQT_TQOBJECT(this), TQT_SLOT(slotPasteClipboard()),
actionCollection(), "paste_clipboard");
action = new KAction(i18n("Paste Selection"), SmallIcon("editpaste"),
CTRL+SHIFT+Key_Insert, this, SLOT(slotPasteSelection()),
CTRL+SHIFT+Key_Insert, TQT_TQOBJECT(this), TQT_SLOT(slotPasteSelection()),
actionCollection(), "paste_selection");
action = new KAction(i18n("Rename Session..."), SmallIcon("edit"),
"Alt+Ctrl+S", this, SLOT(slotInteractiveRename()),
"Alt+Ctrl+S", TQT_TQOBJECT(this), TQT_SLOT(slotInteractiveRename()),
actionCollection(), "edit_name");
action = new KAction(i18n("Increase Width"), SmallIcon("viewmag+"),
"Alt+Shift+Right", this, SLOT(slotIncreaseSizeW()),
"Alt+Shift+Right", TQT_TQOBJECT(this), TQT_SLOT(slotIncreaseSizeW()),
actionCollection(), "increasew");
action = new KAction(i18n("Decrease Width"), SmallIcon("viewmag-"),
"Alt+Shift+Left", this, SLOT(slotDecreaseSizeW()),
"Alt+Shift+Left", TQT_TQOBJECT(this), TQT_SLOT(slotDecreaseSizeW()),
actionCollection(), "decreasew");
action = new KAction(i18n("Increase Height"), SmallIcon("viewmag+"),
"Alt+Shift+Down", this, SLOT(slotIncreaseSizeH()),
"Alt+Shift+Down", TQT_TQOBJECT(this), TQT_SLOT(slotIncreaseSizeH()),
actionCollection(), "increaseh");
action = new KAction(i18n("Decrease Height"), SmallIcon("viewmag-"),
"Alt+Shift+Up", this, SLOT(slotDecreaseSizeH()),
"Alt+Shift+Up", TQT_TQOBJECT(this), TQT_SLOT(slotDecreaseSizeH()),
actionCollection(), "decreaseh");
action = new KAction(i18n("Configure Global Shortcuts..."),
SmallIcon("configure_shortcuts"), 0,
this, SLOT(slotSetAccessKey()),
TQT_TQOBJECT(this), TQT_SLOT(slotSetAccessKey()),
actionCollection(), "global_shortcuts");
action = new KAction(i18n("Quit"), SmallIcon("exit"), 0, this,
SLOT(close()), actionCollection(), "quit");
action = new KAction(i18n("Quit"), SmallIcon("exit"), 0, TQT_TQOBJECT(this),
TQT_SLOT(close()), actionCollection(), "quit");
KStdAction::keyBindings(this, SLOT(slotSetControlKeys()), actionCollection());
KStdAction::preferences(this, SLOT(slotOpenSettingsDialog()), actionCollection());
KStdAction::aboutApp(this, SLOT(slotOpenAboutApp()), actionCollection());
KStdAction::aboutKDE(this, SLOT(slotOpenAboutKDE()), actionCollection());
KStdAction::whatsThis(this, SLOT(whatsThis()), actionCollection());
KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(slotSetControlKeys()), actionCollection());
KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(slotOpenSettingsDialog()), actionCollection());
KStdAction::aboutApp(TQT_TQOBJECT(this), TQT_SLOT(slotOpenAboutApp()), actionCollection());
KStdAction::aboutKDE(TQT_TQOBJECT(this), TQT_SLOT(slotOpenAboutKDE()), actionCollection());
KStdAction::whatsThis(TQT_TQOBJECT(this), TQT_SLOT(whatsThis()), actionCollection());
full_screen_action = KStdAction::fullScreen(this, SLOT(slotUpdateFullScreen()), actionCollection(), this);
connect(full_screen_action, SIGNAL(toggled(bool)), this, SLOT(slotSetFullScreen(bool)));
full_screen_action = KStdAction::fullScreen(TQT_TQOBJECT(this), TQT_SLOT(slotUpdateFullScreen()), actionCollection(), this);
connect(full_screen_action, TQT_SIGNAL(toggled(bool)), TQT_TQOBJECT(this), TQT_SLOT(slotSetFullScreen(bool)));
createMenu();
createSessionMenu();
@ -153,47 +153,47 @@ MainWindow::MainWindow(QWidget * parent, const char * name) :
createTabsBar();
action = new KAction(i18n("Go to Next Session"), SmallIcon("next"),
"Shift+Right", tab_bar, SLOT(slotSelectNextItem()),
"Shift+Right", TQT_TQOBJECT(tab_bar), TQT_SLOT(slotSelectNextItem()),
actionCollection(), "next_tab");
action = new KAction(i18n("Go to Previous Session"), SmallIcon("previous"),
"Shift+Left", tab_bar, SLOT(slotSelectPreviousItem()),
"Shift+Left", TQT_TQOBJECT(tab_bar), TQT_SLOT(slotSelectPreviousItem()),
actionCollection(), "previous_tab");
action = new KAction(i18n("Move Session Left"), SmallIcon("back"),
"Ctrl+Shift+Left", tab_bar, SLOT(slotMoveItemLeft()),
"Ctrl+Shift+Left", TQT_TQOBJECT(tab_bar), TQT_SLOT(slotMoveItemLeft()),
actionCollection(), "move_tab_left");
action = new KAction(i18n("Move Session Right"), SmallIcon("forward"),
"Ctrl+Shift+Right", tab_bar, SLOT(slotMoveItemRight()),
"Ctrl+Shift+Right", TQT_TQOBJECT(tab_bar), TQT_SLOT(slotMoveItemRight()),
actionCollection(), "move_tab_right");
remove_tab_action = new KAction(i18n("Close Session"), SmallIcon("fileclose"), 0,
this, 0, actionCollection(), "remove_tab");
connect(remove_tab_action, SIGNAL(activated(KAction::ActivationReason, Qt::ButtonState)),
this, SLOT(slotHandleRemoveSession(KAction::ActivationReason, Qt::ButtonState)));
TQT_TQOBJECT(this), 0, actionCollection(), "remove_tab");
connect(remove_tab_action, TQT_SIGNAL(activated(KAction::ActivationReason, TQt::ButtonState)),
TQT_TQOBJECT(this), TQT_SLOT(slotHandleRemoveSession(KAction::ActivationReason, TQt::ButtonState)));
split_horiz_action = new KAction(i18n("Split Terminal Horizontally"), SmallIcon("view_top_bottom"),
CTRL+SHIFT+Key_T, this, 0, actionCollection(), "split_horizontally");
connect(split_horiz_action, SIGNAL(activated(KAction::ActivationReason, Qt::ButtonState)),
this, SLOT(slotHandleVerticalSplit(KAction::ActivationReason, Qt::ButtonState)));
split_horiz_action = new KAction(i18n("Split TerminalQt::Horizontally"), SmallIcon("view_top_bottom"),
CTRL+SHIFT+Key_T, TQT_TQOBJECT(this), 0, actionCollection(), "split_horizontally");
connect(split_horiz_action, TQT_SIGNAL(activated(KAction::ActivationReason, TQt::ButtonState)),
TQT_TQOBJECT(this), TQT_SLOT(slotHandleVerticalSplit(KAction::ActivationReason, TQt::ButtonState)));
split_vert_action = new KAction(i18n("Split Terminal Vertically"), SmallIcon("view_left_right"),
CTRL+SHIFT+Key_L, this, 0, actionCollection(), "split_vertically");
connect(split_vert_action, SIGNAL(activated(KAction::ActivationReason, Qt::ButtonState)),
this, SLOT(slotHandleHorizontalSplit(KAction::ActivationReason, Qt::ButtonState)));
split_vert_action = new KAction(i18n("Split TerminalQt::Vertically"), SmallIcon("view_left_right"),
CTRL+SHIFT+Key_L, TQT_TQOBJECT(this), 0, actionCollection(), "split_vertically");
connect(split_vert_action, TQT_SIGNAL(activated(KAction::ActivationReason, TQt::ButtonState)),
TQT_TQOBJECT(this), TQT_SLOT(slotHandleHorizontalSplit(KAction::ActivationReason, TQt::ButtonState)));
remove_term_action = new KAction(i18n("Close Terminal"), SmallIcon("view_remove"),
CTRL+SHIFT+Key_R, this, 0, actionCollection(), "remove_terminal");
connect(remove_term_action, SIGNAL(activated(KAction::ActivationReason, Qt::ButtonState)),
this, SLOT(slotHandleRemoveTerminal(KAction::ActivationReason, Qt::ButtonState)));
CTRL+SHIFT+Key_R, TQT_TQOBJECT(this), 0, actionCollection(), "remove_terminal");
connect(remove_term_action, TQT_SIGNAL(activated(KAction::ActivationReason, TQt::ButtonState)),
TQT_TQOBJECT(this), TQT_SLOT(slotHandleRemoveTerminal(KAction::ActivationReason, TQt::ButtonState)));
QSignalMapper* tab_selection_mapper = new QSignalMapper(this);
connect(tab_selection_mapper, SIGNAL(mapped(int)), this, SLOT(slotSelectTabPosition(int)));
TQSignalMapper* tab_selection_mapper = new TQSignalMapper(TQT_TQOBJECT(this));
connect(tab_selection_mapper, TQT_SIGNAL(mapped(int)), TQT_TQOBJECT(this), TQT_SLOT(slotSelectTabPosition(int)));
for (uint i = 1; i <= 12; ++i)
{
KAction* tab_selection_action = new KAction(i18n("Switch to Session %1").arg(i), 0, 0,
tab_selection_mapper, SLOT(map()), actionCollection(), QString("go_to_tab_%1").arg(i).local8Bit());
KAction* tab_selection_action = new KAction(i18n("Switch to Session %1").tqarg(i), 0, 0,
tab_selection_mapper, TQT_SLOT(map()), actionCollection(), TQString("go_to_tab_%1").tqarg(i).local8Bit());
tab_selection_mapper->setMapping(tab_selection_action, i-1);
}
@ -205,28 +205,28 @@ MainWindow::MainWindow(QWidget * parent, const char * name) :
// Add first session.
slotAddSession();
connect(kapp, SIGNAL(aboutToQuit()), this, SLOT(slotAboutToQuit()));
connect(kapp, TQT_SIGNAL(aboutToQuit()), TQT_TQOBJECT(this), TQT_SLOT(slotAboutToQuit()));
// No need for this if we're not going to use pseudo-translucency.
if (use_translucency)
connect(kapp, SIGNAL(backgroundChanged(int)), this, SLOT(slotUpdateBackgroundState()));
connect(kapp, TQT_SIGNAL(backgroundChanged(int)), TQT_TQOBJECT(this), TQT_SLOT(slotUpdateBackgroundState()));
connect(tab_bar, SIGNAL(addItem()), this, SLOT(slotAddSession()));
connect(tab_bar, SIGNAL(removeItem()), this, SLOT(slotRemoveSession()));
connect(tab_bar, SIGNAL(itemSelected(int)), this, SLOT(slotSelectSession(int)));
connect(&desk_info, SIGNAL(workAreaChanged()), this, SLOT(slotUpdateSize()));
connect(TQT_TQOBJECT(tab_bar), TQT_SIGNAL(addItem()), TQT_TQOBJECT(this), TQT_SLOT(slotAddSession()));
connect(TQT_TQOBJECT(tab_bar), TQT_SIGNAL(removeItem()), TQT_TQOBJECT(this), TQT_SLOT(slotRemoveSession()));
connect(TQT_TQOBJECT(tab_bar), TQT_SIGNAL(itemSelected(int)), TQT_TQOBJECT(this), TQT_SLOT(slotSelectSession(int)));
connect(&desk_info, TQT_SIGNAL(workAreaChanged()), TQT_TQOBJECT(this), TQT_SLOT(slotUpdateSize()));
connect(&poller, SIGNAL(timeout()), this, SLOT(slotPollMouse()));
connect(&poller, TQT_SIGNAL(timeout()), TQT_TQOBJECT(this), TQT_SLOT(slotPollMouse()));
// Startup notification popup.
if (Settings::popup() && !Settings::firstrun())
showPopup(i18n("Application successfully started!\nPress %1 to use it...").arg(global_key->shortcut("AccessKey").toString()));
showPopup(i18n("Application successfully started!\nPress %1 to use it...").tqarg(global_key->shortcut("AccessKey").toString()));
// First run dialog.
if (Settings::firstrun())
{
QTimer::singleShot(0, this, SLOT(slotToggleState()));
QTimer::singleShot(0, this, SLOT(slotOpenFirstRunDialog()));
TQTimer::singleShot(0, TQT_TQOBJECT(this), TQT_SLOT(slotToggleState()));
TQTimer::singleShot(0, TQT_TQOBJECT(this), TQT_SLOT(slotOpenFirstRunDialog()));
}
else if (Settings::poll())
toggleMousePoll(true);
@ -312,15 +312,15 @@ bool MainWindow::queryClose()
void MainWindow::updateWindowMask()
{
QRegion mask = title_bar->getWidgetMask();
TQRegion tqmask = title_bar->getWidgetMask();
mask.translate(0, mask_height);
mask += QRegion(0, 0, width(), mask_height);
tqmask.translate(0, tqmask_height);
tqmask += TQRegion(0, 0, width(), tqmask_height);
setMask(mask);
setMask(tqmask);
}
void MainWindow::showPopup(const QString& text, int time)
void MainWindow::showPopup(const TQString& text, int time)
{
/* Show a passive popup with the given text. */
@ -352,8 +352,8 @@ void MainWindow::slotAddSessionQuad()
void MainWindow::slotAddSession(Session::SessionType type)
{
Session* session = new Session(widgets_stack, type);
connect(session, SIGNAL(destroyed(int)), this, SLOT(slotSessionDestroyed(int)));
connect(session, SIGNAL(titleChanged(const QString&)), this, SLOT(slotUpdateTitle(const QString&)));
connect(session, TQT_SIGNAL(destroyed(int)), TQT_TQOBJECT(this), TQT_SLOT(slotSessionDestroyed(int)));
connect(session, TQT_SIGNAL(titleChanged(const TQString&)), TQT_TQOBJECT(this), TQT_SLOT(slotUpdateTitle(const TQString&)));
widgets_stack->addWidget(session->widget());
sessions_stack.insert(session->id(), session);
@ -377,7 +377,7 @@ void MainWindow::slotRemoveSession(int session_id)
sessions_stack[session_id]->deleteLater();
}
void MainWindow::slotHandleRemoveSession(KAction::ActivationReason reason, Qt::ButtonState /* state */)
void MainWindow::slotHandleRemoveSession(KAction::ActivationReason reason, TQt::ButtonState /* state */)
{
if (reason == KAction::PopupMenuActivation
&& tab_bar->pressedPosition() != -1)
@ -408,7 +408,7 @@ void MainWindow::slotRemoveTerminal(int session_id, int terminal_id)
sessions_stack[session_id]->removeTerminal(terminal_id);
}
void MainWindow::slotRenameSession(int session_id, const QString& name)
void MainWindow::slotRenameSession(int session_id, const TQString& name)
{
tab_bar->renameItem(session_id, name);
}
@ -436,19 +436,19 @@ int MainWindow::selectedTerminal()
return sessions_stack[selected_id]->activeTerminalId();
}
const QString MainWindow::sessionIdList()
const TQString MainWindow::sessionIdList()
{
QValueList<int>::iterator it;
QValueList<int> key_list = sessions_stack.keys();
QStringList id_list;
TQValueList<int>::iterator it;
TQValueList<int> key_list = sessions_stack.keys();
TQStringList id_list;
for (it = key_list.begin(); it != key_list.end(); ++it)
id_list << QString::number((*it));
id_list << TQString::number((*it));
return id_list.join(",");
}
const QString MainWindow::terminalIdList(int session_id)
const TQString MainWindow::terminalIdList(int session_id)
{
if (!sessions_stack[session_id]) return 0;
@ -486,50 +486,50 @@ void MainWindow::slotSelectTabPosition(int position)
tab_bar->selectPosition(position);
}
const QString MainWindow::slotSessionName()
const TQString MainWindow::slotSessionName()
{
return tab_bar->itemName(selected_id);
}
const QString MainWindow::slotSessionName(int session_id)
const TQString MainWindow::slotSessionName(int session_id)
{
if (!sessions_stack[session_id]) return 0;
return tab_bar->itemName(session_id);
}
const QString MainWindow::slotSessionTitle()
const TQString MainWindow::slotSessionTitle()
{
return sessions_stack[selected_id]->title();
}
const QString MainWindow::slotSessionTitle(int session_id)
const TQString MainWindow::slotSessionTitle(int session_id)
{
if (!sessions_stack[session_id]) return 0;
return sessions_stack[session_id]->title();
}
const QString MainWindow::slotSessionTitle(int session_id, int terminal_id)
const TQString MainWindow::slotSessionTitle(int session_id, int terminal_id)
{
if (!sessions_stack[session_id]) return 0;
return sessions_stack[session_id]->title(terminal_id);
}
void MainWindow::slotSetSessionTitleText(const QString& title)
void MainWindow::slotSetSessionTitleText(const TQString& title)
{
sessions_stack[selected_id]->setTitle(title);
}
void MainWindow::slotSetSessionTitleText(int session_id, const QString& title)
void MainWindow::slotSetSessionTitleText(int session_id, const TQString& title)
{
if (!sessions_stack[session_id]) return;
sessions_stack[session_id]->setTitle(title);
}
void MainWindow::slotSetSessionTitleText(int session_id, int terminal_id, const QString& title)
void MainWindow::slotSetSessionTitleText(int session_id, int terminal_id, const TQString& title)
{
if (!sessions_stack[session_id]) return;
@ -574,19 +574,19 @@ void MainWindow::slotPasteSelection(int session_id, int terminal_id)
sessions_stack[session_id]->pasteSelection(terminal_id);
}
void MainWindow::slotRunCommandInSession(const QString& command)
void MainWindow::slotRunCommandInSession(const TQString& command)
{
sessions_stack[selected_id]->runCommand(command);
}
void MainWindow::slotRunCommandInSession(int session_id, const QString& command)
void MainWindow::slotRunCommandInSession(int session_id, const TQString& command)
{
if (!sessions_stack[session_id]) return;
sessions_stack[session_id]->runCommand(command);
}
void MainWindow::slotRunCommandInSession(int session_id, int terminal_id, const QString& command)
void MainWindow::slotRunCommandInSession(int session_id, int terminal_id, const TQString& command)
{
if (!sessions_stack[session_id]) return;
@ -650,7 +650,7 @@ void MainWindow::windowActivationChange(bool old_active)
slotToggleState();
}
void MainWindow::slotHandleHorizontalSplit(KAction::ActivationReason reason, Qt::ButtonState /* state */)
void MainWindow::slotHandleHorizontalSplit(KAction::ActivationReason reason, TQt::ButtonState /* state */)
{
if (reason == KAction::PopupMenuActivation
&& tab_bar->pressedPosition() != -1)
@ -662,7 +662,7 @@ void MainWindow::slotHandleHorizontalSplit(KAction::ActivationReason reason, Qt:
slotSplitHorizontally();
}
void MainWindow::slotHandleVerticalSplit(KAction::ActivationReason reason, Qt::ButtonState /* state */)
void MainWindow::slotHandleVerticalSplit(KAction::ActivationReason reason, TQt::ButtonState /* state */)
{
if (reason == KAction::PopupMenuActivation
&& tab_bar->pressedPosition() != -1)
@ -675,7 +675,7 @@ void MainWindow::slotHandleVerticalSplit(KAction::ActivationReason reason, Qt::B
}
void MainWindow::slotHandleRemoveTerminal(KAction::ActivationReason reason, Qt::ButtonState /* state */)
void MainWindow::slotHandleRemoveTerminal(KAction::ActivationReason reason, TQt::ButtonState /* state */)
{
if (reason == KAction::PopupMenuActivation
&& tab_bar->pressedPosition() != -1)
@ -706,34 +706,34 @@ int MainWindow::getMouseScreen()
{
/* Gets the screen where the mouse pointer is located. */
return QApplication::desktop()->screenNumber(QCursor::pos());
return TQApplication::desktop()->screenNumber(TQCursor::pos());
}
QRect MainWindow::getDesktopGeometry()
TQRect MainWindow::getDesktopGeometry()
{
/* Computes the desktop geometry. */
/* Computes the desktop tqgeometry. */
if (full_screen)
{
if (!Settings::screen())
return QApplication::desktop()->screenGeometry(getMouseScreen());
return TQApplication::desktop()->screenGeometry(getMouseScreen());
else
return QApplication::desktop()->screenGeometry(Settings::screen()-1);
return TQApplication::desktop()->screenGeometry(Settings::screen()-1);
}
QRect result;
TQRect result;
result = desk_info.workArea();
KConfigGroup group(KGlobal::config(), "Windows");
if (QApplication::desktop()->isVirtualDesktop() &&
if (TQApplication::desktop()->isVirtualDesktop() &&
group.readBoolEntry("XineramaEnabled", true) &&