summaryrefslogtreecommitdiffstats
path: root/ksmserver
diff options
context:
space:
mode:
Diffstat (limited to 'ksmserver')
-rw-r--r--ksmserver/client.cpp8
-rw-r--r--ksmserver/legacy.cpp4
-rw-r--r--ksmserver/main.cpp4
-rw-r--r--ksmserver/server.cpp2
-rw-r--r--ksmserver/shutdown.cpp2
-rw-r--r--ksmserver/shutdowndlg.cpp22
-rw-r--r--ksmserver/startup.cpp2
-rw-r--r--ksmserver/startupdlg.cpp2
-rw-r--r--ksmserver/timed.ui18
9 files changed, 32 insertions, 32 deletions
diff --git a/ksmserver/client.cpp b/ksmserver/client.cpp
index 2f6708963..b1927890a 100644
--- a/ksmserver/client.cpp
+++ b/ksmserver/client.cpp
@@ -146,7 +146,7 @@ TQString KSMClient::program() const
SmProp* p = property( SmProgram );
if ( !p || qstrcmp( p->type, SmARRAY8) || p->num_vals < 1)
return TQString::null;
- return TQString::fromLatin1( (const char*) p->vals[0].value );
+ return TQString::tqfromLatin1( (const char*) p->vals[0].value );
}
TQStringList KSMClient::restartCommand() const
@@ -156,7 +156,7 @@ TQStringList KSMClient::restartCommand() const
if ( !p || qstrcmp( p->type, SmLISTofARRAY8) || p->num_vals < 1)
return result;
for ( int i = 0; i < p->num_vals; i++ )
- result +=TQString::fromLatin1( (const char*) p->vals[i].value );
+ result +=TQString::tqfromLatin1( (const char*) p->vals[i].value );
return result;
}
@@ -167,7 +167,7 @@ TQStringList KSMClient::discardCommand() const
if ( !p || qstrcmp( p->type, SmLISTofARRAY8) || p->num_vals < 1)
return result;
for ( int i = 0; i < p->num_vals; i++ )
- result +=TQString::fromLatin1( (const char*) p->vals[i].value );
+ result +=TQString::tqfromLatin1( (const char*) p->vals[i].value );
return result;
}
@@ -184,7 +184,7 @@ TQString KSMClient::userId() const
SmProp* p = property( SmUserID );
if ( !p || qstrcmp( p->type, SmARRAY8) || p->num_vals < 1)
return TQString::null;
- return TQString::fromLatin1( (const char*) p->vals[0].value );
+ return TQString::tqfromLatin1( (const char*) p->vals[0].value );
}
diff --git a/ksmserver/legacy.cpp b/ksmserver/legacy.cpp
index ec0ace402..ad190185e 100644
--- a/ksmserver/legacy.cpp
+++ b/ksmserver/legacy.cpp
@@ -315,7 +315,7 @@ static TQStringList getQStringListProperty(WId w, Atom prop)
if (!data)
return result;
for (int i=0; i<(int)nitems; i++) {
- result << TQString::fromLatin1( (const char*)data + i );
+ result << TQString::tqfromLatin1( (const char*)data + i );
while(data[i]) i++;
}
XFree(data);
@@ -363,7 +363,7 @@ TQString KSMServer::windowWmClientMachine(WId w)
}
}
}
- return TQString::fromLatin1(result);
+ return TQString::tqfromLatin1(result);
}
WId KSMServer::windowWmClientLeader(WId w)
diff --git a/ksmserver/main.cpp b/ksmserver/main.cpp
index c98a1eb69..8e2270068 100644
--- a/ksmserver/main.cpp
+++ b/ksmserver/main.cpp
@@ -170,7 +170,7 @@ void sanity_check( int argc, char* argv[] )
qmsg.sprintf(msg.data(), path.data());
qmsg = msg_pre+qmsg+msg_post;
TQMessageBox::critical(0, "KDE Installation Problem!",
- TQString::fromLatin1(qmsg.data()));
+ TQString::tqfromLatin1(qmsg.data()));
exit(255);
}
}
@@ -218,7 +218,7 @@ extern "C" KDE_EXPORT int kdemain( int argc, char* argv[] )
only_local = false;
#endif
- KSMServer *server = new KSMServer( TQString::fromLatin1(wm), only_local);
+ KSMServer *server = new KSMServer( TQString::tqfromLatin1(wm), only_local);
kapp->dcopClient()->setDefaultObject( server->objId() );
IceSetIOErrorHandler( IoErrorHandler );
diff --git a/ksmserver/server.cpp b/ksmserver/server.cpp
index 44603b812..91cfb7544 100644
--- a/ksmserver/server.cpp
+++ b/ksmserver/server.cpp
@@ -57,7 +57,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#endif
#include <tqfile.h>
-#include <textstream.h>
+#include <tqtextstream.h>
#include <tqdatastream.h>
#include <tqptrstack.h>
#include <tqpushbutton.h>
diff --git a/ksmserver/shutdown.cpp b/ksmserver/shutdown.cpp
index fb6ba9a92..a4ca020e6 100644
--- a/ksmserver/shutdown.cpp
+++ b/ksmserver/shutdown.cpp
@@ -57,7 +57,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#endif
#include <tqfile.h>
-#include <textstream.h>
+#include <tqtextstream.h>
#include <tqdatastream.h>
#include <tqptrstack.h>
#include <tqpushbutton.h>
diff --git a/ksmserver/shutdowndlg.cpp b/ksmserver/shutdowndlg.cpp
index c401ed56e..3df6870b7 100644
--- a/ksmserver/shutdowndlg.cpp
+++ b/ksmserver/shutdowndlg.cpp
@@ -7,7 +7,7 @@ Copyright (C) 2000 Matthias Ettrich <ettrich@kde.org>
#include "shutdowndlg.h"
#include <tqapplication.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqgroupbox.h>
#include <tqvbuttongroup.h>
#include <tqlabel.h>
@@ -650,7 +650,7 @@ KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent,
TQFrame* frame = new TQFrame( this );
frame->setFrameStyle( TQFrame::StyledPanel | TQFrame::Raised );
- frame->setLineWidth( tqstyle().pixelMetric( TQStyle::PM_DefaultFrameWidth, frame ) );
+ frame->setLineWidth( tqstyle().tqpixelMetric( TQStyle::PM_DefaultFrameWidth, frame ) );
// we need to set the minimum size for the logout box, since it
// gets too small if there isn't all options available
frame->setMinimumWidth(400);
@@ -691,7 +691,7 @@ KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent,
{
// first line of buttons
hbuttonbox = new TQHBoxLayout( hbox, factor * KDialog::spacingHint() );
- hbuttonbox->setAlignment( Qt::AlignHCenter );
+ hbuttonbox->tqsetAlignment( Qt::AlignHCenter );
// End session
FlatButton* btnLogout = new FlatButton( frame );
btnLogout->setTextLabel( TQString("&") + i18n("Log out"), false );
@@ -711,12 +711,12 @@ KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent,
hbox->addWidget( lfrm, AlignCenter );
buttonlay = new TQVBoxLayout( hbox, factor * KDialog::spacingHint() );
- buttonlay->setAlignment( Qt::AlignHCenter );
+ buttonlay->tqsetAlignment( Qt::AlignHCenter );
TQLabel* icon = new TQLabel( lfrm );
icon->setPixmap( UserIcon( "shutdownkonq" ) );
- lfrm->setFixedSize( icon->sizeHint());
- icon->setFixedSize( icon->sizeHint());
+ lfrm->setFixedSize( icon->tqsizeHint());
+ icon->setFixedSize( icon->tqsizeHint());
buttonlay->addStretch( 1 );
// End session
@@ -832,7 +832,7 @@ KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent,
// bottom buttons
TQHBoxLayout* hbuttonbox2 = new TQHBoxLayout( vbox, factor * KDialog::spacingHint() );
- hbuttonbox2->setAlignment( Qt::AlignHCenter );
+ hbuttonbox2->tqsetAlignment( Qt::AlignHCenter );
// Reboot
FlatButton* btnReboot = new FlatButton( frame );
@@ -882,7 +882,7 @@ KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent,
// cancel buttonbox
TQHBoxLayout* hbuttonbox3 = new TQHBoxLayout( vbox, factor * KDialog::spacingHint() );
- hbuttonbox3->setAlignment( Qt::AlignRight );
+ hbuttonbox3->tqsetAlignment( Qt::AlignRight );
// Back to Desktop
KSMPushButton* btnBack = new KSMPushButton( KStdGuiItem::cancel(), frame );
@@ -969,7 +969,7 @@ KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent,
{
// cancel buttonbox
TQHBoxLayout* hbuttonbox3 = new TQHBoxLayout( vbox, factor * KDialog::spacingHint() );
- hbuttonbox3->setAlignment( Qt::AlignRight );
+ hbuttonbox3->tqsetAlignment( Qt::AlignRight );
// Back to Desktop
KSMPushButton* btnBack = new KSMPushButton( KStdGuiItem::cancel(), frame );
@@ -1100,7 +1100,7 @@ bool KSMShutdownDlg::confirmShutdown( bool maysd, KApplication::ShutdownType& sd
maysd, sdtype );
// Show dialog (will save the background in showEvent)
- TQSize sh = l->sizeHint();
+ TQSize sh = l->tqsizeHint();
TQRect rect = KGlobalSettings::desktopGeometry(TQCursor::pos());
l->move(rect.x() + (rect.width() - sh.width())/2,
@@ -1230,7 +1230,7 @@ bool KSMDelayedMessageBox::showTicker( KApplication::ShutdownType sdtype, const
{
kapp->enableStyles();
KSMDelayedMessageBox msg( sdtype, bootOption, confirmDelay );
- TQSize sh = msg.sizeHint();
+ TQSize sh = msg.tqsizeHint();
TQRect rect = KGlobalSettings::desktopGeometry(TQCursor::pos());
msg.move(rect.x() + (rect.width() - sh.width())/2,
diff --git a/ksmserver/startup.cpp b/ksmserver/startup.cpp
index d1e569419..b53ae3d18 100644
--- a/ksmserver/startup.cpp
+++ b/ksmserver/startup.cpp
@@ -57,7 +57,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#endif
#include <tqfile.h>
-#include <textstream.h>
+#include <tqtextstream.h>
#include <tqdatastream.h>
#include <tqptrstack.h>
#include <tqpushbutton.h>
diff --git a/ksmserver/startupdlg.cpp b/ksmserver/startupdlg.cpp
index 85c04c393..2d42dd3a2 100644
--- a/ksmserver/startupdlg.cpp
+++ b/ksmserver/startupdlg.cpp
@@ -7,7 +7,7 @@ Copyright (C) 2000 Matthias Ettrich <ettrich@kde.org>
#include "startupdlg.h"
#include <tqapplication.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqgroupbox.h>
#include <tqvbuttongroup.h>
#include <tqlabel.h>
diff --git a/ksmserver/timed.ui b/ksmserver/timed.ui
index fe217c476..14337f6cd 100644
--- a/ksmserver/timed.ui
+++ b/ksmserver/timed.ui
@@ -110,7 +110,7 @@
<property name="sizeType">
<enum>MinimumExpanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>2</height>
@@ -129,7 +129,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="minimumSize">
+ <property name="tqminimumSize">
<size>
<width>48</width>
<height>48</height>
@@ -149,7 +149,7 @@
<property name="sizeType">
<enum>MinimumExpanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>2</height>
@@ -192,7 +192,7 @@
<property name="textFormat">
<enum>PlainText</enum>
</property>
- <property name="alignment">
+ <property name="tqalignment">
<set>AlignVCenter|AlignLeft</set>
</property>
</widget>
@@ -215,7 +215,7 @@ after X automatically.</string>
<property name="textFormat">
<enum>RichText</enum>
</property>
- <property name="alignment">
+ <property name="tqalignment">
<set>WordBreak|AlignVCenter</set>
</property>
</widget>
@@ -229,7 +229,7 @@ after X automatically.</string>
<property name="sizeType">
<enum>Preferred</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>30</width>
<height>0</height>
@@ -258,7 +258,7 @@ after X automatically.</string>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>90</width>
<height>20</height>
@@ -286,7 +286,7 @@ after X automatically.</string>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>90</width>
<height>20</height>
@@ -319,7 +319,7 @@ after X automatically.</string>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>90</width>
<height>20</height>
generated by cgit v1.2.3 (git 2.46.0) at 2025-11-04 00:19:49 +0000