[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: KDE/kdebase/workspace
From: Aaron J. Seigo <aseigo () kde ! org>
Date: 2008-02-19 9:54:41
Message-ID: 1203414881.648030.11280.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 777000 by aseigo:
dmctl.h/cpp -> kdisplaymanager.h/cpp
DM -> KDisplayManager
also add some binary compat protection to the class.
CCMAIL:ossi@kde.org
M +7 -7 krunner/lock/lockdlg.cc
M +3 -3 krunner/lock/lockprocess.cc
M +2 -2 ksmserver/server.cpp
M +2 -2 ksmserver/shutdown.cpp
M +2 -2 ksmserver/shutdowndlg.cpp
M +3 -2 libs/kworkspace/CMakeLists.txt
D libs/kworkspace/dmctl.cpp
D libs/kworkspace/dmctl.h
A libs/kworkspace/kdisplaymanager.cpp libs/kworkspace/dmctl.cpp#776053 \
[License: LGPL (v2+)] A libs/kworkspace/kdisplaymanager.h \
libs/kworkspace/dmctl.h#776053 [License: LGPL (v2+)] M +3 -3 \
plasma/runners/sessions/sessionrunner.cpp M +2 -2 \
plasma/runners/sessions/sessionrunner.h
--- trunk/KDE/kdebase/workspace/krunner/lock/lockdlg.cc #776999:777000
@@ -12,7 +12,7 @@
#include "lockdlg.h"
#include <kcheckpass-enums.h>
-#include <dmctl.h>
+#include <kdisplaymanager.h>
#include <KApplication>
#include <KLocale>
@@ -148,7 +148,7 @@
connect(ok, SIGNAL(clicked()), SLOT(slotOK()));
connect(mNewSessButton, SIGNAL(clicked()), SLOT(slotSwitchUser()));
- if (!DM().isSwitchable() || !KAuthorized::authorizeKAction("switch_user"))
+ if (!KDisplayManager().isSwitchable() || \
!KAuthorized::authorizeKAction("switch_user")) mNewSessButton->hide();
installEventFilter(this);
@@ -489,7 +489,7 @@
void PasswordDlg::slotStartNewSession()
{
if (!KMessageBox::shouldBeShownContinue( ":confirmNewSession" )) {
- DM().startReserve();
+ KDisplayManager().startReserve();
return;
}
@@ -531,7 +531,7 @@
if (ret == KDialog::Yes) {
if (dontAskAgain)
KMessageBox::saveDontShowAgainContinue( ":confirmNewSession" );
- DM().startReserve();
+ KDisplayManager().startReserve();
}
mTimeoutTimerId = startTimer(PASSDLG_HIDE_TIMEOUT);
@@ -554,7 +554,7 @@
void PasswordDlg::slotSwitchUser()
{
int p = 0;
- DM dm;
+ KDisplayManager dm;
QDialog dialog( this, Qt::X11BypassWindowManagerHint );
dialog.setModal( true );
@@ -587,7 +587,7 @@
QString user, loc;
int ns = 0;
for (SessList::ConstIterator it = sess.begin(); it != sess.end(); ++it) {
- DM::sess2Str2( *it, user, loc );
+ KDisplayManager::sess2Str2( *it, user, loc );
itm = new LockListViewItem( lv, user, loc, (*it).vt );
if (!(*it).vt)
itm->setEnabled( false );
@@ -635,7 +635,7 @@
{
LockListViewItem *itm = (LockListViewItem *)lv->currentItem();
if (itm && itm->vt > 0)
- DM().switchVT( itm->vt );
+ KDisplayManager().switchVT( itm->vt );
}
void PasswordDlg::capsLocked()
--- trunk/KDE/kdebase/workspace/krunner/lock/lockprocess.cc #776999:777000
@@ -23,7 +23,7 @@
#include "autologout.h"
#include "kscreensaversettings.h"
-#include <dmctl.h>
+#include <kdisplaymanager.h>
#include <KStandardDirs>
#include <KApplication>
@@ -714,7 +714,7 @@
mVisibility = false;
if (!child_saver) {
if (mLocked)
- DM().setLock( false );
+ KDisplayManager().setLock( false );
ungrabInput();
const char *out = "GOAWAY!";
for (QList<int>::ConstIterator it = child_sockets.begin(); it != \
child_sockets.end(); ++it) @@ -781,7 +781,7 @@
kDebug(1204) << "GreeterPlugin " << *it << " (" << plugin.info->method << ", \
" << plugin.info->name << ") loaded"; greetPlugin = plugin;
mLocked = true;
- DM().setLock( true );
+ KDisplayManager().setLock( true );
return true;
}
cantLock( i18n("No appropriate greeter plugin configured.") );
--- trunk/KDE/kdebase/workspace/ksmserver/server.cpp #776999:777000
@@ -81,7 +81,7 @@
#include <kdebug.h>
-#include <dmctl.h>
+#include <kdisplaymanager.h>
#include <QX11Info>
#include <krandom.h>
#include "klauncher_interface.h"
@@ -712,7 +712,7 @@
signal(SIGTERM, SIG_DFL);
signal(SIGINT, SIG_DFL);
- DM().shutdown( shutdownType, shutdownMode, bootOption );
+ KDisplayManager().shutdown( shutdownType, shutdownMode, bootOption );
}
--- trunk/KDE/kdebase/workspace/ksmserver/shutdown.cpp #776999:777000
@@ -66,7 +66,7 @@
#include <ktemporaryfile.h>
#include <kconfiggroup.h>
#include <knotification.h>
-#include <dmctl.h>
+#include <kdisplaymanager.h>
#include "server.h"
#include "global.h"
#include "client.h"
@@ -118,7 +118,7 @@
(confirm == KWorkSpace::ShutdownConfirmNo) ? true :
!cg.readEntry( "confirmLogout", true );
bool maysd = false;
- if (cg.readEntry( "offerShutdown", true ) && DM().canShutdown())
+ if (cg.readEntry( "offerShutdown", true ) && KDisplayManager().canShutdown())
maysd = true;
if (!maysd) {
if (sdtype != KWorkSpace::ShutdownTypeNone &&
--- trunk/KDE/kdebase/workspace/ksmserver/shutdowndlg.cpp #776999:777000
@@ -53,7 +53,7 @@
#include <stdio.h>
#include <kxerrorhandler.h>
-#include <dmctl.h>
+#include <kdisplaymanager.h>
#include "shutdowndlg.moc"
@@ -465,7 +465,7 @@
btnReboot->setFocus();
int def, cur;
- if ( DM().bootOptions( rebootOptions, def, cur ) ) {
+ if ( KDisplayManager().bootOptions( rebootOptions, def, cur ) ) {
if ( cur == -1 )
cur = def;
--- trunk/KDE/kdebase/workspace/libs/kworkspace/CMakeLists.txt #776999:777000
@@ -1,6 +1,6 @@
-set(kworkspace_LIB_SRCS dmctl.cpp
+set(kworkspace_LIB_SRCS kdisplaymanager.cpp
kworkspace.cpp
kwindowlistmenu.cpp
)
@@ -19,6 +19,7 @@
set_target_properties(kworkspace PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION \
${GENERIC_LIB_SOVERSION} ) install(TARGETS kworkspace DESTINATION \
${LIB_INSTALL_DIR} )
-install( FILES kworkspace.h
+install( FILES kdisplaymanager.h
+ kworkspace.h
kwindowlistmenu.h
DESTINATION ${INCLUDE_INSTALL_DIR}/kworkspace )
--- trunk/KDE/kdebase/workspace/plasma/runners/sessions/sessionrunner.cpp \
#776999:777000 @@ -91,7 +91,7 @@
continue;
}
- QString name = DM::sess2Str(session);
+ QString name = KDisplayManager::sess2Str(session);
Plasma::SearchMatch* action = 0;
if (listAll) {
@@ -127,7 +127,7 @@
SessList sessions;
if (dm.localSessions(sessions)) {
foreach (SessEnt session, sessions) {
- if (sessionName == DM::sess2Str(session)) {
+ if (sessionName == KDisplayManager::sess2Str(session)) {
dm.lockSwitchVT(session.vt);
break;
}
@@ -168,7 +168,7 @@
screensaver.Lock();
}
- DM().startReserve();
+ dm.startReserve();
}
#include "sessionrunner.moc"
--- trunk/KDE/kdebase/workspace/plasma/runners/sessions/sessionrunner.h \
#776999:777000 @@ -19,7 +19,7 @@
#ifndef SESSIONRUNNER_H
#define SESSIONRUNNER_H
-#include <kworkspace/dmctl.h>
+#include <kworkspace/kdisplaymanager.h>
#include <plasma/abstractrunner.h>
class QAction;
@@ -40,7 +40,7 @@
void exec(const Plasma::SearchContext *context, const Plasma::SearchMatch \
*action);
private:
- DM dm;
+ KDisplayManager dm;
};
K_EXPORT_PLASMA_RUNNER(sessions, SessionRunner)
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic