← Back to branch summary

~ubuntu-branches/ubuntu/trusty/kvirc/trusty-proposed

« back to all changes in this revision

Viewing changes to src/modules/window/UserWindow.h

  • Committer: Bazaar Package Importer
  • Author(s): Kai Wasserbäch
  • Date: 2011-02-23 13:19:39 UTC
  • mfrom: (14.1.4 sid)
  • Revision ID: james.westby@ubuntu.com-20110223131939-fmb8l4arvgul8hy0
The "Cunning Advisor" release.

* Synced to upstream's SVN revision 5507.
* debian/kvirc-data.preinst: Removed. Upgrades from stable won't need it.
* debian/watch: Replace the "latest" part with "([\d\.]+)" to make us
  independent of the upstream symlink.
* debian/README.Debian:
  - Removed obsolete parts about Python and upgrades from 3.4.
  - Added notice about handling default script issues.
* debian/README.source: Updated for 4.1.1.
* debian/{compat,control,rules}: Updates for debhelper 8.
* debian/patches/10_fix_desktop_entry.patch: Refreshed.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/modules/window/UserWindow.h
33
33
public:
34
34
        enum CreationFlags { HasInput = 1 };
35
35
public:
36
 
        UserWindow(KviMainWindow * pFrm, const char * pcName, int iIcon, KviConsoleWindow * pConsole = 0, int iCreationFlags = 0);
 
36
        UserWindow(KviMainWindow * pFrm, const char * pcName, QString & szIcon, KviConsoleWindow * pConsole = 0, int iCreationFlags = 0);
37
37
        ~UserWindow();
38
38
protected:
39
 
        int m_iIcon;
 
39
        QString m_szIcon;
40
40
protected:
41
41
        virtual void resizeEvent(QResizeEvent *);
42
42
        virtual QPixmap * myIconPtr();