From b92f4fbd165f03685928a50d85c34ba8729b7c48 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 17 Nov 2011 21:15:44 -0600 Subject: Fix tdebase FTBFS --- kicker/applets/clock/clockapplet.kcfg | 2 +- kicker/kicker/core/containerarea.h | 2 +- kicker/kicker/core/containerarealayout.cpp | 2 +- kicker/kicker/core/containerarealayout.h | 2 +- kicker/kicker/core/extensionSettings.kcfg | 2 +- kicker/taskbar/taskcontainer.cpp | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) (limited to 'kicker') diff --git a/kicker/applets/clock/clockapplet.kcfg b/kicker/applets/clock/clockapplet.kcfg index ed375d03a..6abd26ceb 100644 --- a/kicker/applets/clock/clockapplet.kcfg +++ b/kicker/applets/clock/clockapplet.kcfg @@ -29,7 +29,7 @@ -QFont defFont=KGlobalSettings::generalFont(); +TQFont defFont=KGlobalSettings::generalFont(); defFont.setPointSize(8); defFont diff --git a/kicker/kicker/core/containerarea.h b/kicker/kicker/core/containerarea.h index f8532b511..3dc494798 100644 --- a/kicker/kicker/core/containerarea.h +++ b/kicker/kicker/core/containerarea.h @@ -153,7 +153,7 @@ private: KConfig* _config; DragIndicator* _dragIndicator; BaseContainer* _dragMoveAC; - QPoint _dragMoveOffset; + TQPoint _dragMoveOffset; TQPopupMenu* m_opMenu; KRootPixmap* _rootPixmap; bool _transparent; diff --git a/kicker/kicker/core/containerarealayout.cpp b/kicker/kicker/core/containerarealayout.cpp index ae4cca873..e33a78518 100644 --- a/kicker/kicker/core/containerarealayout.cpp +++ b/kicker/kicker/core/containerarealayout.cpp @@ -243,7 +243,7 @@ TQLayoutItem* ContainerAreaLayout::takeAt(int index) { } #endif // USE_QT4 -void ContainerAreaLayout::addItem(QLayoutItem* item) +void ContainerAreaLayout::addItem(TQLayoutItem* item) { m_items.append(new ContainerAreaLayoutItem(static_cast(item), this)); } diff --git a/kicker/kicker/core/containerarealayout.h b/kicker/kicker/core/containerarealayout.h index d91113660..41a104929 100644 --- a/kicker/kicker/core/containerarealayout.h +++ b/kicker/kicker/core/containerarealayout.h @@ -79,7 +79,7 @@ class ContainerAreaLayout : public TQLayout ContainerAreaLayout(TQWidget* parent); - void addItem(QLayoutItem* item); + void addItem(TQLayoutItem* item); void insertIntoFreeSpace(TQWidget* item, TQPoint insertionPoint); TQStringList listItems() const; TQWidget* widgetAt(int index) const; diff --git a/kicker/kicker/core/extensionSettings.kcfg b/kicker/kicker/core/extensionSettings.kcfg index 89d60b05a..466f30ce7 100644 --- a/kicker/kicker/core/extensionSettings.kcfg +++ b/kicker/kicker/core/extensionSettings.kcfg @@ -30,7 +30,7 @@ - QApplication::desktop()->primaryScreen() + TQApplication::desktop()->primaryScreen() diff --git a/kicker/taskbar/taskcontainer.cpp b/kicker/taskbar/taskcontainer.cpp index 7c850e853..7d0e4d3cd 100644 --- a/kicker/taskbar/taskcontainer.cpp +++ b/kicker/taskbar/taskcontainer.cpp @@ -733,7 +733,7 @@ void TaskContainer::drawButton(TQPainter *p) KImageEffect::blend(img, timg, *taskBar->blendGradient(size()), KImageEffect::Red); // End painting before assigning the pixmap - QPaintDevice* opd = p->device(); + TQPaintDevice* opd = p->device(); p->end(); pm->convertFromImage(img); p->tqbegin(opd ,this); -- cgit v1.2.1