← Back to branch summary

~lightdm-team/lightdm/1.4

« back to all changes in this revision

Viewing changes to greeters/qt/greeter.cpp

  • Committer: David Edmundson
  • Date: 2011-05-21 19:47:27 UTC
  • mfrom: (458.1.7 fix_namespace)
  • Revision ID: david@davidedmundson.co.uk-20110521194727-c3wmqlx2n4wjdiqb
Merge branch that puts Qt LightDM into a namespace, removes possibility of file clash. 

Show diffs side-by-side

added added

removed removed

Lines of Context:
greeters/qt/greeter.cpp
4
4
#include <QApplication>
5
5
#include <QDesktopWidget>
6
6
 
7
 
#include <LdmGreeter>
 
7
#include <QLightDM/Greeter>
8
8
 
9
9
#include "loginprompt.h"
10
10
#include "panel.h"
11
11
 
12
 
 
13
12
Greeter::Greeter() :
14
13
    QWidget(0)
15
14
{
21
20
    //TODO load this from the config file in order to test that works.
22
21
    background->setPixmap(QPixmap("/usr/share/wallpapers/Horos/contents/images/1920x1200.png"));
23
22
 
24
 
    LdmGreeter* greeter = new LdmGreeter(this);
 
23
    QLightDM::Greeter* greeter = new QLightDM::Greeter(this);
25
24
    greeter->connectToServer();
26
25
 
27
26
    LoginPrompt* loginPrompt = new LoginPrompt(greeter, this);