summaryrefslogtreecommitdiffstats
path: root/kbabel/catalogmanager/libsvn
diff options
context:
space:
mode:
Diffstat (limited to 'kbabel/catalogmanager/libsvn')
-rw-r--r--kbabel/catalogmanager/libsvn/svndialog.cpp36
-rw-r--r--kbabel/catalogmanager/libsvn/svnhandler.cpp26
-rw-r--r--kbabel/catalogmanager/libsvn/svnhandler.h10
3 files changed, 36 insertions, 36 deletions
diff --git a/kbabel/catalogmanager/libsvn/svndialog.cpp b/kbabel/catalogmanager/libsvn/svndialog.cpp
index 075a8235..756ace69 100644
--- a/kbabel/catalogmanager/libsvn/svndialog.cpp
+++ b/kbabel/catalogmanager/libsvn/svndialog.cpp
@@ -38,12 +38,12 @@
#include <tqfileinfo.h>
#include <tqframe.h>
#include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqlistbox.h>
#include <tqpushbutton.h>
#include <tqstring.h>
#include <tqstringlist.h>
-#include <textedit.h>
+#include <tqtextedit.h>
// KDE include files
#include <kconfig.h>
#include <kdebug.h>
@@ -66,7 +66,7 @@ SVNDialog::SVNDialog( SVN::Command cmd, TQWidget * parent, KSharedConfig* config
TQString temp;
- TQVBoxLayout * layout = new TQVBoxLayout( this, 6, 6, "MAIN LAYOUT" );
+ TQVBoxLayout * tqlayout = new TQVBoxLayout( this, 6, 6, "MAIN LAYOUT" );
// Set the label's text depending on the SVN command.
switch ( cmd ) {
@@ -89,11 +89,11 @@ SVNDialog::SVNDialog( SVN::Command cmd, TQWidget * parent, KSharedConfig* config
temp = i18n( "Get information for the following files:" );
break;
}
- layout->addWidget( new TQLabel( temp, this ) );
+ tqlayout->addWidget( new TQLabel( temp, this ) );
// Widget for showing the list of files.
filebox = new TQListBox( this );
- layout->addWidget( filebox );
+ tqlayout->addWidget( filebox );
// Add special widgets for 'svn commit'.
if ( cmd == SVN::Commit ) {
@@ -104,15 +104,15 @@ SVNDialog::SVNDialog( SVN::Command cmd, TQWidget * parent, KSharedConfig* config
oldMessages = new TQComboBox( this );
oldMessages->setDuplicatesEnabled( false );
label->setBuddy( oldMessages );
- layout->addWidget( label );
- layout->addWidget( oldMessages );
+ tqlayout->addWidget( label );
+ tqlayout->addWidget( oldMessages );
// Textfield for entering a log message.
label = new TQLabel( i18n( "&Log message:" ), this );
logedit = new TQTextEdit( this );
label->setBuddy( logedit );
- layout->addWidget( label );
- layout->addWidget( logedit );
+ tqlayout->addWidget( label );
+ tqlayout->addWidget( logedit );
connect( oldMessages, TQT_SIGNAL( activated( int ) ),
this, TQT_SLOT( slotComboActivated( int ) ) );
@@ -151,19 +151,19 @@ SVNDialog::SVNDialog( SVN::Command cmd, TQWidget * parent, KSharedConfig* config
cancelBtn = new TQPushButton( i18n( "C&ancel" ), this );
buttons->addWidget( cancelBtn );
- layout->addLayout( buttons );
+ tqlayout->addLayout( buttons );
TQFrame * line = new TQFrame( this );
line->setFrameStyle( TQFrame::HLine | TQFrame::Sunken );
- layout->addWidget( line );
+ tqlayout->addWidget( line );
- layout->addWidget( new TQLabel( i18n( "Command output:" ), this ) );
+ tqlayout->addWidget( new TQLabel( i18n( "Command output:" ), this ) );
output = new TQTextEdit( this );
output->setReadOnly( true );
- layout->addWidget( output );
+ tqlayout->addWidget( output );
- resize( TQSize( 600, 450 ).expandedTo( minimumSizeHint( ) ) );
+ resize( TQSize( 600, 450 ).expandedTo( tqminimumSizeHint( ) ) );
if ( cmd == SVN::Commit )
logedit->setFocus( );
@@ -327,7 +327,7 @@ void SVNDialog::slotProcessStderr( KProcess*, char * buffer, int len )
void SVNDialog::slotProcessExited( KProcess * p )
{
if ( p->exitStatus( ) )
- output->append( i18n( "[ Exited with status %1 ]" ).arg( p->exitStatus( ) ) );
+ output->append( i18n( "[ Exited with status %1 ]" ).tqarg( p->exitStatus( ) ) );
else
output->append( i18n( "[ Finished ]" ) );
@@ -362,9 +362,9 @@ void SVNDialog::readSettings( )
m_logMessages.clear();
m_squeezedLogMessages.clear();
for ( int cnt = 0; cnt < 10; cnt++ )
- if ( config->hasKey( TQString( "CommitLogMessage%1" ).arg( cnt ) ) )
+ if ( config->hasKey( TQString( "CommitLogMessage%1" ).tqarg( cnt ) ) )
{
- const TQString logMessage = config->readEntry( TQString( "CommitLogMessage%1" ).arg( cnt ) );
+ const TQString logMessage = config->readEntry( TQString( "CommitLogMessage%1" ).tqarg( cnt ) );
if ( !logMessage.isEmpty() )
{
// If the message is too long, cut it to 80 characters (or the combo box becomes too wide)
@@ -390,7 +390,7 @@ void SVNDialog::saveSettings( )
int cnt = 0;
TQStringList::const_iterator it;
for ( it = m_logMessages.constBegin( ); it != m_logMessages.constEnd( ) && cnt < 10 ; ++it, ++cnt )
- config->writeEntry( TQString( "CommitLogMessage%1" ).arg( cnt ), *it );
+ config->writeEntry( TQString( "CommitLogMessage%1" ).tqarg( cnt ), *it );
}
m_config->sync();
}
diff --git a/kbabel/catalogmanager/libsvn/svnhandler.cpp b/kbabel/catalogmanager/libsvn/svnhandler.cpp
index d00c0858..5f91e1e8 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::fileStatus( const FileStatus status ) const
+TQString SVNHandler::filetqStatus( const FiletqStatus status ) const
{
switch ( status ) {
case NO_REPOSITORY:
@@ -115,7 +115,7 @@ TQString SVNHandler::fileStatus( const FileStatus status ) const
}
}
-SVNHandler::FileStatus SVNHandler::fstatus( const TQString& filename ) const
+SVNHandler::FiletqStatus SVNHandler::fstatus( const TQString& filename ) const
{
// no valid repository
if ( !_isPORepository )
@@ -145,7 +145,7 @@ SVNHandler::FileStatus SVNHandler::fstatus( const TQString& filename ) const
int errorLine, errorCol;
TQDomNodeList nodelist;
TQDomNode node;
- TQDomElement entry, wcStatus;
+ TQDomElement entry, wctqStatus;
// Parse the output.
if ( !doc.setContent( out.getOutput(), &errorMsg, &errorLine, &errorCol ) ) {
@@ -177,22 +177,22 @@ SVNHandler::FileStatus SVNHandler::fstatus( const TQString& filename ) const
if ( node.isNull() )
return ERROR_IN_WC;
- wcStatus = node.toElement();
+ wctqStatus = node.toElement();
- if ( wcStatus.attributeNode("item").value() == "normal" )
+ if ( wctqStatus.attributeNode("item").value() == "normal" )
return UP_TO_DATE;
- if ( wcStatus.attributeNode("item").value() == "modified" )
+ if ( wctqStatus.attributeNode("item").value() == "modified" )
return LOCALLY_MODIFIED;
- if ( wcStatus.attributeNode("item").value() == "conflicted" )
+ if ( wctqStatus.attributeNode("item").value() == "conflicted" )
return CONFLICT;
- if ( wcStatus.attributeNode("item").value() == "unversioned" )
+ if ( wctqStatus.attributeNode("item").value() == "unversioned" )
return NOT_IN_SVN;
// TODO Ignored entry should have separate return value probably.
- if ( wcStatus.attributeNode("item").value() == "ignored" )
+ if ( wctqStatus.attributeNode("item").value() == "ignored" )
return NOT_IN_SVN;
- if ( wcStatus.attributeNode("item").value() == "added" )
+ if ( wctqStatus.attributeNode("item").value() == "added" )
return LOCALLY_ADDED;
- if ( wcStatus.attributeNode("item").value() == "deleted" )
+ if ( wctqStatus.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::svnStatus( const TQString& filename ) const
+TQString SVNHandler::svntqStatus( const TQString& filename ) const
{
return map[filename];
}
@@ -491,7 +491,7 @@ void SVNHandler::processDiff( TQString output )
KMessageBox::error( 0, error );
}
-bool SVNHandler::isConsideredModified( const FileStatus status ) const
+bool SVNHandler::isConsideredModified( const FiletqStatus 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 2506d0bd..57ce13b4 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 FileStatus {
+ enum FiletqStatus {
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 );
- FileStatus fstatus( const TQString& filename ) const;
- TQString fileStatus( const FileStatus status ) const;
- TQString svnStatus( const TQString& filename ) const;
+ FiletqStatus fstatus( const TQString& filename ) const;
+ TQString filetqStatus( const FiletqStatus status ) const;
+ TQString svntqStatus( 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 FileStatus status ) const;
+ bool isConsideredModified( const FiletqStatus status ) const;
signals:
void signalIsPORepository( bool );
generated by cgit v1.2.1 (git 2.18.0) at 2024-07-08 06:44:56 +0000