summaryrefslogtreecommitdiffstats
path: root/cervisia
diff options
context:
space:
mode:
Diffstat (limited to 'cervisia')
-rw-r--r--cervisia/addremovedlg.cpp12
-rw-r--r--cervisia/addrepositorydlg.cpp18
-rw-r--r--cervisia/checkoutdlg.cpp4
-rw-r--r--cervisia/commitdlg.cpp16
-rw-r--r--cervisia/diffdlg.cpp44
-rw-r--r--cervisia/diffview.cpp4
-rw-r--r--cervisia/historydlg.cpp6
-rw-r--r--cervisia/logdlg.cpp6
-rw-r--r--cervisia/logmessageedit.cpp2
-rw-r--r--cervisia/mergedlg.cpp12
-rw-r--r--cervisia/misc.cpp2
-rw-r--r--cervisia/repositorydlg.cpp2
-rw-r--r--cervisia/resolvedlg.cpp38
-rw-r--r--cervisia/settingsdlg.cpp12
-rw-r--r--cervisia/stringmatcher.cpp2
-rw-r--r--cervisia/tagdlg.cpp10
-rw-r--r--cervisia/tooltip.cpp8
-rw-r--r--cervisia/updatedlg.cpp16
-rw-r--r--cervisia/watchdlg.cpp22
-rw-r--r--cervisia/watchersdlg.cpp4
20 files changed, 120 insertions, 120 deletions
diff --git a/cervisia/addremovedlg.cpp b/cervisia/addremovedlg.cpp
index 73c41d12..c55e34ac 100644
--- a/cervisia/addremovedlg.cpp
+++ b/cervisia/addremovedlg.cpp
@@ -40,18 +40,18 @@ AddRemoveDialog::AddRemoveDialog(ActionType action, TQWidget* parent, const char
TQFrame* mainWidget = makeMainWidget();
- TQBoxLayout *tqlayout = new TQVBoxLayout(mainWidget, 0, spacingHint());
+ TQBoxLayout *layout = new TQVBoxLayout(mainWidget, 0, spacingHint());
TQLabel *textlabel = new TQLabel
( (action==Add)? i18n("Add the following files to the repository:") :
(action==AddBinary)? i18n("Add the following binary files to the repository:") :
i18n("Remove the following files from the repository:") ,
mainWidget );
- tqlayout->addWidget(textlabel);
+ layout->addWidget(textlabel);
m_listBox = new TQListBox(mainWidget);
m_listBox->setSelectionMode(TQListBox::NoSelection);
- tqlayout->addWidget(m_listBox, 5);
+ layout->addWidget(m_listBox, 5);
// Add warning message to dialog when user wants to remove a file
if (action==Remove)
@@ -69,9 +69,9 @@ AddRemoveDialog::AddRemoveDialog(ActionType action, TQWidget* parent, const char
"your local working copy."), mainWidget);
warningLayout->addWidget(warningText);
- tqlayout->addSpacing(5);
- tqlayout->addLayout(warningLayout);
- tqlayout->addSpacing(5);
+ layout->addSpacing(5);
+ layout->addLayout(warningLayout);
+ layout->addSpacing(5);
}
if( action == Remove )
diff --git a/cervisia/addrepositorydlg.cpp b/cervisia/addrepositorydlg.cpp
index e451fca0..c370b02a 100644
--- a/cervisia/addrepositorydlg.cpp
+++ b/cervisia/addrepositorydlg.cpp
@@ -40,10 +40,10 @@ AddRepositoryDialog::AddRepositoryDialog(KConfig& cfg, const TQString& repo,
{
TQFrame* mainWidget = makeMainWidget();
- TQBoxLayout* tqlayout = new TQVBoxLayout(mainWidget, 0, spacingHint());
+ TQBoxLayout* layout = new TQVBoxLayout(mainWidget, 0, spacingHint());
TQLabel* repo_label = new TQLabel(i18n("&Repository:"), mainWidget);
- tqlayout->addWidget(repo_label);
+ layout->addWidget(repo_label);
repo_edit = new KLineEdit(mainWidget);
repo_edit->setFocus();
@@ -53,33 +53,33 @@ AddRepositoryDialog::AddRepositoryDialog(KConfig& cfg, const TQString& repo,
repo_edit->setText(repo);
repo_edit->setEnabled(false);
}
- tqlayout->addWidget(repo_edit);
+ layout->addWidget(repo_edit);
TQLabel* rsh_label = new TQLabel(i18n("Use remote &shell (only for :ext: repositories):"), mainWidget);
- tqlayout->addWidget(rsh_label);
+ layout->addWidget(rsh_label);
rsh_edit = new KLineEdit(mainWidget);
rsh_label->setBuddy(rsh_edit);
- tqlayout->addWidget(rsh_edit);
+ layout->addWidget(rsh_edit);
TQLabel* server_label = new TQLabel(i18n("Invoke this program on the server side:"),
mainWidget);
- tqlayout->addWidget(server_label);
+ layout->addWidget(server_label);
server_edit = new KLineEdit(mainWidget);
server_label->setBuddy(server_edit);
- tqlayout->addWidget(server_edit);
+ layout->addWidget(server_edit);
TQHBox* compressionBox = new TQHBox(mainWidget);
m_useDifferentCompression = new TQCheckBox(i18n("Use different &compression level:"), compressionBox);
m_compressionLevel = new KIntNumInput(compressionBox);
m_compressionLevel->setRange(0, 9, 1, false);
- tqlayout->addWidget(compressionBox);
+ layout->addWidget(compressionBox);
m_retrieveCvsignoreFile = new TQCheckBox(i18n("Download cvsignore file from "
"server"), mainWidget);
- tqlayout->addWidget(m_retrieveCvsignoreFile);
+ layout->addWidget(m_retrieveCvsignoreFile);
connect( repo_edit, TQT_SIGNAL(textChanged(const TQString&)),
this, TQT_SLOT(repoChanged()) );
diff --git a/cervisia/checkoutdlg.cpp b/cervisia/checkoutdlg.cpp
index faafa37c..16a57098 100644
--- a/cervisia/checkoutdlg.cpp
+++ b/cervisia/checkoutdlg.cpp
@@ -55,9 +55,9 @@ CheckoutDialog::CheckoutDialog(KConfig& cfg, CvsService_stub* service,
TQFrame* mainWidget = makeMainWidget();
- TQBoxLayout* tqlayout = new TQVBoxLayout(mainWidget, 0, spacingHint());
+ TQBoxLayout* layout = new TQVBoxLayout(mainWidget, 0, spacingHint());
- TQGridLayout* grid = new TQGridLayout(tqlayout);
+ TQGridLayout* grid = new TQGridLayout(layout);
grid->setColStretch(0, 1);
grid->setColStretch(1, 20);
for( int i = 0; i < ((action==Checkout)? 4 : 10); ++i )
diff --git a/cervisia/commitdlg.cpp b/cervisia/commitdlg.cpp
index 5f45ce16..976d93bd 100644
--- a/cervisia/commitdlg.cpp
+++ b/cervisia/commitdlg.cpp
@@ -61,10 +61,10 @@ CommitDialog::CommitDialog(KConfig& cfg, CvsService_stub* service,
{
TQFrame* mainWidget = makeMainWidget();
- TQBoxLayout *tqlayout = new TQVBoxLayout(mainWidget, 0, spacingHint());
+ TQBoxLayout *layout = new TQVBoxLayout(mainWidget, 0, spacingHint());
TQLabel *textlabel = new TQLabel( i18n("Commit the following &files:"), mainWidget );
- tqlayout->addWidget(textlabel);
+ layout->addWidget(textlabel);
m_fileList = new KListView(mainWidget);
m_fileList->addColumn("");
@@ -75,30 +75,30 @@ CommitDialog::CommitDialog(KConfig& cfg, CvsService_stub* service,
this, TQT_SLOT(fileSelected(TQListViewItem*)));
connect( m_fileList, TQT_SIGNAL(selectionChanged()),
this, TQT_SLOT(fileHighlighted()) );
- tqlayout->addWidget(m_fileList, 5);
+ layout->addWidget(m_fileList, 5);
TQLabel *archivelabel = new TQLabel(i18n("Older &messages:"), mainWidget);
- tqlayout->addWidget(archivelabel);
+ layout->addWidget(archivelabel);
combo = new TQComboBox(mainWidget);
archivelabel->setBuddy(combo);
connect( combo, TQT_SIGNAL(activated(int)), this, TQT_SLOT(comboActivated(int)) );
// make sure that combobox is smaller than the screen
combo->setSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed));
- tqlayout->addWidget(combo);
+ layout->addWidget(combo);
TQLabel *messagelabel = new TQLabel(i18n("&Log message:"), mainWidget);
- tqlayout->addWidget(messagelabel);
+ layout->addWidget(messagelabel);
edit = new Cervisia::LogMessageEdit(mainWidget);
messagelabel->setBuddy(edit);
edit->setCheckSpellingEnabled(true);
edit->setFocus();
edit->setMinimumSize(400, 100);
- tqlayout->addWidget(edit, 10);
+ layout->addWidget(edit, 10);
m_useTemplateChk = new TQCheckBox(i18n("Use log message &template"), mainWidget);
- tqlayout->addWidget(m_useTemplateChk);
+ layout->addWidget(m_useTemplateChk);
connect( m_useTemplateChk, TQT_SIGNAL(clicked()), this, TQT_SLOT(useTemplateClicked()) );
checkForTemplateFile();
diff --git a/cervisia/diffdlg.cpp b/cervisia/diffdlg.cpp
index 1bbcd711..720d3706 100644
--- a/cervisia/diffdlg.cpp
+++ b/cervisia/diffdlg.cpp
@@ -51,30 +51,30 @@ DiffDialog::DiffDialog(KConfig& cfg, TQWidget *parent, const char *name, bool mo
TQFrame* mainWidget = makeMainWidget();
- TQBoxLayout *tqlayout = new TQVBoxLayout(mainWidget, 0, spacingHint());
+ TQBoxLayout *layout = new TQVBoxLayout(mainWidget, 0, spacingHint());
- TQGridLayout *pairtqlayout = new TQGridLayout(tqlayout);
- pairtqlayout->setRowStretch(0, 0);
- pairtqlayout->setRowStretch(1, 1);
- pairtqlayout->setColStretch(1, 0);
- pairtqlayout->addColSpacing(1, 16);
- pairtqlayout->setColStretch(0, 10);
- pairtqlayout->setColStretch(2, 10);
+ TQGridLayout *pairlayout = new TQGridLayout(layout);
+ pairlayout->setRowStretch(0, 0);
+ pairlayout->setRowStretch(1, 1);
+ pairlayout->setColStretch(1, 0);
+ pairlayout->addColSpacing(1, 16);
+ pairlayout->setColStretch(0, 10);
+ pairlayout->setColStretch(2, 10);
revlabel1 = new TQLabel(mainWidget);
- pairtqlayout->addWidget(revlabel1, 0, 0);
+ pairlayout->addWidget(revlabel1, 0, 0);
revlabel2 = new TQLabel(mainWidget);
- pairtqlayout->addWidget(revlabel2, 0, 2);
+ pairlayout->addWidget(revlabel2, 0, 2);
diff1 = new DiffView(cfg, true, false, mainWidget);
diff2 = new DiffView(cfg, true, true, mainWidget);
DiffZoomWidget *zoom = new DiffZoomWidget(cfg, mainWidget);
zoom->setDiffView(diff2);
- pairtqlayout->addWidget(diff1, 1, 0);
- pairtqlayout->addWidget(zoom, 1, 1);
- pairtqlayout->addWidget(diff2, 1, 2);
+ pairlayout->addWidget(diff1, 1, 0);
+ pairlayout->addWidget(zoom, 1, 1);
+ pairlayout->addWidget(diff2, 1, 2);
diff1->setPartner(diff2);
diff2->setPartner(diff1);
@@ -101,15 +101,15 @@ DiffDialog::DiffDialog(KConfig& cfg, TQWidget *parent, const char *name, bool mo
connect( this, TQT_SIGNAL(user1Clicked()), TQT_SLOT(saveAsClicked()) );
- TQBoxLayout *buttontqlayout = new TQHBoxLayout(tqlayout);
- buttontqlayout->addWidget(syncbox, 0);
- buttontqlayout->addStretch(4);
- buttontqlayout->addWidget(itemscombo);
- buttontqlayout->addStretch(1);
- buttontqlayout->addWidget(nofnlabel);
- buttontqlayout->addStretch(1);
- buttontqlayout->addWidget(backbutton);
- buttontqlayout->addWidget(forwbutton);
+ TQBoxLayout *buttonlayout = new TQHBoxLayout(layout);
+ buttonlayout->addWidget(syncbox, 0);
+ buttonlayout->addStretch(4);
+ buttonlayout->addWidget(itemscombo);
+ buttonlayout->addStretch(1);
+ buttonlayout->addWidget(nofnlabel);
+ buttonlayout->addStretch(1);
+ buttonlayout->addWidget(backbutton);
+ buttonlayout->addWidget(forwbutton);
setHelp("diff");
diff --git a/cervisia/diffview.cpp b/cervisia/diffview.cpp
index eacd7847..4d973372 100644
--- a/cervisia/diffview.cpp
+++ b/cervisia/diffview.cpp
@@ -417,7 +417,7 @@ void DiffZoomWidget::setDiffView(DiffView *view)
TQSize DiffZoomWidget::sizeHint() const
{
- return TQSize(25, tqstyle().pixelMetric(TQStyle::PM_ScrollBarExtent, this));
+ return TQSize(25, style().pixelMetric(TQStyle::PM_ScrollBarExtent, this));
}
@@ -440,7 +440,7 @@ void DiffZoomWidget::paintEvent(TQPaintEvent *)
// only y and height are important
const TQRect scrollBarGroove(scrollBar->isVisible()
- ? tqstyle().querySubControlMetrics(TQStyle::CC_ScrollBar,
+ ? style().querySubControlMetrics(TQStyle::CC_ScrollBar,
scrollBar,
TQStyle::SC_ScrollBarGroove)
: rect());
diff --git a/cervisia/historydlg.cpp b/cervisia/historydlg.cpp
index 9e226e34..4beb15c0 100644
--- a/cervisia/historydlg.cpp
+++ b/cervisia/historydlg.cpp
@@ -145,7 +145,7 @@ HistoryDialog::HistoryDialog(KConfig& cfg, TQWidget *parent, const char *name)
{
TQFrame* mainWidget = makeMainWidget();
- TQBoxLayout *tqlayout = new TQVBoxLayout(mainWidget, 0, spacingHint());
+ TQBoxLayout *layout = new TQVBoxLayout(mainWidget, 0, spacingHint());
listview = new KListView(mainWidget);
listview->setSelectionMode(TQListView::NoSelection);
@@ -159,7 +159,7 @@ HistoryDialog::HistoryDialog(KConfig& cfg, TQWidget *parent, const char *name)
listview->addColumn(i18n("File"));
listview->addColumn(i18n("Repo Path"));
listview->setFocus();
- tqlayout->addWidget(listview, 1);
+ layout->addWidget(listview, 1);
commit_box = new TQCheckBox(i18n("Show c&ommit events"), mainWidget);
commit_box->setChecked(true);
@@ -215,7 +215,7 @@ HistoryDialog::HistoryDialog(KConfig& cfg, TQWidget *parent, const char *name)
connect( dirname_edit, TQT_SIGNAL(returnPressed()),
this, TQT_SLOT(choiceChanged()) );
- TQGridLayout *grid = new TQGridLayout(tqlayout);
+ TQGridLayout *grid = new TQGridLayout(layout);
grid->setColStretch(0, 1);
grid->setColStretch(1, 0);
grid->setColStretch(2, 4);
diff --git a/cervisia/logdlg.cpp b/cervisia/logdlg.cpp
index 24d244a6..1c09509a 100644
--- a/cervisia/logdlg.cpp
+++ b/cervisia/logdlg.cpp
@@ -110,7 +110,7 @@ LogDialog::LogDialog(KConfig& cfg, TQWidget *parent, const char *name)
tags.setAutoDelete(true);
TQWidget *mainWidget = new TQWidget(splitter);
- TQBoxLayout *tqlayout = new TQVBoxLayout(mainWidget, 0, spacingHint());
+ TQBoxLayout *layout = new TQVBoxLayout(mainWidget, 0, spacingHint());
for (int i = 0; i < 2; ++i)
{
@@ -118,10 +118,10 @@ LogDialog::LogDialog(KConfig& cfg, TQWidget *parent, const char *name)
{
TQFrame *frame = new TQFrame(mainWidget);
frame->setFrameStyle(TQFrame::HLine | TQFrame::Sunken);
- tqlayout->addWidget(frame);
+ layout->addWidget(frame);
}
- TQGridLayout *grid = new TQGridLayout(tqlayout);
+ TQGridLayout *grid = new TQGridLayout(layout);
grid->setRowStretch(0, 0);
grid->setRowStretch(1, 0);
grid->setRowStretch(2, 1);
diff --git a/cervisia/logmessageedit.cpp b/cervisia/logmessageedit.cpp
index 90b0d405..fb41e57b 100644
--- a/cervisia/logmessageedit.cpp
+++ b/cervisia/logmessageedit.cpp
@@ -76,7 +76,7 @@ void LogMessageEdit::keyPressEvent(TQKeyEvent* event)
if( noModifier )
{
TQString keycode = event->text();
- if( !keycode.isEmpty() && keycode.tqunicode()->isPrint() )
+ if( !keycode.isEmpty() && keycode.unicode()->isPrint() )
{
KTextEdit::keyPressEvent(event);
tryCompletion();
diff --git a/cervisia/mergedlg.cpp b/cervisia/mergedlg.cpp
index b91ca889..e2b770c6 100644
--- a/cervisia/mergedlg.cpp
+++ b/cervisia/mergedlg.cpp
@@ -40,15 +40,15 @@ MergeDialog::MergeDialog(CvsService_stub* service,
cvsService(service)
{
int const iComboBoxMinWidth(30 * fontMetrics().width('0'));
- int const iWidgetIndent(tqstyle().pixelMetric(TQStyle::PM_ExclusiveIndicatorWidth, 0) + 6);
+ int const iWidgetIndent(style().pixelMetric(TQStyle::PM_ExclusiveIndicatorWidth, 0) + 6);
TQFrame* mainWidget = makeMainWidget();
- TQBoxLayout *tqlayout = new TQVBoxLayout(mainWidget, 0, spacingHint());
+ TQBoxLayout *layout = new TQVBoxLayout(mainWidget, 0, spacingHint());
bybranch_button = new TQRadioButton(i18n("Merge from &branch:"), mainWidget);
bybranch_button->setChecked(true);
- tqlayout->addWidget(bybranch_button);
+ layout->addWidget(bybranch_button);
branch_combo = new TQComboBox(true, mainWidget);
branch_combo->setMinimumWidth(iComboBoxMinWidth);
@@ -57,13 +57,13 @@ MergeDialog::MergeDialog(CvsService_stub* service,
connect( branch_button, TQT_SIGNAL(clicked()),
this, TQT_SLOT(branchButtonClicked()) );
- TQBoxLayout *branchedit_layout = new TQHBoxLayout(tqlayout);
+ TQBoxLayout *branchedit_layout = new TQHBoxLayout(layout);
branchedit_layout->addSpacing(iWidgetIndent);
branchedit_layout->addWidget(branch_combo, 2);
branchedit_layout->addWidget(branch_button, 0);
bytags_button = new TQRadioButton(i18n("Merge &modifications:"), mainWidget);
- tqlayout->addWidget(bytags_button);
+ layout->addWidget(bytags_button);
TQLabel *tag1_label = new TQLabel(i18n("between tag: "), mainWidget);
tag1_combo = new TQComboBox(true, mainWidget);
@@ -77,7 +77,7 @@ MergeDialog::MergeDialog(CvsService_stub* service,
connect( tag_button, TQT_SIGNAL(clicked()),
this, TQT_SLOT(tagButtonClicked()) );
- TQGridLayout *tagsedit_layout = new TQGridLayout(tqlayout);
+ TQGridLayout *tagsedit_layout = new TQGridLayout(layout);
tagsedit_layout->addColSpacing(0, iWidgetIndent);
tagsedit_layout->setColStretch(0, 0);
tagsedit_layout->setColStretch(1, 1);
diff --git a/cervisia/misc.cpp b/cervisia/misc.cpp
index fa3936ff..7a13b15c 100644
--- a/cervisia/misc.cpp
+++ b/cervisia/misc.cpp
@@ -60,7 +60,7 @@ static int FindWhiteSpace(const TQString& str, int index)
if( index < 0 || index >= length )
return -1;
- const TQChar* const startPos = str.tqunicode();
+ const TQChar* const startPos = str.unicode();
const TQChar* const endPos = startPos + length;
const TQChar* pos = startPos + index;
diff --git a/cervisia/repositorydlg.cpp b/cervisia/repositorydlg.cpp
index 25cca4c9..be19890d 100644
--- a/cervisia/repositorydlg.cpp
+++ b/cervisia/repositorydlg.cpp
@@ -186,7 +186,7 @@ RepositoryDialog::RepositoryDialog(KConfig& cfg, CvsService_stub* cvsService,
m_loginButton = actionbox->addButton(i18n("Login..."));
m_logoutButton = actionbox->addButton(i18n("Logout"));
actionbox->addStretch();
- actionbox->tqlayout();
+ actionbox->layout();
hbox->addWidget(actionbox, 0);
m_loginButton->setEnabled(false);
diff --git a/cervisia/resolvedlg.cpp b/cervisia/resolvedlg.cpp
index dacb0d0f..3df6a8ee 100644
--- a/cervisia/resolvedlg.cpp
+++ b/cervisia/resolvedlg.cpp
@@ -106,27 +106,27 @@ ResolveDialog::ResolveDialog(KConfig& cfg, TQWidget *parent, const char *name)
TQFrame* mainWidget = makeMainWidget();
- TQBoxLayout *tqlayout = new TQVBoxLayout(mainWidget, 0, spacingHint());
+ TQBoxLayout *layout = new TQVBoxLayout(mainWidget, 0, spacingHint());
TQSplitter *vertSplitter = new TQSplitter(Qt::Vertical, mainWidget);
TQSplitter *splitter = new TQSplitter(Qt::Horizontal, vertSplitter);
TQWidget *versionALayoutWidget = new TQWidget(splitter);
- TQBoxLayout *versionAtqlayout = new TQVBoxLayout(versionALayoutWidget, 5);
+ TQBoxLayout *versionAlayout = new TQVBoxLayout(versionALayoutWidget, 5);
TQLabel *revlabel1 = new TQLabel(i18n("Your version (A):"), versionALayoutWidget);
- versionAtqlayout->addWidget(revlabel1);
+ versionAlayout->addWidget(revlabel1);
diff1 = new DiffView(cfg, true, false, versionALayoutWidget);
- versionAtqlayout->addWidget(diff1, 10);
+ versionAlayout->addWidget(diff1, 10);
TQWidget* versionBLayoutWidget = new TQWidget(splitter);
- TQBoxLayout *versionBtqlayout = new TQVBoxLayout(versionBLayoutWidget, 5);
+ TQBoxLayout *versionBlayout = new TQVBoxLayout(versionBLayoutWidget, 5);
TQLabel *revlabel2 = new TQLabel(i18n("Other version (B):"), versionBLayoutWidget);
- versionBtqlayout->addWidget(revlabel2);
+ versionBlayout->addWidget(revlabel2);
diff2 = new DiffView(cfg, true, false, versionBLayoutWidget);
- versionBtqlayout->addWidget(diff2, 10);
+ versionBlayout->addWidget(diff2, 10);
diff1->setPartner(diff2);
diff2->setPartner(diff1);
@@ -140,7 +140,7 @@ ResolveDialog::ResolveDialog(KConfig& cfg, TQWidget *parent, const char *name)
merge = new DiffView(cfg, false, false, mergeLayoutWidget);
mergeLayout->addWidget(merge, 10);
- tqlayout->addWidget(vertSplitter);
+ layout->addWidget(vertSplitter);
abutton = new TQPushButton("&A", mainWidget);
connect( abutton, TQT_SIGNAL(clicked()), TQT_SLOT(aClicked()) );
@@ -166,17 +166,17 @@ ResolveDialog::ResolveDialog(KConfig& cfg, TQWidget *parent, const char *name)
forwbutton = new TQPushButton("&>>", mainWidget);
connect( forwbutton, TQT_SIGNAL(clicked()), TQT_SLOT(forwClicked()) );
- TQBoxLayout *buttontqlayout = new TQHBoxLayout(tqlayout);
- buttontqlayout->addWidget(abutton, 1);
- buttontqlayout->addWidget(bbutton, 1);
- buttontqlayout->addWidget(abbutton, 1);
- buttontqlayout->addWidget(babutton, 1);
- buttontqlayout->addWidget(editbutton, 1);
- buttontqlayout->addStretch(1);
- buttontqlayout->addWidget(nofnlabel, 2);
- buttontqlayout->addStretch(1);
- buttontqlayout->addWidget(backbutton, 1);
- buttontqlayout->addWidget(forwbutton, 1);
+ TQBoxLayout *buttonlayout = new TQHBoxLayout(layout);
+ buttonlayout->addWidget(abutton, 1);
+ buttonlayout->addWidget(bbutton, 1);
+ buttonlayout->addWidget(abbutton, 1);
+ buttonlayout->addWidget(babutton, 1);
+ buttonlayout->addWidget(editbutton, 1);
+ buttonlayout->addStretch(1);
+ buttonlayout->addWidget(nofnlabel, 2);
+ buttonlayout->addStretch(1);
+ buttonlayout->addWidget(backbutton, 1);
+ buttonlayout->addWidget(forwbutton, 1);
connect( this, TQT_SIGNAL(user2Clicked()), TQT_SLOT(saveClicked()) );
connect( this, TQT_SIGNAL(user1Clicked()), TQT_SLOT(saveAsClicked()) );
diff --git a/cervisia/settingsdlg.cpp b/cervisia/settingsdlg.cpp
index fcd5f8e9..c6e39bf9 100644
--- a/cervisia/settingsdlg.cpp
+++ b/cervisia/settingsdlg.cpp
@@ -236,24 +236,24 @@ void SettingsDialog::addGeneralPage()
{
TQFrame* generalPage = addPage(i18n("General"), TQString(),
LoadIcon("misc"));
- TQVBoxLayout* tqlayout = new TQVBoxLayout(generalPage, 0, KDialog::spacingHint());
+ TQVBoxLayout* layout = new TQVBoxLayout(generalPage, 0, KDialog::spacingHint());
TQLabel *usernamelabel = new TQLabel( i18n("&User name for the change log editor:"), generalPage );
usernameedit = new KLineEdit(generalPage);
usernameedit->setFocus();
usernamelabel->setBuddy(usernameedit);
- tqlayout->addWidget(usernamelabel);
- tqlayout->addWidget(usernameedit);
+ layout->addWidget(usernamelabel);
+ layout->addWidget(usernameedit);
TQLabel *cvspathlabel = new TQLabel( i18n("&Path to CVS executable, or 'cvs':"), generalPage );
cvspathedit = new KURLRequester(generalPage);
cvspathlabel->setBuddy(cvspathedit);
- tqlayout->addWidget(cvspathlabel);
- tqlayout->addWidget(cvspathedit);
+ layout->addWidget(cvspathlabel);
+ layout->addWidget(cvspathedit);
- tqlayout->addStretch();
+ layout->addStretch();
}
diff --git a/cervisia/stringmatcher.cpp b/cervisia/stringmatcher.cpp
index 0c7e833c..6e70a6e0 100644
--- a/cervisia/stringmatcher.cpp
+++ b/cervisia/stringmatcher.cpp
@@ -133,7 +133,7 @@ unsigned int countMetaCharacters(const TQString& text)
{
unsigned int count(0);
- const TQChar* pos(text.tqunicode());
+ const TQChar* pos(text.unicode());
const TQChar* posEnd(pos + text.length());
while (pos < posEnd)
{
diff --git a/cervisia/tagdlg.cpp b/cervisia/tagdlg.cpp
index 3d8b9516..b2bd1506 100644
--- a/cervisia/tagdlg.cpp
+++ b/cervisia/tagdlg.cpp
@@ -47,7 +47,7 @@ TagDialog::TagDialog(ActionType action, CvsService_stub* service,
TQFrame* mainWidget = makeMainWidget();
- TQBoxLayout *tqlayout = new TQVBoxLayout(mainWidget, 0, spacingHint());
+ TQBoxLayout *layout = new TQVBoxLayout(mainWidget, 0, spacingHint());
if (action == Delete)
{
@@ -61,7 +61,7 @@ TagDialog::TagDialog(ActionType action, CvsService_stub* service,
connect( tag_button, TQT_SIGNAL(clicked()),
this, TQT_SLOT(tagButtonClicked()) );
- TQBoxLayout *tagedit_layout = new TQHBoxLayout(tqlayout);
+ TQBoxLayout *tagedit_layout = new TQHBoxLayout(layout);
tagedit_layout->addWidget(tag_label);
tagedit_layout->addWidget(tag_combo);
tagedit_layout->addWidget(tag_button);
@@ -74,15 +74,15 @@ TagDialog::TagDialog(ActionType action, CvsService_stub* service,
TQLabel *tag_label = new TQLabel(tag_edit, i18n("&Name of tag:"), mainWidget);
- TQBoxLayout *tagedit_layout = new TQHBoxLayout(tqlayout);
+ TQBoxLayout *tagedit_layout = new TQHBoxLayout(layout);
tagedit_layout->addWidget(tag_label);
tagedit_layout->addWidget(tag_edit);
branchtag_button = new TQCheckBox(i18n("Create &branch with this tag"), mainWidget);
- tqlayout->addWidget(branchtag_button);
+ layout->addWidget(branchtag_button);
forcetag_button = new TQCheckBox(i18n("&Force tag creation even if tag already exists"), mainWidget);
- tqlayout->addWidget(forcetag_button);
+ layout->addWidget(forcetag_button);
}
setHelp("taggingbranching");
diff --git a/cervisia/tooltip.cpp b/cervisia/tooltip.cpp
index df3c4977..728945ca 100644
--- a/cervisia/tooltip.cpp
+++ b/cervisia/tooltip.cpp
@@ -72,12 +72,12 @@ TQString truncateLines(const TQString& text,
if (numberOfLines <= maxNumberOfLines)
return text;
- const TQChar* tqunicode(text.tqunicode());
- for (int count(maxNumberOfLines); count; ++tqunicode)
- if (*tqunicode == newLine)
+ const TQChar* unicode(text.unicode());
+ for (int count(maxNumberOfLines); count; ++unicode)
+ if (*unicode == newLine)
--count;
- return text.left(tqunicode - text.tqunicode() - 1);
+ return text.left(unicode - text.unicode() - 1);
}
diff --git a/cervisia/updatedlg.cpp b/cervisia/updatedlg.cpp
index 1b49493e..4cd4367c 100644
--- a/cervisia/updatedlg.cpp
+++ b/cervisia/updatedlg.cpp
@@ -40,15 +40,15 @@ UpdateDialog::UpdateDialog(CvsService_stub* service,
cvsService(service)
{
int const iComboBoxMinWidth(40 * fontMetrics().width('0'));
- int const iWidgetIndent(tqstyle().pixelMetric(TQStyle::PM_ExclusiveIndicatorWidth, 0) + 6);
+ int const iWidgetIndent(style().pixelMetric(TQStyle::PM_ExclusiveIndicatorWidth, 0) + 6);
TQFrame* mainWidget = makeMainWidget();
- TQBoxLayout *tqlayout = new TQVBoxLayout(mainWidget, 0, spacingHint());
+ TQBoxLayout *layout = new TQVBoxLayout(mainWidget, 0, spacingHint());
bybranch_button = new TQRadioButton(i18n("Update to &branch: "), mainWidget);
bybranch_button->setChecked(true);
- tqlayout->addWidget(bybranch_button);
+ layout->addWidget(bybranch_button);
branch_combo = new TQComboBox(true, mainWidget);
branch_combo->setMinimumWidth(iComboBoxMinWidth);
@@ -57,13 +57,13 @@ UpdateDialog::UpdateDialog(CvsService_stub* service,
connect( branch_button, TQT_SIGNAL(clicked()),
this, TQT_SLOT(branchButtonClicked()) );
- TQBoxLayout *branchedit_layout = new TQHBoxLayout(tqlayout);
+ TQBoxLayout *branchedit_layout = new TQHBoxLayout(layout);
branchedit_layout->addSpacing(iWidgetIndent);
branchedit_layout->addWidget(branch_combo);
branchedit_layout->addWidget(branch_button);
bytag_button = new TQRadioButton(i18n("Update to &tag: "), mainWidget);
- tqlayout->addWidget(bytag_button);
+ layout->addWidget(bytag_button);
tag_combo = new TQComboBox(true, mainWidget);
tag_combo->setMinimumWidth(iComboBoxMinWidth);
@@ -72,17 +72,17 @@ UpdateDialog::UpdateDialog(CvsService_stub* service,
connect( tag_button, TQT_SIGNAL(clicked()),
this, TQT_SLOT(tagButtonClicked()) );
- TQBoxLayout *tagedit_layout = new TQHBoxLayout(tqlayout);
+ TQBoxLayout *tagedit_layout = new TQHBoxLayout(layout);
tagedit_layout->addSpacing(iWidgetIndent);
tagedit_layout->addWidget(tag_combo);
tagedit_layout->addWidget(tag_button);
bydate_button = new TQRadioButton(i18n("Update to &date ('yyyy-mm-dd'):"), mainWidget);
- tqlayout->addWidget(bydate_button);
+ layout->addWidget(bydate_button);
date_edit = new KLineEdit(mainWidget);
- TQBoxLayout *dateedit_layout = new TQHBoxLayout(tqlayout);
+ TQBoxLayout *dateedit_layout = new TQHBoxLayout(layout);
dateedit_layout->addSpacing(iWidgetIndent);
dateedit_layout->addWidget(date_edit);
diff --git a/cervisia/watchdlg.cpp b/cervisia/watchdlg.cpp
index 607dbd46..7be45e32 100644
--- a/cervisia/watchdlg.cpp
+++ b/cervisia/watchdlg.cpp
@@ -36,37 +36,37 @@ WatchDialog::WatchDialog(ActionType action, TQWidget *parent, const char *name)
TQFrame* mainWidget = makeMainWidget();
- TQBoxLayout *tqlayout = new TQVBoxLayout(mainWidget, 0, spacingHint());
+ TQBoxLayout *layout = new TQVBoxLayout(mainWidget, 0, spacingHint());
TQLabel *textlabel = new TQLabel
( (action==Add)? i18n("Add watches for the following events:")
: i18n("Remove watches for the following events:"), mainWidget );
- tqlayout->addWidget(textlabel, 0);
+ layout->addWidget(textlabel, 0);
all_button = new TQRadioButton(i18n("&All"), mainWidget);
all_button->setFocus();
all_button->setChecked(true);
- tqlayout->addWidget(all_button);
+ layout->addWidget(all_button);
only_button = new TQRadioButton(i18n("&Only:"), mainWidget);
- tqlayout->addWidget(only_button);
+ layout->addWidget(only_button);
- TQGridLayout *eventstqlayout = new TQGridLayout(tqlayout);
- eventstqlayout->addColSpacing(0, 20);
- eventstqlayout->setColStretch(0, 0);
- eventstqlayout->setColStretch(1, 1);
+ TQGridLayout *eventslayout = new TQGridLayout(layout);
+ eventslayout->addColSpacing(0, 20);
+ eventslayout->setColStretch(0, 0);
+ eventslayout->setColStretch(1, 1);
commitbox = new TQCheckBox(i18n("&Commits"), mainWidget);
commitbox->setEnabled(false);
- eventstqlayout->addWidget(commitbox, 0, 1);
+ eventslayout->addWidget(commitbox, 0, 1);
editbox = new TQCheckBox(i18n("&Edits"), mainWidget);
editbox->setEnabled(false);
- eventstqlayout->addWidget(editbox, 1, 1);
+ eventslayout->addWidget(editbox, 1, 1);
uneditbox = new TQCheckBox(i18n("&Unedits"), mainWidget);
uneditbox->setEnabled(false);
- eventstqlayout->addWidget(uneditbox, 2, 1);
+ eventslayout->addWidget(uneditbox, 2, 1);
TQButtonGroup* group = new TQButtonGroup(mainWidget);
group->hide();
diff --git a/cervisia/watchersdlg.cpp b/cervisia/watchersdlg.cpp
index afe9e7a3..d8427f82 100644
--- a/cervisia/watchersdlg.cpp
+++ b/cervisia/watchersdlg.cpp
@@ -37,7 +37,7 @@ WatchersDialog::WatchersDialog(KConfig& cfg, TQWidget* parent, const char* name)
{
TQFrame* mainWidget = makeMainWidget();
- TQBoxLayout *tqlayout = new TQVBoxLayout(mainWidget, 0, spacingHint());
+ TQBoxLayout *layout = new TQVBoxLayout(mainWidget, 0, spacingHint());
table = new TQTable(mainWidget, "watchersTable");
table->setNumCols(5);
@@ -57,7 +57,7 @@ WatchersDialog::WatchersDialog(KConfig& cfg, TQWidget* parent, const char* name)
header->setLabel(3, i18n("Unedit"));
header->setLabel(4, i18n("Commit"));
- tqlayout->addWidget(table, 1);
+ layout->addWidget(table, 1);
setWFlags(TQt::WDestructiveClose | getWFlags());