summaryrefslogtreecommitdiffstats
path: root/tdmlib
diff options
context:
space:
mode:
Diffstat (limited to 'tdmlib')
-rw-r--r--tdmlib/dmctl.cpp4
-rw-r--r--tdmlib/dmctl.h6
-rw-r--r--tdmlib/kgreet_classic.cpp18
-rw-r--r--tdmlib/kgreet_classic.h2
-rw-r--r--tdmlib/kgreet_pam.cpp44
-rw-r--r--tdmlib/kgreet_pam.h4
-rw-r--r--tdmlib/kgreet_winbind.cpp40
-rw-r--r--tdmlib/kgreet_winbind.h2
8 files changed, 62 insertions, 58 deletions
diff --git a/tdmlib/dmctl.cpp b/tdmlib/dmctl.cpp
index 00c3cb489..6cd6f7e93 100644
--- a/tdmlib/dmctl.cpp
+++ b/tdmlib/dmctl.cpp
@@ -19,7 +19,7 @@
#include "dmctl.h"
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
#include <tdelocale.h>
#include <dcopclient.h>
@@ -531,4 +531,4 @@ DM::type()
return DMType;
}
-#endif // Q_WS_X11
+#endif // TQ_WS_X11
diff --git a/tdmlib/dmctl.h b/tdmlib/dmctl.h
index e0cdc966c..40ea95f26 100644
--- a/tdmlib/dmctl.h
+++ b/tdmlib/dmctl.h
@@ -32,7 +32,7 @@ struct SessEnt {
typedef TQValueList<SessEnt> SessList;
class DM {
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
public:
@@ -77,7 +77,7 @@ private:
void GDMAuthenticate();
-#else // Q_WS_X11
+#else // TQ_WS_X11
public:
DM() {}
@@ -100,7 +100,7 @@ public:
int type() { return NoDM }
-#endif // Q_WS_X11
+#endif // TQ_WS_X11
}; // class DM
diff --git a/tdmlib/kgreet_classic.cpp b/tdmlib/kgreet_classic.cpp
index 996754181..7a04b7fea 100644
--- a/tdmlib/kgreet_classic.cpp
+++ b/tdmlib/kgreet_classic.cpp
@@ -83,7 +83,7 @@ KClassicGreeter::KClassicGreeter( KGreeterPluginHandler *_handler,
if (!themer)
grid = new TQGridLayout( 0, 0, 10 );
- layoutItem = TQT_TQLAYOUTITEM(grid);
+ layoutItem = grid;
loginLabel = passwdLabel = passwd1Label = passwd2Label = 0;
loginEdit = 0;
@@ -94,10 +94,10 @@ KClassicGreeter::KClassicGreeter( KGreeterPluginHandler *_handler,
if (fixedUser.isEmpty()) {
loginEdit = new KLineEdit( parent );
loginEdit->setContextMenuEnabled( false );
- connect( loginEdit, TQT_SIGNAL(lostFocus()), TQT_SLOT(slotLoginLostFocus()) );
- connect( loginEdit, TQT_SIGNAL(lostFocus()), TQT_SLOT(slotActivity()) );
- connect( loginEdit, TQT_SIGNAL(textChanged( const TQString & )), TQT_SLOT(slotActivity()) );
- connect( loginEdit, TQT_SIGNAL(selectionChanged()), TQT_SLOT(slotActivity()) );
+ connect( loginEdit, TQ_SIGNAL(lostFocus()), TQ_SLOT(slotLoginLostFocus()) );
+ connect( loginEdit, TQ_SIGNAL(lostFocus()), TQ_SLOT(slotActivity()) );
+ connect( loginEdit, TQ_SIGNAL(textChanged( const TQString & )), TQ_SLOT(slotActivity()) );
+ connect( loginEdit, TQ_SIGNAL(selectionChanged()), TQ_SLOT(slotActivity()) );
if (pred) {
parent->setTabOrder( pred, loginEdit );
pred = loginEdit;
@@ -120,9 +120,9 @@ KClassicGreeter::KClassicGreeter( KGreeterPluginHandler *_handler,
else
passwdEdit = new TDMPasswordEdit( (KPasswordEdit::EchoModes)echoMode,
parent );
- connect( passwdEdit, TQT_SIGNAL(textChanged( const TQString & )),
- TQT_SLOT(slotActivity()) );
- connect( passwdEdit, TQT_SIGNAL(lostFocus()), TQT_SLOT(slotActivity()) );
+ connect( passwdEdit, TQ_SIGNAL(textChanged( const TQString & )),
+ TQ_SLOT(slotActivity()) );
+ connect( passwdEdit, TQ_SIGNAL(lostFocus()), TQ_SLOT(slotActivity()) );
if (pred) {
parent->setTabOrder( pred, passwdEdit );
pred = passwdEdit;
@@ -174,7 +174,7 @@ KClassicGreeter::~KClassicGreeter()
delete passwdEdit;
return;
}
- TQLayoutIterator it = TQT_TQLAYOUT(layoutItem)->iterator();
+ TQLayoutIterator it = static_cast<TQLayout*>(layoutItem)->iterator();
for (TQLayoutItem *itm = it.current(); itm; itm = ++it)
delete itm->widget();
delete layoutItem;
diff --git a/tdmlib/kgreet_classic.h b/tdmlib/kgreet_classic.h
index 3f36d5000..f5dc52122 100644
--- a/tdmlib/kgreet_classic.h
+++ b/tdmlib/kgreet_classic.h
@@ -37,7 +37,7 @@ class TQGridLayout;
class TQLabel;
class KClassicGreeter : public TQObject, public KGreeterPlugin {
- Q_OBJECT
+ TQ_OBJECT
public:
KClassicGreeter( KGreeterPluginHandler *handler,
diff --git a/tdmlib/kgreet_pam.cpp b/tdmlib/kgreet_pam.cpp
index e7a5f0747..1f6da138c 100644
--- a/tdmlib/kgreet_pam.cpp
+++ b/tdmlib/kgreet_pam.cpp
@@ -55,7 +55,7 @@ protected:
virtual void contextMenuEvent( TQContextMenuEvent * ) {}
};
-static FILE* log;
+static FILE *logFile;
static void kg_debug(const char* fmt, ...)
{
va_list lst;
@@ -63,8 +63,8 @@ static void kg_debug(const char* fmt, ...)
#ifdef PAM_GREETER_DEBUG
#if 0
- vfprintf(log, fmt, lst);
- fflush(log);
+ vfprintf(logFile, fmt, lst);
+ fflush(logFile);
#else
char buf[6000];
sprintf(buf, "*** %s\n", fmt);
@@ -111,7 +111,7 @@ KPamGreeter::KPamGreeter( KGreeterPluginHandler *_handler,
m_themer = themer;
if (!themer)
- layoutItem = TQT_TQLAYOUTITEM(new TQGridLayout( 0, 0, 10 ));
+ layoutItem = new TQGridLayout( 0, 0, 10 );
loginLabel = 0;
authLabel.clear();
@@ -127,10 +127,10 @@ KPamGreeter::KPamGreeter( KGreeterPluginHandler *_handler,
if (fixedUser.isEmpty()) {
loginEdit = new KLineEdit( parent );
loginEdit->setContextMenuEnabled( false );
- connect( loginEdit, TQT_SIGNAL(lostFocus()), TQT_SLOT(slotLoginLostFocus()) );
- connect( loginEdit, TQT_SIGNAL(lostFocus()), TQT_SLOT(slotActivity()) );
- connect( loginEdit, TQT_SIGNAL(textChanged( const TQString & )), TQT_SLOT(slotActivity()) );
- connect( loginEdit, TQT_SIGNAL(selectionChanged()), TQT_SLOT(slotActivity()) );
+ connect( loginEdit, TQ_SIGNAL(lostFocus()), TQ_SLOT(slotLoginLostFocus()) );
+ connect( loginEdit, TQ_SIGNAL(lostFocus()), TQ_SLOT(slotActivity()) );
+ connect( loginEdit, TQ_SIGNAL(textChanged( const TQString & )), TQ_SLOT(slotActivity()) );
+ connect( loginEdit, TQ_SIGNAL(selectionChanged()), TQ_SLOT(slotActivity()) );
if (pred) {
parent->setTabOrder( pred, loginEdit );
pred = loginEdit;
@@ -154,9 +154,9 @@ KPamGreeter::KPamGreeter( KGreeterPluginHandler *_handler,
else
passwdEdit = new TDMPasswordEdit( echoMode,
parent );
- connect( passwdEdit, TQT_SIGNAL(textChanged( const TQString & )),
- TQT_SLOT(slotActivity()) );
- connect( passwdEdit, TQT_SIGNAL(lostFocus()), TQT_SLOT(slotActivity()) );
+ connect( passwdEdit, TQ_SIGNAL(textChanged( const TQString & )),
+ TQ_SLOT(slotActivity()) );
+ connect( passwdEdit, TQ_SIGNAL(lostFocus()), TQ_SLOT(slotActivity()) );
if (pred) {
parent->setTabOrder( pred, passwdEdit );
pred = passwdEdit;
@@ -211,7 +211,7 @@ KPamGreeter::~KPamGreeter()
delete loginEdit;
return;
}
- TQLayoutIterator it = TQT_TQLAYOUT(layoutItem)->iterator();
+ TQLayoutIterator it = static_cast<TQLayout*>(layoutItem)->iterator();
for (TQLayoutItem *itm = it.current(); itm; itm = ++it)
delete itm->widget();
delete layoutItem;
@@ -377,7 +377,7 @@ KPamGreeter::textPrompt( const char *prompt, bool echo, bool nonBlocking )
if (tdmlabel) {
//userLabel->setText(TQString::fromUtf8(prompt));
tdmlabel->label.text = TQString::fromUtf8(prompt);
- TQTimer::singleShot(0, tdmlabel, TQT_SLOT(update()));
+ TQTimer::singleShot(0, tdmlabel, TQ_SLOT(update()));
}
}
}
@@ -395,7 +395,7 @@ KPamGreeter::textPrompt( const char *prompt, bool echo, bool nonBlocking )
//userLabel->setText(TQString::fromUtf8(prompt));
TQString str = TQString::fromUtf8(prompt);
tdmlabel->label.text = str;
- TQTimer::singleShot(0, tdmlabel, TQT_SLOT(update()));
+ TQTimer::singleShot(0, tdmlabel, TQ_SLOT(update()));
}
}
@@ -405,9 +405,9 @@ KPamGreeter::textPrompt( const char *prompt, bool echo, bool nonBlocking )
passwdEdit = new TDMPasswordEdit( m_parentWidget );
else
passwdEdit = new TDMPasswordEdit( echoMode, m_parentWidget);
- connect( passwdEdit, TQT_SIGNAL(textChanged( const TQString & )),
- TQT_SLOT(slotActivity()) );
- connect( passwdEdit, TQT_SIGNAL(lostFocus()), TQT_SLOT(slotActivity()) );
+ connect( passwdEdit, TQ_SIGNAL(textChanged( const TQString & )),
+ TQ_SLOT(slotActivity()) );
+ connect( passwdEdit, TQ_SIGNAL(lostFocus()), TQ_SLOT(slotActivity()) );
authEdit << passwdEdit;
#if 1
@@ -435,7 +435,7 @@ KPamGreeter::textPrompt( const char *prompt, bool echo, bool nonBlocking )
if (0) {
//userLabel->setText(TQString::fromUtf8(prompt));
//tdmlabel->label.text = TQString::fromUtf8(prompt);
- //TQTimer::singleShot(0, tdmlabel, TQT_SLOT(update()));
+ //TQTimer::singleShot(0, tdmlabel, TQ_SLOT(update()));
}
}
else
@@ -691,9 +691,11 @@ static bool init( const TQString &,
static void done( void )
{
TDEGlobal::locale()->removeCatalogue( "kgreet_pam" );
- if (log && log != stderr)
- fclose(log);
- log = 0;
+ if (logFile && (logFile != stderr))
+ {
+ fclose(logFile);
+ }
+ logFile = 0;
}
static KGreeterPlugin *
diff --git a/tdmlib/kgreet_pam.h b/tdmlib/kgreet_pam.h
index f579f9522..98e3315b1 100644
--- a/tdmlib/kgreet_pam.h
+++ b/tdmlib/kgreet_pam.h
@@ -37,7 +37,7 @@ class TQGridLayout;
class TQLabel;
class KPamGreeter : public TQObject, public KGreeterPlugin {
- Q_OBJECT
+ TQ_OBJECT
public:
KPamGreeter( KGreeterPluginHandler *handler,
@@ -68,7 +68,7 @@ class KPamGreeter : public TQObject, public KGreeterPlugin {
virtual void revive();
virtual void clear();
- TQGridLayout *getLayoutItem() const { return static_cast<TQGridLayout*>(TQT_TQLAYOUT(layoutItem)); }
+ TQGridLayout *getLayoutItem() const { return static_cast<TQGridLayout*>(layoutItem); }
public slots:
void slotLoginLostFocus();
diff --git a/tdmlib/kgreet_winbind.cpp b/tdmlib/kgreet_winbind.cpp
index 471095d7e..b7a9211b8 100644
--- a/tdmlib/kgreet_winbind.cpp
+++ b/tdmlib/kgreet_winbind.cpp
@@ -91,8 +91,10 @@ KWinbindGreeter::KWinbindGreeter( KGreeterPluginHandler *_handler,
themer = 0;
if (!themer)
+ {
grid = new TQGridLayout( 0, 0, 10 );
- layoutItem = TQT_TQLAYOUTITEM(grid);
+ layoutItem = grid;
+ }
domainLabel = loginLabel = passwdLabel = passwd1Label = passwd2Label = 0;
domainCombo = 0;
@@ -106,12 +108,12 @@ KWinbindGreeter::KWinbindGreeter( KGreeterPluginHandler *_handler,
if (func != ChAuthTok) {
if (fixedUser.isEmpty()) {
domainCombo = new KComboBox( parent );
- connect( domainCombo, TQT_SIGNAL(activated( const TQString & )),
- TQT_SLOT(slotChangedDomain( const TQString & )) );
- connect( domainCombo, TQT_SIGNAL(activated( const TQString & )),
- TQT_SLOT(slotLoginLostFocus()) );
- connect( domainCombo, TQT_SIGNAL(activated( const TQString & )),
- TQT_SLOT(slotActivity()) );
+ connect( domainCombo, TQ_SIGNAL(activated( const TQString & )),
+ TQ_SLOT(slotChangedDomain( const TQString & )) );
+ connect( domainCombo, TQ_SIGNAL(activated( const TQString & )),
+ TQ_SLOT(slotLoginLostFocus()) );
+ connect( domainCombo, TQ_SIGNAL(activated( const TQString & )),
+ TQ_SLOT(slotActivity()) );
// should handle loss of focus
loginEdit = new KLineEdit( parent );
loginEdit->setContextMenuEnabled( false );
@@ -134,13 +136,13 @@ KWinbindGreeter::KWinbindGreeter( KGreeterPluginHandler *_handler,
grid->addWidget( loginLabel, line, 0 );
grid->addWidget( loginEdit, line++, 1 );
}
- connect( loginEdit, TQT_SIGNAL(lostFocus()), TQT_SLOT(slotLoginLostFocus()) );
- connect( loginEdit, TQT_SIGNAL(lostFocus()), TQT_SLOT(slotActivity()) );
- connect( loginEdit, TQT_SIGNAL(textChanged( const TQString & )), TQT_SLOT(slotActivity()) );
- connect( loginEdit, TQT_SIGNAL(selectionChanged()), TQT_SLOT(slotActivity()) );
- connect(&mDomainListTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotStartDomainList()));
+ connect( loginEdit, TQ_SIGNAL(lostFocus()), TQ_SLOT(slotLoginLostFocus()) );
+ connect( loginEdit, TQ_SIGNAL(lostFocus()), TQ_SLOT(slotActivity()) );
+ connect( loginEdit, TQ_SIGNAL(textChanged( const TQString & )), TQ_SLOT(slotActivity()) );
+ connect( loginEdit, TQ_SIGNAL(selectionChanged()), TQ_SLOT(slotActivity()) );
+ connect(&mDomainListTimer, TQ_SIGNAL(timeout()), TQ_SLOT(slotStartDomainList()));
domainCombo->insertStringList( staticDomains );
- TQTimer::singleShot(0, this, TQT_SLOT(slotStartDomainList()));
+ TQTimer::singleShot(0, this, TQ_SLOT(slotStartDomainList()));
} else if (ctx != Login && ctx != Shutdown && grid) {
domainLabel = new TQLabel( i18n("Domain:"), parent );
grid->addWidget( domainLabel, line, 0 );
@@ -154,9 +156,9 @@ KWinbindGreeter::KWinbindGreeter( KGreeterPluginHandler *_handler,
else
passwdEdit = new TDMPasswordEdit( (KPasswordEdit::EchoModes)echoMode,
parent );
- connect( passwdEdit, TQT_SIGNAL(textChanged( const TQString & )),
- TQT_SLOT(slotActivity()) );
- connect( passwdEdit, TQT_SIGNAL(lostFocus()), TQT_SLOT(slotActivity()) );
+ connect( passwdEdit, TQ_SIGNAL(textChanged( const TQString & )),
+ TQ_SLOT(slotActivity()) );
+ connect( passwdEdit, TQ_SIGNAL(lostFocus()), TQ_SLOT(slotActivity()) );
if (!grid) {
passwdEdit->adjustSize();
@@ -215,7 +217,7 @@ KWinbindGreeter::~KWinbindGreeter()
delete domainCombo;
return;
}
- TQLayoutIterator it = TQT_TQLAYOUT(layoutItem)->iterator();
+ TQLayoutIterator it = static_cast<TQLayout*>(layoutItem)->iterator();
for (TQLayoutItem *itm = it.current(); itm; itm = ++it)
delete itm->widget();
delete layoutItem;
@@ -611,8 +613,8 @@ KWinbindGreeter::slotStartDomainList()
mDomainListing.clear();
m_domainLister = new KProcIO;
- connect(m_domainLister, TQT_SIGNAL(readReady(KProcIO*)), TQT_SLOT(slotReadDomainList()));
- connect(m_domainLister, TQT_SIGNAL(processExited(TDEProcess*)), TQT_SLOT(slotEndDomainList()));
+ connect(m_domainLister, TQ_SIGNAL(readReady(KProcIO*)), TQ_SLOT(slotReadDomainList()));
+ connect(m_domainLister, TQ_SIGNAL(processExited(TDEProcess*)), TQ_SLOT(slotEndDomainList()));
(*m_domainLister) << "wbinfo" << "--own-domain" << "--trusted-domains";
m_domainLister->setComm (TDEProcess::Stdout);
diff --git a/tdmlib/kgreet_winbind.h b/tdmlib/kgreet_winbind.h
index 85565628e..7bd8e59e6 100644
--- a/tdmlib/kgreet_winbind.h
+++ b/tdmlib/kgreet_winbind.h
@@ -41,7 +41,7 @@ class KdmThemer;
class KProcIO;
class KWinbindGreeter : public TQObject, public KGreeterPlugin {
- Q_OBJECT
+ TQ_OBJECT
public:
KWinbindGreeter( KGreeterPluginHandler *handler,
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-20 02:02:35 +0000