diff options
| author | Michele Calgaro <michele.calgaro@yahoo.it> | 2023-11-04 22:03:33 +0900 |
|---|---|---|
| committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2023-11-05 11:26:36 +0900 |
| commit | d3cfbab1a822e0ae5d65cd49a2719665076baae5 (patch) | |
| tree | 7c49ea137f1c496f226b4f12c70f18af332ae647 /src/optiondialog.cpp | |
| parent | 5c7ab4d3fbbf174717354d9450b428b5eb64db88 (diff) | |
| download | kdiff3-d3cfbab1a822e0ae5d65cd49a2719665076baae5.tar.gz kdiff3-d3cfbab1a822e0ae5d65cd49a2719665076baae5.zip | |
Replace Qt with TQt
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit 77c18c3fabbb1e81db72c70044f68ddb78d18581)
Diffstat (limited to 'src/optiondialog.cpp')
| -rw-r--r-- | src/optiondialog.cpp | 6 |
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 ); |