diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-16 09:58:25 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-16 09:58:25 -0600 |
| commit | 2c01fd64ddde84a6d78b632f7f3b7c3560dc288c (patch) | |
| tree | 65f4f4370cf4269757d7fa4d0f4d15996a1bf68f /kicker/taskbar/taskbar.cpp | |
| parent | 73c08b592db45af554b9f21029bc549d70f683ab (diff) | |
| download | tdebase-2c01fd64ddde84a6d78b632f7f3b7c3560dc288c.tar.gz tdebase-2c01fd64ddde84a6d78b632f7f3b7c3560dc288c.zip | |
Revert "Rename a number of old tq methods that are no longer tq specific"
This reverts commit 73c08b592db45af554b9f21029bc549d70f683ab.
Diffstat (limited to 'kicker/taskbar/taskbar.cpp')
| -rw-r--r-- | kicker/taskbar/taskbar.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/kicker/taskbar/taskbar.cpp b/kicker/taskbar/taskbar.cpp index 3366f1be3..4da304daf 100644 --- a/kicker/taskbar/taskbar.cpp +++ b/kicker/taskbar/taskbar.cpp @@ -28,7 +28,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <tqapplication.h> #include <tqbitmap.h> #include <tqdesktopwidget.h> -#include <layout.h> +#include <tqlayout.h> #include <tqpainter.h> #include <tqstringlist.h> @@ -66,7 +66,7 @@ TaskBar::TaskBar( TQWidget *parent, const char *name ) blocklayout = true; // init - setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ) ); + tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ) ); // setup animation frames for (int i = 1; i < 11; i++) @@ -160,7 +160,7 @@ KTextShadowEngine *TaskBar::textShadowEngine() } -TQSize TaskBar::sizeHint() const +TQSize TaskBar::tqsizeHint() const { // get our minimum height based on the minimum button height or the // height of the font in use, which is largest @@ -171,7 +171,7 @@ TQSize TaskBar::sizeHint() const return TQSize(BUTTON_MIN_WIDTH, minButtonHeight); } -TQSize TaskBar::sizeHint( KPanelExtension::Position p, TQSize maxSize) const +TQSize TaskBar::tqsizeHint( KPanelExtension::Position p, TQSize maxSize) const { // get our minimum height based on the minimum button height or the // height of the font in use, which is largest @@ -898,9 +898,9 @@ void TaskBar::propagateMouseEvent( TQMouseEvent* e ) { if ( !isTopLevel() ) { - TQMouseEvent me( e->type(), mapTo( topLevelWidget(), e->pos() ), + TQMouseEvent me( e->type(), mapTo( tqtopLevelWidget(), e->pos() ), e->globalPos(), e->button(), e->state() ); - TQApplication::sendEvent( topLevelWidget(), &me ); + TQApplication::sendEvent( tqtopLevelWidget(), &me ); } } @@ -1074,7 +1074,7 @@ void TaskBar::activateNextTask(bool forward) TaskContainer::List::iterator it; for (int i = 0; i < numContainers; ++i) { - it = forward ? list.at(i) : list.at(numContainers - i - 1); + it = forward ? list.tqat(i) : list.tqat(numContainers - i - 1); if (it != list.end() && (*it)->activateNextTask(forward, forcenext)) { @@ -1087,7 +1087,7 @@ void TaskBar::activateNextTask(bool forward) // moving forward from the last, or backward from the first, loop around for (int i = 0; i < numContainers; ++i) { - it = forward ? list.at(i) : list.at(numContainers - i - 1); + it = forward ? list.tqat(i) : list.tqat(numContainers - i - 1); if (it != list.end() && (*it)->activateNextTask(forward, forcenext)) { @@ -1101,7 +1101,7 @@ void TaskBar::activateNextTask(bool forward) forcenext = true; // select first for (int i = 0; i < numContainers; ++i) { - it = forward ? list.at(i) : list.at(numContainers - i - 1); + it = forward ? list.tqat(i) : list.tqat(numContainers - i - 1); if (it == list.end()) { |