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-ecb5cbfe19da
tags/v3.5.13
tpearson 8 years ago
parent
commit
69cac65817
100 changed files with 1724 additions and 1647 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. +13
    -13
      kdict/sets.cpp

+ 6
- 6
dcoprss/cache.cpp View File

@@ -35,7 +35,7 @@ bool CacheEntry::isValid() const
{
// Cache entries get invalid after on hour. One shouldn't hardcode this
// but for now it'll do.
return m_timeStamp.secsTo( TQDateTime::currentDateTime() ) < 3600;
return m_timeStamp.secsTo( TQDateTime::tqcurrentDateTime() ) < 3600;
}

Cache *Cache::m_instance = 0;
@@ -51,8 +51,8 @@ TQString Cache::getCacheKey( const TQString &server, const TQString &method,
const TQValueList<TQVariant> &args )
{
TQString key;
key = server + TQString::fromLatin1( "__" );
key += method + TQString::fromLatin1( "__" );
key = server + TQString::tqfromLatin1( "__" );
key += method + TQString::tqfromLatin1( "__" );
TQValueList<TQVariant>::ConstIterator it = args.begin();
TQValueList<TQVariant>::ConstIterator end = args.end();
for ( ; it != end; ++it )
@@ -108,16 +108,16 @@ void Cache::save()

void Cache::touch( const TQString &key )
{
CacheEntry *entry = find( key );
CacheEntry *entry = tqfind( key );
if ( !entry )
return;
entry->m_timeStamp = TQDateTime::currentDateTime();
entry->m_timeStamp = TQDateTime::tqcurrentDateTime();
}

void Cache::insert( const TQString &key, const KXMLRPC::Query::Result &result )
{
CacheEntry *entry = new CacheEntry;
entry->m_timeStamp = TQDateTime::currentDateTime();
entry->m_timeStamp = TQDateTime::tqcurrentDateTime();
entry->m_result = result;
TQDict<CacheEntry>::insert( key, entry );
}


+ 6
- 2
dcoprss/cache.h View File

@@ -74,12 +74,16 @@ class Cache : public TQDict<CacheEntry>

inline TQDataStream &operator<<( TQDataStream &s, const CacheEntry &e )
{
return s << e.timeStamp() << e.result();
s << e.timeStamp();
s << e.result();
return s;
}

inline TQDataStream &operator>>( TQDataStream &s, CacheEntry &e )
{
return s >> e.m_timeStamp >> e.m_result;
s >> e.m_timeStamp;
s >> e.m_result;
return s;
}

#endif // CACHE_H


+ 7
- 7
dcoprss/document.cpp View File

@@ -29,7 +29,7 @@ RSSDocument::RSSDocument(const TQString& url) :
m_pix = TQPixmap();
m_isLoading = false;
m_maxAge = 60;
m_Timeout = TQDateTime::currentDateTime();
m_Timeout = TQDateTime::tqcurrentDateTime();
m_state.clear();
}

@@ -40,7 +40,7 @@ RSSDocument::~RSSDocument()
delete m_Doc;
}

void RSSDocument::loadingComplete(Loader *ldr, Document doc, Status stat)
void RSSDocument::loadingComplete(Loader *ldr, Document doc, tqStatus stat)
{


@@ -129,7 +129,7 @@ TQDateTime RSSDocument::lastBuildDate()
if( m_Doc != 0L)
return m_Doc->lastBuildDate();
else
return TQDateTime::currentDateTime();
return TQDateTime::tqcurrentDateTime();
}

TQDateTime RSSDocument::pubDate()
@@ -137,7 +137,7 @@ TQDateTime RSSDocument::pubDate()
if( m_Doc != 0L)
return m_Doc->pubDate();
else
return TQDateTime::currentDateTime();
return TQDateTime::tqcurrentDateTime();
}

TQString RSSDocument::copyright()
@@ -243,14 +243,14 @@ bool RSSDocument::pixmapValid()
void RSSDocument::refresh()
{
kdDebug() << "Mod time " << m_Timeout.toString() << endl;
kdDebug() << "Current time " << TQDateTime::currentDateTime().toString() << endl;
kdDebug() << "Current time " << TQDateTime::tqcurrentDateTime().toString() << endl;

if(!m_isLoading && (TQDateTime::currentDateTime() >= m_Timeout))
if(!m_isLoading && (TQDateTime::tqcurrentDateTime() >= m_Timeout))
{
kdDebug() << "Document going to refresh" << endl;
m_isLoading = true;
Loader *loader = Loader::create(this,
TQT_SLOT(loadingComplete(Loader *, Document, Status)));
TQT_SLOT(loadingComplete(Loader *, Document, tqStatus)));
loader->loadFrom(KURL( m_Url ), new FileRetriever());
documentUpdating(DCOPRef(this));
}


+ 10
- 10
dcoprss/feedbrowser.cpp View File

@@ -13,15 +13,15 @@
#include <tqdatastream.h>
#include <tqvbox.h>

CategoryItem::CategoryItem( KListView *parent, const TQString &category )
: KListViewItem( parent ),
CategoryItem::CategoryItem( KListView *tqparent, const TQString &category )
: KListViewItem( tqparent ),
m_category( category )
{
init();
}

CategoryItem::CategoryItem( KListViewItem *parent, const TQString &category )
: KListViewItem( parent ),
CategoryItem::CategoryItem( KListViewItem *tqparent, const TQString &category )
: KListViewItem( tqparent ),
m_category( category )
{
init();
@@ -32,7 +32,7 @@ void CategoryItem::init()
m_populated = false;
m_dcopIface = 0;

setText( 0, m_category.mid( m_category.findRev( '/' ) + 1 ).replace( '_', ' ' ) );
setText( 0, m_category.mid( m_category.tqfindRev( '/' ) + 1 ).tqreplace( '_', ' ' ) );
}

void CategoryItem::setOpen( bool open )
@@ -66,8 +66,8 @@ void CategoryItem::gotCategories( const TQStringList &categories )
KListViewItem::setOpen( true );
}

DCOPRSSIface::DCOPRSSIface( TQObject *parent, const char *name ) :
TQObject( parent, name ), DCOPObject( "FeedBrowser" )
DCOPRSSIface::DCOPRSSIface( TQObject *tqparent, const char *name ) :
TQObject( tqparent, name ), DCOPObject( "FeedBrowser" )
{
connectDCOPSignal( "rssservice", "RSSQuery", "gotCategories(TQStringList)",
"slotGotCategories(TQStringList)", false );
@@ -87,11 +87,11 @@ void DCOPRSSIface::slotGotCategories( const TQStringList &categories )
emit gotCategories( categories );
}

FeedBrowserDlg::FeedBrowserDlg( TQWidget *parent, const char *name )
: KDialogBase( parent, name, true, i18n( "DCOPRSS Feed Browser" ),
FeedBrowserDlg::FeedBrowserDlg( TQWidget *tqparent, const char *name )
: KDialogBase( tqparent, name, true, i18n( "DCOPRSS Feed Browser" ),
Close, Close, true )
{
m_dcopIface = new DCOPRSSIface( this, "m_dcopIface" );
m_dcopIface = new DCOPRSSIface( TQT_TQOBJECT(this), "m_dcopIface" );
connect( m_dcopIface, TQT_SIGNAL( gotCategories( const TQStringList & ) ),
this, TQT_SLOT( gotTopCategories( const TQStringList & ) ) );



+ 7
- 4
dcoprss/feedbrowser.h View File

@@ -10,8 +10,9 @@ class DCOPRSSIface : public TQObject, public DCOPObject
{
K_DCOP
Q_OBJECT
// TQ_OBJECT
public:
DCOPRSSIface( TQObject *parent, const char *name = 0 );
DCOPRSSIface( TQObject *tqparent, const char *name = 0 );

k_dcop:
void slotGotCategories( const TQStringList &categories );
@@ -26,9 +27,10 @@ class DCOPRSSIface : public TQObject, public DCOPObject
class CategoryItem : public TQObject, public KListViewItem
{
Q_OBJECT
// TQ_OBJECT
public:
CategoryItem( KListView *parent, const TQString &category );
CategoryItem( KListViewItem *parent, const TQString &category );
CategoryItem( KListView *tqparent, const TQString &category );
CategoryItem( KListViewItem *tqparent, const TQString &category );

virtual void setOpen( bool open );

@@ -47,9 +49,10 @@ class CategoryItem : public TQObject, public KListViewItem
class FeedBrowserDlg : public KDialogBase
{
Q_OBJECT
// TQ_OBJECT
friend class CategoryItem;
public:
FeedBrowserDlg( TQWidget *parent, const char *name = 0 );
FeedBrowserDlg( TQWidget *tqparent, const char *name = 0 );

private slots:
void itemSelected( TQListViewItem *item );


+ 3
- 3
dcoprss/query.cpp View File

@@ -58,7 +58,7 @@ void QueryService::cachedCall( const TQString &method,
const TQString cacheKey = Cache::getCacheKey( m_xmlrpcServer->url().url(),
method, args );

CacheEntry *cacheEntry = Cache::self().find( cacheKey );
CacheEntry *cacheEntry = Cache::self().tqfind( cacheKey );
if ( cacheEntry != 0 && cacheEntry->isValid() ) {
kdDebug() << "Using cached result." << endl;
SlotCaller::call( this, slot, cacheEntry->result() );
@@ -74,7 +74,7 @@ void QueryService::updateCache( const KXMLRPC::Query::Result &result )
result.method(),
result.args() );

CacheEntry *cacheEntry = Cache::self().find( cacheKey );
CacheEntry *cacheEntry = Cache::self().tqfind( cacheKey );
if ( cacheEntry == 0 ) {
kdDebug() << "Inserting returned result into cache." << endl;
Cache::self().insert( cacheKey, result );
@@ -113,7 +113,7 @@ void QueryService::getCategories( const TQString &category )
kdDebug() << "QueryService::getCategories()" << endl;

if ( category == "Top" ) {
cachedCall( "syndic8.GetCategoryRoots", Server::toVariantList( TQString::fromLatin1( "DMOZ" ) ),
cachedCall( "syndic8.GetCategoryRoots", Server::toVariantList( TQString::tqfromLatin1( "DMOZ" ) ),
TQT_SLOT( slotGotCategories( const KXMLRPC::Query::Result & ) ) );
} else {
TQStringList args;


+ 8
- 4
dcoprss/query.h View File

@@ -1,6 +1,6 @@
/* $Id$ */
#ifndef _QUERY_SERVICE
#define _QUERY_SERVICE
#ifndef _TQUERY_SERVICE
#define _TQUERY_SERVICE

/***************************************************************************
query.h - A query interface to select RSS feeds.
@@ -32,12 +32,14 @@
class RSSService;

/**
* Helper class which just calls the slot given it's QObject/const char*
* Helper class which just calls the slot given it's TQObject/const char*
* representation.
*/
class SlotCaller : public QObject
class SlotCaller : public TQObject
{
Q_OBJECT
// TQ_OBJECT

public:
static void call( TQObject *object, const char *slot,
const KXMLRPC::Query::Result &value );
@@ -53,6 +55,8 @@ class QueryService : public TQObject, public DCOPObject
{
K_DCOP
Q_OBJECT
// TQ_OBJECT

public:
QueryService( RSSService *service );



+ 52
- 20
dcoprss/rssnewsfeed.h View File

@@ -82,31 +82,63 @@ class RSSNewsFeed

inline TQDataStream &operator<<( TQDataStream &stream, const RSSNewsFeed &feed )
{
return stream << feed.m_id << feed.m_name << feed.m_description
<< feed.m_origin << feed.m_languageCode << feed.m_status
<< feed.m_version << feed.m_homePage << feed.m_sourceFile
<< feed.m_imageUrl << feed.m_webmaster << feed.m_publisher
<< feed.m_creator << feed.m_dateCreated << feed.m_dateApproved
<< feed.m_dateXmlChanged << feed.m_fetchable << feed.m_views
<< feed.m_headlinesPerDay << feed.m_headlinesRank
<< feed.m_toolkit << feed.m_toolkitVersion
<< feed.m_pollingInterval << feed.m_lastPoll
<< feed.m_categories;
stream << feed.m_id;
stream << feed.m_name;
stream << feed.m_description;
stream << feed.m_origin;
stream << feed.m_languageCode;
stream << feed.m_status;
stream << feed.m_version;
stream << feed.m_homePage;
stream << feed.m_sourceFile;
stream << feed.m_imageUrl;
stream << feed.m_webmaster;
stream << feed.m_publisher;
stream << feed.m_creator;
stream << feed.m_dateCreated;
stream << feed.m_dateApproved;
stream << feed.m_dateXmlChanged;
stream << feed.m_fetchable;
stream << feed.m_views;
stream << feed.m_headlinesPerDay;
stream << feed.m_headlinesRank;
stream << feed.m_toolkit;
stream << feed.m_toolkitVersion;
stream << feed.m_pollingInterval;
stream << feed.m_lastPoll;
stream << feed.m_categories;

return stream;
}

inline TQDataStream &operator>>( TQDataStream &stream, RSSNewsFeed &feed )
{
int i;
stream >> feed.m_id >> feed.m_name >> feed.m_description
>> feed.m_origin >> feed.m_languageCode >> feed.m_status
>> feed.m_version >> feed.m_homePage >> feed.m_sourceFile
>> feed.m_imageUrl >> feed.m_webmaster >> feed.m_publisher
>> feed.m_creator >> feed.m_dateCreated >> feed.m_dateApproved
>> feed.m_dateXmlChanged >> i >> feed.m_views
>> feed.m_headlinesPerDay >> feed.m_headlinesRank
>> feed.m_toolkit >> feed.m_toolkitVersion
>> feed.m_pollingInterval >> feed.m_lastPoll
>> feed.m_categories;
stream >> feed.m_id;
stream >> feed.m_name;
stream >> feed.m_description;
stream >> feed.m_origin;
stream >> feed.m_languageCode;
stream >> feed.m_status;
stream >> feed.m_version;
stream >> feed.m_homePage;
stream >> feed.m_sourceFile;
stream >> feed.m_imageUrl;
stream >> feed.m_webmaster;
stream >> feed.m_publisher;
stream >> feed.m_creator;
stream >> feed.m_dateCreated;
stream >> feed.m_dateApproved;
stream >> feed.m_dateXmlChanged;
stream >> i;
stream >> feed.m_views;
stream >> feed.m_headlinesPerDay;
stream >> feed.m_headlinesRank;
stream >> feed.m_toolkit;
stream >> feed.m_toolkitVersion;
stream >> feed.m_pollingInterval;
stream >> feed.m_lastPoll;
stream >> feed.m_categories;
feed.m_fetchable = i != 0;
return stream;
}


+ 1
- 1
dcoprss/service.cpp View File

@@ -45,7 +45,7 @@ TQStringList RSSService::list()

DCOPRef RSSService::add(TQString id)
{
if(m_list.find(id) == 0L) { // add a new one only if we need to
if(m_list.tqfind(id) == 0L) { // add a new one only if we need to
m_list.insert(id, new RSSDocument(id));
added(id);
saveLinks();


+ 2
- 1
dcoprss/service.h View File

@@ -109,6 +109,7 @@ class RSSService : public DCOPObject
class RSSDocument : public TQObject, public DCOPObject
{
Q_OBJECT
// TQ_OBJECT
K_DCOP

private:
@@ -123,7 +124,7 @@ class RSSDocument : public TQObject, public DCOPObject

private slots:
void pixmapLoaded(const TQPixmap&);
void loadingComplete(Loader *, Document, Status);
void loadingComplete(Loader *, Document, tqStatus);

public:
RSSDocument(const TQString& url);


+ 6
- 6
dcoprss/xmlrpciface.cpp View File

@@ -33,9 +33,9 @@

using namespace KXMLRPC;

Query *Query::create( TQObject *parent, const char *name )
Query *Query::create( TQObject *tqparent, const char *name )
{
return new Query( parent, name );
return new Query( tqparent, name );
}

void Query::call( const TQString &server, const TQString &method,
@@ -255,7 +255,7 @@ TQVariant Query::demarshal( const TQDomElement &elem )
else
return TQVariant( false );
} else if ( typeName == "base64" )
return TQVariant( KCodecs::base64Decode( typeElement.text().latin1() ) );
return TQVariant( KCodecs::base64Decode( TQCString(typeElement.text().latin1() )) );
else if ( typeName == "datetime" || typeName == "datetime.iso8601" )
return TQVariant( TQDateTime::fromString( typeElement.text(), Qt::ISODate ) );
else if ( typeName == "array" ) {
@@ -282,7 +282,7 @@ TQVariant Query::demarshal( const TQDomElement &elem )
return TQVariant();
}

Query::Query( TQObject *parent, const char *name ) : TQObject( parent, name )
Query::Query( TQObject *tqparent, const char *name ) : TQObject( tqparent, name )
{
}

@@ -352,8 +352,8 @@ TQValueList<TQVariant> Server::toVariantList( const TQStringList &arg )
return args;
}

Server::Server( const KURL &url, TQObject *parent, const char *name )
: TQObject( parent, name )
Server::Server( const KURL &url, TQObject *tqparent, const char *name )
: TQObject( tqparent, name )
{
if ( url.isValid() )
m_url = url;


+ 7
- 5
dcoprss/xmlrpciface.h View File

@@ -47,9 +47,10 @@ namespace KXMLRPC
class QueryResult;
class Server;

class Query : public QObject
class Query : public TQObject
{
Q_OBJECT
TQ_OBJECT
public:
class Result
{
@@ -76,7 +77,7 @@ namespace KXMLRPC
TQValueList<TQVariant> m_args;
};

static Query *create( TQObject *parent = 0, const char *name = 0 );
static Query *create( TQObject *tqparent = 0, const char *name = 0 );
static TQString marshal( const TQVariant &v );
static TQVariant demarshal( const TQDomElement &e );

@@ -104,7 +105,7 @@ namespace KXMLRPC
TQString markupCall( const TQString &method,
const TQValueList<TQVariant> &args ) const;

Query( TQObject *parent = 0, const char *name = 0 );
Query( TQObject *tqparent = 0, const char *name = 0 );

TQBuffer m_buffer;
TQString m_server;
@@ -112,12 +113,13 @@ namespace KXMLRPC
TQValueList<TQVariant> m_args;
};

class Server : public QObject
class Server : public TQObject
{
Q_OBJECT
TQ_OBJECT
public:
Server( const KURL &url = KURL(),
TQObject *parent = 0, const char *name = 0 );
TQObject *tqparent = 0, const char *name = 0 );

const KURL &url() const { return m_url; }
void setUrl( const KURL &url );


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

@@ -2,7 +2,7 @@
common.cpp - description
-------------------
begin : Tue June 6 2002
copyright : (C) 2002 by Jan Schäfer
copyright : (C) 2002 by Jan Sch�fer
email : janschaefer@users.sourceforge.net
***************************************************************************/

@@ -34,7 +34,7 @@

void setComboToString(TQComboBox* combo,const TQString & s)
{
int i = combo->listBox()->index(combo->listBox()->findItem(s,Qt::ExactMatch));
int i = combo->listBox()->index(combo->listBox()->tqfindItem(s,TQt::ExactMatch));
combo->setCurrentItem(i);
}



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

@@ -58,7 +58,7 @@ DictManager::~DictManager() {

void DictManager::handleUnsupportedWidget(const TQString & s, TQWidget* w) {
w->setEnabled(false);
TQToolTip::add(w,i18n("The option <em>%1</em> is not supported by your Samba version").arg(s));
TQToolTip::add(w,i18n("The option <em>%1</em> is not supported by your Samba version").tqarg(s));
}

void DictManager::add(const TQString & key, TQLineEdit* lineEdit) {


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

@@ -41,9 +41,10 @@ class TQStringList;
/**
* @author Jan Schäfer
**/
class DictManager : public QObject
class DictManager : public TQObject
{
Q_OBJECT
TQ_OBJECT
public :
DictManager(SambaShare *share);
virtual ~DictManager();


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

@@ -1,6 +1,6 @@
<!DOCTYPE UI><UI version="3.0" stdsetdef="1">
<class>ExpertUserDlg</class>
<widget class="QDialog">
<widget class="TQDialog">
<property name="name">
<cstring>ExpertUserDlg</cstring>
</property>
@@ -22,7 +22,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
<widget class="QLabel" row="0" column="0">
<widget class="TQLabel" row="0" column="0">
<property name="name">
<cstring>TextLabel12</cstring>
</property>
@@ -41,12 +41,12 @@
<cstring>validUsersEdit</cstring>
</property>
</widget>
<widget class="QLineEdit" row="0" column="1">
<widget class="TQLineEdit" row="0" column="1">
<property name="name">
<cstring>validUsersEdit</cstring>
</property>
</widget>
<widget class="QLabel" row="3" column="0">
<widget class="TQLabel" row="3" column="0">
<property name="name">
<cstring>TextLabel12_2_2_2</cstring>
</property>
@@ -65,12 +65,12 @@
<cstring>adminUsersEdit</cstring>
</property>
</widget>
<widget class="QLineEdit" row="3" column="1">
<widget class="TQLineEdit" row="3" column="1">
<property name="name">
<cstring>adminUsersEdit</cstring>
</property>
</widget>
<widget class="QLabel" row="4" column="0">
<widget class="TQLabel" row="4" column="0">
<property name="name">
<cstring>TextLabel12_2_2_2_2</cstring>
</property>
@@ -89,12 +89,12 @@
<cstring>invalidUsersEdit</cstring>
</property>
</widget>
<widget class="QLineEdit" row="4" column="1">
<widget class="TQLineEdit" row="4" column="1">
<property name="name">
<cstring>invalidUsersEdit</cstring>
</property>
</widget>
<widget class="QFrame" row="6" column="0" rowspan="1" colspan="2">
<widget class="TQFrame" row="6" column="0" rowspan="1" colspan="2">
<property name="name">
<cstring>frame16</cstring>
</property>
@@ -105,7 +105,7 @@
<enum>Raised</enum>
</property>
</widget>
<widget class="QLayoutWidget" row="7" column="0" rowspan="1" colspan="2">
<widget class="TQLayoutWidget" row="7" column="0" rowspan="1" colspan="2">
<property name="name">
<cstring>Layout1</cstring>
</property>
@@ -129,14 +129,14 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="sizeHint">
<property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
</size>
</property>
</spacer>
<widget class="QPushButton">
<widget class="TQPushButton">
<property name="name">
<cstring>buttonOk</cstring>
</property>
@@ -153,7 +153,7 @@
<bool>true</bool>
</property>
</widget>
<widget class="QPushButton">
<widget class="TQPushButton">
<property name="name">
<cstring>buttonCancel</cstring>
</property>
@@ -179,14 +179,14 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="sizeHint">
<property name="tqsizeHint">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
<widget class="QLabel" row="2" column="0">
<widget class="TQLabel" row="2" column="0">
<property name="name">
<cstring>TextLabel12_2</cstring>
</property>
@@ -205,17 +205,17 @@
<cstring>writeListEdit</cstring>
</property>
</widget>
<widget class="QLineEdit" row="2" column="1">
<widget class="TQLineEdit" row="2" column="1">
<property name="name">
<cstring>writeListEdit</cstring>
</property>
</widget>
<widget class="QLineEdit" row="1" column="1">
<widget class="TQLineEdit" row="1" column="1">
<property name="name">
<cstring>readListEdit</cstring>
</property>
</widget>
<widget class="QLabel" row="1" column="0">
<widget class="TQLabel" row="1" column="0">
<property name="name">
<cstring>TextLabel12_2_2</cstring>
</property>
@@ -259,5 +259,5 @@
<tabstop>buttonOk</tabstop>
<tabstop>buttonCancel</tabstop>
</tabstops>
<layoutdefaults spacing="6" margin="11"/>
<tqlayoutdefaults spacing="6" margin="11"/>
</UI>

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

@@ -1,6 +1,6 @@
<!DOCTYPE UI><UI version="3.0" stdsetdef="1">
<class>FileModeDlg</class>
<widget class="QDialog">
<widget class="TQDialog">
<property name="name">
<cstring>FileModeDlg</cstring>
</property>
@@ -22,7 +22,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
<widget class="QGroupBox">
<widget class="TQGroupBox">
<property name="name">
<cstring>GroupBox1</cstring>
</property>
@@ -67,7 +67,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="sizeHint">
<property name="tqsizeHint">
<size>
<width>20</width>
<height>43</height>
@@ -84,14 +84,14 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="sizeHint">
<property name="tqsizeHint">
<size>
<width>70</width>
<height>20</height>
</size>
</property>
</spacer>
<widget class="QLabel" row="3" column="0">
<widget class="TQLabel" row="3" column="0">
<property name="name">
<cstring>TextLabel3</cstring>
</property>
@@ -103,7 +103,7 @@
<string>Others</string>
</property>
</widget>
<widget class="QLabel" row="0" column="1">
<widget class="TQLabel" row="0" column="1">
<property name="name">
<cstring>TextLabel4</cstring>
</property>
@@ -115,7 +115,7 @@
<string>Read</string>
</property>
</widget>
<widget class="QCheckBox" row="3" column="1">
<widget class="TQCheckBox" row="3" column="1">
<property name="name">
<cstring>othersReadChk</cstring>
</property>
@@ -127,7 +127,7 @@
<string></string>
</property>
</widget>
<widget class="QLabel" row="0" column="3">
<widget class="TQLabel" row="0" column="3">
<property name="name">
<cstring>TextLabel6</cstring>
</property>
@@ -139,7 +139,7 @@
<string>Exec</string>
</property>
</widget>
<widget class="QLabel" row="0" column="2">
<widget class="TQLabel" row="0" column="2">
<property name="name">
<cstring>TextLabel5</cstring>
</property>
@@ -151,7 +151,7 @@
<string>Write</string>
</property>
</widget>
<widget class="QCheckBox" row="2" column="2">
<widget class="TQCheckBox" row="2" column="2">
<property name="name">
<cstring>groupWriteChk</cstring>
</property>
@@ -163,7 +163,7 @@
<string></string>
</property>
</widget>
<widget class="QCheckBox" row="3" column="2">
<widget class="TQCheckBox" row="3" column="2">
<property name="name">
<cstring>othersWriteChk</cstring>
</property>
@@ -175,7 +175,7 @@
<string></string>
</property>
</widget>
<widget class="QCheckBox" row="1" column="2">
<widget class="TQCheckBox" row="1" column="2">
<property name="name">
<cstring>ownerWriteChk</cstring>
</property>
@@ -187,7 +187,7 @@
<string></string>
</property>
</widget>
<widget class="QCheckBox" row="3" column="3">
<widget class="TQCheckBox" row="3" column="3">
<property name="name">
<cstring>othersExecChk</cstring>
</property>
@@ -199,7 +199,7 @@
<string></string>
</property>
</widget>
<widget class="QCheckBox" row="2" column="1">
<widget class="TQCheckBox" row="2" column="1">
<property name="name">
<cstring>groupReadChk</cstring>
</property>
@@ -211,7 +211,7 @@
<string></string>
</property>
</widget>
<widget class="QCheckBox" row="1" column="1">
<widget class="TQCheckBox" row="1" column="1">
<property name="name">
<cstring>ownerReadChk</cstring>
</property>
@@ -223,7 +223,7 @@
<string></string>
</property>
</widget>
<widget class="QLabel" row="1" column="0">
<widget class="TQLabel" row="1" column="0">
<property name="name">
<cstring>TextLabel1</cstring>
</property>
@@ -235,7 +235,7 @@
<string>Owner</string>
</property>
</widget>
<widget class="QCheckBox" row="2" column="3">
<widget class="TQCheckBox" row="2" column="3">
<property name="name">
<cstring>groupExecChk</cstring>
</property>
@@ -247,7 +247,7 @@
<string></string>
</property>
</widget>
<widget class="QLabel" row="2" column="0">
<widget class="TQLabel" row="2" column="0">
<property name="name">
<cstring>TextLabel2</cstring>
</property>
@@ -259,7 +259,7 @@
<string>Group</string>
</property>
</widget>
<widget class="QCheckBox" row="1" column="3">
<widget class="TQCheckBox" row="1" column="3">
<property name="name">
<cstring>ownerExecChk</cstring>
</property>
@@ -271,7 +271,7 @@
<string></string>
</property>
</widget>
<widget class="QCheckBox" row="3" column="5">
<widget class="TQCheckBox" row="3" column="5">
<property name="name">
<cstring>stickyBitChk</cstring>
</property>
@@ -283,7 +283,7 @@
<string>Sticky</string>
</property>
</widget>
<widget class="QCheckBox" row="2" column="5">
<widget class="TQCheckBox" row="2" column="5">
<property name="name">
<cstring>setGIDChk</cstring>
</property>
@@ -295,7 +295,7 @@
<string>Set GID</string>
</property>
</widget>
<widget class="QCheckBox" row="1" column="5">
<widget class="TQCheckBox" row="1" column="5">
<property name="name">
<cstring>setUIDChk</cstring>
</property>
@@ -307,7 +307,7 @@
<string>Set UID</string>
</property>
</widget>
<widget class="QLabel" row="0" column="5">
<widget class="TQLabel" row="0" column="5">
<property name="name">
<cstring>TextLabel8</cstring>
</property>
@@ -321,7 +321,7 @@
</widget>
</grid>
</widget>
<widget class="QLayoutWidget">
<widget class="TQLayoutWidget">
<property name="name">
<cstring>Layout1</cstring>
</property>
@@ -335,7 +335,7 @@
<property name="spacing">
<number>6</number>
</property>
<widget class="QPushButton">
<widget class="TQPushButton">
<property name="name">
<cstring>buttonHelp</cstring>
</property>
@@ -359,14 +359,14 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="sizeHint">
<property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
</size>
</property>
</spacer>
<widget class="QPushButton">
<widget class="TQPushButton">
<property name="name">
<cstring>buttonOk</cstring>
</property>
@@ -380,7 +380,7 @@
<bool>true</bool>
</property>
</widget>
<widget class="QPushButton">
<widget class="TQPushButton">
<property name="name">
<cstring>buttonCancel</cstring>
</property>
@@ -426,5 +426,5 @@
<tabstop>buttonOk</tabstop>
<tabstop>buttonCancel</tabstop>
</tabstops>
<layoutdefaults spacing="6" margin="11"/>
<tqlayoutdefaults spacing="6" margin="11"/>
</UI>

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

@@ -35,8 +35,8 @@

#include "filemodedlgimpl.h"

FileModeDlgImpl::FileModeDlgImpl(TQWidget* parent, TQLineEdit* edit)
: FileModeDlg(parent)
FileModeDlgImpl::FileModeDlgImpl(TQWidget* tqparent, TQLineEdit* edit)
: FileModeDlg(tqparent)
{
assert(edit);
_edit = edit;


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

@@ -45,14 +45,15 @@ class TQLineEdit;
* e.g. 0744
* After the user has changed the access rights with the dialog
* the class sets the new access rights as a new octal string
* of the QLineEdit
* of the TQLineEdit
* Implements the filemodedlg.ui interface
**/
class FileModeDlgImpl : public FileModeDlg
{
Q_OBJECT
TQ_OBJECT
public:
FileModeDlgImpl(TQWidget* parent, TQLineEdit* edit);
FileModeDlgImpl(TQWidget* tqparent, TQLineEdit* edit);
~FileModeDlgImpl();
protected:
TQLineEdit* _edit;


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

@@ -1,6 +1,6 @@
<!DOCTYPE UI><UI version="3.0" stdsetdef="1">
<class>GroupSelectDlg</class>
<widget class="QDialog">
<widget class="TQDialog">
<property name="name">
<cstring>GroupSelectDlg</cstring>
</property>
@@ -28,7 +28,7 @@
<property name="spacing">
<number>6</number>
</property>
<widget class="QLayoutWidget" row="4" column="0" rowspan="1" colspan="2">
<widget class="TQLayoutWidget" row="4" column="0" rowspan="1" colspan="2">
<property name="name">
<cstring>Layout1</cstring>
</property>
@@ -52,14 +52,14 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="sizeHint">
<property name="tqsizeHint">
<size>
<width>285</width>
<height>20</height>
</size>
</property>
</spacer>
<widget class="QPushButton">
<widget class="TQPushButton">
<property name="name">
<cstring>buttonOk</cstring>
</property>
@@ -76,7 +76,7 @@
<bool>true</bool>
</property>
</widget>
<widget class="QPushButton">
<widget class="TQPushButton">
<property name="name">
<cstring>buttonCancel</cstring>
</property>
@@ -92,7 +92,7 @@
</widget>
</hbox>
</widget>
<widget class="QFrame" row="3" column="0" rowspan="1" colspan="2">
<widget class="TQFrame" row="3" column="0" rowspan="1" colspan="2">
<property name="name">
<cstring>frame16</cstring>
</property>
@@ -113,14 +113,14 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="sizeHint">
<property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
</size>
</property>
</spacer>
<widget class="QGroupBox" row="0" column="0" rowspan="3" colspan="1">
<widget class="TQGroupBox" row="0" column="0" rowspan="3" colspan="1">
<property name="name">
<cstring>groupBox87</cstring>
</property>
@@ -145,7 +145,7 @@
<property name="spacing">
<number>6</number>
</property>
<widget class="QListView">
<widget class="TQListView">
<column>
<property name="text">
<string>Name</string>
@@ -185,7 +185,7 @@
</widget>
</vbox>
</widget>
<widget class="QButtonGroup" row="0" column="1">
<widget class="TQButtonGroup" row="0" column="1">
<property name="name">
<cstring>accessBtnGrp</cstring>
</property>
@@ -210,7 +210,7 @@
<property name="spacing">
<number>6</number>
</property>
<widget class="QRadioButton">
<widget class="TQRadioButton">
<property name="name">
<cstring>defaultRadio</cstring>
</property>
@@ -232,7 +232,7 @@
<bool>true</bool>
</property>
</widget>
<widget class="QRadioButton">
<widget class="TQRadioButton">
<property name="name">
<cstring>readRadio</cstring>
</property>
@@ -251,7 +251,7 @@
<number>8388690</number>
</property>
</widget>
<widget class="QRadioButton">
<widget class="TQRadioButton">
<property name="name">
<cstring>writeRadio</cstring>
</property>
@@ -270,7 +270,7 @@
<number>8388695</number>
</property>
</widget>
<widget class="QRadioButton">
<widget class="TQRadioButton">
<property name="name">
<cstring>adminRadio</cstring>
</property>
@@ -289,7 +289,7 @@
<number>8388673</number>
</property>
</widget>
<widget class="QRadioButton">
<widget class="TQRadioButton">
<property name="name">
<cstring>noAccessRadio</cstring>
</property>
@@ -310,7 +310,7 @@
</widget>
</vbox>
</widget>
<widget class="QButtonGroup" row="1" column="1">
<widget class="TQButtonGroup" row="1" column="1">
<property name="name">
<cstring>kindBtnGrp</cstring>
</property>
@@ -327,7 +327,7 @@
<property name="spacing">
<number>6</number>
</property>
<widget class="QRadioButton">
<widget class="TQRadioButton">
<property name="name">
<cstring>unixRadio</cstring>
</property>
@@ -352,7 +352,7 @@
<number>0</number>
</property>
</widget>
<widget class="QRadioButton">
<widget class="TQRadioButton">
<property name="name">
<cstring>nisRadio</cstring>
</property>
@@ -377,7 +377,7 @@
<number>1</number>
</property>
</widget>
<widget class="QRadioButton">
<widget class="TQRadioButton">
<property name="name">
<cstring>bothRadio</cstring>
</property>
@@ -425,21 +425,21 @@
<tabstop>buttonCancel</tabstop>
</tabstops>
<includes>
<include location="local" impldecl="in declaration">qstringlist.h</include>
<include location="local" impldecl="in declaration">tqstringlist.h</include>
<include location="local" impldecl="in implementation">passwd.h</include>
<include location="local" impldecl="in implementation">groupselectdlg.ui.h</include>
</includes>
<variables>
<variable>QString groupKind;</variable>
<variable>int access;</variable>
<variable>QStringList selectedGroups;</variable>
<variable>TQStringList selectedGroups;</variable>
</variables>
<slots>
<slot>init( const QStringList &amp; specifiedGroups )</slot>
<Q_SLOTS>
<slot>init( const TQStringList &amp; specifiedGroups )</slot>
<slot access="protected">accept()</slot>
<slot returnType="QStringList">getSelectedGroups()</slot>
<slot returnType="TQStringList">getSelectedGroups()</slot>
<slot returnType="int">getAccess()</slot>
<slot returnType="QString">getGroupKind()</slot>
</slots>
<layoutdefaults spacing="6" margin="11"/>
<slot returnType="TQString">getGroupKind()</slot>
</Q_SLOTS>
<tqlayoutdefaults spacing="6" margin="11"/>
</UI>

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

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

for (TQStringList::Iterator it = unixGroups.begin(); it != unixGroups.end(); ++it)
{
if ( ! specifiedGroups.contains(*it))
if ( ! specifiedGroups.tqcontains(*it))
new TQListViewItem(groupListView, *it, TQString::number(getGroupGID(*it)));
}
}


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

@@ -62,8 +62,8 @@

#define HIDDENTABINDEX 5

HiddenListViewItem::HiddenListViewItem( TQListView *parent, KFileItem *fi, bool hidden=false, bool veto=false, bool vetoOplock=false )
: QMultiCheckListItem( parent )
HiddenListViewItem::HiddenListViewItem( TQListView *tqparent, KFileItem *fi, bool hidden=false, bool veto=false, bool vetoOplock=false )
: QMultiCheckListItem( tqparent )
{
setPixmap( COL_NAME, fi->pixmap(KIcon::SizeSmall));

@@ -91,7 +91,7 @@ KFileItem* HiddenListViewItem::getFileItem()
}


void HiddenListViewItem::paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int alignment)
void HiddenListViewItem::paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int tqalignment)
{
TQColorGroup _cg = cg;

@@ -101,7 +101,7 @@ void HiddenListViewItem::paintCell(TQPainter *p, const TQColorGroup &cg, int col
if (isOn(COL_HIDDEN))
_cg.setColor(TQColorGroup::Text,gray);

QMultiCheckListItem::paintCell(p, _cg, column, width, alignment);
QMultiCheckListItem::paintCell(p, _cg, column, width, tqalignment);
}


@@ -397,14 +397,14 @@ void HiddenFileView::checkBoxClicked(TQCheckBox* chkBox,KToggleAction* action,TQ
if (rx) {
// perhaps it is matched by a wildcard string
TQString p = rx->pattern();
if ( p.find("*") > -1 ||
p.find("?") > -1 )
if ( p.tqfind("*") > -1 ||
p.tqfind("?") > -1 )
{
// TODO after message freeze: why show three times the wildcard string? Once should be enough.
// TODO remove <b></b> and use <qt> instead
int result = KMessageBox::questionYesNo(_dlg,i18n(
"<b></b>Some files you have selected are matched by the wildcarded string <b>'%1'</b>; "
"do you want to uncheck all files matching <b>'%1'</b>?").arg(rx->pattern()).arg(rx->pattern()).arg(rx->pattern()),
"do you want to uncheck all files matching <b>'%1'</b>?").tqarg(rx->pattern()).tqarg(rx->pattern()).tqarg(rx->pattern()),
i18n("Wildcarded String"),i18n("Uncheck Matches"),i18n("Keep Selected"));
TQPtrList<HiddenListViewItem> lst = getMatchingItems( *rx );
@@ -451,7 +451,7 @@ void HiddenFileView::vetoChkClicked(bool b)
}

/**
* Sets the text of the TQLineEdit edit to the entries of the passed QRegExp-List
* Sets the text of the TQLineEdit edit to the entries of the passed TQRegExp-List
**/
void HiddenFileView::updateEdit(TQLineEdit* edit, TQPtrList<TQRegExp> & lst)
{
@@ -519,7 +519,7 @@ void HiddenFileView::updateView()
item->setOn(COL_VETO_OPLOCK,matchVetoOplock(item->text(0)));
}

_dlg->hiddenListView->repaint();
_dlg->hiddenListView->tqrepaint();
}




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

@@ -2,7 +2,7 @@
hiddenfileview.h - description
-------------------
begin : Wed Jan 1 2003
copyright : (C) 2003 by Jan Schäfer
copyright : (C) 2003 by Jan Sch�fer
email : janschaefer@users.sourceforge.net
***************************************************************************/

@@ -42,11 +42,12 @@ class SambaShare;
class HiddenListViewItem : public QMultiCheckListItem
{
Q_OBJECT
TQ_OBJECT
public:
HiddenListViewItem( TQListView *parent, KFileItem *fi, bool hidden, bool veto, bool vetoOplock );
HiddenListViewItem( TQListView *tqparent, KFileItem *fi, bool hidden, bool veto, bool vetoOplock );
~HiddenListViewItem();

virtual void paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int alignment);
virtual void paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int tqalignment);

KFileItem* getFileItem();
protected:
@@ -66,9 +67,10 @@ class ShareDlgImpl;
* of the SambaShare an offers the possibility of
* selecting the files which should be hidden
**/
class HiddenFileView : public QObject
class HiddenFileView : public TQObject
{
Q_OBJECT
TQ_OBJECT

public:
HiddenFileView(ShareDlgImpl* shareDlg, SambaShare* share);


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

@@ -1,6 +1,6 @@
<!DOCTYPE UI><UI version="3.0" stdsetdef="1">
<class>JoinDomainDlg</class>
<widget class="QDialog">
<widget class="TQDialog">
<property name="name">
<cstring>JoinDomainDlg</cstring>
</property>
@@ -22,7 +22,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
<widget class="QLayoutWidget" row="7" column="0" rowspan="1" colspan="2">
<widget class="TQLayoutWidget" row="7" column="0" rowspan="1" colspan="2">
<property name="name">
<cstring>Layout1</cstring>
</property>
@@ -46,14 +46,14 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="sizeHint">
<property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
</size>
</property>
</spacer>
<widget class="QPushButton">
<widget class="TQPushButton">
<property name="name">
<cstring>buttonOk</cstring>
</property>
@@ -70,7 +70,7 @@
<bool>true</bool>
</property>
</widget>
<widget class="QPushButton">
<widget class="TQPushButton">
<property name="name">
<cstring>buttonCancel</cstring>
</property>
@@ -86,22 +86,22 @@
</widget>
</hbox>
</widget>
<widget class="QLineEdit" row="0" column="1">
<widget class="TQLineEdit" row="0" column="1">
<property name="name">
<cstring>domainEdit</cstring>
</property>
</widget>
<widget class="QLineEdit" row="1" column="1">
<widget class="TQLineEdit" row="1" column="1">
<property name="name">
<cstring>domainControllerEdit</cstring>
</property>
</widget>
<widget class="QLineEdit" row="2" column="1">
<widget class="TQLineEdit" row="2" column="1">
<property name="name">
<cstring>usernameEdit</cstring>
</property>
</widget>
<widget class="QLabel" row="4" column="0">
<widget class="TQLabel" row="4" column="0">
<property name="name">
<cstring>textLabel5_2_2</cstring>
</property>
@@ -112,7 +112,7 @@
<cstring>verifyEdit</cstring>
</property>
</widget>
<widget class="QLabel" row="3" column="0">
<widget class="TQLabel" row="3" column="0">
<property name="name">
<cstring>textLabel5_2</cstring>
</property>
@@ -123,7 +123,7 @@
<cstring>passwordEdit</cstring>
</property>
</widget>
<widget class="QLabel" row="2" column="0">
<widget class="TQLabel" row="2" column="0">
<property name="name">
<cstring>textLabel5</cstring>
</property>
@@ -134,7 +134,7 @@
<cstring>usernameEdit</cstring>
</property>
</widget>
<widget class="QLabel" row="1" column="0">
<widget class="TQLabel" row="1" column="0">
<property name="name">
<cstring>textLabel4_2</cstring>
</property>
@@ -145,7 +145,7 @@
<cstring>domainControllerEdit</cstring>
</property>
</widget>
<widget class="QLabel" row="0" column="0">
<widget class="TQLabel" row="0" column="0">
<property name="name">
<cstring>textLabel4</cstring>
</property>
@@ -190,7 +190,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="sizeHint">
<property name="tqsizeHint">
<size>
<width>20</width>
<height>40</height>
@@ -228,10 +228,10 @@
<include location="global" impldecl="in implementation">klocale.h</include>
<include location="local" impldecl="in implementation">joindomaindlg.ui.h</include>
</includes>
<slots>
<Q_SLOTS>
<slot>accept()</slot>
</slots>
<layoutdefaults spacing="6" margin="11"/>
</Q_SLOTS>
<tqlayoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>kpassdlg.h</includehint>
<includehint>kpassdlg.h</includehint>


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

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


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


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

@@ -21,11 +21,11 @@
* *
******************************************************************************/
</comment>
<widget class='QDialog'>
<widget class='TQDialog'>
<property name='name'>
<cstring>KcmPrinterDlg</cstring>
</property>
<property name='geometry'>
<property name='tqgeometry'>
<rect>
<x>0</x>
<y>0</y>
@@ -46,11 +46,11 @@
<property name='spacing'>
<number>6</number>
</property>
<widget class='QTabWidget'>
<widget class='TQTabWidget'>
<property name='name'>
<cstring>_tabs</cstring>
</property>
<widget class='QWidget'>
<widget class='TQWidget'>
<property name='name'>
<cstring>tab</cstring>
</property>
@@ -61,7 +61,7 @@
<property name='name'>
<cstring>unnamed</cstring>
</property>
<widget class='QLayoutWidget'>
<widget class='TQLayoutWidget'>
<property name='name'>
<cstring>Layout51</cstring>
</property>
@@ -75,7 +75,7 @@
<property name='spacing'>
<number>6</number>
</property>
<widget class='QFrame'>
<widget class='TQFrame'>
<property name='name'>
<cstring>pixFrame</cstring>
</property>
@@ -95,7 +95,7 @@
<property name='spacing'>
<number>6</number>
</property>
<widget class='QLabel'>
<widget class='TQLabel'>
<property name='name'>
<cstring>printerPixLbl</cstring>
</property>
@@ -116,7 +116,7 @@
</widget>
</vbox>
</widget>
<widget class='QGroupBox'>
<widget class='TQGroupBox'>
<property name='name'>
<cstring>printerGrp</cstring>
</property>
@@ -136,7 +136,7 @@
<property name='spacing'>
<number>6</number>
</property>
<widget class='QLayoutWidget'>
<widget class='TQLayoutWidget'>
<property name='name'>
<cstring>Layout49</cstring>
</property>
@@ -155,7 +155,7 @@
<cstring>pathUrlRq</cstring>
</property>
</widget>
<widget row='1' class='QLabel' column='0'>
<widget row='1' class='TQLabel' column='0'>
<property name='name'>
<cstring>TextLabel7</cstring>
</property>
@@ -166,7 +166,7 @@
<cstring>pathUrlRq</cstring>
</property>
</widget>
<widget row='0' class='QLabel' column='0'>
<widget row='0' class='TQLabel' column='0'>
<property name='name'>
<cstring>TextLabel4_2</cstring>
</property>
@@ -177,7 +177,7 @@
<cstring>queueCombo</cstring>
</property>
</widget>
<widget row='0' class='QLayoutWidget' column='1'>
<widget row='0' class='TQLayoutWidget' column='1'>
<property name='name'>
<cstring>Layout48</cstring>
</property>
@@ -196,7 +196,7 @@
<cstring>queueCombo</cstring>
</property>
</widget>
<widget class='QCheckBox'>
<widget class='TQCheckBox'>
<property name='name'>
<cstring>printersChk</cstring>
</property>
@@ -215,7 +215,7 @@
</widget>
</hbox>
</widget>
<widget class='QGroupBox'>
<widget class='TQGroupBox'>
<property name='name'>
<cstring>identifierGrp</cstring>
</property>
@@ -232,7 +232,7 @@
<property name='spacing'>
<number>6</number>
</property>
<widget row='0' class='QLabel' column='0'>
<widget row='0' class='TQLabel' column='0'>
<property name='name'>
<cstring>Lbl_shareName</cstring>
</property>
@@ -243,7 +243,7 @@
<cstring>shareNameEdit</cstring>
</property>
</widget>
<widget row='1' class='QLabel' column='0'>
<widget row='1' class='TQLabel' column='0'>
<property name='name'>
<cstring>TextLabel3</cstring>
</property>
@@ -266,7 +266,7 @@
</widget>
</grid>
</widget>
<widget class='QGroupBox'>
<widget class='TQGroupBox'>
<property name='name'>
<cstring>GroupBox4</cstring>
</property>
@@ -283,7 +283,7 @@
<property name='spacing'>
<number>6</number>
</property>
<widget class='QCheckBox'>
<widget class='TQCheckBox'>
<property name='name'>
<cstring>availableBaseChk</cstring>
</property>
@@ -291,7 +291,7 @@
<string>A&amp;vailable</string>
</property>
</widget>
<widget class='QCheckBox'>
<widget class='TQCheckBox'>
<property name='name'>
<cstring>browseableBaseChk</cstring>
</property>
@@ -299,7 +299,7 @@
<string>Bro&amp;wseable</string>
</property>
</widget>
<widget class='QCheckBox'>
<widget class='TQCheckBox'>
<property name='name'>
<cstring>publicBaseChk</cstring>
</property>
@@ -319,7 +319,7 @@
<property name='sizeType'>
<enum>Expanding</enum>
</property>
<property name='sizeHint'>
<property name='tqsizeHint'>
<size>
<width>20</width>
<height>20</height>
@@ -328,7 +328,7 @@
</spacer>
</vbox>
</widget>
<widget class='QWidget'>
<widget class='TQWidget'>
<property name='name'>
<cstring>tab</cstring>
</property>
@@ -349,14 +349,14 @@
<property name='sizeType'>
<enum>Expanding</enum>
</property>
<property name='sizeHint'>
<property name='tqsizeHint'>
<size>
<width>20</width>
<height>50</height>
</size>
</property>
</spacer>
<widget row='3' class='QLabel' rowspan='1' column='0' colspan='2'>
<widget row='3' class='TQLabel' rowspan='1' column='0' colspan='2'>
<property name='name'>
<cstring>TextLabel5_2_8</cstring>
</property>
@@ -372,12 +372,12 @@
<cstring>printerDriverEdit</cstring>
</property>
</widget>
<widget row='3' class='QLineEdit' rowspan='1' column='2' colspan='2'>
<widget row='3' class='TQLineEdit' rowspan='1' column='2' colspan='2'>
<property name='name'>
<cstring>printerDriverEdit</cstring>
</property>
</widget>
<widget row='4' class='QLabel' rowspan='1' column='0' colspan='2'>
<widget row='4' class='TQLabel' rowspan='1' column='0' colspan='2'>
<property name='name'>
<cstring>TextLabel5_2_2_2</cstring>
</property>
@@ -393,12 +393,12 @@
<cstring>printerDriverLocationEdit</cstring>
</property>
</widget>
<widget row='4' class='QLineEdit' rowspan='1' column='2' colspan='2'>
<widget row='4' class='TQLineEdit' rowspan='1' column='2' colspan='2'>
<property name='name'>
<cstring>printerDriverLocationEdit</cstring>
</property>
</widget>
<widget row='5' class='QCheckBox' rowspan='1' column='0' colspan='2'>
<widget row='5' class='TQCheckBox' rowspan='1' column='0' colspan='2'>
<property name='name'>
<cstring>postscriptChk</cstring>
</property>
@@ -406,7 +406,7 @@
<string>PostScr&amp;ipt</string>
</property>
</widget>
<widget row='0' class='QLabel' column='0'>
<widget row='0' class='TQLabel' column='0'>
<property name='name'>
<cstring>PrintingLbl</cstring>
</property>
@@ -417,7 +417,7 @@
<cstring>printingCombo</cstring>
</property>
</widget>
<widget row='0' class='QComboBox' column='2'>
<widget row='0' class='TQComboBox' column='2'>
<item>
<property name='text'>
<string>sysv</string>
@@ -477,7 +477,7 @@
<cstring>printingCombo</cstring>
</property>
</widget>
<widget row='2' class='QLabel' rowspan='1' column='0' colspan='2'>
<widget row='2' class='TQLabel' rowspan='1' column='0' colspan='2'>
<property name='name'>
<cstring>TextLabel3_2_2</cstring>
</property>
@@ -488,7 +488,7 @@
<cstring>maxReportedPrintJobsSpin</cstring>
</property>
</widget>
<widget row='1' class='QLabel' rowspan='1' column='0' colspan='2'>
<widget row='1' class='TQLabel' rowspan='1' column='0' colspan='2'>
<property name='name'>
<cstring>TextLabel3_2</cstring>
</property>
@@ -535,14 +535,14 @@
<property name='sizeType'>
<enum>Expanding</enum>
</property>
<property name='sizeHint'>
<property name='tqsizeHint'>
<size>
<width>200</width>
<height>20</height>
</size>
</property>
</spacer>
<widget row='6' class='QCheckBox' rowspan='1' column='0' colspan='2'>
<widget row='6' class='TQCheckBox' rowspan='1' column='0' colspan='2'>
<property name='name'>
<cstring>useClientDriverChk</cstring>
</property>
@@ -550,7 +550,7 @@
<string>Use c&amp;lient driver</string>
</property>
</widget>
<widget row='7' class='QCheckBox' rowspan='1' column='0' colspan='2'>
<widget row='7' class='TQCheckBox' rowspan='1' column='0' colspan='2'>
<property name='name'>
<cstring>defaultDevmodeChk</cstring>
</property>
@@ -560,7 +560,7 @@
</widget>
</grid>
</widget>
<widget class='QWidget'>
<widget class='TQWidget'>
<property name='name'>
<cstring>tab</cstring>
</property>
@@ -571,7 +571,7 @@
<property name='name'>
<cstring>unnamed</cstring>
</property>
<widget row='3' class='QLabel' column='0'>
<widget row='3' class='TQLabel' column='0'>
<property name='name'>
<cstring>TextLabel6</cstring>
</property>
@@ -585,7 +585,7 @@
<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>
</property>
</widget>