← Back to branch summary

~ubuntu-branches/ubuntu/maverick/kdebase-workspace/maverick-proposed

« back to all changes in this revision

Viewing changes to plasma/desktop/shell/activity.h

  • Committer: Bazaar Package Importer
  • Author(s): Alessandro Ghersi
  • Date: 2010-07-08 01:11:52 UTC
  • mfrom: (1.1.43 upstream)
  • Revision ID: james.westby@ubuntu.com-20100708011152-z0h26httnjr91mmy
Tags: 4:4.4.92-0ubuntu1
* New upstream rc release:
  - Bump kde-sc-dev-latest to 4.4.92
  - Refresh patches
  - Update symbols
  - plasma-widgets-workspace replaces/conflicts plasma-widget-logout

Show diffs side-by-side

added added

removed removed

Lines of Context:
plasma/desktop/shell/activity.h
110
110
     */
111
111
    void open();
112
112
 
 
113
    /**
 
114
     * forcibly insert a containment, replacing the one on its screen/desktop
 
115
     */
 
116
    void replaceContainment(Plasma::Containment* containment);
 
117
 
113
118
private slots:
114
119
    void updateActivityName(Plasma::Context *context);
 
120
    void containmentDestroyed(QObject *object);
115
121
 
116
122
private:
117
123
    void activateContainment(int screen, int desktop);
118
 
    void insertContainment(Plasma::Containment* cont);
 
124
    void insertContainment(Plasma::Containment* cont, bool force=false);
119
125
    void insertContainment(Plasma::Containment* containment, int screen, int desktop);
120
126
    Plasma::Containment* addContainment(int screen, int desktop);
121
127