Ignore:
Timestamp:
May 5, 2011, 5:36:53 AM (14 years ago)
Author:
Dmitry A. Kuminov
Message:

trunk: Merged in qt 4.7.2 sources from branches/vendor/nokia/qt.

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk

  • trunk/tools/qdbus/qdbusviewer/qdbusviewer.h

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)
     
    5353{
    5454    QString mService, mPath, mInterface, mName;
     55    QString mTypeSig;
    5556};
    5657
     
    6667
    6768private slots:
    68     void serviceChanged(QTreeWidgetItem *item);
     69    void serviceChanged(const QModelIndex &index);
    6970    void showContextMenu(const QPoint &);
    7071    void connectionRequested(const BusSignature &sig);
     
    9293    QAction *refreshAction;
    9394    QTreeWidget *services;
     95    QStringListModel *servicesModel;
     96    QSortFilterProxyModel *servicesFilterModel;
     97    QLineEdit *serviceFilterLine;
     98    QListView *servicesView;
    9499    QTextBrowser *log;
    95100    QRegExp objectPathRegExp;
Note: See TracChangeset for help on using the changeset viewer.