TDE
/
yakuake
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/yakuake
0
0
Fork 0
Code Issues Releases Wiki Activity

rename the following methods:

Browse Source 
tqparent parent
tqmask mask


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/yakuake@1246260 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
v3.5.13-sru
tpearson 13 years ago
parent 433d7678bd
commit 5388d67e65
28 changed files with 77 additions and 77 deletions
Show Stats Download Patch File Download Diff File

4
yakuake/src/first_run_dialog.cpp
Unescape View File

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

2
yakuake/src/first_run_dialog.h
Unescape View File

@ -25,7 +25,7 @@ class FirstRunDialog : public FirstRunDialogUI
TQ_OBJECT
public:
explicit FirstRunDialog(TQWidget* tqparent, const char* name=NULL);
explicit FirstRunDialog(TQWidget* parent, const char* name=NULL);
~FirstRunDialog();
KShortcut shortcut();

4
yakuake/src/general_settings.cpp
Unescape View File

@ -23,8 +23,8 @@
#include <klocale.h>
GeneralSettings::GeneralSettings(TQWidget* tqparent, const char* name)
: GeneralSettingsUI(tqparent, name)
GeneralSettings::GeneralSettings(TQWidget* parent, const char* name)
: GeneralSettingsUI(parent, name)
{
kcfg_width->setSuffix("%");
kcfg_height->setSuffix("%");

2
yakuake/src/general_settings.h
Unescape View File

@ -23,7 +23,7 @@ class GeneralSettings : public GeneralSettingsUI
TQ_OBJECT
public:
explicit GeneralSettings(TQWidget* tqparent, const char* name=NULL);
explicit GeneralSettings(TQWidget* parent, const char* name=NULL);
~GeneralSettings();

8
yakuake/src/image_button.cpp
Unescape View File

@ -21,7 +21,7 @@
#include <kglobalsettings.h>
ImageButton::ImageButton(TQWidget* tqparent, const char* name, bool translucency) : TranslucentWidget(tqparent, name, translucency)
ImageButton::ImageButton(TQWidget* parent, const char* name, bool translucency) : TranslucentWidget(parent, name, translucency)
{
state = 0;
toggle = false;
@ -71,14 +71,14 @@ void ImageButton::showPopupMenu()
popup_menu->exec(mapToGlobal(TQPoint(0, height())));
}
void ImageButton::setUpPixmap(const TQString& path, bool use_alpha_tqmask)
void ImageButton::setUpPixmap(const TQString& path, bool use_alpha_mask)
{
up_pixmap.load(path);
resize(up_pixmap.size());
if (up_pixmap.hasAlphaChannel()) setMask(*up_pixmap.tqmask());
if (up_pixmap.hasAlphaChannel()) setMask(*up_pixmap.mask());
if (use_alpha_tqmask)
if (use_alpha_mask)
setUseTranslucency(true);
else
setMask(TQRegion(up_pixmap.rect()));

8
yakuake/src/image_button.h
Unescape View File

@ -34,7 +34,7 @@ class ImageButton : public TranslucentWidget
TQ_OBJECT
public:
explicit ImageButton(TQWidget* tqparent = 0, const char* name = 0, bool translucency = false);
explicit ImageButton(TQWidget* parent = 0, const char* name = 0, bool translucency = false);
~ImageButton();
/* Creates a toggle button */
@ -46,7 +46,7 @@ class ImageButton : public TranslucentWidget
void setDelayedPopup(bool delay) { delay_popup = delay; }
/* Sets the widget's pixmaps */
void setUpPixmap(const TQString& path, bool use_alpha_tqmask = false);
void setUpPixmap(const TQString& path, bool use_alpha_mask = false);
void setOverPixmap(const TQString& path);
void setDownPixmap(const TQString& path);
@ -74,8 +74,8 @@ class ImageButton : public TranslucentWidget
TQTimer* popup_timer;
/* Widget's tqmask */
TQRegion tqmask;
/* Widget's mask */
TQRegion mask;
/* Widget's tip */
TQString tooltip;

14
yakuake/src/main_window.cpp
Unescape View File

@ -30,9 +30,9 @@
#include <kwin.h>
#include <dcopref.h>
MainWindow::MainWindow(TQWidget * tqparent, const char * name) :
MainWindow::MainWindow(TQWidget * parent, const char * name) :
DCOPObject("DCOPInterface"),
KMainWindow(tqparent, name, TQt::WStyle_Customize | TQt::WStyle_NoBorder),
KMainWindow(parent, name, TQt::WStyle_Customize | TQt::WStyle_NoBorder),
step(0)
{
first_run_dialog = 0;
@ -312,12 +312,12 @@ bool MainWindow::queryClose()
void MainWindow::updateWindowMask()
{
TQRegion tqmask = title_bar->getWidgetMask();
TQRegion mask = title_bar->getWidgetMask();
tqmask.translate(0, mask_height);
tqmask += TQRegion(0, 0, width(), mask_height);
mask.translate(0, mask_height);
mask += TQRegion(0, 0, width(), mask_height);
setMask(tqmask);
setMask(mask);
}
void MainWindow::showPopup(const TQString& text, int time)
@ -1047,7 +1047,7 @@ void MainWindow::slotUpdateSize(int new_width, int new_height, int new_location)
back_widget->setGeometry(0, 0, width(), height());
// Update the window tqmask.
// Update the window mask.
mask_height = (isVisible()) ? max_height : 0;
updateWindowMask();
}

2
yakuake/src/main_window.h
Unescape View File

@ -54,7 +54,7 @@ class MainWindow : public KMainWindow, virtual public DCOPInterface
TQ_OBJECT
public:
explicit MainWindow(TQWidget* tqparent = 0, const char* name = 0);
explicit MainWindow(TQWidget* parent = 0, const char* name = 0);
~MainWindow();
int selectedSession();

12
yakuake/src/session.cpp
Unescape View File

@ -23,7 +23,7 @@
int Session::available_session_id = 0;
Session::Session(TQWidget* tqparent, SessionType type, const char* name) : TQObject(tqparent, name)
Session::Session(TQWidget* parent, SessionType type, const char* name) : TQObject(parent, name)
{
session_id = available_session_id;
available_session_id++;
@ -33,7 +33,7 @@ Session::Session(TQWidget* tqparent, SessionType type, const char* name) : TQObj
focus_watcher = new TerminalFocusWatcher(this);
connect(focus_watcher, TQT_SIGNAL(focusChanged()), this, TQT_SLOT(slotFocusChanged()));
base_widget = new TerminalSplitter(Qt::Horizontal, tqparent, "base");
base_widget = new TerminalSplitter(Qt::Horizontal, parent, "base");
connect(base_widget, TQT_SIGNAL(destroyed()), this, TQT_SLOT(slotLastTerminalClosed()));
setenv("DCOP_YAKUAKE_SESSION", TQString::number(session_id).ascii(), 1);
@ -305,7 +305,7 @@ void Session::split(TQWidget* active_terminal, Qt::Orientation o)
TerminalSplitter* splitter = static_cast<TerminalSplitter*>(active_terminal->parentWidget());
if (!splitter) return;
// If the tqparent splitter of this terminal has only this one child,
// If the parent splitter of this terminal has only this one child,
// add the new terminal to the same splitter, after resetting the
// splitter orientation as needed.
if (splitter->count() == 1)
@ -323,7 +323,7 @@ void Session::split(TQWidget* active_terminal, Qt::Orientation o)
terminal->widget()->show();
}
// If the tqparent splitter of this terminal already has two tqchildren,
// If the parent splitter of this terminal already has two tqchildren,
// add a new splitter to it and reparent the terminal to the new
// splitter.
else
@ -351,9 +351,9 @@ void Session::split(TQWidget* active_terminal, Qt::Orientation o)
}
}
Terminal* Session::addTerminal(TQWidget* tqparent)
Terminal* Session::addTerminal(TQWidget* parent)
{
Terminal* terminal = new Terminal(tqparent);
Terminal* terminal = new Terminal(parent);
terminals.insert(terminal->id(), terminal);
terminal_ids.insert(terminal->widget(), terminal->id());

4
yakuake/src/session.h
Unescape View File

@ -31,7 +31,7 @@ class Session : public TQObject
public:
enum SessionType { Single, TwoHorizontal, TwoVertical, Quad };
explicit Session(TQWidget* tqparent = 0, SessionType type = Single, const char* name = 0);
explicit Session(TQWidget* parent = 0, SessionType type = Single, const char* name = 0);
virtual ~Session();
int id() { return session_id; }
@ -80,7 +80,7 @@ class Session : public TQObject
private:
void createInitialSplits(SessionType);
void split(TQWidget* active_terminal, Qt::Orientation o);
Terminal* addTerminal(TQWidget* tqparent);
Terminal* addTerminal(TQWidget* parent);
bool checkFocusWidget();
static int available_session_id;

4
yakuake/src/skin_list_item.cpp
Unescape View File

@ -22,9 +22,9 @@
#include <klocale.h>
SkinListItem::SkinListItem(KListView* tqparent, const TQString& fancy_name,
SkinListItem::SkinListItem(KListView* parent, const TQString& fancy_name,
const TQString& author, const TQPixmap& icon, const TQString& name, const TQString& dir)
: KListViewItem(tqparent, fancy_name)
: KListViewItem(parent, fancy_name)
{
setName(name);
setAuthor(author);

2
yakuake/src/skin_list_item.h
Unescape View File

@ -25,7 +25,7 @@ class TQSimpleRichText;
class SkinListItem : public KListViewItem
{
public:
explicit SkinListItem(KListView* tqparent, const TQString& fancy_name,
explicit SkinListItem(KListView* parent, const TQString& fancy_name,
const TQString& author, const TQPixmap& icon, const TQString& name, const TQString& dir);
~SkinListItem();

4
yakuake/src/skin_settings.cpp
Unescape View File

@ -40,8 +40,8 @@
#include <unistd.h> // unlink()
SkinSettings::SkinSettings(TQWidget* tqparent, const char* name, bool translucency)
: SkinSettingsUI(tqparent, name)
SkinSettings::SkinSettings(TQWidget* parent, const char* name, bool translucency)
: SkinSettingsUI(parent, name)
{
kcfg_skin->hide();

2
yakuake/src/skin_settings.h
Unescape View File

@ -25,7 +25,7 @@ class SkinSettings : public SkinSettingsUI
TQ_OBJECT
public:
explicit SkinSettings(TQWidget* tqparent, const char* name=NULL, bool translucency = false);
explicit SkinSettings(TQWidget* parent, const char* name=NULL, bool translucency = false);
~SkinSettings();

4
yakuake/src/tab_bar.cpp
Unescape View File

@ -22,8 +22,8 @@
#include <kpopupmenu.h>
TabBar::TabBar(TQWidget* tqparent, const char* name, bool translucency, const TQString & skin)
: TranslucentWidget(tqparent, name, translucency)
TabBar::TabBar(TQWidget* parent, const char* name, bool translucency, const TQString & skin)
: TranslucentWidget(parent, name, translucency)
{
loadSkin(skin);

2
yakuake/src/tab_bar.h
Unescape View File

@ -36,7 +36,7 @@ class TabBar : public TranslucentWidget
TQ_OBJECT
public:
explicit TabBar(TQWidget* tqparent = 0, const char* name = 0,
explicit TabBar(TQWidget* parent = 0, const char* name = 0,
bool translucency = false, const TQString& skin = "default");
~TabBar();

26
yakuake/src/tabbed_widget.cpp
Unescape View File

@ -24,8 +24,8 @@
#include <kiconloader.h>
TabbedWidget::TabbedWidget(TQWidget* tqparent, const char* name, bool translucency)
: TranslucentWidget(tqparent, name, translucency)
TabbedWidget::TabbedWidget(TQWidget* parent, const char* name, bool translucency)
: TranslucentWidget(parent, name, translucency)
{
current_position = -1;
pressed = false;
@ -68,26 +68,26 @@ void TabbedWidget::createContextMenu()
{
context_menu = new KPopupMenu();
static_cast<KMainWindow*>(TQT_TQWIDGET(tqparent()->tqparent()))->actionCollection()->
static_cast<KMainWindow*>(TQT_TQWIDGET(parent()->parent()))->actionCollection()->
action("split_horizontally")->plug(context_menu);
static_cast<KMainWindow*>(TQT_TQWIDGET(tqparent()->tqparent()))->actionCollection()->
static_cast<KMainWindow*>(TQT_TQWIDGET(parent()->parent()))->actionCollection()->
action("split_vertically")->plug(context_menu);
static_cast<KMainWindow*>(TQT_TQWIDGET(tqparent()->tqparent()))->actionCollection()->
static_cast<KMainWindow*>(TQT_TQWIDGET(parent()->parent()))->actionCollection()->
action("remove_terminal")->plug(context_menu);
context_menu->insertSeparator();
static_cast<KMainWindow*>(TQT_TQWIDGET(tqparent()->tqparent()))->actionCollection()->
static_cast<KMainWindow*>(TQT_TQWIDGET(parent()->parent()))->actionCollection()->
action("move_tab_left")->plug(context_menu);
static_cast<KMainWindow*>(TQT_TQWIDGET(tqparent()->tqparent()))->actionCollection()->
static_cast<KMainWindow*>(TQT_TQWIDGET(parent()->parent()))->actionCollection()->
action("move_tab_right")->plug(context_menu);
context_menu->insertSeparator();
static_cast<KMainWindow*>(TQT_TQWIDGET(tqparent()->tqparent()))->actionCollection()->
static_cast<KMainWindow*>(TQT_TQWIDGET(parent()->parent()))->actionCollection()->
action("edit_name")->plug(context_menu);
static_cast<KMainWindow*>(TQT_TQWIDGET(tqparent()->tqparent()))->actionCollection()->
static_cast<KMainWindow*>(TQT_TQWIDGET(parent()->parent()))->actionCollection()->
action("remove_tab")->plug(context_menu);
}
@ -452,16 +452,16 @@ void TabbedWidget::mousePressEvent(TQMouseEvent* e)
if (!context_menu) createContextMenu();
static_cast<KMainWindow*>(TQT_TQWIDGET(tqparent()->tqparent()))->actionCollection()->
static_cast<KMainWindow*>(TQT_TQWIDGET(parent()->parent()))->actionCollection()->
action("move_tab_left")->setEnabled((position - 1 > 0));
static_cast<KMainWindow*>(TQT_TQWIDGET(tqparent()->tqparent()))->actionCollection()->
static_cast<KMainWindow*>(TQT_TQWIDGET(parent()->parent()))->actionCollection()->
action("move_tab_right")->setEnabled((position - 1 < int(items.count()) - 1));
context_menu->exec(TQCursor::pos());
static_cast<KMainWindow*>(TQT_TQWIDGET(tqparent()->tqparent()))->actionCollection()->
static_cast<KMainWindow*>(TQT_TQWIDGET(parent()->parent()))->actionCollection()->
action("move_tab_left")->setEnabled(true);
static_cast<KMainWindow*>(TQT_TQWIDGET(tqparent()->tqparent()))->actionCollection()->
static_cast<KMainWindow*>(TQT_TQWIDGET(parent()->parent()))->actionCollection()->
action("move_tab_right")->setEnabled(true);
}
}

2
yakuake/src/tabbed_widget.h
Unescape View File

@ -39,7 +39,7 @@ class TabbedWidget : public TranslucentWidget
TQ_OBJECT
public:
explicit TabbedWidget(TQWidget* tqparent = 0, const char* name = 0, bool translucency = false);
explicit TabbedWidget(TQWidget* parent = 0, const char* name = 0, bool translucency = false);
~TabbedWidget();
int pressedPosition();

4
yakuake/src/terminal.cpp
Unescape View File

@ -17,7 +17,7 @@
int Terminal::available_terminal_id = 0;
Terminal::Terminal(TQWidget* tqparent, const char* name) : TQObject(tqparent, name)
Terminal::Terminal(TQWidget* parent, const char* name) : TQObject(parent, name)
{
terminal_id = available_terminal_id;
available_terminal_id++;
@ -33,7 +33,7 @@ Terminal::Terminal(TQWidget* tqparent, const char* name) : TQObject(tqparent, na
terminal_interface = NULL;
if ((factory = KLibLoader::self()->factory("libkonsolepart")) != NULL)
terminal_part = (KParts::Part *) (factory->create(TQT_TQOBJECT(tqparent)));
terminal_part = (KParts::Part *) (factory->create(TQT_TQOBJECT(parent)));
if (terminal_part != NULL)
{

2
yakuake/src/terminal.h
Unescape View File

@ -31,7 +31,7 @@ class Terminal : public TQObject
TQ_OBJECT
public:
explicit Terminal(TQWidget* tqparent = 0, const char* name = 0);
explicit Terminal(TQWidget* parent = 0, const char* name = 0);
virtual ~Terminal();
int id() { return terminal_id; }

4
yakuake/src/terminal_focus_watcher.cpp
Unescape View File

@ -14,8 +14,8 @@
#include "terminal_focus_watcher.moc"
TerminalFocusWatcher::TerminalFocusWatcher(TQObject* tqparent, const char* name)
: TQObject(tqparent, name)
TerminalFocusWatcher::TerminalFocusWatcher(TQObject* parent, const char* name)
: TQObject(parent, name)
{
}

2
yakuake/src/terminal_focus_watcher.h
Unescape View File

@ -23,7 +23,7 @@ class TerminalFocusWatcher : public TQObject
TQ_OBJECT
public:
explicit TerminalFocusWatcher(TQObject* tqparent = 0, const char* name = 0);
explicit TerminalFocusWatcher(TQObject* parent = 0, const char* name = 0);
virtual ~TerminalFocusWatcher();
virtual bool eventFilter (TQObject* watched, TQEvent* e);

4
yakuake/src/terminal_splitter.cpp
Unescape View File

@ -16,8 +16,8 @@
#include <tqobjectlist.h>
TerminalSplitter::TerminalSplitter(Qt::Orientation o, TQWidget* tqparent, const char* name)
: TQSplitter(o, tqparent, name)
TerminalSplitter::TerminalSplitter(Qt::Orientation o, TQWidget* parent, const char* name)
: TQSplitter(o, parent, name)
{
is_shutting_down = false;
}

2
yakuake/src/terminal_splitter.h
Unescape View File

@ -23,7 +23,7 @@ class TerminalSplitter : public TQSplitter
TQ_OBJECT
public:
explicit TerminalSplitter(Qt::Orientation o, TQWidget* tqparent=0, const char* name=0);
explicit TerminalSplitter(Qt::Orientation o, TQWidget* parent=0, const char* name=0);
~TerminalSplitter();
void focusNext();

20
yakuake/src/title_bar.cpp
Unescape View File

@ -20,14 +20,14 @@
#include <klocale.h>
TitleBar::TitleBar(TQWidget * tqparent, const char * name, const TQString & skin) : TQWidget(tqparent, name)
TitleBar::TitleBar(TQWidget * parent, const char * name, const TQString & skin) : TQWidget(parent, name)
{
TQWhatsThis::add(this, i18n("The title bar displays the session title if available."));
loadSkin(skin);
connect(focus_button, TQT_SIGNAL(toggled(bool)), tqparent, TQT_SLOT(slotSetFocusPolicy(bool)));
connect(quit_button, TQT_SIGNAL(clicked()), tqparent, TQT_SLOT(close()));
connect(focus_button, TQT_SIGNAL(toggled(bool)), parent, TQT_SLOT(slotSetFocusPolicy(bool)));
connect(quit_button, TQT_SIGNAL(clicked()), parent, TQT_SLOT(close()));
}
TitleBar::~TitleBar()
@ -39,7 +39,7 @@ TitleBar::~TitleBar()
TQRegion& TitleBar::getWidgetMask()
{
return tqmask;
return mask;
}
void TitleBar::setTitleText(const TQString& title)
@ -181,12 +181,12 @@ void TitleBar::setPixmaps(const TQString& skin)
void TitleBar::updateWidgetMask()
{
TQRegion temp_tqmask;
TQRegion temp_mask;
tqmask = TQRegion(*left_corner.tqmask());
tqmask += TQRegion(TQRect(TQPoint(left_corner.width(), 0), TQPoint(width() - right_corner.width() - 1, height() - 1)));
mask = TQRegion(*left_corner.mask());
mask += TQRegion(TQRect(TQPoint(left_corner.width(), 0), TQPoint(width() - right_corner.width() - 1, height() - 1)));
temp_tqmask = TQRegion(*right_corner.tqmask());
temp_tqmask.translate(width() - right_corner.width(), 0);
tqmask += temp_tqmask;
temp_mask = TQRegion(*right_corner.mask());
temp_mask.translate(width() - right_corner.width(), 0);
mask += temp_mask;
}

6
yakuake/src/title_bar.h
Unescape View File

@ -38,7 +38,7 @@ class TitleBar : public TQWidget
TQ_OBJECT
public:
explicit TitleBar(TQWidget * tqparent = 0, const char * name = 0, const TQString & skin = "default");
explicit TitleBar(TQWidget * parent = 0, const char * name = 0, const TQString & skin = "default");
~TitleBar();
TQRegion& getWidgetMask();
@ -62,8 +62,8 @@ class TitleBar : public TQWidget
void loadSkin(const TQString& skin);
void updateWidgetMask();
/* Widget's tqmask */
TQRegion tqmask;
/* Widget's mask */
TQRegion mask;
/* Text properties */
TQString title_text;

2
yakuake/src/translucent_widget.cpp
Unescape View File

@ -16,7 +16,7 @@
#include <krootpixmap.h>
TranslucentWidget::TranslucentWidget(TQWidget* tqparent, const char* name, bool translucency) : TQWidget(tqparent, name)
TranslucentWidget::TranslucentWidget(TQWidget* parent, const char* name, bool translucency) : TQWidget(parent, name)
{
use_translucency = translucency;

2
yakuake/src/translucent_widget.h
Unescape View File

@ -26,7 +26,7 @@ class TranslucentWidget : public TQWidget
TQ_OBJECT
public:
explicit TranslucentWidget(TQWidget* tqparent = 0, const char* name = 0, bool translucency = false);
explicit TranslucentWidget(TQWidget* parent = 0, const char* name = 0, bool translucency = false);
virtual ~TranslucentWidget();

Write Preview
Loading…
Cancel
Save