diff options
| author | Darrell Anderson <humanreadable@yahoo.com> | 2012-10-21 12:12:52 -0500 |
|---|---|---|
| committer | Darrell Anderson <humanreadable@yahoo.com> | 2012-10-21 12:12:52 -0500 |
| commit | 5e808dd67e4b481f1acccab7fff0795831545ecb (patch) | |
| tree | 45815e7283abe4a8bce1d4bc2abd8ebbc2d6564c /konqueror | |
| parent | 684544c4d155feedcc6d90e3e96b0f380aef6ff7 (diff) | |
| parent | 03e5e287213a5f14821cfb13dfb536d8325e6645 (diff) | |
| download | tdebase-5e808dd67e4b481f1acccab7fff0795831545ecb.tar.gz tdebase-5e808dd67e4b481f1acccab7fff0795831545ecb.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdebase
Diffstat (limited to 'konqueror')
| -rw-r--r-- | konqueror/iconview/konq_iconview.h | 4 | ||||
| -rw-r--r-- | konqueror/konq_browseriface.h | 2 | ||||
| -rw-r--r-- | konqueror/konq_mainwindow.h | 18 | ||||
| -rw-r--r-- | konqueror/listview/konq_listview.h | 2 |
4 files changed, 13 insertions, 13 deletions
diff --git a/konqueror/iconview/konq_iconview.h b/konqueror/iconview/konq_iconview.h index 517734182..107c83ca3 100644 --- a/konqueror/iconview/konq_iconview.h +++ b/konqueror/iconview/konq_iconview.h @@ -45,8 +45,8 @@ class KonqKfmIconView : public KonqDirPart { friend class IconViewBrowserExtension; // to access m_pProps Q_OBJECT - Q_PROPERTY( bool supportsUndo READ supportsUndo ) - Q_PROPERTY( TQString viewMode READ viewMode WRITE setViewMode ) + TQ_PROPERTY( bool supportsUndo READ supportsUndo ) + TQ_PROPERTY( TQString viewMode READ viewMode WRITE setViewMode ) public: enum SortCriterion { NameCaseSensitive, NameCaseInsensitive, Size, Type, Date }; diff --git a/konqueror/konq_browseriface.h b/konqueror/konq_browseriface.h index 57f2fc05b..e21d0a9ec 100644 --- a/konqueror/konq_browseriface.h +++ b/konqueror/konq_browseriface.h @@ -8,7 +8,7 @@ class KonqView; class KonqBrowserInterface : public KParts::BrowserInterface { Q_OBJECT - Q_PROPERTY( uint historyLength READ historyLength ) + TQ_PROPERTY( uint historyLength READ historyLength ) public: KonqBrowserInterface( KonqView *view, const char *name ); diff --git a/konqueror/konq_mainwindow.h b/konqueror/konq_mainwindow.h index 12e7d8df4..ac73c3670 100644 --- a/konqueror/konq_mainwindow.h +++ b/konqueror/konq_mainwindow.h @@ -88,15 +88,15 @@ class KonqExtendedBookmarkOwner; class KonqMainWindow : public KParts::MainWindow, public KonqFrameContainerBase { Q_OBJECT - Q_PROPERTY( int viewCount READ viewCount ) - Q_PROPERTY( int activeViewsCount READ activeViewsCount ) - Q_PROPERTY( int linkableViewsCount READ linkableViewsCount ) - Q_PROPERTY( TQString locationBarURL READ locationBarURL ) - Q_PROPERTY( bool fullScreenMode READ fullScreenMode ) - Q_PROPERTY( TQString currentTitle READ currentTitle ) - Q_PROPERTY( TQString currentURL READ currentURL ) - Q_PROPERTY( bool isHTMLAllowed READ isHTMLAllowed ) - Q_PROPERTY( TQString currentProfile READ currentProfile ) + TQ_PROPERTY( int viewCount READ viewCount ) + TQ_PROPERTY( int activeViewsCount READ activeViewsCount ) + TQ_PROPERTY( int linkableViewsCount READ linkableViewsCount ) + TQ_PROPERTY( TQString locationBarURL READ locationBarURL ) + TQ_PROPERTY( bool fullScreenMode READ fullScreenMode ) + TQ_PROPERTY( TQString currentTitle READ currentTitle ) + TQ_PROPERTY( TQString currentURL READ currentURL ) + TQ_PROPERTY( bool isHTMLAllowed READ isHTMLAllowed ) + TQ_PROPERTY( TQString currentProfile READ currentProfile ) public: enum ComboAction { ComboClear, ComboAdd, ComboRemove }; enum PageSecurity { NotCrypted, Encrypted, Mixed }; diff --git a/konqueror/listview/konq_listview.h b/konqueror/listview/konq_listview.h index 8665160d3..a6dc8450e 100644 --- a/konqueror/listview/konq_listview.h +++ b/konqueror/listview/konq_listview.h @@ -63,7 +63,7 @@ class KonqListView : public KonqDirPart { friend class KonqBaseListViewWidget; Q_OBJECT - Q_PROPERTY( bool supportsUndo READ supportsUndo ) + TQ_PROPERTY( bool supportsUndo READ supportsUndo ) public: KonqListView( TQWidget *parentWidget, TQObject *parent, const char *name, const TQString& mode ); virtual ~KonqListView(); |