summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-21 14:07:39 -0600
committerSlávek Banko <slavek.banko@axis.cz>2012-08-02 00:48:18 +0200
commit1e77d7d465fa2cf69add20952d41be715ece938a (patch)
treeb2fea1f275b7ffb35ba22f0f8b5134988daa06a0
parent0ed39df6d3f5074d3ef9198684d29a17c40875db (diff)
downloadyakuake-1e77d7d465fa2cf69add20952d41be715ece938a.tar.gz
yakuake-1e77d7d465fa2cf69add20952d41be715ece938a.zip
Rename obsolete tq methods to standard names
(cherry picked from commit 5dba5d5894631925597564b285113c0e29e184ab)
-rw-r--r--yakuake/src/general_settings_ui.ui4
-rw-r--r--yakuake/src/session.cpp4
-rw-r--r--yakuake/src/skin_settings.cpp4
-rw-r--r--yakuake/src/skin_settings_ui.ui2
4 files changed, 7 insertions, 7 deletions
diff --git a/yakuake/src/general_settings_ui.ui b/yakuake/src/general_settings_ui.ui
index 7239ded..9913d89 100644
--- a/yakuake/src/general_settings_ui.ui
+++ b/yakuake/src/general_settings_ui.ui
@@ -366,7 +366,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout10</cstring>
+ <cstring>layout10</cstring>
</property>
<hbox>
<property name="name">
@@ -428,7 +428,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout20</cstring>
+ <cstring>layout20</cstring>
</property>
<hbox>
<property name="name">
diff --git a/yakuake/src/session.cpp b/yakuake/src/session.cpp
index c3268d6..c7d5581 100644
--- a/yakuake/src/session.cpp
+++ b/yakuake/src/session.cpp
@@ -123,7 +123,7 @@ void Session::pasteClipboard()
void Session::pasteClipboard(int terminal_id)
{
if (terminal_parts[terminal_id])
- terminal_parts[terminal_id]->sendInput(TQApplication::tqclipboard()->text(TQClipboard::Clipboard));
+ terminal_parts[terminal_id]->sendInput(TQApplication::clipboard()->text(TQClipboard::Clipboard));
}
void Session::pasteSelection()
@@ -138,7 +138,7 @@ void Session::pasteSelection()
void Session::pasteSelection(int terminal_id)
{
if (terminal_parts[terminal_id])
- terminal_parts[terminal_id]->sendInput(TQApplication::tqclipboard()->text(TQClipboard::Selection));
+ terminal_parts[terminal_id]->sendInput(TQApplication::clipboard()->text(TQClipboard::Selection));
}
void Session::runCommand(const TQString& command)
diff --git a/yakuake/src/skin_settings.cpp b/yakuake/src/skin_settings.cpp
index 1667a89..a9d6928 100644
--- a/yakuake/src/skin_settings.cpp
+++ b/yakuake/src/skin_settings.cpp
@@ -51,8 +51,8 @@ SkinSettings::SkinSettings(TQWidget* parent, const char* name, bool translucency
kcfg_skinbgcolor->setEnabled(!translucency);
kcfg_skinbgcolor->setHidden(translucency);
- skinbgtqlayout->setEnabled(!translucency);
- skinbgtqlayout->invalidate();
+ skinbglayout->setEnabled(!translucency);
+ skinbglayout->invalidate();
skins_list->header()->hide();
skins_list->setSelectionModeExt(KListView::Single);
diff --git a/yakuake/src/skin_settings_ui.ui b/yakuake/src/skin_settings_ui.ui
index 5c3b4d6..3f29641 100644
--- a/yakuake/src/skin_settings_ui.ui
+++ b/yakuake/src/skin_settings_ui.ui
@@ -45,7 +45,7 @@
</widget>
<widget class="TQLayoutWidget" row="0" column="0" rowspan="1" colspan="2">
<property name="name">
- <cstring>skinbgtqlayout</cstring>
+ <cstring>skinbglayout</cstring>
</property>
<hbox>
<property name="name">