summaryrefslogtreecommitdiffstats
path: root/kbabel/catalogmanager
diff options
context:
space:
mode:
Diffstat (limited to 'kbabel/catalogmanager')
-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
12 files changed, 63 insertions, 63 deletions
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>
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-10 20:19:40 +0000