summaryrefslogtreecommitdiffstats
path: root/src/optiondialog.cpp
diff options
context:
space:
mode:
authorMichele Calgaro <michele.calgaro@yahoo.it>2023-11-04 22:03:33 +0900
committerMichele Calgaro <michele.calgaro@yahoo.it>2023-11-04 22:03:33 +0900
commit77c18c3fabbb1e81db72c70044f68ddb78d18581 (patch)
tree74da1d18fa0f89de6b010a2c7d8126d7e2782456 /src/optiondialog.cpp
parent02927b1c01c2894f8c8f5268551505017d1385f7 (diff)
downloadkdiff3-77c18c3fabbb1e81db72c70044f68ddb78d18581.tar.gz
kdiff3-77c18c3fabbb1e81db72c70044f68ddb78d18581.zip
Replace Qt with TQt
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
Diffstat (limited to 'src/optiondialog.cpp')
-rw-r--r--src/optiondialog.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/optiondialog.cpp b/src/optiondialog.cpp
index 324edbe..42a589e 100644
--- a/src/optiondialog.cpp
+++ b/src/optiondialog.cpp
@@ -847,7 +847,7 @@ void OptionDialog::setupMergePage( void )
);
++line;
- TQGroupBox* pGroupBox = new TQGroupBox( 2, Qt::Horizontal, i18n("Automatic Merge Regular Expression"), page);
+ TQGroupBox* pGroupBox = new TQGroupBox( 2, TQt::Horizontal, i18n("Automatic Merge Regular Expression"), page);
gbox->addMultiCellWidget( pGroupBox, line,line,0,1);
++line;
{
@@ -873,7 +873,7 @@ void OptionDialog::setupMergePage( void )
++line;
}
- pGroupBox = new TQGroupBox( 2, Qt::Horizontal, i18n("Version Control History Merging"), page);
+ pGroupBox = new TQGroupBox( 2, TQt::Horizontal, i18n("Version Control History Merging"), page);
gbox->addMultiCellWidget( pGroupBox, line,line,0,1);
++line;
{
@@ -922,7 +922,7 @@ void OptionDialog::setupMergePage( void )
//int year = newHistoryEntry.cap(4).toInt();
//TQString time = newHistoryEntry.cap(5);
//TQString name = newHistoryEntry.cap(6);
- TQString defaultSortKeyOrder = "4,3,2,5,1,6"; //TQDate(year,month,day).toString(Qt::ISODate) +" "+ time + " " + branch + " " + name;
+ TQString defaultSortKeyOrder = "4,3,2,5,1,6"; //TQDate(year,month,day).toString(TQt::ISODate) +" "+ time + " " + branch + " " + name;
label = new TQLabel( i18n("History entry start sort key order:"), page );
gbox->addWidget( label, line, 0 );