summaryrefslogtreecommitdiffstats
path: root/kmrml
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-06-19 19:03:33 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-06-19 19:03:33 +0000
commite69e8b1d09fb579316595b4e6a850e717358a8b1 (patch)
treea24fc20865f65772f530d16177520190594ffdd2 /kmrml
parenteecec9afb81fdebb0f22e9da22635874c403f854 (diff)
downloadtdegraphics-e69e8b1d09fb579316595b4e6a850e717358a8b1.tar.gz
tdegraphics-e69e8b1d09fb579316595b4e6a850e717358a8b1.zip
TQt4 port kdegraphics
This enables compilation under both Qt3 and Qt4 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdegraphics@1237557 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kmrml')
-rw-r--r--kmrml/kmrml.spec6
-rw-r--r--kmrml/kmrml/algorithmcombo.cpp6
-rw-r--r--kmrml/kmrml/algorithmcombo.h3
-rw-r--r--kmrml/kmrml/algorithmdialog.cpp18
-rw-r--r--kmrml/kmrml/algorithmdialog.h3
-rw-r--r--kmrml/kmrml/browser.cpp6
-rw-r--r--kmrml/kmrml/browser.h3
-rw-r--r--kmrml/kmrml/collectioncombo.cpp4
-rw-r--r--kmrml/kmrml/collectioncombo.h3
-rw-r--r--kmrml/kmrml/kcontrol/indexcleaner.cpp14
-rw-r--r--kmrml/kmrml/kcontrol/indexcleaner.h5
-rw-r--r--kmrml/kmrml/kcontrol/indexer.cpp22
-rw-r--r--kmrml/kmrml/kcontrol/indexer.h5
-rw-r--r--kmrml/kmrml/kcontrol/indextest.h3
-rw-r--r--kmrml/kmrml/kcontrol/kcmkmrml.cpp18
-rw-r--r--kmrml/kmrml/kcontrol/kcmkmrml.h3
-rw-r--r--kmrml/kmrml/kcontrol/mainpage.cpp18
-rw-r--r--kmrml/kmrml/kcontrol/mainpage.h5
-rw-r--r--kmrml/kmrml/kcontrol/serverconfigwidget.ui34
-rw-r--r--kmrml/kmrml/lib/kmrml_config.cpp34
-rw-r--r--kmrml/kmrml/lib/kmrml_config.h2
-rw-r--r--kmrml/kmrml/lib/mrml_shared.cpp6
-rw-r--r--kmrml/kmrml/lib/mrml_shared.h4
-rw-r--r--kmrml/kmrml/lib/mrml_utils.h2
-rw-r--r--kmrml/kmrml/lib/watcher_stub.cpp2
-rw-r--r--kmrml/kmrml/loader.cpp4
-rw-r--r--kmrml/kmrml/loader.h3
-rw-r--r--kmrml/kmrml/mrml.cpp14
-rw-r--r--kmrml/kmrml/mrml.h2
-rw-r--r--kmrml/kmrml/mrml_creator.cpp4
-rw-r--r--kmrml/kmrml/mrml_creator.h4
-rw-r--r--kmrml/kmrml/mrml_elements.cpp18
-rw-r--r--kmrml/kmrml/mrml_elements.h6
-rw-r--r--kmrml/kmrml/mrml_part.cpp68
-rw-r--r--kmrml/kmrml/mrml_part.h18
-rw-r--r--kmrml/kmrml/mrml_view.cpp54
-rw-r--r--kmrml/kmrml/mrml_view.h16
-rw-r--r--kmrml/kmrml/propertysheet.cpp10
-rw-r--r--kmrml/kmrml/propertysheet.h6
-rw-r--r--kmrml/kmrml/propertywidgets.cpp20
-rw-r--r--kmrml/kmrml/propertywidgets.h25
-rw-r--r--kmrml/kmrml/server/watcher.cpp16
-rw-r--r--kmrml/kmrml/server/watcher.h1
43 files changed, 269 insertions, 249 deletions
diff --git a/kmrml/kmrml.spec b/kmrml/kmrml.spec
index 79dbab29..d278a7d0 100644
--- a/kmrml/kmrml.spec
+++ b/kmrml/kmrml.spec
@@ -48,11 +48,11 @@ make install DESTDIR=$RPM_BUILD_ROOT
cd $RPM_BUILD_ROOT
-find . -type d | sed '1,2d;s,^\.,\%attr(-\,root\,root) \%dir ,' > $RPM_BUILD_DIR/file.list.%{name}
+tqfind . -type d | sed '1,2d;s,^\.,\%attr(-\,root\,root) \%dir ,' > $RPM_BUILD_DIR/file.list.%{name}
-find . -type f | sed 's,^\.,\%attr(-\,root\,root) ,' >> $RPM_BUILD_DIR/file.list.%{name}
+tqfind . -type f | sed 's,^\.,\%attr(-\,root\,root) ,' >> $RPM_BUILD_DIR/file.list.%{name}
-find . -type l | sed 's,^\.,\%attr(-\,root\,root) ,' >> $RPM_BUILD_DIR/file.list.%{name}
+tqfind . -type l | sed 's,^\.,\%attr(-\,root\,root) ,' >> $RPM_BUILD_DIR/file.list.%{name}
%clean
rm -rf $RPM_BUILD_ROOT
diff --git a/kmrml/kmrml/algorithmcombo.cpp b/kmrml/kmrml/algorithmcombo.cpp
index a2db81d4..bdd56ca3 100644
--- a/kmrml/kmrml/algorithmcombo.cpp
+++ b/kmrml/kmrml/algorithmcombo.cpp
@@ -22,11 +22,11 @@
using namespace KMrml;
-// ### copycat of CollectionCombo... moc can't handle templates unfortunately..
+// ### copycat of CollectionCombo... tqmoc can't handle templates unfortunately..
// could use base-class MrmlElement....
-AlgorithmCombo::AlgorithmCombo( TQWidget *parent, const char *name )
- : KComboBox( false, parent, name ),
+AlgorithmCombo::AlgorithmCombo( TQWidget *tqparent, const char *name )
+ : KComboBox( false, tqparent, name ),
m_algorithms( 0L )
{
connect( this, TQT_SIGNAL( activated( const TQString& ) ),
diff --git a/kmrml/kmrml/algorithmcombo.h b/kmrml/kmrml/algorithmcombo.h
index 8138b47a..082780b4 100644
--- a/kmrml/kmrml/algorithmcombo.h
+++ b/kmrml/kmrml/algorithmcombo.h
@@ -29,9 +29,10 @@ namespace KMrml
class AlgorithmCombo : public KComboBox
{
Q_OBJECT
+ TQ_OBJECT
public:
- AlgorithmCombo( TQWidget *parent, const char *name = 0 );
+ AlgorithmCombo( TQWidget *tqparent, const char *name = 0 );
~AlgorithmCombo();
void setAlgorithms( const AlgorithmList * algorithms );
diff --git a/kmrml/kmrml/algorithmdialog.cpp b/kmrml/kmrml/algorithmdialog.cpp
index bf3ed895..60926b1e 100644
--- a/kmrml/kmrml/algorithmdialog.cpp
+++ b/kmrml/kmrml/algorithmdialog.cpp
@@ -31,11 +31,11 @@
using namespace KMrml;
-class ScrollView : public QScrollView
+class ScrollView : public TQScrollView
{
public:
- ScrollView(TQWidget* parent = 0, const char* name = 0)
- : TQScrollView(parent, name)
+ ScrollView(TQWidget* tqparent = 0, const char* name = 0)
+ : TQScrollView(tqparent, name)
{
setFrameStyle(TQFrame::NoFrame);
m_frame = new TQFrame(viewport(), "ScrollView::m_frame");
@@ -49,8 +49,8 @@ protected:
virtual void viewportResizeEvent(TQResizeEvent* ev)
{
TQScrollView::viewportResizeEvent(ev);
- m_frame->resize( kMax(m_frame->sizeHint().width(), ev->size().width()),
- kMax(m_frame->sizeHint().height(), ev->size().height()));
+ m_frame->resize( kMax(m_frame->tqsizeHint().width(), ev->size().width()),
+ kMax(m_frame->tqsizeHint().height(), ev->size().height()));
};
private:
@@ -60,8 +60,8 @@ private:
AlgorithmDialog::AlgorithmDialog( const AlgorithmList& algorithms,
const CollectionList& collections,
const Collection& currentColl,
- TQWidget *parent, const char *name )
- : KDialogBase( parent, name, false, i18n("Configure Query Algorithms"),
+ TQWidget *tqparent, const char *name )
+ : KDialogBase( tqparent, name, false, i18n("Configure Query Algorithms"),
Ok | Cancel, Ok, false ),
m_allAlgorithms( algorithms ),
m_collections( collections )
@@ -71,7 +71,7 @@ AlgorithmDialog::AlgorithmDialog( const AlgorithmList& algorithms,
TQVBoxLayout *mainLayout = new TQVBoxLayout( box, 0, KDialog::spacingHint(),
"mainLayout");
- TQHBoxLayout *collectionLayout = new TQHBoxLayout( 0L, 0, 0, "coll layout");
+ TQHBoxLayout *collectionLayout = new TQHBoxLayout( 0L, 0, 0, "coll tqlayout");
collectionLayout->addWidget( new TQLabel( i18n("Collection: "), box ));
m_collectionCombo = new CollectionCombo( box, "collection combo" );
@@ -106,7 +106,7 @@ AlgorithmDialog::AlgorithmDialog( const AlgorithmList& algorithms,
mainLayout->activate();
algoHLayout->move( groupBox->x() + 10, groupBox->y() - 12 );
- box->setMinimumWidth( algoHLayout->sizeHint().width() +
+ box->setMinimumWidth( algoHLayout->tqsizeHint().width() +
4 * KDialog::spacingHint() );
}
diff --git a/kmrml/kmrml/algorithmdialog.h b/kmrml/kmrml/algorithmdialog.h
index be119dbd..f5e02116 100644
--- a/kmrml/kmrml/algorithmdialog.h
+++ b/kmrml/kmrml/algorithmdialog.h
@@ -32,11 +32,12 @@ namespace KMrml
class AlgorithmDialog : public KDialogBase
{
Q_OBJECT
+ TQ_OBJECT
public:
AlgorithmDialog( const AlgorithmList&, const CollectionList&,
const Collection& currentColl,
- TQWidget *parent = 0, const char *name = 0 );
+ TQWidget *tqparent = 0, const char *name = 0 );
~AlgorithmDialog();
private slots:
diff --git a/kmrml/kmrml/browser.cpp b/kmrml/kmrml/browser.cpp
index 57ac0085..7603debb 100644
--- a/kmrml/kmrml/browser.cpp
+++ b/kmrml/kmrml/browser.cpp
@@ -23,9 +23,9 @@
using namespace KMrml;
-Browser::Browser( MrmlPart *parent, const char *name )
- : KParts::BrowserExtension( parent, name ),
- m_part( parent )
+Browser::Browser( MrmlPart *tqparent, const char *name )
+ : KParts::BrowserExtension( tqparent, name ),
+ m_part( tqparent )
{
}
diff --git a/kmrml/kmrml/browser.h b/kmrml/kmrml/browser.h
index 71466160..c30e148c 100644
--- a/kmrml/kmrml/browser.h
+++ b/kmrml/kmrml/browser.h
@@ -28,9 +28,10 @@ namespace KMrml
class Browser : public KParts::BrowserExtension
{
Q_OBJECT
+ TQ_OBJECT
public:
- Browser( MrmlPart *parent, const char *name );
+ Browser( MrmlPart *tqparent, const char *name );
~Browser();
virtual void saveState( TQDataStream& stream );
diff --git a/kmrml/kmrml/collectioncombo.cpp b/kmrml/kmrml/collectioncombo.cpp
index 7238305e..d71a1c2a 100644
--- a/kmrml/kmrml/collectioncombo.cpp
+++ b/kmrml/kmrml/collectioncombo.cpp
@@ -22,8 +22,8 @@
using namespace KMrml;
-CollectionCombo::CollectionCombo( TQWidget *parent, const char *name )
- : KComboBox( false, parent, name ),
+CollectionCombo::CollectionCombo( TQWidget *tqparent, const char *name )
+ : KComboBox( false, tqparent, name ),
m_collections( 0L )
{
connect( this, TQT_SIGNAL( activated( const TQString& ) ),
diff --git a/kmrml/kmrml/collectioncombo.h b/kmrml/kmrml/collectioncombo.h
index c39686a4..dc7722d4 100644
--- a/kmrml/kmrml/collectioncombo.h
+++ b/kmrml/kmrml/collectioncombo.h
@@ -29,9 +29,10 @@ namespace KMrml
class CollectionCombo : public KComboBox
{
Q_OBJECT
+ TQ_OBJECT
public:
- CollectionCombo( TQWidget *parent, const char *name = 0 );
+ CollectionCombo( TQWidget *tqparent, const char *name = 0 );
~CollectionCombo();
void setCollections( const CollectionList * collections );
diff --git a/kmrml/kmrml/kcontrol/indexcleaner.cpp b/kmrml/kmrml/kcontrol/indexcleaner.cpp
index 56e606aa..b02d6343 100644
--- a/kmrml/kmrml/kcontrol/indexcleaner.cpp
+++ b/kmrml/kmrml/kcontrol/indexcleaner.cpp
@@ -6,17 +6,17 @@
#include <kdeversion.h>
#if KDE_VERSION < 306
- #define QUOTE( x ) x
+ #define TQUOTE( x ) x
#else
- #define QUOTE( x ) KProcess::quote( x )
+ #define TQUOTE( x ) KProcess::quote( x )
#endif
using namespace KMrmlConfig;
IndexCleaner::IndexCleaner( const TQStringList& dirs,
const KMrml::Config *config,
- TQObject *parent, const char *name )
- : TQObject( parent, name ),
+ TQObject *tqparent, const char *name )
+ : TQObject( tqparent, name ),
m_dirs( dirs ),
m_config( config ),
m_process( 0L )
@@ -74,11 +74,11 @@ void IndexCleaner::startNext()
TQString dir = m_dirs.first();
m_dirs.pop_front();
- int index = cmd.find( "%d" );
+ int index = cmd.tqfind( "%d" );
if ( index != -1 )
- cmd.replace( index, 2, QUOTE( dir ) );
+ cmd.tqreplace( index, 2, TQUOTE( dir ) );
else // no %d? What else can we do?
- cmd.append( TQString::fromLatin1(" ") + QUOTE( dir ) );
+ cmd.append( TQString::tqfromLatin1(" ") + TQUOTE( dir ) );
*m_process << cmd;
diff --git a/kmrml/kmrml/kcontrol/indexcleaner.h b/kmrml/kmrml/kcontrol/indexcleaner.h
index 92dcdc22..afc2ebfd 100644
--- a/kmrml/kmrml/kcontrol/indexcleaner.h
+++ b/kmrml/kmrml/kcontrol/indexcleaner.h
@@ -20,13 +20,14 @@ namespace KMrml
namespace KMrmlConfig
{
- class IndexCleaner : public QObject
+ class IndexCleaner : public TQObject
{
Q_OBJECT
+ TQ_OBJECT
public:
IndexCleaner( const TQStringList& dirs, const KMrml::Config *config,
- TQObject *parent = 0, const char *name = 0 );
+ TQObject *tqparent = 0, const char *name = 0 );
~IndexCleaner();
void start();
diff --git a/kmrml/kmrml/kcontrol/indexer.cpp b/kmrml/kmrml/kcontrol/indexer.cpp
index f4c4b108..0308dd39 100644
--- a/kmrml/kmrml/kcontrol/indexer.cpp
+++ b/kmrml/kmrml/kcontrol/indexer.cpp
@@ -28,16 +28,16 @@
#include <kdeversion.h>
#if KDE_VERSION < 306
- #define QUOTE( x ) x
+ #define TQUOTE( x ) x
#else
- #define QUOTE( x ) KProcess::quote( x )
+ #define TQUOTE( x ) KProcess::quote( x )
#endif
using namespace KMrmlConfig;
Indexer::Indexer( const KMrml::Config* config,
- TQObject *parent, const char *name )
- : TQObject( parent, name ),
+ TQObject *tqparent, const char *name )
+ : TQObject( tqparent, name ),
m_config( config ),
m_dirCount( 0 )
{
@@ -93,14 +93,14 @@ void Indexer::processNext()
TQString cmd = m_config->addCollectionCommandLine().simplifyWhiteSpace().stripWhiteSpace();
- // in the commandline, replace %d with the directory to process and
+ // in the commandline, tqreplace %d with the directory to process and
// %t with the thumbnail dir
- int index = cmd.find( "%d" ); // ### TQFile::encodeName()?
+ int index = cmd.tqfind( "%d" ); // ### TQFile::encodeName()?
if ( index != -1 )
- cmd.replace( index, 2, QUOTE( m_currentDir ) );
- index = cmd.find( "%t" );
+ cmd.tqreplace( index, 2, TQUOTE( m_currentDir ) );
+ index = cmd.tqfind( "%t" );
if ( index != -1 )
- cmd.replace( index, 2, QUOTE(m_currentDir + "_thumbnails") );
+ cmd.tqreplace( index, 2, TQUOTE(m_currentDir + "_thumbnails") );
// qDebug("****** command: %s", cmd.latin1());
#if KDE_VERSION >= 306
@@ -112,7 +112,7 @@ void Indexer::processNext()
*m_process << *it;
#endif
- emit progress( 0, i18n("<qt>Next Folder: <br><b>%1</b>").arg( m_currentDir ));
+ emit progress( 0, i18n("<qt>Next Folder: <br><b>%1</b>").tqarg( m_currentDir ));
m_process->start();
}
@@ -160,7 +160,7 @@ void Indexer::slotCanRead( KProcIO *proc )
if ( ok )
{
uint dirsLeft = m_dirs.count();
- TQString message = i18n( "<qt>Processing folder %1 of %2: <br><b>%3</b><br>File %4 of %5.</qt>").arg( m_dirCount - dirsLeft ).arg( m_dirCount).arg( m_currentDir ).arg( currentFile ).arg( numFiles );
+ TQString message = i18n( "<qt>Processing folder %1 of %2: <br><b>%3</b><br>File %4 of %5.</qt>").tqarg( m_dirCount - dirsLeft ).tqarg( m_dirCount).tqarg( m_currentDir ).tqarg( currentFile ).tqarg( numFiles );
emit progress( perc, message );
}
}
diff --git a/kmrml/kmrml/kcontrol/indexer.h b/kmrml/kmrml/kcontrol/indexer.h
index 290c9937..d9fede24 100644
--- a/kmrml/kmrml/kcontrol/indexer.h
+++ b/kmrml/kmrml/kcontrol/indexer.h
@@ -28,13 +28,14 @@ class KProcIO;
namespace KMrmlConfig
{
- class Indexer : public QObject
+ class Indexer : public TQObject
{
Q_OBJECT
+ TQ_OBJECT
public:
Indexer( const KMrml::Config *config,
- TQObject *parent = 0L, const char *name = 0 );
+ TQObject *tqparent = 0L, const char *name = 0 );
~Indexer();
void startIndexing( const TQStringList& dirs );
diff --git a/kmrml/kmrml/kcontrol/indextest.h b/kmrml/kmrml/kcontrol/indextest.h
index 15cda2ce..91320d2e 100644
--- a/kmrml/kmrml/kcontrol/indextest.h
+++ b/kmrml/kmrml/kcontrol/indextest.h
@@ -8,9 +8,10 @@
#ifndef INDEXTEST_H
#define INDEXTEST_H
-class IndexTest : public QObject
+class IndexTest : public TQObject
{
Q_OBJECT
+ TQ_OBJECT
public:
IndexTest();
diff --git a/kmrml/kmrml/kcontrol/kcmkmrml.cpp b/kmrml/kmrml/kcontrol/kcmkmrml.cpp
index d2b60fc0..3bff026a 100644
--- a/kmrml/kmrml/kcontrol/kcmkmrml.cpp
+++ b/kmrml/kmrml/kcontrol/kcmkmrml.cpp
@@ -43,8 +43,8 @@ static const int COL_FILENAME = 1;
typedef KGenericFactory<KCMKMrml, TQWidget> MrmlFactory;
K_EXPORT_COMPONENT_FACTORY( kcm_kmrml, MrmlFactory("kmrml") )
-KCMKMrml::KCMKMrml(TQWidget *parent, const char *name, const TQStringList & ):
- KCModule(MrmlFactory::instance(), parent, name)
+KCMKMrml::KCMKMrml(TQWidget *tqparent, const char *name, const TQStringList & ):
+ KCModule(MrmlFactory::instance(), tqparent, name)
{
KAboutData* ab = new KAboutData(
"kcmkmrml",
@@ -58,11 +58,11 @@ KCMKMrml::KCMKMrml(TQWidget *parent, const char *name, const TQStringList & ):
ab->addAuthor( "Carsten Pfeiffer", 0, "pfeiffer@kde.org" );
setAboutData( ab );
- TQVBoxLayout *layout = new TQVBoxLayout( this );
- layout->setSpacing( KDialog::spacingHint() );
+ TQVBoxLayout *tqlayout = new TQVBoxLayout( this );
+ tqlayout->setSpacing( KDialog::spacingHint() );
m_mainPage = new MainPage( this, "main page" );
- layout->addWidget( m_mainPage );
+ tqlayout->addWidget( m_mainPage );
connect( m_mainPage, TQT_SIGNAL( changed( bool ) ), TQT_SIGNAL( changed( bool )));
@@ -86,11 +86,11 @@ void KCMKMrml::checkGiftInstallation()
KMessageBox::error( this, errorMessage );
m_mainPage->hide();
TQLabel *errorLabel = new TQLabel( errorMessage, this );
- errorLabel->setSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Fixed ) );
- KURLLabel *urlLabel = new KURLLabel( "http://www.gnu.org/software/gift", TQString::null, this );
- urlLabel->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) );
+ errorLabel->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Fixed ) );
+ KURLLabel *urlLabel = new KURLLabel( "http://www.gnu.org/software/gift", TQString(), this );
+ urlLabel->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) );
connect( urlLabel, TQT_SIGNAL( leftClickedURL( const TQString& )), kapp, TQT_SLOT( invokeBrowser( const TQString& )) );
- TQLayout *l = layout();
+ TQLayout *l = tqlayout();
l->addItem( new TQSpacerItem( 0, 10, TQSizePolicy::Minimum, TQSizePolicy::Expanding ) );
l->add( errorLabel );
l->add( urlLabel );
diff --git a/kmrml/kmrml/kcontrol/kcmkmrml.h b/kmrml/kmrml/kcontrol/kcmkmrml.h
index 306e55f0..1c15a0a2 100644
--- a/kmrml/kmrml/kcontrol/kcmkmrml.h
+++ b/kmrml/kmrml/kcontrol/kcmkmrml.h
@@ -31,9 +31,10 @@ namespace KMrmlConfig
class KCMKMrml : public KCModule
{
Q_OBJECT
+ TQ_OBJECT
public:
- KCMKMrml(TQWidget *parent, const char *name, const TQStringList &);
+ KCMKMrml(TQWidget *tqparent, const char *name, const TQStringList &);
virtual ~KCMKMrml();
virtual void defaults();
diff --git a/kmrml/kmrml/kcontrol/mainpage.cpp b/kmrml/kmrml/kcontrol/mainpage.cpp
index c4e65ac3..ab6fc84b 100644
--- a/kmrml/kmrml/kcontrol/mainpage.cpp
+++ b/kmrml/kmrml/kcontrol/mainpage.cpp
@@ -50,8 +50,8 @@
using namespace KMrmlConfig;
-MainPage::MainPage( TQWidget *parent, const char *name )
- : TQVBox( parent, name ),
+MainPage::MainPage( TQWidget *tqparent, const char *name )
+ : TQVBox( tqparent, name ),
m_indexer( 0L ),
m_indexCleaner( 0L ),
m_progressDialog( 0L ),
@@ -132,7 +132,7 @@ void MainPage::resetDefaults()
m_listBox->clear();
- // slotHostChanged(); not necessary, will be called by Qt signals
+ // slotHostChanged(); not necessary, will be called by TQt signals
slotUseAuthChanged( m_serverWidget->m_useAuth->isChecked() );
blockSignals( false );
@@ -151,7 +151,7 @@ void MainPage::load()
m_listBox->clear();
m_listBox->insertStringList( m_config->indexableDirectories() );
- // slotHostChanged(); not necessary, will be called by Qt signals
+ // slotHostChanged(); not necessary, will be called by TQt signals
slotUseAuthChanged( m_serverWidget->m_useAuth->isChecked() );
blockSignals( false );
@@ -186,7 +186,7 @@ TQStringList MainPage::difference( const TQStringList& oldIndexDirs,
{
TQStringList result;
- TQString slash = TQString::fromLatin1("/");
+ TQString slash = TQString::tqfromLatin1("/");
TQStringList::ConstIterator oldIt = oldIndexDirs.begin();
TQString oldDir, newDir;
@@ -341,7 +341,7 @@ void MainPage::slotRemoveClicked()
void MainPage::enableWidgetsFor( const KMrml::ServerSettings& settings )
{
TQString host = settings.host;
- bool enableWidgets = (m_config->hosts().findIndex( host ) > -1);
+ bool enableWidgets = (m_config->hosts().tqfindIndex( host ) > -1);
m_serverWidget->m_addButton->setEnabled(!enableWidgets && !host.isEmpty());
m_serverWidget->m_removeButton->setEnabled( enableWidgets &&
!host.isEmpty() &&
@@ -397,7 +397,7 @@ void MainPage::processIndexDirs( const TQStringList& removeDirs )
if ( !removeDirs.isEmpty() )
{
- m_indexCleaner = new IndexCleaner( removeDirs, m_config, this );
+ m_indexCleaner = new IndexCleaner( removeDirs, m_config, TQT_TQOBJECT(this) );
connect( m_indexCleaner, TQT_SIGNAL( advance( int ) ),
m_progressDialog->progressBar(), TQT_SLOT( advance( int ) ));
connect( m_indexCleaner, TQT_SIGNAL( finished() ),
@@ -437,7 +437,7 @@ void MainPage::slotMaybeIndex()
m_progressDialog->progressBar()->setProgress( 0 );
// do the indexing
- m_indexer = new Indexer( m_config, this, "Indexer" );
+ m_indexer = new Indexer( m_config, TQT_TQOBJECT(this), "Indexer" );
connect( m_indexer, TQT_SIGNAL( progress( int, const TQString& )),
TQT_SLOT( slotIndexingProgress( int, const TQString& ) ));
connect( m_indexer, TQT_SIGNAL( finished( int )),
@@ -465,7 +465,7 @@ void MainPage::slotIndexingFinished( int returnCode )
if ( err )
syserr = TQString::fromLocal8Bit( err );
else
- syserr = i18n("Unknown error: %1").arg( returnCode );
+ syserr = i18n("Unknown error: %1").tqarg( returnCode );
}
KMessageBox::detailedError( this, i18n("An error occurred during indexing. The index might be invalid."),
diff --git a/kmrml/kmrml/kcontrol/mainpage.h b/kmrml/kmrml/kcontrol/mainpage.h
index 8000aea9..7a7d6902 100644
--- a/kmrml/kmrml/kcontrol/mainpage.h
+++ b/kmrml/kmrml/kcontrol/mainpage.h
@@ -43,12 +43,13 @@ namespace KMrmlConfig
class Indexer;
class IndexCleaner;
- class MainPage : public QVBox
+ class MainPage : public TQVBox
{
Q_OBJECT
+ TQ_OBJECT
public:
- MainPage( TQWidget *parent, const char *name );
+ MainPage( TQWidget *tqparent, const char *name );
~MainPage();
void resetDefaults();
diff --git a/kmrml/kmrml/kcontrol/serverconfigwidget.ui b/kmrml/kmrml/kcontrol/serverconfigwidget.ui
index e0a08007..c78a5046 100644
--- a/kmrml/kmrml/kcontrol/serverconfigwidget.ui
+++ b/kmrml/kmrml/kcontrol/serverconfigwidget.ui
@@ -1,6 +1,6 @@
<!DOCTYPE UI><UI version="3.0" stdsetdef="1">
<class>ServerConfigWidget</class>
-<widget class="QWidget">
+<widget class="TQWidget">
<property name="name">
<cstring>ServerConfigWidget</cstring>
</property>
@@ -22,7 +22,7 @@
<property name="spacing">
<number>6</number>
</property>
- <widget class="QLayoutWidget">
+ <widget class="TQLayoutWidget">
<property name="name">
<cstring>Layout7</cstring>
</property>
@@ -36,7 +36,7 @@
<property name="spacing">
<number>6</number>
</property>
- <widget class="QLayoutWidget" row="0" column="1">
+ <widget class="TQLayoutWidget" row="0" column="1">
<property name="name">
<cstring>Layout4</cstring>
</property>
@@ -66,7 +66,7 @@
<bool>true</bool>
</property>
</widget>
- <widget class="QPushButton">
+ <widget class="TQPushButton">
<property name="name">
<cstring>m_addButton</cstring>
</property>
@@ -74,7 +74,7 @@
<string>&amp;Add</string>
</property>
</widget>
- <widget class="QPushButton">
+ <widget class="TQPushButton">
<property name="name">
<cstring>m_removeButton</cstring>
</property>
@@ -84,7 +84,7 @@
</widget>
</hbox>
</widget>
- <widget class="QLayoutWidget" row="1" column="1">
+ <widget class="TQLayoutWidget" row="1" column="1">
<property name="name">
<cstring>Layout6</cstring>
</property>
@@ -114,7 +114,7 @@
<string>TCP/IP Port Number of the Indexing Server</string>
</property>
</widget>
- <widget class="QCheckBox">
+ <widget class="TQCheckBox">
<property name="name">
<cstring>m_autoPort</cstring>
</property>
@@ -135,7 +135,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>200</width>
<height>0</height>
@@ -144,7 +144,7 @@
</spacer>
</hbox>
</widget>
- <widget class="QLabel" row="0" column="0">
+ <widget class="TQLabel" row="0" column="0">
<property name="name">
<cstring>m_hostLabel</cstring>
</property>
@@ -155,7 +155,7 @@
<cstring>m_hostCombo</cstring>
</property>
</widget>
- <widget class="QLabel" row="1" column="0">
+ <widget class="TQLabel" row="1" column="0">
<property name="name">
<cstring>m_portLabel</cstring>
</property>
@@ -168,7 +168,7 @@
</widget>
</grid>
</widget>
- <widget class="QCheckBox">
+ <widget class="TQCheckBox">
<property name="name">
<cstring>m_useAuth</cstring>
</property>
@@ -176,7 +176,7 @@
<string>Per&amp;form authentication</string>
</property>
</widget>
- <widget class="QLayoutWidget">
+ <widget class="TQLayoutWidget">
<property name="name">
<cstring>Layout12</cstring>
</property>
@@ -200,14 +200,14 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>16</width>
<height>16</height>
</size>
</property>
</spacer>
- <widget class="QLayoutWidget">
+ <widget class="TQLayoutWidget">
<property name="name">
<cstring>Layout6</cstring>
</property>
@@ -221,7 +221,7 @@
<property name="spacing">
<number>6</number>
</property>
- <widget class="QLabel" row="0" column="0">
+ <widget class="TQLabel" row="0" column="0">
<property name="name">
<cstring>m_userLabel</cstring>
</property>
@@ -237,7 +237,7 @@
<cstring>m_passEdit</cstring>
</property>
</widget>
- <widget class="QLabel" row="1" column="0">
+ <widget class="TQLabel" row="1" column="0">
<property name="name">
<cstring>m_passLabel</cstring>
</property>
@@ -268,5 +268,5 @@
<tabstop>m_userEdit</tabstop>
<tabstop>m_passEdit</tabstop>
</tabstops>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
</UI>
diff --git a/kmrml/kmrml/lib/kmrml_config.cpp b/kmrml/kmrml/lib/kmrml_config.cpp
index 6358971d..6d779860 100644
--- a/kmrml/kmrml/lib/kmrml_config.cpp
+++ b/kmrml/kmrml/lib/kmrml_config.cpp
@@ -30,9 +30,9 @@
#include <kdeversion.h>
#if KDE_VERSION < 307
- #define QUOTE( x ) x
+ #define TQUOTE( x ) x
#else
- #define QUOTE( x ) KProcess::quote( x )
+ #define TQUOTE( x ) KProcess::quote( x )
#endif
using namespace KMrml;
@@ -104,7 +104,7 @@ bool Config::sync()
void Config::setDefaultHost( const TQString& host )
{
m_defaultHost = host.isEmpty() ?
- TQString::fromLatin1(DEFAULT_HOST) : host;
+ TQString::tqfromLatin1(DEFAULT_HOST) : host;
m_config->setGroup( CONFIG_GROUP );
m_config->writeEntry( "Default Host", m_defaultHost );
@@ -137,7 +137,7 @@ ServerSettings Config::settingsForHost( const TQString& host ) const
void Config::addSettings( const ServerSettings& settings )
{
TQString host = settings.host;
- if ( m_hostList.find( host ) == m_hostList.end() )
+ if ( m_hostList.tqfind( host ) == m_hostList.end() )
m_hostList.append( host );
m_config->setGroup( CONFIG_GROUP );
@@ -181,13 +181,13 @@ TQString Config::addCollectionCommandLine() const
m_config->setGroup( CONFIG_GROUP );
TQString cmd = m_config->readEntry( "AddCollection Commandline",
DEFAULT_ADDCOLLECTION_CMD );
- int index = cmd.find( "%h" );
+ int index = cmd.tqfind( "%h" );
if ( index != -1 )
- cmd.replace( index, 2, QUOTE( mrmldDataDir() ) );
+ cmd.tqreplace( index, 2, TQUOTE( mrmldDataDir() ) );
- index = cmd.find( "%e" );
+ index = cmd.tqfind( "%e" );
if ( index != -1 )
- cmd.replace( index, 2, TQTextCodec::codecForLocale()->mimeName() );
+ cmd.tqreplace( index, 2, TQTextCodec::codecForLocale()->mimeName() );
return cmd;
}
@@ -203,13 +203,13 @@ TQString Config::removeCollectionCommandLine() const
m_config->setGroup( CONFIG_GROUP );
TQString cmd = m_config->readEntry( "RemoveCollection Commandline",
DEFAULT_REMOVECOLLECTION_CMD );
- int index = cmd.find( "%h" );
+ int index = cmd.tqfind( "%h" );
if ( index != -1 )
- cmd.replace( index, 2, QUOTE( mrmldDataDir() ) );
+ cmd.tqreplace( index, 2, TQUOTE( mrmldDataDir() ) );
- index = cmd.find( "%e" );
+ index = cmd.tqfind( "%e" );
if ( index != -1 )
- cmd.replace( index, 2, TQTextCodec::codecForLocale()->mimeName() );
+ cmd.tqreplace( index, 2, TQTextCodec::codecForLocale()->mimeName() );
return cmd;
}
@@ -231,17 +231,17 @@ TQString Config::mrmldCommandline() const
DEFAULT_MRMLD_CMD );
// add data directory and port to the commandline
- int index = cmd.find( "%p" );
+ int index = cmd.tqfind( "%p" );
if ( index != -1 )
{
TQString port = settings.autoPort ?
- TQString::null : TQString::number( settings.configuredPort );
- cmd.replace( index, 2, port );
+ TQString() : TQString::number( settings.configuredPort );
+ cmd.tqreplace( index, 2, port );
}
- index = cmd.find( "%d" );
+ index = cmd.tqfind( "%d" );
if ( index != -1 )
{
- cmd.replace( index, 2, QUOTE( mrmldDataDir() ) );
+ cmd.tqreplace( index, 2, TQUOTE( mrmldDataDir() ) );
}
qDebug("***** commandline: %s", cmd.latin1());
diff --git a/kmrml/kmrml/lib/kmrml_config.h b/kmrml/kmrml/lib/kmrml_config.h
index 2208030a..4e39d3bf 100644
--- a/kmrml/kmrml/lib/kmrml_config.h
+++ b/kmrml/kmrml/lib/kmrml_config.h
@@ -108,7 +108,7 @@ namespace KMrml
TQString settingsGroup( const TQString& host ) const
{
- return TQString::fromLatin1( "SettingsFor: " ).append( host );
+ return TQString::tqfromLatin1( "SettingsFor: " ).append( host );
}
bool m_serverStartedIndividually;
diff --git a/kmrml/kmrml/lib/mrml_shared.cpp b/kmrml/kmrml/lib/mrml_shared.cpp
index 3e7d6d95..932010f6 100644
--- a/kmrml/kmrml/lib/mrml_shared.cpp
+++ b/kmrml/kmrml/lib/mrml_shared.cpp
@@ -53,7 +53,7 @@ const TQString * MrmlShared::m_element = 0L;
const TQString * MrmlShared::m_attribute = 0L;
const TQString * MrmlShared::m_attributeName = 0L;
const TQString * MrmlShared::m_attributeValue = 0L;
-const TQString * MrmlShared::m_children = 0L;
+const TQString * MrmlShared::m_tqchildren = 0L;
const TQString * MrmlShared::m_none = 0L;
const TQString * MrmlShared::m_multiSet = 0L;
@@ -141,7 +141,7 @@ void MrmlShared::init()
m_attribute = new TQString ( "attribute" ) ;
m_attributeName = new TQString ( "attribute-name" ) ;
m_attributeValue = new TQString ( "attribute-value" ) ;
- m_children = new TQString ( "children" ) ;
+ m_tqchildren = new TQString ( "tqchildren" ) ;
m_none = new TQString ( "none" ) ;
m_multiSet = new TQString ( "multi-set" ) ;
@@ -215,7 +215,7 @@ void MrmlShared::cleanup()
delete m_attribute;
delete m_attributeName;
delete m_attributeValue;
- delete m_children;
+ delete m_tqchildren;
delete m_none;
delete m_visibility;
diff --git a/kmrml/kmrml/lib/mrml_shared.h b/kmrml/kmrml/lib/mrml_shared.h
index 6ed2177a..175d5c3c 100644
--- a/kmrml/kmrml/lib/mrml_shared.h
+++ b/kmrml/kmrml/lib/mrml_shared.h
@@ -76,7 +76,7 @@ public:
static const TQString& attribute() { return *m_attribute; }
static const TQString& attributeName() { return *m_attributeName; }
static const TQString& attributeValue() { return *m_attributeValue; }
- static const TQString& children() { return *m_children; }
+ static const TQString& tqchildren() { return *m_tqchildren; }
static const TQString& none() { return *m_none; }
static const TQString& visibility() { return *m_visibility; }
@@ -139,7 +139,7 @@ private:
static const TQString * m_attribute;
static const TQString * m_attributeName;
static const TQString * m_attributeValue;
- static const TQString * m_children;
+ static const TQString * m_tqchildren;
static const TQString * m_none;
static const TQString * m_visibility;
diff --git a/kmrml/kmrml/lib/mrml_utils.h b/kmrml/kmrml/lib/mrml_utils.h
index ee2fdb30..5707b177 100644
--- a/kmrml/kmrml/lib/mrml_utils.h
+++ b/kmrml/kmrml/lib/mrml_utils.h
@@ -28,7 +28,7 @@
namespace KMrml
{
- class Util : public QObject
+ class Util : public TQObject
{
public:
static Util * self();
diff --git a/kmrml/kmrml/lib/watcher_stub.cpp b/kmrml/kmrml/lib/watcher_stub.cpp
index ca9ca7b2..d10dcbc7 100644
--- a/kmrml/kmrml/lib/watcher_stub.cpp
+++ b/kmrml/kmrml/lib/watcher_stub.cpp
@@ -78,7 +78,7 @@ TQStringList Watcher_stub::runningDaemons()
TQByteArray data, replyData;
TQCString replyType;
if ( dcopClient()->call( app(), obj(), "runningDaemons()", data, replyType, replyData ) ) {
- if ( replyType == "TQStringList" ) {
+ if ( replyType == TQSTRINGLIST_OBJECT_NAME_STRING ) {
TQDataStream _reply_stream( replyData, IO_ReadOnly );
_reply_stream >> result;
setStatus( CallSucceeded );
diff --git a/kmrml/kmrml/loader.cpp b/kmrml/kmrml/loader.cpp
index ea8803e2..f8cbecb3 100644
--- a/kmrml/kmrml/loader.cpp
+++ b/kmrml/kmrml/loader.cpp
@@ -72,7 +72,7 @@ void Loader::requestDownload( const KURL& url )
void Loader::slotData( KIO::Job *job, const TQByteArray& data )
{
- DownloadIterator it = m_downloads.find( static_cast<KIO::TransferJob*>(job) );
+ DownloadIterator it = m_downloads.tqfind( static_cast<KIO::TransferJob*>(job) );
if ( it != m_downloads.end() ) {
TQBuffer& buffer = it.data()->m_buffer;
if ( !buffer.isOpen() )
@@ -90,7 +90,7 @@ void Loader::slotResult( KIO::Job *job )
{
KIO::TransferJob *tjob = static_cast<KIO::TransferJob*>( job );
- DownloadIterator it = m_downloads.find( tjob );
+ DownloadIterator it = m_downloads.tqfind( tjob );
if ( it != m_downloads.end() ) {
Download *d = it.data();
diff --git a/kmrml/kmrml/loader.h b/kmrml/kmrml/loader.h
index 8e1090cf..7b0cef21 100644
--- a/kmrml/kmrml/loader.h
+++ b/kmrml/kmrml/loader.h
@@ -39,10 +39,11 @@ public:
};
-class Loader : public QObject
+class Loader : public TQObject
{
friend class gcc_sucks;
Q_OBJECT
+ TQ_OBJECT
public:
static Loader *self();
diff --git a/kmrml/kmrml/mrml.cpp b/kmrml/kmrml/mrml.cpp
index 1d998476..8fdcce29 100644
--- a/kmrml/kmrml/mrml.cpp
+++ b/kmrml/kmrml/mrml.cpp
@@ -214,13 +214,13 @@ bool Mrml::startSession( const KURL& url )
// desired collection-id
// Wolfgang says, we shouldn't create an own session-id here, as gcc 2.95
- // apparently makes problems in exception handling somehow. So we simply
+ // aptqparently makes problems in exception handling somehow. So we simply
// accept the server's session-id.
- TQString msg = mrmlString( TQString::null ).arg(
+ TQString msg = mrmlString( TQString() ).tqarg(
"<open-session user-name=\"%1\" session-name=\"kio_mrml session\" /> \
<get-algorithms /> \
<get-collections /> \
- </mrml>" ).arg( user( url ));
+ </mrml>" ).tqarg( user( url ));
TQCString utf8 = msg.utf8();
// qDebug(":::Writing: %s", utf8.data());
@@ -240,13 +240,13 @@ TQString Mrml::mrmlString( const TQString& sessionId, const TQString& transactio
</mrml>";
if ( sessionId.isEmpty() ) // when we don't have one yet
- return msg.arg( "<mrml>%1" );
+ return msg.tqarg( "<mrml>%1" );
if ( transactionId.isNull() )
- return msg.arg( "<mrml session-id=\"%1\">%1" ).arg( sessionId );
+ return msg.tqarg( "<mrml session-id=\"%1\">%1" ).tqarg( sessionId );
else
- return msg.arg( "<mrml session-id=\"%1\" transaction-id=\"%1\">%1")
- .arg( sessionId ).arg( transactionId );
+ return msg.tqarg( "<mrml session-id=\"%1\" transaction-id=\"%1\">%1")
+ .tqarg( sessionId ).tqarg( transactionId );
}
void Mrml::emitData( const TQCString& msg )
diff --git a/kmrml/kmrml/mrml.h b/kmrml/kmrml/mrml.h
index c6ee01b2..d0493168 100644
--- a/kmrml/kmrml/mrml.h
+++ b/kmrml/kmrml/mrml.h
@@ -56,7 +56,7 @@ private:
}
static TQString mrmlString( const TQString& sessionId,
- const TQString& transactionId = TQString::null );
+ const TQString& transactionId = TQString() );
static TQCString loginString();
static TQCString getConfigurationString();
diff --git a/kmrml/kmrml/mrml_creator.cpp b/kmrml/kmrml/mrml_creator.cpp
index fe4a14c6..03f2ef77 100644
--- a/kmrml/kmrml/mrml_creator.cpp
+++ b/kmrml/kmrml/mrml_creator.cpp
@@ -65,12 +65,12 @@ TQDomElement MrmlCreator::addRelevanceList( TQDomElement& query )
* Creates a <user-relevance-element> with the given attributes set.
*/
void MrmlCreator::createRelevanceElement( TQDomDocument& doc,
- TQDomElement& parent,
+ TQDomElement& tqparent,
const TQString& url,
Relevance relevance )
{
TQDomElement element = doc.createElement( "user-relevance-element" );
element.setAttribute( "image-location", url );
element.setAttribute( "user-relevance", TQString::number( relevance ) );
- parent.appendChild( element );
+ tqparent.appendChild( element );
}
diff --git a/kmrml/kmrml/mrml_creator.h b/kmrml/kmrml/mrml_creator.h
index 18e49551..2c9e33c3 100644
--- a/kmrml/kmrml/mrml_creator.h
+++ b/kmrml/kmrml/mrml_creator.h
@@ -32,7 +32,7 @@ namespace MrmlCreator
TQDomElement createMrml( TQDomDocument& doc,
const TQString& sessionId,
- const TQString& transactionId = TQString::null );
+ const TQString& transactionId = TQString() );
TQDomElement configureSession( TQDomElement& mrml,
const KMrml::Algorithm& algo,
const TQString& sessionId );
@@ -41,7 +41,7 @@ namespace MrmlCreator
/**
* Creates a <user-relevance-element> with the given attributes set.
*/
- void createRelevanceElement( TQDomDocument& doc, TQDomElement& parent,
+ void createRelevanceElement( TQDomDocument& doc, TQDomElement& tqparent,
const TQString& url, Relevance relevance );
}
diff --git a/kmrml/kmrml/mrml_elements.cpp b/kmrml/kmrml/mrml_elements.cpp
index 3fadcaba..a5a0ebb1 100644
--- a/kmrml/kmrml/mrml_elements.cpp
+++ b/kmrml/kmrml/mrml_elements.cpp
@@ -28,7 +28,7 @@ using namespace KMrml;
//
// MrmlElement is currently the baseclass for Algorithm and Collection. Both
// may have a single child-element <query-paradigm-list>, with a number of
-// <query-paradigm> elements as children.
+// <query-paradigm> elements as tqchildren.
//
MrmlElement::MrmlElement( const TQDomElement& elem )
@@ -144,11 +144,11 @@ Algorithm Algorithm::defaultAlgorithm()
return algo;
}
-TQDomElement Algorithm::toElement( TQDomElement& parent ) const
+TQDomElement Algorithm::toElement( TQDomElement& tqparent ) const
{
- TQDomDocument doc = parent.ownerDocument();
+ TQDomDocument doc = tqparent.ownerDocument();
TQDomElement algorithm = doc.createElement( MrmlShared::algorithm() );
- parent.appendChild( algorithm );
+ tqparent.appendChild( algorithm );
setOtherAttributes( algorithm );
if ( !m_name.isEmpty() )
@@ -194,7 +194,7 @@ bool QueryParadigm::equalMaps( const TQMap<TQString,TQString> m1,
TQMapConstIterator<TQString,TQString> it = m1.begin();
for ( ; it != m1.end(); ++it )
{
- TQMapConstIterator<TQString,TQString> it2 = m2.find( it.key() );
+ TQMapConstIterator<TQString,TQString> it2 = m2.tqfind( it.key() );
if ( it2 == m2.end() || it.data() != it2.data() )
return false;
}
@@ -242,12 +242,12 @@ bool QueryParadigmList::matches( const QueryParadigmList& other ) const
///////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////
-TQValueList<TQDomElement> KMrml::directChildElements( const TQDomElement& parent,
+TQValueList<TQDomElement> KMrml::directChildElements( const TQDomElement& tqparent,
const TQString& tagName )
{
TQValueList<TQDomElement> list;
- TQDomNode node = parent.firstChild();
+ TQDomNode node = tqparent.firstChild();
while ( !node.isNull() )
{
if ( node.isElement() && node.nodeName() == tagName )
@@ -259,10 +259,10 @@ TQValueList<TQDomElement> KMrml::directChildElements( const TQDomElement& parent
return list;
}
-TQDomElement KMrml::firstChildElement( const TQDomElement& parent,
+TQDomElement KMrml::firstChildElement( const TQDomElement& tqparent,
const TQString& tagName )
{
- TQDomNode node = parent.firstChild();
+ TQDomNode node = tqparent.firstChild();
while ( !node.isNull() )
{
if ( node.isElement() && node.nodeName() == tagName )
diff --git a/kmrml/kmrml/mrml_elements.h b/kmrml/kmrml/mrml_elements.h
index 6fe6767d..ae66dcab 100644
--- a/kmrml/kmrml/mrml_elements.h
+++ b/kmrml/kmrml/mrml_elements.h
@@ -106,7 +106,7 @@ namespace KMrml
m_collectionId = id;
}
- TQDomElement toElement( TQDomElement& parent ) const;
+ TQDomElement toElement( TQDomElement& tqparent ) const;
const PropertySheet& propertySheet() const;
static Algorithm defaultAlgorithm();
@@ -221,9 +221,9 @@ namespace KMrml
};
- TQValueList<TQDomElement> directChildElements( const TQDomElement& parent,
+ TQValueList<TQDomElement> directChildElements( const TQDomElement& tqparent,
const TQString& tagName);
- TQDomElement firstChildElement( const TQDomElement& parent,
+ TQDomElement firstChildElement( const TQDomElement& tqparent,
const TQString& tagName );
diff --git a/kmrml/kmrml/mrml_part.cpp b/kmrml/kmrml/mrml_part.cpp
index ba0cad5e..2ec0af90 100644
--- a/kmrml/kmrml/mrml_part.cpp
+++ b/kmrml/kmrml/mrml_part.cpp
@@ -90,14 +90,14 @@ KInstance * PartFactory::instance()
return s_instance;
}
-KParts::Part * PartFactory::createPartObject( TQWidget *parentWidget,
+KParts::Part * PartFactory::createPartObject( TQWidget *tqparentWidget,
const char *widgetName,
- TQObject *parent,
+ TQObject *tqparent,
const char *name,
const char *,
const TQStringList& args )
{
- return new MrmlPart( parentWidget, widgetName, parent, name, args );
+ return new MrmlPart( tqparentWidget, widgetName, tqparent, name, args );
}
@@ -111,10 +111,10 @@ KParts::Part * PartFactory::createPartObject( TQWidget *parentWidget,
uint MrmlPart::s_sessionId = 0;
-MrmlPart::MrmlPart( TQWidget *parentWidget, const char * /* widgetName */,
- TQObject *parent, const char *name,
+MrmlPart::MrmlPart( TQWidget *tqparentWidget, const char * /* widgetName */,
+ TQObject *tqparent, const char *name,
const TQStringList& /* args */ )
- : KParts::ReadOnlyPart( parent, name ),
+ : KParts::ReadOnlyPart( tqparent, name ),
m_job( 0L ),
m_status( NeedCollection )
{
@@ -126,7 +126,7 @@ MrmlPart::MrmlPart( TQWidget *parentWidget, const char * /* widgetName */,
KConfig *config = PartFactory::instance()->config();
config->setGroup("MRML Settings");
- TQVBox *box = new TQVBox( parentWidget, "main mrml box" );
+ TQVBox *box = new TQVBox( tqparentWidget, "main mrml box" );
m_view = new MrmlView( box, "MrmlView" );
connect( m_view, TQT_SIGNAL( activated( const KURL&, ButtonState )),
this, TQT_SLOT( slotActivated( const KURL&, ButtonState )));
@@ -151,15 +151,15 @@ MrmlPart::MrmlPart( TQWidget *parentWidget, const char * /* widgetName */,
// prevent crashes when the connection to the server fails
m_collectionCombo->setCollections( &m_collections );
- m_algoButton = new TQPushButton( TQString::null, m_panel );
+ m_algoButton = new TQPushButton( TQString(), m_panel );
m_algoButton->setPixmap( SmallIcon("configure") );
- m_algoButton->setFixedSize( m_algoButton->sizeHint() );
+ m_algoButton->setFixedSize( m_algoButton->tqsizeHint() );
connect( m_algoButton, TQT_SIGNAL( clicked() ),
TQT_SLOT( slotConfigureAlgorithm() ));
TQToolTip::add( m_algoButton, i18n("Configure algorithm") );
TQWidget *spacer = new TQWidget( m_panel );
- spacer->setSizePolicy( TQSizePolicy( TQSizePolicy::MinimumExpanding,
+ spacer->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::MinimumExpanding,
TQSizePolicy::Minimum ) );
int resultSize = config->readNumEntry( "Result-size", 20 );
@@ -170,15 +170,15 @@ MrmlPart::MrmlPart( TQWidget *parentWidget, const char * /* widgetName */,
TQVBox *tmp = new TQVBox( m_panel );
m_random = new TQCheckBox( i18n("Random search"), tmp );
- m_startButton = new TQPushButton( TQString::null, tmp );
+ m_startButton = new TQPushButton( TQString(), tmp );
connect( m_startButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotStartClicked() ));
- setStatus( NeedCollection );
+ settqStatus( NeedCollection );
setWidget( box );
// setXMLFile( "mrml_part.rc" );
- slotSetStatusBar( TQString::null );
+ slotSetStatusBar( TQString() );
enableServerDependentWidgets( false );
}
@@ -206,7 +206,7 @@ void MrmlPart::initCollections( const TQDomElement& elem )
KMessageBox::information( widget(),
i18n("There is no image collection available\n"
"at %1.\n"), i18n("No Image Collection"));
- setStatus( NeedCollection );
+ settqStatus( NeedCollection );
}
else
m_collectionCombo->updateGeometry(); // adjust the entire grid
@@ -229,7 +229,7 @@ bool MrmlPart::openURL( const KURL& url )
m_url = url;
TQString host = url.host().isEmpty() ?
- TQString::fromLatin1("localhost") : url.host();
+ TQString::tqfromLatin1("localhost") : url.host();
m_hostCombo->setCurrentItem( host );
@@ -285,8 +285,8 @@ bool MrmlPart::openURL( const KURL& url )
== KMessageBox::Yes )
{
KApplication::kdeinitExec( "kcmshell",
- TQString::fromLatin1("kcmkmrml"));
- setStatus( NeedCollection );
+ TQString::tqfromLatin1("kcmkmrml"));
+ settqStatus( NeedCollection );
return false;
}
}
@@ -308,9 +308,9 @@ void MrmlPart::contactServer( const KURL& url )
m_job->addMetaData( MrmlShared::kio_task(), MrmlShared::kio_initialize() );
TQString host = url.host().isEmpty() ?
- TQString::fromLatin1("localhost") : url.host();
+ TQString::tqfromLatin1("localhost") : url.host();
- slotSetStatusBar( i18n("Connecting to indexing server at %1...").arg( host ));
+ slotSetStatusBar( i18n("Connecting to indexing server at %1...").tqarg( host ));
}
//
@@ -325,11 +325,11 @@ void MrmlPart::downloadReferenceFiles( const KURL::List& downloadList )
for ( ; it != downloadList.end(); it++ )
{
TQString extension;
- int index = (*it).fileName().findRev( '.' );
+ int index = (*it).fileName().tqfindRev( '.' );
if ( index != -1 )
extension = (*it).fileName().mid( index );
- KTempFile tmpFile( TQString::null, extension );
+ KTempFile tmpFile( TQString(), extension );
if ( tmpFile.status() != 0 )
{
kdWarning() << "Can't create temporary file, skipping: " << *it << endl;
@@ -376,7 +376,7 @@ bool MrmlPart::closeURL()
m_job = 0L;
}
- setStatus( NeedCollection );
+ settqStatus( NeedCollection );
return true;
}
@@ -400,7 +400,7 @@ KIO::TransferJob * MrmlPart::transferJob( const KURL& url )
emit started( job );
emit setWindowCaption( url.prettyURL() );
- setStatus( InProgress );
+ settqStatus( InProgress );
return job;
}
@@ -410,7 +410,7 @@ void MrmlPart::slotResult( KIO::Job *job )
if ( job == m_job )
m_job = 0L;
- slotSetStatusBar( TQString::null );
+ slotSetStatusBar( TQString() );
if ( !job->error() )
emit completed();
@@ -423,7 +423,7 @@ void MrmlPart::slotResult( KIO::Job *job )
bool auto_random = m_view->isEmpty() && m_queryList.isEmpty();
m_random->setChecked( auto_random );
m_random->setEnabled( !auto_random );
- setStatus( job->error() ? NeedCollection : CanSearch );
+ settqStatus( job->error() ? NeedCollection : CanSearch );
if ( !job->error() && !m_queryList.isEmpty() ) {
// we have a connection and we got a list of relevant URLs to query for
@@ -495,7 +495,7 @@ void MrmlPart::parseMrml( TQDomDocument& doc )
else if ( tagName == "error" ) {
KMessageBox::information( widget(),
i18n("Server returned error:\n%1\n")
- .arg( elem.attribute( "message" )),
+ .tqarg( elem.attribute( "message" )),
i18n("Server Error") );
}
@@ -560,8 +560,8 @@ void MrmlPart::slotStartClicked()
// cut off an eventual query and reference from the url, when the user
// performs a real query (otherwise restoreState() would restore and
// re-do the query from the URL
- m_url.setRef( TQString::null );
- m_url.setQuery( TQString::null );
+ m_url.setRef( TQString() );
+ m_url.setQuery( TQString() );
createQuery();
m_browser->openURLNotify();
@@ -677,7 +677,7 @@ void MrmlPart::performQuery( TQDomDocument& doc )
queryStep.setAttribute("query-type", "at-random");
// remove user-relevance-element-list element for random search
- relevanceList.parentNode().removeChild( relevanceList );
+ relevanceList.tqparentNode().removeChild( relevanceList );
}
}
else
@@ -705,13 +705,13 @@ void MrmlPart::slotSetStatusBar( const TQString& text )
void MrmlPart::slotActivated( const KURL& url, ButtonState button )
{
- if ( button == LeftButton )
+ if ( button == Qt::LeftButton )
emit m_browser->openURLRequest( url );
- else if ( button == MidButton )
+ else if ( button == Qt::MidButton )
emit m_browser->createNewWindow( url );
- else if ( button == RightButton ) {
+ else if ( button == Qt::RightButton ) {
// enableExtensionActions( url, true ); // for now
- emit m_browser->popupMenu( TQCursor::pos(), url, TQString::null );
+ emit m_browser->popupMenu( TQCursor::pos(), url, TQString() );
// enableExtensionActions( url, false );
}
}
@@ -776,7 +776,7 @@ void MrmlPart::slotHostComboActivated( const TQString& host )
openURL( settings.getUrl() );
}
-void MrmlPart::setStatus( Status status )
+void MrmlPart::settqStatus( tqStatus status )
{
switch ( status )
{
diff --git a/kmrml/kmrml/mrml_part.h b/kmrml/kmrml/mrml_part.h
index 84ce0529..fbe82d25 100644
--- a/kmrml/kmrml/mrml_part.h
+++ b/kmrml/kmrml/mrml_part.h
@@ -54,16 +54,17 @@ class MrmlView;
class MrmlPart : public KParts::ReadOnlyPart
{
Q_OBJECT
+ TQ_OBJECT
public:
- enum Status { NeedCollection, CanSearch, InProgress };
+ enum tqStatus { NeedCollection, CanSearch, InProgress };
- MrmlPart( TQWidget *parentWidget, const char *widgetName,
- TQObject *parent, const char *name, const TQStringList& args );
+ MrmlPart( TQWidget *tqparentWidget, const char *widgetName,
+ TQObject *tqparent, const char *name, const TQStringList& args );
~MrmlPart();
TQString sessionId() const { return m_sessionId; }
- TQString transactionId() const { return TQString::null; } // ###
+ TQString transactionId() const { return TQString(); } // ###
void saveState( TQDataStream& stream );
void restoreState( TQDataStream& stream );
@@ -115,7 +116,7 @@ private:
void initHostCombo();
void enableServerDependentWidgets( bool enable );
- void setStatus( Status status );
+ void settqStatus( tqStatus status );
void contactServer( const KURL& url );
void downloadReferenceFiles( const KURL::List& downloadList );
@@ -142,7 +143,7 @@ private:
CollectionList m_collections;
AlgorithmList m_algorithms;
- Status m_status;
+ tqStatus m_status;
static uint s_sessionId;
};
@@ -150,6 +151,7 @@ private:
class PartFactory : public KParts::Factory
{
Q_OBJECT
+ TQ_OBJECT
public:
PartFactory();
@@ -158,9 +160,9 @@ public:
static KInstance * instance();
protected:
- virtual KParts::Part * createPartObject( TQWidget *parentWidget = 0,
+ virtual KParts::Part * createPartObject( TQWidget *tqparentWidget = 0,
const char *widgetName = 0,
- TQObject *parent = 0,
+ TQObject *tqparent = 0,
const char *name = 0,
const char *classname = "KParts::Part",
const TQStringList& args = TQStringList() );
diff --git a/kmrml/kmrml/mrml_view.cpp b/kmrml/kmrml/mrml_view.cpp
index 89c15061..254307e0 100644
--- a/kmrml/kmrml/mrml_view.cpp
+++ b/kmrml/kmrml/mrml_view.cpp
@@ -37,8 +37,8 @@
using namespace KMrml;
-MrmlView::MrmlView( TQWidget *parent, const char *name )
- : TQScrollView( parent, name )
+MrmlView::MrmlView( TQWidget *tqparent, const char *name )
+ : TQScrollView( tqparent, name )
{
setStaticBackground( true );
setResizePolicy( Manual );
@@ -57,11 +57,11 @@ MrmlView::MrmlView( TQWidget *parent, const char *name )
// query result image
TQLabel l( i18n( "No thumbnail available" ), 0L );
l.setFixedSize( 80, 80 );
- l.setAlignment( WordBreak | AlignCenter );
+ l.tqsetAlignment( WordBreak | AlignCenter );
// l.setFrameStyle( TQLabel::Box | TQLabel::Plain );
// l.setLineWidth( 1 );
- l.setPaletteBackgroundColor( Qt::white );
- l.setPaletteForegroundColor( Qt::black );
+ l.setPaletteBackgroundColor( TQt::white );
+ l.setPaletteForegroundColor( TQt::black );
m_unavailablePixmap = TQPixmap::grabWidget( &l );
}
@@ -103,11 +103,11 @@ MrmlViewItem * MrmlView::addItem( const KURL& url, const KURL& thumbURL,
}
void MrmlView::addRelevanceToQuery( TQDomDocument& document,
- TQDomElement& parent )
+ TQDomElement& tqparent )
{
TQPtrListIterator<MrmlViewItem> it( m_items );
for( ; it.current(); ++it ) {
- it.current()->createRelevanceElement( document, parent );
+ it.current()->createRelevanceElement( document, tqparent );
}
}
@@ -120,7 +120,7 @@ void MrmlView::clear()
TQPixmap * MrmlView::getPixmap( const KURL& url )
{
TQString u = url.url();
- TQPixmap *pix = m_pixmapCache.find( u );
+ TQPixmap *pix = m_pixmapCache.tqfind( u );
if ( pix )
return pix;
@@ -130,7 +130,7 @@ TQPixmap * MrmlView::getPixmap( const KURL& url )
p = m_unavailablePixmap;
m_pixmapCache.insert( u, p );
- return m_pixmapCache.find( u );
+ return m_pixmapCache.tqfind( u );
}
else { // remote url, download with KIO
Loader::self()->requestDownload( url );
@@ -176,7 +176,7 @@ void MrmlView::slotLayout()
TQPtrListIterator<MrmlViewItem> it( m_items );
for ( ; it.current(); ++it ) {
- itemWidth = QMAX( itemWidth, it.current()->sizeHint().width() );
+ itemWidth = TQMAX( itemWidth, it.current()->tqsizeHint().width() );
}
if ( itemWidth == 0 )
@@ -202,7 +202,7 @@ void MrmlView::slotLayout()
if ( item == 0 )
rowIt = it;
- rowHeight = QMAX( rowHeight, it.current()->sizeHint().height() );
+ rowHeight = TQMAX( rowHeight, it.current()->tqsizeHint().height() );
addChild( it.current(), margin + item * itemWidth, y );
it.current()->show();
@@ -251,7 +251,7 @@ void MrmlView::restoreState( TQDataStream& stream )
KURL url, thumbURL;
double similarity;
- Q_UINT32 relevance;
+ TQ_UINT32 relevance;
MrmlViewItem *item;
@@ -274,7 +274,7 @@ TQDataStream& KMrml::operator<<( TQDataStream& stream,
return stream << item.url()
<< item.thumbURL()
<< item.similarity()
- << static_cast<Q_UINT32>( item.relevance() );
+ << static_cast<TQ_UINT32>( item.relevance() );
}
///////////////////////////////////////////////////////////////////
@@ -292,7 +292,7 @@ MrmlViewItem::MrmlViewItem( const KURL& url, const KURL& thumbURL,
m_hasRemotePixmap( false )
{
if ( m_similarity != -1 )
- m_similarity = QMAX( 0.0, QMIN( 1.0, similarity ));
+ m_similarity = TQMAX( 0.0, TQMIN( 1.0, similarity ));
setFrameStyle( Panel | Sunken );
setMouseTracking( true );
@@ -306,11 +306,11 @@ MrmlViewItem::MrmlViewItem( const KURL& url, const KURL& thumbURL,
/*
if ( similarity > -1 )
- TQToolTip::add( this, TQString::fromLatin1("<qt>%1<br>%1</qt>")
- .arg( url )
- .arg(i18n("Similarity: %1").arg( TQString::number(similarity))));
+ TQToolTip::add( this, TQString::tqfromLatin1("<qt>%1<br>%1</qt>")
+ .tqarg( url )
+ .tqarg(i18n("Similarity: %1").tqarg( TQString::number(similarity))));
else
- TQToolTip::add( this, TQString::fromLatin1("<qt>%1</qt>").arg( url ) );
+ TQToolTip::add( this, TQString::tqfromLatin1("<qt>%1</qt>").tqarg( url ) );
*/
setMinimumSize( 130, 130 ); // ###
@@ -342,14 +342,14 @@ void MrmlViewItem::paintEvent( TQPaintEvent *e )
if ( m_similarity >= 0 ) {
TQPainter p( this );
- TQPen pen( colorGroup().highlight(), 1, TQPen::SolidLine );
+ TQPen pen( tqcolorGroup().highlight(), 1, TQPen::SolidLine );
p.setPen( pen );
int x = margin;
int y = m_combo->y() - similarityHeight - 2;
int w = (int) (similarityFullWidth * m_similarity);
int h = similarityHeight;
p.drawRect( x, y, similarityFullWidth, h );
- p.fillRect( x, y, w, h, colorGroup().highlight() );
+ p.fillRect( x, y, w, h, tqcolorGroup().highlight() );
}
}
@@ -361,9 +361,9 @@ void MrmlViewItem::resizeEvent( TQResizeEvent *e )
m_combo->move( width()/2 - m_combo->width()/2, y );
}
-TQSize MrmlViewItem::sizeHint() const
+TQSize MrmlViewItem::tqsizeHint() const
{
- int w = QMAX( QMAX(minimumHeight(), m_combo->width()), m_pixmap.width() );
+ int w = TQMAX( TQMAX(minimumHeight(), m_combo->width()), m_pixmap.width() );
w += 2 * margin;
int h = m_pixmap.isNull() ? margin : margin + spacing + m_pixmap.height();
@@ -380,11 +380,11 @@ void MrmlViewItem::mousePressEvent( TQMouseEvent *e )
pressedPos.setY( 0 );
- if ( e->button() == LeftButton || e->button() == MidButton ) {
+ if ( e->button() == Qt::LeftButton || e->button() == Qt::MidButton ) {
if ( hitsPixmap( e->pos() ) )
pressedPos = e->pos();
}
- else if ( e->button() == RightButton && hitsPixmap( e->pos() ) )
+ else if ( e->button() == Qt::RightButton && hitsPixmap( e->pos() ) )
emit view()->activated( m_url, e->button() );
}
@@ -403,7 +403,7 @@ void MrmlViewItem::mouseMoveEvent( TQMouseEvent *e )
}
}
- if ( (e->state() & LeftButton) && !pressedPos.isNull() ) {
+ if ( (e->state() & Qt::LeftButton) && !pressedPos.isNull() ) {
TQPoint dist = e->pos() - pressedPos;
if ( dist.manhattanLength() > KGlobalSettings::dndEventDelay() ) {
// start drag here
@@ -439,13 +439,13 @@ bool MrmlViewItem::hitsPixmap( const TQPoint& pos ) const
}
void MrmlViewItem::createRelevanceElement( TQDomDocument& document,
- TQDomElement& parent )
+ TQDomElement& tqparent )
{
int rel = m_combo->currentItem();
if ( rel == Neutral )
return;
- MrmlCreator::createRelevanceElement( document, parent, m_url.url(),
+ MrmlCreator::createRelevanceElement( document, tqparent, m_url.url(),
(rel == Relevant) ? MrmlCreator::Relevant : MrmlCreator::Irrelevant );
}
diff --git a/kmrml/kmrml/mrml_view.h b/kmrml/kmrml/mrml_view.h
index f48c80be..d666910f 100644
--- a/kmrml/kmrml/mrml_view.h
+++ b/kmrml/kmrml/mrml_view.h
@@ -47,14 +47,15 @@ protected:
};
-class MrmlView : public QScrollView
+class MrmlView : public TQScrollView
{
friend class MrmlViewItem;
Q_OBJECT
+ TQ_OBJECT
public:
- MrmlView( TQWidget *parent = 0L, const char *name = 0L );
+ MrmlView( TQWidget *tqparent = 0L, const char *name = 0L );
~MrmlView();
MrmlViewItem * addItem( const KURL& url, const KURL& thumbURL,
@@ -63,7 +64,7 @@ public:
double similarity );
- void addRelevanceToQuery( TQDomDocument&, TQDomElement& parent );
+ void addRelevanceToQuery( TQDomDocument&, TQDomElement& tqparent );
void clear();
@@ -100,9 +101,10 @@ private:
};
-class MrmlViewItem : public QFrame
+class MrmlViewItem : public TQFrame
{
Q_OBJECT
+ TQ_OBJECT
public:
enum Relevance
@@ -118,13 +120,13 @@ public:
void setPixmap( const TQPixmap& pixmap );
- void createRelevanceElement( TQDomDocument& document, TQDomElement& parent );
+ void createRelevanceElement( TQDomDocument& document, TQDomElement& tqparent );
double similarity() const { return m_similarity; }
void setSimilarity( double value );
- virtual TQSize sizeHint() const;
+ virtual TQSize tqsizeHint() const;
const KURL& url() const { return m_url; }
const KURL& thumbURL() const { return m_thumbURL; }
@@ -147,7 +149,7 @@ private:
MrmlView * view() const { return m_view; }
inline int pixmapX() const {
- return QMAX( margin, (width() - m_pixmap.width()) / 2);
+ return TQMAX( margin, (width() - m_pixmap.width()) / 2);
}
inline int pixmapY() const {
return m_combo->y() - similarityHeight - m_pixmap.height() - margin;
diff --git a/kmrml/kmrml/propertysheet.cpp b/kmrml/kmrml/propertysheet.cpp
index af913558..6391c62e 100644
--- a/kmrml/kmrml/propertysheet.cpp
+++ b/kmrml/kmrml/propertysheet.cpp
@@ -98,14 +98,14 @@ void PropertySheet::initFromDOM( const TQDomElement& elem )
m_minSubsetSize = toInt( elem.attribute( MrmlShared::minSubsetSize() ));
m_maxSubsetSize = toInt( elem.attribute( MrmlShared::maxSubsetSize() ));
- TQValueList<TQDomElement> children =
+ TQValueList<TQDomElement> tqchildren =
KMrml::directChildElements( elem, MrmlShared::propertySheet() );
- TQValueListConstIterator<TQDomElement> it = children.begin();
- for ( ; it != children.end(); ++it )
+ TQValueListConstIterator<TQDomElement> it = tqchildren.begin();
+ for ( ; it != tqchildren.end(); ++it )
m_subSheets.append( new PropertySheet( *it ) );
}
-TQWidget * PropertySheet::createWidget( TQWidget */*parent*/, const char */*name*/ )
+TQWidget * PropertySheet::createWidget( TQWidget */*tqparent*/, const char */*name*/ )
{
TQWidget *w = 0L;
@@ -190,7 +190,7 @@ PropertySheet::SendType PropertySheet::getSendType( const TQString& value )
type = AttributeName;
else if ( value == MrmlShared::attributeValue() )
type = AttributeValue;
- else if ( value == MrmlShared::children() )
+ else if ( value == MrmlShared::tqchildren() )
type = Children;
else if ( value == MrmlShared::none() )
type = None;
diff --git a/kmrml/kmrml/propertysheet.h b/kmrml/kmrml/propertysheet.h
index e4759282..89d9a37f 100644
--- a/kmrml/kmrml/propertysheet.h
+++ b/kmrml/kmrml/propertysheet.h
@@ -34,7 +34,7 @@ namespace KMrml
{
MultiSet = 1, // ??
Subset, // radio-button/combobox or listbox
- SetElement, // CheckBox -> disables/enables children?
+ SetElement, // CheckBox -> disables/enables tqchildren?
Boolean, // CheckBox
Numeric, // Slider/Spinbox
Textual, // lineedit
@@ -71,9 +71,9 @@ namespace KMrml
}
void initFromDOM( const TQDomElement& elem );
- void toElement( TQDomElement& parent );
+ void toElement( TQDomElement& tqparent );
- TQWidget * createWidget( TQWidget *parent, const char *name = 0 );
+ TQWidget * createWidget( TQWidget *tqparent, const char *name = 0 );
private:
static Visibility getVisibility( const TQString& value );
diff --git a/kmrml/kmrml/propertywidgets.cpp b/kmrml/kmrml/propertywidgets.cpp
index 18508f3a..5c562588 100644
--- a/kmrml/kmrml/propertywidgets.cpp
+++ b/kmrml/kmrml/propertywidgets.cpp
@@ -19,8 +19,8 @@
#include "propertywidgets.h"
IntegerWidget::IntegerWidget( const PropertySheet& sheet,
- TQWidget *parent, const char *name )
- : TQHBox( parent, name )
+ TQWidget *tqparent, const char *name )
+ : TQHBox( tqparent, name )
{
}
@@ -39,8 +39,8 @@ int IntegerWidget::value() const
///////////////////////////////////////////////////////////////////
ComboWidget::ComboWidget( const PropertySheet& sheet,
- TQWidget *parent, const char *name )
- : TQHBox( parent, name )
+ TQWidget *tqparent, const char *name )
+ : TQHBox( tqparent, name )
{
}
@@ -60,8 +60,8 @@ TQString ComboWidget::value() const
///////////////////////////////////////////////////////////////////
CheckBoxWidget::CheckBoxWidget( const PropertySheet& sheet,
- TQWidget *parent, const char *name )
- : TQHBox( parent, name )
+ TQWidget *tqparent, const char *name )
+ : TQHBox( tqparent, name )
{
}
@@ -81,8 +81,8 @@ bool CheckBoxWidget::value() const
///////////////////////////////////////////////////////////////////
LineEditWidget::LineEditWidget( const PropertySheet& sheet,
- TQWidget *parent, const char *name )
- : TQHBox( parent, name )
+ TQWidget *tqparent, const char *name )
+ : TQHBox( tqparent, name )
{
}
@@ -102,8 +102,8 @@ TQString LineEditWidget::value() const
///////////////////////////////////////////////////////////////////
ListBoxWidget::ListBoxWidget( const PropertySheet& sheet,
- TQWidget *parent, const char *name )
- : TQHBox( parent, name )
+ TQWidget *tqparent, const char *name )
+ : TQHBox( tqparent, name )
{
}
diff --git a/kmrml/kmrml/propertywidgets.h b/kmrml/kmrml/propertywidgets.h
index def1d2ca..1048e6f0 100644
--- a/kmrml/kmrml/propertywidgets.h
+++ b/kmrml/kmrml/propertywidgets.h
@@ -25,13 +25,14 @@
namespace KMrml
{
- class IntegerWidget : public QHBox
+ class IntegerWidget : public TQHBox
{
Q_OBJECT
+ TQ_OBJECT
public:
IntegerWidget( const PropertySheet& sheet,
- TQWidget *parent = parent, const char *name = 0L );
+ TQWidget *tqparent = tqparent, const char *name = 0L );
~IntegerWidget();
int value() const;
@@ -40,13 +41,14 @@ namespace KMrml
};
- class ComboWidget : public QHBox
+ class ComboWidget : public TQHBox
{
Q_OBJECT
+ TQ_OBJECT
public:
ComboWidget( const PropertySheet& sheet,
- TQWidget *parent = parent, const char *name = 0L );
+ TQWidget *tqparent = tqparent, const char *name = 0L );
~ComboWidget();
TQString value() const;
@@ -55,13 +57,14 @@ namespace KMrml
};
- class CheckBoxWidget : public QHBox
+ class CheckBoxWidget : public TQHBox
{
Q_OBJECT
+ TQ_OBJECT
public:
CheckBoxWidget( const PropertySheet& sheet,
- TQWidget *parent = parent, const char *name = 0L );
+ TQWidget *tqparent = tqparent, const char *name = 0L );
~CheckBoxWidget();
bool value();
@@ -72,13 +75,14 @@ namespace KMrml
};
- class LineEditWidget : public QHBox
+ class LineEditWidget : public TQHBox
{
Q_OBJECT
+ TQ_OBJECT
public:
LineEditWidget( const PropertySheet& sheet,
- TQWidget *parent = parent, const char *name = 0L );
+ TQWidget *tqparent = tqparent, const char *name = 0L );
~LineEditWidget();
TQString value();
@@ -87,13 +91,14 @@ namespace KMrml
};
- class ListBoxWidget : public QHBox
+ class ListBoxWidget : public TQHBox
{
Q_OBJECT
+ TQ_OBJECT
public:
ListBoxWidget( const PropertySheet& sheet,
- TQWidget *parent = parent, const char *name = 0L );
+ TQWidget *tqparent = tqparent, const char *name = 0L );
~ListBoxWidget();
TQStringList values();
diff --git a/kmrml/kmrml/server/watcher.cpp b/kmrml/kmrml/server/watcher.cpp
index 96314257..46a7221c 100644
--- a/kmrml/kmrml/server/watcher.cpp
+++ b/kmrml/kmrml/server/watcher.cpp
@@ -56,11 +56,11 @@ bool Watcher::requireDaemon( const TQCString& clientAppId,
<< ": Client AppID is not registered with DCOP: "
<< clientAppId << endl;
- DaemonData *daemon = m_daemons.find( daemonKey );
+ DaemonData *daemon = m_daemons.tqfind( daemonKey );
if ( daemon )
{
- if ( !daemon->apps.find( clientAppId ) )
+ if ( !daemon->apps.tqfind( clientAppId ) )
daemon->apps.append( clientAppId );
// timeout, commandline and restart values are: first come, first serve
@@ -93,7 +93,7 @@ bool Watcher::requireDaemon( const TQCString& clientAppId,
void Watcher::unrequireDaemon( const TQCString& clientAppId,
const TQString& daemonKey )
{
- unrequireDaemon( m_daemons.find( daemonKey ), clientAppId );
+ unrequireDaemon( m_daemons.tqfind( daemonKey ), clientAppId );
}
void Watcher::unrequireDaemon( DaemonData *daemon,
@@ -101,7 +101,7 @@ void Watcher::unrequireDaemon( DaemonData *daemon,
{
if ( daemon )
{
- daemon->apps.remove( clientAppId );
+ daemon->apps.remove( clientAppId.data() );
if ( daemon->apps.isEmpty() )
{
if ( !daemon->timer )
@@ -146,7 +146,7 @@ void Watcher::slotProcExited( KProcess *proc )
i18n("<qt>The server with the command line"
"<br>%1<br>"
"is not available anymore. Do you want to "
- "restart it?" ).arg( daemon->commandline ),
+ "restart it?" ).tqarg( daemon->commandline ),
i18n("Service Failure"), i18n("Restart Server"), i18n("Do Not Restart") )
== KMessageBox::Yes )
{
@@ -175,7 +175,7 @@ bool Watcher::startDaemon( DaemonData *daemon )
i18n("Unable to start the server with the "
"command line"
"<br>%1<br>"
- "Try again?").arg( daemon->commandline ),
+ "Try again?").tqarg( daemon->commandline ),
i18n("Service Failure"), i18n("Try Again"), i18n("Do Not Try") )
== KMessageBox::Yes )
{
@@ -188,7 +188,7 @@ bool Watcher::startDaemon( DaemonData *daemon )
void Watcher::slotTimeout()
{
- TQTimer *timer = static_cast<TQTimer*>( const_cast<TQObject *>( sender() ) );
+ TQTimer *timer = static_cast<TQTimer*>( TQT_TQOBJECT( sender() ) );
DaemonData *daemon = findDaemonFromTimer( timer );
if ( daemon )
{
@@ -243,7 +243,7 @@ void Watcher::slotAppUnregistered( const TQCString& appId )
TQDictIterator<DaemonData> it( m_daemons );
for ( ; (daemon = it.current()); ++it )
{
- if ( daemon->apps.find( appId ) != -1 )
+ if ( daemon->apps.tqfind( appId ) != -1 )
unrequireDaemon( daemon, appId );
}
}
diff --git a/kmrml/kmrml/server/watcher.h b/kmrml/kmrml/server/watcher.h
index ef7ae9eb..941d7ebf 100644
--- a/kmrml/kmrml/server/watcher.h
+++ b/kmrml/kmrml/server/watcher.h
@@ -61,6 +61,7 @@ namespace KMrml
class Watcher : public KDEDModule
{
Q_OBJECT
+// TQ_OBJECT
K_DCOP
public: