Browse Source

TQt4 port kdenetwork

This enables compilation under both Qt3 and Qt4


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdenetwork@1237912 283d02a7-25f6-0310-bc7c-ecb5cbfe19
tags/v3.5.13
tpearson 8 years ago
parent
commit
69cac65817
100 changed files with 1711 additions and 1634 deletions
  1. 6
    6
      dcoprss/cache.cpp
  2. 6
    2
      dcoprss/cache.h
  3. 7
    7
      dcoprss/document.cpp
  4. 10
    10
      dcoprss/feedbrowser.cpp
  5. 7
    4
      dcoprss/feedbrowser.h
  6. 3
    3
      dcoprss/query.cpp
  7. 8
    4
      dcoprss/query.h
  8. 52
    20
      dcoprss/rssnewsfeed.h
  9. 1
    1
      dcoprss/service.cpp
  10. 2
    1
      dcoprss/service.h
  11. 6
    6
      dcoprss/xmlrpciface.cpp
  12. 7
    5
      dcoprss/xmlrpciface.h
  13. 2
    2
      filesharing/advanced/kcm_sambaconf/common.cpp
  14. 1
    1
      filesharing/advanced/kcm_sambaconf/dictmanager.cpp
  15. 2
    1
      filesharing/advanced/kcm_sambaconf/dictmanager.h
  16. 18
    18
      filesharing/advanced/kcm_sambaconf/expertuserdlg.ui
  17. 29
    29
      filesharing/advanced/kcm_sambaconf/filemodedlg.ui
  18. 2
    2
      filesharing/advanced/kcm_sambaconf/filemodedlgimpl.cpp
  19. 3
    2
      filesharing/advanced/kcm_sambaconf/filemodedlgimpl.h
  20. 27
    27
      filesharing/advanced/kcm_sambaconf/groupselectdlg.ui
  21. 2
    2
      filesharing/advanced/kcm_sambaconf/groupselectdlg.ui.h
  22. 9
    9
      filesharing/advanced/kcm_sambaconf/hiddenfileview.cpp
  23. 6
    4
      filesharing/advanced/kcm_sambaconf/hiddenfileview.h
  24. 17
    17
      filesharing/advanced/kcm_sambaconf/joindomaindlg.ui
  25. 1
    1
      filesharing/advanced/kcm_sambaconf/joindomaindlg.ui.h
  26. 542
    542
      filesharing/advanced/kcm_sambaconf/kcminterface.ui
  27. 1
    1
      filesharing/advanced/kcm_sambaconf/kcminterface.ui.h
  28. 86
    86
      filesharing/advanced/kcm_sambaconf/kcmprinterdlg.ui
  29. 1
    1
      filesharing/advanced/kcm_sambaconf/kcmprinterdlg.ui.h
  30. 19
    19
      filesharing/advanced/kcm_sambaconf/kcmsambaconf.cpp
  31. 4
    3
      filesharing/advanced/kcm_sambaconf/kcmsambaconf.h
  32. 30
    30
      filesharing/advanced/kcm_sambaconf/konqinterface.ui
  33. 1
    1
      filesharing/advanced/kcm_sambaconf/konqinterface.ui.h
  34. 6
    6
      filesharing/advanced/kcm_sambaconf/linuxpermissionchecker.cpp
  35. 1
    1
      filesharing/advanced/kcm_sambaconf/linuxpermissionchecker.h
  36. 12
    12
      filesharing/advanced/kcm_sambaconf/printerdlgimpl.cpp
  37. 2
    1
      filesharing/advanced/kcm_sambaconf/printerdlgimpl.h
  38. 9
    9
      filesharing/advanced/kcm_sambaconf/qmultichecklistitem.cpp
  39. 5
    4
      filesharing/advanced/kcm_sambaconf/qmultichecklistitem.h
  40. 18
    18
      filesharing/advanced/kcm_sambaconf/sambafile.cpp
  41. 3
    2
      filesharing/advanced/kcm_sambaconf/sambafile.h
  42. 13
    13
      filesharing/advanced/kcm_sambaconf/sambashare.cpp
  43. 1
    1
      filesharing/advanced/kcm_sambaconf/sambashare.h
  44. 229
    229
      filesharing/advanced/kcm_sambaconf/share.ui
  45. 1
    1
      filesharing/advanced/kcm_sambaconf/share.ui.h
  46. 10
    10
      filesharing/advanced/kcm_sambaconf/sharedlgimpl.cpp
  47. 2
    1
      filesharing/advanced/kcm_sambaconf/sharedlgimpl.h
  48. 7
    7
      filesharing/advanced/kcm_sambaconf/smbconfconfigwidget.cpp
  49. 1
    0
      filesharing/advanced/kcm_sambaconf/smbconfconfigwidget.h
  50. 5
    5
      filesharing/advanced/kcm_sambaconf/smbpasswdfile.cpp
  51. 3
    2
      filesharing/advanced/kcm_sambaconf/smbpasswdfile.h
  52. 27
    27
      filesharing/advanced/kcm_sambaconf/socketoptionsdlg.ui
  53. 4
    4
      filesharing/advanced/kcm_sambaconf/socketoptionsdlg.ui.h
  54. 21
    21
      filesharing/advanced/kcm_sambaconf/userselectdlg.ui
  55. 2
    2
      filesharing/advanced/kcm_sambaconf/userselectdlg.ui.h
  56. 20
    20
      filesharing/advanced/kcm_sambaconf/usertab.ui
  57. 1
    1
      filesharing/advanced/kcm_sambaconf/usertab.ui.h
  58. 4
    4
      filesharing/advanced/kcm_sambaconf/usertabimpl.cpp
  59. 2
    1
      filesharing/advanced/kcm_sambaconf/usertabimpl.h
  60. 38
    38
      filesharing/advanced/nfs/hostprops.ui
  61. 1
    1
      filesharing/advanced/nfs/hostprops.ui.h
  62. 5
    5
      filesharing/advanced/nfs/nfsdialog.cpp
  63. 2
    1
      filesharing/advanced/nfs/nfsdialog.h
  64. 9
    9
      filesharing/advanced/nfs/nfsdialoggui.ui
  65. 1
    1
      filesharing/advanced/nfs/nfsdialoggui.ui.h
  66. 8
    8
      filesharing/advanced/nfs/nfsentry.cpp
  67. 1
    1
      filesharing/advanced/nfs/nfsentry.h
  68. 6
    6
      filesharing/advanced/nfs/nfsfile.cpp
  69. 7
    7
      filesharing/advanced/nfs/nfshostdlg.cpp
  70. 2
    1
      filesharing/advanced/nfs/nfshostdlg.h
  71. 7
    7
      filesharing/advanced/propsdlgplugin/propertiespage.cpp
  72. 2
    1
      filesharing/advanced/propsdlgplugin/propertiespage.h
  73. 35
    35
      filesharing/advanced/propsdlgplugin/propertiespagegui.ui
  74. 1
    1
      filesharing/advanced/propsdlgplugin/propertiespagegui.ui.h
  75. 1
    1
      filesharing/advanced/propsdlgplugin/propsdlgshareplugin.cpp
  76. 3
    2
      filesharing/advanced/propsdlgplugin/propsdlgshareplugin.h
  77. 32
    32
      filesharing/simple/controlcenter.ui
  78. 1
    1
      filesharing/simple/controlcenter.ui.h
  79. 13
    13
      filesharing/simple/fileshare.cpp
  80. 4
    2
      filesharing/simple/fileshare.h
  81. 15
    15
      filesharing/simple/groupconfigdlg.cpp
  82. 2
    1
      filesharing/simple/groupconfigdlg.h
  83. 16
    16
      filesharing/simple/groupconfiggui.ui
  84. 1
    1
      filesharing/simple/groupconfiggui.ui.h
  85. 12
    12
      filesharing/simple/krichtextlabel.cpp
  86. 7
    6
      filesharing/simple/krichtextlabel.h
  87. 13
    13
      kdict/actions.cpp
  88. 6
    3
      kdict/actions.h
  89. 16
    16
      kdict/applet/kdictapplet.cpp
  90. 4
    2
      kdict/applet/kdictapplet.h
  91. 1
    0
      kdict/application.h
  92. 32
    32
      kdict/dict.cpp
  93. 2
    1
      kdict/dict.h
  94. 22
    22
      kdict/matchview.cpp
  95. 5
    4
      kdict/matchview.h
  96. 12
    12
      kdict/options.cpp
  97. 6
    5
      kdict/options.h
  98. 26
    26
      kdict/queryview.cpp
  99. 7
    5
      kdict/queryview.h
  100. 0
    0
      kdict/sets.cpp

+ 6
- 6
dcoprss/cache.cpp View File

@@ -35,7 +35,7 @@ bool CacheEntry::isValid() const
35 35
 {
36 36
 	// Cache entries get invalid after on hour. One shouldn't hardcode this
37 37
 	// but for now it'll do.
38
-	return m_timeStamp.secsTo( TQDateTime::currentDateTime() ) < 3600;
38
+	return m_timeStamp.secsTo( TQDateTime::tqcurrentDateTime() ) < 3600;
39 39
 }
40 40
 
41 41
 Cache *Cache::m_instance = 0;
@@ -51,8 +51,8 @@ TQString Cache::getCacheKey( const TQString &server, const TQString &method,
51 51
                             const TQValueList<TQVariant> &args )
52 52
 {
53 53
 	TQString key;
54
-	key = server + TQString::fromLatin1( "__" );
55
-	key += method + TQString::fromLatin1( "__" );
54
+	key = server + TQString::tqfromLatin1( "__" );
55
+	key += method + TQString::tqfromLatin1( "__" );
56 56
 	TQValueList<TQVariant>::ConstIterator it = args.begin();
57 57
 	TQValueList<TQVariant>::ConstIterator end = args.end();
58 58
 	for ( ; it != end; ++it )
@@ -108,16 +108,16 @@ void Cache::save()
108 108
 
109 109
 void Cache::touch( const TQString &key )
110 110
 {
111
-	CacheEntry *entry = find( key );
111
+	CacheEntry *entry = tqfind( key );
112 112
 	if ( !entry )
113 113
 		return;
114
-	entry->m_timeStamp = TQDateTime::currentDateTime();
114
+	entry->m_timeStamp = TQDateTime::tqcurrentDateTime();
115 115
 }
116 116
 
117 117
 void Cache::insert( const TQString &key, const KXMLRPC::Query::Result &result )
118 118
 {
119 119
 	CacheEntry *entry = new CacheEntry;
120
-	entry->m_timeStamp = TQDateTime::currentDateTime();
120
+	entry->m_timeStamp = TQDateTime::tqcurrentDateTime();
121 121
 	entry->m_result = result;
122 122
 	TQDict<CacheEntry>::insert( key, entry );
123 123
 }

+ 6
- 2
dcoprss/cache.h View File

@@ -74,12 +74,16 @@ class Cache : public TQDict<CacheEntry>
74 74
 
75 75
 inline TQDataStream &operator<<( TQDataStream &s, const CacheEntry &e )
76 76
 {
77
-	return s << e.timeStamp() << e.result();
77
+	s << e.timeStamp();
78
+	s << e.result();
79
+	return s;
78 80
 }
79 81
 
80 82
 inline TQDataStream &operator>>( TQDataStream &s, CacheEntry &e )
81 83
 {
82
-	return s >> e.m_timeStamp >> e.m_result;
84
+	s >> e.m_timeStamp;
85
+	s >> e.m_result;
86
+	return s;
83 87
 }
84 88
 
85 89
 #endif // CACHE_H

+ 7
- 7
dcoprss/document.cpp View File

@@ -29,7 +29,7 @@ RSSDocument::RSSDocument(const TQString& url) :
29 29
 	m_pix = TQPixmap();
30 30
 	m_isLoading = false;
31 31
 	m_maxAge = 60;
32
-	m_Timeout = TQDateTime::currentDateTime();
32
+	m_Timeout = TQDateTime::tqcurrentDateTime();
33 33
 	m_state.clear();
34 34
 }
35 35
 
@@ -40,7 +40,7 @@ RSSDocument::~RSSDocument()
40 40
 	delete m_Doc;
41 41
 }
42 42
 
43
-void RSSDocument::loadingComplete(Loader *ldr, Document doc, Status stat)
43
+void RSSDocument::loadingComplete(Loader *ldr, Document doc, tqStatus stat)
44 44
 {
45 45
 
46 46
 
@@ -129,7 +129,7 @@ TQDateTime RSSDocument::lastBuildDate()
129 129
 	if( m_Doc != 0L)
130 130
 		return m_Doc->lastBuildDate();
131 131
 	else
132
-		return TQDateTime::currentDateTime();
132
+		return TQDateTime::tqcurrentDateTime();
133 133
 }
134 134
 
135 135
 TQDateTime RSSDocument::pubDate()
@@ -137,7 +137,7 @@ TQDateTime RSSDocument::pubDate()
137 137
 	if( m_Doc != 0L)
138 138
 		return m_Doc->pubDate();
139 139
 	else
140
-		return TQDateTime::currentDateTime();
140
+		return TQDateTime::tqcurrentDateTime();
141 141
 }
142 142
 
143 143
 TQString RSSDocument::copyright()
@@ -243,14 +243,14 @@ bool RSSDocument::pixmapValid()
243 243
 void RSSDocument::refresh()
244 244
 {
245 245
 	kdDebug() << "Mod time " << m_Timeout.toString() << endl;
246
-	kdDebug() << "Current time " << TQDateTime::currentDateTime().toString() << endl;
246
+	kdDebug() << "Current time " << TQDateTime::tqcurrentDateTime().toString() << endl;
247 247
 
248
-	if(!m_isLoading  && (TQDateTime::currentDateTime() >= m_Timeout))
248
+	if(!m_isLoading  && (TQDateTime::tqcurrentDateTime() >= m_Timeout))
249 249
 	{
250 250
 		kdDebug() << "Document going to refresh" << endl;
251 251
 		m_isLoading = true;
252 252
 		Loader *loader = Loader::create(this,
253
-			TQT_SLOT(loadingComplete(Loader *, Document, Status)));
253
+			TQT_SLOT(loadingComplete(Loader *, Document, tqStatus)));
254 254
 		loader->loadFrom(KURL( m_Url ),  new FileRetriever());
255 255
 		documentUpdating(DCOPRef(this));
256 256
 	}

+ 10
- 10
dcoprss/feedbrowser.cpp View File

@@ -13,15 +13,15 @@
13 13
 #include <tqdatastream.h>
14 14
 #include <tqvbox.h>
15 15
 
16
-CategoryItem::CategoryItem( KListView *parent, const TQString &category )
17
-	: KListViewItem( parent ),
16
+CategoryItem::CategoryItem( KListView *tqparent, const TQString &category )
17
+	: KListViewItem( tqparent ),
18 18
 	m_category( category )
19 19
 {
20 20
 	init();
21 21
 }
22 22
 
23
-CategoryItem::CategoryItem( KListViewItem *parent, const TQString &category )
24
-	: KListViewItem( parent ),
23
+CategoryItem::CategoryItem( KListViewItem *tqparent, const TQString &category )
24
+	: KListViewItem( tqparent ),
25 25
 	m_category( category )
26 26
 {
27 27
 	init();
@@ -32,7 +32,7 @@ void CategoryItem::init()
32 32
 	m_populated = false;
33 33
 	m_dcopIface = 0;
34 34
 
35
-	setText( 0, m_category.mid( m_category.findRev( '/' ) + 1 ).replace( '_', ' ' ) );
35
+	setText( 0, m_category.mid( m_category.tqfindRev( '/' ) + 1 ).tqreplace( '_', ' ' ) );
36 36
 }
37 37
 
38 38
 void CategoryItem::setOpen( bool open )
@@ -66,8 +66,8 @@ void CategoryItem::gotCategories( const TQStringList &categories )
66 66
 		KListViewItem::setOpen( true );
67 67
 }
68 68
 
69
-DCOPRSSIface::DCOPRSSIface( TQObject *parent, const char *name ) :
70
-	TQObject( parent, name ), DCOPObject( "FeedBrowser" )
69
+DCOPRSSIface::DCOPRSSIface( TQObject *tqparent, const char *name ) :
70
+	TQObject( tqparent, name ), DCOPObject( "FeedBrowser" )
71 71
 {
72 72
 	connectDCOPSignal( "rssservice", "RSSQuery", "gotCategories(TQStringList)",
73 73
 	                   "slotGotCategories(TQStringList)", false );
@@ -87,11 +87,11 @@ void DCOPRSSIface::slotGotCategories( const TQStringList &categories )
87 87
 	emit gotCategories( categories );
88 88
 }
89 89
 
90
-FeedBrowserDlg::FeedBrowserDlg( TQWidget *parent, const char *name )
91
-	: KDialogBase( parent, name, true, i18n( "DCOPRSS Feed Browser" ),
90
+FeedBrowserDlg::FeedBrowserDlg( TQWidget *tqparent, const char *name )
91
+	: KDialogBase( tqparent, name, true, i18n( "DCOPRSS Feed Browser" ),
92 92
 	               Close, Close, true )
93 93
 {
94
-	m_dcopIface = new DCOPRSSIface( this, "m_dcopIface" );
94
+	m_dcopIface = new DCOPRSSIface( TQT_TQOBJECT(this), "m_dcopIface" );
95 95
 	connect( m_dcopIface, TQT_SIGNAL( gotCategories( const TQStringList & ) ),
96 96
 	         this, TQT_SLOT( gotTopCategories( const TQStringList & ) ) );
97 97
 

+ 7
- 4
dcoprss/feedbrowser.h View File

@@ -10,8 +10,9 @@ class DCOPRSSIface : public TQObject, public DCOPObject
10 10
 {
11 11
 	K_DCOP
12 12
 	Q_OBJECT
13
+//	TQ_OBJECT
13 14
 	public:
14
-		DCOPRSSIface( TQObject *parent, const char *name = 0 );
15
+		DCOPRSSIface( TQObject *tqparent, const char *name = 0 );
15 16
 
16 17
 	k_dcop:
17 18
 		void slotGotCategories( const TQStringList &categories );
@@ -26,9 +27,10 @@ class DCOPRSSIface : public TQObject, public DCOPObject
26 27
 class CategoryItem : public TQObject, public KListViewItem
27 28
 {
28 29
 	Q_OBJECT
30
+//	TQ_OBJECT
29 31
 	public:
30
-		CategoryItem( KListView *parent, const TQString &category );
31
-		CategoryItem( KListViewItem *parent, const TQString &category );
32
+		CategoryItem( KListView *tqparent, const TQString &category );
33
+		CategoryItem( KListViewItem *tqparent, const TQString &category );
32 34
 
33 35
 		virtual void setOpen( bool open );
34 36
 
@@ -47,9 +49,10 @@ class CategoryItem : public TQObject, public KListViewItem
47 49
 class FeedBrowserDlg : public KDialogBase
48 50
 {
49 51
 	Q_OBJECT
52
+//	TQ_OBJECT
50 53
 	friend class CategoryItem;
51 54
 	public:
52
-		FeedBrowserDlg( TQWidget *parent, const char *name = 0 );
55
+		FeedBrowserDlg( TQWidget *tqparent, const char *name = 0 );
53 56
 
54 57
 	private slots:
55 58
 		void itemSelected( TQListViewItem *item );

+ 3
- 3
dcoprss/query.cpp View File

@@ -58,7 +58,7 @@ void QueryService::cachedCall( const TQString &method,
58 58
 	const TQString cacheKey = Cache::getCacheKey( m_xmlrpcServer->url().url(),
59 59
 	                                             method, args );
60 60
 
61
-	CacheEntry *cacheEntry = Cache::self().find( cacheKey );
61
+	CacheEntry *cacheEntry = Cache::self().tqfind( cacheKey );
62 62
 	if ( cacheEntry != 0 && cacheEntry->isValid() ) {
63 63
 		kdDebug() << "Using cached result." << endl;
64 64
 		SlotCaller::call( this, slot, cacheEntry->result() );
@@ -74,7 +74,7 @@ void QueryService::updateCache( const KXMLRPC::Query::Result &result )
74 74
 	                                             result.method(),
75 75
 	                                             result.args() );
76 76
 
77
-	CacheEntry *cacheEntry = Cache::self().find( cacheKey );
77
+	CacheEntry *cacheEntry = Cache::self().tqfind( cacheKey );
78 78
 	if ( cacheEntry == 0 ) {
79 79
 		kdDebug() << "Inserting returned result into cache." << endl;
80 80
 		Cache::self().insert( cacheKey, result );
@@ -113,7 +113,7 @@ void QueryService::getCategories( const TQString &category )
113 113
 	kdDebug() << "QueryService::getCategories()" << endl;
114 114
 
115 115
 	if ( category == "Top" ) {
116
-		cachedCall( "syndic8.GetCategoryRoots", Server::toVariantList( TQString::fromLatin1( "DMOZ" ) ),
116
+		cachedCall( "syndic8.GetCategoryRoots", Server::toVariantList( TQString::tqfromLatin1( "DMOZ" ) ),
117 117
 		            TQT_SLOT( slotGotCategories( const KXMLRPC::Query::Result & ) ) );
118 118
 	} else {
119 119
 		TQStringList args;

+ 8
- 4
dcoprss/query.h View File

@@ -1,6 +1,6 @@
1 1
 /* $Id$ */
2
-#ifndef _QUERY_SERVICE
3
-#define _QUERY_SERVICE
2
+#ifndef _TQUERY_SERVICE
3
+#define _TQUERY_SERVICE
4 4
 
5 5
 /***************************************************************************
6 6
                           query.h  -  A query interface to select RSS feeds.
@@ -32,12 +32,14 @@
32 32
 class RSSService;
33 33
 
34 34
 /**
35
- * Helper class which just calls the slot given it's QObject/const char*
35
+ * Helper class which just calls the slot given it's TQObject/const char*
36 36
  * representation.
37 37
  */
38
-class SlotCaller : public QObject
38
+class SlotCaller : public TQObject
39 39
 {
40 40
 	Q_OBJECT
41
+//	TQ_OBJECT
42
+
41 43
 	public:
42 44
 		static void call( TQObject *object, const char *slot,
43 45
 		                  const KXMLRPC::Query::Result &value );
@@ -53,6 +55,8 @@ class QueryService : public TQObject, public DCOPObject
53 55
 {
54 56
 	K_DCOP
55 57
 	Q_OBJECT
58
+//	TQ_OBJECT
59
+
56 60
 	public:
57 61
 		QueryService( RSSService *service );
58 62
 

+ 52
- 20
dcoprss/rssnewsfeed.h View File

@@ -82,31 +82,63 @@ class RSSNewsFeed
82 82
 
83 83
 inline TQDataStream &operator<<( TQDataStream &stream, const RSSNewsFeed &feed )
84 84
 {
85
-	return stream << feed.m_id << feed.m_name << feed.m_description
86
-	              << feed.m_origin << feed.m_languageCode << feed.m_status
87
-	              << feed.m_version << feed.m_homePage << feed.m_sourceFile
88
-	              << feed.m_imageUrl << feed.m_webmaster << feed.m_publisher
89
-	              << feed.m_creator << feed.m_dateCreated << feed.m_dateApproved
90
-	              << feed.m_dateXmlChanged << feed.m_fetchable << feed.m_views 
91
-	              << feed.m_headlinesPerDay << feed.m_headlinesRank
92
-	              << feed.m_toolkit << feed.m_toolkitVersion
93
-	              << feed.m_pollingInterval << feed.m_lastPoll
94
-	              << feed.m_categories;
85
+	stream << feed.m_id;
86
+	stream << feed.m_name;
87
+	stream << feed.m_description;
88
+	stream << feed.m_origin;
89
+	stream << feed.m_languageCode;
90
+	stream << feed.m_status;
91
+	stream << feed.m_version;
92
+	stream << feed.m_homePage;
93
+	stream << feed.m_sourceFile;
94
+	stream << feed.m_imageUrl;
95
+	stream << feed.m_webmaster;
96
+	stream << feed.m_publisher;
97
+	stream << feed.m_creator;
98
+	stream << feed.m_dateCreated;
99
+	stream << feed.m_dateApproved;
100
+	stream << feed.m_dateXmlChanged;
101
+	stream << feed.m_fetchable;
102
+	stream << feed.m_views;
103
+	stream << feed.m_headlinesPerDay;
104
+	stream << feed.m_headlinesRank;
105
+	stream << feed.m_toolkit;
106
+	stream << feed.m_toolkitVersion;
107
+	stream << feed.m_pollingInterval;
108
+	stream << feed.m_lastPoll;
109
+	stream << feed.m_categories;
110
+
111
+	return stream;
95 112
 }
96 113
 
97 114
 inline TQDataStream &operator>>( TQDataStream &stream, RSSNewsFeed &feed )
98 115
 {
99 116
 	int i;
100
-	stream >> feed.m_id >> feed.m_name >> feed.m_description
101
-	       >> feed.m_origin >> feed.m_languageCode >> feed.m_status
102
-	       >> feed.m_version >> feed.m_homePage >> feed.m_sourceFile
103
-	       >> feed.m_imageUrl >> feed.m_webmaster >> feed.m_publisher
104
-	       >> feed.m_creator >> feed.m_dateCreated >> feed.m_dateApproved
105
-	       >> feed.m_dateXmlChanged >> i >> feed.m_views 
106
-	       >> feed.m_headlinesPerDay >> feed.m_headlinesRank
107
-	       >> feed.m_toolkit >> feed.m_toolkitVersion
108
-	       >> feed.m_pollingInterval >> feed.m_lastPoll
109
-	       >> feed.m_categories;
117
+	stream >> feed.m_id;
118
+	stream >> feed.m_name;
119
+	stream >> feed.m_description;
120
+	stream >> feed.m_origin;
121
+	stream >> feed.m_languageCode;
122
+	stream >> feed.m_status;
123
+	stream >> feed.m_version;
124
+	stream >> feed.m_homePage;
125
+	stream >> feed.m_sourceFile;
126
+	stream >> feed.m_imageUrl;
127
+	stream >> feed.m_webmaster;
128
+	stream >> feed.m_publisher;
129
+	stream >> feed.m_creator;
130
+	stream >> feed.m_dateCreated;
131
+	stream >> feed.m_dateApproved;
132
+	stream >> feed.m_dateXmlChanged;
133
+	stream >> i;
134
+	stream >> feed.m_views;
135
+	stream >> feed.m_headlinesPerDay;
136
+	stream >> feed.m_headlinesRank;
137
+	stream >> feed.m_toolkit;
138
+	stream >> feed.m_toolkitVersion;
139
+	stream >> feed.m_pollingInterval;
140
+	stream >> feed.m_lastPoll;
141
+	stream >> feed.m_categories;
110 142
 	feed.m_fetchable = i != 0;
111 143
 	return stream;
112 144
 }

+ 1
- 1
dcoprss/service.cpp View File

@@ -45,7 +45,7 @@ TQStringList RSSService::list()
45 45
 
46 46
 DCOPRef RSSService::add(TQString id)
47 47
 {
48
-	if(m_list.find(id) == 0L) { // add a new one only if we need to
48
+	if(m_list.tqfind(id) == 0L) { // add a new one only if we need to
49 49
 		m_list.insert(id, new RSSDocument(id));
50 50
 		added(id);
51 51
 		saveLinks();

+ 2
- 1
dcoprss/service.h View File

@@ -109,6 +109,7 @@ class RSSService : public DCOPObject
109 109
 class RSSDocument :  public TQObject, public DCOPObject
110 110
 {
111 111
 	Q_OBJECT
112
+//	TQ_OBJECT
112 113
 	K_DCOP
113 114
 
114 115
 	private:
@@ -123,7 +124,7 @@ class RSSDocument :  public TQObject, public DCOPObject
123 124
 
124 125
 	private slots:
125 126
 		void pixmapLoaded(const TQPixmap&);
126
-		void loadingComplete(Loader *, Document, Status);
127
+		void loadingComplete(Loader *, Document, tqStatus);
127 128
 
128 129
 	public:
129 130
 		RSSDocument(const TQString& url);

+ 6
- 6
dcoprss/xmlrpciface.cpp View File

@@ -33,9 +33,9 @@
33 33
 
34 34
 using namespace KXMLRPC;
35 35
 
36
-Query *Query::create( TQObject *parent, const char *name )
36
+Query *Query::create( TQObject *tqparent, const char *name )
37 37
 {
38
-	return new Query( parent, name );
38
+	return new Query( tqparent, name );
39 39
 }
40 40
 
41 41
 void Query::call( const TQString &server, const TQString &method,
@@ -255,7 +255,7 @@ TQVariant Query::demarshal( const TQDomElement &elem )
255 255
 		else
256 256
 			return TQVariant( false );
257 257
 	} else if ( typeName == "base64" )
258
-		return TQVariant( KCodecs::base64Decode( typeElement.text().latin1() ) );
258
+		return TQVariant( KCodecs::base64Decode( TQCString(typeElement.text().latin1() )) );
259 259
 	else if ( typeName == "datetime" || typeName == "datetime.iso8601" )
260 260
 		return TQVariant( TQDateTime::fromString( typeElement.text(), Qt::ISODate ) );
261 261
 	else if ( typeName == "array" ) {
@@ -282,7 +282,7 @@ TQVariant Query::demarshal( const TQDomElement &elem )
282 282
 	return TQVariant();
283 283
 }
284 284
 
285
-Query::Query( TQObject *parent, const char *name ) : TQObject( parent, name )
285
+Query::Query( TQObject *tqparent, const char *name ) : TQObject( tqparent, name )
286 286
 {
287 287
 }
288 288
 
@@ -352,8 +352,8 @@ TQValueList<TQVariant> Server::toVariantList( const TQStringList &arg )
352 352
 	return args;
353 353
 }
354 354
 
355
-Server::Server( const KURL &url, TQObject *parent, const char *name )
356
-	: TQObject( parent, name )
355
+Server::Server( const KURL &url, TQObject *tqparent, const char *name )
356
+	: TQObject( tqparent, name )
357 357
 {
358 358
 	if ( url.isValid() )
359 359
 		m_url = url;

+ 7
- 5
dcoprss/xmlrpciface.h View File

@@ -47,9 +47,10 @@ namespace KXMLRPC
47 47
 	class QueryResult;
48 48
 	class Server;
49 49
 
50
-	class Query : public QObject
50
+	class Query : public TQObject
51 51
 	{
52 52
 		Q_OBJECT
53
+  TQ_OBJECT
53 54
 		public:
54 55
 			class Result
55 56
 			{
@@ -76,7 +77,7 @@ namespace KXMLRPC
76 77
 					TQValueList<TQVariant> m_args;
77 78
 			};
78 79
 
79
-			static Query *create( TQObject *parent = 0, const char *name = 0 );
80
+			static Query *create( TQObject *tqparent = 0, const char *name = 0 );
80 81
 			static TQString marshal( const TQVariant &v );
81 82
 			static TQVariant demarshal( const TQDomElement &e );
82 83
 
@@ -104,7 +105,7 @@ namespace KXMLRPC
104 105
 			TQString markupCall( const TQString &method,
105 106
 			                    const TQValueList<TQVariant> &args ) const;
106 107
 
107
-			Query( TQObject *parent = 0, const char *name = 0 );
108
+			Query( TQObject *tqparent = 0, const char *name = 0 );
108 109
 
109 110
 			TQBuffer m_buffer;
110 111
 			TQString m_server;
@@ -112,12 +113,13 @@ namespace KXMLRPC
112 113
 			TQValueList<TQVariant> m_args;
113 114
 	};
114 115
 
115
-	class Server : public QObject
116
+	class Server : public TQObject
116 117
 	{
117 118
 		Q_OBJECT
119
+  TQ_OBJECT
118 120
 		public:
119 121
 			Server( const KURL &url = KURL(),
120
-			        TQObject *parent = 0, const char *name = 0 );
122
+			        TQObject *tqparent = 0, const char *name = 0 );
121 123
 
122 124
 			const KURL &url() const { return m_url; }
123 125
 			void setUrl( const KURL &url );

+ 2
- 2
filesharing/advanced/kcm_sambaconf/common.cpp View File

@@ -2,7 +2,7 @@
2 2
                           common.cpp  -  description
3 3
                              -------------------
4 4
     begin                : Tue June 6 2002
5
-    copyright            : (C) 2002 by Jan Schäfer
5
+    copyright            : (C) 2002 by Jan Sch�fer
6 6
     email                : janschaefer@users.sourceforge.net
7 7
  ***************************************************************************/
8 8
 
@@ -34,7 +34,7 @@
34 34
 
35 35
 void setComboToString(TQComboBox* combo,const TQString & s)
36 36
 {
37
-  int i = combo->listBox()->index(combo->listBox()->findItem(s,Qt::ExactMatch));
37
+  int i = combo->listBox()->index(combo->listBox()->tqfindItem(s,TQt::ExactMatch));
38 38
   combo->setCurrentItem(i);
39 39
 }
40 40
 

+ 1
- 1
filesharing/advanced/kcm_sambaconf/dictmanager.cpp View File

@@ -58,7 +58,7 @@ DictManager::~DictManager() {
58 58
 
59 59
 void DictManager::handleUnsupportedWidget(const TQString & s, TQWidget* w) {
60 60
   w->setEnabled(false);
61
-  TQToolTip::add(w,i18n("The option <em>%1</em> is not supported by your Samba version").arg(s));
61
+  TQToolTip::add(w,i18n("The option <em>%1</em> is not supported by your Samba version").tqarg(s));
62 62
 }
63 63
 
64 64
 void DictManager::add(const TQString & key, TQLineEdit* lineEdit) {

+ 2
- 1
filesharing/advanced/kcm_sambaconf/dictmanager.h View File

@@ -41,9 +41,10 @@ class TQStringList;
41 41
 /**
42 42
  * @author Jan Schäfer
43 43
  **/
44
-class DictManager : public QObject
44
+class DictManager : public TQObject
45 45
 {
46 46
 Q_OBJECT
47
+  TQ_OBJECT
47 48
   public :
48 49
     DictManager(SambaShare *share);
49 50
     virtual ~DictManager();

+ 18
- 18
filesharing/advanced/kcm_sambaconf/expertuserdlg.ui View File

@@ -1,6 +1,6 @@
1 1
 <!DOCTYPE UI><UI version="3.0" stdsetdef="1">
2 2
 <class>ExpertUserDlg</class>
3
-<widget class="QDialog">
3
+<widget class="TQDialog">
4 4
     <property name="name">
5 5
         <cstring>ExpertUserDlg</cstring>
6 6
     </property>
@@ -22,7 +22,7 @@
22 22
         <property name="name">
23 23
             <cstring>unnamed</cstring>
24 24
         </property>
25
-        <widget class="QLabel" row="0" column="0">
25
+        <widget class="TQLabel" row="0" column="0">
26 26
             <property name="name">
27 27
                 <cstring>TextLabel12</cstring>
28 28
             </property>
@@ -41,12 +41,12 @@
41 41
                 <cstring>validUsersEdit</cstring>
42 42
             </property>
43 43
         </widget>
44
-        <widget class="QLineEdit" row="0" column="1">
44
+        <widget class="TQLineEdit" row="0" column="1">
45 45
             <property name="name">
46 46
                 <cstring>validUsersEdit</cstring>
47 47
             </property>
48 48
         </widget>
49
-        <widget class="QLabel" row="3" column="0">
49
+        <widget class="TQLabel" row="3" column="0">
50 50
             <property name="name">
51 51
                 <cstring>TextLabel12_2_2_2</cstring>
52 52
             </property>
@@ -65,12 +65,12 @@
65 65
                 <cstring>adminUsersEdit</cstring>
66 66
             </property>
67 67
         </widget>
68
-        <widget class="QLineEdit" row="3" column="1">
68
+        <widget class="TQLineEdit" row="3" column="1">
69 69
             <property name="name">
70 70
                 <cstring>adminUsersEdit</cstring>
71 71
             </property>
72 72
         </widget>
73
-        <widget class="QLabel" row="4" column="0">
73
+        <widget class="TQLabel" row="4" column="0">
74 74
             <property name="name">
75 75
                 <cstring>TextLabel12_2_2_2_2</cstring>
76 76
             </property>
@@ -89,12 +89,12 @@
89 89
                 <cstring>invalidUsersEdit</cstring>
90 90
             </property>
91 91
         </widget>
92
-        <widget class="QLineEdit" row="4" column="1">
92
+        <widget class="TQLineEdit" row="4" column="1">
93 93
             <property name="name">
94 94
                 <cstring>invalidUsersEdit</cstring>
95 95
             </property>
96 96
         </widget>
97
-        <widget class="QFrame" row="6" column="0" rowspan="1" colspan="2">
97
+        <widget class="TQFrame" row="6" column="0" rowspan="1" colspan="2">
98 98
             <property name="name">
99 99
                 <cstring>frame16</cstring>
100 100
             </property>
@@ -105,7 +105,7 @@
105 105
                 <enum>Raised</enum>
106 106
             </property>
107 107
         </widget>
108
-        <widget class="QLayoutWidget" row="7" column="0" rowspan="1" colspan="2">
108
+        <widget class="TQLayoutWidget" row="7" column="0" rowspan="1" colspan="2">
109 109
             <property name="name">
110 110
                 <cstring>Layout1</cstring>
111 111
             </property>
@@ -129,14 +129,14 @@
129 129
                     <property name="sizeType">
130 130
                         <enum>Expanding</enum>
131 131
                     </property>
132
-                    <property name="sizeHint">
132
+                    <property name="tqsizeHint">
133 133
                         <size>
134 134
                             <width>20</width>
135 135
                             <height>20</height>
136 136
                         </size>
137 137
                     </property>
138 138
                 </spacer>
139
-                <widget class="QPushButton">
139
+                <widget class="TQPushButton">
140 140
                     <property name="name">
141 141
                         <cstring>buttonOk</cstring>
142 142
                     </property>
@@ -153,7 +153,7 @@
153 153
                         <bool>true</bool>
154 154
                     </property>
155 155
                 </widget>
156
-                <widget class="QPushButton">
156
+                <widget class="TQPushButton">
157 157
                     <property name="name">
158 158
                         <cstring>buttonCancel</cstring>
159 159
                     </property>
@@ -179,14 +179,14 @@
179 179
             <property name="sizeType">
180 180
                 <enum>Expanding</enum>
181 181
             </property>
182
-            <property name="sizeHint">
182
+            <property name="tqsizeHint">
183 183
                 <size>
184 184
                     <width>20</width>
185 185
                     <height>40</height>
186 186
                 </size>
187 187
             </property>
188 188
         </spacer>
189
-        <widget class="QLabel" row="2" column="0">
189
+        <widget class="TQLabel" row="2" column="0">
190 190
             <property name="name">
191 191
                 <cstring>TextLabel12_2</cstring>
192 192
             </property>
@@ -205,17 +205,17 @@
205 205
                 <cstring>writeListEdit</cstring>
206 206
             </property>
207 207
         </widget>
208
-        <widget class="QLineEdit" row="2" column="1">
208
+        <widget class="TQLineEdit" row="2" column="1">
209 209
             <property name="name">
210 210
                 <cstring>writeListEdit</cstring>
211 211
             </property>
212 212
         </widget>
213
-        <widget class="QLineEdit" row="1" column="1">
213
+        <widget class="TQLineEdit" row="1" column="1">
214 214
             <property name="name">
215 215
                 <cstring>readListEdit</cstring>
216 216
             </property>
217 217
         </widget>
218
-        <widget class="QLabel" row="1" column="0">
218
+        <widget class="TQLabel" row="1" column="0">
219 219
             <property name="name">
220 220
                 <cstring>TextLabel12_2_2</cstring>
221 221
             </property>
@@ -259,5 +259,5 @@
259 259
     <tabstop>buttonOk</tabstop>
260 260
     <tabstop>buttonCancel</tabstop>
261 261
 </tabstops>
262
-<layoutdefaults spacing="6" margin="11"/>
262
+<tqlayoutdefaults spacing="6" margin="11"/>
263 263
 </UI>

+ 29
- 29
filesharing/advanced/kcm_sambaconf/filemodedlg.ui View File

@@ -1,6 +1,6 @@
1 1
 <!DOCTYPE UI><UI version="3.0" stdsetdef="1">
2 2
 <class>FileModeDlg</class>
3
-<widget class="QDialog">
3
+<widget class="TQDialog">
4 4
     <property name="name">
5 5
         <cstring>FileModeDlg</cstring>
6 6
     </property>
@@ -22,7 +22,7 @@
22 22
         <property name="name">
23 23
             <cstring>unnamed</cstring>
24 24
         </property>
25
-        <widget class="QGroupBox">
25
+        <widget class="TQGroupBox">
26 26
             <property name="name">
27 27
                 <cstring>GroupBox1</cstring>
28 28
             </property>
@@ -67,7 +67,7 @@
67 67
                     <property name="sizeType">
68 68
                         <enum>Expanding</enum>
69 69
                     </property>
70
-                    <property name="sizeHint">
70
+                    <property name="tqsizeHint">
71 71
                         <size>
72 72
                             <width>20</width>
73 73
                             <height>43</height>
@@ -84,14 +84,14 @@
84 84
                     <property name="sizeType">
85 85
                         <enum>Expanding</enum>
86 86
                     </property>
87
-                    <property name="sizeHint">
87
+                    <property name="tqsizeHint">
88 88
                         <size>
89 89
                             <width>70</width>
90 90
                             <height>20</height>
91 91
                         </size>
92 92
                     </property>
93 93
                 </spacer>
94
-                <widget class="QLabel" row="3" column="0">
94
+                <widget class="TQLabel" row="3" column="0">
95 95
                     <property name="name">
96 96
                         <cstring>TextLabel3</cstring>
97 97
                     </property>
@@ -103,7 +103,7 @@
103 103
                         <string>Others</string>
104 104
                     </property>
105 105
                 </widget>
106
-                <widget class="QLabel" row="0" column="1">
106
+                <widget class="TQLabel" row="0" column="1">
107 107
                     <property name="name">
108 108
                         <cstring>TextLabel4</cstring>
109 109
                     </property>
@@ -115,7 +115,7 @@
115 115
                         <string>Read</string>
116 116
                     </property>
117 117
                 </widget>
118
-                <widget class="QCheckBox" row="3" column="1">
118
+                <widget class="TQCheckBox" row="3" column="1">
119 119
                     <property name="name">
120 120
                         <cstring>othersReadChk</cstring>
121 121
                     </property>
@@ -127,7 +127,7 @@
127 127
                         <string></string>
128 128
                     </property>
129 129
                 </widget>
130
-                <widget class="QLabel" row="0" column="3">
130
+                <widget class="TQLabel" row="0" column="3">
131 131
                     <property name="name">
132 132
                         <cstring>TextLabel6</cstring>
133 133
                     </property>
@@ -139,7 +139,7 @@
139 139
                         <string>Exec</string>
140 140
                     </property>
141 141
                 </widget>
142
-                <widget class="QLabel" row="0" column="2">
142
+                <widget class="TQLabel" row="0" column="2">
143 143
                     <property name="name">
144 144
                         <cstring>TextLabel5</cstring>
145 145
                     </property>
@@ -151,7 +151,7 @@
151 151
                         <string>Write</string>
152 152
                     </property>
153 153
                 </widget>
154
-                <widget class="QCheckBox" row="2" column="2">
154
+                <widget class="TQCheckBox" row="2" column="2">
155 155
                     <property name="name">
156 156
                         <cstring>groupWriteChk</cstring>
157 157
                     </property>
@@ -163,7 +163,7 @@
163 163
                         <string></string>
164 164
                     </property>
165 165
                 </widget>
166
-                <widget class="QCheckBox" row="3" column="2">
166
+                <widget class="TQCheckBox" row="3" column="2">
167 167
                     <property name="name">
168 168
                         <cstring>othersWriteChk</cstring>
169 169
                     </property>
@@ -175,7 +175,7 @@
175 175
                         <string></string>
176 176
                     </property>
177 177
                 </widget>
178
-                <widget class="QCheckBox" row="1" column="2">
178
+                <widget class="TQCheckBox" row="1" column="2">
179 179
                     <property name="name">
180 180
                         <cstring>ownerWriteChk</cstring>
181 181
                     </property>
@@ -187,7 +187,7 @@
187 187
                         <string></string>
188 188
                     </property>
189 189
                 </widget>
190
-                <widget class="QCheckBox" row="3" column="3">
190
+                <widget class="TQCheckBox" row="3" column="3">
191 191
                     <property name="name">
192 192
                         <cstring>othersExecChk</cstring>
193 193
                     </property>
@@ -199,7 +199,7 @@
199 199
                         <string></string>
200 200
                     </property>
201 201
                 </widget>
202
-                <widget class="QCheckBox" row="2" column="1">
202
+                <widget class="TQCheckBox" row="2" column="1">
203 203
                     <property name="name">
204 204
                         <cstring>groupReadChk</cstring>
205 205
                     </property>
@@ -211,7 +211,7 @@
211 211
                         <string></string>
212 212
                     </property>
213 213
                 </widget>
214
-                <widget class="QCheckBox" row="1" column="1">
214
+                <widget class="TQCheckBox" row="1" column="1">
215 215
                     <property name="name">
216 216
                         <cstring>ownerReadChk</cstring>
217 217
                     </property>
@@ -223,7 +223,7 @@
223 223
                         <string></string>
224 224
                     </property>
225 225
                 </widget>
226
-                <widget class="QLabel" row="1" column="0">
226
+                <widget class="TQLabel" row="1" column="0">
227 227
                     <property name="name">
228 228
                         <cstring>TextLabel1</cstring>
229 229
                     </property>
@@ -235,7 +235,7 @@
235 235
                         <string>Owner</string>
236 236
                     </property>
237 237
                 </widget>
238
-                <widget class="QCheckBox" row="2" column="3">
238
+                <widget class="TQCheckBox" row="2" column="3">
239 239
                     <property name="name">
240 240
                         <cstring>groupExecChk</cstring>
241 241
                     </property>
@@ -247,7 +247,7 @@
247 247
                         <string></string>
248 248
                     </property>
249 249
                 </widget>
250
-                <widget class="QLabel" row="2" column="0">
250
+                <widget class="TQLabel" row="2" column="0">
251 251
                     <property name="name">
252 252
                         <cstring>TextLabel2</cstring>
253 253
                     </property>
@@ -259,7 +259,7 @@
259 259
                         <string>Group</string>
260 260
                     </property>
261 261
                 </widget>
262
-                <widget class="QCheckBox" row="1" column="3">
262
+                <widget class="TQCheckBox" row="1" column="3">
263 263
                     <property name="name">
264 264
                         <cstring>ownerExecChk</cstring>
265 265
                     </property>
@@ -271,7 +271,7 @@
271 271
                         <string></string>
272 272
                     </property>
273 273
                 </widget>
274
-                <widget class="QCheckBox" row="3" column="5">
274
+                <widget class="TQCheckBox" row="3" column="5">
275 275
                     <property name="name">
276 276
                         <cstring>stickyBitChk</cstring>
277 277
                     </property>
@@ -283,7 +283,7 @@
283 283
                         <string>Sticky</string>
284 284
                     </property>
285 285
                 </widget>
286
-                <widget class="QCheckBox" row="2" column="5">
286
+                <widget class="TQCheckBox" row="2" column="5">
287 287
                     <property name="name">
288 288
                         <cstring>setGIDChk</cstring>
289 289
                     </property>
@@ -295,7 +295,7 @@
295 295
                         <string>Set GID</string>
296 296
                     </property>
297 297
                 </widget>
298
-                <widget class="QCheckBox" row="1" column="5">
298
+                <widget class="TQCheckBox" row="1" column="5">
299 299
                     <property name="name">
300 300
                         <cstring>setUIDChk</cstring>
301 301
                     </property>
@@ -307,7 +307,7 @@
307 307
                         <string>Set UID</string>
308 308
                     </property>
309 309
                 </widget>
310
-                <widget class="QLabel" row="0" column="5">
310
+                <widget class="TQLabel" row="0" column="5">
311 311
                     <property name="name">
312 312
                         <cstring>TextLabel8</cstring>
313 313
                     </property>
@@ -321,7 +321,7 @@
321 321
                 </widget>
322 322
             </grid>
323 323
         </widget>
324
-        <widget class="QLayoutWidget">
324
+        <widget class="TQLayoutWidget">
325 325
             <property name="name">
326 326
                 <cstring>Layout1</cstring>
327 327
             </property>
@@ -335,7 +335,7 @@
335 335
                 <property name="spacing">
336 336
                     <number>6</number>
337 337
                 </property>
338
-                <widget class="QPushButton">
338
+                <widget class="TQPushButton">
339 339
                     <property name="name">
340 340
                         <cstring>buttonHelp</cstring>
341 341
                     </property>
@@ -359,14 +359,14 @@
359 359
                     <property name="sizeType">
360 360
                         <enum>Expanding</enum>
361 361
                     </property>
362
-                    <property name="sizeHint">
362
+                    <property name="tqsizeHint">
363 363
                         <size>
364 364
                             <width>20</width>
365 365
                             <height>20</height>
366 366
                         </size>
367 367
                     </property>
368 368
                 </spacer>
369
-                <widget class="QPushButton">
369
+                <widget class="TQPushButton">
370 370
                     <property name="name">
371 371
                         <cstring>buttonOk</cstring>
372 372
                     </property>
@@ -380,7 +380,7 @@
380 380
                         <bool>true</bool>
381 381
                     </property>
382 382
                 </widget>
383
-                <widget class="QPushButton">
383
+                <widget class="TQPushButton">
384 384
                     <property name="name">
385 385
                         <cstring>buttonCancel</cstring>
386 386
                     </property>
@@ -426,5 +426,5 @@
426 426
     <tabstop>buttonOk</tabstop>
427 427
     <tabstop>buttonCancel</tabstop>
428 428
 </tabstops>
429
-<layoutdefaults spacing="6" margin="11"/>
429
+<tqlayoutdefaults spacing="6" margin="11"/>
430 430
 </UI>

+ 2
- 2
filesharing/advanced/kcm_sambaconf/filemodedlgimpl.cpp View File

@@ -35,8 +35,8 @@
35 35
 
36 36
 #include "filemodedlgimpl.h"
37 37
 
38
-FileModeDlgImpl::FileModeDlgImpl(TQWidget* parent, TQLineEdit* edit)
39
-  : FileModeDlg(parent)
38
+FileModeDlgImpl::FileModeDlgImpl(TQWidget* tqparent, TQLineEdit* edit)
39
+  : FileModeDlg(tqparent)
40 40
 {
41 41
   assert(edit);
42 42
   _edit = edit;

+ 3
- 2
filesharing/advanced/kcm_sambaconf/filemodedlgimpl.h View File

@@ -45,14 +45,15 @@ class TQLineEdit;
45 45
  * e.g. 0744
46 46
  * After the user has changed the access rights with the dialog
47 47
  * the class sets the new access rights as a new octal string
48
- * of the QLineEdit
48
+ * of the TQLineEdit
49 49
  * Implements the filemodedlg.ui interface
50 50
  **/  
51 51
 class FileModeDlgImpl : public FileModeDlg
52 52
 {
53 53
 Q_OBJECT
54
+  TQ_OBJECT
54 55
 public: 
55
-	FileModeDlgImpl(TQWidget* parent, TQLineEdit* edit);
56
+	FileModeDlgImpl(TQWidget* tqparent, TQLineEdit* edit);
56 57
 	~FileModeDlgImpl();
57 58
 protected:
58 59
   TQLineEdit* _edit;

+ 27
- 27
filesharing/advanced/kcm_sambaconf/groupselectdlg.ui View File

@@ -1,6 +1,6 @@
1 1
 <!DOCTYPE UI><UI version="3.0" stdsetdef="1">
2 2
 <class>GroupSelectDlg</class>
3
-<widget class="QDialog">
3
+<widget class="TQDialog">
4 4
     <property name="name">
5 5
         <cstring>GroupSelectDlg</cstring>
6 6
     </property>
@@ -28,7 +28,7 @@
28 28
         <property name="spacing">
29 29
             <number>6</number>
30 30
         </property>
31
-        <widget class="QLayoutWidget" row="4" column="0" rowspan="1" colspan="2">
31
+        <widget class="TQLayoutWidget" row="4" column="0" rowspan="1" colspan="2">
32 32
             <property name="name">
33 33
                 <cstring>Layout1</cstring>
34 34
             </property>
@@ -52,14 +52,14 @@
52 52
                     <property name="sizeType">
53 53
                         <enum>Expanding</enum>
54 54
                     </property>
55
-                    <property name="sizeHint">
55
+                    <property name="tqsizeHint">
56 56
                         <size>
57 57
                             <width>285</width>
58 58
                             <height>20</height>
59 59
                         </size>
60 60
                     </property>
61 61
                 </spacer>
62
-                <widget class="QPushButton">
62
+                <widget class="TQPushButton">
63 63
                     <property name="name">
64 64
                         <cstring>buttonOk</cstring>
65 65
                     </property>
@@ -76,7 +76,7 @@
76 76
                         <bool>true</bool>
77 77
                     </property>
78 78
                 </widget>
79
-                <widget class="QPushButton">
79
+                <widget class="TQPushButton">
80 80
                     <property name="name">
81 81
                         <cstring>buttonCancel</cstring>
82 82
                     </property>
@@ -92,7 +92,7 @@
92 92
                 </widget>
93 93
             </hbox>
94 94
         </widget>
95
-        <widget class="QFrame" row="3" column="0" rowspan="1" colspan="2">
95
+        <widget class="TQFrame" row="3" column="0" rowspan="1" colspan="2">
96 96
             <property name="name">
97 97
                 <cstring>frame16</cstring>
98 98
             </property>
@@ -113,14 +113,14 @@
113 113
             <property name="sizeType">
114 114
                 <enum>Expanding</enum>
115 115
             </property>
116
-            <property name="sizeHint">
116
+            <property name="tqsizeHint">
117 117
                 <size>
118 118
                     <width>20</width>
119 119
                     <height>20</height>
120 120
                 </size>
121 121
             </property>
122 122
         </spacer>
123
-        <widget class="QGroupBox" row="0" column="0" rowspan="3" colspan="1">
123
+        <widget class="TQGroupBox" row="0" column="0" rowspan="3" colspan="1">
124 124
             <property name="name">
125 125
                 <cstring>groupBox87</cstring>
126 126
             </property>
@@ -145,7 +145,7 @@
145 145
                 <property name="spacing">
146 146
                     <number>6</number>
147 147
                 </property>
148
-                <widget class="QListView">
148
+                <widget class="TQListView">
149 149
                     <column>
150 150
                         <property name="text">
151 151
                             <string>Name</string>
@@ -185,7 +185,7 @@
185 185
                 </widget>
186 186
             </vbox>
187 187
         </widget>
188
-        <widget class="QButtonGroup" row="0" column="1">
188
+        <widget class="TQButtonGroup" row="0" column="1">
189 189
             <property name="name">
190 190
                 <cstring>accessBtnGrp</cstring>
191 191
             </property>
@@ -210,7 +210,7 @@
210 210
                 <property name="spacing">
211 211
                     <number>6</number>
212 212
                 </property>
213
-                <widget class="QRadioButton">
213
+                <widget class="TQRadioButton">
214 214
                     <property name="name">
215 215
                         <cstring>defaultRadio</cstring>
216 216
                     </property>
@@ -232,7 +232,7 @@
232 232
                         <bool>true</bool>
233 233
                     </property>
234 234
                 </widget>
235
-                <widget class="QRadioButton">
235
+                <widget class="TQRadioButton">
236 236
                     <property name="name">
237 237
                         <cstring>readRadio</cstring>
238 238
                     </property>
@@ -251,7 +251,7 @@
251 251
                         <number>8388690</number>
252 252
                     </property>
253 253
                 </widget>
254
-                <widget class="QRadioButton">
254
+                <widget class="TQRadioButton">
255 255
                     <property name="name">
256 256
                         <cstring>writeRadio</cstring>
257 257
                     </property>
@@ -270,7 +270,7 @@
270 270
                         <number>8388695</number>
271 271
                     </property>
272 272
                 </widget>
273
-                <widget class="QRadioButton">
273
+                <widget class="TQRadioButton">
274 274
                     <property name="name">
275 275
                         <cstring>adminRadio</cstring>
276 276
                     </property>
@@ -289,7 +289,7 @@
289 289
                         <number>8388673</number>
290 290
                     </property>
291 291
                 </widget>
292
-                <widget class="QRadioButton">
292
+                <widget class="TQRadioButton">
293 293
                     <property name="name">
294 294
                         <cstring>noAccessRadio</cstring>
295 295
                     </property>
@@ -310,7 +310,7 @@
310 310
                 </widget>
311 311
             </vbox>
312 312
         </widget>
313
-        <widget class="QButtonGroup" row="1" column="1">
313
+        <widget class="TQButtonGroup" row="1" column="1">
314 314
             <property name="name">
315 315
                 <cstring>kindBtnGrp</cstring>
316 316
             </property>
@@ -327,7 +327,7 @@
327 327
                 <property name="spacing">
328 328
                     <number>6</number>
329 329
                 </property>
330
-                <widget class="QRadioButton">
330
+                <widget class="TQRadioButton">
331 331
                     <property name="name">
332 332
                         <cstring>unixRadio</cstring>
333 333
                     </property>
@@ -352,7 +352,7 @@
352 352
                         <number>0</number>
353 353
                     </property>
354 354
                 </widget>
355
-                <widget class="QRadioButton">
355
+                <widget class="TQRadioButton">
356 356
                     <property name="name">
357 357
                         <cstring>nisRadio</cstring>
358 358
                     </property>
@@ -377,7 +377,7 @@
377 377
                         <number>1</number>
378 378
                     </property>
379 379
                 </widget>
380
-                <widget class="QRadioButton">
380
+                <widget class="TQRadioButton">
381 381
                     <property name="name">
382 382
                         <cstring>bothRadio</cstring>
383 383
                     </property>
@@ -425,21 +425,21 @@
425 425
     <tabstop>buttonCancel</tabstop>
426 426
 </tabstops>
427 427
 <includes>
428
-    <include location="local" impldecl="in declaration">qstringlist.h</include>
428
+    <include location="local" impldecl="in declaration">tqstringlist.h</include>
429 429
     <include location="local" impldecl="in implementation">passwd.h</include>
430 430
     <include location="local" impldecl="in implementation">groupselectdlg.ui.h</include>
431 431
 </includes>
432 432
 <variables>
433 433
     <variable>QString groupKind;</variable>
434 434
     <variable>int access;</variable>
435
-    <variable>QStringList selectedGroups;</variable>
435
+    <variable>TQStringList selectedGroups;</variable>
436 436
 </variables>
437
-<slots>
438
-    <slot>init( const QStringList &amp; specifiedGroups )</slot>
437
+<Q_SLOTS>
438
+    <slot>init( const TQStringList &amp; specifiedGroups )</slot>
439 439
     <slot access="protected">accept()</slot>
440
-    <slot returnType="QStringList">getSelectedGroups()</slot>
440
+    <slot returnType="TQStringList">getSelectedGroups()</slot>
441 441
     <slot returnType="int">getAccess()</slot>
442
-    <slot returnType="QString">getGroupKind()</slot>
443
-</slots>
444
-<layoutdefaults spacing="6" margin="11"/>
442
+    <slot returnType="TQString">getGroupKind()</slot>
443
+</Q_SLOTS>
444
+<tqlayoutdefaults spacing="6" margin="11"/>
445 445
 </UI>

+ 2
- 2
filesharing/advanced/kcm_sambaconf/groupselectdlg.ui.h View File

@@ -2,7 +2,7 @@
2 2
 ** ui.h extension file, included from the uic-generated form implementation.
3 3
 **
4 4
 ** If you wish to add, delete or rename functions or slots use
5
-** Qt Designer which will update this file, preserving your code. Create an
5
+** TQt Designer which will update this file, preserving your code. Create an
6 6
 ** init() function in place of a constructor, and a destroy() function in
7 7
 ** place of a destructor.
8 8
 *****************************************************************************/
@@ -14,7 +14,7 @@ void GroupSelectDlg::init(const TQStringList & specifiedGroups)
14 14
 
15 15
   for (TQStringList::Iterator it = unixGroups.begin(); it != unixGroups.end(); ++it)
16 16
   {
17
-      if ( ! specifiedGroups.contains(*it))
17
+      if ( ! specifiedGroups.tqcontains(*it))
18 18
 	  new TQListViewItem(groupListView, *it, TQString::number(getGroupGID(*it)));
19 19
   }
20 20
 }

+ 9
- 9
filesharing/advanced/kcm_sambaconf/hiddenfileview.cpp View File

@@ -62,8 +62,8 @@
62 62
 
63 63
 #define HIDDENTABINDEX 5
64 64
 
65
-HiddenListViewItem::HiddenListViewItem( TQListView *parent, KFileItem *fi, bool hidden=false, bool veto=false, bool vetoOplock=false )
66
-  : QMultiCheckListItem( parent )
65
+HiddenListViewItem::HiddenListViewItem( TQListView *tqparent, KFileItem *fi, bool hidden=false, bool veto=false, bool vetoOplock=false )
66
+  : QMultiCheckListItem( tqparent )
67 67
 {
68 68
   setPixmap( COL_NAME, fi->pixmap(KIcon::SizeSmall));
69 69
 
@@ -91,7 +91,7 @@ KFileItem* HiddenListViewItem::getFileItem()
91 91
 }
92 92
 
93 93
 
94
-void HiddenListViewItem::paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int alignment)
94
+void HiddenListViewItem::paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int tqalignment)
95 95
 {
96 96
   TQColorGroup _cg = cg;
97 97
 
@@ -101,7 +101,7 @@ void HiddenListViewItem::paintCell(TQPainter *p, const TQColorGroup &cg, int col
101 101
   if (isOn(COL_HIDDEN))
102 102
      _cg.setColor(TQColorGroup::Text,gray);
103 103
 
104
-  QMultiCheckListItem::paintCell(p, _cg, column, width, alignment);
104
+  QMultiCheckListItem::paintCell(p, _cg, column, width, tqalignment);
105 105
 }
106 106
 
107 107
 
@@ -397,14 +397,14 @@ void HiddenFileView::checkBoxClicked(TQCheckBox* chkBox,KToggleAction* action,TQ
397 397
             if (rx) {
398 398
                 // perhaps it is matched by a wildcard string
399 399
                 TQString p = rx->pattern();
400
-                if ( p.find("*") > -1 ||
401
-                        p.find("?") > -1 )
400
+                if ( p.tqfind("*") > -1 ||
401
+                        p.tqfind("?") > -1 )
402 402
                 {
403 403
                     // TODO after message freeze: why show three times the wildcard string? Once should be enough.
404 404
 		    // TODO remove <b></b> and use <qt> instead
405 405
                     int result = KMessageBox::questionYesNo(_dlg,i18n(
406 406
                     "<b></b>Some files you have selected are matched by the wildcarded string <b>'%1'</b>; "
407
-                    "do you want to uncheck all files matching <b>'%1'</b>?").arg(rx->pattern()).arg(rx->pattern()).arg(rx->pattern()),
407
+                    "do you want to uncheck all files matching <b>'%1'</b>?").tqarg(rx->pattern()).tqarg(rx->pattern()).tqarg(rx->pattern()),
408 408
                     i18n("Wildcarded String"),i18n("Uncheck Matches"),i18n("Keep Selected"));
409 409
             
410 410
                     TQPtrList<HiddenListViewItem> lst = getMatchingItems( *rx );
@@ -451,7 +451,7 @@ void HiddenFileView::vetoChkClicked(bool b)
451 451
 }
452 452
 
453 453
 /**
454
- * Sets the text of the TQLineEdit edit to the entries of the passed QRegExp-List
454
+ * Sets the text of the TQLineEdit edit to the entries of the passed TQRegExp-List
455 455
  **/
456 456
 void HiddenFileView::updateEdit(TQLineEdit* edit, TQPtrList<TQRegExp> & lst)
457 457
 {
@@ -519,7 +519,7 @@ void HiddenFileView::updateView()
519 519
     item->setOn(COL_VETO_OPLOCK,matchVetoOplock(item->text(0)));
520 520
   }
521 521
 
522
-  _dlg->hiddenListView->repaint();
522
+  _dlg->hiddenListView->tqrepaint();
523 523
 }
524 524
 
525 525
 

+ 6
- 4
filesharing/advanced/kcm_sambaconf/hiddenfileview.h View File

@@ -2,7 +2,7 @@
2 2
                           hiddenfileview.h  -  description
3 3
                              -------------------
4 4
     begin                : Wed Jan 1 2003
5
-    copyright            : (C) 2003 by Jan Schäfer
5
+    copyright            : (C) 2003 by Jan Sch�fer
6 6
     email                : janschaefer@users.sourceforge.net
7 7
  ***************************************************************************/
8 8
 
@@ -42,11 +42,12 @@ class SambaShare;
42 42
 class HiddenListViewItem : public QMultiCheckListItem
43 43
 {
44 44
 Q_OBJECT
45
+  TQ_OBJECT
45 46
 public:
46
-  HiddenListViewItem( TQListView *parent, KFileItem *fi, bool hidden, bool veto, bool vetoOplock );
47
+  HiddenListViewItem( TQListView *tqparent, KFileItem *fi, bool hidden, bool veto, bool vetoOplock );
47 48
   ~HiddenListViewItem();
48 49
 
49
-  virtual void paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int alignment);
50
+  virtual void paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int tqalignment);
50 51
 
51 52
   KFileItem* getFileItem();
52 53
 protected:
@@ -66,9 +67,10 @@ class ShareDlgImpl;
66 67
  * of the SambaShare an offers the possibility of
67 68
  * selecting the files which should be hidden
68 69
  **/
69
-class HiddenFileView : public QObject
70
+class HiddenFileView : public TQObject
70 71
 {
71 72
 Q_OBJECT
73
+  TQ_OBJECT
72 74
 
73 75
 public:
74 76
   HiddenFileView(ShareDlgImpl* shareDlg, SambaShare* share);

+ 17
- 17
filesharing/advanced/kcm_sambaconf/joindomaindlg.ui View File

@@ -1,6 +1,6 @@
1 1
 <!DOCTYPE UI><UI version="3.0" stdsetdef="1">
2 2
 <class>JoinDomainDlg</class>
3
-<widget class="QDialog">
3
+<widget class="TQDialog">
4 4
     <property name="name">
5 5
         <cstring>JoinDomainDlg</cstring>
6 6
     </property>
@@ -22,7 +22,7 @@
22 22
         <property name="name">
23 23
             <cstring>unnamed</cstring>
24 24
         </property>
25
-        <widget class="QLayoutWidget" row="7" column="0" rowspan="1" colspan="2">
25
+        <widget class="TQLayoutWidget" row="7" column="0" rowspan="1" colspan="2">
26 26
             <property name="name">
27 27
                 <cstring>Layout1</cstring>
28 28
             </property>
@@ -46,14 +46,14 @@
46 46
                     <property name="sizeType">
47 47
                         <enum>Expanding</enum>
48 48
                     </property>
49
-                    <property name="sizeHint">
49
+                    <property name="tqsizeHint">
50 50
                         <size>
51 51
                             <width>20</width>
52 52
                             <height>20</height>
53 53
                         </size>
54 54
                     </property>
55 55
                 </spacer>
56
-                <widget class="QPushButton">
56
+                <widget class="TQPushButton">
57 57
                     <property name="name">
58 58
                         <cstring>buttonOk</cstring>
59 59
                     </property>
@@ -70,7 +70,7 @@
70 70
                         <bool>true</bool>
71 71
                     </property>
72 72
                 </widget>
73
-                <widget class="QPushButton">
73
+                <widget class="TQPushButton">
74 74
                     <property name="name">
75 75
                         <cstring>buttonCancel</cstring>
76 76
                     </property>
@@ -86,22 +86,22 @@
86 86
                 </widget>
87 87
             </hbox>
88 88
         </widget>
89
-        <widget class="QLineEdit" row="0" column="1">
89
+        <widget class="TQLineEdit" row="0" column="1">
90 90
             <property name="name">
91 91
                 <cstring>domainEdit</cstring>
92 92
             </property>
93 93
         </widget>
94
-        <widget class="QLineEdit" row="1" column="1">
94
+        <widget class="TQLineEdit" row="1" column="1">
95 95
             <property name="name">
96 96
                 <cstring>domainControllerEdit</cstring>
97 97
             </property>
98 98
         </widget>
99
-        <widget class="QLineEdit" row="2" column="1">
99
+        <widget class="TQLineEdit" row="2" column="1">
100 100
             <property name="name">
101 101
                 <cstring>usernameEdit</cstring>
102 102
             </property>
103 103
         </widget>
104
-        <widget class="QLabel" row="4" column="0">
104
+        <widget class="TQLabel" row="4" column="0">
105 105
             <property name="name">
106 106
                 <cstring>textLabel5_2_2</cstring>
107 107
             </property>
@@ -112,7 +112,7 @@
112 112
                 <cstring>verifyEdit</cstring>
113 113
             </property>
114 114
         </widget>
115
-        <widget class="QLabel" row="3" column="0">
115
+        <widget class="TQLabel" row="3" column="0">
116 116
             <property name="name">
117 117
                 <cstring>textLabel5_2</cstring>
118 118
             </property>
@@ -123,7 +123,7 @@
123 123
                 <cstring>passwordEdit</cstring>
124 124
             </property>
125 125
         </widget>
126
-        <widget class="QLabel" row="2" column="0">
126
+        <widget class="TQLabel" row="2" column="0">
127 127
             <property name="name">
128 128
                 <cstring>textLabel5</cstring>
129 129
             </property>
@@ -134,7 +134,7 @@
134 134
                 <cstring>usernameEdit</cstring>
135 135
             </property>
136 136
         </widget>
137
-        <widget class="QLabel" row="1" column="0">
137
+        <widget class="TQLabel" row="1" column="0">
138 138
             <property name="name">
139 139
                 <cstring>textLabel4_2</cstring>
140 140
             </property>
@@ -145,7 +145,7 @@
145 145
                 <cstring>domainControllerEdit</cstring>
146 146
             </property>
147 147
         </widget>
148
-        <widget class="QLabel" row="0" column="0">
148
+        <widget class="TQLabel" row="0" column="0">
149 149
             <property name="name">
150 150
                 <cstring>textLabel4</cstring>
151 151
             </property>
@@ -190,7 +190,7 @@
190 190
             <property name="sizeType">
191 191
                 <enum>Expanding</enum>
192 192
             </property>
193
-            <property name="sizeHint">
193
+            <property name="tqsizeHint">
194 194
                 <size>
195 195
                     <width>20</width>
196 196
                     <height>40</height>
@@ -228,10 +228,10 @@
228 228
     <include location="global" impldecl="in implementation">klocale.h</include>
229 229
     <include location="local" impldecl="in implementation">joindomaindlg.ui.h</include>
230 230
 </includes>
231
-<slots>
231
+<Q_SLOTS>
232 232
     <slot>accept()</slot>
233
-</slots>
234
-<layoutdefaults spacing="6" margin="11"/>
233
+</Q_SLOTS>
234
+<tqlayoutdefaults spacing="6" margin="11"/>
235 235
 <includehints>
236 236
     <includehint>kpassdlg.h</includehint>
237 237
     <includehint>kpassdlg.h</includehint>

+ 1
- 1
filesharing/advanced/kcm_sambaconf/joindomaindlg.ui.h View File

@@ -2,7 +2,7 @@
2 2
 ** ui.h extension file, included from the uic-generated form implementation.
3 3
 **
4 4
 ** If you wish to add, delete or rename functions or slots use
5
-** Qt Designer which will update this file, preserving your code. Create an
5
+** TQt Designer which will update this file, preserving your code. Create an
6 6
 ** init() function in place of a constructor, and a destroy() function in
7 7
 ** place of a destructor.
8 8
 *****************************************************************************/

+ 542
- 542
filesharing/advanced/kcm_sambaconf/kcminterface.ui
File diff suppressed because it is too large
View File


+ 1
- 1
filesharing/advanced/kcm_sambaconf/kcminterface.ui.h View File

@@ -1,7 +1,7 @@
1 1
 /****************************************************************************
2 2
 ** ui.h extension file, included from the uic-generated form implementation.
3 3
 **
4
-** If you wish to add, delete or rename slots use Qt Designer which will
4
+** If you wish to add, delete or rename slots use TQt Designer which will
5 5
 ** update this file, preserving your code. Create an init() slot in place of
6 6
 ** a constructor, and a destroy() slot in place of a destructor.
7 7
 *****************************************************************************/

+ 86
- 86
filesharing/advanced/kcm_sambaconf/kcmprinterdlg.ui View File

@@ -21,11 +21,11 @@
21 21
  *                                                                            *
22 22
  ******************************************************************************/
23 23
 </comment>
24
-  <widget class='QDialog'>
24
+  <widget class='TQDialog'>
25 25
     <property name='name'>
26 26
       <cstring>KcmPrinterDlg</cstring>
27 27
     </property>
28
-    <property name='geometry'>
28
+    <property name='tqgeometry'>
29 29
       <rect>
30 30
         <x>0</x>
31 31
         <y>0</y>
@@ -46,11 +46,11 @@
46 46
       <property name='spacing'>
47 47
         <number>6</number>
48 48
       </property>
49
-      <widget class='QTabWidget'>
49
+      <widget class='TQTabWidget'>
50 50
         <property name='name'>
51 51
           <cstring>_tabs</cstring>
52 52
         </property>
53
-        <widget class='QWidget'>
53
+        <widget class='TQWidget'>
54 54
           <property name='name'>
55 55
             <cstring>tab</cstring>
56 56
           </property>
@@ -61,7 +61,7 @@
61 61
             <property name='name'>
62 62
               <cstring>unnamed</cstring>
63 63
             </property>
64
-            <widget class='QLayoutWidget'>
64
+            <widget class='TQLayoutWidget'>
65 65
               <property name='name'>
66 66
                 <cstring>Layout51</cstring>
67 67
               </property>
@@ -75,7 +75,7 @@
75 75
                 <property name='spacing'>
76 76
                   <number>6</number>
77 77
                 </property>
78
-                <widget class='QFrame'>
78
+                <widget class='TQFrame'>
79 79
                   <property name='name'>
80 80
                     <cstring>pixFrame</cstring>
81 81
                   </property>
@@ -95,7 +95,7 @@
95 95
                     <property name='spacing'>
96 96
                       <number>6</number>
97 97
                     </property>
98
-                    <widget class='QLabel'>
98
+                    <widget class='TQLabel'>
99 99
                       <property name='name'>
100 100
                         <cstring>printerPixLbl</cstring>
101 101
                       </property>
@@ -116,7 +116,7 @@
116 116
                     </widget>
117 117
                   </vbox>
118 118
                 </widget>
119
-                <widget class='QGroupBox'>
119
+                <widget class='TQGroupBox'>
120 120
                   <property name='name'>
121 121
                     <cstring>printerGrp</cstring>
122 122
                   </property>
@@ -136,7 +136,7 @@
136 136
                     <property name='spacing'>
137 137
                       <number>6</number>
138 138
                     </property>
139
-                    <widget class='QLayoutWidget'>
139
+                    <widget class='TQLayoutWidget'>
140 140
                       <property name='name'>
141 141
                         <cstring>Layout49</cstring>
142 142
                       </property>
@@ -155,7 +155,7 @@
155 155
                             <cstring>pathUrlRq</cstring>
156 156
                           </property>
157 157
                         </widget>
158
-                        <widget row='1' class='QLabel' column='0'>
158
+                        <widget row='1' class='TQLabel' column='0'>
159 159
                           <property name='name'>
160 160
                             <cstring>TextLabel7</cstring>
161 161
                           </property>
@@ -166,7 +166,7 @@
166 166
                             <cstring>pathUrlRq</cstring>
167 167
                           </property>
168 168
                         </widget>
169
-                        <widget row='0' class='QLabel' column='0'>
169
+                        <widget row='0' class='TQLabel' column='0'>
170 170
                           <property name='name'>
171 171
                             <cstring>TextLabel4_2</cstring>
172 172
                           </property>
@@ -177,7 +177,7 @@
177 177
                             <cstring>queueCombo</cstring>
178 178
                           </property>
179 179
                         </widget>
180
-                        <widget row='0' class='QLayoutWidget' column='1'>
180
+                        <widget row='0' class='TQLayoutWidget' column='1'>
181 181
                           <property name='name'>
182 182
                             <cstring>Layout48</cstring>
183 183
                           </property>
@@ -196,7 +196,7 @@
196 196
                                 <cstring>queueCombo</cstring>
197 197
                               </property>
198 198
                             </widget>
199
-                            <widget class='QCheckBox'>
199
+                            <widget class='TQCheckBox'>
200 200
                               <property name='name'>
201 201
                                 <cstring>printersChk</cstring>
202 202
                               </property>
@@ -215,7 +215,7 @@
215 215
                 </widget>
216 216
               </hbox>
217 217
             </widget>
218
-            <widget class='QGroupBox'>
218
+            <widget class='TQGroupBox'>
219 219
               <property name='name'>
220 220
                 <cstring>identifierGrp</cstring>
221 221
               </property>
@@ -232,7 +232,7 @@
232 232
                 <property name='spacing'>
233 233
                   <number>6</number>
234 234
                 </property>
235
-                <widget row='0' class='QLabel' column='0'>
235
+                <widget row='0' class='TQLabel' column='0'>
236 236
                   <property name='name'>
237 237
                     <cstring>Lbl_shareName</cstring>
238 238
                   </property>
@@ -243,7 +243,7 @@
243 243
                     <cstring>shareNameEdit</cstring>
244 244
                   </property>
245 245
                 </widget>
246
-                <widget row='1' class='QLabel' column='0'>
246
+                <widget row='1' class='TQLabel' column='0'>
247 247
                   <property name='name'>
248 248
                     <cstring>TextLabel3</cstring>
249 249
                   </property>
@@ -266,7 +266,7 @@
266 266
                 </widget>
267 267
               </grid>
268 268
             </widget>
269
-            <widget class='QGroupBox'>
269
+            <widget class='TQGroupBox'>
270 270
               <property name='name'>
271 271
                 <cstring>GroupBox4</cstring>
272 272
               </property>
@@ -283,7 +283,7 @@
283 283
                 <property name='spacing'>
284 284
                   <number>6</number>
285 285
                 </property>
286
-                <widget class='QCheckBox'>
286
+                <widget class='TQCheckBox'>
287 287
                   <property name='name'>
288 288
                     <cstring>availableBaseChk</cstring>
289 289
                   </property>
@@ -291,7 +291,7 @@
291 291
                     <string>A&amp;vailable</string>
292 292
                   </property>
293 293
                 </widget>
294
-                <widget class='QCheckBox'>
294
+                <widget class='TQCheckBox'>
295 295
                   <property name='name'>
296 296
                     <cstring>browseableBaseChk</cstring>
297 297
                   </property>
@@ -299,7 +299,7 @@
299 299
                     <string>Bro&amp;wseable</string>
300 300
                   </property>
301 301
                 </widget>
302
-                <widget class='QCheckBox'>
302
+                <widget class='TQCheckBox'>
303 303
                   <property name='name'>
304 304
                     <cstring>publicBaseChk</cstring>
305 305
                   </property>
@@ -319,7 +319,7 @@
319 319
               <property name='sizeType'>
320 320
                 <enum>Expanding</enum>
321 321
               </property>
322
-              <property name='sizeHint'>
322
+              <property name='tqsizeHint'>
323 323
                 <size>
324 324
                   <width>20</width>
325 325
                   <height>20</height>
@@ -328,7 +328,7 @@
328 328
             </spacer>
329 329
           </vbox>
330 330
         </widget>
331
-        <widget class='QWidget'>
331
+        <widget class='TQWidget'>
332 332
           <property name='name'>
333 333
             <cstring>tab</cstring>
334 334
           </property>
@@ -349,14 +349,14 @@
349 349
               <property name='sizeType'>
350 350
                 <enum>Expanding</enum>
351 351
               </property>
352
-              <property name='sizeHint'>
352
+              <property name='tqsizeHint'>
353 353
                 <size>
354 354
                   <width>20</width>
355 355
                   <height>50</height>
356 356
                 </size>
357 357
               </property>
358 358
             </spacer>
359
-            <widget row='3' class='QLabel' rowspan='1' column='0' colspan='2'>
359
+            <widget row='3' class='TQLabel' rowspan='1' column='0' colspan='2'>
360 360
               <property name='name'>
361 361
                 <cstring>TextLabel5_2_8</cstring>
362 362
               </property>
@@ -372,12 +372,12 @@
372 372
                 <cstring>printerDriverEdit</cstring>
373 373
               </property>
374 374
             </widget>
375
-            <widget row='3' class='QLineEdit' rowspan='1' column='2' colspan='2'>
375
+            <widget row='3' class='TQLineEdit' rowspan='1' column='2' colspan='2'>
376 376
               <property name='name'>
377 377
                 <cstring>printerDriverEdit</cstring>
378 378
               </property>
379 379
             </widget>
380
-            <widget row='4' class='QLabel' rowspan='1' column='0' colspan='2'>
380
+            <widget row='4' class='TQLabel' rowspan='1' column='0' colspan='2'>
381 381
               <property name='name'>
382 382
                 <cstring>TextLabel5_2_2_2</cstring>
383 383
               </property>
@@ -393,12 +393,12 @@
393 393
                 <cstring>printerDriverLocationEdit</cstring>
394 394
               </property>
395 395
             </widget>
396
-            <widget row='4' class='QLineEdit' rowspan='1' column='2' colspan='2'>
396
+            <widget row='4' class='TQLineEdit' rowspan='1' column='2' colspan='2'>
397 397
               <property name='name'>
398 398
                 <cstring>printerDriverLocationEdit</cstring>
399 399
               </property>
400 400
             </widget>
401
-            <widget row='5' class='QCheckBox' rowspan='1' column='0' colspan='2'>
401
+            <widget row='5' class='TQCheckBox' rowspan='1' column='0' colspan='2'>
402 402
               <property name='name'>
403 403
                 <cstring>postscriptChk</cstring>
404 404
               </property>
@@ -406,7 +406,7 @@
406 406
                 <string>PostScr&amp;ipt</string>
407 407
               </property>
408 408
             </widget>
409
-            <widget row='0' class='QLabel' column='0'>
409
+            <widget row='0' class='TQLabel' column='0'>
410 410
               <property name='name'>
411 411
                 <cstring>PrintingLbl</cstring>
412 412
               </property>
@@ -417,7 +417,7 @@
417 417
                 <cstring>printingCombo</cstring>
418 418
               </property>
419 419
             </widget>
420
-            <widget row='0' class='QComboBox' column='2'>
420
+            <widget row='0' class='TQComboBox' column='2'>
421 421
               <item>
422 422
                 <property name='text'>
423 423
                   <string>sysv</string>
@@ -477,7 +477,7 @@
477 477
                 <cstring>printingCombo</cstring>
478 478
               </property>
479 479
             </widget>
480
-            <widget row='2' class='QLabel' rowspan='1' column='0' colspan='2'>
480
+            <widget row='2' class='TQLabel' rowspan='1' column='0' colspan='2'>
481 481
               <property name='name'>
482 482
                 <cstring>TextLabel3_2_2</cstring>
483 483
               </property>
@@ -488,7 +488,7 @@
488 488
                 <cstring>maxReportedPrintJobsSpin</cstring>
489 489
               </property>
490 490
             </widget>
491
-            <widget row='1' class='QLabel' rowspan='1' column='0' colspan='2'>
491
+            <widget row='1' class='TQLabel' rowspan='1' column='0' colspan='2'>
492 492
               <property name='name'>
493 493
                 <cstring>TextLabel3_2</cstring>
494 494
               </property>
@@ -535,14 +535,14 @@
535 535
               <property name='sizeType'>
536 536
                 <enum>Expanding</enum>
537 537
               </property>
538
-              <property name='sizeHint'>
538
+              <property name='tqsizeHint'>
539 539
                 <size>
540 540
                   <width>200</width>
541 541
                   <height>20</height>
542 542
                 </size>
543 543
               </property>
544 544
             </spacer>
545
-            <widget row='6' class='QCheckBox' rowspan='1' column='0' colspan='2'>
545
+            <widget row='6' class='TQCheckBox' rowspan='1' column='0' colspan='2'>
546 546
               <property name='name'>
547 547
                 <cstring>useClientDriverChk</cstring>
548 548
               </property>
@@ -550,7 +550,7 @@
550 550
                 <string>Use c&amp;lient driver</string>
551 551
               </property>
552 552
             </widget>
553
-            <widget row='7' class='QCheckBox' rowspan='1' column='0' colspan='2'>
553
+            <widget row='7' class='TQCheckBox' rowspan='1' column='0' colspan='2'>
554 554
               <property name='name'>
555 555
                 <cstring>defaultDevmodeChk</cstring>
556 556
               </property>
@@ -560,7 +560,7 @@
560 560
             </widget>
561 561
           </grid>
562 562
         </widget>
563
-        <widget class='QWidget'>
563
+        <widget class='TQWidget'>
564 564
           <property name='name'>
565 565
             <cstring>tab</cstring>
566 566
           </property>
@@ -571,7 +571,7 @@
571 571
             <property name='name'>
572 572
               <cstring>unnamed</cstring>
573 573
             </property>
574
-            <widget row='3' class='QLabel' column='0'>
574
+            <widget row='3' class='TQLabel' column='0'>
575 575
               <property name='name'>
576 576
                 <cstring>TextLabel6</cstring>
577 577
               </property>
@@ -585,7 +585,7 @@
585 585
                 <string>The opposite of hosts allow - hosts listed here are NOT permitted access to services unless the specific services have their own lists to override this one. Where the lists conflict, the allow list takes precedence.</string>
586 586
               </property>
587 587
             </widget>
588
-            <widget row='3' class='QLineEdit' rowspan='1' column='1' colspan='2'>
588
+            <widget row='3' class='TQLineEdit' rowspan='1' column='1' colspan='2'>
589 589
               <property name='name'>
590 590
                 <cstring>hostsDenyEdit</cstring>
591 591
               </property>
@@ -593,7 +593,7 @@
593 593
                 <string>The opposite of hosts allow - hosts listed here are NOT permitted access to services unless the specific services have their own lists to override this one. Where the lists conflict, the allow list takes precedence.</string>
594 594
               </property>
595 595
             </widget>
596
-            <widget row='2' class='QLineEdit' rowspan='1' column='1' colspan='2'>
596
+            <widget row='2' class='TQLineEdit' rowspan='1' column='1' colspan='2'>
597 597
               <property name='name'>
598 598
                 <cstring>hostsAllowEdit</cstring>
599 599
               </property>
@@ -601,7 +601,7 @@
601 601
                 <string>This parameter is a comma, space, or tab delimited set of hosts which are permitted to access a service.</string>
602 602
               </property>
603 603
             </widget>
604
-            <widget row='2' class='QLabel' column='0'>
604
+            <widget row='2' class='TQLabel' column='0'>
605 605
               <property name='name'>
606 606
                 <cstring>TextLabel5</cstring>
607 607
               </property>
@@ -615,7 +615,7 @@
615 615
                 <string>This parameter is a comma, space, or tab delimited set of hosts which are permitted to access a service.</string>
616 616
               </property>
617 617
             </widget>
618
-            <widget row='1' class='QLineEdit' rowspan='1' column='1' colspan='2'>
618
+            <widget row='1' class='TQLineEdit' rowspan='1' column='1' colspan='2'>
619 619
               <property name='name'>
620 620
                 <cstring>printerAdminEdit</cstring>
621 621
               </property>
@@ -633,14 +633,14 @@
633 633
               <property name='sizeType'>
634 634
                 <enum>Expanding</enum>
635 635
               </property>
636
-              <property name='sizeHint'>
636
+              <property name='tqsizeHint'>
637 637
                 <size>
638 638
                   <width>20</width>
639 639
                   <height>20</height>
640 640
                 </size>
641 641
               </property>
642 642
             </spacer>
643
-            <widget row='1' class='QLabel' column='0'>
643
+            <widget row='1' class='TQLabel' column='0'>
644 644
               <property name='name'>
645 645
                 <cstring>TextLabel6_2</cstring>
646 646
               </property>
@@ -654,7 +654,7 @@
654 654
                 <string>The opposite of hosts allow - hosts listed here are NOT permitted access to services unless the specific services have their own lists to override this one. Where the lists conflict, the allow list takes precedence.</string>
655 655
               </property>
656 656
             </widget>
657
-            <widget row='0' class='QLabel' column='0'>
657
+            <widget row='0' class='TQLabel' column='0'>
658 658
               <property name='name'>
659 659
                 <cstring>TextLabel1_2</cstring>
660 660
               </property>
@@ -668,7 +668,7 @@
668 668
                 <string>This is a username which will be used for access to services which are specified as guest ok. Whatever privileges this user has will be available to any client connecting to the guest service. Typically this user will exist in the password file, but will not have a valid login. The user account \"ftp\" is often a good choice for this parameter. If a username is specified in a given service, the specified username overrides this one.</string>
669 669
               </property>
670 670
             </widget>
671
-            <widget row='0' class='QComboBox' column='1'>
671
+            <widget row='0' class='TQComboBox' column='1'>
672 672
               <property name='name'>
673 673
                 <cstring>guestAccountCombo</cstring>
674 674
               </property>
@@ -683,7 +683,7 @@
683 683
               <property name='sizeType'>
684 684
                 <enum>Expanding</enum>
685 685
               </property>
686
-              <property name='sizeHint'>
686
+              <property name='tqsizeHint'>
687 687
                 <size>
688 688
                   <width>263</width>
689 689
                   <height>20</height>
@@ -692,7 +692,7 @@
692 692
             </spacer>
693 693
           </grid>
694 694
         </widget>
695
-        <widget class='QWidget'>
695
+        <widget class='TQWidget'>
696 696
           <property name='name'>
697 697
             <cstring>tab</cstring>
698 698
           </property>
@@ -709,7 +709,7 @@
709 709
             <property name='spacing'>
710 710
               <number>6</number>
711 711
             </property>
712
-            <widget row='0' class='QLabel' column='0'>
712
+            <widget row='0' class='TQLabel' column='0'>
713 713
               <property name='name'>
714 714
                 <cstring>TextLabel5_2</cstring>
715 715
               </property>
@@ -720,12 +720,12 @@
720 720
                 <cstring>printCommandEdit</cstring>
721 721
               </property>
722 722
             </widget>
723
-            <widget row='0' class='QLineEdit' column='1'>
723
+            <widget row='0' class='TQLineEdit' column='1'>
724 724
               <property name='name'>
725 725
                 <cstring>printCommandEdit</cstring>
726 726
               </property>
727 727
             </widget>
728
-            <widget row='1' class='QLabel' column='0'>
728
+            <widget row='1' class='TQLabel' column='0'>
729 729
               <property name='name'>
730 730
                 <cstring>TextLabel5_2_2</cstring>
731 731
               </property>
@@ -736,17 +736,17 @@
736 736
                 <cstring>lpqCommandEdit</cstring>
737 737
               </property>
738 738
             </widget>
739
-            <widget row='1' class='QLineEdit' column='1'>
739
+            <widget row='1' class='TQLineEdit' column='1'>
740 740
               <property name='name'>
741 741
                 <cstring>lpqCommandEdit</cstring>
742 742
               </property>
743 743
             </widget>
744
-            <widget row='2' class='QLineEdit' column='1'>
744
+            <widget row='2' class='TQLineEdit' column='1'>
745 745
               <property name='name'>
746 746
                 <cstring>lprmCommandEdit</cstring>
747 747
               </property>
748 748
             </widget>
749
-            <widget row='2' class='QLabel' column='0'>
749
+            <widget row='2' class='TQLabel' column='0'>
750 750
               <property name='name'>
751 751
                 <cstring>TextLabel5_2_3</cstring>
752 752
               </property>
@@ -757,17 +757,17 @@
757 757
                 <cstring>lprmCommandEdit</cstring>
758 758
               </property>
759 759
             </widget>
760
-            <widget row='4' class='QLineEdit' column='1'>
760
+            <widget row='4' class='TQLineEdit' column='1'>
761 761
               <property name='name'>
762 762
                 <cstring>lpresumeEdit</cstring>
763 763
               </property>
764 764
             </widget>
765
-            <widget row='3' class='QLineEdit' column='1'>
765
+            <widget row='3' class='TQLineEdit' column='1'>
766 766
               <property name='name'>
767 767
                 <cstring>lppauseEdit</cstring>
768 768
               </property>
769 769
             </widget>
770
-            <widget row='4' class='QLabel' column='0'>
770
+            <widget row='4' class='TQLabel' column='0'>
771 771
               <property name='name'>
772 772
                 <cstring>TextLabel5_2_5</cstring>
773 773
               </property>
@@ -778,7 +778,7 @@
778 778
                 <cstring>lpresumeEdit</cstring>
779 779
               </property>
780 780
             </widget>
781
-            <widget row='5' class='QLabel' column='0'>
781
+            <widget row='5' class='TQLabel' column='0'>
782 782
               <property name='name'>
783 783
                 <cstring>TextLabel5_2_6</cstring>
784 784
               </property>
@@ -789,7 +789,7 @@
789 789
                 <cstring>queuepauseEdit</cstring>
790 790
               </property>
791 791
             </widget>
792
-            <widget row='3' class='QLabel' column='0'>
792
+            <widget row='3' class='TQLabel' column='0'>
793 793
               <property name='name'>
794 794
                 <cstring>TextLabel5_2_4</cstring>
795 795
               </property>
@@ -800,17 +800,17 @@
800 800
                 <cstring>lppauseEdit</cstring>
801 801
               </property>
802 802
             </widget>
803
-            <widget row='5' class='QLineEdit' column='1'>
803
+            <widget row='5' class='TQLineEdit' column='1'>
804 804
               <property name='name'>
805 805
                 <cstring>queuepauseEdit</cstring>
806 806
               </property>
807 807
             </widget>
808
-            <widget row='6' class='QLineEdit' column='1'>
808
+            <widget row='6' class='TQLineEdit' column='1'>
809 809
               <property name='name'>
810 810
                 <cstring>queueresumeEdit</cstring>
811 811
               </property>
812 812
             </widget>
813
-            <widget row='6' class='QLabel' column='0'>
813
+            <widget row='6' class='TQLabel' column='0'>
814 814
               <property name='name'>
815 815
                 <cstring>TextLabel5_2_7</cstring>
816 816
               </property>
@@ -831,7 +831,7 @@
831 831
               <property name='sizeType'>
832 832
                 <enum>Expanding</enum>
833 833
               </property>
834
-              <property name='sizeHint'>
834
+              <property name='tqsizeHint'>
835 835
                 <size>
836 836
                   <width>20</width>
837 837
                   <height>20</height>
@@ -840,7 +840,7 @@
840 840
             </spacer>
841 841
           </grid>
842 842
         </widget>
843
-        <widget class='QWidget'>
843
+        <widget class='TQWidget'>
844 844
           <property name='name'>
845 845
             <cstring>tab</cstring>
846 846
           </property>
@@ -851,7 +851,7 @@
851 851
             <property name='name'>
852 852
               <cstring>unnamed</cstring>
853 853
             </property>
854
-            <widget row='1' class='QGroupBox' rowspan='1' column='0' colspan='2'>
854
+            <widget row='1' class='TQGroupBox' rowspan='1' column='0' colspan='2'>
855 855
               <property name='name'>
856 856
                 <cstring>GroupBox31</cstring>
857 857
               </property>
@@ -868,17 +868,17 @@
868 868
                 <property name='spacing'>
869 869
                   <number>6</number>
870 870
                 </property>
871
-                <widget row='1' class='QLineEdit' column='1'>
871
+                <widget row='1' class='TQLineEdit' column='1'>
872 872
                   <property name='name'>
873 873
                     <cstring>postExecEdit</cstring>
874 874
                   </property>
875 875
                 </widget>
876
-                <widget row='0' class='QLineEdit' column='1'>
876
+                <widget row='0' class='TQLineEdit' column='1'>
877 877
                   <property name='name'>
878 878
                     <cstring>preExecEdit</cstring>
879 879
                   </property>
880 880
                 </widget>
881
-                <widget row='0' class='QLabel' column='0'>
881
+                <widget row='0' class='TQLabel' column='0'>
882 882
                   <property name='name'>
883 883
                     <cstring>TextLabel6_3</cstring>
884 884
                   </property>
@@ -889,7 +889,7 @@
889 889
                     <cstring>preExecEdit</cstring>
890 890
                   </property>
891 891
                 </widget>
892
-                <widget row='2' class='QLabel' column='0'>
892
+                <widget row='2' class='TQLabel' column='0'>
893 893
                   <property name='name'>
894 894
                     <cstring>TextLabel6_3_3</cstring>
895 895
                   </property>
@@ -900,17 +900,17 @@
900 900
                     <cstring>rootPreExecEdit</cstring>
901 901
                   </property>
902 902
                 </widget>
903
-                <widget row='2' class='QLineEdit' column='1'>
903
+                <widget row='2' class='TQLineEdit' column='1'>
904 904
                   <property name='name'>
905 905
                     <cstring>rootPreExecEdit</cstring>
906 906
                   </property>
907 907
                 </widget>
908
-                <widget row='3' class='QLineEdit' column='1'>
908
+                <widget row='3' class='TQLineEdit' column='1'>
909 909
                   <property name='name'>
910 910
                     <cstring>rootPostExecEdit</cstring>
911 911
                   </property>
912 912
                 </widget>
913
-                <widget row='3' class='QLabel' column='0'>
913
+                <widget row='3' class='TQLabel' column='0'>
914 914
                   <property name='name'>
915 915
                     <cstring>TextLabel6_3_4</cstring>
916 916
                   </property>
@@ -921,7 +921,7 @@
921 921
                     <cstring>rootPostExecEdit</cstring>
922 922
                   </property>
923 923
                 </widget>
924
-                <widget row='1' class='QLabel' column='0'>
924
+                <widget row='1' class='TQLabel' column='0'>
925 925
                   <property name='name'>
926 926
                     <cstring>TextLabel6_3_2</cstring>
927 927
                   </property>
@@ -944,14 +944,14 @@
944 944
               <property name='sizeType'>
945 945
                 <enum>Expanding</enum>
946 946
               </property>
947
-              <property name='sizeHint'>
947
+              <property name='tqsizeHint'>
948 948
                 <size>
949 949
                   <width>20</width>
950 950
                   <height>20</height>
951 951
                 </size>
952 952
               </property>
953 953
             </spacer>
954
-            <widget row='0' class='QGroupBox' column='0'>
954
+            <widget row='0' class='TQGroupBox' column='0'>
955 955
               <property name='name'>
956 956
                 <cstring>GroupBox27</cstring>
957 957
               </property>
@@ -968,7 +968,7 @@
968 968
                 <property name='spacing'>
969 969
                   <number>6</number>
970 970
                 </property>
971
-                <widget class='QLabel'>
971
+                <widget class='TQLabel'>
972 972
                   <property name='name'>
973 973
                     <cstring>TextLabel1</cstring>
974 974
                   </property>
@@ -1000,7 +1000,7 @@
1000 1000
                     <number>2147483647</number>
1001 1001
                   </property>
1002 1002
                 </widget>
1003
-                <widget class='QLabel'>
1003
+                <widget class='TQLabel'>
1004 1004
                   <property name='name'>
1005 1005
                     <cstring>textLabel2</cstring>
1006 1006
                   </property>
@@ -1011,7 +1011,7 @@
1011 1011
                 </widget>
1012 1012
               </hbox>
1013 1013
             </widget>
1014
-            <widget row='0' class='QGroupBox' column='1'>
1014
+            <widget row='0' class='TQGroupBox' column='1'>
1015 1015
               <property name='name'>
1016 1016
                 <cstring>GroupBox17</cstring>
1017 1017
               </property>
@@ -1028,7 +1028,7 @@
1028 1028
                 <property name='spacing'>
1029 1029
                   <number>6</number>
1030 1030
                 </property>
1031
-                <widget class='QCheckBox'>
1031
+                <widget class='TQCheckBox'>
1032 1032
                   <property name='name'>
1033 1033
                     <cstring>statusChk</cstring>
1034 1034
                   </property>
@@ -1041,7 +1041,7 @@
1041 1041
           </grid>
1042 1042
         </widget>
1043 1043
       </widget>
1044
-      <widget class='QLayoutWidget'>
1044
+      <widget class='TQLayoutWidget'>
1045 1045
         <property name='name'>
1046 1046
           <cstring>Layout1</cstring>
1047 1047
         </property>
@@ -1055,7 +1055,7 @@
1055 1055
           <property name='spacing'>
1056 1056
             <number>6</number>
1057 1057
           </property>
1058
-          <widget class='QPushButton'>
1058
+          <widget class='TQPushButton'>
1059 1059
             <property name='name'>
1060 1060
               <cstring>buttonHelp</cstring>
1061 1061
             </property>
@@ -1079,14 +1079,14 @@
1079 1079
             <property name='sizeType'>
1080 1080
               <enum>Expanding</enum>
1081 1081
             </property>
1082
-            <property name='sizeHint'>
1082
+            <property name='tqsizeHint'>
1083 1083
               <size>
1084 1084
                 <width>20</width>
1085 1085
                 <height>20</height>
1086 1086
               </size>
1087 1087
             </property>
1088 1088
           </spacer>
1089
-          <widget class='QPushButton'>
1089
+          <widget class='TQPushButton'>
1090 1090
             <property name='name'>
1091 1091
               <cstring>buttonOk</cstring>
1092 1092
             </property>
@@ -1100,7 +1100,7 @@
1100 1100
               <bool>true</bool>
1101 1101
             </property>
1102 1102
           </widget>
1103
-          <widget class='QPushButton'>
1103
+          <widget class='TQPushButton'>
1104 1104
             <property name='name'>
1105 1105
               <cstring>buttonCancel</cstring>
1106 1106
             </property>
@@ -1190,13 +1190,13 @@
1190 1190
     <include location='local' impldecl='in implementation'>kiconloader.h</include>
1191 1191
     <include location='local' impldecl='in implementation'>kcmprinterdlg.ui.h</include>
1192 1192
   </includes>
1193
-  <slots>
1193
+  <Q_SLOTS>
1194 1194
     <slot>init()</slot>
1195 1195
     <slot>accept()</slot>
1196 1196
     <slot>reject()</slot>
1197 1197
     <slot>printersChkToggled( bool )</slot>
1198
-  </slots>
1199
-  <layoutdefaults margin='11' spacing='6'/>
1198
+  </Q_SLOTS>
1199
+  <tqlayoutdefaults margin='11' spacing='6'/>
1200 1200
   <includehints>
1201 1201
     <includehint>kurlrequester.h</includehint>
1202 1202
     <includehint>klineedit.h</includehint>

+ 1
- 1
filesharing/advanced/kcm_sambaconf/kcmprinterdlg.ui.h View File

@@ -1,7 +1,7 @@
1 1
 /****************************************************************************
2 2
 ** ui.h extension file, included from the uic-generated form implementation.
3 3
 **
4
-** If you wish to add, delete or rename slots use Qt Designer which will
4
+** If you wish to add, delete or rename slots use TQt Designer which will
5 5
 ** update this file, preserving your code. Create an init() slot in place of
6 6
 ** a constructor, and a destroy() slot in place of a destructor.
7 7
 *****************************************************************************/

+ 19
- 19
filesharing/advanced/kcm_sambaconf/kcmsambaconf.cpp View File

@@ -75,8 +75,8 @@
75 75
 #define COL_NOPASSWORD 3
76 76
 
77 77
 
78
-ShareListViewItem::ShareListViewItem(TQListView * parent, SambaShare* share)
79
-  : TQListViewItem(parent)
78
+ShareListViewItem::ShareListViewItem(TQListView * tqparent, SambaShare* share)
79
+  : TQListViewItem(tqparent)
80 80
 {
81 81
   setShare(share);
82 82
 }
@@ -174,8 +174,8 @@ TQPixmap ShareListViewItem::createPropertyPixmap()
174 174
   return TQPixmap(pix);
175 175
 }
176 176
 
177
-KcmSambaConf::KcmSambaConf(TQWidget *parent, const char *name)
178
-  : KCModule(parent,name)
177
+KcmSambaConf::KcmSambaConf(TQWidget *tqparent, const char *name)
178
+  : KCModule(tqparent,name)
179 179
 {
180 180
   _dictMngr = 0L;
181 181
   _sambaFile = 0L;
@@ -919,7 +919,7 @@ void KcmSambaConf::loadCharset(SambaShare* )
919 919
   _dictMngr->add("character set", _interface->characterSetEdit);
920 920
   _dictMngr->add("valid chars", _interface->validCharsEdit);
921 921
   
922
-  _dictMngr->add("unicode",_interface->unicodeChk);
922
+  _dictMngr->add("tqunicode",_interface->tqunicodeChk);
923 923
 }
924 924
 
925 925
 void KcmSambaConf::loadWinbind(SambaShare* )
@@ -1010,7 +1010,7 @@ void KcmSambaConf::loadCommands(SambaShare*)
1010 1010
 
1011 1011
 void KcmSambaConf::setComboIndexToValue(TQComboBox* box, const TQString & value, SambaShare* share) 
1012 1012
 {
1013
-  int i = box->listBox()->index(box->listBox()->findItem(share->getValue(value,false,true),Qt::ExactMatch));
1013
+  int i = box->listBox()->index(box->listBox()->tqfindItem(share->getValue(value,false,true),TQt::ExactMatch));
1014 1014
   box->setCurrentItem(i);
1015 1015
 }
1016 1016
 
@@ -1078,7 +1078,7 @@ void KcmSambaConf::loadUserTab()
1078 1078
   {
1079 1079
     TQStringList::Iterator it;
1080 1080
 
1081
-    it=added.find(unixUser->name);
1081
+    it=added.tqfind(unixUser->name);
1082 1082
     if (it == added.end())
1083 1083
         new KListViewItem(_interface->unixUsersListView, unixUser->name, TQString::number(unixUser->uid));
1084 1084
   }
@@ -1102,7 +1102,7 @@ void KcmSambaConf::joinADomainBtnClicked() {
1102 1102
                             dlg->usernameEdit->text(),
1103 1103
                             dlg->passwordEdit->text()))
1104 1104
     {
1105
-      KMessageBox::sorry(0,i18n("Joining the domain %1 failed.").arg(dlg->domainEdit->text()));
1105
+      KMessageBox::sorry(0,i18n("Joining the domain %1 failed.").tqarg(dlg->domainEdit->text()));
1106 1106
     }
1107 1107
   }
1108 1108
   delete dlg;
@@ -1172,7 +1172,7 @@ void KcmSambaConf::addSambaUserBtnClicked()
1172 1172
     
1173 1173
     TQCString password;
1174 1174
     int passResult = KPasswordDialog::getNewPassword(password, 
1175
-                        i18n("<qt>Please enter a password for the user <b>%1</b></qt>").arg(user.name));
1175
+                        i18n("<qt>Please enter a password for the user <b>%1</b></qt>").tqarg(user.name));
1176 1176
     if (passResult != KPasswordDialog::Accepted) {
1177 1177
        list.remove(item);
1178 1178
        continue;
@@ -1180,7 +1180,7 @@ void KcmSambaConf::addSambaUserBtnClicked()
1180 1180
     
1181 1181
     if (!passwd.addUser(user,password))
1182 1182
     {
1183
-      KMessageBox::sorry(0,i18n("<qt>Adding the user <b>%1</b> to the Samba user database failed.</qt>").arg(user.name));
1183
+      KMessageBox::sorry(0,i18n("<qt>Adding the user <b>%1</b> to the Samba user database failed.</qt>").tqarg(user.name));
1184 1184
       break;
1185 1185
     }
1186 1186
 
@@ -1211,7 +1211,7 @@ void KcmSambaConf::removeSambaUserBtnClicked()
1211 1211
     SambaUser user( item->text(0), item->text(1).toInt() );
1212 1212
     if (!passwd.removeUser(user))
1213 1213
     {
1214
-      KMessageBox::sorry(0,i18n("Removing the user %1 from the Samba user database failed.").arg(user.name));
1214
+      KMessageBox::sorry(0,i18n("Removing the user %1 from the Samba user database failed.").tqarg(user.name));
1215 1215
       continue;
1216 1216
     }
1217 1217
 
@@ -1235,13 +1235,13 @@ void KcmSambaConf::sambaUserPasswordBtnClicked()
1235 1235
     
1236 1236
     TQCString password;
1237 1237
     int passResult = KPasswordDialog::getNewPassword(password,
1238
-                        i18n("Please enter a password for the user %1").arg(user.name));
1238
+                        i18n("Please enter a password for the user %1").tqarg(user.name));
1239 1239
     if (passResult != KPasswordDialog::Accepted)
1240 1240
        return;
1241 1241
     
1242 1242
     if (!passwd.changePassword(user,password))
1243 1243
     {
1244
-      KMessageBox::sorry(0,i18n("Changing the password of the user %1 failed.").arg(user.name));
1244
+      KMessageBox::sorry(0,i18n("Changing the password of the user %1 failed.").tqarg(user.name));
1245 1245
     } else {
1246 1246
       static_cast<QMultiCheckListItem*>(item)->setOn(COL_NOPASSWORD,false);
1247 1247
     }
@@ -1267,7 +1267,7 @@ void KcmSambaConf::save() {
1267 1267
   // Base settings
1268 1268
 
1269 1269
   _smbconf = _interface->configUrlRq->url();
1270
-  KSimpleConfig config(TQString::fromLatin1(FILESHARECONF),false);
1270
+  KSimpleConfig config(TQString::tqfromLatin1(FILESHARECONF),false);
1271 1271
   config.writeEntry("SMBCONF",_smbconf);
1272 1272
   config.sync();
1273 1273
 
@@ -1311,7 +1311,7 @@ void KcmSambaConf::save() {
1311 1311
 bool KcmSambaConf::getSocketBoolValue( const TQString & str, const TQString & name )
1312 1312
 {
1313 1313
   TQString s = str;
1314
-  int i = s.find(name ,0,false);
1314
+  int i = s.tqfind(name ,0,false);
1315 1315
 
1316 1316
   if (i > -1)
1317 1317
   {
@@ -1335,7 +1335,7 @@ bool KcmSambaConf::getSocketBoolValue( const TQString & str, const TQString & na
1335 1335
 int KcmSambaConf::getSocketIntValue( const TQString & str, const TQString & name )
1336 1336
 {
1337 1337
     TQString s = str;
1338
-    int i = s.find(name ,0,false);
1338
+    int i = s.tqfind(name ,0,false);
1339 1339
 
1340