Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdebase

12 files changed, 56 insertions, 56 deletions

diff --git a/kfind/kfindpart.h b/kfind/kfindpart.h
index 47d75a53c..19bdb73be 100644
--- a/kfind/kfindpart.h
+++ b/kfind/kfindpart.h
@@ -42,7 +42,7 @@ class KFindPart : public KonqDirPart//KParts::ReadOnlyPart
 {
   friend class KFindPartBrowserExtension;
     Q_OBJECT
-    Q_PROPERTY( bool showsResult READ showsResult )
+    TQ_PROPERTY( bool showsResult READ showsResult )
 public:
     KFindPart( TQWidget * parentWidget, const char *widgetName, 
 	       TQObject *parent, const char *name, const TQStringList & /*args*/ );
diff --git a/khotkeys/shared/khlistbox.h b/khotkeys/shared/khlistbox.h
index ad2cdb3b6..9ffe9d42e 100644
--- a/khotkeys/shared/khlistbox.h
+++ b/khotkeys/shared/khlistbox.h
@@ -22,7 +22,7 @@ class KHListBox
     : public TQListBox
     {
     Q_OBJECT
-    Q_PROPERTY( bool forceSelect READ forceSelect WRITE setForceSelect )
+    TQ_PROPERTY( bool forceSelect READ forceSelect WRITE setForceSelect )
     public:
         KHListBox( TQWidget* parent_P, const char* name_P = NULL );
         virtual void clear();
diff --git a/khotkeys/shared/khlistview.h b/khotkeys/shared/khlistview.h
index c475b2d6c..0a0118a63 100644
--- a/khotkeys/shared/khlistview.h
+++ b/khotkeys/shared/khlistview.h
@@ -23,7 +23,7 @@ class KDE_EXPORT KHListView
     : public KListView
     {
     Q_OBJECT
-    Q_PROPERTY( bool forceSelect READ forceSelect WRITE setForceSelect )
+    TQ_PROPERTY( bool forceSelect READ forceSelect WRITE setForceSelect )
     public:
         KHListView( TQWidget* parent_P, const char* name_P = NULL );
         virtual void clear();
diff --git a/kicker/extensions/kasbar/kasbar.h b/kicker/extensions/kasbar/kasbar.h
index 342da3743..d875dd00f 100644
--- a/kicker/extensions/kasbar/kasbar.h
+++ b/kicker/extensions/kasbar/kasbar.h
@@ -80,12 +80,12 @@ typedef TQPtrList<KasItem> KasItemList;
 class KDE_EXPORT KasBar : public TQWidget
 {
    Q_OBJECT
-   Q_PROPERTY( int maxBoxes READ maxBoxes )
-   Q_PROPERTY( uint boxesPerLine READ boxesPerLine )
-   Q_PROPERTY( Direction direction READ direction )
-   Q_PROPERTY( Orientation orientation READ orientation )
-   Q_PROPERTY( bool masked READ isMasked )
-   Q_ENUMS( Direction )
+   TQ_PROPERTY( int maxBoxes READ maxBoxes )
+   TQ_PROPERTY( uint boxesPerLine READ boxesPerLine )
+   TQ_PROPERTY( Direction direction READ direction )
+   TQ_PROPERTY( Orientation orientation READ orientation )
+   TQ_PROPERTY( bool masked READ isMasked )
+   TQ_ENUMS( Direction )
 
    friend class KasItem;
 public:
diff --git a/kicker/extensions/kasbar/kastasker.h b/kicker/extensions/kasbar/kastasker.h
index d3491ba98..015d9fb37 100644
--- a/kicker/extensions/kasbar/kastasker.h
+++ b/kicker/extensions/kasbar/kastasker.h
@@ -85,9 +85,9 @@ class KasGrouper;
 class KDE_EXPORT KasTasker : public KasBar
 {
     Q_OBJECT
-    Q_PROPERTY( bool isTopLevel READ isTopLevel )
-    Q_PROPERTY( bool showClock READ showClock )
-    Q_PROPERTY( bool showLoad READ showLoad )
+    TQ_PROPERTY( bool isTopLevel READ isTopLevel )
+    TQ_PROPERTY( bool showClock READ showClock )
+    TQ_PROPERTY( bool showLoad READ showLoad )
 
 public:
     /** Create a KasTasker widget. */
diff --git a/kicker/kicker/ui/k_new_mnu.h b/kicker/kicker/ui/k_new_mnu.h
index ef45ef815..8a9970789 100644
--- a/kicker/kicker/ui/k_new_mnu.h
+++ b/kicker/kicker/ui/k_new_mnu.h
@@ -81,7 +81,7 @@ enum OverflowCategoryState { None, Filling, NotNeeded };
 class KMenu : public KMenuBase
 {
     Q_OBJECT
-    Q_PROPERTY (bool KStyleMenuDropShadow READ useKStyleMenuDropShadow )
+    TQ_PROPERTY (bool KStyleMenuDropShadow READ useKStyleMenuDropShadow )
 
 public:
     KMenu();
diff --git a/kicker/taskmanager/taskmanager.h b/kicker/taskmanager/taskmanager.h
index febb923e2..b78764331 100644
--- a/kicker/taskmanager/taskmanager.h
+++ b/kicker/taskmanager/taskmanager.h
@@ -71,28 +71,28 @@ typedef TQValueList<WId> WindowList;
 class KDE_EXPORT Task: public TQObject, public KShared
 {
     Q_OBJECT
-    Q_PROPERTY( TQString visibleIconicName READ visibleIconicName )
-    Q_PROPERTY( TQString iconicName READ iconicName )
-    Q_PROPERTY( TQString visibleIconicNameWithState READ visibleIconicNameWithState )
-    Q_PROPERTY( TQString visibleName READ visibleName )
-    Q_PROPERTY( TQString name READ name )
-    Q_PROPERTY( TQString visibleNameWithState READ visibleNameWithState )
-    Q_PROPERTY( TQPixmap pixmap READ pixmap )
-    Q_PROPERTY( bool maximized READ isMaximized )
-    Q_PROPERTY( bool minimized READ isMinimized )
+    TQ_PROPERTY( TQString visibleIconicName READ visibleIconicName )
+    TQ_PROPERTY( TQString iconicName READ iconicName )
+    TQ_PROPERTY( TQString visibleIconicNameWithState READ visibleIconicNameWithState )
+    TQ_PROPERTY( TQString visibleName READ visibleName )
+    TQ_PROPERTY( TQString name READ name )
+    TQ_PROPERTY( TQString visibleNameWithState READ visibleNameWithState )
+    TQ_PROPERTY( TQPixmap pixmap READ pixmap )
+    TQ_PROPERTY( bool maximized READ isMaximized )
+    TQ_PROPERTY( bool minimized READ isMinimized )
     // KDE4 deprecated
-    Q_PROPERTY( bool iconified READ isIconified )
-    Q_PROPERTY( bool shaded READ isShaded WRITE setShaded )
-    Q_PROPERTY( bool active READ isActive )
-    Q_PROPERTY( bool onCurrentDesktop READ isOnCurrentDesktop )
-    Q_PROPERTY( bool onAllDesktops READ isOnAllDesktops )
-    Q_PROPERTY( bool alwaysOnTop READ isAlwaysOnTop WRITE setAlwaysOnTop )
-    Q_PROPERTY( bool modified READ isModified )
-    Q_PROPERTY( bool demandsAttention READ demandsAttention )
-    Q_PROPERTY( int desktop READ desktop )
-    Q_PROPERTY( double thumbnailSize READ thumbnailSize WRITE setThumbnailSize )
-    Q_PROPERTY( bool hasThumbnail READ hasThumbnail )
-    Q_PROPERTY( TQPixmap thumbnail READ thumbnail )
+    TQ_PROPERTY( bool iconified READ isIconified )
+    TQ_PROPERTY( bool shaded READ isShaded WRITE setShaded )
+    TQ_PROPERTY( bool active READ isActive )
+    TQ_PROPERTY( bool onCurrentDesktop READ isOnCurrentDesktop )
+    TQ_PROPERTY( bool onAllDesktops READ isOnAllDesktops )
+    TQ_PROPERTY( bool alwaysOnTop READ isAlwaysOnTop WRITE setAlwaysOnTop )
+    TQ_PROPERTY( bool modified READ isModified )
+    TQ_PROPERTY( bool demandsAttention READ demandsAttention )
+    TQ_PROPERTY( int desktop READ desktop )
+    TQ_PROPERTY( double thumbnailSize READ thumbnailSize WRITE setThumbnailSize )
+    TQ_PROPERTY( bool hasThumbnail READ hasThumbnail )
+    TQ_PROPERTY( TQPixmap thumbnail READ thumbnail )
 
 public:
     typedef KSharedPtr<Task> Ptr;
@@ -514,9 +514,9 @@ public:
 class KDE_EXPORT Startup: public TQObject, public KShared
 {
     Q_OBJECT
-    Q_PROPERTY( TQString text READ text )
-    Q_PROPERTY( TQString bin READ bin )
-    Q_PROPERTY( TQString icon READ icon )
+    TQ_PROPERTY( TQString text READ text )
+    TQ_PROPERTY( TQString bin READ bin )
+    TQ_PROPERTY( TQString icon READ icon )
 
 public:
     typedef KSharedPtr<Startup> Ptr;
@@ -568,8 +568,8 @@ private:
 class KDE_EXPORT TaskManager : public TQObject
 {
     Q_OBJECT
-    Q_PROPERTY( int currentDesktop READ currentDesktop )
-    Q_PROPERTY( int numberOfDesktops READ numberOfDesktops )
+    TQ_PROPERTY( int currentDesktop READ currentDesktop )
+    TQ_PROPERTY( int numberOfDesktops READ numberOfDesktops )
 
 public:
     static TaskManager* the();
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();
diff --git a/libkonq/konq_iconviewwidget.h b/libkonq/konq_iconviewwidget.h
index 04db9029a..85d743782 100644
--- a/libkonq/konq_iconviewwidget.h
+++ b/libkonq/konq_iconviewwidget.h
@@ -42,10 +42,10 @@ namespace KIO { class Job; }
 class LIBKONQ_EXPORT KonqIconViewWidget : public KIconView
 {
     Q_OBJECT
-    Q_PROPERTY( bool sortDirectoriesFirst READ sortDirectoriesFirst WRITE setSortDirectoriesFirst )
-    Q_PROPERTY( TQRect iconArea READ iconArea WRITE setIconArea )
-    Q_PROPERTY( int lineupMode READ lineupMode WRITE setLineupMode )
-    Q_PROPERTY( TQString url READ urlString WRITE setNewURL )
+    TQ_PROPERTY( bool sortDirectoriesFirst READ sortDirectoriesFirst WRITE setSortDirectoriesFirst )
+    TQ_PROPERTY( TQRect iconArea READ iconArea WRITE setIconArea )
+    TQ_PROPERTY( int lineupMode READ lineupMode WRITE setLineupMode )
+    TQ_PROPERTY( TQString url READ urlString WRITE setNewURL )
 
     friend class KFileIVI;