summaryrefslogtreecommitdiffstats
path: root/kbabel
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-18 18:35:10 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-18 18:35:10 -0600
commit1dd83e5f38d1c16d3e6da18d0caca0ee093ab58f (patch)
tree11037eed53e1cd90dad4e194f9dea542ad28607f /kbabel
parent3b34e5cf56262c9f54a3bcf02ee5ad93ca0fb05b (diff)
downloadtdesdk-1dd83e5f38d1c16d3e6da18d0caca0ee093ab58f.tar.gz
tdesdk-1dd83e5f38d1c16d3e6da18d0caca0ee093ab58f.zip
Rename old tq methods that no longer need a unique name
Diffstat (limited to 'kbabel')
-rw-r--r--kbabel/addons/kfile-plugins/kfile_po.cpp2
-rw-r--r--kbabel/catalogmanager/catalogmanager.cpp4
-rw-r--r--kbabel/catalogmanager/catalogmanagerview.cpp12
-rw-r--r--kbabel/catalogmanager/catalogmanagerview.h2
-rw-r--r--kbabel/catalogmanager/catmanlistitem.cpp34
-rw-r--r--kbabel/catalogmanager/libcvs/cvsdialog.cpp8
-rw-r--r--kbabel/catalogmanager/libcvs/cvshandler.cpp14
-rw-r--r--kbabel/catalogmanager/libcvs/cvshandler.h10
-rw-r--r--kbabel/catalogmanager/libcvs/cvsresources.h2
-rw-r--r--kbabel/catalogmanager/libsvn/svndialog.cpp2
-rw-r--r--kbabel/catalogmanager/libsvn/svnhandler.cpp26
-rw-r--r--kbabel/catalogmanager/libsvn/svnhandler.h10
-rw-r--r--kbabel/catalogmanager/validateprogresswidget.ui2
-rw-r--r--kbabel/common/catalog.cpp46
-rw-r--r--kbabel/common/catalog.h20
-rw-r--r--kbabel/common/catalogfileplugin.h8
-rw-r--r--kbabel/common/importplugin.cpp4
-rw-r--r--kbabel/common/msgfmt.cpp8
-rw-r--r--kbabel/common/msgfmt.h6
-rw-r--r--kbabel/common/poinfo.cpp16
-rw-r--r--kbabel/common/poinfo.h6
-rw-r--r--kbabel/commonui/cmdedit.cpp2
-rw-r--r--kbabel/commonui/diffpreferences.ui2
-rw-r--r--kbabel/commonui/klisteditor.ui4
-rw-r--r--kbabel/commonui/projectprefwidgets.cpp30
-rw-r--r--kbabel/commonui/projectwizardwidget2.ui2
-rw-r--r--kbabel/commonui/roughtransdlg.cpp2
-rw-r--r--kbabel/filters/gettext/gettextexport.cpp6
-rw-r--r--kbabel/filters/gettext/gettextexport.h2
-rw-r--r--kbabel/filters/gettext/gettextimport.cpp16
-rw-r--r--kbabel/filters/gettext/gettextimport.h6
-rw-r--r--kbabel/filters/linguist/linguistexport.cpp2
-rw-r--r--kbabel/filters/linguist/linguistexport.h2
-rw-r--r--kbabel/filters/linguist/linguistimport.cpp2
-rw-r--r--kbabel/filters/linguist/linguistimport.h2
-rw-r--r--kbabel/filters/xliff/xliffexport.cpp2
-rw-r--r--kbabel/filters/xliff/xliffexport.h2
-rw-r--r--kbabel/filters/xliff/xliffimport.cpp2
-rw-r--r--kbabel/filters/xliff/xliffimport.h2
-rw-r--r--kbabel/kbabel/colorpreferences.ui2
-rw-r--r--kbabel/kbabel/editordiffpreferences.ui2
-rw-r--r--kbabel/kbabel/editorpreferences.ui10
-rw-r--r--kbabel/kbabel/errorlistview.cpp2
-rw-r--r--kbabel/kbabel/kbabel.cpp14
-rw-r--r--kbabel/kbabel/kbabelsplash.cpp2
-rw-r--r--kbabel/kbabel/kbabelview.cpp60
-rw-r--r--kbabel/kbabel/kbabelview.h4
-rw-r--r--kbabel/kbabel/kbabelview2.cpp6
-rw-r--r--kbabel/kbabel/kbhighlighting.cpp2
-rw-r--r--kbabel/kbabel/main.cpp18
-rw-r--r--kbabel/kbabel/mymultilineedit.cpp10
-rw-r--r--kbabel/kbabel/searchpreferences.ui2
-rw-r--r--kbabel/kbabeldict/kbabeldictbox.cpp4
-rw-r--r--kbabel/kbabeldict/kbabelsplash.cpp2
-rw-r--r--kbabel/kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp10
-rw-r--r--kbabel/kbabeldict/modules/dbsearchengine/dbscan.cpp4
-rw-r--r--kbabel/kbabeldict/modules/dbsearchengine/dbseprefwidget.ui12
-rw-r--r--kbabel/kbabeldict/modules/dbsearchengine/preferenceswidget.cpp2
-rw-r--r--kbabel/kbabeldict/modules/dbsearchengine2/dbscan.cpp2
-rw-r--r--kbabel/kbabeldict/modules/dbsearchengine2/dbse2.ui10
-rw-r--r--kbabel/kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui12
-rw-r--r--kbabel/kbabeldict/modules/dbsearchengine2/sourcedialog.ui4
-rw-r--r--kbabel/kbabeldict/modules/poauxiliary/poauxiliary.cpp8
-rw-r--r--kbabel/kbabeldict/modules/poauxiliary/pwidget.ui4
-rw-r--r--kbabel/kbabeldict/modules/pocompendium/compendiumdata.cpp4
-rw-r--r--kbabel/kbabeldict/modules/pocompendium/pocompendium.cpp4
-rw-r--r--kbabel/kbabeldict/modules/pocompendium/pwidget.ui4
-rw-r--r--kbabel/kbabeldict/modules/tmx/pwidget.ui2
-rw-r--r--kbabel/kbabeldict/modules/tmx/tmxcompendium.cpp4
-rw-r--r--kbabel/kbabeldict/modules/tmx/tmxcompendiumdata.cpp2
-rw-r--r--kbabel/kbabeldict/searchengine.h12
71 files changed, 285 insertions, 285 deletions
diff --git a/kbabel/addons/kfile-plugins/kfile_po.cpp b/kbabel/addons/kfile-plugins/kfile_po.cpp
index cb2b6390..156f52c1 100644
--- a/kbabel/addons/kfile-plugins/kfile_po.cpp
+++ b/kbabel/addons/kfile-plugins/kfile_po.cpp
@@ -62,7 +62,7 @@ bool KPoPlugin::readInfo(KFileMetaInfo& metaInfo, uint)
{
PoInfo poInfo;
TQStringList wordList;
- ConversiontqStatus status = PoInfo::info(metaInfo.path(), poInfo, wordList, false, false, false);
+ ConversionStatus status = PoInfo::info(metaInfo.path(), poInfo, wordList, false, false, false);
if (status == OK) {
KFileMetaInfoGroup group = appendGroup(metaInfo, "CatalogInfo");
diff --git a/kbabel/catalogmanager/catalogmanager.cpp b/kbabel/catalogmanager/catalogmanager.cpp
index 572c593c..60b0b8b8 100644
--- a/kbabel/catalogmanager/catalogmanager.cpp
+++ b/kbabel/catalogmanager/catalogmanager.cpp
@@ -431,7 +431,7 @@ void CatalogManager::setupActions()
(void)new KAction( i18n( "Commit Marked" ), 0, TQT_TQOBJECT(_catalogManager),
TQT_SLOT( cvsCommitMarked( ) ), actionCollection( ), "cvs_commit_marked" );
(void)new KAction( i18n( "Status" ), 0, TQT_TQOBJECT(_catalogManager),
- TQT_SLOT( cvstqStatus( ) ), actionCollection( ), "cvs_status" );
+ TQT_SLOT( cvsStatus( ) ), actionCollection( ), "cvs_status" );
(void)new KAction( i18n( "Status for Marked" ), 0, TQT_TQOBJECT(_catalogManager),
TQT_SLOT( cvsStatusMarked( ) ), actionCollection( ), "cvs_status_marked" );
(void)new KAction( i18n( "Show Diff" ), 0, TQT_TQOBJECT(_catalogManager),
@@ -552,7 +552,7 @@ void CatalogManager::setupStatusBar()
_statusProgressBar->hide();
statusBar()->addWidget(progressBox,1);
- statusBar()->setMinimumHeight(_statusProgressBar->tqsizeHint().height());
+ statusBar()->setMinimumHeight(_statusProgressBar->sizeHint().height());
TQWhatsThis::add(statusBar(),
i18n("<qt><p><b>Statusbar</b></p>\n"
diff --git a/kbabel/catalogmanager/catalogmanagerview.cpp b/kbabel/catalogmanager/catalogmanagerview.cpp
index 2473af73..88678fa8 100644
--- a/kbabel/catalogmanager/catalogmanagerview.cpp
+++ b/kbabel/catalogmanager/catalogmanagerview.cpp
@@ -807,7 +807,7 @@ void CatalogManagerView::checkSyntax()
if(!item->hasPo())
return;
- Msgfmt::tqStatus status;
+ Msgfmt::Status status;
TQString output;
Msgfmt msgfmt;
@@ -850,7 +850,7 @@ void CatalogManagerView::checkSyntax()
}
else
{
- Msgfmt::tqStatus status;
+ Msgfmt::Status status;
TQString output;
Msgfmt msgfmt;
@@ -1082,14 +1082,14 @@ void CatalogManagerView::cvsCommitMarked( )
doCVSCommand( CVS::Commit, true );
}
-void CatalogManagerView::cvstqStatus( )
+void CatalogManagerView::cvsStatus( )
{
- doCVSCommand( CVS::tqStatus );
+ doCVSCommand( CVS::Status );
}
void CatalogManagerView::cvsStatusMarked( )
{
- doCVSCommand( CVS::tqStatus, true );
+ doCVSCommand( CVS::Status, true );
}
void CatalogManagerView::cvsUpdateTemplate( )
@@ -3008,7 +3008,7 @@ void CatalogManagerView::validate_internal( const TQStringList& files, const KDa
true, i18n("Validation Options"), KDialogBase::Ok|KDialogBase::Cancel);
_validateOptions = new ValidationOptions(_validateOptionsDlg);
_validateOptionsDlg->setMainWidget( _validateOptions );
- _validateOptions->resize( _validateOptions->tqsizeHint() );
+ _validateOptions->resize( _validateOptions->sizeHint() );
// setup stored values
_validateOptions->markAsFuzzy->setChecked( _markAsFuzzy );
diff --git a/kbabel/catalogmanager/catalogmanagerview.h b/kbabel/catalogmanager/catalogmanagerview.h
index d923a3bb..398a796a 100644
--- a/kbabel/catalogmanager/catalogmanagerview.h
+++ b/kbabel/catalogmanager/catalogmanagerview.h
@@ -161,7 +161,7 @@ public slots:
void cvsUpdateMarked( );
void cvsCommit( );
void cvsCommitMarked( );
- void cvstqStatus( );
+ void cvsStatus( );
void cvsStatusMarked( );
void cvsUpdateTemplate( );
void cvsUpdateMarkedTemplate( );
diff --git a/kbabel/catalogmanager/catmanlistitem.cpp b/kbabel/catalogmanager/catmanlistitem.cpp
index d5997dd5..c836a956 100644
--- a/kbabel/catalogmanager/catmanlistitem.cpp
+++ b/kbabel/catalogmanager/catmanlistitem.cpp
@@ -417,7 +417,7 @@ void CatManListItem::update(bool showPoInfo,bool includeChildren
if(showPoInfo)
{
- _lastUpdated=TQDateTime::tqcurrentDateTime();
+ _lastUpdated=TQDateTime::currentDateTime();
bool neededWork=needsWork();
bool needWork=false;
@@ -435,17 +435,17 @@ void CatManListItem::update(bool showPoInfo,bool includeChildren
const CVSHandler* cvsHandler = _view->cvsHandler();
const SVNHandler* svnHandler = _view->svnHandler();
- const CVSHandler::FiletqStatus cvsFiletqStatus = cvsHandler->fstatus( poFile() );
- const SVNHandler::FiletqStatus svnFiletqStatus = svnHandler->fstatus( poFile() );
+ const CVSHandler::FileStatus cvsFileStatus = cvsHandler->fstatus( poFile() );
+ const SVNHandler::FileStatus svnFileStatus = svnHandler->fstatus( poFile() );
- _isModified = cvsHandler->isConsideredModified( cvsFiletqStatus )
- || svnHandler->isConsideredModified( svnFiletqStatus );
+ _isModified = cvsHandler->isConsideredModified( cvsFileStatus )
+ || svnHandler->isConsideredModified( svnFileStatus );
TQString versionControl;
- if ( cvsFiletqStatus != CVSHandler::NO_REPOSITORY )
- versionControl = cvsHandler->filetqStatus( cvsFiletqStatus );
- else if ( svnFiletqStatus != SVNHandler::NO_REPOSITORY )
- versionControl = svnHandler->filetqStatus( svnFiletqStatus );
+ if ( cvsFileStatus != CVSHandler::NO_REPOSITORY )
+ versionControl = cvsHandler->fileStatus( cvsFileStatus );
+ else if ( svnFileStatus != SVNHandler::NO_REPOSITORY )
+ versionControl = svnHandler->fileStatus( svnFileStatus );
else
versionControl = i18n("No version control");
@@ -532,7 +532,7 @@ void CatManListItem::update(bool showPoInfo,bool includeChildren
if(showPoInfo)
{
- _lastUpdated=TQDateTime::tqcurrentDateTime();
+ _lastUpdated=TQDateTime::currentDateTime();
// clean previous state information
setText(COL_FUZZY,TQString());
@@ -617,7 +617,7 @@ void CatManListItem::updateAfterSave( PoInfo &poInfo )
TQString name=_primary.fileName();
setText(COL_NAME,name.left(name.length()-3));
- _lastUpdated=TQDateTime::tqcurrentDateTime();
+ _lastUpdated=TQDateTime::currentDateTime();
bool neededWork=needsWork();
bool needWork=false;
@@ -625,14 +625,14 @@ void CatManListItem::updateAfterSave( PoInfo &poInfo )
TQPixmap icon;
_hasErrors=false;
- const CVSHandler::FiletqStatus cvsFiletqStatus = _view->cvsHandler()->fstatus(poFile());
- const SVNHandler::FiletqStatus svnFiletqStatus = _view->svnHandler()->fstatus(poFile());
+ const CVSHandler::FileStatus cvsFileStatus = _view->cvsHandler()->fstatus(poFile());
+ const SVNHandler::FileStatus svnFileStatus = _view->svnHandler()->fstatus(poFile());
TQString versionControl;
- if ( cvsFiletqStatus != CVSHandler::NO_REPOSITORY )
- versionControl = _view->cvsHandler()->filetqStatus( cvsFiletqStatus );
- else if ( svnFiletqStatus != SVNHandler::NO_REPOSITORY )
- versionControl = _view->svnHandler()->filetqStatus( svnFiletqStatus );
+ if ( cvsFileStatus != CVSHandler::NO_REPOSITORY )
+ versionControl = _view->cvsHandler()->fileStatus( cvsFileStatus );
+ else if ( svnFileStatus != SVNHandler::NO_REPOSITORY )
+ versionControl = _view->svnHandler()->fileStatus( svnFileStatus );
else
versionControl = i18n("No version control");
diff --git a/kbabel/catalogmanager/libcvs/cvsdialog.cpp b/kbabel/catalogmanager/libcvs/cvsdialog.cpp
index 1cfd6ab7..798bb51f 100644
--- a/kbabel/catalogmanager/libcvs/cvsdialog.cpp
+++ b/kbabel/catalogmanager/libcvs/cvsdialog.cpp
@@ -79,7 +79,7 @@ CVSDialog::CVSDialog( CVS::Command cmd, TQWidget * parent, KSharedConfig* config
case CVS::Commit:
temp = i18n( "Commit the following files:" );
break;
- case CVS::tqStatus:
+ case CVS::Status:
temp = i18n( "Get status for the following files:" );
break;
case CVS::Diff:
@@ -143,7 +143,7 @@ CVSDialog::CVSDialog( CVS::Command cmd, TQWidget * parent, KSharedConfig* config
case CVS::Commit:
temp = i18n( "&Commit" );
break;
- case CVS::tqStatus:
+ case CVS::Status:
temp = i18n( "&Get Status" );
break;
case CVS::Diff:
@@ -168,7 +168,7 @@ CVSDialog::CVSDialog( CVS::Command cmd, TQWidget * parent, KSharedConfig* config
output->setReadOnly( true );
tqlayout->addWidget( output );
- resize( TQSize( 600, 450 ).expandedTo( tqminimumSizeHint( ) ) );
+ resize( TQSize( 600, 450 ).expandedTo( minimumSizeHint( ) ) );
if ( cmd == CVS::Commit )
logedit->setFocus( );
@@ -330,7 +330,7 @@ void CVSDialog::slotProcessStdout( KProcess*, char * buffer, int len )
output->setCursorPosition( output->lines( ), 0 );
// If the command is 'cvs status' or 'cvs diff' collect the output of stdout.
- if ( (_cmd == CVS::tqStatus) || (_cmd == CVS::Diff) )
+ if ( (_cmd == CVS::Status) || (_cmd == CVS::Diff) )
_statusOutput += TQString::fromLocal8Bit( buffer, len );
}
diff --git a/kbabel/catalogmanager/libcvs/cvshandler.cpp b/kbabel/catalogmanager/libcvs/cvshandler.cpp
index b0764af8..cf067f9c 100644
--- a/kbabel/catalogmanager/libcvs/cvshandler.cpp
+++ b/kbabel/catalogmanager/libcvs/cvshandler.cpp
@@ -81,7 +81,7 @@ void CVSHandler::setPOTBaseDir( const TQString& dir )
emit signalIsPOTRepository( _isPOTRepository );
}
-TQString CVSHandler::filetqStatus( const FiletqStatus status ) const
+TQString CVSHandler::fileStatus( const FileStatus status ) const
{
switch ( status ) {
case NO_REPOSITORY:
@@ -111,7 +111,7 @@ TQString CVSHandler::filetqStatus( const FiletqStatus status ) const
}
}
-CVSHandler::FiletqStatus CVSHandler::fstatus( const TQString& filename ) const
+CVSHandler::FileStatus CVSHandler::fstatus( const TQString& filename ) const
{
// no valid repository
if ( !_isPORepository )
@@ -177,7 +177,7 @@ CVSHandler::FiletqStatus CVSHandler::fstatus( const TQString& filename ) const
return UP_TO_DATE;
}
-TQString CVSHandler::cvstqStatus( const TQString& filename ) const
+TQString CVSHandler::cvsStatus( const TQString& filename ) const
{
return map[filename];
}
@@ -210,7 +210,7 @@ void CVSHandler::execCVSCommand( TQWidget* parent, CVS::Command cmd, const TQStr
command += "commit -F @LOG@FILE@";
checkToAdd( TQStringList( filename ) );
break;
- case CVS::tqStatus:
+ case CVS::Status:
command += "status";
break;
case CVS::Diff:
@@ -241,7 +241,7 @@ void CVSHandler::execCVSCommand( TQWidget* parent, CVS::Command cmd, const TQStr
command += "commit -F @LOG@FILE@";
checkToAdd( files );
break;
- case CVS::tqStatus:
+ case CVS::Status:
command += "status";
break;
case CVS::Diff:
@@ -280,7 +280,7 @@ void CVSHandler::showDialog( TQWidget* parent, CVS::Command cmd, const TQStringL
}
if ( dia->exec( ) == KDialog::Accepted ) {
- if ( cmd == CVS::tqStatus )
+ if ( cmd == CVS::Status )
processStatusOutput( dia->statusOutput( ) );
if ( cmd == CVS::Diff )
processDiff( dia->statusOutput( ) );
@@ -383,7 +383,7 @@ void CVSHandler::processDiff( TQString output )
KMessageBox::error( 0, error );
}
-bool CVSHandler::isConsideredModified( const FiletqStatus status ) const
+bool CVSHandler::isConsideredModified( const FileStatus status ) const
{
/*
* A file is modified if it is either:
diff --git a/kbabel/catalogmanager/libcvs/cvshandler.h b/kbabel/catalogmanager/libcvs/cvshandler.h
index 1c08af92..5aeba57b 100644
--- a/kbabel/catalogmanager/libcvs/cvshandler.h
+++ b/kbabel/catalogmanager/libcvs/cvshandler.h
@@ -60,7 +60,7 @@ class CVSHandler : public TQObject
TQ_OBJECT
public:
- enum FiletqStatus {
+ enum FileStatus {
NO_REPOSITORY,
NOT_IN_CVS,
LOCALLY_ADDED,
@@ -75,9 +75,9 @@ class CVSHandler : public TQObject
void setPOBaseDir( const TQString& dir );
void setPOTBaseDir( const TQString& dir );
- FiletqStatus fstatus( const TQString& filename ) const;
- TQString filetqStatus( const FiletqStatus status ) const;
- TQString cvstqStatus( const TQString& filename ) const;
+ FileStatus fstatus( const TQString& filename ) const;
+ TQString fileStatus( const FileStatus status ) const;
+ TQString cvsStatus( const TQString& filename ) const;
void execCVSCommand( TQWidget* parent, CVS::Command cmd, const TQString& filename, bool templates, KSharedConfig* config );
void execCVSCommand( TQWidget* parent, CVS::Command cmd, const TQStringList& files, bool templates, KSharedConfig* config );
@@ -87,7 +87,7 @@ class CVSHandler : public TQObject
/**
* True if the file was modified or has another status considered as a modification
*/
- bool isConsideredModified( const FiletqStatus status ) const;
+ bool isConsideredModified( const FileStatus status ) const;
signals:
void signalIsPORepository( bool );
diff --git a/kbabel/catalogmanager/libcvs/cvsresources.h b/kbabel/catalogmanager/libcvs/cvsresources.h
index 4c2bc144..9cac64db 100644
--- a/kbabel/catalogmanager/libcvs/cvsresources.h
+++ b/kbabel/catalogmanager/libcvs/cvsresources.h
@@ -35,7 +35,7 @@
#define CVSRESOURCES_H
namespace CVS {
- enum Command { Update, Commit, tqStatus, Diff };
+ enum Command { Update, Commit, Status, Diff };
}
#endif // CVSRESOURCES_H
diff --git a/kbabel/catalogmanager/libsvn/svndialog.cpp b/kbabel/catalogmanager/libsvn/svndialog.cpp
index 756ace69..b1b6d4de 100644
--- a/kbabel/catalogmanager/libsvn/svndialog.cpp
+++ b/kbabel/catalogmanager/libsvn/svndialog.cpp
@@ -163,7 +163,7 @@ SVNDialog::SVNDialog( SVN::Command cmd, TQWidget * parent, KSharedConfig* config
output->setReadOnly( true );
tqlayout->addWidget( output );
- resize( TQSize( 600, 450 ).expandedTo( tqminimumSizeHint( ) ) );
+ resize( TQSize( 600, 450 ).expandedTo( minimumSizeHint( ) ) );
if ( cmd == SVN::Commit )
logedit->setFocus( );
diff --git a/kbabel/catalogmanager/libsvn/svnhandler.cpp b/kbabel/catalogmanager/libsvn/svnhandler.cpp
index 5f91e1e8..d00c0858 100644
--- a/kbabel/catalogmanager/libsvn/svnhandler.cpp
+++ b/kbabel/catalogmanager/libsvn/svnhandler.cpp
@@ -83,7 +83,7 @@ void SVNHandler::setPOTBaseDir( const TQString& dir )
emit signalIsPOTRepository( _isPOTRepository );
}
-TQString SVNHandler::filetqStatus( const FiletqStatus status ) const
+TQString SVNHandler::fileStatus( const FileStatus status ) const
{
switch ( status ) {
case NO_REPOSITORY:
@@ -115,7 +115,7 @@ TQString SVNHandler::filetqStatus( const FiletqStatus status ) const
}
}
-SVNHandler::FiletqStatus SVNHandler::fstatus( const TQString& filename ) const
+SVNHandler::FileStatus SVNHandler::fstatus( const TQString& filename ) const
{
// no valid repository
if ( !_isPORepository )
@@ -145,7 +145,7 @@ SVNHandler::FiletqStatus SVNHandler::fstatus( const TQString& filename ) const
int errorLine, errorCol;
TQDomNodeList nodelist;
TQDomNode node;
- TQDomElement entry, wctqStatus;
+ TQDomElement entry, wcStatus;
// Parse the output.
if ( !doc.setContent( out.getOutput(), &errorMsg, &errorLine, &errorCol ) ) {
@@ -177,22 +177,22 @@ SVNHandler::FiletqStatus SVNHandler::fstatus( const TQString& filename ) const
if ( node.isNull() )
return ERROR_IN_WC;
- wctqStatus = node.toElement();
+ wcStatus = node.toElement();
- if ( wctqStatus.attributeNode("item").value() == "normal" )
+ if ( wcStatus.attributeNode("item").value() == "normal" )
return UP_TO_DATE;
- if ( wctqStatus.attributeNode("item").value() == "modified" )
+ if ( wcStatus.attributeNode("item").value() == "modified" )
return LOCALLY_MODIFIED;
- if ( wctqStatus.attributeNode("item").value() == "conflicted" )
+ if ( wcStatus.attributeNode("item").value() == "conflicted" )
return CONFLICT;
- if ( wctqStatus.attributeNode("item").value() == "unversioned" )
+ if ( wcStatus.attributeNode("item").value() == "unversioned" )
return NOT_IN_SVN;
// TODO Ignored entry should have separate return value probably.
- if ( wctqStatus.attributeNode("item").value() == "ignored" )
+ if ( wcStatus.attributeNode("item").value() == "ignored" )
return NOT_IN_SVN;
- if ( wctqStatus.attributeNode("item").value() == "added" )
+ if ( wcStatus.attributeNode("item").value() == "added" )
return LOCALLY_ADDED;
- if ( wctqStatus.attributeNode("item").value() == "deleted" )
+ if ( wcStatus.attributeNode("item").value() == "deleted" )
return LOCALLY_REMOVED;
// TODO What to do with "missing", "incomplete", "replaced", "merged",
// "obstructed", "external"? Can these appear at all in our case?
@@ -269,7 +269,7 @@ no_status_xml:
}
-TQString SVNHandler::svntqStatus( const TQString& filename ) const
+TQString SVNHandler::svnStatus( const TQString& filename ) const
{
return map[filename];
}
@@ -491,7 +491,7 @@ void SVNHandler::processDiff( TQString output )
KMessageBox::error( 0, error );
}
-bool SVNHandler::isConsideredModified( const FiletqStatus status ) const
+bool SVNHandler::isConsideredModified( const FileStatus status ) const
{
/*
* A file is modified if it is either:
diff --git a/kbabel/catalogmanager/libsvn/svnhandler.h b/kbabel/catalogmanager/libsvn/svnhandler.h
index 57ce13b4..2506d0bd 100644
--- a/kbabel/catalogmanager/libsvn/svnhandler.h
+++ b/kbabel/catalogmanager/libsvn/svnhandler.h
@@ -58,7 +58,7 @@ class SVNHandler : public TQObject
TQ_OBJECT
public:
- enum FiletqStatus {
+ enum FileStatus {
NO_REPOSITORY,
NOT_IN_SVN,
LOCALLY_ADDED,
@@ -74,9 +74,9 @@ class SVNHandler : public TQObject
void setPOBaseDir( const TQString& dir );
void setPOTBaseDir( const TQString& dir );
- FiletqStatus fstatus( const TQString& filename ) const;
- TQString filetqStatus( const FiletqStatus status ) const;
- TQString svntqStatus( const TQString& filename ) const;
+ FileStatus fstatus( const TQString& filename ) const;
+ TQString fileStatus( const FileStatus status ) const;
+ TQString svnStatus( const TQString& filename ) const;
void execSVNCommand( TQWidget* parent, SVN::Command cmd, const TQString& filename, bool templates, KSharedConfig* config );
void execSVNCommand( TQWidget* parent, SVN::Command cmd, const TQStringList& files, bool templates, KSharedConfig* config );
@@ -86,7 +86,7 @@ class SVNHandler : public TQObject
/**
* True if the file was modified or has another status considered as a modification
*/
- bool isConsideredModified( const FiletqStatus status ) const;
+ bool isConsideredModified( const FileStatus status ) const;
signals:
void signalIsPORepository( bool );
diff --git a/kbabel/catalogmanager/validateprogresswidget.ui b/kbabel/catalogmanager/validateprogresswidget.ui
index 01cb4c5f..f0fd4bd8 100644
--- a/kbabel/catalogmanager/validateprogresswidget.ui
+++ b/kbabel/catalogmanager/validateprogresswidget.ui
@@ -28,7 +28,7 @@
<property name="name">
<cstring>_currentAction</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>92</width>
<height>0</height>
diff --git a/kbabel/common/catalog.cpp b/kbabel/common/catalog.cpp
index 00c9491d..01c8bab9 100644
--- a/kbabel/common/catalog.cpp
+++ b/kbabel/common/catalog.cpp
@@ -578,12 +578,12 @@ CatalogItem Catalog::updatedHeader(CatalogItem oldHeader, bool usePrefs) const
if( saveOptions.FSFCopyright == ProjectSettingsBase::Remove)
(*it).remove(" YEAR Free Software Foundation, Inc");
else
- (*it).replace("YEAR", TQDate::tqcurrentDate().toString("yyyy"));
+ (*it).replace("YEAR", TQDate::currentDate().toString("yyyy"));
} else
if( saveOptions.FSFCopyright == ProjectSettingsBase::Update )
{
//update years
- TQString cy = TQDate::tqcurrentDate().toString("yyyy");
+ TQString cy = TQDate::currentDate().toString("yyyy");
if( !(*it).contains( TQRegExp(cy)) ) // is the year already included?
{
int index = (*it).findRev( TQRegExp("[\\d]+[\\d\\-, ]*") );
@@ -674,7 +674,7 @@ CatalogItem Catalog::updatedHeader(CatalogItem oldHeader, bool usePrefs) const
{
temp+=(" <"+identityOptions.authorEmail+">");
}
- temp+=", "+TQDate::tqcurrentDate().toString("yyyy")+".";
+ temp+=", "+TQDate::currentDate().toString("yyyy")+".";
// ### TODO: it would be nice if the entry could start with "COPYRIGHT" and have the "(C)" symbol (both not mandatory)
TQRegExp regexpAuthorYear( "^#.*(<.+@.+>)?,\\s*([\\d]+[\\d\\-, ]*|YEAR)" );
@@ -721,7 +721,7 @@ CatalogItem Catalog::updatedHeader(CatalogItem oldHeader, bool usePrefs) const
found = false;
bool foundAuthor = false;
- const TQString cy = TQDate::tqcurrentDate().toString("yyyy");
+ const TQString cy = TQDate::currentDate().toString("yyyy");
ait = foundAuthors.end();
for( it = foundAuthors.begin() ; it!=foundAuthors.end(); ++it )
@@ -816,7 +816,7 @@ void Catalog::setFuzzy(uint index, bool on)
}
-void Catalog::removeFuzzytqStatus(uint index)
+void Catalog::removeFuzzyStatus(uint index)
{
setFuzzy(index,false);
}
@@ -888,10 +888,10 @@ TQString Catalog::encoding() const
return encodingStr;
}
-ConversiontqStatus Catalog::openURL(const KURL& url, const TQString& package)
+ConversionStatus Catalog::openURL(const KURL& url, const TQString& package)
{
TQString target;
- ConversiontqStatus error = OK;
+ ConversionStatus error = OK;
if(KIO::NetAccess::download(url, target, NULL))
{
@@ -992,10 +992,10 @@ ConversiontqStatus Catalog::openURL(const KURL& url, const TQString& package)
}
}
-ConversiontqStatus Catalog::openURL(const KURL& openUrl, const KURL& saveURL, const TQString& package)
+ConversionStatus Catalog::openURL(const KURL& openUrl, const KURL& saveURL, const TQString& package)
{
TQString target;
- ConversiontqStatus error = OK;
+ ConversionStatus error = OK;
if(KIO::NetAccess::download(openUrl, target, NULL))
{
@@ -1093,7 +1093,7 @@ ConversiontqStatus Catalog::openURL(const KURL& openUrl, const KURL& saveURL, co
}
}
-Msgfmt::tqStatus Catalog::checkSyntax(TQString& output, bool clearErrors)
+Msgfmt::Status Catalog::checkSyntax(TQString& output, bool clearErrors)
{
if( !d->_mimeTypes.contains( "application/x-gettext" ) )
return Msgfmt::Unsupported;
@@ -1112,7 +1112,7 @@ Msgfmt::tqStatus Catalog::checkSyntax(TQString& output, bool clearErrors)
}
Msgfmt msgfmt;
- Msgfmt::tqStatus result = msgfmt.checkSyntax( filename , output, pluralFormType() != KDESpecific );
+ Msgfmt::Status result = msgfmt.checkSyntax( filename , output, pluralFormType() != KDESpecific );
if( clearErrors) clearErrorList();
@@ -1185,7 +1185,7 @@ void Catalog::removeFromErrorList(uint index)
}
}
-TQStringList Catalog::itemtqStatus(uint index, bool recheck, TQPtrList<KDataTool> whatToCheck)
+TQStringList Catalog::itemStatus(uint index, bool recheck, TQPtrList<KDataTool> whatToCheck)
{
if ( d->_entries.isEmpty() )
return TQStringList();
@@ -1207,7 +1207,7 @@ TQStringList Catalog::itemtqStatus(uint index, bool recheck, TQPtrList<KDataTool
return item.errors();
}
-TQStringList Catalog::itemtqStatus(uint index)
+TQStringList Catalog::itemStatus(uint index)
{
if ( d->_entries.isEmpty() )
return TQStringList();
@@ -1800,7 +1800,7 @@ int Catalog::findPrevInList(const TQValueList<uint>& list,uint index) const
TQString Catalog::dateTime() const
{
- const TQDateTime dt = TQDateTime::tqcurrentDateTime();
+ const TQDateTime dt = TQDateTime::currentDateTime();
TQString dateTimeString;
const SaveSettings options = d->_project->saveSettings();
@@ -1936,7 +1936,7 @@ TQString Catalog::dateTime() const
}
-ConversiontqStatus Catalog::saveFile()
+ConversionStatus Catalog::saveFile()
{
if(d->_url.isEmpty())
{
@@ -1947,11 +1947,11 @@ ConversiontqStatus Catalog::saveFile()
return saveFileAs(d->_url,true);
}
-ConversiontqStatus Catalog::saveFileAs(const KURL &url, bool overwrite)
+ConversionStatus Catalog::saveFileAs(const KURL &url, bool overwrite)
{
if( d->_active ) return BUSY;
- ConversiontqStatus status=OK;
+ ConversionStatus status=OK;
bool newName=false;
KURL targetURL=d->_url;
@@ -2043,7 +2043,7 @@ TQString Catalog::saveTempFile()
}
-ConversiontqStatus Catalog::writeFile(TQString localFile , bool overwrite)
+ConversionStatus Catalog::writeFile(TQString localFile , bool overwrite)
{
TQFileInfo info(localFile);
@@ -2066,7 +2066,7 @@ ConversiontqStatus Catalog::writeFile(TQString localFile , bool overwrite)
}
}
- ConversiontqStatus error = OK;
+ ConversionStatus error = OK;
CatalogExportPlugin* filter=0;
// gimme plugin for this MIME type
@@ -2549,7 +2549,7 @@ bool Catalog::findNext(const FindOptions* findOpts, DocPosition& docPos, int& le
int contextInfoPos = -1;
TQString targetStr;
- kapp->tqprocessEvents(10);
+ kapp->processEvents(10);
if( d->_stop || endReached)
{
@@ -2798,7 +2798,7 @@ bool Catalog::findPrev(const FindOptions* findOpts, DocPosition& docPos, int& le
int contextInfoPos = -1;
TQString targetStr;
- kapp->tqprocessEvents(10);
+ kapp->processEvents(10);
if( d->_stop || beginReached)
{
@@ -3155,7 +3155,7 @@ Catalog::DiffResult Catalog::diff(uint entry, TQString *result)
bestId = (*it);
}
- kapp->tqprocessEvents(10);
+ kapp->processEvents(10);
if( d->_stop )
{
@@ -3232,7 +3232,7 @@ void Catalog::setDiffList( const TQValueList<DiffEntry>& list)
{
oldPercent = percent;
emit signalProgress(percent);
- kapp->tqprocessEvents(10);
+ kapp->processEvents(10);
}
TQString id = (*it).msgid;
diff --git a/kbabel/common/catalog.h b/kbabel/common/catalog.h
index dd8c3a30..a034375e 100644
--- a/kbabel/common/catalog.h
+++ b/kbabel/common/catalog.h
@@ -226,7 +226,7 @@ public:
* @return the list of errors found for a given item index
* @param index index of the item to check
*/
- TQStringList itemtqStatus(uint index);
+ TQStringList itemStatus(uint index);
/**
* @return the list of errors found for a given item index
@@ -234,7 +234,7 @@ public:
* @param recheck flag, if the item status should be checked now
* @param whatToCheck what checks to do (a list of tools to be used
*/
- TQStringList itemtqStatus(uint index, bool recheck, TQPtrList<KDataTool> whatToCheck);
+ TQStringList itemStatus(uint index, bool recheck, TQPtrList<KDataTool> whatToCheck);
/**
* replaces msgstr in catalog item at index index with msgstr
@@ -253,7 +253,7 @@ public:
bool setHeader(CatalogItem header);
/** removes string ", fuzzy" from comment */
- void removeFuzzytqStatus(uint index);
+ void removeFuzzyStatus(uint index);
/** sets or unsets fuzzy status of entry index */
void setFuzzy(uint index, bool on);
@@ -297,19 +297,19 @@ public:
* opens file url by using KDE's network downlad and calls
* openFile with a local filename
*/
- ConversiontqStatus openURL(const KURL& url, const TQString& package=TQString());
+ ConversionStatus openURL(const KURL& url, const TQString& package=TQString());
/**
* opens file openURL by using KDE's network downlad and calls
* openFile with a local filename
* sets current URL to saveURL
*/
- ConversiontqStatus openURL(const KURL& openURL, const KURL& saveURL, const TQString& package=TQString());
+ ConversionStatus openURL(const KURL& openURL, const KURL& saveURL, const TQString& package=TQString());
/** save the file under the old filename */
- ConversiontqStatus saveFile();
+ ConversionStatus saveFile();
/** saves the file under a new filename */
- ConversiontqStatus saveFileAs(const KURL& url,bool overwrite=false);
+ ConversionStatus saveFileAs(const KURL& url,bool overwrite=false);
/**
* saves the current catalog in a temporary file and
@@ -342,7 +342,7 @@ public:
* @param clearError should the errors be cleared before running msgfmt
* @return the file codec used for the current catalog
*/
- Msgfmt::tqStatus checkSyntax(TQString& output, bool clearErrors=true);
+ Msgfmt::Status checkSyntax(TQString& output, bool clearErrors=true);
/**
* checks using an external tool. The tool must provide the "validate" command
@@ -484,7 +484,7 @@ public:
* the search in po-files. This way, I can easily find the first
* catalog entry in the textstream
*/
-// static ConversiontqStatus readHeader(TQTextStream& stream,CatalogItem& header);
+// static ConversionStatus readHeader(TQTextStream& stream,CatalogItem& header);
void registerView(CatalogView* view);
@@ -612,7 +612,7 @@ private:
void processCommand(EditCommand* cmd, CatalogView* view2exclude=0, bool undo=false);
/** do the actual file write using plugin */
- ConversiontqStatus writeFile(TQString localfile, bool overwrite=false);
+ ConversionStatus writeFile(TQString localfile, bool overwrite=false);
/**
* generates lists that contain indexes of all fuzzy and untranslated entries
diff --git a/kbabel/common/catalogfileplugin.h b/kbabel/common/catalogfileplugin.h
index d4e72a76..631a94b3 100644
--- a/kbabel/common/catalogfileplugin.h
+++ b/kbabel/common/catalogfileplugin.h
@@ -50,7 +50,7 @@ class CatalogExportPluginPrivate;
/**
* Result of the conversion
*/
-enum ConversiontqStatus {
+enum ConversionStatus {
OK,
NOT_IMPLEMENTED,
NO_FILE,
@@ -97,7 +97,7 @@ public:
* @param catalog the catalog to be filled
* @return result of the operation
*/
- ConversiontqStatus open(const TQString& file, const TQString& mimetype, Catalog* catalog);
+ ConversionStatus open(const TQString& file, const TQString& mimetype, Catalog* catalog);
/**
* Reimplement this method to load the local file passed as an argument.
@@ -109,7 +109,7 @@ public:
* @param file file to be loaded
* @param mimetype the expected MIME type (the type used for plugin selection
*/
- virtual ConversiontqStatus load(const TQString& file, const TQString& mimetype) = 0;
+ virtual ConversionStatus load(const TQString& file, const TQString& mimetype) = 0;
/**
* Reimplement this method to return unique identification of your plugin
*/
@@ -183,7 +183,7 @@ class KDE_EXPORT CatalogExportPlugin: public TQObject
public:
CatalogExportPlugin(TQObject* parent, const char* name);
virtual ~CatalogExportPlugin();
- virtual ConversiontqStatus save(const TQString& file, const TQString& mimetype, const Catalog* catalog) = 0;
+ virtual ConversionStatus save(const TQString& file, const TQString& mimetype, const Catalog* catalog) = 0;
static TQStringList availableExportMimeTypes();
diff --git a/kbabel/common/importplugin.cpp b/kbabel/common/importplugin.cpp
index ed6d15ef..e75deca7 100644
--- a/kbabel/common/importplugin.cpp
+++ b/kbabel/common/importplugin.cpp
@@ -99,13 +99,13 @@ void CatalogImportPlugin::setMimeTypes( const TQString& mimetypes )
d->_mimeTypes=mimetypes;
}
-ConversiontqStatus CatalogImportPlugin::open(const TQString& file, const TQString& mimetype, Catalog* catalog)
+ConversionStatus CatalogImportPlugin::open(const TQString& file, const TQString& mimetype, Catalog* catalog)
{
d->_stopped=false;
d->_catalog=catalog;
startTransaction();
- ConversiontqStatus result = load(file, mimetype);
+ ConversionStatus result = load(file, mimetype);
if( d->_stopped )
{
d->_started=false;
diff --git a/kbabel/common/msgfmt.cpp b/kbabel/common/msgfmt.cpp
index f91f25f9..11e6969f 100644
--- a/kbabel/common/msgfmt.cpp
+++ b/kbabel/common/msgfmt.cpp
@@ -51,9 +51,9 @@ Msgfmt::Msgfmt(TQObject* parent,const char* name)
{
}
-Msgfmt::tqStatus Msgfmt::checkSyntax(TQString file,TQString& output, bool gnu)
+Msgfmt::Status Msgfmt::checkSyntax(TQString file,TQString& output, bool gnu)
{
- tqStatus stat=Ok;
+ Status stat=Ok;
// this method does not return the right retrun values at the moment :-(
KProcess proc;
@@ -92,9 +92,9 @@ Msgfmt::tqStatus Msgfmt::checkSyntax(TQString file,TQString& output, bool gnu)
return stat;
}
-Msgfmt::tqStatus Msgfmt::checkSyntaxInDir(TQString dir,TQString regexp,TQString& output)
+Msgfmt::Status Msgfmt::checkSyntaxInDir(TQString dir,TQString regexp,TQString& output)
{
- tqStatus stat=Ok;
+ Status stat=Ok;
// this method does not return the right return values at the moment :-(
KProcess proc;
diff --git a/kbabel/common/msgfmt.h b/kbabel/common/msgfmt.h
index 025a2fdd..c711cf48 100644
--- a/kbabel/common/msgfmt.h
+++ b/kbabel/common/msgfmt.h
@@ -47,11 +47,11 @@ class KDE_EXPORT Msgfmt : private TQObject
Q_OBJECT
TQ_OBJECT
public:
- enum tqStatus{NoExecutable,Ok,SyntaxError,HeaderError,Error,Unsupported};
+ enum Status{NoExecutable,Ok,SyntaxError,HeaderError,Error,Unsupported};
Msgfmt(TQObject* parent=0,const char* name=0);
- tqStatus checkSyntax(TQString file,TQString& output, bool gnu = false);
- tqStatus checkSyntaxInDir(TQString dir,TQString regexp,TQString& output);
+ Status checkSyntax(TQString file,TQString& output, bool gnu = false);
+ Status checkSyntaxInDir(TQString dir,TQString regexp,TQString& output);
private slots:
void addToOutput(KProcess*,char *buffer, int buflen);
diff --git a/kbabel/common/poinfo.cpp b/kbabel/common/poinfo.cpp
index 63a01d38..aa6b1666 100644
--- a/kbabel/common/poinfo.cpp
+++ b/kbabel/common/poinfo.cpp
@@ -350,12 +350,12 @@ PoInfo PoInfo::headerInfo(const CatalogItem& headerItem)
}
-ConversiontqStatus PoInfo::info(const TQString& url, PoInfo& info, TQStringList &wordList, bool updateWordList, bool interactive)
+ConversionStatus PoInfo::info(const TQString& url, PoInfo& info, TQStringList &wordList, bool updateWordList, bool interactive)
{
return PoInfo::info( url, info, wordList, updateWordList, interactive, true);
}
-ConversiontqStatus PoInfo::info(const TQString& url, PoInfo& info, TQStringList &wordList, bool updateWordList, bool interactive, bool msgfmt)
+ConversionStatus PoInfo::info(const TQString& url, PoInfo& info, TQStringList &wordList, bool updateWordList, bool interactive, bool msgfmt)
{
stopStaticRead = false;
@@ -372,7 +372,7 @@ ConversiontqStatus PoInfo::info(const TQString& url, PoInfo& info, TQStringList
// First check file with msgfmt to be sure, it is syntactically correct
Msgfmt msgfmt;
TQString output;
- Msgfmt::tqStatus stat = msgfmt.checkSyntax( target , output );
+ Msgfmt::Status stat = msgfmt.checkSyntax( target , output );
if(stat == Msgfmt::SyntaxError)
{
KIO::NetAccess::removeTempFile(target);
@@ -395,11 +395,11 @@ ConversiontqStatus PoInfo::info(const TQString& url, PoInfo& info, TQStringList
lexer->yylex();
// now parse the rest of the file
- ConversiontqStatus success=OK;
+ ConversionStatus success=OK;
while( lexer->lastToken != T_EOF && success==OK)
{
- if( interactive ) kapp->tqprocessEvents(10);
+ if( interactive ) kapp->processEvents(10);
if( stopStaticRead )
{
@@ -532,7 +532,7 @@ bool PoInfo::findInFile( const TQString& url, FindOptions options )
// first read header
CatalogItem temp;
- ConversiontqStatus status = fastRead( temp, lexer, true );
+ ConversionStatus status = fastRead( temp, lexer, true );
if( status != OK || !temp.msgid().first().isEmpty() )
{
delete lexer;
@@ -639,7 +639,7 @@ bool PoInfo::findInFile( const TQString& url, FindOptions options )
}
case T_MSGID:
case T_MSGIDPLURAL: {
- kapp->tqprocessEvents(10);
+ kapp->processEvents(10);
// if stopped, return not found
if( stopStaticRead )
@@ -666,7 +666,7 @@ bool PoInfo::findInFile( const TQString& url, FindOptions options )
}
// this does not like any incorrect files
-ConversiontqStatus PoInfo::fastRead( CatalogItem& item, GettextFlexLexer *lexer, bool storeText)
+ConversionStatus PoInfo::fastRead( CatalogItem& item, GettextFlexLexer *lexer, bool storeText)
{
item.clear();
_gettextPluralForm = false;
diff --git a/kbabel/common/poinfo.h b/kbabel/common/poinfo.h
index 58e0bc66..70ba652a 100644
--- a/kbabel/common/poinfo.h
+++ b/kbabel/common/poinfo.h
@@ -105,7 +105,7 @@ public:
* being parsed?
* @since KBabel 1.11 (KDE 3.5)
*/
- static ConversiontqStatus info(const TQString& url,PoInfo& info, TQStringList &wordList, bool updateWordList, bool interactive, bool msgfmt);
+ static ConversionStatus info(const TQString& url,PoInfo& info, TQStringList &wordList, bool updateWordList, bool interactive, bool msgfmt);
/**
* @brief Get information about the PO file
@@ -121,7 +121,7 @@ public:
* KBabel 1.11.1 (KDE 3.5.1)
* @note This function always call Gettext's mgfmt before parsing each file
*/
- static ConversiontqStatus info(const TQString& url,PoInfo& info, TQStringList &wordList, bool updateWordList, bool interactive = true);
+ static ConversionStatus info(const TQString& url,PoInfo& info, TQStringList &wordList, bool updateWordList, bool interactive = true);
static PoInfo headerInfo(const CatalogItem&);
static bool findInFile(const TQString& url, FindOptions options );
@@ -147,7 +147,7 @@ private:
*/
static void cacheRead();
- static ConversiontqStatus fastRead( CatalogItem& item, GettextFlexLexer* lexer, bool storeText );
+ static ConversionStatus fastRead( CatalogItem& item, GettextFlexLexer* lexer, bool storeText );
static bool _gettextPluralForm;
};
diff --git a/kbabel/commonui/cmdedit.cpp b/kbabel/commonui/cmdedit.cpp
index df8ce38a..2620ea3a 100644
--- a/kbabel/commonui/cmdedit.cpp
+++ b/kbabel/commonui/cmdedit.cpp
@@ -104,7 +104,7 @@ CmdEdit::CmdEdit(TQWidget* parent, const char* name)
tqlayout->addRowSpacing(2, KDialog::spacingHint());
tqlayout->addRowSpacing(6, KDialog::spacingHint());
- setMinimumSize(tqlayout->tqsizeHint());
+ setMinimumSize(tqlayout->sizeHint());
connect(_addButton , TQT_SIGNAL(clicked()) , this , TQT_SLOT(addCmd()) ) ;
diff --git a/kbabel/commonui/diffpreferences.ui b/kbabel/commonui/diffpreferences.ui
index c52e3c27..dfe8279b 100644
--- a/kbabel/commonui/diffpreferences.ui
+++ b/kbabel/commonui/diffpreferences.ui
@@ -116,7 +116,7 @@ the database are used for diffing.&lt;/p&gt;&lt;/qt&gt;</string>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>31</height>
diff --git a/kbabel/commonui/klisteditor.ui b/kbabel/commonui/klisteditor.ui
index b31497b4..4b7eeb0d 100644
--- a/kbabel/commonui/klisteditor.ui
+++ b/kbabel/commonui/klisteditor.ui
@@ -97,7 +97,7 @@
<property name="name">
<cstring>_list</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>200</width>
<height>200</height>
@@ -172,7 +172,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/kbabel/commonui/projectprefwidgets.cpp b/kbabel/commonui/projectprefwidgets.cpp
index 163b4eeb..b77a1811 100644
--- a/kbabel/commonui/projectprefwidgets.cpp
+++ b/kbabel/commonui/projectprefwidgets.cpp
@@ -79,7 +79,7 @@ using namespace KBabel;
static TQSize sizeHintForWidget(const TQWidget* widget)
{
//
- // The size is computed by adding the tqsizeHint().height() of all
+ // The size is computed by adding the sizeHint().height() of all
// widget tqchildren and taking the width of the widest child and adding
// tqlayout()->margin() and tqlayout()->spacing()
//
@@ -97,7 +97,7 @@ static TQSize sizeHintForWidget(const TQWidget* widget)
numChild += 1;
TQWidget *w=((TQWidget*)o);
- TQSize s = w->tqsizeHint();
+ TQSize s = w->sizeHint();
if( s.isEmpty() == true )
{
s = TQSize( 50, 100 ); // Default size
@@ -323,7 +323,7 @@ SavePreferences::SavePreferences(TQWidget *parent)
"in the online help.</p>"
"</qt>") );
- setMinimumSize(tqsizeHint());
+ setMinimumSize(sizeHint());
}
@@ -443,12 +443,12 @@ IdentityPreferences::IdentityPreferences(TQWidget* parent, const TQString& proje
tempLabel=new TQLabel(i18n("&Language mailing list:"),group);
_listEdit = new TQLineEdit(group, "kcfg_Mailinglist");
- _listEdit->setMinimumSize(100,_listEdit->tqsizeHint().height());
+ _listEdit->setMinimumSize(100,_listEdit->sizeHint().height());
tempLabel->setBuddy(_listEdit);
tempLabel=new TQLabel(i18n("&Timezone:"), group);
_timezoneEdit = new TQLineEdit(group, "kcfg_Timezone");
- _timezoneEdit->setMinimumSize(100,_timezoneEdit->tqsizeHint().height());
+ _timezoneEdit->setMinimumSize(100,_timezoneEdit->sizeHint().height());
tempLabel->setBuddy(_timezoneEdit);
@@ -538,7 +538,7 @@ IdentityPreferences::IdentityPreferences(TQWidget* parent, const TQString& proje
page->setMinimumSize(sizeHintForWidget(page));
- setMinimumSize(tqsizeHint());
+ setMinimumSize(sizeHint());
_mailEdit->installEventFilter(this);
_listEdit->installEventFilter(this);
@@ -837,7 +837,7 @@ SpellPreferences::SpellPreferences(TQWidget* parent)
page->setMinimumSize(sizeHintForWidget(page));
- setMinimumSize(tqsizeHint());
+ setMinimumSize(sizeHint());
}
@@ -896,7 +896,7 @@ CatmanPreferences::CatmanPreferences(TQWidget* parent)
_poDirEdit = new KURLRequester(hbox, "kcfg_PoBaseDir");
_poDirEdit->setMode( mode );
- _poDirEdit->setMinimumSize(250,_poDirEdit->tqsizeHint().height());
+ _poDirEdit->setMinimumSize(250,_poDirEdit->sizeHint().height());
label->setBuddy(_poDirEdit);
@@ -906,7 +906,7 @@ CatmanPreferences::CatmanPreferences(TQWidget* parent)
_potDirEdit = new KURLRequester(hbox, "kcfg_PotBaseDir");
_potDirEdit->setMode( mode );
- _potDirEdit->setMinimumSize(250,_potDirEdit->tqsizeHint().height());
+ _potDirEdit->setMinimumSize(250,_potDirEdit->sizeHint().height());
label->setBuddy(_potDirEdit);
@@ -960,7 +960,7 @@ CatmanPreferences::CatmanPreferences(TQWidget* parent)
page->setMinimumSize(sizeHintForWidget(page));
- setMinimumSize(tqsizeHint());
+ setMinimumSize(sizeHint());
}
@@ -1013,7 +1013,7 @@ DirCommandsPreferences::DirCommandsPreferences(TQWidget* parent)
tqlayout->addStretch(1);
page->setMinimumSize(sizeHintForWidget(page));
- setMinimumSize(tqsizeHint());
+ setMinimumSize(sizeHint());
}
@@ -1077,7 +1077,7 @@ FileCommandsPreferences::FileCommandsPreferences(TQWidget* parent)
tqlayout->addStretch(1);
page->setMinimumSize(sizeHintForWidget(page));
- setMinimumSize(tqsizeHint());
+ setMinimumSize(sizeHint());
}
@@ -1130,7 +1130,7 @@ ViewPreferences::ViewPreferences(TQWidget* parent)
page->setMinimumSize(sizeHintForWidget(page));
- setMinimumSize(tqsizeHint());
+ setMinimumSize(sizeHint());
}
@@ -1159,7 +1159,7 @@ SourceContextPreferences::SourceContextPreferences(TQWidget* parent): TQWidget(p
const KFile::Mode mode = static_cast<KFile::Mode>( KFile::Directory | KFile::ExistingOnly | KFile::LocalOnly );
_coderootEdit = new KURLRequester ( box, "kcfg_CodeRoot" );
_coderootEdit->setMode( mode );
- _coderootEdit->setMinimumSize( 250, _coderootEdit->tqsizeHint().height() );
+ _coderootEdit->setMinimumSize( 250, _coderootEdit->sizeHint().height() );
tempLabel->setBuddy( _coderootEdit );
tqlayout->addWidget(box);
@@ -1173,7 +1173,7 @@ SourceContextPreferences::SourceContextPreferences(TQWidget* parent): TQWidget(p
_pathsEditor->installEventFilter(this);
- setMinimumSize(tqsizeHint());
+ setMinimumSize(sizeHint());
}
SourceContextPreferences::~SourceContextPreferences()
diff --git a/kbabel/commonui/projectwizardwidget2.ui b/kbabel/commonui/projectwizardwidget2.ui
index 97030b94..50671e62 100644
--- a/kbabel/commonui/projectwizardwidget2.ui
+++ b/kbabel/commonui/projectwizardwidget2.ui
@@ -138,7 +138,7 @@ will not work.</string>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>31</width>
<height>100</height>
diff --git a/kbabel/commonui/roughtransdlg.cpp b/kbabel/commonui/roughtransdlg.cpp
index 57fb21d0..a5415529 100644
--- a/kbabel/commonui/roughtransdlg.cpp
+++ b/kbabel/commonui/roughtransdlg.cpp
@@ -278,7 +278,7 @@ void RoughTransDlg::translate()
for(int i = 0; i < total; i++)
{
progressbar->setProgress(i+1);
- kapp->tqprocessEvents(100);
+ kapp->processEvents(100);
if(stop || cancel) break;
diff --git a/kbabel/filters/gettext/gettextexport.cpp b/kbabel/filters/gettext/gettextexport.cpp
index 31cca29f..ea098013 100644
--- a/kbabel/filters/gettext/gettextexport.cpp
+++ b/kbabel/filters/gettext/gettextexport.cpp
@@ -56,7 +56,7 @@ GettextExportPlugin::GettextExportPlugin(TQObject* parent, const char* name, con
{
}
-ConversiontqStatus GettextExportPlugin::save(const TQString& localFile , const TQString& mimetype, const Catalog* catalog)
+ConversionStatus GettextExportPlugin::save(const TQString& localFile , const TQString& mimetype, const Catalog* catalog)
{
// check, whether we know how to handle the extra data
if( catalog->importPluginID() != "GNU gettext")
@@ -164,7 +164,7 @@ ConversiontqStatus GettextExportPlugin::save(const TQString& localFile , const T
stream << "\n";
- kapp->tqprocessEvents(10);
+ kapp->processEvents(10);
if( isStopped() )
{
return STOPPED;
@@ -181,7 +181,7 @@ ConversiontqStatus GettextExportPlugin::save(const TQString& localFile , const T
{
stream << (*oit) << "\n\n";
- kapp->tqprocessEvents(10);
+ kapp->processEvents(10);
if( isStopped() )
{
return STOPPED;
diff --git a/kbabel/filters/gettext/gettextexport.h b/kbabel/filters/gettext/gettextexport.h
index 695105d2..9732ac73 100644
--- a/kbabel/filters/gettext/gettextexport.h
+++ b/kbabel/filters/gettext/gettextexport.h
@@ -54,7 +54,7 @@ class GettextExportPlugin: public KBabel::CatalogExportPlugin
{
public:
GettextExportPlugin(TQObject* parent, const char* name, const TQStringList &);
- virtual KBabel::ConversiontqStatus save(const TQString& file, const TQString& mimetype, const KBabel::Catalog* catalog);
+ virtual KBabel::ConversionStatus save(const TQString& file, const TQString& mimetype, const KBabel::Catalog* catalog);
private:
/**
diff --git a/kbabel/filters/gettext/gettextimport.cpp b/kbabel/filters/gettext/gettextimport.cpp
index a48e327b..a9bae51a 100644
--- a/kbabel/filters/gettext/gettextimport.cpp
+++ b/kbabel/filters/gettext/gettextimport.cpp
@@ -57,7 +57,7 @@ GettextImportPlugin::GettextImportPlugin(TQObject* parent, const char* name, con
{
}
-ConversiontqStatus GettextImportPlugin::load(const TQString& filename, const TQString&)
+ConversionStatus GettextImportPlugin::load(const TQString& filename, const TQString&)
{
kdDebug( KBABEL ) << k_funcinfo << endl;
@@ -117,7 +117,7 @@ ConversiontqStatus GettextImportPlugin::load(const TQString& filename, const TQS
kdDebug(KBABEL) << "start parsing..." << endl;
// first read header
- const ConversiontqStatus status = readHeader(stream);
+ const ConversionStatus status = readHeader(stream);
if ( status == RECOVERED_PARSE_ERROR )
@@ -173,13 +173,13 @@ ConversiontqStatus GettextImportPlugin::load(const TQString& filename, const TQS
while( !stream.eof() )
{
- kapp->tqprocessEvents(10);
+ kapp->processEvents(10);
if( isStopped() )
{
return STOPPED;
}
- const ConversiontqStatus success=readEntry(stream);
+ const ConversionStatus success=readEntry(stream);
if(success==OK)
{
@@ -302,7 +302,7 @@ TQTextCodec* GettextImportPlugin::codecForArray(TQByteArray& array, bool* hadCod
stream.setEncoding( TQTextStream::Latin1 );
// first read header
- ConversiontqStatus status = readHeader(stream);
+ ConversionStatus status = readHeader(stream);
if(status!=OK && status != RECOVERED_PARSE_ERROR)
{
kdDebug(KBABEL) << "wasn't able to read header" << endl;
@@ -360,11 +360,11 @@ TQTextCodec* GettextImportPlugin::codecForArray(TQByteArray& array, bool* hadCod
return codec;
}
-ConversiontqStatus GettextImportPlugin::readHeader(TQTextStream& stream)
+ConversionStatus GettextImportPlugin::readHeader(TQTextStream& stream)
{
CatalogItem temp;
int filePos=stream.tqdevice()->at();
- ConversiontqStatus status=readEntry(stream);
+ ConversionStatus status=readEntry(stream);
if(status==OK || status==RECOVERED_PARSE_ERROR)
{
@@ -380,7 +380,7 @@ ConversiontqStatus GettextImportPlugin::readHeader(TQTextStream& stream)
return PARSE_ERROR;
}
-ConversiontqStatus GettextImportPlugin::readEntry(TQTextStream& stream)
+ConversionStatus GettextImportPlugin::readEntry(TQTextStream& stream)
{
//kdDebug( KBABEL ) << k_funcinfo << " START" << endl;
enum {Begin,Comment,Msgctxt,Msgid,Msgstr} part=Begin;
diff --git a/kbabel/filters/gettext/gettextimport.h b/kbabel/filters/gettext/gettextimport.h
index fa20aa62..e5f81679 100644
--- a/kbabel/filters/gettext/gettextimport.h
+++ b/kbabel/filters/gettext/gettextimport.h
@@ -50,13 +50,13 @@ class GettextImportPlugin: public KBabel::CatalogImportPlugin
{
public:
GettextImportPlugin(TQObject* parent, const char* name, const TQStringList &);
- virtual KBabel::ConversiontqStatus load(const TQString& file, const TQString& mimetype);
+ virtual KBabel::ConversionStatus load(const TQString& file, const TQString& mimetype);
virtual const TQString id() { return "GNU gettext"; }
private:
TQTextCodec* codecForArray(TQByteArray& arary, bool* hadCodec);
- KBabel::ConversiontqStatus readHeader(TQTextStream& stream);
- KBabel::ConversiontqStatus readEntry(TQTextStream& stream);
+ KBabel::ConversionStatus readHeader(TQTextStream& stream);
+ KBabel::ConversionStatus readEntry(TQTextStream& stream);
// description of the last read entry
TQString _msgctxt;
diff --git a/kbabel/filters/linguist/linguistexport.cpp b/kbabel/filters/linguist/linguistexport.cpp
index 10fc37e2..eb6ab744 100644
--- a/kbabel/filters/linguist/linguistexport.cpp
+++ b/kbabel/filters/linguist/linguistexport.cpp
@@ -58,7 +58,7 @@ LinguistExportPlugin::LinguistExportPlugin( TQObject * parent, const char * name
{
}
-ConversiontqStatus LinguistExportPlugin::save( const TQString& filename, const TQString&, const Catalog * catalog )
+ConversionStatus LinguistExportPlugin::save( const TQString& filename, const TQString&, const Catalog * catalog )
{
// Check whether we know how to handle the extra data.
if ( catalog->importPluginID( ) != "TQt translation source" )
diff --git a/kbabel/filters/linguist/linguistexport.h b/kbabel/filters/linguist/linguistexport.h
index d468fce4..18b52460 100644
--- a/kbabel/filters/linguist/linguistexport.h
+++ b/kbabel/filters/linguist/linguistexport.h
@@ -52,7 +52,7 @@ class LinguistExportPlugin : public KBabel::CatalogExportPlugin
{
public:
LinguistExportPlugin( TQObject * parent, const char * name, const TQStringList& );
- virtual KBabel::ConversiontqStatus save( const TQString& filename, const TQString& mimetype, const KBabel::Catalog * catalog );
+ virtual KBabel::ConversionStatus save( const TQString& filename, const TQString& mimetype, const KBabel::Catalog * catalog );
private:
const TQString extractComment( TQDomDocument& doc, const TQString& s, bool& fuzzy );
diff --git a/kbabel/filters/linguist/linguistimport.cpp b/kbabel/filters/linguist/linguistimport.cpp
index 6d8dda81..b4476d52 100644
--- a/kbabel/filters/linguist/linguistimport.cpp
+++ b/kbabel/filters/linguist/linguistimport.cpp
@@ -60,7 +60,7 @@ LinguistImportPlugin::LinguistImportPlugin( TQObject * parent, const char * name
{
}
-ConversiontqStatus LinguistImportPlugin::load( const TQString& filename, const TQString& )
+ConversionStatus LinguistImportPlugin::load( const TQString& filename, const TQString& )
{
if ( filename.isEmpty( ) ) {
kdDebug( ) << "fatal error: empty filename to open" << endl;
diff --git a/kbabel/filters/linguist/linguistimport.h b/kbabel/filters/linguist/linguistimport.h
index b0bc51d9..11b5c6d1 100644
--- a/kbabel/filters/linguist/linguistimport.h
+++ b/kbabel/filters/linguist/linguistimport.h
@@ -52,7 +52,7 @@ class LinguistImportPlugin : public KBabel::CatalogImportPlugin
public:
LinguistImportPlugin( TQObject * parent, const char * name, const TQStringList& );
- virtual KBabel::ConversiontqStatus load( const TQString& filename, const TQString& mimetype );
+ virtual KBabel::ConversionStatus load( const TQString& filename, const TQString& mimetype );
virtual const TQString id( ) { return "TQt translation source"; }
private:
diff --git a/kbabel/filters/xliff/xliffexport.cpp b/kbabel/filters/xliff/xliffexport.cpp
index c633e8b1..59b41bfd 100644
--- a/kbabel/filters/xliff/xliffexport.cpp
+++ b/kbabel/filters/xliff/xliffexport.cpp
@@ -58,7 +58,7 @@ XLIFFExportPlugin::XLIFFExportPlugin( TQObject * parent, const char * name, cons
{
}
-ConversiontqStatus XLIFFExportPlugin::save( const TQString& filename, const TQString&, const Catalog * catalog )
+ConversionStatus XLIFFExportPlugin::save( const TQString& filename, const TQString&, const Catalog * catalog )
{
// Check whether we know how to handle the extra data.
if ( catalog->importPluginID( ) != "XLIFF 1.1" )
diff --git a/kbabel/filters/xliff/xliffexport.h b/kbabel/filters/xliff/xliffexport.h
index eccc311c..ac550ccc 100644
--- a/kbabel/filters/xliff/xliffexport.h
+++ b/kbabel/filters/xliff/xliffexport.h
@@ -52,7 +52,7 @@ class XLIFFExportPlugin : public KBabel::CatalogExportPlugin
{
public:
XLIFFExportPlugin( TQObject * parent, const char * name, const TQStringList& );
- virtual KBabel::ConversiontqStatus save( const TQString& filename, const TQString& mimetype, const KBabel::Catalog * catalog );
+ virtual KBabel::ConversionStatus save( const TQString& filename, const TQString& mimetype, const KBabel::Catalog * catalog );
private:
TQDomElement extractComment( TQDomDocument& doc, const TQString& s );
diff --git a/kbabel/filters/xliff/xliffimport.cpp b/kbabel/filters/xliff/xliffimport.cpp
index 246b8c24..807a624d 100644
--- a/kbabel/filters/xliff/xliffimport.cpp
+++ b/kbabel/filters/xliff/xliffimport.cpp
@@ -73,7 +73,7 @@ XLIFFImportPlugin::XLIFFImportPlugin( TQObject * parent, const char * name, cons
{
}
-ConversiontqStatus XLIFFImportPlugin::load( const TQString& filename, const TQString& )
+ConversionStatus XLIFFImportPlugin::load( const TQString& filename, const TQString& )
{
if ( filename.isEmpty( ) ) {
kdDebug( KDEBUG_AREA ) << "fatal error: empty filename to open" << endl;
diff --git a/kbabel/filters/xliff/xliffimport.h b/kbabel/filters/xliff/xliffimport.h
index a32a686b..8901afd2 100644
--- a/kbabel/filters/xliff/xliffimport.h
+++ b/kbabel/filters/xliff/xliffimport.h
@@ -52,7 +52,7 @@ class XLIFFImportPlugin : public KBabel::CatalogImportPlugin
public:
XLIFFImportPlugin( TQObject * parent, const char * name, const TQStringList& );
- virtual KBabel::ConversiontqStatus load( const TQString& filename, const TQString& mimetype );
+ virtual KBabel::ConversionStatus load( const TQString& filename, const TQString& mimetype );
virtual const TQString id( ) { return "XLIFF 1.1"; }
private:
diff --git a/kbabel/kbabel/colorpreferences.ui b/kbabel/kbabel/colorpreferences.ui
index ae8e57fe..63a0dcf1 100644
--- a/kbabel/kbabel/colorpreferences.ui
+++ b/kbabel/kbabel/colorpreferences.ui
@@ -164,7 +164,7 @@ phrases.&lt;/qt&gt;</string>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>50</height>
diff --git a/kbabel/kbabel/editordiffpreferences.ui b/kbabel/kbabel/editordiffpreferences.ui
index 33460635..56c6848b 100644
--- a/kbabel/kbabel/editordiffpreferences.ui
+++ b/kbabel/kbabel/editordiffpreferences.ui
@@ -170,7 +170,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>31</height>
diff --git a/kbabel/kbabel/editorpreferences.ui b/kbabel/kbabel/editorpreferences.ui
index 15498f32..77c64683 100644
--- a/kbabel/kbabel/editorpreferences.ui
+++ b/kbabel/kbabel/editorpreferences.ui
@@ -133,7 +133,7 @@ activated, you will still see a message in the statusbar.
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>21</height>
@@ -206,10 +206,10 @@ activated, you will still see a message in the statusbar.
<cstring>buttonGroup1</cstring>
</property>
<property name="title">
- <string>tqStatus LEDs</string>
+ <string>Status LEDs</string>
</property>
<property name="whatsThis" stdset="0">
- <string>&lt;qt&gt;&lt;p&gt;&lt;b&gt;tqStatus LEDs&lt;/b&gt;&lt;/p&gt;
+ <string>&lt;qt&gt;&lt;p&gt;&lt;b&gt;Status LEDs&lt;/b&gt;&lt;/p&gt;
&lt;p&gt;Choose here where the status LEDs are displayed and what color they have.&lt;/p&gt;&lt;/qt&gt;</string>
</property>
<hbox>
@@ -245,7 +245,7 @@ activated, you will still see a message in the statusbar.
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>51</width>
<height>20</height>
@@ -283,7 +283,7 @@ activated, you will still see a message in the statusbar.
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>29</height>
diff --git a/kbabel/kbabel/errorlistview.cpp b/kbabel/kbabel/errorlistview.cpp
index 719798d3..33b1f7e9 100644
--- a/kbabel/kbabel/errorlistview.cpp
+++ b/kbabel/kbabel/errorlistview.cpp
@@ -70,7 +70,7 @@ void ErrorListView::updateView()
if( _catalog->numberOfEntries() == 0 )
return;
- _textview->setText( _catalog->itemtqStatus( _currentIndex ).join( "\n---\n" ) );
+ _textview->setText( _catalog->itemStatus( _currentIndex ).join( "\n---\n" ) );
}
#include "errorlistview.moc"
diff --git a/kbabel/kbabel/kbabel.cpp b/kbabel/kbabel/kbabel.cpp
index 24c3eae9..c12a8e41 100644
--- a/kbabel/kbabel/kbabel.cpp
+++ b/kbabel/kbabel/kbabel.cpp
@@ -115,9 +115,9 @@ class MyKProgress: public KProgress
public:
MyKProgress( TQWidget *parent, const char *name ) : KProgress( parent, name )
{
- tqsetSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Preferred );
+ setSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Preferred );
}
- TQSize tqsizeHint() const { return TQSize( 1, 1);}
+ TQSize sizeHint() const { return TQSize( 1, 1);}
};
KBabelMW::KBabelMW(TQString projectFile)
@@ -455,7 +455,7 @@ void KBabelMW::setupActions()
,TQT_SLOT(emitChar()), actionCollection(), "char2msgstr");
a_unsetFuzzy = new KAction(i18n("To&ggle Fuzzy Status"), "togglefuzzy", CTRL+Key_U, TQT_TQOBJECT(m_view)
- , TQT_SLOT(removeFuzzytqStatus()), actionCollection(), "edit_toggle_fuzzy");
+ , TQT_SLOT(removeFuzzyStatus()), actionCollection(), "edit_toggle_fuzzy");
action = new KAction(i18n("&Edit Header..."), 0, TQT_TQOBJECT(m_view), TQT_SLOT(editHeader()),
actionCollection(), "edit_edit_header");
@@ -724,7 +724,7 @@ void KBabelMW::setupStatusBar()
_errorLed->setFixedSize(15,12);
new TQLabel(i18n("faulty")+" ",statusBox);
- statusBox->setFixedWidth(statusBox->tqsizeHint().width());
+ statusBox->setFixedWidth(statusBox->sizeHint().width());
statusBar()->addWidget(statusBox);
}
@@ -743,7 +743,7 @@ void KBabelMW::setupStatusBar()
progressBox->setStretchFactor(_progressBar,1);
statusBar()->addWidget(progressBox,1);
- statusBar()->setMinimumHeight(progressBox->tqsizeHint().height());
+ statusBar()->setMinimumHeight(progressBox->sizeHint().height());
TQWhatsThis::add(statusBar(),
i18n("<qt><p><b>Statusbar</b></p>\n\
@@ -999,7 +999,7 @@ void KBabelMW::openRecent(const KURL& url)
KBabelView *view = KBabelView::viewForURL(url,TQString());
if(view)
{
- KWin::activateWindow(view->tqtopLevelWidget()->winId());
+ KWin::activateWindow(view->topLevelWidget()->winId());
return;
}
@@ -1019,7 +1019,7 @@ void KBabelMW::open(const KURL& url, const TQString package, bool newWindow)
if(view)
{
kdDebug(KBABEL) << "there is a such view" << endl;
- KWin::activateWindow(view->tqtopLevelWidget()->winId());
+ KWin::activateWindow(view->topLevelWidget()->winId());
return;
}
diff --git a/kbabel/kbabel/kbabelsplash.cpp b/kbabel/kbabel/kbabelsplash.cpp
index 785943d8..143aff02 100644
--- a/kbabel/kbabel/kbabelsplash.cpp
+++ b/kbabel/kbabel/kbabelsplash.cpp
@@ -55,7 +55,7 @@ KBabelSplash::KBabelSplash( TQWidget* parent, const char* name )
// Set tqgeometry, with support for Xinerama systems
TQRect r;
- r.setSize(tqsizeHint());
+ r.setSize(sizeHint());
int ps = TQApplication::desktop()->primaryScreen();
r.moveCenter( TQApplication::desktop()->screenGeometry(ps).center() );
setGeometry(r);
diff --git a/kbabel/kbabel/kbabelview.cpp b/kbabel/kbabel/kbabelview.cpp
index 4c50a7e9..b4bba709 100644
--- a/kbabel/kbabel/kbabelview.cpp
+++ b/kbabel/kbabel/kbabelview.cpp
@@ -685,7 +685,7 @@ void KBabelView::readSettings(KConfig* config)
if(KBabelSettings::autoUnsetFuzzy())
{
connect(msgstrEdit,TQT_SIGNAL(textChanged())
- ,this,TQT_SLOT(autoRemoveFuzzytqStatus()));
+ ,this,TQT_SLOT(autoRemoveFuzzyStatus()));
}
setupAutoCheckTools();
@@ -854,12 +854,12 @@ void KBabelView::updateSettings()
}
disconnect(msgstrEdit,TQT_SIGNAL(textChanged())
- ,this,TQT_SLOT(autoRemoveFuzzytqStatus()));
+ ,this,TQT_SLOT(autoRemoveFuzzyStatus()));
if(KBabelSettings::autoUnsetFuzzy())
{
connect(msgstrEdit,TQT_SIGNAL(textChanged())
- ,this,TQT_SLOT(autoRemoveFuzzytqStatus()));
+ ,this,TQT_SLOT(autoRemoveFuzzyStatus()));
}
msgstrEdit->setCleverEditing(KBabelSettings::cleverEditing());
@@ -1116,7 +1116,7 @@ void KBabelView::open(const KURL& _url, const TQString & package, bool checkIfMo
cu.cleanPath();
if(checkIfModified && !url.isEmpty() && cu==url)
{
- KWin::activateWindow(tqtopLevelWidget()->winId());
+ KWin::activateWindow(topLevelWidget()->winId());
return;
}
@@ -1155,12 +1155,12 @@ void KBabelView::open(const KURL& _url, const TQString & package, bool checkIfMo
return;
}
else {
- KWin::activateWindow(v->tqtopLevelWidget()->winId());
+ KWin::activateWindow(v->topLevelWidget()->winId());
return;
}
}
- ConversiontqStatus stat=_catalog->openURL(url, package);
+ ConversionStatus stat=_catalog->openURL(url, package);
switch(stat)
{
@@ -1282,7 +1282,7 @@ void KBabelView::openTemplate(const KURL& openURL, const KURL& saveURL)
setCursor(KCursor::waitCursor());*/
- ConversiontqStatus stat=_catalog->openURL(openURL,saveURL);
+ ConversionStatus stat=_catalog->openURL(openURL,saveURL);
switch(stat)
{
@@ -1368,7 +1368,7 @@ bool KBabelView::saveFile(bool syntaxCheck)
}
else
{
- ConversiontqStatus stat=_catalog->saveFile();
+ ConversionStatus stat=_catalog->saveFile();
int whatToDo = -1;
@@ -1458,7 +1458,7 @@ bool KBabelView::saveFileAs(KURL url, bool syntaxCheck)
bool wasReadOnly=_catalog->isReadOnly();
- ConversiontqStatus stat=_catalog->saveFileAs(url,true);
+ ConversionStatus stat=_catalog->saveFileAs(url,true);
// if the file was not saved sucessfully ask for saving to another file
@@ -1625,7 +1625,7 @@ bool KBabelView::checkSyntax(bool msgOnlyAtError,bool question)
bool returnCode=true;
TQString output;
- Msgfmt::tqStatus result=_catalog->checkSyntax( output );
+ Msgfmt::Status result=_catalog->checkSyntax( output );
const TQStringList outputLines = TQStringList::split("\n",output);
@@ -1831,7 +1831,7 @@ void KBabelView::updateEditor(int form, bool delay)
if(KBabelSettings::autoUnsetFuzzy() && !msgstrEdit->isModified())
{
- disconnect(msgstrEdit,TQT_SIGNAL(textChanged()),this,TQT_SLOT(autoRemoveFuzzytqStatus()));
+ disconnect(msgstrEdit,TQT_SIGNAL(textChanged()),this,TQT_SLOT(autoRemoveFuzzyStatus()));
}
msgidLabel->setText(_catalog->msgid(_currentIndex), _catalog->msgctxt(_currentIndex));
@@ -1844,7 +1844,7 @@ void KBabelView::updateEditor(int form, bool delay)
if(KBabelSettings::autoUnsetFuzzy() && _catalog->isFuzzy(_currentIndex))
{
- connect(msgstrEdit,TQT_SIGNAL(textChanged()),this,TQT_SLOT(autoRemoveFuzzytqStatus()));
+ connect(msgstrEdit,TQT_SIGNAL(textChanged()),this,TQT_SLOT(autoRemoveFuzzyStatus()));
}
msgstrEdit->blockSignals(false);
@@ -2615,7 +2615,7 @@ void KBabelView::replaceAll()
while(success)
{
- kapp->tqprocessEvents(100);
+ kapp->processEvents(100);
_replacesTotal++;
@@ -3159,7 +3159,7 @@ void KBabelView::forwardHistory()
}
}
-void KBabelView::removeFuzzytqStatus()
+void KBabelView::removeFuzzyStatus()
{
bool newState = !_catalog->isFuzzy(_currentIndex);
_catalog->setFuzzy(_currentIndex,newState);
@@ -3302,12 +3302,12 @@ void KBabelView::emitEntryState()
TQPalette palette=msgstrEdit->palette();
palette.setColor( TQColorGroup::Text, red );
- if( _catalog->itemtqStatus(_currentIndex).contains("syntax error"))
+ if( _catalog->itemStatus(_currentIndex).contains("syntax error"))
{
msgstrEdit->setCurrentColor( MsgMultiLineEdit::ErrorColor );
}
else
- if( !_catalog->itemtqStatus(_currentIndex).isEmpty() && KBabelSettings::autoCheckColorError())
+ if( !_catalog->itemStatus(_currentIndex).isEmpty() && KBabelSettings::autoCheckColorError())
{
msgstrEdit->setCurrentColor( MsgMultiLineEdit::ErrorColor );
}
@@ -3332,12 +3332,12 @@ void KBabelView::checkUntranslated()
emit signalUntranslatedInFront(_catalog->hasUntranslatedInFront(_currentIndex));
}
-void KBabelView::autoRemoveFuzzytqStatus()
+void KBabelView::autoRemoveFuzzyStatus()
{
// only at first text change remove fuzzy status
- disconnect(msgstrEdit,TQT_SIGNAL(textChanged()),this,TQT_SLOT(autoRemoveFuzzytqStatus()));
+ disconnect(msgstrEdit,TQT_SIGNAL(textChanged()),this,TQT_SLOT(autoRemoveFuzzyStatus()));
- //removeFuzzytqStatus();
+ //removeFuzzyStatus();
}
void KBabelView::toggleFuzzyLed(bool on)
@@ -3541,7 +3541,7 @@ void KBabelView::forwardMsgstrEditCmd(EditCommand* cmd)
_catalog->applyBeginCommand(_currentIndex,Msgstr,this);
- removeFuzzytqStatus();
+ removeFuzzyStatus();
}
cmd->setPart(Msgstr);
@@ -3576,13 +3576,13 @@ void KBabelView::autoCheck(bool onlyWhenChanged)
{
if( !_autocheckTools.isEmpty() )
{
- TQStringList oldtqStatus = _catalog->itemtqStatus(_currentIndex);
+ TQStringList oldStatus = _catalog->itemStatus(_currentIndex);
- TQStringList status = _catalog->itemtqStatus( _currentIndex,true, _autocheckTools );
+ TQStringList status = _catalog->itemStatus( _currentIndex,true, _autocheckTools );
// if there is more than one view, the status changes only in
// one view, so we have to update always.
- if(_catalog->isLastView() && onlyWhenChanged && oldtqStatus == status)
+ if(_catalog->isLastView() && onlyWhenChanged && oldStatus == status)
return;
if( !status.isEmpty() )
@@ -3598,7 +3598,7 @@ void KBabelView::autoCheck(bool onlyWhenChanged)
else msg += ", "+locale->translate("what check found errors",(*it).utf8());
}
- //i18n: translators: tqStatus bar text that automatic checks have found some errors
+ //i18n: translators: Status bar text that automatic checks have found some errors
emit signalChangeStatusbar(i18n("1 error: %1", "%n errors: %1", status.size ()).tqarg(msg));
emit signalFaultyDisplayed(true);
@@ -3611,7 +3611,7 @@ void KBabelView::autoCheck(bool onlyWhenChanged)
{
if(onlyWhenChanged)
{
- if(oldtqStatus != status && oldtqStatus.isEmpty() )
+ if(oldStatus != status && oldStatus.isEmpty() )
{
KNotifyClient::beep();
}
@@ -3622,7 +3622,7 @@ void KBabelView::autoCheck(bool onlyWhenChanged)
}
}
}
- else if( _catalog->itemtqStatus(_currentIndex).isEmpty() )
+ else if( _catalog->itemStatus(_currentIndex).isEmpty() )
{
_catalog->removeFromErrorList(_currentIndex);
@@ -3888,7 +3888,7 @@ void KBabelView::spellcheck()
if(emitProgress)
{
emit signalResetProgressBar(i18n("Preparing spell check"),100);
- kapp->tqprocessEvents(100);
+ kapp->processEvents(100);
}
uint total=last-first+1;
@@ -3900,7 +3900,7 @@ void KBabelView::spellcheck()
lastPercent++;
emit signalProgress(lastPercent);
- kapp->tqprocessEvents(100);
+ kapp->processEvents(100);
}
TQStringList msgs=_catalog->msgstr(i);
@@ -4018,7 +4018,7 @@ void KBabelView::spellStart(KSpell *)
if(spell.ignoreList.count() > 0)
{
emit signalResetProgressBar(i18n("Preparing spell check"),100);
- kapp->tqprocessEvents(100);
+ kapp->processEvents(100);
uint total = spell.ignoreList.count();
uint oldPercent=0;
@@ -4031,7 +4031,7 @@ void KBabelView::spellStart(KSpell *)
{
oldPercent++;
emit signalProgress(oldPercent);
- kapp->tqprocessEvents(100);
+ kapp->processEvents(100);
}
spell.kspell->ignore(*it);
diff --git a/kbabel/kbabel/kbabelview.h b/kbabel/kbabel/kbabelview.h
index 3398457d..af7fff86 100644
--- a/kbabel/kbabel/kbabelview.h
+++ b/kbabel/kbabel/kbabelview.h
@@ -268,7 +268,7 @@ public slots:
void skipToTagFromTool(int index);
void wordCount();
- void removeFuzzytqStatus();
+ void removeFuzzyStatus();
/** opens the header editor for the po-file */
void editHeader();
@@ -451,7 +451,7 @@ protected slots:
private slots:
void msgstrPluralFormChanged (uint index);
- void autoRemoveFuzzytqStatus();
+ void autoRemoveFuzzyStatus();
/** connected to the catalog. it is called when a new file is opened*/
void newFileOpened(bool readOnly);
diff --git a/kbabel/kbabel/kbabelview2.cpp b/kbabel/kbabel/kbabelview2.cpp
index c70b42e7..a5ba1df4 100644
--- a/kbabel/kbabel/kbabelview2.cpp
+++ b/kbabel/kbabel/kbabelview2.cpp
@@ -709,7 +709,7 @@ bool KBabelView::openDiffFile(bool autoDiff)
connect(&cat,TQT_SIGNAL(signalProgress(int)),this,TQT_SIGNAL(signalProgress(int)));
emit signalResetProgressBar(i18n("loading file for diff"),100);
- ConversiontqStatus stat = cat.openURL(url);
+ ConversionStatus stat = cat.openURL(url);
emit signalClearProgressBar();
@@ -802,8 +802,8 @@ void KBabelView::showTryLaterMessageBox()
"However, the string might be found "
"in the files being searched at the moment.\n"
"Please try later."), contents);
- label2->tqsetAlignment( TQt::AlignAuto | TQt::AlignVCenter | TQt::ExpandTabs | TQt::WordBreak );
- label2->setMinimumSize(label2->tqsizeHint());
+ label2->setAlignment( TQt::AlignAuto | TQt::AlignVCenter | TQt::ExpandTabs | TQt::WordBreak );
+ label2->setMinimumSize(label2->sizeHint());
lay->add( label2 );
lay->addStretch(1);
diff --git a/kbabel/kbabel/kbhighlighting.cpp b/kbabel/kbabel/kbhighlighting.cpp
index c67d56a7..621fb654 100644
--- a/kbabel/kbabel/kbhighlighting.cpp
+++ b/kbabel/kbabel/kbhighlighting.cpp
@@ -300,7 +300,7 @@ void KBabelHighlighter::setSpellChecker( KSpell* spell )
this, TQT_SLOT(slotMisspelling(const TQString &, const TQStringList &, unsigned int)));
// wait for KSpell to startup correctly
- kapp->tqprocessEvents(500);
+ kapp->processEvents(500);
}
highlight();
diff --git a/kbabel/kbabel/main.cpp b/kbabel/kbabel/main.cpp
index f36a0b94..85158efa 100644
--- a/kbabel/kbabel/main.cpp
+++ b/kbabel/kbabel/main.cpp
@@ -242,7 +242,7 @@ void KBabelInterface::openURL(TQCString url, TQCString package, WId window, int
KBabelMW *kb = KBabelMW::winForURL(u,project);
if(kb)
{
- KWin::activateWindow(kb->tqtopLevelWidget()->winId());
+ KWin::activateWindow(kb->topLevelWidget()->winId());
}
else
{
@@ -255,7 +255,7 @@ void KBabelInterface::openURL(TQCString url, TQCString package, WId window, int
if( mw->inherits("KBabelMW") && mw->winId() == window)
{
kb = static_cast<KBabelMW*>(mw);
- KWin::activateWindow(kb->tqtopLevelWidget()->winId());
+ KWin::activateWindow(kb->topLevelWidget()->winId());
kb->open(u, TQString::fromUtf8(package),newWindow);
kdDebug () << "Resuming DCOP" << endl;
@@ -272,7 +272,7 @@ void KBabelInterface::openURL(TQCString url, TQCString package, WId window, int
{
// here, we don't care about "open in new window", because
// it's empty
- KWin::setActiveWindow(kb->tqtopLevelWidget()->winId());
+ KWin::setActiveWindow(kb->topLevelWidget()->winId());
kb->projectOpen(projectFile);
kb->open(u,TQString::fromUtf8(package),false);
@@ -289,7 +289,7 @@ void KBabelInterface::openURL(TQCString url, TQCString package, WId window, int
if( mw->inherits("KBabelMW") && static_cast<KBabelMW*>(mw)->project()==project)
{
kb = static_cast<KBabelMW*>(mw);
- KWin::activateWindow(kb->tqtopLevelWidget()->winId());
+ KWin::activateWindow(kb->topLevelWidget()->winId());
kb->open(u, TQString::fromUtf8(package),newWindow);
kdDebug () << "Resuming DCOP" << endl;
@@ -305,7 +305,7 @@ void KBabelInterface::openURL(TQCString url, TQCString package, WId window, int
kb = new KBabelMW(project);
kb->show();
} else kb = static_cast<KBabelMW*>(mw);
- KWin::activateWindow(kb->tqtopLevelWidget()->winId());
+ KWin::activateWindow(kb->topLevelWidget()->winId());
kb->open(u,TQString::fromUtf8(package),newWindow);
}
@@ -331,7 +331,7 @@ void KBabelInterface::openTemplate(TQCString openFilename, TQCString saveFilenam
KBabelMW *kb = KBabelMW::winForURL(u, project);
if(kb)
{
- KWin::activateWindow(kb->tqtopLevelWidget()->winId());
+ KWin::activateWindow(kb->topLevelWidget()->winId());
}
else
{
@@ -342,7 +342,7 @@ void KBabelInterface::openTemplate(TQCString openFilename, TQCString saveFilenam
if(mw && mw->inherits("KBabelMW") && static_cast<KBabelMW*>(mw)->project()==project)
{
kb = static_cast<KBabelMW*>(mw);
- KWin::activateWindow(kb->tqtopLevelWidget()->winId());
+ KWin::activateWindow(kb->topLevelWidget()->winId());
kb->projectOpen(projectFile);
kb->openTemplate(t,u,TQString::fromUtf8(package),newWindow);
}
@@ -350,7 +350,7 @@ void KBabelInterface::openTemplate(TQCString openFilename, TQCString saveFilenam
{
kb = new KBabelMW(project);
kb->show();
- KWin::activateWindow(kb->tqtopLevelWidget()->winId());
+ KWin::activateWindow(kb->topLevelWidget()->winId());
kb->openTemplate(t,u,TQString::fromUtf8(package));
}
}
@@ -505,7 +505,7 @@ KBabelMW* KBabelInterface::findInstance( const KURL& url, const TQString& projec
if(kb)
{
- KWin::activateWindow(kb->tqtopLevelWidget()->winId());
+ KWin::activateWindow(kb->topLevelWidget()->winId());
}
}
diff --git a/kbabel/kbabel/mymultilineedit.cpp b/kbabel/kbabel/mymultilineedit.cpp
index af824fdd..7b2155eb 100644
--- a/kbabel/kbabel/mymultilineedit.cpp
+++ b/kbabel/kbabel/mymultilineedit.cpp
@@ -120,7 +120,7 @@ void MyMultiLineEdit::processCommand(EditCommand* cmd, bool undo)
TQPalette _visibleHighlight( palette() );
TQPalette _invisibleHighlight( palette() );
- TQColorGroup newcg( tqcolorGroup() );
+ TQColorGroup newcg( colorGroup() );
newcg.setColor( TQColorGroup::HighlightedText, newcg.text() );
newcg.setColor( TQColorGroup::Highlight, newcg.base() );
if( hasFocus() ) _invisibleHighlight.setActive( newcg );
@@ -362,7 +362,7 @@ void MyMultiLineEdit::insert( const TQString & text, bool indent, bool checkNewL
TQPalette _visibleHighlight( palette() );
TQPalette _invisibleHighlight( palette() );
- TQColorGroup newcg( tqcolorGroup() );
+ TQColorGroup newcg( colorGroup() );
newcg.setColor( TQColorGroup::HighlightedText, newcg.text() );
newcg.setColor( TQColorGroup::Highlight, newcg.base() );
if( hasFocus() ) _invisibleHighlight.setActive( newcg );
@@ -598,7 +598,7 @@ MsgMultiLineEdit::MsgMultiLineEdit(int ID, KSpell* spell, TQWidget* parent,const
_cleverEditing(false),
_highlightBg(false),
_spacePoints(false),
- _bgColor(tqcolorGroup().base().dark(110)),
+ _bgColor(colorGroup().base().dark(110)),
_textColor(KGlobalSettings::textColor()),
_errorColor(TQt::red),
_currentColor(KGlobalSettings::textColor()),
@@ -910,7 +910,7 @@ void MsgMultiLineEdit::setDiffColors(const TQColor& addColor
void MsgMultiLineEdit::setTextColor(const TQColor &color )
{
TQPalette p( palette() );
- TQColorGroup newcg( tqcolorGroup() );
+ TQColorGroup newcg( colorGroup() );
newcg.setColor( TQColorGroup::Text, color );
if( hasFocus() ) p.setActive( newcg );
else p.setInactive( newcg );
@@ -1167,7 +1167,7 @@ void MsgMultiLineEdit::highlight()
TQColor bg;
if( _highlightBg ) bg = _bgColor;
- else bg = tqcolorGroup().base();
+ else bg = colorGroup().base();
for( int i = 0 ; i < paragraphs() ; i++ )
setParagraphBackgroundColor( i, bg );
diff --git a/kbabel/kbabel/searchpreferences.ui b/kbabel/kbabel/searchpreferences.ui
index c00e537f..10ce1a89 100644
--- a/kbabel/kbabel/searchpreferences.ui
+++ b/kbabel/kbabel/searchpreferences.ui
@@ -96,7 +96,7 @@ the desired dictionary from &lt;b&gt;Settings-&gt;Configure Dictionary&lt;/b&gt;
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>31</width>
<height>91</height>
diff --git a/kbabel/kbabeldict/kbabeldictbox.cpp b/kbabel/kbabeldict/kbabeldictbox.cpp
index de0f747f..62f68f7d 100644
--- a/kbabel/kbabeldict/kbabeldictbox.cpp
+++ b/kbabel/kbabeldict/kbabeldictbox.cpp
@@ -324,10 +324,10 @@ KBabelDictBox::KBabelDictBox( TQWidget* parent, const char* name, WFlags fl )
mainLayout->addLayout(hbox);
totalResultsLabel->setNum(100000);
- totalResultsLabel->setFixedSize(totalResultsLabel->tqsizeHint());
+ totalResultsLabel->setFixedSize(totalResultsLabel->sizeHint());
totalResultsLabel->setNum(0);
currentLabel->setNum(100000);
- currentLabel->setFixedSize(currentLabel->tqsizeHint());
+ currentLabel->setFixedSize(currentLabel->sizeHint());
currentLabel->setNum(0);
setRMBMenu(new TQPopupMenu(this));
diff --git a/kbabel/kbabeldict/kbabelsplash.cpp b/kbabel/kbabeldict/kbabelsplash.cpp
index a62cec5f..85ec22d4 100644
--- a/kbabel/kbabeldict/kbabelsplash.cpp
+++ b/kbabel/kbabeldict/kbabelsplash.cpp
@@ -55,7 +55,7 @@ KBabelSplash::KBabelSplash( TQWidget* parent, const char* name )
// Set tqgeometry, with support for Xinerama systems
TQRect r;
- r.setSize(tqsizeHint());
+ r.setSize(sizeHint());
int ps = TQApplication::desktop()->primaryScreen();
r.moveCenter( TQApplication::desktop()->screenGeometry(ps).center() );
setGeometry(r);
diff --git a/kbabel/kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp b/kbabel/kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp
index 4c79bacd..46948614 100644
--- a/kbabel/kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp
+++ b/kbabel/kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp
@@ -474,7 +474,7 @@ KDBSearchEngine::messagesForFilter (const SearchFilter * filter,
if (count % step == 0)
{
emit progress (100 * count / totalRecord);
- kapp->tqprocessEvents (100);
+ kapp->processEvents (100);
}
if (stopNow)
{
@@ -582,7 +582,7 @@ KDBSearchEngine::repeat ()
if (count % step == 0)
{
emit progress (100 * count / totalRecord);
- kapp->tqprocessEvents (100);
+ kapp->processEvents (100);
}
if (stopNow)
{
@@ -755,7 +755,7 @@ KDBSearchEngine::startSearchNow (int searchmode)
step = 100;
emit progress (0);
- kapp->tqprocessEvents (100);
+ kapp->processEvents (100);
if (stopNow)
{
stopNow = false;
@@ -775,7 +775,7 @@ KDBSearchEngine::startSearchNow (int searchmode)
{
emit progress (100 * count / /*TQMAX( */
totalprogress /*,1) */ );
- kapp->tqprocessEvents (100);
+ kapp->processEvents (100);
if (stopNow)
{
@@ -1715,7 +1715,7 @@ TQValueList < KeyAndScore > KDBSearchEngine::searchWords (TQString phrase,
{
emit
progress (100 * count / totalprogress);
- kapp->tqprocessEvents (100);
+ kapp->processEvents (100);
}
if (stopNow)
{
diff --git a/kbabel/kbabeldict/modules/dbsearchengine/dbscan.cpp b/kbabel/kbabeldict/modules/dbsearchengine/dbscan.cpp
index 2969a9df..10a3a796 100644
--- a/kbabel/kbabeldict/modules/dbsearchengine/dbscan.cpp
+++ b/kbabel/kbabeldict/modules/dbsearchengine/dbscan.cpp
@@ -128,7 +128,7 @@ emit fileLoading(0);
KURL u(fileName);
-ConversiontqStatus rr=catalog->openURL(u);
+ConversionStatus rr=catalog->openURL(u);
if(rr != OK && rr !=RECOVERED_PARSE_ERROR )
{
delete catalog;
@@ -159,7 +159,7 @@ for (i=0;i<tot;i++) //Skip header = ????
{
emit fileProgress(100*i/tot);
emit added(count);
- kapp->tqprocessEvents(100);
+ kapp->processEvents(100);
}
fuzzy=catalog->isFuzzy(i);
diff --git a/kbabel/kbabeldict/modules/dbsearchengine/dbseprefwidget.ui b/kbabel/kbabeldict/modules/dbsearchengine/dbseprefwidget.ui
index b457bf74..6c3fa8a9 100644
--- a/kbabel/kbabeldict/modules/dbsearchengine/dbseprefwidget.ui
+++ b/kbabel/kbabeldict/modules/dbsearchengine/dbseprefwidget.ui
@@ -179,7 +179,7 @@ It also substitutes groups of more than one space character with only one space
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>20</height>
@@ -245,7 +245,7 @@ It also substitutes groups of more than one space character with only one space
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -262,7 +262,7 @@ It also substitutes groups of more than one space character with only one space
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -332,7 +332,7 @@ It also substitutes groups of more than one space character with only one space
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -384,7 +384,7 @@ If you search for &lt;em&gt;My name is Andrea&lt;/em&gt; and you have activated
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -415,7 +415,7 @@ If you search for &lt;em&gt;My name is Andrea&lt;/em&gt; and you have activated
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/kbabel/kbabeldict/modules/dbsearchengine/preferenceswidget.cpp b/kbabel/kbabeldict/modules/dbsearchengine/preferenceswidget.cpp
index a2c8c289..a3481a07 100644
--- a/kbabel/kbabeldict/modules/dbsearchengine/preferenceswidget.cpp
+++ b/kbabel/kbabeldict/modules/dbsearchengine/preferenceswidget.cpp
@@ -25,7 +25,7 @@ PreferencesWidget::PreferencesWidget(TQWidget *parent, const char* name)
dbpw->dirInput->setMode(KFile::Directory | KFile::LocalOnly);
tqlayout->addWidget(dbpw);
- resize(TQSize(200,200).expandedTo(tqminimumSizeHint()));
+ resize(TQSize(200,200).expandedTo(minimumSizeHint()));
// connect(dbpw->browseTB_3,TQT_SIGNAL(clicked()),TQT_SLOT(browse1()));
diff --git a/kbabel/kbabeldict/modules/dbsearchengine2/dbscan.cpp b/kbabel/kbabeldict/modules/dbsearchengine2/dbscan.cpp
index 23f0b7d2..c4f5e397 100644
--- a/kbabel/kbabeldict/modules/dbsearchengine2/dbscan.cpp
+++ b/kbabel/kbabeldict/modules/dbsearchengine2/dbscan.cpp
@@ -212,7 +212,7 @@ emit fileLoading(0);
bool error;
-ConversiontqStatus rr=catalog->openURL(u);
+ConversionStatus rr=catalog->openURL(u);
if(rr != OK && rr !=RECOVERED_PARSE_ERROR )
{
delete catalog;
diff --git a/kbabel/kbabeldict/modules/dbsearchengine2/dbse2.ui b/kbabel/kbabeldict/modules/dbsearchengine2/dbse2.ui
index 285319e5..685e86bd 100644
--- a/kbabel/kbabeldict/modules/dbsearchengine2/dbse2.ui
+++ b/kbabel/kbabeldict/modules/dbsearchengine2/dbse2.ui
@@ -109,7 +109,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>40</height>
@@ -147,7 +147,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>40</height>
@@ -380,7 +380,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -496,7 +496,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -669,7 +669,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>40</height>
diff --git a/kbabel/kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui b/kbabel/kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui
index 64a74b8a..0834f06c 100644
--- a/kbabel/kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui
+++ b/kbabel/kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui
@@ -182,7 +182,7 @@ It also substitutes groups of more than one space character with only one space
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>20</height>
@@ -248,7 +248,7 @@ It also substitutes groups of more than one space character with only one space
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -265,7 +265,7 @@ It also substitutes groups of more than one space character with only one space
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -335,7 +335,7 @@ It also substitutes groups of more than one space character with only one space
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -387,7 +387,7 @@ If you search for &lt;em&gt;My name is Andrea&lt;/em&gt; and you have activated
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -418,7 +418,7 @@ If you search for &lt;em&gt;My name is Andrea&lt;/em&gt; and you have activated
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/kbabel/kbabeldict/modules/dbsearchengine2/sourcedialog.ui b/kbabel/kbabeldict/modules/dbsearchengine2/sourcedialog.ui
index 39e1f2ac..a34953df 100644
--- a/kbabel/kbabeldict/modules/dbsearchengine2/sourcedialog.ui
+++ b/kbabel/kbabeldict/modules/dbsearchengine2/sourcedialog.ui
@@ -29,7 +29,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>40</width>
<height>20</height>
@@ -72,7 +72,7 @@
</rect>
</property>
<property name="text">
- <string>tqStatus: </string>
+ <string>Status: </string>
</property>
</widget>
<widget class="KLineEdit">
diff --git a/kbabel/kbabeldict/modules/poauxiliary/poauxiliary.cpp b/kbabel/kbabeldict/modules/poauxiliary/poauxiliary.cpp
index 9025d716..589b3d25 100644
--- a/kbabel/kbabeldict/modules/poauxiliary/poauxiliary.cpp
+++ b/kbabel/kbabeldict/modules/poauxiliary/poauxiliary.cpp
@@ -182,7 +182,7 @@ bool PoAuxiliary::startSearch(const TQString& t, uint pluralForm, const SearchFi
clearResults();
- kapp->tqprocessEvents(100);
+ kapp->processEvents(100);
text.replace("\n","");
@@ -255,7 +255,7 @@ bool PoAuxiliary::startSearchInTranslation(const TQString& text)
clearResults();
- kapp->tqprocessEvents(100);
+ kapp->processEvents(100);
Entry *entry = msgstrDict[text];
if(entry)
@@ -427,7 +427,7 @@ void PoAuxiliary::loadAuxiliary()
connect(catalog, TQT_SIGNAL(signalProgress(int))
, this, TQT_SIGNAL(progress(int)));
- ConversiontqStatus stat = catalog->openURL(u);
+ ConversionStatus stat = catalog->openURL(u);
if( stat != OK && stat != RECOVERED_PARSE_ERROR)
{
kdDebug(KBABEL_SEARCH) << "error while opening file " << u.prettyURL() << endl;
@@ -455,7 +455,7 @@ void PoAuxiliary::loadAuxiliary()
if( (100*(i+1))%total < 100 )
{
emit progress((100*(i+1))/total);
- kapp->tqprocessEvents(100);
+ kapp->processEvents(100);
}
Entry *e = new Entry;
diff --git a/kbabel/kbabeldict/modules/poauxiliary/pwidget.ui b/kbabel/kbabeldict/modules/poauxiliary/pwidget.ui
index b91f98e5..27179462 100644
--- a/kbabel/kbabeldict/modules/poauxiliary/pwidget.ui
+++ b/kbabel/kbabeldict/modules/poauxiliary/pwidget.ui
@@ -92,14 +92,14 @@ The following variables will be replaced in the path if available:
<enum>Expanding</enum>
</property>
<property>
- <name>tqsizeHint</name>
+ <name>sizeHint</name>
<size>
<width>20</width>
<height>20</height>
</size>
</property>
<property>
- <name>tqsizeHint</name>
+ <name>sizeHint</name>
<size>
<width>20</width>
<height>20</height>
diff --git a/kbabel/kbabeldict/modules/pocompendium/compendiumdata.cpp b/kbabel/kbabeldict/modules/pocompendium/compendiumdata.cpp
index e6565e54..b90479e1 100644
--- a/kbabel/kbabeldict/modules/pocompendium/compendiumdata.cpp
+++ b/kbabel/kbabeldict/modules/pocompendium/compendiumdata.cpp
@@ -79,7 +79,7 @@ bool CompendiumData::load(KURL url)
emit progressStarts(i18n("Loading PO compendium"));
connect(_catalog, TQT_SIGNAL(signalProgress(int)), this, TQT_SIGNAL(progress(int)));
- ConversiontqStatus stat=_catalog->openURL(url);
+ ConversionStatus stat=_catalog->openURL(url);
disconnect(_catalog, TQT_SIGNAL(signalProgress(int))
, this, TQT_SIGNAL(progress(int)));
@@ -109,7 +109,7 @@ bool CompendiumData::load(KURL url)
if( (100*(i+1))%total < 100 )
{
emit progress((100*(i+1))/total);
- kapp->tqprocessEvents(100);
+ kapp->processEvents(100);
}
// FIXME: shoudl care about plural forms
diff --git a/kbabel/kbabeldict/modules/pocompendium/pocompendium.cpp b/kbabel/kbabeldict/modules/pocompendium/pocompendium.cpp
index 60de6a4f..f5ecf286 100644
--- a/kbabel/kbabeldict/modules/pocompendium/pocompendium.cpp
+++ b/kbabel/kbabeldict/modules/pocompendium/pocompendium.cpp
@@ -369,7 +369,7 @@ bool PoCompendium::searchWords(const TQString& searchStr, uint pluralForm, TQPtr
emit progress( (50*checkCounter+1)/catalogInfo.total);
}
- kapp->tqprocessEvents(100);
+ kapp->processEvents(100);
TQString origStr = data->catalog()->msgid(*it).first();
origStr = CompendiumData::simplify(origStr);
@@ -537,7 +537,7 @@ bool PoCompendium::searchNGram(const TQString& searchStr, uint pluralForm, TQPtr
continue;
}
- kapp->tqprocessEvents(100);
+ kapp->processEvents(100);
TQString origStr = data->catalog()->msgid(i).first();
origStr = CompendiumData::simplify(origStr);
diff --git a/kbabel/kbabeldict/modules/pocompendium/pwidget.ui b/kbabel/kbabeldict/modules/pocompendium/pwidget.ui
index f9558dc3..05bafd89 100644
--- a/kbabel/kbabeldict/modules/pocompendium/pwidget.ui
+++ b/kbabel/kbabeldict/modules/pocompendium/pwidget.ui
@@ -236,14 +236,14 @@
<enum>Expanding</enum>
</property>
<property>
- <name>tqsizeHint</name>
+ <name>sizeHint</name>
<size>
<width>20</width>
<height>20</height>
</size>
</property>
<property>
- <name>tqsizeHint</name>
+ <name>sizeHint</name>
<size>
<width>20</width>
<height>20</height>
diff --git a/kbabel/kbabeldict/modules/tmx/pwidget.ui b/kbabel/kbabeldict/modules/tmx/pwidget.ui
index 9d0d4281..875e744f 100644
--- a/kbabel/kbabeldict/modules/tmx/pwidget.ui
+++ b/kbabel/kbabeldict/modules/tmx/pwidget.ui
@@ -171,7 +171,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/kbabel/kbabeldict/modules/tmx/tmxcompendium.cpp b/kbabel/kbabeldict/modules/tmx/tmxcompendium.cpp
index 9163d7cb..ca28acbe 100644
--- a/kbabel/kbabeldict/modules/tmx/tmxcompendium.cpp
+++ b/kbabel/kbabeldict/modules/tmx/tmxcompendium.cpp
@@ -337,7 +337,7 @@ bool TmxCompendium::startSearch(const TQString& text, uint pluralForm, const Sea
emit progress( (100*(checkCounter+1))/data->numberOfEntries());
}
- kapp->tqprocessEvents(100);
+ kapp->processEvents(100);
TQString origStr = data->msgid(*it);
origStr = TmxCompendiumData::simplify(origStr);
@@ -484,7 +484,7 @@ bool TmxCompendium::startSearch(const TQString& text, uint pluralForm, const Sea
continue;
}
- kapp->tqprocessEvents(100);
+ kapp->processEvents(100);
if(i >= data->numberOfEntries())
{
diff --git a/kbabel/kbabeldict/modules/tmx/tmxcompendiumdata.cpp b/kbabel/kbabeldict/modules/tmx/tmxcompendiumdata.cpp
index 8646806e..3c12be11 100644
--- a/kbabel/kbabeldict/modules/tmx/tmxcompendiumdata.cpp
+++ b/kbabel/kbabeldict/modules/tmx/tmxcompendiumdata.cpp
@@ -146,7 +146,7 @@ bool TmxCompendiumData::load(const KURL& url, const TQString& language)
if( (100*(i+1))%total < 100 )
{
emit progress((100*(i+1))/total);
- kapp->tqprocessEvents(100);
+ kapp->processEvents(100);
}
TQDomNodeList tuvTags = tuTags.item(i).toElement().elementsByTagName("tuv");
diff --git a/kbabel/kbabeldict/searchengine.h b/kbabel/kbabeldict/searchengine.h
index c5b28ad5..cafebd1f 100644
--- a/kbabel/kbabeldict/searchengine.h
+++ b/kbabel/kbabeldict/searchengine.h
@@ -91,7 +91,7 @@ public:
TQString projectContext;
/**
- * tqStatus of the translation, for example "approved", "spellchecked", "unknown"
+ * Status of the translation, for example "approved", "spellchecked", "unknown"
*/
TQString status;
@@ -173,7 +173,7 @@ public:
, _translators()
, _projectKeywords()
, _projectContexts()
- , _translationtqStatus()
+ , _translationStatus()
{}
virtual ~SearchFilter() {}
@@ -213,10 +213,10 @@ public:
void setProjectContext( const TQStringList& projectContexts) { _projectContexts = projectContexts; }
/**
- * tqStatus of the translation, for example "approved", "spellchecked", "unknown"
+ * Status of the translation, for example "approved", "spellchecked", "unknown"
*/
- void settqStatus( const TQString& translationtqStatus) { _translationtqStatus = translationtqStatus; }
- void settqStatus( const TQStringList& translationStati) { _translationtqStatus = translationStati; }
+ void setStatus( const TQString& translationStatus) { _translationStatus = translationStatus; }
+ void setStatus( const TQStringList& translationStati) { _translationStatus = translationStati; }
/**
* The key method of the class - check, if the argument
@@ -232,7 +232,7 @@ private:
TQStringList _translators;
TQStringList _projectKeywords ;
TQStringList _projectContexts;
- TQStringList _translationtqStatus;
+ TQStringList _translationStatus;
};
/**