Fix the most egregious style guide violations in the remaining kdesktop_lock source files

No functional changes were made to the source
pull/2/head
Timothy Pearson 9 years ago
parent b5462e86f3
commit e89d9e5e16

@ -1,6 +1,6 @@
//=========================================================================== //===========================================================================
// //
// This file is part of the KDE project // This file is part of the TDE project
// //
// Copyright (c) 2004 Chris Howells <howells@kde.org> // Copyright (c) 2004 Chris Howells <howells@kde.org>
@ -42,10 +42,12 @@ AutoLogout::AutoLogout(LockProcess *parent) : TQDialog(parent, "password dialog"
setCaption(i18n("Automatic Logout Notification")); setCaption(i18n("Automatic Logout Notification"));
frame = new TQFrame(this); frame = new TQFrame(this);
if (trinity_desktop_lock_use_system_modal_dialogs) if (trinity_desktop_lock_use_system_modal_dialogs) {
frame->setFrameStyle( TQFrame::NoFrame ); frame->setFrameStyle( TQFrame::NoFrame );
else }
else {
frame->setFrameStyle(TQFrame::Panel | TQFrame::Raised); frame->setFrameStyle(TQFrame::Panel | TQFrame::Raised);
}
frame->setLineWidth(2); frame->setLineWidth(2);
TQLabel *pixLabel = new TQLabel( frame, "pixlabel" ); TQLabel *pixLabel = new TQLabel( frame, "pixlabel" );
@ -101,12 +103,10 @@ void AutoLogout::updateInfo(int timeout)
void AutoLogout::timerEvent(TQTimerEvent *ev) void AutoLogout::timerEvent(TQTimerEvent *ev)
{ {
if (ev->timerId() == mCountdownTimerId) if (ev->timerId() == mCountdownTimerId) {
{
updateInfo(mRemaining); updateInfo(mRemaining);
--mRemaining; --mRemaining;
if (mRemaining < 0) if (mRemaining < 0) {
{
logout(); logout();
} }
} }

@ -1,6 +1,6 @@
//=========================================================================== //===========================================================================
// //
// This file is part of the KDE project // This file is part of the TDE project
// //
// Copyright (c) 1999 Martin R. Jones <mjones@kde.org> // Copyright (c) 1999 Martin R. Jones <mjones@kde.org>
// Copyright (c) 2003 Oswald Buddenhagen <ossi@kde.org> // Copyright (c) 2003 Oswald Buddenhagen <ossi@kde.org>
@ -24,18 +24,18 @@ class AutoLogout : public TQDialog
{ {
Q_OBJECT Q_OBJECT
public: public:
AutoLogout(LockProcess *parent); AutoLogout(LockProcess *parent);
~AutoLogout(); ~AutoLogout();
virtual void show(); virtual void show();
protected: protected:
virtual void timerEvent(TQTimerEvent *); virtual void timerEvent(TQTimerEvent *);
private slots: private slots:
void slotActivity(); void slotActivity();
private: private:
void updateInfo(int); void updateInfo(int);
TQFrame *frame; TQFrame *frame;
TQGridLayout *frameLayout; TQGridLayout *frameLayout;

@ -1,7 +1,7 @@
/* This file is part of the KDE project /* This file is part of the TDE project
Copyright (C) 1999 David Faure Copyright (C) 1999 David Faure
Copyright (c) 2003 Oswald Buddenhagen <ossi@kde.org> Copyright (c) 2003 Oswald Buddenhagen <ossi@kde.org>
Copyright (c) 2010-2012 Timothy Pearson <kb9vqf@pearsoncomputing.net> Copyright (c) 2010-2015 Timothy Pearson <kb9vqf@pearsoncomputing.net>
This library is free software; you can redistribute it and/or This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public modify it under the terms of the GNU Library General Public
@ -260,8 +260,7 @@ int main( int argc, char **argv )
int parent_connection = 0; // socket to the parent saver int parent_connection = 0; // socket to the parent saver
TQValueList<int> child_sockets; TQValueList<int> child_sockets;
if (TDEGlobalSettings::isMultiHead()) if (TDEGlobalSettings::isMultiHead()) {
{
Display *dpy = XOpenDisplay(NULL); Display *dpy = XOpenDisplay(NULL);
if (! dpy) { if (! dpy) {
fprintf(stderr, fprintf(stderr,
@ -278,8 +277,9 @@ int main( int argc, char **argv )
kdDebug() << "screen " << number_of_screens << " " << kdesktop_screen_number << " " << display_name << " " << starting_screen << endl; kdDebug() << "screen " << number_of_screens << " " << kdesktop_screen_number << " " << display_name << " " << starting_screen << endl;
dpy = 0; dpy = 0;
if ((pos = display_name.findRev('.')) != -1) if ((pos = display_name.findRev('.')) != -1) {
display_name.remove(pos, 10); display_name.remove(pos, 10);
}
TQCString env; TQCString env;
if (number_of_screens != 1) { if (number_of_screens != 1) {
@ -297,7 +297,8 @@ int main( int argc, char **argv )
// break here because we are the child process, we don't // break here because we are the child process, we don't
// want to fork() anymore // want to fork() anymore
break; break;
} else { }
else {
child_sockets.append(fd[1]); child_sockets.append(fd[1]);
} }
} }

@ -1,4 +1,4 @@
/* This file is part of the KDE project /* This file is part of the TDE project
Copyright (c) 2003 Oswald Buddenhagen <ossi@kde.org> Copyright (c) 2003 Oswald Buddenhagen <ossi@kde.org>
This library is free software; you can redistribute it and/or This library is free software; you can redistribute it and/or
@ -26,15 +26,18 @@
class MyApp : public TDEApplication { class MyApp : public TDEApplication {
Q_OBJECT Q_OBJECT
public: public:
MyApp() : TDEApplication(), lastTick( 0 ) {} MyApp() : TDEApplication(), lastTick( 0 ) {}
MyApp(Display *display, Qt::HANDLE visual = 0, Qt::HANDLE colormap = 0, bool allowStyles=true) : TDEApplication(display, visual, colormap, allowStyles), lastTick( 0 ) {} MyApp(Display *display, Qt::HANDLE visual = 0, Qt::HANDLE colormap = 0, bool allowStyles=true) : TDEApplication(display, visual, colormap, allowStyles), lastTick( 0 ) {}
protected:
protected:
bool x11EventFilter( XEvent * ); bool x11EventFilter( XEvent * );
signals:
signals:
void activity(); void activity();
void mouseInteraction(XEvent *event); void mouseInteraction(XEvent *event);
private:
private:
time_t lastTick; time_t lastTick;
}; };

Loading…
Cancel
Save