Fix tdebase FTBFS

pull/2/head
Timothy Pearson 13 years ago
parent b3e920373e
commit b92f4fbd16

@ -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)

@ -22,6 +22,7 @@
#define desktopbehavior_h
#include "desktopbehavior.h"
#include "tqlistview.h"
#include <kconfig.h>
#include <kcmodule.h>

@ -166,7 +166,7 @@ private:
struct VkbdWindow
{
WId id;
QRect rect;
TQRect rect;
};
TQValueList< VkbdWindow > mVkbdWindows;
WId mVkbdLastEventWindow;

@ -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 (<INFILE>) {
} 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) {

@ -167,7 +167,7 @@ KClassicGreeter::~KClassicGreeter()
delete passwdEdit;
return;
}
TQLayoutIterator it = TQT_TQLAYOUT(static_cast<QLayoutItem*>(layoutItem))->iterator();
TQLayoutIterator it = TQT_TQLAYOUT(layoutItem)->iterator();
for (TQLayoutItem *itm = it.current(); itm; itm = ++it)
delete itm->widget();
delete layoutItem;

@ -209,7 +209,7 @@ KPamGreeter::~KPamGreeter()
delete loginEdit;
return;
}
TQLayoutIterator it = TQT_TQLAYOUT(static_cast<QLayoutItem*>(layoutItem))->iterator();
TQLayoutIterator it = TQT_TQLAYOUT(layoutItem)->iterator();
for (TQLayoutItem *itm = it.current(); itm; itm = ++it)
delete itm->widget();
delete layoutItem;

@ -65,7 +65,7 @@ class KPamGreeter : public TQObject, public KGreeterPlugin {
virtual void revive();
virtual void clear();
TQGridLayout *getLayoutItem() const { return static_cast<TQGridLayout*>(TQT_TQLAYOUT(static_cast<QLayoutItem*>(layoutItem))); }
TQGridLayout *getLayoutItem() const { return static_cast<TQGridLayout*>(TQT_TQLAYOUT(layoutItem)); }
public slots:
void slotLoginLostFocus();

@ -213,7 +213,7 @@ KWinbindGreeter::~KWinbindGreeter()
delete domainCombo;
return;
}
TQLayoutIterator it = TQT_TQLAYOUT(static_cast<QLayoutItem *>(layoutItem))->iterator();
TQLayoutIterator it = TQT_TQLAYOUT(layoutItem)->iterator();
for (TQLayoutItem *itm = it.current(); itm; itm = ++it)
delete itm->widget();
delete layoutItem;

@ -154,7 +154,7 @@
</connection>
</connections>
<forwards>
<forward>class QListViewItem;</forward>
<forward>class TQListViewItem;</forward>
</forwards>
<Q_SLOTS>
<slot access="protected" specifier="pure virtual">copy_pressed()</slot>

@ -29,7 +29,7 @@
<entry name="DateFont" type="Font" key="Font">
<label>Font for the clock.</label>
<code>
QFont defFont=KGlobalSettings::generalFont();
TQFont defFont=KGlobalSettings::generalFont();
defFont.setPointSize(8);
</code>
<default code="true">defFont</default>

@ -153,7 +153,7 @@ private:
KConfig* _config;
DragIndicator* _dragIndicator;
BaseContainer* _dragMoveAC;
QPoint _dragMoveOffset;
TQPoint _dragMoveOffset;
TQPopupMenu* m_opMenu;
KRootPixmap* _rootPixmap;
bool _transparent;

@ -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<TQLayoutItem*>(item), this));
}

@ -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;

@ -30,7 +30,7 @@
<entry name="XineramaScreen" type="Int">
<label>Primary xinerama screen</label>
<default code="true">QApplication::desktop()->primaryScreen()</default>
<default code="true">TQApplication::desktop()->primaryScreen()</default>
</entry>
<entry name="HideButtonSize" type="Int" >

@ -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);

@ -1,6 +1,6 @@
/* This file is part of the KDE Project
Copyright (c) 2005 Jean-Remy Falleri <jr.falleri@laposte.net>
Copyright (c) 2005 Kévin Ottens <ervin ipsquad net>
Copyright (c) 2005 K<EFBFBD>vin Ottens <ervin ipsquad net>
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 <kcmodule.h>
#include <tqlistbox.h>
#include "notifiersettings.h"
#include "notifiermoduleview.h"

@ -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

@ -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;

@ -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

@ -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();

@ -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

Loading…
Cancel
Save