diff options
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 ); |