diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-16 09:55:55 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-16 09:55:55 -0600 |
| commit | 769d9f539ffa81925d11cf5480e396d26a43b86d (patch) | |
| tree | f853cfe083f858b7492337c650eddf9383d332e8 /katapult/plugins/catalogs/calculatorcatalog | |
| parent | a3703745120ffe8f1beadd5fa58f9ab1470bc2f8 (diff) | |
| download | katapult-769d9f539ffa81925d11cf5480e396d26a43b86d.tar.gz katapult-769d9f539ffa81925d11cf5480e396d26a43b86d.zip | |
Revert "Rename a number of old tq methods that are no longer tq specific"
This reverts commit a3703745120ffe8f1beadd5fa58f9ab1470bc2f8.
Diffstat (limited to 'katapult/plugins/catalogs/calculatorcatalog')
3 files changed, 10 insertions, 10 deletions
diff --git a/katapult/plugins/catalogs/calculatorcatalog/actionevalexpr.cpp b/katapult/plugins/catalogs/calculatorcatalog/actionevalexpr.cpp index 038071e..74fce5b 100644 --- a/katapult/plugins/catalogs/calculatorcatalog/actionevalexpr.cpp +++ b/katapult/plugins/catalogs/calculatorcatalog/actionevalexpr.cpp @@ -28,7 +28,7 @@ #include <kurl.h> #include <klocale.h> -#include <clipboard.h> +#include <tqclipboard.h> #include "calculatorcatalog.h" #include "expression.h" @@ -150,7 +150,7 @@ void ActionEvaluateExpression::execute(const KatapultItem* item) const // Copy calculation and result into clipboard (unless there's a parse error). if (!_expr->parseError()) { - TQClipboard *cb = TQApplication::clipboard(); + TQClipboard *cb = TQApplication::tqclipboard(); TQString s = _expr->catalog()->formatString(); s.replace("%1", _expr->text()); s.replace("%2", text()); diff --git a/katapult/plugins/catalogs/calculatorcatalog/calculatorcatalog.cpp b/katapult/plugins/catalogs/calculatorcatalog/calculatorcatalog.cpp index 724c371..05a6c74 100644 --- a/katapult/plugins/catalogs/calculatorcatalog/calculatorcatalog.cpp +++ b/katapult/plugins/catalogs/calculatorcatalog/calculatorcatalog.cpp @@ -141,7 +141,7 @@ CalculatorCatalog::~CalculatorCatalog() void CalculatorCatalog::queryChanged() { - int newStatus = 0; + int newtqStatus = 0; TQString cmd = query(); if (cmd.isEmpty()) { @@ -203,12 +203,12 @@ void CalculatorCatalog::queryChanged() //set status. //add S_Multiple to make sure katapult doesn't auto-exec and close the window //add S_Active to make sure katapult doesn't start the hideTimer or clearTimer - newStatus = S_HasResults | S_Multiple | S_Active; + newtqStatus = S_HasResults | S_Multiple | S_Active; } else { - newStatus = 0; + newtqStatus = 0; } } - setStatus(newStatus); + settqStatus(newtqStatus); } void CalculatorCatalog::reset() diff --git a/katapult/plugins/catalogs/calculatorcatalog/settings.ui b/katapult/plugins/catalogs/calculatorcatalog/settings.ui index ca86824..a1a0c18 100644 --- a/katapult/plugins/catalogs/calculatorcatalog/settings.ui +++ b/katapult/plugins/catalogs/calculatorcatalog/settings.ui @@ -21,7 +21,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout13</cstring> + <cstring>tqlayout13</cstring> </property> <hbox> <property name="name"> @@ -59,7 +59,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout6</cstring> + <cstring>tqlayout6</cstring> </property> <hbox> <property name="name"> @@ -156,7 +156,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout8</cstring> + <cstring>tqlayout8</cstring> </property> <hbox> <property name="name"> @@ -200,7 +200,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>40</height> |