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

« back to all changes in this revision

Viewing changes to src/modules/options/OptionsWidget_servers.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:
190
190
        IrcServerDetailsWidget       * m_pServerDetailsDialog;
191
191
        IrcNetworkDetailsWidget      * m_pNetworkDetailsDialog;
192
192
        KviMexServerImport           * m_pImportFilter;
 
193
        KviBoolSelector              * m_pShowThisDialogAtStartupSelector;
193
194
 
194
195
        QToolButton                  * m_pNewServerButton;
195
196
        QToolButton                  * m_pNewNetworkButton;
203
204
        IrcServerOptionsTreeWidgetItem * findNetItem(const QString &netname);
204
205
        void selectBestServerByUrl(const QString &szUrl);
205
206
protected slots:
 
207
        void slotShowThisDialogAtStartupSelectorDestroyed();
206
208
        void importerDead();
207
209
        void importServer(const KviIrcServer & s,const QString &network);
208
210
        void importPopupAboutToShow();