Rename old tq methods that no longer need a unique name

pull/1/head
Timothy Pearson 13 years ago
parent 11afca150c
commit 7d0cfa3f10

@ -78,7 +78,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>80</width> <width>80</width>
<height>21</height> <height>21</height>
@ -103,7 +103,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>80</width> <width>80</width>
<height>21</height> <height>21</height>
@ -131,7 +131,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Fixed</enum> <enum>Fixed</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>21</width> <width>21</width>
<height>16</height> <height>16</height>
@ -148,7 +148,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Fixed</enum> <enum>Fixed</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>21</width> <width>21</width>
<height>20</height> <height>20</height>

@ -72,7 +72,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Fixed</enum> <enum>Fixed</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>16</width> <width>16</width>
<height>20</height> <height>20</height>
@ -89,7 +89,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Fixed</enum> <enum>Fixed</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>16</width> <width>16</width>
<height>20</height> <height>20</height>
@ -473,7 +473,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>210</width> <width>210</width>
<height>26</height> <height>26</height>
@ -494,7 +494,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>21</width> <width>21</width>
<height>20</height> <height>20</height>

@ -1232,7 +1232,7 @@ void MainWindow::slotOpenFirstRunDialog()
connect(first_run_dialog, TQT_SIGNAL(hidden()), TQT_TQOBJECT(this), TQT_SLOT(slotDialogFinished())); connect(first_run_dialog, TQT_SIGNAL(hidden()), TQT_TQOBJECT(this), TQT_SLOT(slotDialogFinished()));
FirstRunDialog* first_run_dialog_page = new FirstRunDialog(first_run_dialog); FirstRunDialog* first_run_dialog_page = new FirstRunDialog(first_run_dialog);
first_run_dialog_page->setMinimumSize(first_run_dialog_page->tqsizeHint()); first_run_dialog_page->setMinimumSize(first_run_dialog_page->sizeHint());
first_run_dialog_page->setShortcut(global_key->shortcut("AccessKey")); first_run_dialog_page->setShortcut(global_key->shortcut("AccessKey"));
first_run_dialog->setMainWidget(first_run_dialog_page); first_run_dialog->setMainWidget(first_run_dialog_page);

@ -56,10 +56,10 @@ void Session::slotFocusChanged()
{ {
if (checkFocusWidget()) if (checkFocusWidget())
{ {
base_widget->setFocusProxy(base_widget->tqfocusWidget()); base_widget->setFocusProxy(base_widget->focusWidget());
active_terminal = base_widget->tqfocusWidget(); active_terminal = base_widget->focusWidget();
int terminal_id = terminal_ids[base_widget->tqfocusWidget()]; int terminal_id = terminal_ids[base_widget->focusWidget()];
slotTitleChange(base_widget->tqfocusWidget(), slotTitleChange(base_widget->focusWidget(),
terminals[terminal_id]->title()); terminals[terminal_id]->title());
} }
} }
@ -67,7 +67,7 @@ void Session::slotFocusChanged()
int Session::activeTerminalId() int Session::activeTerminalId()
{ {
if (checkFocusWidget()) if (checkFocusWidget())
return terminal_ids[base_widget->tqfocusWidget()]; return terminal_ids[base_widget->focusWidget()];
else else
return -1; return -1;
} }
@ -403,7 +403,7 @@ void Session::slotLastTerminalClosed()
void Session::slotTitleChange(TQWidget* w, const TQString& title) void Session::slotTitleChange(TQWidget* w, const TQString& title)
{ {
if (w == base_widget->tqfocusWidget()) if (w == base_widget->focusWidget())
{ {
session_title = title; session_title = title;
emit titleChanged( session_title); emit titleChanged( session_title);
@ -412,8 +412,8 @@ void Session::slotTitleChange(TQWidget* w, const TQString& title)
bool Session::checkFocusWidget() bool Session::checkFocusWidget()
{ {
if (base_widget->tqfocusWidget() if (base_widget->focusWidget()
&& base_widget->tqfocusWidget()->isA(TQCString("TEWidget"))) && base_widget->focusWidget()->isA(TQCString("TEWidget")))
{ {
return true; return true;
} }

@ -86,7 +86,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>290</width> <width>290</width>
<height>0</height> <height>0</height>

@ -210,7 +210,7 @@ void TabbedWidget::interactiveRename(int position)
inline_edit->setText(captions[position]); inline_edit->setText(captions[position]);
inline_edit->setGeometry(width, 0, areas[position], height()); inline_edit->setGeometry(width, 0, areas[position], height());
inline_edit->tqsetAlignment(TQt::AlignHCenter); inline_edit->setAlignment(TQt::AlignHCenter);
inline_edit->setFrame(false); inline_edit->setFrame(false);
inline_edit->selectAll(); inline_edit->selectAll();
inline_edit->setFocus(); inline_edit->setFocus();

Loading…
Cancel
Save