From 7be55ffa061c026e35e2d6a0effe1161ddb0d41f Mon Sep 17 00:00:00 2001 From: tpearson Date: Sat, 31 Jul 2010 19:53:50 +0000 Subject: Trinity Qt initial conversion git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1157655 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kpilot/conduits/docconduit/doc-conflictdialog.cc | 72 ++++++++++++------------ 1 file changed, 36 insertions(+), 36 deletions(-) (limited to 'kpilot/conduits/docconduit/doc-conflictdialog.cc') diff --git a/kpilot/conduits/docconduit/doc-conflictdialog.cc b/kpilot/conduits/docconduit/doc-conflictdialog.cc index 7dafd9b66..50ecbbd1e 100644 --- a/kpilot/conduits/docconduit/doc-conflictdialog.cc +++ b/kpilot/conduits/docconduit/doc-conflictdialog.cc @@ -28,54 +28,54 @@ #include "options.h" #include "doc-conflictdialog.moc" -#include -#include -#include -#include +#include +#include +#include +#include #include -#include -#include -#include -#include +#include +#include +#include +#include -ResolutionDialog::ResolutionDialog( QWidget* parent, const QString& caption, syncInfoList*sinfo, KPilotLink*lnk ) +ResolutionDialog::ResolutionDialog( TQWidget* parent, const TQString& caption, syncInfoList*sinfo, KPilotLink*lnk ) : KDialogBase( parent, "resolutionDialog", true, caption, KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok, true), tickleTimer(0L), fHandle(lnk) { FUNCTIONSETUP; syncInfo=sinfo; hasConflicts=false; - QWidget *page = new QWidget( this ); + TQWidget *page = new TQWidget( this ); setMainWidget(page); - QVBoxLayout *topLayout = new QVBoxLayout( page, 0, spacingHint() ); + TQVBoxLayout *topLayout = new TQVBoxLayout( page, 0, spacingHint() ); // First, insert the texts on top: - textLabel1 = new QLabel(i18n("Here is a list of all text files and DOC databases the conduit found. The conduit tried to determine the correct sync direction, but for databases in bold red letters a conflict occurred (i.e. the text was changed both on the desktop and on the handheld). For these databases please specify which version is the current one."), page); - textLabel1->setAlignment( int( QLabel::WordBreak | QLabel::AlignVCenter ) ); + textLabel1 = new TQLabel(i18n("Here is a list of all text files and DOC databases the conduit found. The conduit tried to determine the correct sync direction, but for databases in bold red letters a conflict occurred (i.e. the text was changed both on the desktop and on the handheld). For these databases please specify which version is the current one."), page); + textLabel1->setAlignment( int( TQLabel::WordBreak | TQLabel::AlignVCenter ) ); topLayout->addWidget(textLabel1); - textLabel2 = new QLabel(i18n("You can also change the sync direction for databases without a conflict." ), page ); - textLabel2->setAlignment( int( QLabel::WordBreak | QLabel::AlignVCenter ) ); + textLabel2 = new TQLabel(i18n("You can also change the sync direction for databases without a conflict." ), page ); + textLabel2->setAlignment( int( TQLabel::WordBreak | TQLabel::AlignVCenter ) ); topLayout->addWidget(textLabel2); - resolutionGroupBox = new QGroupBox(i18n("DOC Databases"), page ); - QVBoxLayout*playout = new QVBoxLayout(resolutionGroupBox); - QScrollView* sv = new QScrollView(resolutionGroupBox); + resolutionGroupBox = new TQGroupBox(i18n("DOC Databases"), page ); + TQVBoxLayout*playout = new TQVBoxLayout(resolutionGroupBox); + TQScrollView* sv = new TQScrollView(resolutionGroupBox); playout->addWidget(sv); - sv->setResizePolicy(QScrollView::AutoOneFit); - sv->setHScrollBarMode(QScrollView::AlwaysOff); + sv->setResizePolicy(TQScrollView::AutoOneFit); + sv->setHScrollBarMode(TQScrollView::AlwaysOff); sv->setMargin(5); - QFrame* big_box = new QFrame(sv->viewport()); + TQFrame* big_box = new TQFrame(sv->viewport()); sv->addChild(big_box); - resolutionGroupBoxLayout = new QGridLayout( big_box, syncInfo->size(), 3 ); + resolutionGroupBoxLayout = new TQGridLayout( big_box, syncInfo->size(), 3 ); resolutionGroupBoxLayout->setAlignment( Qt::AlignTop ); // Invisible button group for the information buttons to use the same slot for all of them (see Dallheimer's book, page 309f) - QButtonGroup *bgroup = new QButtonGroup( this ); + TQButtonGroup *bgroup = new TQButtonGroup( this ); bgroup->hide(); - QObject::connect(bgroup, SIGNAL(clicked(int)), this, SLOT(slotInfo(int))); + TQObject::connect(bgroup, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(slotInfo(int))); if (syncInfo) { DEBUGKPILOT<<"Adding resolution options for the databases "<")+text+CSL1(""); DEBUGKPILOT<<"We have a conflict for database "<addWidget( cE.dbname, cE.index, 0 ); - cE.resolution=new QComboBox( FALSE, big_box); - cE.resolution->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, - (QSizePolicy::SizeType)0, 0, 0, + cE.resolution=new TQComboBox( FALSE, big_box); + cE.resolution->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, + (TQSizePolicy::SizeType)0, 0, 0, cE.resolution->sizePolicy().hasHeightForWidth() ) ); cE.resolution->clear(); cE.resolution->insertItem( i18n( "No Sync" ) ); @@ -110,7 +110,7 @@ ResolutionDialog::ResolutionDialog( QWidget* parent, const QString& caption, syn cE.resolution->setCurrentItem((int)si.direction); resolutionGroupBoxLayout->addWidget( cE.resolution, cE.index, 1); - cE.info = new QPushButton( i18n("More Info..."), big_box ); + cE.info = new TQPushButton( i18n("More Info..."), big_box ); resolutionGroupBoxLayout->addWidget(cE.info, cE.index, 2); bgroup->insert(cE.info); @@ -123,11 +123,11 @@ ResolutionDialog::ResolutionDialog( QWidget* parent, const QString& caption, syn topLayout->addWidget( resolutionGroupBox ); - resize( QSize(600, 480).expandedTo(minimumSizeHint()) ); + resize( TQSize(600, 480).expandedTo(minimumSizeHint()) ); - if (fHandle) tickleTimer=new QTimer(this, "TickleTimer"); + if (fHandle) tickleTimer=new TQTimer(this, "TickleTimer"); if (tickleTimer) { - connect( tickleTimer, SIGNAL(timeout()), this, SLOT(_tickle()) ); + connect( tickleTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(_tickle()) ); tickleTimer->start( 10000 ); // tickle the palm every 10 seconds to prevent a timeout until the sync is really finished. } @@ -143,14 +143,14 @@ ResolutionDialog::~ResolutionDialog() /* virtual slot */ void ResolutionDialog::slotOk() { FUNCTIONSETUP; - QValueList::Iterator ceIt; + TQValueList::Iterator ceIt; for (ceIt=conflictEntries.begin(); ceIt!=conflictEntries.end(); ++ceIt) { (*syncInfo)[(*ceIt).index].direction=(eSyncDirectionEnum)((*ceIt).resolution->currentItem()); } KDialogBase::slotOk(); } -QString eTextStatusToString(eTextStatus stat) { +TQString eTextStatusToString(eTextStatus stat) { switch(stat) { case eStatNone: return i18n("unchanged"); case eStatNew: return i18n("new"); @@ -168,7 +168,7 @@ void ResolutionDialog::slotInfo(int index) { int ix=cE.index; if (!syncInfo) return; docSyncInfo si=(*syncInfo)[ix]; - QString text=i18n("Status of the database %1:\n\n").arg(si.handheldDB); + TQString text=i18n("Status of the database %1:\n\n").arg(si.handheldDB); text+=i18n("Handheld: %1\n").arg(eTextStatusToString(si.fPalmStatus)); text+=i18n("Desktop: %1\n").arg(eTextStatusToString(si.fPCStatus)); -- cgit v1.2.1