summaryrefslogtreecommitdiffstats
path: root/kdm
diff options
context:
space:
mode:
Diffstat (limited to 'kdm')
-rw-r--r--kdm/kfrontend/kchooser.cpp10
-rw-r--r--kdm/kfrontend/kconsole.h2
-rw-r--r--kdm/kfrontend/kdm_greet.c4
-rw-r--r--kdm/kfrontend/kdm_greet.h2
-rw-r--r--kdm/kfrontend/kdmadmindialog.cpp8
-rw-r--r--kdm/kfrontend/kdmclock.cpp8
-rw-r--r--kdm/kfrontend/kdmconfig.cpp6
-rw-r--r--kdm/kfrontend/kdmshutdown.cpp22
-rw-r--r--kdm/kfrontend/kfdialog.cpp6
-rw-r--r--kdm/kfrontend/kgapp.cpp2
-rw-r--r--kdm/kfrontend/kgdialog.cpp4
-rw-r--r--kdm/kfrontend/kgreeter.cpp28
-rw-r--r--kdm/kfrontend/kgverify.cpp18
-rw-r--r--kdm/kfrontend/kgverify.h2
-rw-r--r--kdm/kfrontend/krootimage.cpp2
-rw-r--r--kdm/kfrontend/sakdlg.cc8
-rw-r--r--kdm/kfrontend/themer/kdmitem.cpp18
-rw-r--r--kdm/kfrontend/themer/kdmitem.h10
-rw-r--r--kdm/kfrontend/themer/kdmlabel.cpp10
-rw-r--r--kdm/kfrontend/themer/kdmlabel.h2
-rw-r--r--kdm/kfrontend/themer/kdmlayout.cpp26
-rw-r--r--kdm/kfrontend/themer/kdmlayout.h2
-rw-r--r--kdm/kfrontend/themer/kdmpixmap.cpp8
-rw-r--r--kdm/kfrontend/themer/kdmpixmap.h2
-rw-r--r--kdm/kfrontend/themer/kdmrect.cpp2
-rw-r--r--kdm/kfrontend/themer/kdmthemer.h4
26 files changed, 108 insertions, 108 deletions
diff --git a/kdm/kfrontend/kchooser.cpp b/kdm/kfrontend/kchooser.cpp
index f44687e14..c76f041e2 100644
--- a/kdm/kfrontend/kchooser.cpp
+++ b/kdm/kfrontend/kchooser.cpp
@@ -32,7 +32,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include <klocale.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqlabel.h>
#include <tqpushbutton.h>
#include <tqpopupmenu.h>
@@ -59,7 +59,7 @@ ChooserDlg::ChooserDlg()
TQBoxLayout *vbox = new TQVBoxLayout( this, 10, 10 );
TQLabel *title = new TQLabel( i18n("XDMCP Host Menu"), this );
- title->setAlignment( AlignCenter );
+ title->tqsetAlignment( AlignCenter );
vbox->addWidget( title );
host_view = new TQListView( this, "hosts" );
@@ -145,14 +145,14 @@ void ChooserDlg::pingHosts()
void ChooserDlg::accept()
{
- if (focusWidget() == iline) {
+ if (tqfocusWidget() == iline) {
if (!iline->text().isEmpty()) {
GSendInt( G_Ch_DirectChoice );
GSendStr( iline->text().latin1() );
iline->clear();
}
return;
- } else /*if (focusWidget() == host_view)*/ {
+ } else /*if (tqfocusWidget() == host_view)*/ {
TQListViewItem *item = host_view->currentItem();
if (item) {
GSendInt( G_Ready );
@@ -170,7 +170,7 @@ TQString ChooserDlg::recvStr()
{
char *arr = GRecvStr();
if (arr) {
- TQString str = TQString::fromLatin1( arr );
+ TQString str = TQString::tqfromLatin1( arr );
free( arr );
return str;
} else
diff --git a/kdm/kfrontend/kconsole.h b/kdm/kfrontend/kconsole.h
index dc644b42b..73d13912e 100644
--- a/kdm/kfrontend/kconsole.h
+++ b/kdm/kfrontend/kconsole.h
@@ -24,7 +24,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#ifndef KCONSOLE_H
#define KCONSOLE_H
-#include <textedit.h>
+#include <tqtextedit.h>
class TQSocketNotifier;
class KPty;
diff --git a/kdm/kfrontend/kdm_greet.c b/kdm/kfrontend/kdm_greet.c
index b7841e6a3..2082b2393 100644
--- a/kdm/kfrontend/kdm_greet.c
+++ b/kdm/kfrontend/kdm_greet.c
@@ -700,11 +700,11 @@ restore_modifiers( void )
}
void
-setCursor( Display *mdpy, int window, int shape )
+setCursor( Display *mdpy, int window, int tqshape )
{
Cursor xcursor;
- if ((xcursor = XCreateFontCursor( mdpy, shape ))) {
+ if ((xcursor = XCreateFontCursor( mdpy, tqshape ))) {
XDefineCursor( mdpy, window, xcursor );
XFreeCursor( mdpy, xcursor );
XFlush( mdpy );
diff --git a/kdm/kfrontend/kdm_greet.h b/kdm/kfrontend/kdm_greet.h
index df325c28d..d68ee8604 100644
--- a/kdm/kfrontend/kdm_greet.h
+++ b/kdm/kfrontend/kdm_greet.h
@@ -77,7 +77,7 @@ int PingServer( struct _XDisplay *dpy );
void setup_modifiers( struct _XDisplay *mdpy, int numlock );
void restore_modifiers( void );
-void setCursor( struct _XDisplay *mdpy, int window, int shape );
+void setCursor( struct _XDisplay *mdpy, int window, int tqshape );
extern int rfd; /* for select() loops */
diff --git a/kdm/kfrontend/kdmadmindialog.cpp b/kdm/kfrontend/kdmadmindialog.cpp
index 8383b2087..42459ad60 100644
--- a/kdm/kfrontend/kdmadmindialog.cpp
+++ b/kdm/kfrontend/kdmadmindialog.cpp
@@ -37,7 +37,7 @@
#include <tqcombobox.h>
#include <tqvbuttongroup.h>
#include <tqstyle.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqaccel.h>
#include <tqpopupmenu.h>
@@ -75,10 +75,10 @@ KDMAdmin::KDMAdmin( const TQString &user, TQWidget *_parent )
box->addWidget( new KSeparator( KSeparator::HLine, this ) );
okButton = new KPushButton( KStdGuiItem::ok(), this );
- okButton->setSizePolicy( fp );
+ okButton->tqsetSizePolicy( fp );
okButton->setDefault( true );
cancelButton = new KPushButton( KStdGuiItem::cancel(), this );
- cancelButton->setSizePolicy( fp );
+ cancelButton->tqsetSizePolicy( fp );
hlay = new TQHBoxLayout( box );
hlay->addStretch( 1 );
@@ -103,7 +103,7 @@ void
KDMAdmin::slotActivatePlugMenu()
{
TQPopupMenu *cmnu = verify->getPlugMenu();
- TQSize sh( cmnu->sizeHint() / 2 );
+ TQSize sh( cmnu->tqsizeHint() / 2 );
cmnu->exec( geometry().center() - TQPoint( sh.width(), sh.height() ) );
}
diff --git a/kdm/kfrontend/kdmclock.cpp b/kdm/kfrontend/kdmclock.cpp
index 88cd53970..87e6a32ba 100644
--- a/kdm/kfrontend/kdmclock.cpp
+++ b/kdm/kfrontend/kdmclock.cpp
@@ -50,7 +50,7 @@ KdmClock::KdmClock( TQWidget *parent, const char *name )
mBorder = false;//config->readNumEntry( "border", FALSE );
//config->setGroup( "Font" );
- mFont.setFamily( TQString::fromLatin1("Utopia")/*config->readEntry( "Family", "Utopia")*/ );
+ mFont.setFamily( TQString::tqfromLatin1("Utopia")/*config->readEntry( "Family", "Utopia")*/ );
mFont.setPointSize( 51/*config->readNumEntry( "Point Size", 51)*/ );
mFont.setWeight( 75/*config->readNumEntry( "Weight", 75)*/ );
mFont.setItalic( TRUE/*config->readNumEntry( "Italic",TRUE )*/ );
@@ -76,19 +76,19 @@ KdmClock::KdmClock( TQWidget *parent, const char *name )
//setBackgroundOrigin( WindowOrigin );
mBackgroundBrush = backgroundBrush();
setBackgroundMode( NoBackground );
- repaint();
+ tqrepaint();
}
void KdmClock::showEvent( TQShowEvent * )
{
- repaint();
+ tqrepaint();
}
void KdmClock::timeout()
{
- repaint();
+ tqrepaint();
}
void KdmClock::paintEvent( TQPaintEvent * )
diff --git a/kdm/kfrontend/kdmconfig.cpp b/kdm/kfrontend/kdmconfig.cpp
index c12345323..0916eb881 100644
--- a/kdm/kfrontend/kdmconfig.cpp
+++ b/kdm/kfrontend/kdmconfig.cpp
@@ -72,7 +72,7 @@ Str2Font( const TQString &aValue )
TQFont aRetFont;
TQString chStr;
- TQStringList sl = TQStringList::split( TQString::fromLatin1(","), aValue );
+ TQStringList sl = TQStringList::split( TQString::tqfromLatin1(","), aValue );
if (sl.count() == 1) {
/* X11 font spec */
@@ -160,7 +160,7 @@ decodeSess( dpySpec *sess, TQString &user, TQString &loc )
sess->vt ?
TQString("vt%1").arg( sess->vt ) :
#endif
- TQString::fromLatin1( *sess->from ? sess->from : sess->display );
+ TQString::tqfromLatin1( *sess->from ? sess->from : sess->display );
} else {
user =
!sess->user ?
@@ -174,6 +174,6 @@ decodeSess( dpySpec *sess, TQString &user, TQString &loc )
sess->vt ?
TQString("%1, vt%2").arg( sess->display ).arg( sess->vt ) :
#endif
- TQString::fromLatin1( sess->display );
+ TQString::tqfromLatin1( sess->display );
}
}
diff --git a/kdm/kfrontend/kdmshutdown.cpp b/kdm/kfrontend/kdmshutdown.cpp
index b0080d02f..70fee982e 100644
--- a/kdm/kfrontend/kdmshutdown.cpp
+++ b/kdm/kfrontend/kdmshutdown.cpp
@@ -40,7 +40,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include <tqcombobox.h>
#include <tqvbuttongroup.h>
#include <tqstyle.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqaccel.h>
#include <tqpopupmenu.h>
#include <tqcheckbox.h>
@@ -117,7 +117,7 @@ KDMShutdownBase::complete( TQWidget *prevWidget )
hlay->addStretch( 1 );
if (mayOk) {
okButton = new KPushButton( KStdGuiItem::ok(), this );
- okButton->setSizePolicy( fp );
+ okButton->tqsetSizePolicy( fp );
okButton->setDefault( true );
hlay->addWidget( okButton );
hlay->addStretch( 1 );
@@ -126,13 +126,13 @@ KDMShutdownBase::complete( TQWidget *prevWidget )
if (maySched) {
KPushButton *schedButton =
new KPushButton( KGuiItem( i18n("&Schedule...") ), this );
- schedButton->setSizePolicy( fp );
+ schedButton->tqsetSizePolicy( fp );
hlay->addWidget( schedButton );
hlay->addStretch( 1 );
connect( schedButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotSched()) );
}
cancelButton = new KPushButton( KStdGuiItem::cancel(), this );
- cancelButton->setSizePolicy( fp );
+ cancelButton->tqsetSizePolicy( fp );
if (!mayOk)
cancelButton->setDefault( true );
hlay->addWidget( cancelButton );
@@ -149,7 +149,7 @@ KDMShutdownBase::slotActivatePlugMenu()
TQPopupMenu *cmnu = verify->getPlugMenu();
if (!cmnu)
return;
- TQSize sh( cmnu->sizeHint() / 2 );
+ TQSize sh( cmnu->tqsizeHint() / 2 );
cmnu->exec( geometry().center() - TQPoint( sh.width(), sh.height() ) );
}
}
@@ -276,7 +276,7 @@ KDMShutdown::KDMShutdown( int _uid, TQWidget *_parent )
freeStrArr( tlist );
targets->setCurrentItem( oldTarget == -1 ? defaultTarget : oldTarget );
TQHBoxLayout *hb = new TQHBoxLayout( hlp, 0, KDsh );
- int spc = kapp->tqstyle().pixelMetric( TQStyle::PM_ExclusiveIndicatorWidth )
+ int spc = kapp->tqstyle().tqpixelMetric( TQStyle::PM_ExclusiveIndicatorWidth )
+ howGroup->insideSpacing();
hb->addSpacing( spc );
hb->addWidget( targets );
@@ -284,7 +284,7 @@ KDMShutdown::KDMShutdown( int _uid, TQWidget *_parent )
}
GSet( 0 );
- howGroup->setSizePolicy( fp );
+ howGroup->tqsetSizePolicy( fp );
schedGroup = new TQGroupBox( i18n("Scheduling"), this );
hlay->addWidget( schedGroup, 0, AlignTop );
@@ -310,7 +310,7 @@ KDMShutdown::KDMShutdown( int _uid, TQWidget *_parent )
grid->addWidget( le_timeout, 2, 1 );
grid->addMultiCellWidget( cb_force, 3,3, 0,1 );
- schedGroup->setSizePolicy( fp );
+ schedGroup->tqsetSizePolicy( fp );
le_start->setText( "0" );
if (_defSdMode == SHUT_SCHEDULE)
@@ -484,7 +484,7 @@ KDMSlimShutdown::KDMSlimShutdown( TQWidget *_parent )
lfrm->setFrameStyle( TQFrame::NoFrame );
else
lfrm->setFrameStyle( TQFrame::StyledPanel | TQFrame::Raised );
- lfrm->setLineWidth( tqstyle().pixelMetric( TQStyle::PM_DefaultFrameWidth, lfrm ) );
+ lfrm->setLineWidth( tqstyle().tqpixelMetric( TQStyle::PM_DefaultFrameWidth, lfrm ) );
// we need to set the minimum size for the logout box, since it
// gets too small if there all options are not available
lfrm->setMinimumSize(300,120);
@@ -494,7 +494,7 @@ KDMSlimShutdown::KDMSlimShutdown( TQWidget *_parent )
// first line of buttons
hbuttonbox = new TQHBoxLayout( vbox, 8 * KDialog::spacingHint() );
- hbuttonbox->setAlignment( Qt::AlignHCenter );
+ hbuttonbox->tqsetAlignment( Qt::AlignHCenter );
// Reboot
FlatButton* btnReboot = new FlatButton( lfrm );
@@ -538,7 +538,7 @@ KDMSlimShutdown::KDMSlimShutdown( TQWidget *_parent )
// cancel buttonbox
TQHBoxLayout* hbuttonbox2 = new TQHBoxLayout( vbox, 8 * KDialog::spacingHint() );
- hbuttonbox2->setAlignment( Qt::AlignRight );
+ hbuttonbox2->tqsetAlignment( Qt::AlignRight );
// Back to kdm
KSMPushButton* btnBack = new KSMPushButton( KStdGuiItem::cancel(), lfrm );
diff --git a/kdm/kfrontend/kfdialog.cpp b/kdm/kfrontend/kfdialog.cpp
index 5a4e5e255..285c3878e 100644
--- a/kdm/kfrontend/kfdialog.cpp
+++ b/kdm/kfrontend/kfdialog.cpp
@@ -31,7 +31,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include <kglobalsettings.h>
#include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqapplication.h>
#include <tqcursor.h>
@@ -169,10 +169,10 @@ KFMsgBox::KFMsgBox( TQWidget *parent, TQMessageBox::Icon type, const TQString &t
TQLabel *label2 = new TQLabel( text, this );
TQRect d = KGlobalSettings::desktopGeometry(this);
if ( label2->fontMetrics().size( 0, text).width() > d.width() * 3 / 5)
- label2->setAlignment(TQt::WordBreak | TQt::AlignAuto );
+ label2->tqsetAlignment(TQt::WordBreak | TQt::AlignAuto );
KPushButton *button = new KPushButton( KStdGuiItem::ok(), this );
button->setDefault( true );
- button->setSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Preferred ) );
+ button->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Preferred ) );
connect( button, TQT_SIGNAL(clicked()), TQT_SLOT(accept()) );
TQGridLayout *grid = new TQGridLayout( this, 2, 2, 10 );
diff --git a/kdm/kfrontend/kgapp.cpp b/kdm/kfrontend/kgapp.cpp
index 152dc28bc..f21741805 100644
--- a/kdm/kfrontend/kgapp.cpp
+++ b/kdm/kfrontend/kgapp.cpp
@@ -48,7 +48,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include <tqtimer.h>
#include <tqstring.h>
#include <tqcursor.h>
-#include <palette.h>
+#include <tqpalette.h>
#include <stdlib.h> // free(), exit()
#include <unistd.h> // alarm()
diff --git a/kdm/kfrontend/kgdialog.cpp b/kdm/kfrontend/kgdialog.cpp
index 723711dcc..9300b9220 100644
--- a/kdm/kfrontend/kgdialog.cpp
+++ b/kdm/kfrontend/kgdialog.cpp
@@ -32,7 +32,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include <kiconloader.h>
#include <tqaccel.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqpushbutton.h>
#include <tqpopupmenu.h>
#include <tqapplication.h>
@@ -134,7 +134,7 @@ void
KGDialog::slotActivateMenu( int id )
{
TQPopupMenu *cmnu = optMenu->findItem( id )->popup();
- TQSize sh( cmnu->sizeHint() / 2 );
+ TQSize sh( cmnu->tqsizeHint() / 2 );
cmnu->exec( geometry().center() - TQPoint( sh.width(), sh.height() ) );
}
diff --git a/kdm/kfrontend/kgreeter.cpp b/kdm/kfrontend/kgreeter.cpp
index 61a27a03f..ab7fd302b 100644
--- a/kdm/kfrontend/kgreeter.cpp
+++ b/kdm/kfrontend/kgreeter.cpp
@@ -53,7 +53,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include <tqtimer.h>
#include <tqheader.h>
#include <tqstyle.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqlabel.h>
#include <tqpushbutton.h>
#include <tqtooltip.h>
@@ -96,7 +96,7 @@ class UserListView : public KListView {
: KListView( parent, name )
, themed(_them), cachedSizeHint( -1, 0 )
{
- setSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Ignored );
+ tqsetSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Ignored );
header()->hide();
addColumn( TQString::null );
setColumnAlignment( 0, AlignVCenter );
@@ -122,10 +122,10 @@ class UserListView : public KListView {
return sum;
}
public:
- virtual TQSize sizeHint() const
+ virtual TQSize tqsizeHint() const
{
if (themed)
- return KListView::sizeHint();
+ return KListView::tqsizeHint();
if (!cachedSizeHint.isValid()) {
constPolish();
@@ -136,7 +136,7 @@ public:
maxw = thisw;
}
cachedSizeHint.setWidth(
- tqstyle().pixelMetric( TQStyle::PM_ScrollBarExtent ) +
+ tqstyle().tqpixelMetric( TQStyle::PM_ScrollBarExtent ) +
frameWidth() * 2 + maxw );
}
return cachedSizeHint;
@@ -157,7 +157,7 @@ public:
kdDebug() << "paintEmpty " << rect << endl;
TQRect devRect = p->xForm( rect );
kdDebug() << "paintEmpty2 " << devRect << endl;
- p->drawPixmap(0, 0, *pm, devRect.left(), devRect.top() );
+ p->tqdrawPixmap(0, 0, *pm, devRect.left(), devRect.top() );
}
TQPixmap background;
@@ -243,8 +243,8 @@ void KGreeter::handleInputPipe(void) {
currentDisplay = TQString(getenv("DISPLAY"));
currentDisplay = currentDisplay.replace(":", "");
displayNumber = currentDisplay.toInt();
- mPipeFilename = TQString(FIFO_FILE).arg(displayNumber);
- ::unlink((TQString(FIFO_SAK_FILE).arg(displayNumber)).ascii());
+ mPipeFilename = TQString(FIFO_FILE).tqarg(displayNumber);
+ ::unlink((TQString(FIFO_SAK_FILE).tqarg(displayNumber)).ascii());
/* Create the FIFOs if they do not exist */
umask(0);
@@ -338,12 +338,12 @@ class UserListViewItem : public KListViewItem {
parent->cachedSizeHint.setWidth( -1 );
}
- virtual void paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int alignment)
+ virtual void paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int tqalignment)
{
if (((UserListView*)listView())->themed)
- TQListViewItem::paintCell(p, cg, column, width, alignment);
+ TQListViewItem::paintCell(p, cg, column, width, tqalignment);
else
- KListViewItem::paintCell(p, cg, column, width, alignment);
+ KListViewItem::paintCell(p, cg, column, width, tqalignment);
}
TQString login;
@@ -422,7 +422,7 @@ KGreeter::insertUser( const TQImage &default_pix,
if ( randomFace.isNull() ) {
TQStringList::size_type index = 0;
for ( size_t i = 0; i < username.length(); ++i )
- index += ( 0x7f - username.at( i ).latin1() ) % 37;
+ index += ( 0x7f - username.tqat( i ).latin1() ) % 37;
randomFace = randomFaces[ index % randomFaces.count() ];
}
p.load( _faceDir + "/../pics/users/" + randomFace + ".png" );
@@ -890,14 +890,14 @@ KStdGreeter::KStdGreeter()
i18n("This display requires no X authorization.\n"
"This means that anybody can connect to it,\n"
"open windows on it or intercept your input.") );
- complainLabel->setAlignment( AlignCenter );
+ complainLabel->tqsetAlignment( AlignCenter );
complainLabel->setFont( _failFont );
complainLabel->setPaletteForegroundColor( Qt::red );
inner_box->addWidget( complainLabel );
}
if (!_greetString.isEmpty()) {
TQLabel *welcomeLabel = new TQLabel( _greetString, this );
- welcomeLabel->setAlignment( AlignCenter );
+ welcomeLabel->tqsetAlignment( AlignCenter );
welcomeLabel->setFont( _greetFont );
inner_box->addWidget( welcomeLabel );
}
diff --git a/kdm/kfrontend/kgverify.cpp b/kdm/kfrontend/kgverify.cpp
index fc7a2cba9..b7f57a5bd 100644
--- a/kdm/kfrontend/kgverify.cpp
+++ b/kdm/kfrontend/kgverify.cpp
@@ -40,7 +40,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include <tqregexp.h>
#include <tqpopupmenu.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqfile.h>
#include <tqlabel.h>
@@ -150,7 +150,7 @@ KGVerify::pluginName() const
TQString name( greetPlugins[pluginList[curPlugin]].library->fileName() );
uint st = name.findRev( '/' ) + 1;
uint en = name.find( '.', st );
- if (en - st > 7 && TQConstString( name.unicode() + st, 7 ).string() == "kgreet_")
+ if (en - st > 7 && TQConstString( name.tqunicode() + st, 7 ).string() == "kgreet_")
st += 7;
return name.mid( st, en - st );
}
@@ -163,7 +163,7 @@ showWidgets( TQLayoutItem *li )
if ((w = li->widget()))
w->show();
- else if ((l = li->layout())) {
+ else if ((l = li->tqlayout())) {
TQLayoutIterator it = l->iterator();
for (TQLayoutItem *itm = it.current(); itm; itm = ++it)
showWidgets( itm );
@@ -856,7 +856,7 @@ KGVerify::getConf( void *, const char *key, const TQVariant &dflt )
if (!qstrcmp( key, "EchoMode" ))
return TQVariant( _echoMode );
else {
- TQString fkey = TQString::fromLatin1( key ) + '=';
+ TQString fkey = TQString::tqfromLatin1( key ) + '=';
for (TQStringList::ConstIterator it = _pluginOptions.begin();
it != _pluginOptions.end(); ++it)
if ((*it).startsWith( fkey ))
@@ -930,7 +930,7 @@ KGStdVerify::KGStdVerify( KGVerifyHandler *_handler, TQWidget *_parent,
, failedLabelState( 0 )
{
grid = new TQGridLayout;
- grid->setAlignment( AlignCenter );
+ grid->tqsetAlignment( AlignCenter );
failedLabel = new TQLabel( parent );
failedLabel->setFont( _failFont );
@@ -959,7 +959,7 @@ KGStdVerify::slotPluginSelected( int id )
return;
if (id != curPlugin) {
plugMenu->setItemChecked( curPlugin, false );
- parent->setUpdatesEnabled( false );
+ parent->tqsetUpdatesEnabled( false );
grid->removeItem( greet->getLayoutItem() );
Debug( "delete %s\n", pName.data() );
delete greet;
@@ -967,7 +967,7 @@ KGStdVerify::slotPluginSelected( int id )
handler->verifyPluginChanged( id );
if (running)
start();
- parent->setUpdatesEnabled( true );
+ parent->tqsetUpdatesEnabled( true );
}
}
@@ -1087,10 +1087,10 @@ KGChTok::KGChTok( TQWidget *_parent, const TQString &user,
{
TQSizePolicy fp( TQSizePolicy::Fixed, TQSizePolicy::Fixed );
okButton = new KPushButton( KStdGuiItem::ok(), this );
- okButton->setSizePolicy( fp );
+ okButton->tqsetSizePolicy( fp );
okButton->setDefault( true );
cancelButton = new KPushButton( KStdGuiItem::cancel(), this );
- cancelButton->setSizePolicy( fp );
+ cancelButton->tqsetSizePolicy( fp );
verify = new KGStdVerify( this, this, cancelButton, user, pluginList, func, ctx );
verify->selectPlugin( curPlugin );
diff --git a/kdm/kfrontend/kgverify.h b/kdm/kfrontend/kgverify.h
index 810298dbc..41451d800 100644
--- a/kdm/kfrontend/kgverify.h
+++ b/kdm/kfrontend/kgverify.h
@@ -29,7 +29,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "kgreeterplugin.h"
#include "kfdialog.h"
-#include <layout.h>
+#include <tqlayout.h>
#include <tqtimer.h>
#include <tqvaluevector.h>
diff --git a/kdm/kfrontend/krootimage.cpp b/kdm/kfrontend/krootimage.cpp
index 7d231948f..390601c8d 100644
--- a/kdm/kfrontend/krootimage.cpp
+++ b/kdm/kfrontend/krootimage.cpp
@@ -73,7 +73,7 @@ MyApplication::renderDone()
// ...set it to the desktop widget...
TQT_TQWIDGET(desktop())->setBackgroundPixmap( pm );
- TQT_TQWIDGET(desktop())->repaint( true );
+ TQT_TQWIDGET(desktop())->tqrepaint( true );
// ...and export it via Esetroot-style so that composition managers can use it!
Pixmap bgPm = pm.handle(); // fetch the actual X handle to it
diff --git a/kdm/kfrontend/sakdlg.cc b/kdm/kfrontend/sakdlg.cc
index e24f07bb2..5fbb27346 100644
--- a/kdm/kfrontend/sakdlg.cc
+++ b/kdm/kfrontend/sakdlg.cc
@@ -26,7 +26,7 @@
#include <kmessagebox.h>
#include <kdialog.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqpushbutton.h>
#include <tqmessagebox.h>
#include <tqsimplerichtext.h>
@@ -108,7 +108,7 @@ SAKDlg::SAKDlg(TQWidget *parent)
KUser user;
mStatusLabel = new TQLabel( "<b> </b>", frame );
- mStatusLabel->setAlignment( TQLabel::AlignVCenter );
+ mStatusLabel->tqsetAlignment( TQLabel::AlignVCenter );
TQVBoxLayout *unlockDialogLayout = new TQVBoxLayout( this );
unlockDialogLayout->addWidget( frame );
@@ -157,8 +157,8 @@ void SAKDlg::handleInputPipe(void) {
currentDisplay = TQString(getenv("DISPLAY"));
currentDisplay = currentDisplay.replace(":", "");
displayNumber = currentDisplay.toInt();
- mPipeFilename = TQString(FIFO_SAK_FILE).arg(displayNumber);
- ::unlink((TQString(FIFO_FILE).arg(displayNumber)).ascii());
+ mPipeFilename = TQString(FIFO_SAK_FILE).tqarg(displayNumber);
+ ::unlink((TQString(FIFO_FILE).tqarg(displayNumber)).ascii());
/* Create the FIFOs if they do not exist */
umask(0);
diff --git a/kdm/kfrontend/themer/kdmitem.cpp b/kdm/kfrontend/themer/kdmitem.cpp
index 5f4c42b5a..eb5283cd9 100644
--- a/kdm/kfrontend/themer/kdmitem.cpp
+++ b/kdm/kfrontend/themer/kdmitem.cpp
@@ -34,7 +34,7 @@
#include <tqframe.h>
#include <tqwidget.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqimage.h>
#include <tqpainter.h>
@@ -280,7 +280,7 @@ KdmItem::setGeometry( const TQRect &newGeometry, bool force )
if (fixedManager && !fixedManager->isEmpty())
fixedManager->update( newGeometry, force );
- // TODO send *selective* repaint signal
+ // TODO send *selective* tqrepaint signal
}
void
@@ -299,7 +299,7 @@ KdmItem::paint( TQPainter *p, const TQRect &rect )
if ((_compositor.isEmpty()) || (!argb_visual_available)) {
// Software blend only (no compositing support)
TQPixmap copy( myWidget->size() );
- kdDebug() << myWidget->geometry() << " " << area << " " << myWidget->size() << endl;
+ kdDebug() << myWidget->tqgeometry() << " " << area << " " << myWidget->size() << endl;
bitBlt( &copy, TQPoint( 0, 0), p->device(), myWidget->geometry(), TQt::CopyROP );
// Lighten it slightly
TQImage lightVersion;
@@ -443,12 +443,12 @@ KdmItem::statusChanged()
// BEGIN protected inheritable
TQSize
-KdmItem::sizeHint()
+KdmItem::tqsizeHint()
{
if (myWidget)
return myWidget->size();
if (myLayoutItem)
- return myLayoutItem->sizeHint();
+ return myLayoutItem->tqsizeHint();
int w = pos.wType == DTpixel ? kAbs( pos.width ) : -1,
h = pos.hType == DTpixel ? kAbs( pos.height ) : -1;
return TQSize( w, h );
@@ -457,7 +457,7 @@ KdmItem::sizeHint()
TQRect
KdmItem::placementHint( const TQRect &parentRect )
{
- TQSize hintedSize = sizeHint();
+ TQSize hintedSize = tqsizeHint();
TQSize boxHint;
int x = parentRect.left(),
@@ -474,7 +474,7 @@ KdmItem::placementHint( const TQRect &parentRect )
else {
if (!boxManager)
return parentRect;
- boxHint = boxManager->sizeHint();
+ boxHint = boxManager->tqsizeHint();
}
kdDebug() << timestamp() << " boxHint " << boxHint << endl;
}
@@ -592,7 +592,7 @@ KdmItem::parseAttribute( const TQString &s, int &val, enum DataType &dType )
} else { // int value
dType = DTpixel;
TQString sCopy = s;
- if (sCopy.at( 0 ) == '-') {
+ if (sCopy.tqat( 0 ) == '-') {
sCopy.remove( 0, 1 );
dType = DTnpixel;
}
@@ -616,7 +616,7 @@ KdmItem::parseFont( const TQString &s, TQFont &font )
void
KdmItem::parseColor( const TQString &s, TQColor &color )
{
- if (s.at( 0 ) != '#')
+ if (s.tqat( 0 ) != '#')
return;
bool ok;
TQString sCopy = s;
diff --git a/kdm/kfrontend/themer/kdmitem.h b/kdm/kfrontend/themer/kdmitem.h
index 230ed71c4..ca6bd3435 100644
--- a/kdm/kfrontend/themer/kdmitem.h
+++ b/kdm/kfrontend/themer/kdmitem.h
@@ -96,7 +96,7 @@ public:
/**
* Fixup the geometry of an item and its children (even if fixed
- * or boxed ones). Note that this will generate repaint signals
+ * or boxed ones). Note that this will generate tqrepaint signals
* when needed. The default implementation should fit all needs.
*/
virtual void setGeometry( const TQRect &newGeometry, bool force );
@@ -109,7 +109,7 @@ public:
void paint( TQPainter *painter, const TQRect &boundaries );
/**
- * Update representation of contents and repaint.
+ * Update representation of contents and tqrepaint.
*/
virtual void update();
@@ -120,7 +120,7 @@ public:
void mouseEvent( int x, int y, bool pressed = false, bool released = false );
/**
- * Similar to sizeHint(..), this returns the area of the item
+ * Similar to tqsizeHint(..), this returns the area of the item
* given the @p parentGeometry. The default implementation
* takes into account geometric constraints and layoutings.
* @param parentGeometry the geometry of the caller item or a
@@ -181,7 +181,7 @@ protected:
* @return (-1,-1) if no size can be determined (so it should
* default to parent's size).
*/
- virtual TQSize sizeHint();
+ virtual TQSize tqsizeHint();
/**
* Low level graphical function to paint the item.
@@ -195,7 +195,7 @@ protected:
/**
* Called when item changes its 'state' variable. This must
- * handle item's repaint.
+ * handle item's tqrepaint.
*/
virtual void statusChanged();
diff --git a/kdm/kfrontend/themer/kdmlabel.cpp b/kdm/kfrontend/themer/kdmlabel.cpp
index 0eab99c30..c019851e1 100644
--- a/kdm/kfrontend/themer/kdmlabel.cpp
+++ b/kdm/kfrontend/themer/kdmlabel.cpp
@@ -116,7 +116,7 @@ KdmLabel::setTextInt( const TQString &txt)
if (cAccel != -1) {
cText.remove('&');
myAccel = new TQAccel(parentWidget());
- myAccel->insertItem(ALT + UNICODE_ACCEL + cText.at(cAccel).lower().unicode());
+ myAccel->insertItem(ALT + UNICODE_ACCEL + cText.tqat(cAccel).lower().tqunicode());
connect(myAccel, TQT_SIGNAL(activated(int)), TQT_SLOT(slotAccel()));
}
}
@@ -138,7 +138,7 @@ KdmLabel::setText( const TQString &txt )
}
TQSize
-KdmLabel::sizeHint()
+KdmLabel::tqsizeHint()
{
// choose the correct label class
struct LabelStruct::LabelClass *l = &label.normal;
@@ -177,8 +177,8 @@ KdmLabel::drawContents( TQPainter *p, const TQRect &/*r*/ )
TQFont f(l->font);
f.setUnderline(true);
p->setFont ( f );
- p->drawText( tarea, AlignLeft | SingleLine, TQString(cText.at(cAccel)));
- tarea.rLeft() += fm.width(cText.at(cAccel));
+ p->drawText( tarea, AlignLeft | SingleLine, TQString(cText.tqat(cAccel)));
+ tarea.rLeft() += fm.width(cText.tqat(cAccel));
p->setFont( l->font );
p->drawText( tarea, AlignLeft | SingleLine, right);
} else {
@@ -268,7 +268,7 @@ KdmLabel::lookupText( const TQString &t )
m['s'] = KThemedGreeter::timedUser;
// xgettext:no-c-format
KGlobal::locale()->setDateFormat( i18n("date format", "%a %d %B") );
- m['c'] = KGlobal::locale()->formatDateTime( TQDateTime::currentDateTime(), false, false );
+ m['c'] = KGlobal::locale()->formatDateTime( TQDateTime::tqcurrentDateTime(), false, false );
return KMacroExpander::expandMacros( text, m );
}
diff --git a/kdm/kfrontend/themer/kdmlabel.h b/kdm/kfrontend/themer/kdmlabel.h
index 1ec2f88ec..33ce1cc00 100644
--- a/kdm/kfrontend/themer/kdmlabel.h
+++ b/kdm/kfrontend/themer/kdmlabel.h
@@ -42,7 +42,7 @@ public:
protected:
// reimplemented; returns the minimum size of rendered text
- virtual TQSize sizeHint();
+ virtual TQSize tqsizeHint();
// draw the label
virtual void drawContents( TQPainter *p, const TQRect &r );
diff --git a/kdm/kfrontend/themer/kdmlayout.cpp b/kdm/kfrontend/themer/kdmlayout.cpp
index 093d450fc..83a4ea377 100644
--- a/kdm/kfrontend/themer/kdmlayout.cpp
+++ b/kdm/kfrontend/themer/kdmlayout.cpp
@@ -74,7 +74,7 @@ KdmLayoutBox::update( const TQRect &parentGeometry, bool force )
// Check if box size was computed. If not compute it
// TODO check if this prevents updating changing items
// if (!hintedSize.isValid())
-// sizeHint();
+// tqsizeHint();
// kdDebug() << this << " hintedSize " << hintedSize << endl;
@@ -114,30 +114,30 @@ KdmLayoutBox::update( const TQRect &parentGeometry, bool force )
if ((*it)->isExplicitlyHidden())
continue;
- TQRect temp = childrenRect, itemRect;
+ TQRect temp = childrenRect, tqitemRect;
if (box.isVertical) {
temp.setHeight( 0 );
- itemRect = (*it)->placementHint( temp );
- temp.setHeight( itemRect.height() );
- childrenRect.setTop( childrenRect.top() + itemRect.size().height() + box.spacing );
+ tqitemRect = (*it)->placementHint( temp );
+ temp.setHeight( tqitemRect.height() );
+ childrenRect.setTop( childrenRect.top() + tqitemRect.size().height() + box.spacing );
} else {
temp.setWidth( 0 );
- itemRect = (*it)->placementHint( temp );
- kdDebug() << this << " placementHint " << *it << " " << temp << " " << itemRect << endl;
- temp.setWidth( itemRect.width() );
- childrenRect.setLeft( childrenRect.left() + itemRect.size().width() + box.spacing );
+ tqitemRect = (*it)->placementHint( temp );
+ kdDebug() << this << " placementHint " << *it << " " << temp << " " << tqitemRect << endl;
+ temp.setWidth( tqitemRect.width() );
+ childrenRect.setLeft( childrenRect.left() + tqitemRect.size().width() + box.spacing );
kdDebug() << timestamp() << " childrenRect after " << *it << " " << childrenRect << endl;
}
- itemRect = (*it)->placementHint( temp );
- kdDebug() << this << " placementHint2 " << *it << " " << temp << " " << itemRect << endl;
- (*it)->setGeometry( itemRect, force );
+ tqitemRect = (*it)->placementHint( temp );
+ kdDebug() << this << " placementHint2 " << *it << " " << temp << " " << tqitemRect << endl;
+ (*it)->setGeometry( tqitemRect, force );
}
}
}
//FIXME truly experimental (is so close to greeter_geometry.c)
TQSize
-KdmLayoutBox::sizeHint()
+KdmLayoutBox::tqsizeHint()
{
// Sum up area taken by children
int w = 0, h = 0;
diff --git a/kdm/kfrontend/themer/kdmlayout.h b/kdm/kfrontend/themer/kdmlayout.h
index 4c73e9a1b..69b515d67 100644
--- a/kdm/kfrontend/themer/kdmlayout.h
+++ b/kdm/kfrontend/themer/kdmlayout.h
@@ -80,7 +80,7 @@ public:
// Computes the size hint of the box, telling which is the
// smallest size inside which boxed items will fit
- TQSize sizeHint();
+ TQSize tqsizeHint();
private:
struct {
diff --git a/kdm/kfrontend/themer/kdmpixmap.cpp b/kdm/kfrontend/themer/kdmpixmap.cpp
index 8020bd1e1..6bb1fc57d 100644
--- a/kdm/kfrontend/themer/kdmpixmap.cpp
+++ b/kdm/kfrontend/themer/kdmpixmap.cpp
@@ -107,7 +107,7 @@ KdmPixmap::KdmPixmap( KdmItem *parent, const TQDomNode &node, const char *name )
}
TQSize
-KdmPixmap::sizeHint()
+KdmPixmap::tqsizeHint()
{
// choose the correct pixmap class
PixmapStruct::PixmapClass * pClass = &pixmap.normal;
@@ -118,7 +118,7 @@ KdmPixmap::sizeHint()
// use the pixmap size as the size hint
if (!pClass->pixmap.isNull())
return pClass->pixmap.size();
- return KdmItem::sizeHint();
+ return KdmItem::tqsizeHint();
}
void
@@ -138,7 +138,7 @@ KdmPixmap::fullPath( const TQString &fileName)
return TQString::null;
TQString fullName = fileName;
- if (fullName.at( 0 ) != '/')
+ if (fullName.tqat( 0 ) != '/')
fullName = baseDir() + "/" + fileName;
return fullName;
}
@@ -177,7 +177,7 @@ KdmPixmap::loadPixmap( PixmapStruct::PixmapClass *pClass )
TQString ext = fullpath.right(fullpath.length() - index);
fullpath = fullpath.left(index);
kdDebug() << timestamp() << " ext " << ext << " " << fullpath << endl;
- TQString testpath = TQString("-%1x%2").arg(area.width()).arg(area.height()) + ext;
+ TQString testpath = TQString("-%1x%2").tqarg(area.width()).arg(area.height()) + ext;
kdDebug() << timestamp() << " testing for " << fullpath + testpath << endl;
if (KStandardDirs::exists(fullpath + testpath))
pClass->pixmap.load(fullpath + testpath);
diff --git a/kdm/kfrontend/themer/kdmpixmap.h b/kdm/kfrontend/themer/kdmpixmap.h
index a12c9fea4..d49394bc9 100644
--- a/kdm/kfrontend/themer/kdmpixmap.h
+++ b/kdm/kfrontend/themer/kdmpixmap.h
@@ -42,7 +42,7 @@ public:
protected:
// reimplemented; returns the size of loaded pixmap
- virtual TQSize sizeHint();
+ virtual TQSize tqsizeHint();
// draw the pixmap
virtual void drawContents( TQPainter *p, const TQRect &r );
diff --git a/kdm/kfrontend/themer/kdmrect.cpp b/kdm/kfrontend/themer/kdmrect.cpp
index 7805ba846..1db128da0 100644
--- a/kdm/kfrontend/themer/kdmrect.cpp
+++ b/kdm/kfrontend/themer/kdmrect.cpp
@@ -29,7 +29,7 @@
#include <tqimage.h>
#include <tqpainter.h>
#include <tqwidget.h>
-#include <layout.h>
+#include <tqlayout.h>
extern bool argb_visual_available;
diff --git a/kdm/kfrontend/themer/kdmthemer.h b/kdm/kfrontend/themer/kdmthemer.h
index f9a0b1b6f..e6e5efdb4 100644
--- a/kdm/kfrontend/themer/kdmthemer.h
+++ b/kdm/kfrontend/themer/kdmthemer.h
@@ -61,9 +61,9 @@ public:
bool isOK() { return rootItem != 0; }
/*
- * Gives a sizeHint to the widget (parent size)
+ * Gives a tqsizeHint to the widget (parent size)
*/
- //TQSize sizeHint() const{ return parentWidget()->size(); }
+ //TQSize tqsizeHint() const{ return parentWidget()->size(); }
/*
* Takes a shot of the current widget