diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-01-03 20:16:47 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-01-03 20:16:47 +0000 |
| commit | 495d08bc2db58ee7fc4ea55a7158f2f61b82fc56 (patch) | |
| tree | daabcb652c07b9a17cad88ca50b63a2d91ead4a3 /kdm/backend/dm.h | |
| parent | 50001f1757f97510e80cb1990e2f2d5b00144c2a (diff) | |
| download | tdebase-495d08bc2db58ee7fc4ea55a7158f2f61b82fc56.tar.gz tdebase-495d08bc2db58ee7fc4ea55a7158f2f61b82fc56.zip | |
Automated conversion for enhanced compatibility with TQt for Qt4 3.4.0 TP1
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1211357 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kdm/backend/dm.h')
| -rw-r--r-- | kdm/backend/dm.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/kdm/backend/dm.h b/kdm/backend/dm.h index c05d4c865..f73f68e10 100644 --- a/kdm/backend/dm.h +++ b/kdm/backend/dm.h @@ -181,11 +181,11 @@ typedef struct GProc { int pid; } GProc; -typedef enum displayStatus { notRunning = 0, running, zombie, phoenix, raiser, - textMode, reserve, remoteLogin } DisplayStatus; +typedef enum displaytqStatus { notRunning = 0, running, zombie, phoenix, raiser, + textMode, reserve, remoteLogin } DisplaytqStatus; -typedef enum serverStatus { ignore = 0, awaiting, starting, - terminated, killed, pausing } ServerStatus; +typedef enum servertqStatus { ignore = 0, awaiting, starting, + terminated, killed, pausing } ServertqStatus; typedef struct RcStr { struct RcStr *next; @@ -241,7 +241,7 @@ struct display { CfgArr cfg; /* config data array */ /* display state */ - DisplayStatus status; /* current status */ + DisplaytqStatus status; /* current status */ int zstatus; /* substatus while zombie */ int pid; /* process id of child */ int serverPid; /* process id of server (-1 if none) */ @@ -249,7 +249,7 @@ struct display { int serverVT; /* server VT (0 = none, -1 = pending) */ struct display *follower; /* on exit, hand VT to this display */ #endif - ServerStatus serverStatus; /* X server startup state */ + ServertqStatus servertqStatus; /* X server startup state */ Time_t lastStart; /* time of last display start */ int startTries; /* current start try */ int stillThere; /* state during HUP processing */ |