diff options
| author | Darrell Anderson <humanreadable@yahoo.com> | 2012-10-21 13:11:21 -0500 |
|---|---|---|
| committer | Darrell Anderson <humanreadable@yahoo.com> | 2012-10-21 13:11:21 -0500 |
| commit | 7bdcf7b7a990e5024a865d801cd16df9d6e8a3e2 (patch) | |
| tree | 713b8b19d0bff547fb7a12d8f36b7ab5e48bbbd2 /kparts | |
| parent | 5d9a593c1fe4967f3636524cbef739d80b0d8cae (diff) | |
| parent | fe43761567120b0bda4e0aed56b7c1e56bdd93c5 (diff) | |
| download | tdelibs-7bdcf7b7a990e5024a865d801cd16df9d6e8a3e2.tar.gz tdelibs-7bdcf7b7a990e5024a865d801cd16df9d6e8a3e2.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdelibs
Diffstat (limited to 'kparts')
| -rw-r--r-- | kparts/browserextension.h | 2 | ||||
| -rw-r--r-- | kparts/browserinterface.h | 2 | ||||
| -rw-r--r-- | kparts/partmanager.h | 8 |
3 files changed, 6 insertions, 6 deletions
diff --git a/kparts/browserextension.h b/kparts/browserextension.h index 17bf9d65e..bc5e9cc92 100644 --- a/kparts/browserextension.h +++ b/kparts/browserextension.h @@ -308,7 +308,7 @@ class BrowserExtensionPrivate; class KPARTS_EXPORT BrowserExtension : public TQObject { Q_OBJECT - Q_PROPERTY( bool urlDropHandling READ isURLDropHandlingEnabled WRITE setURLDropHandlingEnabled ) + TQ_PROPERTY( bool urlDropHandling READ isURLDropHandlingEnabled WRITE setURLDropHandlingEnabled ) public: /** * Constructor diff --git a/kparts/browserinterface.h b/kparts/browserinterface.h index 302f474d7..82521376f 100644 --- a/kparts/browserinterface.h +++ b/kparts/browserinterface.h @@ -26,7 +26,7 @@ namespace KParts * * Qt properties: * <code> - * Q_PROPERTY( uint historyLength READ historyLength ); + * TQ_PROPERTY( uint historyLength READ historyLength ); * </code> * * Callable methods: diff --git a/kparts/partmanager.h b/kparts/partmanager.h index ba5c726cc..33c13d3ed 100644 --- a/kparts/partmanager.h +++ b/kparts/partmanager.h @@ -50,10 +50,10 @@ class PartManagerPrivate; class KPARTS_EXPORT PartManager : public TQObject { Q_OBJECT - Q_ENUMS( SelectionPolicy ) - Q_PROPERTY( SelectionPolicy selectionPolicy READ selectionPolicy WRITE setSelectionPolicy ) - Q_PROPERTY( bool allowNestedParts READ allowNestedParts WRITE setAllowNestedParts ) - Q_PROPERTY( bool ignoreScrollBars READ ignoreScrollBars WRITE setIgnoreScrollBars ) + TQ_ENUMS( SelectionPolicy ) + TQ_PROPERTY( SelectionPolicy selectionPolicy READ selectionPolicy WRITE setSelectionPolicy ) + TQ_PROPERTY( bool allowNestedParts READ allowNestedParts WRITE setAllowNestedParts ) + TQ_PROPERTY( bool ignoreScrollBars READ ignoreScrollBars WRITE setIgnoreScrollBars ) public: /// Selection policy. The default policy of a PartManager is Direct. enum SelectionPolicy { Direct, TriState }; |