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 --- kcontrol/kcontrol/moduletreeview.cpp | 2 +- kcontrol/konq/desktopbehavior_impl.h | 1 + kdesktop/lock/lockprocess.h | 2 +- kdm/confproc.pl | 4 ++-- kdmlib/kgreet_classic.cpp | 2 +- kdmlib/kgreet_pam.cpp | 2 +- kdmlib/kgreet_pam.h | 2 +- kdmlib/kgreet_winbind.cpp | 2 +- khotkeys/kcontrol/ui/windowdef_list_widget_ui.ui | 2 +- 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 +- kioslave/media/kcmodule/notifiermodule.h | 3 ++- klipper/toplevel.cpp | 4 ++-- kpager/main.cpp | 2 +- krootbacking/main.cpp | 2 +- twin/sm.cpp | 4 ++-- twin/sm.h | 4 ++-- 21 files changed, 26 insertions(+), 24 deletions(-) diff --git a/kcontrol/kcontrol/moduletreeview.cpp b/kcontrol/kcontrol/moduletreeview.cpp index b90d8bc07..144cf294f 100644 --- a/kcontrol/kcontrol/moduletreeview.cpp +++ b/kcontrol/kcontrol/moduletreeview.cpp @@ -136,7 +136,7 @@ void ModuleTreeView::fill(ModuleTreeItem *parent, const TQString &parentPath) TQSize ModuleTreeView::tqsizeHint() const { return TQListView::tqsizeHint().boundedTo( - TQSize( fontMetrics().maxWidth()*35, QWIDGETSIZE_MAX) ); + TQSize( fontMetrics().maxWidth()*35, TQWIDGETSIZE_MAX) ); } void ModuleTreeView::makeSelected(ConfigModule *module) diff --git a/kcontrol/konq/desktopbehavior_impl.h b/kcontrol/konq/desktopbehavior_impl.h index e7e181e4d..ba9904d37 100644 --- a/kcontrol/konq/desktopbehavior_impl.h +++ b/kcontrol/konq/desktopbehavior_impl.h @@ -22,6 +22,7 @@ #define desktopbehavior_h #include "desktopbehavior.h" +#include "tqlistview.h" #include #include diff --git a/kdesktop/lock/lockprocess.h b/kdesktop/lock/lockprocess.h index e2c9ee575..713a8f3b3 100644 --- a/kdesktop/lock/lockprocess.h +++ b/kdesktop/lock/lockprocess.h @@ -166,7 +166,7 @@ private: struct VkbdWindow { WId id; - QRect rect; + TQRect rect; }; TQValueList< VkbdWindow > mVkbdWindows; WId mVkbdLastEventWindow; diff --git a/kdm/confproc.pl b/kdm/confproc.pl index ad685d284..0ce0c1ae0 100755 --- a/kdm/confproc.pl +++ b/kdm/confproc.pl @@ -212,7 +212,7 @@ my %th = ( "list" => [ "C_TYPE_ARGV", "", "char\t**", "TQStringList\t", "GetCfgStrArr", "GetCfgQStrList" ] ); -my @tl = ("QFont\t", "TQStringList\t", "TQString\t", "char\t**", "char\t*", "int\t", "bool\t"); +my @tl = ("TQFont\t", "TQStringList\t", "TQString\t", "char\t**", "char\t*", "int\t", "bool\t"); sub init_defs($) { @@ -444,7 +444,7 @@ while () { } else { # greeter(-c)? my ($typ, $gtr, $isc); if ($isfn) { - $typ = "QFont\t"; + $typ = "TQFont\t"; $gtr = "Str2Font( GetCfgQStr( ".$kid." ) )"; $isc = 0; } elsif ($user eq "greeter" && $cppget) { diff --git a/kdmlib/kgreet_classic.cpp b/kdmlib/kgreet_classic.cpp index 8117429a8..af6d80172 100644 --- a/kdmlib/kgreet_classic.cpp +++ b/kdmlib/kgreet_classic.cpp @@ -167,7 +167,7 @@ KClassicGreeter::~KClassicGreeter() delete passwdEdit; return; } - TQLayoutIterator it = TQT_TQLAYOUT(static_cast(layoutItem))->iterator(); + TQLayoutIterator it = TQT_TQLAYOUT(layoutItem)->iterator(); for (TQLayoutItem *itm = it.current(); itm; itm = ++it) delete itm->widget(); delete layoutItem; diff --git a/kdmlib/kgreet_pam.cpp b/kdmlib/kgreet_pam.cpp index 19c797b44..41c7b2439 100644 --- a/kdmlib/kgreet_pam.cpp +++ b/kdmlib/kgreet_pam.cpp @@ -209,7 +209,7 @@ KPamGreeter::~KPamGreeter() delete loginEdit; return; } - TQLayoutIterator it = TQT_TQLAYOUT(static_cast(layoutItem))->iterator(); + TQLayoutIterator it = TQT_TQLAYOUT(layoutItem)->iterator(); for (TQLayoutItem *itm = it.current(); itm; itm = ++it) delete itm->widget(); delete layoutItem; diff --git a/kdmlib/kgreet_pam.h b/kdmlib/kgreet_pam.h index 0be454674..2c1e3f252 100644 --- a/kdmlib/kgreet_pam.h +++ b/kdmlib/kgreet_pam.h @@ -65,7 +65,7 @@ class KPamGreeter : public TQObject, public KGreeterPlugin { virtual void revive(); virtual void clear(); - TQGridLayout *getLayoutItem() const { return static_cast(TQT_TQLAYOUT(static_cast(layoutItem))); } + TQGridLayout *getLayoutItem() const { return static_cast(TQT_TQLAYOUT(layoutItem)); } public slots: void slotLoginLostFocus(); diff --git a/kdmlib/kgreet_winbind.cpp b/kdmlib/kgreet_winbind.cpp index 8ae12144b..3ab5bbaa8 100644 --- a/kdmlib/kgreet_winbind.cpp +++ b/kdmlib/kgreet_winbind.cpp @@ -213,7 +213,7 @@ KWinbindGreeter::~KWinbindGreeter() delete domainCombo; return; } - TQLayoutIterator it = TQT_TQLAYOUT(static_cast(layoutItem))->iterator(); + TQLayoutIterator it = TQT_TQLAYOUT(layoutItem)->iterator(); for (TQLayoutItem *itm = it.current(); itm; itm = ++it) delete itm->widget(); delete layoutItem; diff --git a/khotkeys/kcontrol/ui/windowdef_list_widget_ui.ui b/khotkeys/kcontrol/ui/windowdef_list_widget_ui.ui index 2fe4e161d..aaa52e891 100644 --- a/khotkeys/kcontrol/ui/windowdef_list_widget_ui.ui +++ b/khotkeys/kcontrol/ui/windowdef_list_widget_ui.ui @@ -154,7 +154,7 @@ - class QListViewItem; + class TQListViewItem; copy_pressed() 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); diff --git a/kioslave/media/kcmodule/notifiermodule.h b/kioslave/media/kcmodule/notifiermodule.h index e284e87fe..88f06c97b 100644 --- a/kioslave/media/kcmodule/notifiermodule.h +++ b/kioslave/media/kcmodule/notifiermodule.h @@ -1,6 +1,6 @@ /* This file is part of the KDE Project Copyright (c) 2005 Jean-Remy Falleri - Copyright (c) 2005 Kévin Ottens + Copyright (c) 2005 K�vin Ottens This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public @@ -21,6 +21,7 @@ #define _NOTIFIERMODULE_H_ #include +#include #include "notifiersettings.h" #include "notifiermoduleview.h" diff --git a/klipper/toplevel.cpp b/klipper/toplevel.cpp index 0db99c25e..81c7bd326 100644 --- a/klipper/toplevel.cpp +++ b/klipper/toplevel.cpp @@ -110,7 +110,7 @@ public: * * Saving history on session save */ - virtual bool commitData( QSessionManager& ) { + virtual bool commitData( TQSessionManager& ) { klipper->saveSession(); return true; } @@ -119,7 +119,7 @@ private: }; extern bool qt_qclipboard_bailout_hack; -#if KDE_IS_VERSION( 3, 9, 0 ) +#if KDE_IS_VERSION( 15, 0, 0 ) #error Check status of #80072 with Qt4. #endif diff --git a/kpager/main.cpp b/kpager/main.cpp index 8b4d5926f..9f2282b59 100644 --- a/kpager/main.cpp +++ b/kpager/main.cpp @@ -47,7 +47,7 @@ public: void commitData(TQSessionManager& sm) { if (mainWidget()->isHidden()) { - sm.setRestartHint( QSessionManager::RestartNever ); + sm.setRestartHint( TQSessionManager::RestartNever ); return; } closed_by_sm = true; diff --git a/krootbacking/main.cpp b/krootbacking/main.cpp index 6b35a51af..dd4761973 100644 --- a/krootbacking/main.cpp +++ b/krootbacking/main.cpp @@ -61,7 +61,7 @@ int main(int argc, char **argv) args->clear(); TQObject* mainWin = new KRootBacking(); - TQTimer *timer = new QTimer( mainWin ); + TQTimer *timer = new TQTimer( mainWin ); TQObject::connect( timer, SIGNAL(timeout()), mainWin, SLOT(start()) ); timer->start( 100, TRUE ); // 100ms single shot timer diff --git a/twin/sm.cpp b/twin/sm.cpp index 3a6aa3ebe..752ea988c 100644 --- a/twin/sm.cpp +++ b/twin/sm.cpp @@ -27,7 +27,7 @@ License. See the file "COPYING" for the exact licensing terms. namespace KWinInternal { -bool SessionManaged::saveState( QSessionManager& sm ) +bool SessionManaged::saveState( TQSessionManager& sm ) { // If the session manager is ksmserver, save stacking // order, active window, active desktop etc. in phase 1, @@ -53,7 +53,7 @@ bool SessionManaged::saveState( QSessionManager& sm ) } // I bet this is broken, just like everywhere else in KDE -bool SessionManaged::commitData( QSessionManager& sm ) +bool SessionManaged::commitData( TQSessionManager& sm ) { if ( !sm.isPhase2() ) Workspace::self()->sessionSaveStarted(); diff --git a/twin/sm.h b/twin/sm.h index 065ce621d..da9e49953 100644 --- a/twin/sm.h +++ b/twin/sm.h @@ -80,8 +80,8 @@ class SessionManaged : public KSessionManaged { public: - virtual bool saveState( QSessionManager& sm ); - virtual bool commitData( QSessionManager& sm ); + virtual bool saveState( TQSessionManager& sm ); + virtual bool commitData( TQSessionManager& sm ); }; } // namespace -- cgit v1.2.3