diff --git a/cervisia/annotateview.cpp b/cervisia/annotateview.cpp
index f3d80605..6d99c573 100644
--- a/cervisia/annotateview.cpp
+++ b/cervisia/annotateview.cpp
@@ -175,7 +175,7 @@ void AnnotateView::addLine(const LogInfo& logInfo, const TQString& content,
}
-TQSize AnnotateView::tqsizeHint() const
+TQSize AnnotateView::sizeHint() const
{
TQFontMetrics fm(fontMetrics());
return TQSize(100 * fm.width("0"), 10 * fm.lineSpacing());
@@ -191,7 +191,7 @@ void AnnotateView::slotQueryToolTip(const TQPoint& viewportPos,
const int column(header()->sectionAt(viewportPos.x()));
if ((column == AnnotateViewItem::AuthorColumn) && !item->m_logInfo.m_author.isNull())
{
- viewportRect = tqitemRect(item);
+ viewportRect = itemRect(item);
text = item->m_logInfo.createToolTipText(false);
}
}
diff --git a/cervisia/annotateview.h b/cervisia/annotateview.h
index e4c78b58..aa6d947b 100644
--- a/cervisia/annotateview.h
+++ b/cervisia/annotateview.h
@@ -46,7 +46,7 @@ public:
void addLine(const Cervisia::LogInfo& logInfo, const TQString& content,
bool odd);
- virtual TQSize tqsizeHint() const;
+ virtual TQSize sizeHint() const;
private slots:
diff --git a/cervisia/cervisiapart.cpp b/cervisia/cervisiapart.cpp
index 9087bacc..1af4f881 100644
--- a/cervisia/cervisiapart.cpp
+++ b/cervisia/cervisiapart.cpp
@@ -213,7 +213,7 @@ void CervisiaPart::slotSetupStatusBar()
{
// create the active filter indicator and add it to the statusbar
filterLabel = new TQLabel("UR", m_statusBar->statusBar());
- filterLabel->setFixedSize(filterLabel->tqsizeHint());
+ filterLabel->setFixedSize(filterLabel->sizeHint());
filterLabel->setText("");
TQToolTip::add(filterLabel,
i18n("F - All files are hidden, the tree shows only folders\n"
@@ -258,7 +258,7 @@ void CervisiaPart::setupActions()
action->setWhatsThis( hint );
action = new KAction( i18n("&Status"), "vcs_status", Key_F5,
- this, TQT_SLOT( slottqStatus() ),
+ this, TQT_SLOT( slotStatus() ),
actionCollection(), "file_status" );
hint = i18n("Updates the status (cvs -n update) of the selected files and folders");
action->setToolTip( hint );
@@ -856,7 +856,7 @@ void CervisiaPart::slotUpdate()
}
-void CervisiaPart::slottqStatus()
+void CervisiaPart::slotStatus()
{
TQStringList list = update->multipleSelection();
if (list.isEmpty())
@@ -1166,13 +1166,13 @@ void CervisiaPart::slotAnnotate()
void CervisiaPart::slotDiffBase()
{
- showDiff(TQString::tqfromLatin1("BASE"));
+ showDiff(TQString::fromLatin1("BASE"));
}
void CervisiaPart::slotDiffHead()
{
- showDiff(TQString::tqfromLatin1("HEAD"));
+ showDiff(TQString::fromLatin1("HEAD"));
}
@@ -1764,7 +1764,7 @@ bool CervisiaPart::openSandbox(const TQString &dirname)
if (dostatus)
{
update->setSelected(update->firstChild(), true);
- slottqStatus();
+ slotStatus();
}
//load the recentCommits for this app from the KConfig app
diff --git a/cervisia/cervisiapart.h b/cervisia/cervisiapart.h
index b802e8ad..7a3802fd 100644
--- a/cervisia/cervisiapart.h
+++ b/cervisia/cervisiapart.h
@@ -83,7 +83,7 @@ public slots:
void slotOpen();
void slotResolve();
- void slottqStatus();
+ void slotStatus();
void slotUpdate();
void slotChangeLog();
void slotCommit();
diff --git a/cervisia/changelogdlg.cpp b/cervisia/changelogdlg.cpp
index 9d00a8e8..8c19a9fc 100644
--- a/cervisia/changelogdlg.cpp
+++ b/cervisia/changelogdlg.cpp
@@ -33,7 +33,7 @@
static inline TQString DateStringISO8601()
{
- return TQDate::tqcurrentDate().toString(Qt::ISODate);
+ return TQDate::currentDate().toString(Qt::ISODate);
}
diff --git a/cervisia/checkoutdlg.cpp b/cervisia/checkoutdlg.cpp
index 9be04dd4..faafa37c 100644
--- a/cervisia/checkoutdlg.cpp
+++ b/cervisia/checkoutdlg.cpp
@@ -66,7 +66,7 @@ CheckoutDialog::CheckoutDialog(KConfig& cfg, CvsService_stub* service,
repo_combo = new TQComboBox(true, mainWidget);
repo_combo->setFocus();
// make sure combobox is smaller than the screen
- repo_combo->tqsetSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed);
+ repo_combo->setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed);
grid->addWidget(repo_combo, 0, 1);
TQLabel* repo_label = new TQLabel(repo_combo, i18n("&Repository:"), mainWidget);
diff --git a/cervisia/commitdlg.cpp b/cervisia/commitdlg.cpp
index a2e587f3..5f45ce16 100644
--- a/cervisia/commitdlg.cpp
+++ b/cervisia/commitdlg.cpp
@@ -84,7 +84,7 @@ CommitDialog::CommitDialog(KConfig& cfg, CvsService_stub* service,
archivelabel->setBuddy(combo);
connect( combo, TQT_SIGNAL(activated(int)), this, TQT_SLOT(comboActivated(int)) );
// make sure that combobox is smaller than the screen
- combo->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed));
+ combo->setSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed));
tqlayout->addWidget(combo);
TQLabel *messagelabel = new TQLabel(i18n("&Log message:"), mainWidget);
diff --git a/cervisia/cvsservice/repository.cpp b/cervisia/cvsservice/repository.cpp
index 822a77ae..398c1c47 100644
--- a/cervisia/cvsservice/repository.cpp
+++ b/cervisia/cvsservice/repository.cpp
@@ -223,7 +223,7 @@ void Repository::Private::readConfig()
//
// In order to be able to read this group, we then have to manually add
// the port number to it.
- TQString repositoryGroup = TQString::tqfromLatin1("Repository-") + location;
+ TQString repositoryGroup = TQString::fromLatin1("Repository-") + location;
if( !config->hasGroup(repositoryGroup) )
{
// find the position of the first path separator
diff --git a/cervisia/diffdlg.cpp b/cervisia/diffdlg.cpp
index 8d7ed8c8..ef6c725c 100644
--- a/cervisia/diffdlg.cpp
+++ b/cervisia/diffdlg.cpp
@@ -93,10 +93,10 @@ DiffDialog::DiffDialog(KConfig& cfg, TQWidget *parent, const char *name, bool mo
// avoids auto resize when the text is changed
nofnlabel->setMinimumWidth(fontMetrics().width(i18n("%1 differences").tqarg(10000)));
- backbutton = new TQPushButton(TQString::tqfromLatin1("&<<"), mainWidget);
+ backbutton = new TQPushButton(TQString::fromLatin1("&<<"), mainWidget);
connect( backbutton, TQT_SIGNAL(clicked()), TQT_SLOT(backClicked()) );
- forwbutton = new TQPushButton(TQString::tqfromLatin1("&>>"), mainWidget);
+ forwbutton = new TQPushButton(TQString::fromLatin1("&>>"), mainWidget);
connect( forwbutton, TQT_SIGNAL(clicked()), TQT_SLOT(forwClicked()) );
connect( this, TQT_SIGNAL(user1Clicked()), TQT_SLOT(saveAsClicked()) );
diff --git a/cervisia/diffview.cpp b/cervisia/diffview.cpp
index 554e6d3f..70e0ed2b 100644
--- a/cervisia/diffview.cpp
+++ b/cervisia/diffview.cpp
@@ -293,7 +293,7 @@ int DiffView::cellWidth(int col)
}
-TQSize DiffView::tqsizeHint() const
+TQSize DiffView::sizeHint() const
{
TQFontMetrics fm(font());
return TQSize( 4*fm.width("0123456789"), fm.lineSpacing()*8 );
@@ -391,7 +391,7 @@ void DiffView::wheelEvent(TQWheelEvent *e)
DiffZoomWidget::DiffZoomWidget(KConfig& cfg, TQWidget *parent, const char *name)
: TQFrame(parent, name)
{
- tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Minimum ) );
+ setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Minimum ) );
cfg.setGroup("Colors");
TQColor defaultColor=TQColor(237, 190, 190);
@@ -415,9 +415,9 @@ void DiffZoomWidget::setDiffView(DiffView *view)
}
-TQSize DiffZoomWidget::tqsizeHint() const
+TQSize DiffZoomWidget::sizeHint() const
{
- return TQSize(25, tqstyle().tqpixelMetric(TQStyle::PM_ScrollBarExtent, this));
+ return TQSize(25, tqstyle().pixelMetric(TQStyle::PM_ScrollBarExtent, this));
}
diff --git a/cervisia/diffview.h b/cervisia/diffview.h
index 2a2b998b..9bc57b06 100644
--- a/cervisia/diffview.h
+++ b/cervisia/diffview.h
@@ -74,7 +74,7 @@ public:
virtual void setFont(const TQFont &font);
virtual int cellWidth(int col);
- virtual TQSize tqsizeHint() const;
+ virtual TQSize sizeHint() const;
virtual void paintCell(TQPainter *p, int row, int col);
virtual void wheelEvent(TQWheelEvent *);
const TQScrollBar *scrollBar() const
@@ -112,7 +112,7 @@ public:
~DiffZoomWidget();
void setDiffView(DiffView *view);
- TQSize tqsizeHint() const;
+ TQSize sizeHint() const;
protected:
void paintEvent(TQPaintEvent *);
diff --git a/cervisia/entry.h b/cervisia/entry.h
index 2c0a1c98..f3705d35 100644
--- a/cervisia/entry.h
+++ b/cervisia/entry.h
@@ -43,7 +43,7 @@ struct Entry
};
/**
- * Sets status to \a EntrytqStatus::Unknown and type to \a File.
+ * Sets status to \a EntryStatus::Unknown and type to \a File.
*/
Entry();
@@ -60,7 +60,7 @@ struct Entry
/**
* The status of this entry.
*/
- EntrytqStatus m_status;
+ EntryStatus m_status;
/**
* The revision of this entry.
diff --git a/cervisia/entry_status.cpp b/cervisia/entry_status.cpp
index c76c135c..00ff3b32 100644
--- a/cervisia/entry_status.cpp
+++ b/cervisia/entry_status.cpp
@@ -28,10 +28,10 @@ namespace Cervisia
{
-TQString toString(EntrytqStatus entrytqStatus)
+TQString toString(EntryStatus entryStatus)
{
TQString result;
- switch (entrytqStatus)
+ switch (entryStatus)
{
case LocallyModified:
result = i18n("Locally Modified");
diff --git a/cervisia/entry_status.h b/cervisia/entry_status.h
index b1d6cf6f..aa964735 100644
--- a/cervisia/entry_status.h
+++ b/cervisia/entry_status.h
@@ -31,7 +31,7 @@ namespace Cervisia
/**
* All stati a an entry could have.
*/
-enum EntrytqStatus
+enum EntryStatus
{
LocallyModified,
LocallyAdded,
@@ -51,11 +51,11 @@ enum EntrytqStatus
/**
* The entry status as translated string.
*
- * @param entrytqStatus The entry status to translate.
+ * @param entryStatus The entry status to translate.
*
* @return The translated string.
*/
-TQString toString(EntrytqStatus entrytqStatus);
+TQString toString(EntryStatus entryStatus);
} // namespace Cervisia
diff --git a/cervisia/entry_status_change.h b/cervisia/entry_status_change.h
index 7935cf1d..3518eed8 100644
--- a/cervisia/entry_status_change.h
+++ b/cervisia/entry_status_change.h
@@ -44,7 +44,7 @@ struct EntryStatusChange
/**
* The new status of the entry.
*/
- EntrytqStatus m_status;
+ EntryStatus m_status;
};
diff --git a/cervisia/globalignorelist.cpp b/cervisia/globalignorelist.cpp
index 4b5c8a47..b3834a42 100644
--- a/cervisia/globalignorelist.cpp
+++ b/cervisia/globalignorelist.cpp
@@ -81,7 +81,7 @@ void GlobalIgnoreList::addEntry(const TQString& entry)
// Bug #89215:
// Make sure '.' and '..' are always in the ignore list, so
// UpdateDirItem::maybeScanDir() doesn't loop endlessly.
- addEntriesFromString(TQString::tqfromLatin1(". .."));
+ addEntriesFromString(TQString::fromLatin1(". .."));
}
}
@@ -92,7 +92,7 @@ void GlobalIgnoreList::setup()
.nse_depinfo #* .#* cvslog.* ,* CVS CVS.adm .del-* *.a *.olb *.o *.obj\
*.so *.Z *~ *.old *.elc *.ln *.bak *.BAK *.orig *.rej *.exe _$* *$";
- addEntriesFromString(TQString::tqfromLatin1(ignorestr));
+ addEntriesFromString(TQString::fromLatin1(ignorestr));
addEntriesFromString(TQString::fromLocal8Bit(::getenv("CVSIGNORE")));
addEntriesFromFile(TQDir::homeDirPath() + "/.cvsignore");
diff --git a/cervisia/historydlg.cpp b/cervisia/historydlg.cpp
index 1eb3b6ee..9e226e34 100644
--- a/cervisia/historydlg.cpp
+++ b/cervisia/historydlg.cpp
@@ -246,7 +246,7 @@ HistoryDialog::HistoryDialog(KConfig& cfg, TQWidget *parent, const char *name)
for (int i = 0; i < listview->columns(); ++i)
listview->setColumnWidthMode(i, TQListView::Manual);
- listview->restoreLayout(&partConfig, TQString::tqfromLatin1("HistoryListView"));
+ listview->restoreLayout(&partConfig, TQString::fromLatin1("HistoryListView"));
}
@@ -254,7 +254,7 @@ HistoryDialog::~HistoryDialog()
{
saveDialogSize(partConfig, "HistoryDialog");
- listview->saveLayout(&partConfig, TQString::tqfromLatin1("HistoryListView"));
+ listview->saveLayout(&partConfig, TQString::fromLatin1("HistoryListView"));
}
diff --git a/cervisia/loginfo.cpp b/cervisia/loginfo.cpp
index 8e6464d0..b97ff1f0 100644
--- a/cervisia/loginfo.cpp
+++ b/cervisia/loginfo.cpp
@@ -41,7 +41,7 @@ TQString TagInfo::toString(bool prefixWithType) const
TQString text;
if (prefixWithType)
{
- text += typeToString() + TQString::tqfromLatin1(": ");
+ text += typeToString() + TQString::fromLatin1(": ");
}
text += m_name;
@@ -71,32 +71,32 @@ TQString TagInfo::typeToString() const
TQString LogInfo::createToolTipText(bool showTime) const
{
- TQString text(TQString::tqfromLatin1(""));
+ TQString text(TQString::fromLatin1(""));
text += TQStyleSheet::escape(m_revision);
- text += TQString::tqfromLatin1(" ");
+ text += TQString::fromLatin1(" ");
text += TQStyleSheet::escape(m_author);
- text += TQString::tqfromLatin1(" ");
+ text += TQString::fromLatin1(" ");
text += TQStyleSheet::escape(dateTimeToString(showTime));
- text += TQString::tqfromLatin1("");
+ text += TQString::fromLatin1("");
if (!m_comment.isEmpty())
{
- text += TQString::tqfromLatin1("");
+ text += TQString::fromLatin1("");
text += TQStyleSheet::escape(m_comment);
- text += TQString::tqfromLatin1("");
+ text += TQString::fromLatin1("");
}
if (!m_tags.isEmpty())
{
- text += TQString::tqfromLatin1("");
+ text += TQString::fromLatin1("");
for (TTagInfoSeq::const_iterator it = m_tags.begin();
it != m_tags.end(); ++it)
{
if (it != m_tags.begin() || m_comment.isEmpty())
- text += TQString::tqfromLatin1("
");
+ text += TQString::fromLatin1("
");
text += TQStyleSheet::escape((*it).toString());
}
- text += TQString::tqfromLatin1("");
+ text += TQString::fromLatin1("");
}
return text;
diff --git a/cervisia/loglist.cpp b/cervisia/loglist.cpp
index 439ba36f..d676718a 100644
--- a/cervisia/loglist.cpp
+++ b/cervisia/loglist.cpp
@@ -69,7 +69,7 @@ LogListViewItem::LogListViewItem(TQListView* list, const Cervisia::LogInfo& logI
setText(Tags, logInfo.tagsToString(Cervisia::TagInfo::Tag,
Cervisia::LogInfo::NoTagType,
- TQString::tqfromLatin1(", ")));
+ TQString::fromLatin1(", ")));
}
@@ -131,13 +131,13 @@ LogListView::LogListView(KConfig& cfg, TQWidget *parent, const char *name)
for (int i = 0; i < columns(); ++i)
setColumnWidthMode(i, Manual);
- restoreLayout(&partConfig, TQString::tqfromLatin1("LogList view"));
+ restoreLayout(&partConfig, TQString::fromLatin1("LogList view"));
}
LogListView::~LogListView()
{
- saveLayout(&partConfig, TQString::tqfromLatin1("LogList view"));
+ saveLayout(&partConfig, TQString::fromLatin1("LogList view"));
}
@@ -220,7 +220,7 @@ void LogListView::slotQueryToolTip(const TQPoint& viewportPos,
{
if (const LogListViewItem* item = static_cast(itemAt(viewportPos)))
{
- viewportRect = tqitemRect(item);
+ viewportRect = itemRect(item);
text = item->m_logInfo.createToolTipText();
}
}
diff --git a/cervisia/logtree.cpp b/cervisia/logtree.cpp
index 88684312..e48c3870 100644
--- a/cervisia/logtree.cpp
+++ b/cervisia/logtree.cpp
@@ -249,7 +249,7 @@ void LogTreeView::setSelectedPair(TQString selectionA, TQString selectionB)
}
-TQSize LogTreeView::tqsizeHint() const
+TQSize LogTreeView::sizeHint() const
{
return TQSize(2 * static_width, 3 * static_height);
}
diff --git a/cervisia/logtree.h b/cervisia/logtree.h
index f1af28b9..c895c183 100644
--- a/cervisia/logtree.h
+++ b/cervisia/logtree.h
@@ -56,7 +56,7 @@ public:
virtual void paintCell(TQPainter *p, int row, int col, const TQRect& cr,
bool selected, const TQColorGroup& cg);
- virtual TQSize tqsizeHint() const;
+ virtual TQSize sizeHint() const;
virtual TQString text(int row, int col) const;
diff --git a/cervisia/mergedlg.cpp b/cervisia/mergedlg.cpp
index be371c62..b91ca889 100644
--- a/cervisia/mergedlg.cpp
+++ b/cervisia/mergedlg.cpp
@@ -40,7 +40,7 @@ MergeDialog::MergeDialog(CvsService_stub* service,
cvsService(service)
{
int const iComboBoxMinWidth(30 * fontMetrics().width('0'));
- int const iWidgetIndent(tqstyle().tqpixelMetric(TQStyle::PM_ExclusiveIndicatorWidth, 0) + 6);
+ int const iWidgetIndent(tqstyle().pixelMetric(TQStyle::PM_ExclusiveIndicatorWidth, 0) + 6);
TQFrame* mainWidget = makeMainWidget();
diff --git a/cervisia/misc.cpp b/cervisia/misc.cpp
index 76ae72d1..99ae25ec 100644
--- a/cervisia/misc.cpp
+++ b/cervisia/misc.cpp
@@ -261,14 +261,14 @@ TQStringList splitLine(TQString line, char delim)
const TQStringList fetchBranches(CvsService_stub* cvsService, TQWidget* parent)
{
- return FetchBranchesAndTags(TQString::tqfromLatin1("branch"), cvsService,
+ return FetchBranchesAndTags(TQString::fromLatin1("branch"), cvsService,
parent);
}
const TQStringList fetchTags(CvsService_stub* cvsService, TQWidget* parent)
{
- return FetchBranchesAndTags(TQString::tqfromLatin1("revision"), cvsService,
+ return FetchBranchesAndTags(TQString::fromLatin1("revision"), cvsService,
parent);
}
diff --git a/cervisia/progressdlg.cpp b/cervisia/progressdlg.cpp
index abf23d1a..a7e34018 100644
--- a/cervisia/progressdlg.cpp
+++ b/cervisia/progressdlg.cpp
@@ -90,8 +90,8 @@ void ProgressDialog::setupGui(const TQString& heading)
TQHBoxLayout* hboxLayout = new TQHBoxLayout(headingBox);
TQLabel* textLabel = new TQLabel(heading, headingBox);
- textLabel->setMinimumWidth(textLabel->tqsizeHint().width());
- textLabel->setFixedHeight(textLabel->tqsizeHint().height());
+ textLabel->setMinimumWidth(textLabel->sizeHint().width());
+ textLabel->setFixedHeight(textLabel->sizeHint().height());
hboxLayout->addWidget(textLabel);
hboxLayout->addStretch();
@@ -104,7 +104,7 @@ void ProgressDialog::setupGui(const TQString& heading)
TQFontMetrics fm(d->resultbox->fontMetrics());
d->resultbox->setMinimumSize(fm.width("0")*70, fm.lineSpacing()*8);
- resize(tqsizeHint());
+ resize(sizeHint());
}
diff --git a/cervisia/qttableview.cpp b/cervisia/qttableview.cpp
index a9e8a9fd..02de078e 100644
--- a/cervisia/qttableview.cpp
+++ b/cervisia/qttableview.cpp
@@ -33,8 +33,8 @@ enum ScrollBarDirtyFlags {
};
-#define HSBEXT horizontalScrollBar()->tqsizeHint().height()
-#define VSBEXT verticalScrollBar()->tqsizeHint().width()
+#define HSBEXT horizontalScrollBar()->sizeHint().height()
+#define VSBEXT verticalScrollBar()->sizeHint().width()
class TQCornerSquare : public TQWidget // internal class
@@ -1384,7 +1384,7 @@ void QtTableView::paintEvent( TQPaintEvent *e )
// outside the cells.
TQRect viewR = viewRect();
- const TQColorGroup g = tqcolorGroup();
+ const TQColorGroup g = colorGroup();
if ( xPos <= maxX ) {
TQRect r = viewR;
@@ -1447,7 +1447,7 @@ TQScrollBar *QtTableView::verticalScrollBar() const
#ifndef TQT_NO_CURSOR
sb->setCursor( arrowCursor );
#endif
- sb->resize( sb->tqsizeHint() ); // height is irrelevant
+ sb->resize( sb->sizeHint() ); // height is irrelevant
Q_CHECK_PTR(sb);
sb->setTracking( FALSE );
sb->setFocusPolicy( TQ_NoFocus );
@@ -1478,7 +1478,7 @@ TQScrollBar *QtTableView::horizontalScrollBar() const
#ifndef TQT_NO_CURSOR
sb->setCursor( arrowCursor );
#endif
- sb->resize( sb->tqsizeHint() ); // width is irrelevant
+ sb->resize( sb->sizeHint() ); // width is irrelevant
sb->setFocusPolicy( TQ_NoFocus );
Q_CHECK_PTR(sb);
sb->setTracking( FALSE );
diff --git a/cervisia/repositorydlg.cpp b/cervisia/repositorydlg.cpp
index 64adc69e..25cca4c9 100644
--- a/cervisia/repositorydlg.cpp
+++ b/cervisia/repositorydlg.cpp
@@ -141,14 +141,14 @@ void RepositoryListItem::setIsLoggedIn(bool isLoggedIn)
void RepositoryListItem::changeLoginStatusColumn()
{
- TQString logintqStatus;
+ TQString loginStatus;
if( LoginNeeded(repository()) )
- logintqStatus = m_isLoggedIn ? i18n("Logged in") : i18n("Not logged in");
+ loginStatus = m_isLoggedIn ? i18n("Logged in") : i18n("Not logged in");
else
- logintqStatus = i18n("No login required");
+ loginStatus = i18n("No login required");
- setText(3, logintqStatus);
+ setText(3, loginStatus);
}
@@ -231,7 +231,7 @@ RepositoryDialog::RepositoryDialog(KConfig& cfg, CvsService_stub* cvsService,
for (int i = 0; i < m_repoList->columns(); ++i)
m_repoList->setColumnWidthMode(i, TQListView::Manual);
- m_repoList->restoreLayout(&m_partConfig, TQString::tqfromLatin1("RepositoryListView"));
+ m_repoList->restoreLayout(&m_partConfig, TQString::fromLatin1("RepositoryListView"));
}
@@ -239,7 +239,7 @@ RepositoryDialog::~RepositoryDialog()
{
saveDialogSize(m_partConfig, "RepositoryDialog");
- m_repoList->saveLayout(&m_partConfig, TQString::tqfromLatin1("RepositoryListView"));
+ m_repoList->saveLayout(&m_partConfig, TQString::fromLatin1("RepositoryListView"));
delete m_serviceConfig;
}
@@ -274,7 +274,7 @@ void RepositoryDialog::readConfigFile()
RepositoryListItem* ritem = static_cast(item);
// read entries from cvs DCOP service configuration
- m_serviceConfig->setGroup(TQString::tqfromLatin1("Repository-") +
+ m_serviceConfig->setGroup(TQString::fromLatin1("Repository-") +
ritem->repository());
TQString rsh = m_serviceConfig->readEntry("rsh", TQString());
@@ -490,7 +490,7 @@ void RepositoryDialog::slotSelectionChanged()
void RepositoryDialog::writeRepositoryData(RepositoryListItem* item)
{
// write entries to cvs DCOP service configuration
- m_serviceConfig->setGroup(TQString::tqfromLatin1("Repository-") +
+ m_serviceConfig->setGroup(TQString::fromLatin1("Repository-") +
item->repository());
m_serviceConfig->writeEntry("rsh", item->rsh());
diff --git a/cervisia/resolvedlg.cpp b/cervisia/resolvedlg.cpp
index fd3e7d9a..a2aceced 100644
--- a/cervisia/resolvedlg.cpp
+++ b/cervisia/resolvedlg.cpp
@@ -158,7 +158,7 @@ ResolveDialog::ResolveDialog(KConfig& cfg, TQWidget *parent, const char *name)
connect( editbutton, TQT_SIGNAL(clicked()), TQT_SLOT(editClicked()) );
nofnlabel = new TQLabel(mainWidget);
- nofnlabel->tqsetAlignment(AlignCenter);
+ nofnlabel->setAlignment(AlignCenter);
backbutton = new TQPushButton("&<<", mainWidget);
connect( backbutton, TQT_SIGNAL(clicked()), TQT_SLOT(backClicked()) );
diff --git a/cervisia/settingsdlg.cpp b/cervisia/settingsdlg.cpp
index eecdd41f..d1350323 100644
--- a/cervisia/settingsdlg.cpp
+++ b/cervisia/settingsdlg.cpp
@@ -52,7 +52,7 @@ namespace
inline TQPixmap LoadIcon(const char* iconName)
{
KIconLoader* loader = KGlobal::instance()->iconLoader();
- return loader->loadIcon(TQString::tqfromLatin1(iconName), KIcon::NoGroup,
+ return loader->loadIcon(TQString::fromLatin1(iconName), KIcon::NoGroup,
KIcon::SizeMedium);
}
}
@@ -99,7 +99,7 @@ SettingsDialog::SettingsDialog( KConfig *conf, TQWidget *parent, const char *nam
addDiffPage();
//
- // tqStatus Options
+ // Status Options
//
addStatusPage();
@@ -204,7 +204,7 @@ void SettingsDialog::writeSettings()
CervisiaSettings::setDiffDeleteColor(m_diffDeleteButton->color());
// I'm not yet sure whether this is a hack or not :-)
- TQWidgetListIt it(*TQApplication::tqallWidgets());
+ TQWidgetListIt it(*TQApplication::allWidgets());
for (; it.current(); ++it)
{
TQWidget *w = it.current();
@@ -341,37 +341,37 @@ void SettingsDialog::addLookAndFeelPage()
m_changelogFontBox = new FontButton(i18n("Font for ChangeLog View..."),
fontGroupBox);
- TQGroupBox* tqcolorGroupBox = new TQGroupBox(4, Qt::Horizontal,
+ TQGroupBox* colorGroupBox = new TQGroupBox(4, Qt::Horizontal,
i18n("Colors"), lookPage);
- tqcolorGroupBox->setColumns(4);
- tqcolorGroupBox->setInsideSpacing(KDialog::spacingHint());
+ colorGroupBox->setColumns(4);
+ colorGroupBox->setInsideSpacing(KDialog::spacingHint());
- TQLabel* conflictLabel = new TQLabel(i18n("Conflict:"), tqcolorGroupBox);
- m_conflictButton = new KColorButton(tqcolorGroupBox);
+ TQLabel* conflictLabel = new TQLabel(i18n("Conflict:"), colorGroupBox);
+ m_conflictButton = new KColorButton(colorGroupBox);
conflictLabel->setBuddy(m_conflictButton);
- TQLabel* diffChangeLabel = new TQLabel(i18n("Diff change:"), tqcolorGroupBox);
- m_diffChangeButton = new KColorButton(tqcolorGroupBox);
+ TQLabel* diffChangeLabel = new TQLabel(i18n("Diff change:"), colorGroupBox);
+ m_diffChangeButton = new KColorButton(colorGroupBox);
diffChangeLabel->setBuddy(m_diffChangeButton);
- TQLabel* localChangeLabel = new TQLabel(i18n("Local change:"), tqcolorGroupBox);
- m_localChangeButton = new KColorButton(tqcolorGroupBox);
+ TQLabel* localChangeLabel = new TQLabel(i18n("Local change:"), colorGroupBox);
+ m_localChangeButton = new KColorButton(colorGroupBox);
localChangeLabel->setBuddy(m_localChangeButton);
- TQLabel* diffInsertLabel = new TQLabel(i18n("Diff insertion:"), tqcolorGroupBox);
- m_diffInsertButton = new KColorButton(tqcolorGroupBox);
+ TQLabel* diffInsertLabel = new TQLabel(i18n("Diff insertion:"), colorGroupBox);
+ m_diffInsertButton = new KColorButton(colorGroupBox);
diffInsertLabel->setBuddy(m_diffInsertButton);
- TQLabel* remoteChangeLabel = new TQLabel(i18n("Remote change:"), tqcolorGroupBox);
- m_remoteChangeButton = new KColorButton(tqcolorGroupBox);
+ TQLabel* remoteChangeLabel = new TQLabel(i18n("Remote change:"), colorGroupBox);
+ m_remoteChangeButton = new KColorButton(colorGroupBox);
remoteChangeLabel->setBuddy( m_remoteChangeButton );
- TQLabel* diffDeleteLabel = new TQLabel(i18n("Diff deletion:"), tqcolorGroupBox);
- m_diffDeleteButton = new KColorButton(tqcolorGroupBox);
+ TQLabel* diffDeleteLabel = new TQLabel(i18n("Diff deletion:"), colorGroupBox);
+ m_diffDeleteButton = new KColorButton(colorGroupBox);
diffDeleteLabel->setBuddy(m_diffDeleteButton);
- TQLabel* notInCvsLabel = new TQLabel(i18n("Not in cvs:"), tqcolorGroupBox);
- m_notInCvsButton = new KColorButton(tqcolorGroupBox);
+ TQLabel* notInCvsLabel = new TQLabel(i18n("Not in cvs:"), colorGroupBox);
+ m_notInCvsButton = new KColorButton(colorGroupBox);
notInCvsLabel->setBuddy(m_notInCvsButton);
m_splitterBox = new TQCheckBox(i18n("Split main window &horizontally"), lookPage);
diff --git a/cervisia/settingsdlg_advanced.ui b/cervisia/settingsdlg_advanced.ui
index 2100e8ff..c15d391f 100644
--- a/cervisia/settingsdlg_advanced.ui
+++ b/cervisia/settingsdlg_advanced.ui
@@ -26,7 +26,7 @@
Expanding
-
+
31
41
diff --git a/cervisia/updatedlg.cpp b/cervisia/updatedlg.cpp
index 55243796..1b49493e 100644
--- a/cervisia/updatedlg.cpp
+++ b/cervisia/updatedlg.cpp
@@ -40,7 +40,7 @@ UpdateDialog::UpdateDialog(CvsService_stub* service,
cvsService(service)
{
int const iComboBoxMinWidth(40 * fontMetrics().width('0'));
- int const iWidgetIndent(tqstyle().tqpixelMetric(TQStyle::PM_ExclusiveIndicatorWidth, 0) + 6);
+ int const iWidgetIndent(tqstyle().pixelMetric(TQStyle::PM_ExclusiveIndicatorWidth, 0) + 6);
TQFrame* mainWidget = makeMainWidget();
diff --git a/cervisia/updateview.cpp b/cervisia/updateview.cpp
index 47ab5c65..52e44b2e 100644
--- a/cervisia/updateview.cpp
+++ b/cervisia/updateview.cpp
@@ -35,7 +35,7 @@
using Cervisia::Entry;
-using Cervisia::EntrytqStatus;
+using Cervisia::EntryStatus;
UpdateView::UpdateView(KConfig& partConfig, TQWidget *parent, const char *name)
@@ -65,13 +65,13 @@ UpdateView::UpdateView(KConfig& partConfig, TQWidget *parent, const char *name)
for (int col = 0; col < columns(); ++col)
setColumnWidthMode(col, TQListView::Manual);
- restoreLayout(&m_partConfig, TQString::tqfromLatin1("UpdateView"));
+ restoreLayout(&m_partConfig, TQString::fromLatin1("UpdateView"));
}
UpdateView::~UpdateView()
{
- saveLayout(&m_partConfig, TQString::tqfromLatin1("UpdateView"));
+ saveLayout(&m_partConfig, TQString::fromLatin1("UpdateView"));
}
@@ -548,7 +548,7 @@ void UpdateView::updateColors()
/**
- * Process one line from the output of 'cvs update'. If parseAstqStatus
+ * Process one line from the output of 'cvs update'. If parseAsStatus
* is true, it is assumed that the output is from a command
* 'cvs update -n', i.e. cvs actually changes no files.
*/
@@ -556,7 +556,7 @@ void UpdateView::processUpdateLine(TQString str)
{
if (str.length() > 2 && str[1] == ' ')
{
- EntrytqStatus status(Cervisia::Unknown);
+ EntryStatus status(Cervisia::Unknown);
switch (str[0].latin1())
{
case 'C':
@@ -586,8 +586,8 @@ void UpdateView::processUpdateLine(TQString str)
updateItem(str.mid(2), status, false);
}
- const TQString removedFileStart(TQString::tqfromLatin1("cvs server: "));
- const TQString removedFileEnd(TQString::tqfromLatin1(" is no longer in the repository"));
+ const TQString removedFileStart(TQString::fromLatin1("cvs server: "));
+ const TQString removedFileEnd(TQString::fromLatin1(" is no longer in the repository"));
if (str.startsWith(removedFileStart) && str.endsWith(removedFileEnd))
{
}
@@ -600,7 +600,7 @@ void UpdateView::processUpdateLine(TQString str)
}
-void UpdateView::updateItem(const TQString& filePath, EntrytqStatus status, bool isdir)
+void UpdateView::updateItem(const TQString& filePath, EntryStatus status, bool isdir)
{
if (isdir && filePath == TQChar('.'))
return;
diff --git a/cervisia/updateview.h b/cervisia/updateview.h
index 181cf739..9fde0956 100644
--- a/cervisia/updateview.h
+++ b/cervisia/updateview.h
@@ -86,7 +86,7 @@ private slots:
void itemExecuted(TQListViewItem *item);
private:
- void updateItem(const TQString &filename, Cervisia::EntrytqStatus status, bool isdir);
+ void updateItem(const TQString &filename, Cervisia::EntryStatus status, bool isdir);
void rememberSelection(bool recursive);
void syncSelection();
void markUpdated(bool laststage, bool success);
diff --git a/cervisia/updateview_items.cpp b/cervisia/updateview_items.cpp
index 4e07c1ab..99276c3c 100644
--- a/cervisia/updateview_items.cpp
+++ b/cervisia/updateview_items.cpp
@@ -39,7 +39,7 @@
using Cervisia::Entry;
-using Cervisia::EntrytqStatus;
+using Cervisia::EntryStatus;
// ------------------------------------------------------------------------------
@@ -103,7 +103,7 @@ UpdateDirItem::UpdateDirItem(UpdateView* parent,
* Update the status of an item; if it doesn't exist yet, create new one
*/
void UpdateDirItem::updateChildItem(const TQString& name,
- EntrytqStatus status,
+ EntryStatus status,
bool isdir)
{
if (UpdateItem* item = findItem(name))
@@ -111,7 +111,7 @@ void UpdateDirItem::updateChildItem(const TQString& name,
if (isFileItem(item))
{
UpdateFileItem* fileItem = static_cast(item);
- fileItem->settqStatus(status);
+ fileItem->setStatus(status);
}
return;
}
@@ -127,7 +127,7 @@ void UpdateDirItem::updateChildItem(const TQString& name,
else
{
entry.m_type = Entry::File;
- createFileItem(entry)->settqStatus(status);
+ createFileItem(entry)->setStatus(status);
}
}
@@ -150,7 +150,7 @@ void UpdateDirItem::updateEntriesItem(const Entry& entry,
entry.m_status == Cervisia::LocallyRemoved ||
entry.m_status == Cervisia::Conflict)
{
- fileItem->settqStatus(entry.m_status);
+ fileItem->setStatus(entry.m_status);
}
fileItem->setRevTag(entry.m_revision, entry.m_tag);
fileItem->setDate(entry.m_dateTime);
@@ -288,7 +288,7 @@ TQDateTime parseDateTime(const TQString &s)
TQDate date( year, month, day );
TQTime time;
int hour, minute, second;
- int pivot = s.find( TQRegExp(TQString::tqfromLatin1("[0-9][0-9]:[0-9][0-9]:[0-9][0-9]")) );
+ int pivot = s.find( TQRegExp(TQString::fromLatin1("[0-9][0-9]:[0-9][0-9]:[0-9][0-9]")) );
if ( pivot != -1 ) {
hour = s.mid( pivot, 2 ).toInt();
minute = s.mid( pivot+3, 2 ).toInt();
@@ -392,7 +392,7 @@ void UpdateDirItem::syncWithDirectory()
// is file removed?
if (!dir.exists(it.key()))
{
- fileItem->settqStatus(Cervisia::Removed);
+ fileItem->setStatus(Cervisia::Removed);
fileItem->setRevTag(TQString(), TQString());
}
}
@@ -501,7 +501,7 @@ UpdateFileItem::UpdateFileItem(UpdateDirItem* parent, const Entry& entry)
}
-void UpdateFileItem::settqStatus(EntrytqStatus status)
+void UpdateFileItem::setStatus(EntryStatus status)
{
if (status != m_entry.m_status)
{
@@ -598,13 +598,13 @@ void UpdateFileItem::setDate(const TQDateTime& date)
void UpdateFileItem::markUpdated(bool laststage,
bool success)
{
- EntrytqStatus newstatus = m_entry.m_status;
+ EntryStatus newstatus = m_entry.m_status;
if (laststage)
{
if (undefinedState() && m_entry.m_status != Cervisia::NotInCVS)
newstatus = success? Cervisia::UpToDate : Cervisia::Unknown;
- settqStatus(newstatus);
+ setStatus(newstatus);
}
else
setUndefinedState(true);
@@ -668,7 +668,7 @@ int UpdateFileItem::compare(TQListViewItem* i,
case MimeType:
iResult = KMimeType::findByPath(entry().m_name)->comment().localeAwareCompare(KMimeType::findByPath(item->entry().m_name)->comment());
break;
- case tqStatus:
+ case Status:
if ((iResult = ::compare(statusClass(), item->statusClass())) == 0)
iResult = entry().m_name.localeAwareCompare(item->entry().m_name);
break;
@@ -698,7 +698,7 @@ TQString UpdateFileItem::text(int column) const
case MimeType:
result = KMimeType::findByPath(entry().m_name)->comment();
break;
- case tqStatus:
+ case Status:
result = toString(entry().m_status);
break;
case Revision:
diff --git a/cervisia/updateview_items.h b/cervisia/updateview_items.h
index ca26930f..b3a034c3 100644
--- a/cervisia/updateview_items.h
+++ b/cervisia/updateview_items.h
@@ -78,7 +78,7 @@ public:
void syncWithDirectory();
void syncWithEntries();
- void updateChildItem(const TQString& name, Cervisia::EntrytqStatus status, bool isdir);
+ void updateChildItem(const TQString& name, Cervisia::EntryStatus status, bool isdir);
void updateEntriesItem(const Cervisia::Entry& entry, bool isBinary);
bool wasScanned() const { return m_opened; }
@@ -119,7 +119,7 @@ class UpdateFileItem : public UpdateItem
{
public:
- enum { Name, MimeType, tqStatus, Revision, TagOrDate, Timestamp };
+ enum { Name, MimeType, Status, Revision, TagOrDate, Timestamp };
UpdateFileItem(UpdateDirItem* parent, const Cervisia::Entry& entry);
@@ -132,7 +132,7 @@ public:
int col, int width, int align);
virtual int rtti() const { return RTTI; }
- void settqStatus(Cervisia::EntrytqStatus status);
+ void setStatus(Cervisia::EntryStatus status);
void setRevTag(const TQString& rev, const TQString& tag);
void setDate(const TQDateTime& date);
void setUndefinedState(bool b)
diff --git a/kbabel/addons/kfile-plugins/kfile_po.cpp b/kbabel/addons/kfile-plugins/kfile_po.cpp
index cb2b6390..156f52c1 100644
--- a/kbabel/addons/kfile-plugins/kfile_po.cpp
+++ b/kbabel/addons/kfile-plugins/kfile_po.cpp
@@ -62,7 +62,7 @@ bool KPoPlugin::readInfo(KFileMetaInfo& metaInfo, uint)
{
PoInfo poInfo;
TQStringList wordList;
- ConversiontqStatus status = PoInfo::info(metaInfo.path(), poInfo, wordList, false, false, false);
+ ConversionStatus status = PoInfo::info(metaInfo.path(), poInfo, wordList, false, false, false);
if (status == OK) {
KFileMetaInfoGroup group = appendGroup(metaInfo, "CatalogInfo");
diff --git a/kbabel/catalogmanager/catalogmanager.cpp b/kbabel/catalogmanager/catalogmanager.cpp
index 572c593c..60b0b8b8 100644
--- a/kbabel/catalogmanager/catalogmanager.cpp
+++ b/kbabel/catalogmanager/catalogmanager.cpp
@@ -431,7 +431,7 @@ void CatalogManager::setupActions()
(void)new KAction( i18n( "Commit Marked" ), 0, TQT_TQOBJECT(_catalogManager),
TQT_SLOT( cvsCommitMarked( ) ), actionCollection( ), "cvs_commit_marked" );
(void)new KAction( i18n( "Status" ), 0, TQT_TQOBJECT(_catalogManager),
- TQT_SLOT( cvstqStatus( ) ), actionCollection( ), "cvs_status" );
+ TQT_SLOT( cvsStatus( ) ), actionCollection( ), "cvs_status" );
(void)new KAction( i18n( "Status for Marked" ), 0, TQT_TQOBJECT(_catalogManager),
TQT_SLOT( cvsStatusMarked( ) ), actionCollection( ), "cvs_status_marked" );
(void)new KAction( i18n( "Show Diff" ), 0, TQT_TQOBJECT(_catalogManager),
@@ -552,7 +552,7 @@ void CatalogManager::setupStatusBar()
_statusProgressBar->hide();
statusBar()->addWidget(progressBox,1);
- statusBar()->setMinimumHeight(_statusProgressBar->tqsizeHint().height());
+ statusBar()->setMinimumHeight(_statusProgressBar->sizeHint().height());
TQWhatsThis::add(statusBar(),
i18n("Statusbar
\n"
diff --git a/kbabel/catalogmanager/catalogmanagerview.cpp b/kbabel/catalogmanager/catalogmanagerview.cpp
index 2473af73..88678fa8 100644
--- a/kbabel/catalogmanager/catalogmanagerview.cpp
+++ b/kbabel/catalogmanager/catalogmanagerview.cpp
@@ -807,7 +807,7 @@ void CatalogManagerView::checkSyntax()
if(!item->hasPo())
return;
- Msgfmt::tqStatus status;
+ Msgfmt::Status status;
TQString output;
Msgfmt msgfmt;
@@ -850,7 +850,7 @@ void CatalogManagerView::checkSyntax()
}
else
{
- Msgfmt::tqStatus status;
+ Msgfmt::Status status;
TQString output;
Msgfmt msgfmt;
@@ -1082,14 +1082,14 @@ void CatalogManagerView::cvsCommitMarked( )
doCVSCommand( CVS::Commit, true );
}
-void CatalogManagerView::cvstqStatus( )
+void CatalogManagerView::cvsStatus( )
{
- doCVSCommand( CVS::tqStatus );
+ doCVSCommand( CVS::Status );
}
void CatalogManagerView::cvsStatusMarked( )
{
- doCVSCommand( CVS::tqStatus, true );
+ doCVSCommand( CVS::Status, true );
}
void CatalogManagerView::cvsUpdateTemplate( )
@@ -3008,7 +3008,7 @@ void CatalogManagerView::validate_internal( const TQStringList& files, const KDa
true, i18n("Validation Options"), KDialogBase::Ok|KDialogBase::Cancel);
_validateOptions = new ValidationOptions(_validateOptionsDlg);
_validateOptionsDlg->setMainWidget( _validateOptions );
- _validateOptions->resize( _validateOptions->tqsizeHint() );
+ _validateOptions->resize( _validateOptions->sizeHint() );
// setup stored values
_validateOptions->markAsFuzzy->setChecked( _markAsFuzzy );
diff --git a/kbabel/catalogmanager/catalogmanagerview.h b/kbabel/catalogmanager/catalogmanagerview.h
index d923a3bb..398a796a 100644
--- a/kbabel/catalogmanager/catalogmanagerview.h
+++ b/kbabel/catalogmanager/catalogmanagerview.h
@@ -161,7 +161,7 @@ public slots:
void cvsUpdateMarked( );
void cvsCommit( );
void cvsCommitMarked( );
- void cvstqStatus( );
+ void cvsStatus( );
void cvsStatusMarked( );
void cvsUpdateTemplate( );
void cvsUpdateMarkedTemplate( );
diff --git a/kbabel/catalogmanager/catmanlistitem.cpp b/kbabel/catalogmanager/catmanlistitem.cpp
index d5997dd5..c836a956 100644
--- a/kbabel/catalogmanager/catmanlistitem.cpp
+++ b/kbabel/catalogmanager/catmanlistitem.cpp
@@ -417,7 +417,7 @@ void CatManListItem::update(bool showPoInfo,bool includeChildren
if(showPoInfo)
{
- _lastUpdated=TQDateTime::tqcurrentDateTime();
+ _lastUpdated=TQDateTime::currentDateTime();
bool neededWork=needsWork();
bool needWork=false;
@@ -435,17 +435,17 @@ void CatManListItem::update(bool showPoInfo,bool includeChildren
const CVSHandler* cvsHandler = _view->cvsHandler();
const SVNHandler* svnHandler = _view->svnHandler();
- const CVSHandler::FiletqStatus cvsFiletqStatus = cvsHandler->fstatus( poFile() );
- const SVNHandler::FiletqStatus svnFiletqStatus = svnHandler->fstatus( poFile() );
+ const CVSHandler::FileStatus cvsFileStatus = cvsHandler->fstatus( poFile() );
+ const SVNHandler::FileStatus svnFileStatus = svnHandler->fstatus( poFile() );
- _isModified = cvsHandler->isConsideredModified( cvsFiletqStatus )
- || svnHandler->isConsideredModified( svnFiletqStatus );
+ _isModified = cvsHandler->isConsideredModified( cvsFileStatus )
+ || svnHandler->isConsideredModified( svnFileStatus );
TQString versionControl;
- if ( cvsFiletqStatus != CVSHandler::NO_REPOSITORY )
- versionControl = cvsHandler->filetqStatus( cvsFiletqStatus );
- else if ( svnFiletqStatus != SVNHandler::NO_REPOSITORY )
- versionControl = svnHandler->filetqStatus( svnFiletqStatus );
+ if ( cvsFileStatus != CVSHandler::NO_REPOSITORY )
+ versionControl = cvsHandler->fileStatus( cvsFileStatus );
+ else if ( svnFileStatus != SVNHandler::NO_REPOSITORY )
+ versionControl = svnHandler->fileStatus( svnFileStatus );
else
versionControl = i18n("No version control");
@@ -532,7 +532,7 @@ void CatManListItem::update(bool showPoInfo,bool includeChildren
if(showPoInfo)
{
- _lastUpdated=TQDateTime::tqcurrentDateTime();
+ _lastUpdated=TQDateTime::currentDateTime();
// clean previous state information
setText(COL_FUZZY,TQString());
@@ -617,7 +617,7 @@ void CatManListItem::updateAfterSave( PoInfo &poInfo )
TQString name=_primary.fileName();
setText(COL_NAME,name.left(name.length()-3));
- _lastUpdated=TQDateTime::tqcurrentDateTime();
+ _lastUpdated=TQDateTime::currentDateTime();
bool neededWork=needsWork();
bool needWork=false;
@@ -625,14 +625,14 @@ void CatManListItem::updateAfterSave( PoInfo &poInfo )
TQPixmap icon;
_hasErrors=false;
- const CVSHandler::FiletqStatus cvsFiletqStatus = _view->cvsHandler()->fstatus(poFile());
- const SVNHandler::FiletqStatus svnFiletqStatus = _view->svnHandler()->fstatus(poFile());
+ const CVSHandler::FileStatus cvsFileStatus = _view->cvsHandler()->fstatus(poFile());
+ const SVNHandler::FileStatus svnFileStatus = _view->svnHandler()->fstatus(poFile());
TQString versionControl;
- if ( cvsFiletqStatus != CVSHandler::NO_REPOSITORY )
- versionControl = _view->cvsHandler()->filetqStatus( cvsFiletqStatus );
- else if ( svnFiletqStatus != SVNHandler::NO_REPOSITORY )
- versionControl = _view->svnHandler()->filetqStatus( svnFiletqStatus );
+ if ( cvsFileStatus != CVSHandler::NO_REPOSITORY )
+ versionControl = _view->cvsHandler()->fileStatus( cvsFileStatus );
+ else if ( svnFileStatus != SVNHandler::NO_REPOSITORY )
+ versionControl = _view->svnHandler()->fileStatus( svnFileStatus );
else
versionControl = i18n("No version control");
diff --git a/kbabel/catalogmanager/libcvs/cvsdialog.cpp b/kbabel/catalogmanager/libcvs/cvsdialog.cpp
index 1cfd6ab7..798bb51f 100644
--- a/kbabel/catalogmanager/libcvs/cvsdialog.cpp
+++ b/kbabel/catalogmanager/libcvs/cvsdialog.cpp
@@ -79,7 +79,7 @@ CVSDialog::CVSDialog( CVS::Command cmd, TQWidget * parent, KSharedConfig* config
case CVS::Commit:
temp = i18n( "Commit the following files:" );
break;
- case CVS::tqStatus:
+ case CVS::Status:
temp = i18n( "Get status for the following files:" );
break;
case CVS::Diff:
@@ -143,7 +143,7 @@ CVSDialog::CVSDialog( CVS::Command cmd, TQWidget * parent, KSharedConfig* config
case CVS::Commit:
temp = i18n( "&Commit" );
break;
- case CVS::tqStatus:
+ case CVS::Status:
temp = i18n( "&Get Status" );
break;
case CVS::Diff:
@@ -168,7 +168,7 @@ CVSDialog::CVSDialog( CVS::Command cmd, TQWidget * parent, KSharedConfig* config
output->setReadOnly( true );
tqlayout->addWidget( output );
- resize( TQSize( 600, 450 ).expandedTo( tqminimumSizeHint( ) ) );
+ resize( TQSize( 600, 450 ).expandedTo( minimumSizeHint( ) ) );
if ( cmd == CVS::Commit )
logedit->setFocus( );
@@ -330,7 +330,7 @@ void CVSDialog::slotProcessStdout( KProcess*, char * buffer, int len )
output->setCursorPosition( output->lines( ), 0 );
// If the command is 'cvs status' or 'cvs diff' collect the output of stdout.
- if ( (_cmd == CVS::tqStatus) || (_cmd == CVS::Diff) )
+ if ( (_cmd == CVS::Status) || (_cmd == CVS::Diff) )
_statusOutput += TQString::fromLocal8Bit( buffer, len );
}
diff --git a/kbabel/catalogmanager/libcvs/cvshandler.cpp b/kbabel/catalogmanager/libcvs/cvshandler.cpp
index b0764af8..cf067f9c 100644
--- a/kbabel/catalogmanager/libcvs/cvshandler.cpp
+++ b/kbabel/catalogmanager/libcvs/cvshandler.cpp
@@ -81,7 +81,7 @@ void CVSHandler::setPOTBaseDir( const TQString& dir )
emit signalIsPOTRepository( _isPOTRepository );
}
-TQString CVSHandler::filetqStatus( const FiletqStatus status ) const
+TQString CVSHandler::fileStatus( const FileStatus status ) const
{
switch ( status ) {
case NO_REPOSITORY:
@@ -111,7 +111,7 @@ TQString CVSHandler::filetqStatus( const FiletqStatus status ) const
}
}
-CVSHandler::FiletqStatus CVSHandler::fstatus( const TQString& filename ) const
+CVSHandler::FileStatus CVSHandler::fstatus( const TQString& filename ) const
{
// no valid repository
if ( !_isPORepository )
@@ -177,7 +177,7 @@ CVSHandler::FiletqStatus CVSHandler::fstatus( const TQString& filename ) const
return UP_TO_DATE;
}
-TQString CVSHandler::cvstqStatus( const TQString& filename ) const
+TQString CVSHandler::cvsStatus( const TQString& filename ) const
{
return map[filename];
}
@@ -210,7 +210,7 @@ void CVSHandler::execCVSCommand( TQWidget* parent, CVS::Command cmd, const TQStr
command += "commit -F @LOG@FILE@";
checkToAdd( TQStringList( filename ) );
break;
- case CVS::tqStatus:
+ case CVS::Status:
command += "status";
break;
case CVS::Diff:
@@ -241,7 +241,7 @@ void CVSHandler::execCVSCommand( TQWidget* parent, CVS::Command cmd, const TQStr
command += "commit -F @LOG@FILE@";
checkToAdd( files );
break;
- case CVS::tqStatus:
+ case CVS::Status:
command += "status";
break;
case CVS::Diff:
@@ -280,7 +280,7 @@ void CVSHandler::showDialog( TQWidget* parent, CVS::Command cmd, const TQStringL
}
if ( dia->exec( ) == KDialog::Accepted ) {
- if ( cmd == CVS::tqStatus )
+ if ( cmd == CVS::Status )
processStatusOutput( dia->statusOutput( ) );
if ( cmd == CVS::Diff )
processDiff( dia->statusOutput( ) );
@@ -383,7 +383,7 @@ void CVSHandler::processDiff( TQString output )
KMessageBox::error( 0, error );
}
-bool CVSHandler::isConsideredModified( const FiletqStatus status ) const
+bool CVSHandler::isConsideredModified( const FileStatus status ) const
{
/*
* A file is modified if it is either:
diff --git a/kbabel/catalogmanager/libcvs/cvshandler.h b/kbabel/catalogmanager/libcvs/cvshandler.h
index 1c08af92..5aeba57b 100644
--- a/kbabel/catalogmanager/libcvs/cvshandler.h
+++ b/kbabel/catalogmanager/libcvs/cvshandler.h
@@ -60,7 +60,7 @@ class CVSHandler : public TQObject
TQ_OBJECT
public:
- enum FiletqStatus {
+ enum FileStatus {
NO_REPOSITORY,
NOT_IN_CVS,
LOCALLY_ADDED,
@@ -75,9 +75,9 @@ class CVSHandler : public TQObject
void setPOBaseDir( const TQString& dir );
void setPOTBaseDir( const TQString& dir );
- FiletqStatus fstatus( const TQString& filename ) const;
- TQString filetqStatus( const FiletqStatus status ) const;
- TQString cvstqStatus( const TQString& filename ) const;
+ FileStatus fstatus( const TQString& filename ) const;
+ TQString fileStatus( const FileStatus status ) const;
+ TQString cvsStatus( const TQString& filename ) const;
void execCVSCommand( TQWidget* parent, CVS::Command cmd, const TQString& filename, bool templates, KSharedConfig* config );
void execCVSCommand( TQWidget* parent, CVS::Command cmd, const TQStringList& files, bool templates, KSharedConfig* config );
@@ -87,7 +87,7 @@ class CVSHandler : public TQObject
/**
* True if the file was modified or has another status considered as a modification
*/
- bool isConsideredModified( const FiletqStatus status ) const;
+ bool isConsideredModified( const FileStatus status ) const;
signals:
void signalIsPORepository( bool );
diff --git a/kbabel/catalogmanager/libcvs/cvsresources.h b/kbabel/catalogmanager/libcvs/cvsresources.h
index 4c2bc144..9cac64db 100644
--- a/kbabel/catalogmanager/libcvs/cvsresources.h
+++ b/kbabel/catalogmanager/libcvs/cvsresources.h
@@ -35,7 +35,7 @@
#define CVSRESOURCES_H
namespace CVS {
- enum Command { Update, Commit, tqStatus, Diff };
+ enum Command { Update, Commit, Status, Diff };
}
#endif // CVSRESOURCES_H
diff --git a/kbabel/catalogmanager/libsvn/svndialog.cpp b/kbabel/catalogmanager/libsvn/svndialog.cpp
index 756ace69..b1b6d4de 100644
--- a/kbabel/catalogmanager/libsvn/svndialog.cpp
+++ b/kbabel/catalogmanager/libsvn/svndialog.cpp
@@ -163,7 +163,7 @@ SVNDialog::SVNDialog( SVN::Command cmd, TQWidget * parent, KSharedConfig* config
output->setReadOnly( true );
tqlayout->addWidget( output );
- resize( TQSize( 600, 450 ).expandedTo( tqminimumSizeHint( ) ) );
+ resize( TQSize( 600, 450 ).expandedTo( minimumSizeHint( ) ) );
if ( cmd == SVN::Commit )
logedit->setFocus( );
diff --git a/kbabel/catalogmanager/libsvn/svnhandler.cpp b/kbabel/catalogmanager/libsvn/svnhandler.cpp
index 5f91e1e8..d00c0858 100644
--- a/kbabel/catalogmanager/libsvn/svnhandler.cpp
+++ b/kbabel/catalogmanager/libsvn/svnhandler.cpp
@@ -83,7 +83,7 @@ void SVNHandler::setPOTBaseDir( const TQString& dir )
emit signalIsPOTRepository( _isPOTRepository );
}
-TQString SVNHandler::filetqStatus( const FiletqStatus status ) const
+TQString SVNHandler::fileStatus( const FileStatus status ) const
{
switch ( status ) {
case NO_REPOSITORY:
@@ -115,7 +115,7 @@ TQString SVNHandler::filetqStatus( const FiletqStatus status ) const
}
}
-SVNHandler::FiletqStatus SVNHandler::fstatus( const TQString& filename ) const
+SVNHandler::FileStatus SVNHandler::fstatus( const TQString& filename ) const
{
// no valid repository
if ( !_isPORepository )
@@ -145,7 +145,7 @@ SVNHandler::FiletqStatus SVNHandler::fstatus( const TQString& filename ) const
int errorLine, errorCol;
TQDomNodeList nodelist;
TQDomNode node;
- TQDomElement entry, wctqStatus;
+ TQDomElement entry, wcStatus;
// Parse the output.
if ( !doc.setContent( out.getOutput(), &errorMsg, &errorLine, &errorCol ) ) {
@@ -177,22 +177,22 @@ SVNHandler::FiletqStatus SVNHandler::fstatus( const TQString& filename ) const
if ( node.isNull() )
return ERROR_IN_WC;
- wctqStatus = node.toElement();
+ wcStatus = node.toElement();
- if ( wctqStatus.attributeNode("item").value() == "normal" )
+ if ( wcStatus.attributeNode("item").value() == "normal" )
return UP_TO_DATE;
- if ( wctqStatus.attributeNode("item").value() == "modified" )
+ if ( wcStatus.attributeNode("item").value() == "modified" )
return LOCALLY_MODIFIED;
- if ( wctqStatus.attributeNode("item").value() == "conflicted" )
+ if ( wcStatus.attributeNode("item").value() == "conflicted" )
return CONFLICT;
- if ( wctqStatus.attributeNode("item").value() == "unversioned" )
+ if ( wcStatus.attributeNode("item").value() == "unversioned" )
return NOT_IN_SVN;
// TODO Ignored entry should have separate return value probably.
- if ( wctqStatus.attributeNode("item").value() == "ignored" )
+ if ( wcStatus.attributeNode("item").value() == "ignored" )
return NOT_IN_SVN;
- if ( wctqStatus.attributeNode("item").value() == "added" )
+ if ( wcStatus.attributeNode("item").value() == "added" )
return LOCALLY_ADDED;
- if ( wctqStatus.attributeNode("item").value() == "deleted" )
+ if ( wcStatus.attributeNode("item").value() == "deleted" )
return LOCALLY_REMOVED;
// TODO What to do with "missing", "incomplete", "replaced", "merged",
// "obstructed", "external"? Can these appear at all in our case?
@@ -269,7 +269,7 @@ no_status_xml:
}
-TQString SVNHandler::svntqStatus( const TQString& filename ) const
+TQString SVNHandler::svnStatus( const TQString& filename ) const
{
return map[filename];
}
@@ -491,7 +491,7 @@ void SVNHandler::processDiff( TQString output )
KMessageBox::error( 0, error );
}
-bool SVNHandler::isConsideredModified( const FiletqStatus status ) const
+bool SVNHandler::isConsideredModified( const FileStatus status ) const
{
/*
* A file is modified if it is either:
diff --git a/kbabel/catalogmanager/libsvn/svnhandler.h b/kbabel/catalogmanager/libsvn/svnhandler.h
index 57ce13b4..2506d0bd 100644
--- a/kbabel/catalogmanager/libsvn/svnhandler.h
+++ b/kbabel/catalogmanager/libsvn/svnhandler.h
@@ -58,7 +58,7 @@ class SVNHandler : public TQObject
TQ_OBJECT
public:
- enum FiletqStatus {
+ enum FileStatus {
NO_REPOSITORY,
NOT_IN_SVN,
LOCALLY_ADDED,
@@ -74,9 +74,9 @@ class SVNHandler : public TQObject
void setPOBaseDir( const TQString& dir );
void setPOTBaseDir( const TQString& dir );
- FiletqStatus fstatus( const TQString& filename ) const;
- TQString filetqStatus( const FiletqStatus status ) const;
- TQString svntqStatus( const TQString& filename ) const;
+ FileStatus fstatus( const TQString& filename ) const;
+ TQString fileStatus( const FileStatus status ) const;
+ TQString svnStatus( const TQString& filename ) const;
void execSVNCommand( TQWidget* parent, SVN::Command cmd, const TQString& filename, bool templates, KSharedConfig* config );
void execSVNCommand( TQWidget* parent, SVN::Command cmd, const TQStringList& files, bool templates, KSharedConfig* config );
@@ -86,7 +86,7 @@ class SVNHandler : public TQObject
/**
* True if the file was modified or has another status considered as a modification
*/
- bool isConsideredModified( const FiletqStatus status ) const;
+ bool isConsideredModified( const FileStatus status ) const;
signals:
void signalIsPORepository( bool );
diff --git a/kbabel/catalogmanager/validateprogresswidget.ui b/kbabel/catalogmanager/validateprogresswidget.ui
index 01cb4c5f..f0fd4bd8 100644
--- a/kbabel/catalogmanager/validateprogresswidget.ui
+++ b/kbabel/catalogmanager/validateprogresswidget.ui
@@ -28,7 +28,7 @@
_currentAction
-
+
92
0
diff --git a/kbabel/common/catalog.cpp b/kbabel/common/catalog.cpp
index 00c9491d..01c8bab9 100644
--- a/kbabel/common/catalog.cpp
+++ b/kbabel/common/catalog.cpp
@@ -578,12 +578,12 @@ CatalogItem Catalog::updatedHeader(CatalogItem oldHeader, bool usePrefs) const
if( saveOptions.FSFCopyright == ProjectSettingsBase::Remove)
(*it).remove(" YEAR Free Software Foundation, Inc");
else
- (*it).replace("YEAR", TQDate::tqcurrentDate().toString("yyyy"));
+ (*it).replace("YEAR", TQDate::currentDate().toString("yyyy"));
} else
if( saveOptions.FSFCopyright == ProjectSettingsBase::Update )
{
//update years
- TQString cy = TQDate::tqcurrentDate().toString("yyyy");
+ TQString cy = TQDate::currentDate().toString("yyyy");
if( !(*it).contains( TQRegExp(cy)) ) // is the year already included?
{
int index = (*it).findRev( TQRegExp("[\\d]+[\\d\\-, ]*") );
@@ -674,7 +674,7 @@ CatalogItem Catalog::updatedHeader(CatalogItem oldHeader, bool usePrefs) const
{
temp+=(" <"+identityOptions.authorEmail+">");
}
- temp+=", "+TQDate::tqcurrentDate().toString("yyyy")+".";
+ temp+=", "+TQDate::currentDate().toString("yyyy")+".";
// ### TODO: it would be nice if the entry could start with "COPYRIGHT" and have the "(C)" symbol (both not mandatory)
TQRegExp regexpAuthorYear( "^#.*(<.+@.+>)?,\\s*([\\d]+[\\d\\-, ]*|YEAR)" );
@@ -721,7 +721,7 @@ CatalogItem Catalog::updatedHeader(CatalogItem oldHeader, bool usePrefs) const
found = false;
bool foundAuthor = false;
- const TQString cy = TQDate::tqcurrentDate().toString("yyyy");
+ const TQString cy = TQDate::currentDate().toString("yyyy");
ait = foundAuthors.end();
for( it = foundAuthors.begin() ; it!=foundAuthors.end(); ++it )
@@ -816,7 +816,7 @@ void Catalog::setFuzzy(uint index, bool on)
}
-void Catalog::removeFuzzytqStatus(uint index)
+void Catalog::removeFuzzyStatus(uint index)
{
setFuzzy(index,false);
}
@@ -888,10 +888,10 @@ TQString Catalog::encoding() const
return encodingStr;
}
-ConversiontqStatus Catalog::openURL(const KURL& url, const TQString& package)
+ConversionStatus Catalog::openURL(const KURL& url, const TQString& package)
{
TQString target;
- ConversiontqStatus error = OK;
+ ConversionStatus error = OK;
if(KIO::NetAccess::download(url, target, NULL))
{
@@ -992,10 +992,10 @@ ConversiontqStatus Catalog::openURL(const KURL& url, const TQString& package)
}
}
-ConversiontqStatus Catalog::openURL(const KURL& openUrl, const KURL& saveURL, const TQString& package)
+ConversionStatus Catalog::openURL(const KURL& openUrl, const KURL& saveURL, const TQString& package)
{
TQString target;
- ConversiontqStatus error = OK;
+ ConversionStatus error = OK;
if(KIO::NetAccess::download(openUrl, target, NULL))
{
@@ -1093,7 +1093,7 @@ ConversiontqStatus Catalog::openURL(const KURL& openUrl, const KURL& saveURL, co
}
}
-Msgfmt::tqStatus Catalog::checkSyntax(TQString& output, bool clearErrors)
+Msgfmt::Status Catalog::checkSyntax(TQString& output, bool clearErrors)
{
if( !d->_mimeTypes.contains( "application/x-gettext" ) )
return Msgfmt::Unsupported;
@@ -1112,7 +1112,7 @@ Msgfmt::tqStatus Catalog::checkSyntax(TQString& output, bool clearErrors)
}
Msgfmt msgfmt;
- Msgfmt::tqStatus result = msgfmt.checkSyntax( filename , output, pluralFormType() != KDESpecific );
+ Msgfmt::Status result = msgfmt.checkSyntax( filename , output, pluralFormType() != KDESpecific );
if( clearErrors) clearErrorList();
@@ -1185,7 +1185,7 @@ void Catalog::removeFromErrorList(uint index)
}
}
-TQStringList Catalog::itemtqStatus(uint index, bool recheck, TQPtrList whatToCheck)
+TQStringList Catalog::itemStatus(uint index, bool recheck, TQPtrList whatToCheck)
{
if ( d->_entries.isEmpty() )
return TQStringList();
@@ -1207,7 +1207,7 @@ TQStringList Catalog::itemtqStatus(uint index, bool recheck, TQPtrList_entries.isEmpty() )
return TQStringList();
@@ -1800,7 +1800,7 @@ int Catalog::findPrevInList(const TQValueList& list,uint index) const
TQString Catalog::dateTime() const
{
- const TQDateTime dt = TQDateTime::tqcurrentDateTime();
+ const TQDateTime dt = TQDateTime::currentDateTime();
TQString dateTimeString;
const SaveSettings options = d->_project->saveSettings();
@@ -1936,7 +1936,7 @@ TQString Catalog::dateTime() const
}
-ConversiontqStatus Catalog::saveFile()
+ConversionStatus Catalog::saveFile()
{
if(d->_url.isEmpty())
{
@@ -1947,11 +1947,11 @@ ConversiontqStatus Catalog::saveFile()
return saveFileAs(d->_url,true);
}
-ConversiontqStatus Catalog::saveFileAs(const KURL &url, bool overwrite)
+ConversionStatus Catalog::saveFileAs(const KURL &url, bool overwrite)
{
if( d->_active ) return BUSY;
- ConversiontqStatus status=OK;
+ ConversionStatus status=OK;
bool newName=false;
KURL targetURL=d->_url;
@@ -2043,7 +2043,7 @@ TQString Catalog::saveTempFile()
}
-ConversiontqStatus Catalog::writeFile(TQString localFile , bool overwrite)
+ConversionStatus Catalog::writeFile(TQString localFile , bool overwrite)
{
TQFileInfo info(localFile);
@@ -2066,7 +2066,7 @@ ConversiontqStatus Catalog::writeFile(TQString localFile , bool overwrite)
}
}
- ConversiontqStatus error = OK;
+ ConversionStatus error = OK;
CatalogExportPlugin* filter=0;
// gimme plugin for this MIME type
@@ -2549,7 +2549,7 @@ bool Catalog::findNext(const FindOptions* findOpts, DocPosition& docPos, int& le
int contextInfoPos = -1;
TQString targetStr;
- kapp->tqprocessEvents(10);
+ kapp->processEvents(10);
if( d->_stop || endReached)
{
@@ -2798,7 +2798,7 @@ bool Catalog::findPrev(const FindOptions* findOpts, DocPosition& docPos, int& le
int contextInfoPos = -1;
TQString targetStr;
- kapp->tqprocessEvents(10);
+ kapp->processEvents(10);
if( d->_stop || beginReached)
{
@@ -3155,7 +3155,7 @@ Catalog::DiffResult Catalog::diff(uint entry, TQString *result)
bestId = (*it);
}
- kapp->tqprocessEvents(10);
+ kapp->processEvents(10);
if( d->_stop )
{
@@ -3232,7 +3232,7 @@ void Catalog::setDiffList( const TQValueList& list)
{
oldPercent = percent;
emit signalProgress(percent);
- kapp->tqprocessEvents(10);
+ kapp->processEvents(10);
}
TQString id = (*it).msgid;
diff --git a/kbabel/common/catalog.h b/kbabel/common/catalog.h
index dd8c3a30..a034375e 100644
--- a/kbabel/common/catalog.h
+++ b/kbabel/common/catalog.h
@@ -226,7 +226,7 @@ public:
* @return the list of errors found for a given item index
* @param index index of the item to check
*/
- TQStringList itemtqStatus(uint index);
+ TQStringList itemStatus(uint index);
/**
* @return the list of errors found for a given item index
@@ -234,7 +234,7 @@ public:
* @param recheck flag, if the item status should be checked now
* @param whatToCheck what checks to do (a list of tools to be used
*/
- TQStringList itemtqStatus(uint index, bool recheck, TQPtrList whatToCheck);
+ TQStringList itemStatus(uint index, bool recheck, TQPtrList whatToCheck);
/**
* replaces msgstr in catalog item at index index with msgstr
@@ -253,7 +253,7 @@ public:
bool setHeader(CatalogItem header);
/** removes string ", fuzzy" from comment */
- void removeFuzzytqStatus(uint index);
+ void removeFuzzyStatus(uint index);
/** sets or unsets fuzzy status of entry index */
void setFuzzy(uint index, bool on);
@@ -297,19 +297,19 @@ public:
* opens file url by using KDE's network downlad and calls
* openFile with a local filename
*/
- ConversiontqStatus openURL(const KURL& url, const TQString& package=TQString());
+ ConversionStatus openURL(const KURL& url, const TQString& package=TQString());
/**
* opens file openURL by using KDE's network downlad and calls
* openFile with a local filename
* sets current URL to saveURL
*/
- ConversiontqStatus openURL(const KURL& openURL, const KURL& saveURL, const TQString& package=TQString());
+ ConversionStatus openURL(const KURL& openURL, const KURL& saveURL, const TQString& package=TQString());
/** save the file under the old filename */
- ConversiontqStatus saveFile();
+ ConversionStatus saveFile();
/** saves the file under a new filename */
- ConversiontqStatus saveFileAs(const KURL& url,bool overwrite=false);
+ ConversionStatus saveFileAs(const KURL& url,bool overwrite=false);
/**
* saves the current catalog in a temporary file and
@@ -342,7 +342,7 @@ public:
* @param clearError should the errors be cleared before running msgfmt
* @return the file codec used for the current catalog
*/
- Msgfmt::tqStatus checkSyntax(TQString& output, bool clearErrors=true);
+ Msgfmt::Status checkSyntax(TQString& output, bool clearErrors=true);
/**
* checks using an external tool. The tool must provide the "validate" command
@@ -484,7 +484,7 @@ public:
* the search in po-files. This way, I can easily find the first
* catalog entry in the textstream
*/
-// static ConversiontqStatus readHeader(TQTextStream& stream,CatalogItem& header);
+// static ConversionStatus readHeader(TQTextStream& stream,CatalogItem& header);
void registerView(CatalogView* view);
@@ -612,7 +612,7 @@ private:
void processCommand(EditCommand* cmd, CatalogView* view2exclude=0, bool undo=false);
/** do the actual file write using plugin */
- ConversiontqStatus writeFile(TQString localfile, bool overwrite=false);
+ ConversionStatus writeFile(TQString localfile, bool overwrite=false);
/**
* generates lists that contain indexes of all fuzzy and untranslated entries
diff --git a/kbabel/common/catalogfileplugin.h b/kbabel/common/catalogfileplugin.h
index d4e72a76..631a94b3 100644
--- a/kbabel/common/catalogfileplugin.h
+++ b/kbabel/common/catalogfileplugin.h
@@ -50,7 +50,7 @@ class CatalogExportPluginPrivate;
/**
* Result of the conversion
*/
-enum ConversiontqStatus {
+enum ConversionStatus {
OK,
NOT_IMPLEMENTED,
NO_FILE,
@@ -97,7 +97,7 @@ public:
* @param catalog the catalog to be filled
* @return result of the operation
*/
- ConversiontqStatus open(const TQString& file, const TQString& mimetype, Catalog* catalog);
+ ConversionStatus open(const TQString& file, const TQString& mimetype, Catalog* catalog);
/**
* Reimplement this method to load the local file passed as an argument.
@@ -109,7 +109,7 @@ public:
* @param file file to be loaded
* @param mimetype the expected MIME type (the type used for plugin selection
*/
- virtual ConversiontqStatus load(const TQString& file, const TQString& mimetype) = 0;
+ virtual ConversionStatus load(const TQString& file, const TQString& mimetype) = 0;
/**
* Reimplement this method to return unique identification of your plugin
*/
@@ -183,7 +183,7 @@ class KDE_EXPORT CatalogExportPlugin: public TQObject
public:
CatalogExportPlugin(TQObject* parent, const char* name);
virtual ~CatalogExportPlugin();
- virtual ConversiontqStatus save(const TQString& file, const TQString& mimetype, const Catalog* catalog) = 0;
+ virtual ConversionStatus save(const TQString& file, const TQString& mimetype, const Catalog* catalog) = 0;
static TQStringList availableExportMimeTypes();
diff --git a/kbabel/common/importplugin.cpp b/kbabel/common/importplugin.cpp
index ed6d15ef..e75deca7 100644
--- a/kbabel/common/importplugin.cpp
+++ b/kbabel/common/importplugin.cpp
@@ -99,13 +99,13 @@ void CatalogImportPlugin::setMimeTypes( const TQString& mimetypes )
d->_mimeTypes=mimetypes;
}
-ConversiontqStatus CatalogImportPlugin::open(const TQString& file, const TQString& mimetype, Catalog* catalog)
+ConversionStatus CatalogImportPlugin::open(const TQString& file, const TQString& mimetype, Catalog* catalog)
{
d->_stopped=false;
d->_catalog=catalog;
startTransaction();
- ConversiontqStatus result = load(file, mimetype);
+ ConversionStatus result = load(file, mimetype);
if( d->_stopped )
{
d->_started=false;
diff --git a/kbabel/common/msgfmt.cpp b/kbabel/common/msgfmt.cpp
index f91f25f9..11e6969f 100644
--- a/kbabel/common/msgfmt.cpp
+++ b/kbabel/common/msgfmt.cpp
@@ -51,9 +51,9 @@ Msgfmt::Msgfmt(TQObject* parent,const char* name)
{
}
-Msgfmt::tqStatus Msgfmt::checkSyntax(TQString file,TQString& output, bool gnu)
+Msgfmt::Status Msgfmt::checkSyntax(TQString file,TQString& output, bool gnu)
{
- tqStatus stat=Ok;
+ Status stat=Ok;
// this method does not return the right retrun values at the moment :-(
KProcess proc;
@@ -92,9 +92,9 @@ Msgfmt::tqStatus Msgfmt::checkSyntax(TQString file,TQString& output, bool gnu)
return stat;
}
-Msgfmt::tqStatus Msgfmt::checkSyntaxInDir(TQString dir,TQString regexp,TQString& output)
+Msgfmt::Status Msgfmt::checkSyntaxInDir(TQString dir,TQString regexp,TQString& output)
{
- tqStatus stat=Ok;
+ Status stat=Ok;
// this method does not return the right return values at the moment :-(
KProcess proc;
diff --git a/kbabel/common/msgfmt.h b/kbabel/common/msgfmt.h
index 025a2fdd..c711cf48 100644
--- a/kbabel/common/msgfmt.h
+++ b/kbabel/common/msgfmt.h
@@ -47,11 +47,11 @@ class KDE_EXPORT Msgfmt : private TQObject
Q_OBJECT
TQ_OBJECT
public:
- enum tqStatus{NoExecutable,Ok,SyntaxError,HeaderError,Error,Unsupported};
+ enum Status{NoExecutable,Ok,SyntaxError,HeaderError,Error,Unsupported};
Msgfmt(TQObject* parent=0,const char* name=0);
- tqStatus checkSyntax(TQString file,TQString& output, bool gnu = false);
- tqStatus checkSyntaxInDir(TQString dir,TQString regexp,TQString& output);
+ Status checkSyntax(TQString file,TQString& output, bool gnu = false);
+ Status checkSyntaxInDir(TQString dir,TQString regexp,TQString& output);
private slots:
void addToOutput(KProcess*,char *buffer, int buflen);
diff --git a/kbabel/common/poinfo.cpp b/kbabel/common/poinfo.cpp
index 63a01d38..aa6b1666 100644
--- a/kbabel/common/poinfo.cpp
+++ b/kbabel/common/poinfo.cpp
@@ -350,12 +350,12 @@ PoInfo PoInfo::headerInfo(const CatalogItem& headerItem)
}
-ConversiontqStatus PoInfo::info(const TQString& url, PoInfo& info, TQStringList &wordList, bool updateWordList, bool interactive)
+ConversionStatus PoInfo::info(const TQString& url, PoInfo& info, TQStringList &wordList, bool updateWordList, bool interactive)
{
return PoInfo::info( url, info, wordList, updateWordList, interactive, true);
}
-ConversiontqStatus PoInfo::info(const TQString& url, PoInfo& info, TQStringList &wordList, bool updateWordList, bool interactive, bool msgfmt)
+ConversionStatus PoInfo::info(const TQString& url, PoInfo& info, TQStringList &wordList, bool updateWordList, bool interactive, bool msgfmt)
{
stopStaticRead = false;
@@ -372,7 +372,7 @@ ConversiontqStatus PoInfo::info(const TQString& url, PoInfo& info, TQStringList
// First check file with msgfmt to be sure, it is syntactically correct
Msgfmt msgfmt;
TQString output;
- Msgfmt::tqStatus stat = msgfmt.checkSyntax( target , output );
+ Msgfmt::Status stat = msgfmt.checkSyntax( target , output );
if(stat == Msgfmt::SyntaxError)
{
KIO::NetAccess::removeTempFile(target);
@@ -395,11 +395,11 @@ ConversiontqStatus PoInfo::info(const TQString& url, PoInfo& info, TQStringList
lexer->yylex();
// now parse the rest of the file
- ConversiontqStatus success=OK;
+ ConversionStatus success=OK;
while( lexer->lastToken != T_EOF && success==OK)
{
- if( interactive ) kapp->tqprocessEvents(10);
+ if( interactive ) kapp->processEvents(10);
if( stopStaticRead )
{
@@ -532,7 +532,7 @@ bool PoInfo::findInFile( const TQString& url, FindOptions options )
// first read header
CatalogItem temp;
- ConversiontqStatus status = fastRead( temp, lexer, true );
+ ConversionStatus status = fastRead( temp, lexer, true );
if( status != OK || !temp.msgid().first().isEmpty() )
{
delete lexer;
@@ -639,7 +639,7 @@ bool PoInfo::findInFile( const TQString& url, FindOptions options )
}
case T_MSGID:
case T_MSGIDPLURAL: {
- kapp->tqprocessEvents(10);
+ kapp->processEvents(10);
// if stopped, return not found
if( stopStaticRead )
@@ -666,7 +666,7 @@ bool PoInfo::findInFile( const TQString& url, FindOptions options )
}
// this does not like any incorrect files
-ConversiontqStatus PoInfo::fastRead( CatalogItem& item, GettextFlexLexer *lexer, bool storeText)
+ConversionStatus PoInfo::fastRead( CatalogItem& item, GettextFlexLexer *lexer, bool storeText)
{
item.clear();
_gettextPluralForm = false;
diff --git a/kbabel/common/poinfo.h b/kbabel/common/poinfo.h
index 58e0bc66..70ba652a 100644
--- a/kbabel/common/poinfo.h
+++ b/kbabel/common/poinfo.h
@@ -105,7 +105,7 @@ public:
* being parsed?
* @since KBabel 1.11 (KDE 3.5)
*/
- static ConversiontqStatus info(const TQString& url,PoInfo& info, TQStringList &wordList, bool updateWordList, bool interactive, bool msgfmt);
+ static ConversionStatus info(const TQString& url,PoInfo& info, TQStringList &wordList, bool updateWordList, bool interactive, bool msgfmt);
/**
* @brief Get information about the PO file
@@ -121,7 +121,7 @@ public:
* KBabel 1.11.1 (KDE 3.5.1)
* @note This function always call Gettext's mgfmt before parsing each file
*/
- static ConversiontqStatus info(const TQString& url,PoInfo& info, TQStringList &wordList, bool updateWordList, bool interactive = true);
+ static ConversionStatus info(const TQString& url,PoInfo& info, TQStringList &wordList, bool updateWordList, bool interactive = true);
static PoInfo headerInfo(const CatalogItem&);
static bool findInFile(const TQString& url, FindOptions options );
@@ -147,7 +147,7 @@ private:
*/
static void cacheRead();
- static ConversiontqStatus fastRead( CatalogItem& item, GettextFlexLexer* lexer, bool storeText );
+ static ConversionStatus fastRead( CatalogItem& item, GettextFlexLexer* lexer, bool storeText );
static bool _gettextPluralForm;
};
diff --git a/kbabel/commonui/cmdedit.cpp b/kbabel/commonui/cmdedit.cpp
index df8ce38a..2620ea3a 100644
--- a/kbabel/commonui/cmdedit.cpp
+++ b/kbabel/commonui/cmdedit.cpp
@@ -104,7 +104,7 @@ CmdEdit::CmdEdit(TQWidget* parent, const char* name)
tqlayout->addRowSpacing(2, KDialog::spacingHint());
tqlayout->addRowSpacing(6, KDialog::spacingHint());
- setMinimumSize(tqlayout->tqsizeHint());
+ setMinimumSize(tqlayout->sizeHint());
connect(_addButton , TQT_SIGNAL(clicked()) , this , TQT_SLOT(addCmd()) ) ;
diff --git a/kbabel/commonui/diffpreferences.ui b/kbabel/commonui/diffpreferences.ui
index c52e3c27..dfe8279b 100644
--- a/kbabel/commonui/diffpreferences.ui
+++ b/kbabel/commonui/diffpreferences.ui
@@ -116,7 +116,7 @@ the database are used for diffing.</p></qt>
Expanding
-
+
20
31
diff --git a/kbabel/commonui/klisteditor.ui b/kbabel/commonui/klisteditor.ui
index b31497b4..4b7eeb0d 100644
--- a/kbabel/commonui/klisteditor.ui
+++ b/kbabel/commonui/klisteditor.ui
@@ -97,7 +97,7 @@
_list
-
+
200
200
@@ -172,7 +172,7 @@
Expanding
-
+
20
20
diff --git a/kbabel/commonui/projectprefwidgets.cpp b/kbabel/commonui/projectprefwidgets.cpp
index 163b4eeb..b77a1811 100644
--- a/kbabel/commonui/projectprefwidgets.cpp
+++ b/kbabel/commonui/projectprefwidgets.cpp
@@ -79,7 +79,7 @@ using namespace KBabel;
static TQSize sizeHintForWidget(const TQWidget* widget)
{
//
- // The size is computed by adding the tqsizeHint().height() of all
+ // The size is computed by adding the sizeHint().height() of all
// widget tqchildren and taking the width of the widest child and adding
// tqlayout()->margin() and tqlayout()->spacing()
//
@@ -97,7 +97,7 @@ static TQSize sizeHintForWidget(const TQWidget* widget)
numChild += 1;
TQWidget *w=((TQWidget*)o);
- TQSize s = w->tqsizeHint();
+ TQSize s = w->sizeHint();
if( s.isEmpty() == true )
{
s = TQSize( 50, 100 ); // Default size
@@ -323,7 +323,7 @@ SavePreferences::SavePreferences(TQWidget *parent)
"in the online help."
"") );
- setMinimumSize(tqsizeHint());
+ setMinimumSize(sizeHint());
}
@@ -443,12 +443,12 @@ IdentityPreferences::IdentityPreferences(TQWidget* parent, const TQString& proje
tempLabel=new TQLabel(i18n("&Language mailing list:"),group);
_listEdit = new TQLineEdit(group, "kcfg_Mailinglist");
- _listEdit->setMinimumSize(100,_listEdit->tqsizeHint().height());
+ _listEdit->setMinimumSize(100,_listEdit->sizeHint().height());
tempLabel->setBuddy(_listEdit);
tempLabel=new TQLabel(i18n("&Timezone:"), group);
_timezoneEdit = new TQLineEdit(group, "kcfg_Timezone");
- _timezoneEdit->setMinimumSize(100,_timezoneEdit->tqsizeHint().height());
+ _timezoneEdit->setMinimumSize(100,_timezoneEdit->sizeHint().height());
tempLabel->setBuddy(_timezoneEdit);
@@ -538,7 +538,7 @@ IdentityPreferences::IdentityPreferences(TQWidget* parent, const TQString& proje
page->setMinimumSize(sizeHintForWidget(page));
- setMinimumSize(tqsizeHint());
+ setMinimumSize(sizeHint());
_mailEdit->installEventFilter(this);
_listEdit->installEventFilter(this);
@@ -837,7 +837,7 @@ SpellPreferences::SpellPreferences(TQWidget* parent)
page->setMinimumSize(sizeHintForWidget(page));
- setMinimumSize(tqsizeHint());
+ setMinimumSize(sizeHint());
}
@@ -896,7 +896,7 @@ CatmanPreferences::CatmanPreferences(TQWidget* parent)
_poDirEdit = new KURLRequester(hbox, "kcfg_PoBaseDir");
_poDirEdit->setMode( mode );
- _poDirEdit->setMinimumSize(250,_poDirEdit->tqsizeHint().height());
+ _poDirEdit->setMinimumSize(250,_poDirEdit->sizeHint().height());
label->setBuddy(_poDirEdit);
@@ -906,7 +906,7 @@ CatmanPreferences::CatmanPreferences(TQWidget* parent)
_potDirEdit = new KURLRequester(hbox, "kcfg_PotBaseDir");
_potDirEdit->setMode( mode );
- _potDirEdit->setMinimumSize(250,_potDirEdit->tqsizeHint().height());
+ _potDirEdit->setMinimumSize(250,_potDirEdit->sizeHint().height());
label->setBuddy(_potDirEdit);
@@ -960,7 +960,7 @@ CatmanPreferences::CatmanPreferences(TQWidget* parent)
page->setMinimumSize(sizeHintForWidget(page));
- setMinimumSize(tqsizeHint());
+ setMinimumSize(sizeHint());
}
@@ -1013,7 +1013,7 @@ DirCommandsPreferences::DirCommandsPreferences(TQWidget* parent)
tqlayout->addStretch(1);
page->setMinimumSize(sizeHintForWidget(page));
- setMinimumSize(tqsizeHint());
+ setMinimumSize(sizeHint());
}
@@ -1077,7 +1077,7 @@ FileCommandsPreferences::FileCommandsPreferences(TQWidget* parent)
tqlayout->addStretch(1);
page->setMinimumSize(sizeHintForWidget(page));
- setMinimumSize(tqsizeHint());
+ setMinimumSize(sizeHint());
}
@@ -1130,7 +1130,7 @@ ViewPreferences::ViewPreferences(TQWidget* parent)
page->setMinimumSize(sizeHintForWidget(page));
- setMinimumSize(tqsizeHint());
+ setMinimumSize(sizeHint());
}
@@ -1159,7 +1159,7 @@ SourceContextPreferences::SourceContextPreferences(TQWidget* parent): TQWidget(p
const KFile::Mode mode = static_cast( KFile::Directory | KFile::ExistingOnly | KFile::LocalOnly );
_coderootEdit = new KURLRequester ( box, "kcfg_CodeRoot" );
_coderootEdit->setMode( mode );
- _coderootEdit->setMinimumSize( 250, _coderootEdit->tqsizeHint().height() );
+ _coderootEdit->setMinimumSize( 250, _coderootEdit->sizeHint().height() );
tempLabel->setBuddy( _coderootEdit );
tqlayout->addWidget(box);
@@ -1173,7 +1173,7 @@ SourceContextPreferences::SourceContextPreferences(TQWidget* parent): TQWidget(p
_pathsEditor->installEventFilter(this);
- setMinimumSize(tqsizeHint());
+ setMinimumSize(sizeHint());
}
SourceContextPreferences::~SourceContextPreferences()
diff --git a/kbabel/commonui/projectwizardwidget2.ui b/kbabel/commonui/projectwizardwidget2.ui
index 97030b94..50671e62 100644
--- a/kbabel/commonui/projectwizardwidget2.ui
+++ b/kbabel/commonui/projectwizardwidget2.ui
@@ -138,7 +138,7 @@ will not work.
Expanding
-
+
31
100
diff --git a/kbabel/commonui/roughtransdlg.cpp b/kbabel/commonui/roughtransdlg.cpp
index 57fb21d0..a5415529 100644
--- a/kbabel/commonui/roughtransdlg.cpp
+++ b/kbabel/commonui/roughtransdlg.cpp
@@ -278,7 +278,7 @@ void RoughTransDlg::translate()
for(int i = 0; i < total; i++)
{
progressbar->setProgress(i+1);
- kapp->tqprocessEvents(100);
+ kapp->processEvents(100);
if(stop || cancel) break;
diff --git a/kbabel/filters/gettext/gettextexport.cpp b/kbabel/filters/gettext/gettextexport.cpp
index 31cca29f..ea098013 100644
--- a/kbabel/filters/gettext/gettextexport.cpp
+++ b/kbabel/filters/gettext/gettextexport.cpp
@@ -56,7 +56,7 @@ GettextExportPlugin::GettextExportPlugin(TQObject* parent, const char* name, con
{
}
-ConversiontqStatus GettextExportPlugin::save(const TQString& localFile , const TQString& mimetype, const Catalog* catalog)
+ConversionStatus GettextExportPlugin::save(const TQString& localFile , const TQString& mimetype, const Catalog* catalog)
{
// check, whether we know how to handle the extra data
if( catalog->importPluginID() != "GNU gettext")
@@ -164,7 +164,7 @@ ConversiontqStatus GettextExportPlugin::save(const TQString& localFile , const T
stream << "\n";
- kapp->tqprocessEvents(10);
+ kapp->processEvents(10);
if( isStopped() )
{
return STOPPED;
@@ -181,7 +181,7 @@ ConversiontqStatus GettextExportPlugin::save(const TQString& localFile , const T
{
stream << (*oit) << "\n\n";
- kapp->tqprocessEvents(10);
+ kapp->processEvents(10);
if( isStopped() )
{
return STOPPED;
diff --git a/kbabel/filters/gettext/gettextexport.h b/kbabel/filters/gettext/gettextexport.h
index 695105d2..9732ac73 100644
--- a/kbabel/filters/gettext/gettextexport.h
+++ b/kbabel/filters/gettext/gettextexport.h
@@ -54,7 +54,7 @@ class GettextExportPlugin: public KBabel::CatalogExportPlugin
{
public:
GettextExportPlugin(TQObject* parent, const char* name, const TQStringList &);
- virtual KBabel::ConversiontqStatus save(const TQString& file, const TQString& mimetype, const KBabel::Catalog* catalog);
+ virtual KBabel::ConversionStatus save(const TQString& file, const TQString& mimetype, const KBabel::Catalog* catalog);
private:
/**
diff --git a/kbabel/filters/gettext/gettextimport.cpp b/kbabel/filters/gettext/gettextimport.cpp
index a48e327b..a9bae51a 100644
--- a/kbabel/filters/gettext/gettextimport.cpp
+++ b/kbabel/filters/gettext/gettextimport.cpp
@@ -57,7 +57,7 @@ GettextImportPlugin::GettextImportPlugin(TQObject* parent, const char* name, con
{
}
-ConversiontqStatus GettextImportPlugin::load(const TQString& filename, const TQString&)
+ConversionStatus GettextImportPlugin::load(const TQString& filename, const TQString&)
{
kdDebug( KBABEL ) << k_funcinfo << endl;
@@ -117,7 +117,7 @@ ConversiontqStatus GettextImportPlugin::load(const TQString& filename, const TQS
kdDebug(KBABEL) << "start parsing..." << endl;
// first read header
- const ConversiontqStatus status = readHeader(stream);
+ const ConversionStatus status = readHeader(stream);
if ( status == RECOVERED_PARSE_ERROR )
@@ -173,13 +173,13 @@ ConversiontqStatus GettextImportPlugin::load(const TQString& filename, const TQS
while( !stream.eof() )
{
- kapp->tqprocessEvents(10);
+ kapp->processEvents(10);
if( isStopped() )
{
return STOPPED;
}
- const ConversiontqStatus success=readEntry(stream);
+ const ConversionStatus success=readEntry(stream);
if(success==OK)
{
@@ -302,7 +302,7 @@ TQTextCodec* GettextImportPlugin::codecForArray(TQByteArray& array, bool* hadCod
stream.setEncoding( TQTextStream::Latin1 );
// first read header
- ConversiontqStatus status = readHeader(stream);
+ ConversionStatus status = readHeader(stream);
if(status!=OK && status != RECOVERED_PARSE_ERROR)
{
kdDebug(KBABEL) << "wasn't able to read header" << endl;
@@ -360,11 +360,11 @@ TQTextCodec* GettextImportPlugin::codecForArray(TQByteArray& array, bool* hadCod
return codec;
}
-ConversiontqStatus GettextImportPlugin::readHeader(TQTextStream& stream)
+ConversionStatus GettextImportPlugin::readHeader(TQTextStream& stream)
{
CatalogItem temp;
int filePos=stream.tqdevice()->at();
- ConversiontqStatus status=readEntry(stream);
+ ConversionStatus status=readEntry(stream);
if(status==OK || status==RECOVERED_PARSE_ERROR)
{
@@ -380,7 +380,7 @@ ConversiontqStatus GettextImportPlugin::readHeader(TQTextStream& stream)
return PARSE_ERROR;
}
-ConversiontqStatus GettextImportPlugin::readEntry(TQTextStream& stream)
+ConversionStatus GettextImportPlugin::readEntry(TQTextStream& stream)
{
//kdDebug( KBABEL ) << k_funcinfo << " START" << endl;
enum {Begin,Comment,Msgctxt,Msgid,Msgstr} part=Begin;
diff --git a/kbabel/filters/gettext/gettextimport.h b/kbabel/filters/gettext/gettextimport.h
index fa20aa62..e5f81679 100644
--- a/kbabel/filters/gettext/gettextimport.h
+++ b/kbabel/filters/gettext/gettextimport.h
@@ -50,13 +50,13 @@ class GettextImportPlugin: public KBabel::CatalogImportPlugin
{
public:
GettextImportPlugin(TQObject* parent, const char* name, const TQStringList &);
- virtual KBabel::ConversiontqStatus load(const TQString& file, const TQString& mimetype);
+ virtual KBabel::ConversionStatus load(const TQString& file, const TQString& mimetype);
virtual const TQString id() { return "GNU gettext"; }
private:
TQTextCodec* codecForArray(TQByteArray& arary, bool* hadCodec);
- KBabel::ConversiontqStatus readHeader(TQTextStream& stream);
- KBabel::ConversiontqStatus readEntry(TQTextStream& stream);
+ KBabel::ConversionStatus readHeader(TQTextStream& stream);
+ KBabel::ConversionStatus readEntry(TQTextStream& stream);
// description of the last read entry
TQString _msgctxt;
diff --git a/kbabel/filters/linguist/linguistexport.cpp b/kbabel/filters/linguist/linguistexport.cpp
index 10fc37e2..eb6ab744 100644
--- a/kbabel/filters/linguist/linguistexport.cpp
+++ b/kbabel/filters/linguist/linguistexport.cpp
@@ -58,7 +58,7 @@ LinguistExportPlugin::LinguistExportPlugin( TQObject * parent, const char * name
{
}
-ConversiontqStatus LinguistExportPlugin::save( const TQString& filename, const TQString&, const Catalog * catalog )
+ConversionStatus LinguistExportPlugin::save( const TQString& filename, const TQString&, const Catalog * catalog )
{
// Check whether we know how to handle the extra data.
if ( catalog->importPluginID( ) != "TQt translation source" )
diff --git a/kbabel/filters/linguist/linguistexport.h b/kbabel/filters/linguist/linguistexport.h
index d468fce4..18b52460 100644
--- a/kbabel/filters/linguist/linguistexport.h
+++ b/kbabel/filters/linguist/linguistexport.h
@@ -52,7 +52,7 @@ class LinguistExportPlugin : public KBabel::CatalogExportPlugin
{
public:
LinguistExportPlugin( TQObject * parent, const char * name, const TQStringList& );
- virtual KBabel::ConversiontqStatus save( const TQString& filename, const TQString& mimetype, const KBabel::Catalog * catalog );
+ virtual KBabel::ConversionStatus save( const TQString& filename, const TQString& mimetype, const KBabel::Catalog * catalog );
private:
const TQString extractComment( TQDomDocument& doc, const TQString& s, bool& fuzzy );
diff --git a/kbabel/filters/linguist/linguistimport.cpp b/kbabel/filters/linguist/linguistimport.cpp
index 6d8dda81..b4476d52 100644
--- a/kbabel/filters/linguist/linguistimport.cpp
+++ b/kbabel/filters/linguist/linguistimport.cpp
@@ -60,7 +60,7 @@ LinguistImportPlugin::LinguistImportPlugin( TQObject * parent, const char * name
{
}
-ConversiontqStatus LinguistImportPlugin::load( const TQString& filename, const TQString& )
+ConversionStatus LinguistImportPlugin::load( const TQString& filename, const TQString& )
{
if ( filename.isEmpty( ) ) {
kdDebug( ) << "fatal error: empty filename to open" << endl;
diff --git a/kbabel/filters/linguist/linguistimport.h b/kbabel/filters/linguist/linguistimport.h
index b0bc51d9..11b5c6d1 100644
--- a/kbabel/filters/linguist/linguistimport.h
+++ b/kbabel/filters/linguist/linguistimport.h
@@ -52,7 +52,7 @@ class LinguistImportPlugin : public KBabel::CatalogImportPlugin
public:
LinguistImportPlugin( TQObject * parent, const char * name, const TQStringList& );
- virtual KBabel::ConversiontqStatus load( const TQString& filename, const TQString& mimetype );
+ virtual KBabel::ConversionStatus load( const TQString& filename, const TQString& mimetype );
virtual const TQString id( ) { return "TQt translation source"; }
private:
diff --git a/kbabel/filters/xliff/xliffexport.cpp b/kbabel/filters/xliff/xliffexport.cpp
index c633e8b1..59b41bfd 100644
--- a/kbabel/filters/xliff/xliffexport.cpp
+++ b/kbabel/filters/xliff/xliffexport.cpp
@@ -58,7 +58,7 @@ XLIFFExportPlugin::XLIFFExportPlugin( TQObject * parent, const char * name, cons
{
}
-ConversiontqStatus XLIFFExportPlugin::save( const TQString& filename, const TQString&, const Catalog * catalog )
+ConversionStatus XLIFFExportPlugin::save( const TQString& filename, const TQString&, const Catalog * catalog )
{
// Check whether we know how to handle the extra data.
if ( catalog->importPluginID( ) != "XLIFF 1.1" )
diff --git a/kbabel/filters/xliff/xliffexport.h b/kbabel/filters/xliff/xliffexport.h
index eccc311c..ac550ccc 100644
--- a/kbabel/filters/xliff/xliffexport.h
+++ b/kbabel/filters/xliff/xliffexport.h
@@ -52,7 +52,7 @@ class XLIFFExportPlugin : public KBabel::CatalogExportPlugin
{
public:
XLIFFExportPlugin( TQObject * parent, const char * name, const TQStringList& );
- virtual KBabel::ConversiontqStatus save( const TQString& filename, const TQString& mimetype, const KBabel::Catalog * catalog );
+ virtual KBabel::ConversionStatus save( const TQString& filename, const TQString& mimetype, const KBabel::Catalog * catalog );
private:
TQDomElement extractComment( TQDomDocument& doc, const TQString& s );
diff --git a/kbabel/filters/xliff/xliffimport.cpp b/kbabel/filters/xliff/xliffimport.cpp
index 246b8c24..807a624d 100644
--- a/kbabel/filters/xliff/xliffimport.cpp
+++ b/kbabel/filters/xliff/xliffimport.cpp
@@ -73,7 +73,7 @@ XLIFFImportPlugin::XLIFFImportPlugin( TQObject * parent, const char * name, cons
{
}
-ConversiontqStatus XLIFFImportPlugin::load( const TQString& filename, const TQString& )
+ConversionStatus XLIFFImportPlugin::load( const TQString& filename, const TQString& )
{
if ( filename.isEmpty( ) ) {
kdDebug( KDEBUG_AREA ) << "fatal error: empty filename to open" << endl;
diff --git a/kbabel/filters/xliff/xliffimport.h b/kbabel/filters/xliff/xliffimport.h
index a32a686b..8901afd2 100644
--- a/kbabel/filters/xliff/xliffimport.h
+++ b/kbabel/filters/xliff/xliffimport.h
@@ -52,7 +52,7 @@ class XLIFFImportPlugin : public KBabel::CatalogImportPlugin
public:
XLIFFImportPlugin( TQObject * parent, const char * name, const TQStringList& );
- virtual KBabel::ConversiontqStatus load( const TQString& filename, const TQString& mimetype );
+ virtual KBabel::ConversionStatus load( const TQString& filename, const TQString& mimetype );
virtual const TQString id( ) { return "XLIFF 1.1"; }
private:
diff --git a/kbabel/kbabel/colorpreferences.ui b/kbabel/kbabel/colorpreferences.ui
index ae8e57fe..63a0dcf1 100644
--- a/kbabel/kbabel/colorpreferences.ui
+++ b/kbabel/kbabel/colorpreferences.ui
@@ -164,7 +164,7 @@ phrases.</qt>
Expanding
-
+
20
50
diff --git a/kbabel/kbabel/editordiffpreferences.ui b/kbabel/kbabel/editordiffpreferences.ui
index 33460635..56c6848b 100644
--- a/kbabel/kbabel/editordiffpreferences.ui
+++ b/kbabel/kbabel/editordiffpreferences.ui
@@ -170,7 +170,7 @@
Expanding
-
+
20
31
diff --git a/kbabel/kbabel/editorpreferences.ui b/kbabel/kbabel/editorpreferences.ui
index 15498f32..77c64683 100644
--- a/kbabel/kbabel/editorpreferences.ui
+++ b/kbabel/kbabel/editorpreferences.ui
@@ -133,7 +133,7 @@ activated, you will still see a message in the statusbar.
Expanding
-
+
20
21
@@ -206,10 +206,10 @@ activated, you will still see a message in the statusbar.
buttonGroup1
- tqStatus LEDs
+ Status LEDs
- <qt><p><b>tqStatus LEDs</b></p>
+ <qt><p><b>Status LEDs</b></p>
<p>Choose here where the status LEDs are displayed and what color they have.</p></qt>
@@ -245,7 +245,7 @@ activated, you will still see a message in the statusbar.
Expanding
-
+
51
20
@@ -283,7 +283,7 @@ activated, you will still see a message in the statusbar.
Expanding
-
+
20
29
diff --git a/kbabel/kbabel/errorlistview.cpp b/kbabel/kbabel/errorlistview.cpp
index 719798d3..33b1f7e9 100644
--- a/kbabel/kbabel/errorlistview.cpp
+++ b/kbabel/kbabel/errorlistview.cpp
@@ -70,7 +70,7 @@ void ErrorListView::updateView()
if( _catalog->numberOfEntries() == 0 )
return;
- _textview->setText( _catalog->itemtqStatus( _currentIndex ).join( "\n---\n" ) );
+ _textview->setText( _catalog->itemStatus( _currentIndex ).join( "\n---\n" ) );
}
#include "errorlistview.moc"
diff --git a/kbabel/kbabel/kbabel.cpp b/kbabel/kbabel/kbabel.cpp
index 24c3eae9..c12a8e41 100644
--- a/kbabel/kbabel/kbabel.cpp
+++ b/kbabel/kbabel/kbabel.cpp
@@ -115,9 +115,9 @@ class MyKProgress: public KProgress
public:
MyKProgress( TQWidget *parent, const char *name ) : KProgress( parent, name )
{
- tqsetSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Preferred );
+ setSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Preferred );
}
- TQSize tqsizeHint() const { return TQSize( 1, 1);}
+ TQSize sizeHint() const { return TQSize( 1, 1);}
};
KBabelMW::KBabelMW(TQString projectFile)
@@ -455,7 +455,7 @@ void KBabelMW::setupActions()
,TQT_SLOT(emitChar()), actionCollection(), "char2msgstr");
a_unsetFuzzy = new KAction(i18n("To&ggle Fuzzy Status"), "togglefuzzy", CTRL+Key_U, TQT_TQOBJECT(m_view)
- , TQT_SLOT(removeFuzzytqStatus()), actionCollection(), "edit_toggle_fuzzy");
+ , TQT_SLOT(removeFuzzyStatus()), actionCollection(), "edit_toggle_fuzzy");
action = new KAction(i18n("&Edit Header..."), 0, TQT_TQOBJECT(m_view), TQT_SLOT(editHeader()),
actionCollection(), "edit_edit_header");
@@ -724,7 +724,7 @@ void KBabelMW::setupStatusBar()
_errorLed->setFixedSize(15,12);
new TQLabel(i18n("faulty")+" ",statusBox);
- statusBox->setFixedWidth(statusBox->tqsizeHint().width());
+ statusBox->setFixedWidth(statusBox->sizeHint().width());
statusBar()->addWidget(statusBox);
}
@@ -743,7 +743,7 @@ void KBabelMW::setupStatusBar()
progressBox->setStretchFactor(_progressBar,1);
statusBar()->addWidget(progressBox,1);
- statusBar()->setMinimumHeight(progressBox->tqsizeHint().height());
+ statusBar()->setMinimumHeight(progressBox->sizeHint().height());
TQWhatsThis::add(statusBar(),
i18n("Statusbar
\n\
@@ -999,7 +999,7 @@ void KBabelMW::openRecent(const KURL& url)
KBabelView *view = KBabelView::viewForURL(url,TQString());
if(view)
{
- KWin::activateWindow(view->tqtopLevelWidget()->winId());
+ KWin::activateWindow(view->topLevelWidget()->winId());
return;
}
@@ -1019,7 +1019,7 @@ void KBabelMW::open(const KURL& url, const TQString package, bool newWindow)
if(view)
{
kdDebug(KBABEL) << "there is a such view" << endl;
- KWin::activateWindow(view->tqtopLevelWidget()->winId());
+ KWin::activateWindow(view->topLevelWidget()->winId());
return;
}
diff --git a/kbabel/kbabel/kbabelsplash.cpp b/kbabel/kbabel/kbabelsplash.cpp
index 785943d8..143aff02 100644
--- a/kbabel/kbabel/kbabelsplash.cpp
+++ b/kbabel/kbabel/kbabelsplash.cpp
@@ -55,7 +55,7 @@ KBabelSplash::KBabelSplash( TQWidget* parent, const char* name )
// Set tqgeometry, with support for Xinerama systems
TQRect r;
- r.setSize(tqsizeHint());
+ r.setSize(sizeHint());
int ps = TQApplication::desktop()->primaryScreen();
r.moveCenter( TQApplication::desktop()->screenGeometry(ps).center() );
setGeometry(r);
diff --git a/kbabel/kbabel/kbabelview.cpp b/kbabel/kbabel/kbabelview.cpp
index 4c50a7e9..b4bba709 100644
--- a/kbabel/kbabel/kbabelview.cpp
+++ b/kbabel/kbabel/kbabelview.cpp
@@ -685,7 +685,7 @@ void KBabelView::readSettings(KConfig* config)
if(KBabelSettings::autoUnsetFuzzy())
{
connect(msgstrEdit,TQT_SIGNAL(textChanged())
- ,this,TQT_SLOT(autoRemoveFuzzytqStatus()));
+ ,this,TQT_SLOT(autoRemoveFuzzyStatus()));
}
setupAutoCheckTools();
@@ -854,12 +854,12 @@ void KBabelView::updateSettings()
}
disconnect(msgstrEdit,TQT_SIGNAL(textChanged())
- ,this,TQT_SLOT(autoRemoveFuzzytqStatus()));
+ ,this,TQT_SLOT(autoRemoveFuzzyStatus()));
if(KBabelSettings::autoUnsetFuzzy())
{
connect(msgstrEdit,TQT_SIGNAL(textChanged())
- ,this,TQT_SLOT(autoRemoveFuzzytqStatus()));
+ ,this,TQT_SLOT(autoRemoveFuzzyStatus()));
}
msgstrEdit->setCleverEditing(KBabelSettings::cleverEditing());
@@ -1116,7 +1116,7 @@ void KBabelView::open(const KURL& _url, const TQString & package, bool checkIfMo
cu.cleanPath();
if(checkIfModified && !url.isEmpty() && cu==url)
{
- KWin::activateWindow(tqtopLevelWidget()->winId());
+ KWin::activateWindow(topLevelWidget()->winId());
return;
}
@@ -1155,12 +1155,12 @@ void KBabelView::open(const KURL& _url, const TQString & package, bool checkIfMo
return;
}
else {
- KWin::activateWindow(v->tqtopLevelWidget()->winId());
+ KWin::activateWindow(v->topLevelWidget()->winId());
return;
}
}
- ConversiontqStatus stat=_catalog->openURL(url, package);
+ ConversionStatus stat=_catalog->openURL(url, package);
switch(stat)
{
@@ -1282,7 +1282,7 @@ void KBabelView::openTemplate(const KURL& openURL, const KURL& saveURL)
setCursor(KCursor::waitCursor());*/
- ConversiontqStatus stat=_catalog->openURL(openURL,saveURL);
+ ConversionStatus stat=_catalog->openURL(openURL,saveURL);
switch(stat)
{
@@ -1368,7 +1368,7 @@ bool KBabelView::saveFile(bool syntaxCheck)
}
else
{
- ConversiontqStatus stat=_catalog->saveFile();
+ ConversionStatus stat=_catalog->saveFile();
int whatToDo = -1;
@@ -1458,7 +1458,7 @@ bool KBabelView::saveFileAs(KURL url, bool syntaxCheck)
bool wasReadOnly=_catalog->isReadOnly();
- ConversiontqStatus stat=_catalog->saveFileAs(url,true);
+ ConversionStatus stat=_catalog->saveFileAs(url,true);
// if the file was not saved sucessfully ask for saving to another file
@@ -1625,7 +1625,7 @@ bool KBabelView::checkSyntax(bool msgOnlyAtError,bool question)
bool returnCode=true;
TQString output;
- Msgfmt::tqStatus result=_catalog->checkSyntax( output );
+ Msgfmt::Status result=_catalog->checkSyntax( output );
const TQStringList outputLines = TQStringList::split("\n",output);
@@ -1831,7 +1831,7 @@ void KBabelView::updateEditor(int form, bool delay)
if(KBabelSettings::autoUnsetFuzzy() && !msgstrEdit->isModified())
{
- disconnect(msgstrEdit,TQT_SIGNAL(textChanged()),this,TQT_SLOT(autoRemoveFuzzytqStatus()));
+ disconnect(msgstrEdit,TQT_SIGNAL(textChanged()),this,TQT_SLOT(autoRemoveFuzzyStatus()));
}
msgidLabel->setText(_catalog->msgid(_currentIndex), _catalog->msgctxt(_currentIndex));
@@ -1844,7 +1844,7 @@ void KBabelView::updateEditor(int form, bool delay)
if(KBabelSettings::autoUnsetFuzzy() && _catalog->isFuzzy(_currentIndex))
{
- connect(msgstrEdit,TQT_SIGNAL(textChanged()),this,TQT_SLOT(autoRemoveFuzzytqStatus()));
+ connect(msgstrEdit,TQT_SIGNAL(textChanged()),this,TQT_SLOT(autoRemoveFuzzyStatus()));
}
msgstrEdit->blockSignals(false);
@@ -2615,7 +2615,7 @@ void KBabelView::replaceAll()
while(success)
{
- kapp->tqprocessEvents(100);
+ kapp->processEvents(100);
_replacesTotal++;
@@ -3159,7 +3159,7 @@ void KBabelView::forwardHistory()
}
}
-void KBabelView::removeFuzzytqStatus()
+void KBabelView::removeFuzzyStatus()
{
bool newState = !_catalog->isFuzzy(_currentIndex);
_catalog->setFuzzy(_currentIndex,newState);
@@ -3302,12 +3302,12 @@ void KBabelView::emitEntryState()
TQPalette palette=msgstrEdit->palette();
palette.setColor( TQColorGroup::Text, red );
- if( _catalog->itemtqStatus(_currentIndex).contains("syntax error"))
+ if( _catalog->itemStatus(_currentIndex).contains("syntax error"))
{
msgstrEdit->setCurrentColor( MsgMultiLineEdit::ErrorColor );
}
else
- if( !_catalog->itemtqStatus(_currentIndex).isEmpty() && KBabelSettings::autoCheckColorError())
+ if( !_catalog->itemStatus(_currentIndex).isEmpty() && KBabelSettings::autoCheckColorError())
{
msgstrEdit->setCurrentColor( MsgMultiLineEdit::ErrorColor );
}
@@ -3332,12 +3332,12 @@ void KBabelView::checkUntranslated()
emit signalUntranslatedInFront(_catalog->hasUntranslatedInFront(_currentIndex));
}
-void KBabelView::autoRemoveFuzzytqStatus()
+void KBabelView::autoRemoveFuzzyStatus()
{
// only at first text change remove fuzzy status
- disconnect(msgstrEdit,TQT_SIGNAL(textChanged()),this,TQT_SLOT(autoRemoveFuzzytqStatus()));
+ disconnect(msgstrEdit,TQT_SIGNAL(textChanged()),this,TQT_SLOT(autoRemoveFuzzyStatus()));
- //removeFuzzytqStatus();
+ //removeFuzzyStatus();
}
void KBabelView::toggleFuzzyLed(bool on)
@@ -3541,7 +3541,7 @@ void KBabelView::forwardMsgstrEditCmd(EditCommand* cmd)
_catalog->applyBeginCommand(_currentIndex,Msgstr,this);
- removeFuzzytqStatus();
+ removeFuzzyStatus();
}
cmd->setPart(Msgstr);
@@ -3576,13 +3576,13 @@ void KBabelView::autoCheck(bool onlyWhenChanged)
{
if( !_autocheckTools.isEmpty() )
{
- TQStringList oldtqStatus = _catalog->itemtqStatus(_currentIndex);
+ TQStringList oldStatus = _catalog->itemStatus(_currentIndex);
- TQStringList status = _catalog->itemtqStatus( _currentIndex,true, _autocheckTools );
+ TQStringList status = _catalog->itemStatus( _currentIndex,true, _autocheckTools );
// if there is more than one view, the status changes only in
// one view, so we have to update always.
- if(_catalog->isLastView() && onlyWhenChanged && oldtqStatus == status)
+ if(_catalog->isLastView() && onlyWhenChanged && oldStatus == status)
return;
if( !status.isEmpty() )
@@ -3598,7 +3598,7 @@ void KBabelView::autoCheck(bool onlyWhenChanged)
else msg += ", "+locale->translate("what check found errors",(*it).utf8());
}
- //i18n: translators: tqStatus bar text that automatic checks have found some errors
+ //i18n: translators: Status bar text that automatic checks have found some errors
emit signalChangeStatusbar(i18n("1 error: %1", "%n errors: %1", status.size ()).tqarg(msg));
emit signalFaultyDisplayed(true);
@@ -3611,7 +3611,7 @@ void KBabelView::autoCheck(bool onlyWhenChanged)
{
if(onlyWhenChanged)
{
- if(oldtqStatus != status && oldtqStatus.isEmpty() )
+ if(oldStatus != status && oldStatus.isEmpty() )
{
KNotifyClient::beep();
}
@@ -3622,7 +3622,7 @@ void KBabelView::autoCheck(bool onlyWhenChanged)
}
}
}
- else if( _catalog->itemtqStatus(_currentIndex).isEmpty() )
+ else if( _catalog->itemStatus(_currentIndex).isEmpty() )
{
_catalog->removeFromErrorList(_currentIndex);
@@ -3888,7 +3888,7 @@ void KBabelView::spellcheck()
if(emitProgress)
{
emit signalResetProgressBar(i18n("Preparing spell check"),100);
- kapp->tqprocessEvents(100);
+ kapp->processEvents(100);
}
uint total=last-first+1;
@@ -3900,7 +3900,7 @@ void KBabelView::spellcheck()
lastPercent++;
emit signalProgress(lastPercent);
- kapp->tqprocessEvents(100);
+ kapp->processEvents(100);
}
TQStringList msgs=_catalog->msgstr(i);
@@ -4018,7 +4018,7 @@ void KBabelView::spellStart(KSpell *)
if(spell.ignoreList.count() > 0)
{
emit signalResetProgressBar(i18n("Preparing spell check"),100);
- kapp->tqprocessEvents(100);
+ kapp->processEvents(100);
uint total = spell.ignoreList.count();
uint oldPercent=0;
@@ -4031,7 +4031,7 @@ void KBabelView::spellStart(KSpell *)
{
oldPercent++;
emit signalProgress(oldPercent);
- kapp->tqprocessEvents(100);
+ kapp->processEvents(100);
}
spell.kspell->ignore(*it);
diff --git a/kbabel/kbabel/kbabelview.h b/kbabel/kbabel/kbabelview.h
index 3398457d..af7fff86 100644
--- a/kbabel/kbabel/kbabelview.h
+++ b/kbabel/kbabel/kbabelview.h
@@ -268,7 +268,7 @@ public slots:
void skipToTagFromTool(int index);
void wordCount();
- void removeFuzzytqStatus();
+ void removeFuzzyStatus();
/** opens the header editor for the po-file */
void editHeader();
@@ -451,7 +451,7 @@ protected slots:
private slots:
void msgstrPluralFormChanged (uint index);
- void autoRemoveFuzzytqStatus();
+ void autoRemoveFuzzyStatus();
/** connected to the catalog. it is called when a new file is opened*/
void newFileOpened(bool readOnly);
diff --git a/kbabel/kbabel/kbabelview2.cpp b/kbabel/kbabel/kbabelview2.cpp
index c70b42e7..a5ba1df4 100644
--- a/kbabel/kbabel/kbabelview2.cpp
+++ b/kbabel/kbabel/kbabelview2.cpp
@@ -709,7 +709,7 @@ bool KBabelView::openDiffFile(bool autoDiff)
connect(&cat,TQT_SIGNAL(signalProgress(int)),this,TQT_SIGNAL(signalProgress(int)));
emit signalResetProgressBar(i18n("loading file for diff"),100);
- ConversiontqStatus stat = cat.openURL(url);
+ ConversionStatus stat = cat.openURL(url);
emit signalClearProgressBar();
@@ -802,8 +802,8 @@ void KBabelView::showTryLaterMessageBox()
"However, the string might be found "
"in the files being searched at the moment.\n"
"Please try later."), contents);
- label2->tqsetAlignment( TQt::AlignAuto | TQt::AlignVCenter | TQt::ExpandTabs | TQt::WordBreak );
- label2->setMinimumSize(label2->tqsizeHint());
+ label2->setAlignment( TQt::AlignAuto | TQt::AlignVCenter | TQt::ExpandTabs | TQt::WordBreak );
+ label2->setMinimumSize(label2->sizeHint());
lay->add( label2 );
lay->addStretch(1);
diff --git a/kbabel/kbabel/kbhighlighting.cpp b/kbabel/kbabel/kbhighlighting.cpp
index c67d56a7..621fb654 100644
--- a/kbabel/kbabel/kbhighlighting.cpp
+++ b/kbabel/kbabel/kbhighlighting.cpp
@@ -300,7 +300,7 @@ void KBabelHighlighter::setSpellChecker( KSpell* spell )
this, TQT_SLOT(slotMisspelling(const TQString &, const TQStringList &, unsigned int)));
// wait for KSpell to startup correctly
- kapp->tqprocessEvents(500);
+ kapp->processEvents(500);
}
highlight();
diff --git a/kbabel/kbabel/main.cpp b/kbabel/kbabel/main.cpp
index f36a0b94..85158efa 100644
--- a/kbabel/kbabel/main.cpp
+++ b/kbabel/kbabel/main.cpp
@@ -242,7 +242,7 @@ void KBabelInterface::openURL(TQCString url, TQCString package, WId window, int
KBabelMW *kb = KBabelMW::winForURL(u,project);
if(kb)
{
- KWin::activateWindow(kb->tqtopLevelWidget()->winId());
+ KWin::activateWindow(kb->topLevelWidget()->winId());
}
else
{
@@ -255,7 +255,7 @@ void KBabelInterface::openURL(TQCString url, TQCString package, WId window, int
if( mw->inherits("KBabelMW") && mw->winId() == window)
{
kb = static_cast(mw);
- KWin::activateWindow(kb->tqtopLevelWidget()->winId());
+ KWin::activateWindow(kb->topLevelWidget()->winId());
kb->open(u, TQString::fromUtf8(package),newWindow);
kdDebug () << "Resuming DCOP" << endl;
@@ -272,7 +272,7 @@ void KBabelInterface::openURL(TQCString url, TQCString package, WId window, int
{
// here, we don't care about "open in new window", because
// it's empty
- KWin::setActiveWindow(kb->tqtopLevelWidget()->winId());
+ KWin::setActiveWindow(kb->topLevelWidget()->winId());
kb->projectOpen(projectFile);
kb->open(u,TQString::fromUtf8(package),false);
@@ -289,7 +289,7 @@ void KBabelInterface::openURL(TQCString url, TQCString package, WId window, int
if( mw->inherits("KBabelMW") && static_cast(mw)->project()==project)
{
kb = static_cast(mw);
- KWin::activateWindow(kb->tqtopLevelWidget()->winId());
+ KWin::activateWindow(kb->topLevelWidget()->winId());
kb->open(u, TQString::fromUtf8(package),newWindow);
kdDebug () << "Resuming DCOP" << endl;
@@ -305,7 +305,7 @@ void KBabelInterface::openURL(TQCString url, TQCString package, WId window, int
kb = new KBabelMW(project);
kb->show();
} else kb = static_cast(mw);
- KWin::activateWindow(kb->tqtopLevelWidget()->winId());
+ KWin::activateWindow(kb->topLevelWidget()->winId());
kb->open(u,TQString::fromUtf8(package),newWindow);
}
@@ -331,7 +331,7 @@ void KBabelInterface::openTemplate(TQCString openFilename, TQCString saveFilenam
KBabelMW *kb = KBabelMW::winForURL(u, project);
if(kb)
{
- KWin::activateWindow(kb->tqtopLevelWidget()->winId());
+ KWin::activateWindow(kb->topLevelWidget()->winId());
}
else
{
@@ -342,7 +342,7 @@ void KBabelInterface::openTemplate(TQCString openFilename, TQCString saveFilenam
if(mw && mw->inherits("KBabelMW") && static_cast(mw)->project()==project)
{
kb = static_cast(mw);
- KWin::activateWindow(kb->tqtopLevelWidget()->winId());
+ KWin::activateWindow(kb->topLevelWidget()->winId());
kb->projectOpen(projectFile);
kb->openTemplate(t,u,TQString::fromUtf8(package),newWindow);
}
@@ -350,7 +350,7 @@ void KBabelInterface::openTemplate(TQCString openFilename, TQCString saveFilenam
{
kb = new KBabelMW(project);
kb->show();
- KWin::activateWindow(kb->tqtopLevelWidget()->winId());
+ KWin::activateWindow(kb->topLevelWidget()->winId());
kb->openTemplate(t,u,TQString::fromUtf8(package));
}
}
@@ -505,7 +505,7 @@ KBabelMW* KBabelInterface::findInstance( const KURL& url, const TQString& projec
if(kb)
{
- KWin::activateWindow(kb->tqtopLevelWidget()->winId());
+ KWin::activateWindow(kb->topLevelWidget()->winId());
}
}
diff --git a/kbabel/kbabel/mymultilineedit.cpp b/kbabel/kbabel/mymultilineedit.cpp
index af824fdd..7b2155eb 100644
--- a/kbabel/kbabel/mymultilineedit.cpp
+++ b/kbabel/kbabel/mymultilineedit.cpp
@@ -120,7 +120,7 @@ void MyMultiLineEdit::processCommand(EditCommand* cmd, bool undo)
TQPalette _visibleHighlight( palette() );
TQPalette _invisibleHighlight( palette() );
- TQColorGroup newcg( tqcolorGroup() );
+ TQColorGroup newcg( colorGroup() );
newcg.setColor( TQColorGroup::HighlightedText, newcg.text() );
newcg.setColor( TQColorGroup::Highlight, newcg.base() );
if( hasFocus() ) _invisibleHighlight.setActive( newcg );
@@ -362,7 +362,7 @@ void MyMultiLineEdit::insert( const TQString & text, bool indent, bool checkNewL
TQPalette _visibleHighlight( palette() );
TQPalette _invisibleHighlight( palette() );
- TQColorGroup newcg( tqcolorGroup() );
+ TQColorGroup newcg( colorGroup() );
newcg.setColor( TQColorGroup::HighlightedText, newcg.text() );
newcg.setColor( TQColorGroup::Highlight, newcg.base() );
if( hasFocus() ) _invisibleHighlight.setActive( newcg );
@@ -598,7 +598,7 @@ MsgMultiLineEdit::MsgMultiLineEdit(int ID, KSpell* spell, TQWidget* parent,const
_cleverEditing(false),
_highlightBg(false),
_spacePoints(false),
- _bgColor(tqcolorGroup().base().dark(110)),
+ _bgColor(colorGroup().base().dark(110)),
_textColor(KGlobalSettings::textColor()),
_errorColor(TQt::red),
_currentColor(KGlobalSettings::textColor()),
@@ -910,7 +910,7 @@ void MsgMultiLineEdit::setDiffColors(const TQColor& addColor
void MsgMultiLineEdit::setTextColor(const TQColor &color )
{
TQPalette p( palette() );
- TQColorGroup newcg( tqcolorGroup() );
+ TQColorGroup newcg( colorGroup() );
newcg.setColor( TQColorGroup::Text, color );
if( hasFocus() ) p.setActive( newcg );
else p.setInactive( newcg );
@@ -1167,7 +1167,7 @@ void MsgMultiLineEdit::highlight()
TQColor bg;
if( _highlightBg ) bg = _bgColor;
- else bg = tqcolorGroup().base();
+ else bg = colorGroup().base();
for( int i = 0 ; i < paragraphs() ; i++ )
setParagraphBackgroundColor( i, bg );
diff --git a/kbabel/kbabel/searchpreferences.ui b/kbabel/kbabel/searchpreferences.ui
index c00e537f..10ce1a89 100644
--- a/kbabel/kbabel/searchpreferences.ui
+++ b/kbabel/kbabel/searchpreferences.ui
@@ -96,7 +96,7 @@ the desired dictionary from <b>Settings->Configure Dictionary</b>
Expanding
-
+
31
91
diff --git a/kbabel/kbabeldict/kbabeldictbox.cpp b/kbabel/kbabeldict/kbabeldictbox.cpp
index de0f747f..62f68f7d 100644
--- a/kbabel/kbabeldict/kbabeldictbox.cpp
+++ b/kbabel/kbabeldict/kbabeldictbox.cpp
@@ -324,10 +324,10 @@ KBabelDictBox::KBabelDictBox( TQWidget* parent, const char* name, WFlags fl )
mainLayout->addLayout(hbox);
totalResultsLabel->setNum(100000);
- totalResultsLabel->setFixedSize(totalResultsLabel->tqsizeHint());
+ totalResultsLabel->setFixedSize(totalResultsLabel->sizeHint());
totalResultsLabel->setNum(0);
currentLabel->setNum(100000);
- currentLabel->setFixedSize(currentLabel->tqsizeHint());
+ currentLabel->setFixedSize(currentLabel->sizeHint());
currentLabel->setNum(0);
setRMBMenu(new TQPopupMenu(this));
diff --git a/kbabel/kbabeldict/kbabelsplash.cpp b/kbabel/kbabeldict/kbabelsplash.cpp
index a62cec5f..85ec22d4 100644
--- a/kbabel/kbabeldict/kbabelsplash.cpp
+++ b/kbabel/kbabeldict/kbabelsplash.cpp
@@ -55,7 +55,7 @@ KBabelSplash::KBabelSplash( TQWidget* parent, const char* name )
// Set tqgeometry, with support for Xinerama systems
TQRect r;
- r.setSize(tqsizeHint());
+ r.setSize(sizeHint());
int ps = TQApplication::desktop()->primaryScreen();
r.moveCenter( TQApplication::desktop()->screenGeometry(ps).center() );
setGeometry(r);
diff --git a/kbabel/kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp b/kbabel/kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp
index 4c79bacd..46948614 100644
--- a/kbabel/kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp
+++ b/kbabel/kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp
@@ -474,7 +474,7 @@ KDBSearchEngine::messagesForFilter (const SearchFilter * filter,
if (count % step == 0)
{
emit progress (100 * count / totalRecord);
- kapp->tqprocessEvents (100);
+ kapp->processEvents (100);
}
if (stopNow)
{
@@ -582,7 +582,7 @@ KDBSearchEngine::repeat ()
if (count % step == 0)
{
emit progress (100 * count / totalRecord);
- kapp->tqprocessEvents (100);
+ kapp->processEvents (100);
}
if (stopNow)
{
@@ -755,7 +755,7 @@ KDBSearchEngine::startSearchNow (int searchmode)
step = 100;
emit progress (0);
- kapp->tqprocessEvents (100);
+ kapp->processEvents (100);
if (stopNow)
{
stopNow = false;
@@ -775,7 +775,7 @@ KDBSearchEngine::startSearchNow (int searchmode)
{
emit progress (100 * count / /*TQMAX( */
totalprogress /*,1) */ );
- kapp->tqprocessEvents (100);
+ kapp->processEvents (100);
if (stopNow)
{
@@ -1715,7 +1715,7 @@ TQValueList < KeyAndScore > KDBSearchEngine::searchWords (TQString phrase,
{
emit
progress (100 * count / totalprogress);
- kapp->tqprocessEvents (100);
+ kapp->processEvents (100);
}
if (stopNow)
{
diff --git a/kbabel/kbabeldict/modules/dbsearchengine/dbscan.cpp b/kbabel/kbabeldict/modules/dbsearchengine/dbscan.cpp
index 2969a9df..10a3a796 100644
--- a/kbabel/kbabeldict/modules/dbsearchengine/dbscan.cpp
+++ b/kbabel/kbabeldict/modules/dbsearchengine/dbscan.cpp
@@ -128,7 +128,7 @@ emit fileLoading(0);
KURL u(fileName);
-ConversiontqStatus rr=catalog->openURL(u);
+ConversionStatus rr=catalog->openURL(u);
if(rr != OK && rr !=RECOVERED_PARSE_ERROR )
{
delete catalog;
@@ -159,7 +159,7 @@ for (i=0;itqprocessEvents(100);
+ kapp->processEvents(100);
}
fuzzy=catalog->isFuzzy(i);
diff --git a/kbabel/kbabeldict/modules/dbsearchengine/dbseprefwidget.ui b/kbabel/kbabeldict/modules/dbsearchengine/dbseprefwidget.ui
index b457bf74..6c3fa8a9 100644
--- a/kbabel/kbabeldict/modules/dbsearchengine/dbseprefwidget.ui
+++ b/kbabel/kbabeldict/modules/dbsearchengine/dbseprefwidget.ui
@@ -179,7 +179,7 @@ It also substitutes groups of more than one space character with only one space
0
-
+
0
20
@@ -245,7 +245,7 @@ It also substitutes groups of more than one space character with only one space
Fixed
-
+
20
20
@@ -262,7 +262,7 @@ It also substitutes groups of more than one space character with only one space
Fixed
-
+
20
20
@@ -332,7 +332,7 @@ It also substitutes groups of more than one space character with only one space
Fixed
-
+
20
20
@@ -384,7 +384,7 @@ If you search for <em>My name is Andrea</em> and you have activated
Fixed
-
+
20
20
@@ -415,7 +415,7 @@ If you search for <em>My name is Andrea</em> and you have activated
Fixed
-
+
20
20
diff --git a/kbabel/kbabeldict/modules/dbsearchengine/preferenceswidget.cpp b/kbabel/kbabeldict/modules/dbsearchengine/preferenceswidget.cpp
index a2c8c289..a3481a07 100644
--- a/kbabel/kbabeldict/modules/dbsearchengine/preferenceswidget.cpp
+++ b/kbabel/kbabeldict/modules/dbsearchengine/preferenceswidget.cpp
@@ -25,7 +25,7 @@ PreferencesWidget::PreferencesWidget(TQWidget *parent, const char* name)
dbpw->dirInput->setMode(KFile::Directory | KFile::LocalOnly);
tqlayout->addWidget(dbpw);
- resize(TQSize(200,200).expandedTo(tqminimumSizeHint()));
+ resize(TQSize(200,200).expandedTo(minimumSizeHint()));
// connect(dbpw->browseTB_3,TQT_SIGNAL(clicked()),TQT_SLOT(browse1()));
diff --git a/kbabel/kbabeldict/modules/dbsearchengine2/dbscan.cpp b/kbabel/kbabeldict/modules/dbsearchengine2/dbscan.cpp
index 23f0b7d2..c4f5e397 100644
--- a/kbabel/kbabeldict/modules/dbsearchengine2/dbscan.cpp
+++ b/kbabel/kbabeldict/modules/dbsearchengine2/dbscan.cpp
@@ -212,7 +212,7 @@ emit fileLoading(0);
bool error;
-ConversiontqStatus rr=catalog->openURL(u);
+ConversionStatus rr=catalog->openURL(u);
if(rr != OK && rr !=RECOVERED_PARSE_ERROR )
{
delete catalog;
diff --git a/kbabel/kbabeldict/modules/dbsearchengine2/dbse2.ui b/kbabel/kbabeldict/modules/dbsearchengine2/dbse2.ui
index 285319e5..685e86bd 100644
--- a/kbabel/kbabeldict/modules/dbsearchengine2/dbse2.ui
+++ b/kbabel/kbabeldict/modules/dbsearchengine2/dbse2.ui
@@ -109,7 +109,7 @@
Expanding
-
+
20
40
@@ -147,7 +147,7 @@
Expanding
-
+
20
40
@@ -380,7 +380,7 @@
Fixed
-
+
20
20
@@ -496,7 +496,7 @@
Expanding
-
+
20
20
@@ -669,7 +669,7 @@
Expanding
-
+
20
40
diff --git a/kbabel/kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui b/kbabel/kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui
index 64a74b8a..0834f06c 100644
--- a/kbabel/kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui
+++ b/kbabel/kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui
@@ -182,7 +182,7 @@ It also substitutes groups of more than one space character with only one space
0
-
+
0
20
@@ -248,7 +248,7 @@ It also substitutes groups of more than one space character with only one space
Fixed
-
+
20
20
@@ -265,7 +265,7 @@ It also substitutes groups of more than one space character with only one space
Fixed
-
+
20
20
@@ -335,7 +335,7 @@ It also substitutes groups of more than one space character with only one space
Fixed
-
+
20
20
@@ -387,7 +387,7 @@ If you search for <em>My name is Andrea</em> and you have activated
Fixed
-
+
20
20
@@ -418,7 +418,7 @@ If you search for <em>My name is Andrea</em> and you have activated
Fixed
-
+
20
20
diff --git a/kbabel/kbabeldict/modules/dbsearchengine2/sourcedialog.ui b/kbabel/kbabeldict/modules/dbsearchengine2/sourcedialog.ui
index 39e1f2ac..a34953df 100644
--- a/kbabel/kbabeldict/modules/dbsearchengine2/sourcedialog.ui
+++ b/kbabel/kbabeldict/modules/dbsearchengine2/sourcedialog.ui
@@ -29,7 +29,7 @@
Expanding
-
+
40
20
@@ -72,7 +72,7 @@
- tqStatus:
+ Status:
diff --git a/kbabel/kbabeldict/modules/poauxiliary/poauxiliary.cpp b/kbabel/kbabeldict/modules/poauxiliary/poauxiliary.cpp
index 9025d716..589b3d25 100644
--- a/kbabel/kbabeldict/modules/poauxiliary/poauxiliary.cpp
+++ b/kbabel/kbabeldict/modules/poauxiliary/poauxiliary.cpp
@@ -182,7 +182,7 @@ bool PoAuxiliary::startSearch(const TQString& t, uint pluralForm, const SearchFi
clearResults();
- kapp->tqprocessEvents(100);
+ kapp->processEvents(100);
text.replace("\n","");
@@ -255,7 +255,7 @@ bool PoAuxiliary::startSearchInTranslation(const TQString& text)
clearResults();
- kapp->tqprocessEvents(100);
+ kapp->processEvents(100);
Entry *entry = msgstrDict[text];
if(entry)
@@ -427,7 +427,7 @@ void PoAuxiliary::loadAuxiliary()
connect(catalog, TQT_SIGNAL(signalProgress(int))
, this, TQT_SIGNAL(progress(int)));
- ConversiontqStatus stat = catalog->openURL(u);
+ ConversionStatus stat = catalog->openURL(u);
if( stat != OK && stat != RECOVERED_PARSE_ERROR)
{
kdDebug(KBABEL_SEARCH) << "error while opening file " << u.prettyURL() << endl;
@@ -455,7 +455,7 @@ void PoAuxiliary::loadAuxiliary()
if( (100*(i+1))%total < 100 )
{
emit progress((100*(i+1))/total);
- kapp->tqprocessEvents(100);
+ kapp->processEvents(100);
}
Entry *e = new Entry;
diff --git a/kbabel/kbabeldict/modules/poauxiliary/pwidget.ui b/kbabel/kbabeldict/modules/poauxiliary/pwidget.ui
index b91f98e5..27179462 100644
--- a/kbabel/kbabeldict/modules/poauxiliary/pwidget.ui
+++ b/kbabel/kbabeldict/modules/poauxiliary/pwidget.ui
@@ -92,14 +92,14 @@ The following variables will be replaced in the path if available:
Expanding
- tqsizeHint
+ sizeHint
20
20
- tqsizeHint
+ sizeHint
20
20
diff --git a/kbabel/kbabeldict/modules/pocompendium/compendiumdata.cpp b/kbabel/kbabeldict/modules/pocompendium/compendiumdata.cpp
index e6565e54..b90479e1 100644
--- a/kbabel/kbabeldict/modules/pocompendium/compendiumdata.cpp
+++ b/kbabel/kbabeldict/modules/pocompendium/compendiumdata.cpp
@@ -79,7 +79,7 @@ bool CompendiumData::load(KURL url)
emit progressStarts(i18n("Loading PO compendium"));
connect(_catalog, TQT_SIGNAL(signalProgress(int)), this, TQT_SIGNAL(progress(int)));
- ConversiontqStatus stat=_catalog->openURL(url);
+ ConversionStatus stat=_catalog->openURL(url);
disconnect(_catalog, TQT_SIGNAL(signalProgress(int))
, this, TQT_SIGNAL(progress(int)));
@@ -109,7 +109,7 @@ bool CompendiumData::load(KURL url)
if( (100*(i+1))%total < 100 )
{
emit progress((100*(i+1))/total);
- kapp->tqprocessEvents(100);
+ kapp->processEvents(100);
}
// FIXME: shoudl care about plural forms
diff --git a/kbabel/kbabeldict/modules/pocompendium/pocompendium.cpp b/kbabel/kbabeldict/modules/pocompendium/pocompendium.cpp
index 60de6a4f..f5ecf286 100644
--- a/kbabel/kbabeldict/modules/pocompendium/pocompendium.cpp
+++ b/kbabel/kbabeldict/modules/pocompendium/pocompendium.cpp
@@ -369,7 +369,7 @@ bool PoCompendium::searchWords(const TQString& searchStr, uint pluralForm, TQPtr
emit progress( (50*checkCounter+1)/catalogInfo.total);
}
- kapp->tqprocessEvents(100);
+ kapp->processEvents(100);
TQString origStr = data->catalog()->msgid(*it).first();
origStr = CompendiumData::simplify(origStr);
@@ -537,7 +537,7 @@ bool PoCompendium::searchNGram(const TQString& searchStr, uint pluralForm, TQPtr
continue;
}
- kapp->tqprocessEvents(100);
+ kapp->processEvents(100);
TQString origStr = data->catalog()->msgid(i).first();
origStr = CompendiumData::simplify(origStr);
diff --git a/kbabel/kbabeldict/modules/pocompendium/pwidget.ui b/kbabel/kbabeldict/modules/pocompendium/pwidget.ui
index f9558dc3..05bafd89 100644
--- a/kbabel/kbabeldict/modules/pocompendium/pwidget.ui
+++ b/kbabel/kbabeldict/modules/pocompendium/pwidget.ui
@@ -236,14 +236,14 @@
Expanding
- tqsizeHint
+ sizeHint
20
20
- tqsizeHint
+ sizeHint
20
20
diff --git a/kbabel/kbabeldict/modules/tmx/pwidget.ui b/kbabel/kbabeldict/modules/tmx/pwidget.ui
index 9d0d4281..875e744f 100644
--- a/kbabel/kbabeldict/modules/tmx/pwidget.ui
+++ b/kbabel/kbabeldict/modules/tmx/pwidget.ui
@@ -171,7 +171,7 @@
Expanding
-
+
20
20
diff --git a/kbabel/kbabeldict/modules/tmx/tmxcompendium.cpp b/kbabel/kbabeldict/modules/tmx/tmxcompendium.cpp
index 9163d7cb..ca28acbe 100644
--- a/kbabel/kbabeldict/modules/tmx/tmxcompendium.cpp
+++ b/kbabel/kbabeldict/modules/tmx/tmxcompendium.cpp
@@ -337,7 +337,7 @@ bool TmxCompendium::startSearch(const TQString& text, uint pluralForm, const Sea
emit progress( (100*(checkCounter+1))/data->numberOfEntries());
}
- kapp->tqprocessEvents(100);
+ kapp->processEvents(100);
TQString origStr = data->msgid(*it);
origStr = TmxCompendiumData::simplify(origStr);
@@ -484,7 +484,7 @@ bool TmxCompendium::startSearch(const TQString& text, uint pluralForm, const Sea
continue;
}
- kapp->tqprocessEvents(100);
+ kapp->processEvents(100);
if(i >= data->numberOfEntries())
{
diff --git a/kbabel/kbabeldict/modules/tmx/tmxcompendiumdata.cpp b/kbabel/kbabeldict/modules/tmx/tmxcompendiumdata.cpp
index 8646806e..3c12be11 100644
--- a/kbabel/kbabeldict/modules/tmx/tmxcompendiumdata.cpp
+++ b/kbabel/kbabeldict/modules/tmx/tmxcompendiumdata.cpp
@@ -146,7 +146,7 @@ bool TmxCompendiumData::load(const KURL& url, const TQString& language)
if( (100*(i+1))%total < 100 )
{
emit progress((100*(i+1))/total);
- kapp->tqprocessEvents(100);
+ kapp->processEvents(100);
}
TQDomNodeList tuvTags = tuTags.item(i).toElement().elementsByTagName("tuv");
diff --git a/kbabel/kbabeldict/searchengine.h b/kbabel/kbabeldict/searchengine.h
index c5b28ad5..cafebd1f 100644
--- a/kbabel/kbabeldict/searchengine.h
+++ b/kbabel/kbabeldict/searchengine.h
@@ -91,7 +91,7 @@ public:
TQString projectContext;
/**
- * tqStatus of the translation, for example "approved", "spellchecked", "unknown"
+ * Status of the translation, for example "approved", "spellchecked", "unknown"
*/
TQString status;
@@ -173,7 +173,7 @@ public:
, _translators()
, _projectKeywords()
, _projectContexts()
- , _translationtqStatus()
+ , _translationStatus()
{}
virtual ~SearchFilter() {}
@@ -213,10 +213,10 @@ public:
void setProjectContext( const TQStringList& projectContexts) { _projectContexts = projectContexts; }
/**
- * tqStatus of the translation, for example "approved", "spellchecked", "unknown"
+ * Status of the translation, for example "approved", "spellchecked", "unknown"
*/
- void settqStatus( const TQString& translationtqStatus) { _translationtqStatus = translationtqStatus; }
- void settqStatus( const TQStringList& translationStati) { _translationtqStatus = translationStati; }
+ void setStatus( const TQString& translationStatus) { _translationStatus = translationStatus; }
+ void setStatus( const TQStringList& translationStati) { _translationStatus = translationStati; }
/**
* The key method of the class - check, if the argument
@@ -232,7 +232,7 @@ private:
TQStringList _translators;
TQStringList _projectKeywords ;
TQStringList _projectContexts;
- TQStringList _translationtqStatus;
+ TQStringList _translationStatus;
};
/**
diff --git a/kbugbuster/backend/bug.cpp b/kbugbuster/backend/bug.cpp
index c2328122..ec249ef7 100644
--- a/kbugbuster/backend/bug.cpp
+++ b/kbugbuster/backend/bug.cpp
@@ -56,16 +56,16 @@ TQString Bug::severityLabel( Bug::Severity s )
TQString Bug::severityToString( Bug::Severity s )
{
switch ( s ) {
- case Critical: return TQString::tqfromLatin1( "critical" );
- case Grave: return TQString::tqfromLatin1( "grave" );
- case Major: return TQString::tqfromLatin1( "major" );
- case Crash: return TQString::tqfromLatin1( "crash" );
- case Normal: return TQString::tqfromLatin1( "normal" );
- case Minor: return TQString::tqfromLatin1( "minor" );
- case Wishlist: return TQString::tqfromLatin1( "wishlist" );
+ case Critical: return TQString::fromLatin1( "critical" );
+ case Grave: return TQString::fromLatin1( "grave" );
+ case Major: return TQString::fromLatin1( "major" );
+ case Crash: return TQString::fromLatin1( "crash" );
+ case Normal: return TQString::fromLatin1( "normal" );
+ case Minor: return TQString::fromLatin1( "minor" );
+ case Wishlist: return TQString::fromLatin1( "wishlist" );
default:
kdWarning() << "Bug::severityToString invalid severity " << s << endl;
- return TQString::tqfromLatin1( "" );
+ return TQString::fromLatin1( "" );
}
}
@@ -95,7 +95,7 @@ TQValueList Bug::severities()
return s;
}
-TQString Bug::statusLabel( Bug::tqStatus s )
+TQString Bug::statusLabel( Bug::Status s )
{
switch ( s )
{
@@ -109,21 +109,21 @@ TQString Bug::statusLabel( Bug::tqStatus s )
}
}
-TQString Bug::statusToString( Bug::tqStatus s )
+TQString Bug::statusToString( Bug::Status s )
{
switch ( s ) {
- case Unconfirmed: return TQString::tqfromLatin1( "unconfirmed" );
- case New: return TQString::tqfromLatin1( "new" );
- case Assigned: return TQString::tqfromLatin1( "assigned" );
- case Reopened: return TQString::tqfromLatin1( "reopened" );
- case Closed: return TQString::tqfromLatin1( "closed" );
+ case Unconfirmed: return TQString::fromLatin1( "unconfirmed" );
+ case New: return TQString::fromLatin1( "new" );
+ case Assigned: return TQString::fromLatin1( "assigned" );
+ case Reopened: return TQString::fromLatin1( "reopened" );
+ case Closed: return TQString::fromLatin1( "closed" );
default:
kdWarning() << "Bug::statusToString invalid status " << s << endl;
- return TQString::tqfromLatin1( "" );
+ return TQString::fromLatin1( "" );
}
}
-Bug::tqStatus Bug::stringTotqStatus( const TQString &s, bool *ok )
+Bug::Status Bug::stringToStatus( const TQString &s, bool *ok )
{
if ( ok )
*ok = true;
@@ -207,7 +207,7 @@ Bug::BugMergeList Bug::mergedWith() const
}
-Bug::tqStatus Bug::status() const
+Bug::Status Bug::status() const
{
if ( !m_impl )
return StatusUndefined;
diff --git a/kbugbuster/backend/bug.h b/kbugbuster/backend/bug.h
index e60b0e98..406179c8 100644
--- a/kbugbuster/backend/bug.h
+++ b/kbugbuster/backend/bug.h
@@ -17,7 +17,7 @@ public:
enum Severity { SeverityUndefined, Critical, Grave, Major, Crash, Normal,
Minor, Wishlist };
- enum tqStatus { StatusUndefined, Unconfirmed, New, Assigned, Reopened,
+ enum Status { StatusUndefined, Unconfirmed, New, Assigned, Reopened,
Closed };
Bug();
@@ -55,23 +55,23 @@ public:
BugMergeList mergedWith() const;
/**
- * tqStatus of a bug. Currently open or closed.
+ * Status of a bug. Currently open or closed.
* TODO: Should we add a status 'deleted' here ?
*/
- tqStatus status() const;
- void settqStatus( tqStatus newtqStatus );
+ Status status() const;
+ void setStatus( Status newStatus );
- static TQString statusLabel( tqStatus s );
+ static TQString statusLabel( Status s );
/**
Return string representation of status. This function is symmetric to
- stringTotqStatus().
+ stringToStatus().
*/
- static TQString statusToString( tqStatus s );
+ static TQString statusToString( Status s );
/**
Return status code of string representation. This function is symmetric
to statusToString().
*/
- static tqStatus stringTotqStatus( const TQString &, bool *ok = 0 );
+ static Status stringToStatus( const TQString &, bool *ok = 0 );
bool operator==( const Bug &rhs );
bool operator<( const Bug &rhs ) const;
diff --git a/kbugbuster/backend/bugcache.cpp b/kbugbuster/backend/bugcache.cpp
index 66f59eb5..ce325a31 100644
--- a/kbugbuster/backend/bugcache.cpp
+++ b/kbugbuster/backend/bugcache.cpp
@@ -137,7 +137,7 @@ Bug::List BugCache::loadBugList( const Package &pkg, const TQString &component,
if ( !title.isEmpty() ) // dunno how I ended up with an all empty bug in the cache
{
Person submitter = readPerson( m_cacheBugs, "Submitter" );
- Bug::tqStatus status = Bug::stringTotqStatus( m_cacheBugs->readEntry("Status") );
+ Bug::Status status = Bug::stringToStatus( m_cacheBugs->readEntry("Status") );
Bug::Severity severity = Bug::stringToSeverity( m_cacheBugs->readEntry("Severity") );
Person developerTODO = readPerson( m_cacheBugs, "TODO" );
Bug::BugMergeList mergedWith = m_cacheBugs->readIntListEntry( "MergedWith" );
diff --git a/kbugbuster/backend/bugcommand.h b/kbugbuster/backend/bugcommand.h
index bb53cdb4..9f68fb2e 100644
--- a/kbugbuster/backend/bugcommand.h
+++ b/kbugbuster/backend/bugcommand.h
@@ -51,7 +51,7 @@ class BugCommandClose : public BugCommand {
TQString name();
TQString details() const;
- TQString type() const { return TQString::tqfromLatin1("Close"); }
+ TQString type() const { return TQString::fromLatin1("Close"); }
void save( KConfig * );
@@ -68,7 +68,7 @@ class BugCommandCloseSilently : public BugCommand {
TQString name();
- TQString type() const { return TQString::tqfromLatin1("CloseSilently"); }
+ TQString type() const { return TQString::fromLatin1("CloseSilently"); }
void save( KConfig * );
};
@@ -82,7 +82,7 @@ class BugCommandReopen : public BugCommand {
TQString name();
- TQString type() const { return TQString::tqfromLatin1("Reopen"); }
+ TQString type() const { return TQString::fromLatin1("Reopen"); }
void save( KConfig * );
};
@@ -97,7 +97,7 @@ class BugCommandRetitle : public BugCommand {
TQString name();
TQString details() const;
- TQString type() const { return TQString::tqfromLatin1("Retitle"); }
+ TQString type() const { return TQString::fromLatin1("Retitle"); }
void save( KConfig * );
@@ -115,7 +115,7 @@ class BugCommandMerge : public BugCommand {
TQString name();
TQString details() const;
- TQString type() const { return TQString::tqfromLatin1("Merge"); }
+ TQString type() const { return TQString::fromLatin1("Merge"); }
void save( KConfig * );
@@ -130,7 +130,7 @@ class BugCommandUnmerge : public BugCommand {
TQString name();
- TQString type() const { return TQString::tqfromLatin1("Unmerge"); }
+ TQString type() const { return TQString::fromLatin1("Unmerge"); }
void save( KConfig * );
@@ -148,7 +148,7 @@ class BugCommandReply : public BugCommand {
TQString name();
TQString details() const;
- TQString type() const { return TQString::tqfromLatin1("Reply"); }
+ TQString type() const { return TQString::fromLatin1("Reply"); }
void save( KConfig * );
@@ -169,7 +169,7 @@ class BugCommandReplyPrivate : public BugCommand {
TQString name();
TQString details() const;
- TQString type() const { return TQString::tqfromLatin1("ReplyPrivate"); }
+ TQString type() const { return TQString::fromLatin1("ReplyPrivate"); }
void save( KConfig * );
@@ -186,7 +186,7 @@ class BugCommandSeverity : public BugCommand {
TQString name();
TQString details() const;
- TQString type() const { return TQString::tqfromLatin1("Severity"); }
+ TQString type() const { return TQString::fromLatin1("Severity"); }
TQString controlString() const;
@@ -204,7 +204,7 @@ class BugCommandReassign : public BugCommand {
TQString name();
TQString details() const;
- TQString type() const { return TQString::tqfromLatin1("Reassign"); }
+ TQString type() const { return TQString::fromLatin1("Reassign"); }
TQString controlString() const;
diff --git a/kbugbuster/backend/bugdetails.cpp b/kbugbuster/backend/bugdetails.cpp
index 6c153e2c..1b6a1f79 100644
--- a/kbugbuster/backend/bugdetails.cpp
+++ b/kbugbuster/backend/bugdetails.cpp
@@ -79,7 +79,7 @@ int BugDetails::age() const
if ( !m_impl )
return 0;
- return submissionDate().daysTo( TQDateTime::tqcurrentDateTime() );
+ return submissionDate().daysTo( TQDateTime::currentDateTime() );
}
BugDetailsPart::List BugDetails::parts() const
diff --git a/kbugbuster/backend/bugimpl.h b/kbugbuster/backend/bugimpl.h
index b1d94b2d..7fefc53d 100644
--- a/kbugbuster/backend/bugimpl.h
+++ b/kbugbuster/backend/bugimpl.h
@@ -12,7 +12,7 @@ struct BugImpl : public KShared
public:
BugImpl( const TQString &_title, const Person &_submitter, TQString _number,
uint _age, Bug::Severity _severity, Person _developerTODO,
- Bug::tqStatus _status, const Bug::BugMergeList& _mergedWith )
+ Bug::Status _status, const Bug::BugMergeList& _mergedWith )
: age( _age ), title( _title ), submitter( _submitter ), number( _number ),
severity( _severity ), developerTODO( _developerTODO ),
status( _status ), mergedWith( _mergedWith )
@@ -25,7 +25,7 @@ public:
TQString number;
Bug::Severity severity;
Person developerTODO;
- Bug::tqStatus status;
+ Bug::Status status;
Bug::BugMergeList mergedWith;
};
diff --git a/kbugbuster/backend/bugserver.cpp b/kbugbuster/backend/bugserver.cpp
index a1863f58..dc4fa8a5 100644
--- a/kbugbuster/backend/bugserver.cpp
+++ b/kbugbuster/backend/bugserver.cpp
@@ -152,7 +152,7 @@ KURL BugServer::attachmentEditLink( const TQString &id )
return url;
}
-Bug::tqStatus BugServer::bugtqStatus( const TQString &str )
+Bug::Status BugServer::bugStatus( const TQString &str )
{
if ( str == "UNCONFIRMED" ) {
return Bug::Unconfirmed;
diff --git a/kbugbuster/backend/bugserver.h b/kbugbuster/backend/bugserver.h
index b865450f..c76b565a 100644
--- a/kbugbuster/backend/bugserver.h
+++ b/kbugbuster/backend/bugserver.h
@@ -64,7 +64,7 @@ class BugServer
KURL attachmentViewLink( const TQString &id );
KURL attachmentEditLink( const TQString &id );
- Bug::tqStatus bugtqStatus( const TQString & );
+ Bug::Status bugStatus( const TQString & );
Bug::Severity bugSeverity( const TQString & );
diff --git a/kbugbuster/backend/domprocessor.cpp b/kbugbuster/backend/domprocessor.cpp
index e7b1e49c..ffd3e475 100644
--- a/kbugbuster/backend/domprocessor.cpp
+++ b/kbugbuster/backend/domprocessor.cpp
@@ -170,7 +170,7 @@ KBB::Error DomProcessor::parseDomBugList( const TQDomElement &topElement,
TQString submitterName;
TQString submitterEmail;
TQString bugNr;
- Bug::tqStatus status = Bug::StatusUndefined;
+ Bug::Status status = Bug::StatusUndefined;
Bug::Severity severity = Bug::SeverityUndefined;
Person developerTodo;
Bug::BugMergeList mergedList;
@@ -184,7 +184,7 @@ KBB::Error DomProcessor::parseDomBugList( const TQDomElement &topElement,
if ( e.tagName() == "bugid" )
bugNr = e.text();
else if ( e.tagName() == "status" )
- status = server()->bugtqStatus( e.text() );
+ status = server()->bugStatus( e.text() );
else if ( e.tagName() == "descr" )
title = e.text();
else if ( e.tagName() == "reporter" )
@@ -194,7 +194,7 @@ KBB::Error DomProcessor::parseDomBugList( const TQDomElement &topElement,
else if ( e.tagName() == "severity" )
severity = Bug::stringToSeverity( e.text() );
else if ( e.tagName() == "creationdate" )
- age = ( TQDateTime::fromString( e.text(), Qt::ISODate ) ).daysTo( TQDateTime::tqcurrentDateTime() );
+ age = ( TQDateTime::fromString( e.text(), Qt::ISODate ) ).daysTo( TQDateTime::currentDateTime() );
}
Person submitter( submitterName, submitterEmail );
diff --git a/kbugbuster/backend/mailsender.cpp b/kbugbuster/backend/mailsender.cpp
index 2a5ae930..543b1de3 100644
--- a/kbugbuster/backend/mailsender.cpp
+++ b/kbugbuster/backend/mailsender.cpp
@@ -39,7 +39,7 @@ bool MailSender::send(const TQString &fromName,const TQString &fromEmail,const T
{
TQString from( fromName );
if ( !fromEmail.isEmpty() )
- from += TQString::tqfromLatin1( " <%2>" ).tqarg( fromEmail );
+ from += TQString::fromLatin1( " <%2>" ).tqarg( fromEmail );
kdDebug() << "MailSender::sendMail():\nFrom: " << from << "\nTo: " << to
<< "\nbccflag:" << bcc
<< "\nRecipient:" << recipient
@@ -53,18 +53,18 @@ bool MailSender::send(const TQString &fromName,const TQString &fromEmail,const T
bool needHeaders = true;
- TQString command = KStandardDirs::findExe(TQString::tqfromLatin1("sendmail"),
- TQString::tqfromLatin1("/sbin:/usr/sbin:/usr/lib"));
- if (!command.isNull()) command += TQString::tqfromLatin1(" -oi -t");
+ TQString command = KStandardDirs::findExe(TQString::fromLatin1("sendmail"),
+ TQString::fromLatin1("/sbin:/usr/sbin:/usr/lib"));
+ if (!command.isNull()) command += TQString::fromLatin1(" -oi -t");
else {
- command = KStandardDirs::findExe(TQString::tqfromLatin1("mail"));
+ command = KStandardDirs::findExe(TQString::fromLatin1("mail"));
if (command.isNull()) return false; // give up
- command.append(TQString::tqfromLatin1(" -s "));
+ command.append(TQString::fromLatin1(" -s "));
command.append(KProcess::quote(subject));
if (bcc) {
- command.append(TQString::tqfromLatin1(" -b "));
+ command.append(TQString::fromLatin1(" -b "));
command.append(KProcess::quote(from));
}
@@ -85,11 +85,11 @@ bool MailSender::send(const TQString &fromName,const TQString &fromEmail,const T
TQString textComplete;
if (needHeaders)
{
- textComplete += TQString::tqfromLatin1("From: ") + from + '\n';
- textComplete += TQString::tqfromLatin1("To: ") + to + '\n';
- if (bcc) textComplete += TQString::tqfromLatin1("Bcc: ") + from + '\n';
- textComplete += TQString::tqfromLatin1("Subject: ") + subject + '\n';
- textComplete += TQString::tqfromLatin1("X-Mailer: KBugBuster") + '\n';
+ textComplete += TQString::fromLatin1("From: ") + from + '\n';
+ textComplete += TQString::fromLatin1("To: ") + to + '\n';
+ if (bcc) textComplete += TQString::fromLatin1("Bcc: ") + from + '\n';
+ textComplete += TQString::fromLatin1("Subject: ") + subject + '\n';
+ textComplete += TQString::fromLatin1("X-Mailer: KBugBuster") + '\n';
}
textComplete += '\n'; // end of headers
textComplete += body;
@@ -121,11 +121,11 @@ bool MailSender::send(const TQString &fromName,const TQString &fromEmail,const T
else
recipients << to;
- TQString message = TQString::tqfromLatin1( "From: " ) + from +
- TQString::tqfromLatin1( "\nTo: " ) + to +
- TQString::tqfromLatin1( "\nSubject: " ) + subject +
- TQString::tqfromLatin1( "\nX-Mailer: KBugBuster" ) +
- TQString::tqfromLatin1( "\n\n" ) + body;
+ TQString message = TQString::fromLatin1( "From: " ) + from +
+ TQString::fromLatin1( "\nTo: " ) + to +
+ TQString::fromLatin1( "\nSubject: " ) + subject +
+ TQString::fromLatin1( "\nX-Mailer: KBugBuster" ) +
+ TQString::fromLatin1( "\n\n" ) + body;
Smtp *smtp = new Smtp( fromEmail, recipients, message, m_smtpServer );
connect( smtp, TQT_SIGNAL( status( const TQString & ) ),
diff --git a/kbugbuster/backend/person.cpp b/kbugbuster/backend/person.cpp
index 8f73c512..40cf72b7 100644
--- a/kbugbuster/backend/person.cpp
+++ b/kbugbuster/backend/person.cpp
@@ -53,9 +53,9 @@ Person Person::parseFromString( const TQString &_str )
}
int atPos = str.find( '@' );
- int spacedAtPos = str.find( TQString::tqfromLatin1( " at " ) );
+ int spacedAtPos = str.find( TQString::fromLatin1( " at " ) );
if ( atPos == -1 && spacedAtPos != -1 )
- str.replace( spacedAtPos, 4, TQString::tqfromLatin1( "@" ) );
+ str.replace( spacedAtPos, 4, TQString::fromLatin1( "@" ) );
int spacePos = str.find( ' ' );
while ( spacePos != -1 )
diff --git a/kbugbuster/backend/rdfprocessor.cpp b/kbugbuster/backend/rdfprocessor.cpp
index 3beed42f..578b330d 100644
--- a/kbugbuster/backend/rdfprocessor.cpp
+++ b/kbugbuster/backend/rdfprocessor.cpp
@@ -54,7 +54,7 @@ KBB::Error RdfProcessor::parseDomBugList( const TQDomElement &element,
TQString title;
Person submitter;
TQString bugNr;
- Bug::tqStatus status = Bug::StatusUndefined;
+ Bug::Status status = Bug::StatusUndefined;
Bug::Severity severity = Bug::SeverityUndefined;
Person developerTodo;
Bug::BugMergeList mergedList;
@@ -68,7 +68,7 @@ KBB::Error RdfProcessor::parseDomBugList( const TQDomElement &element,
if ( e.tagName() == "bz:id" ) {
bugNr = e.text();
} else if ( e.tagName() == "bz:status" ) {
- status = server()->bugtqStatus( e.text() );
+ status = server()->bugStatus( e.text() );
} else if ( e.tagName() == "bz:severity" ) {
severity = server()->bugSeverity( e.text() );
} else if ( e.tagName() == "bz:summary" ) {
diff --git a/kbugbuster/gui/centralwidget.cpp b/kbugbuster/gui/centralwidget.cpp
index 9a747367..50384351 100644
--- a/kbugbuster/gui/centralwidget.cpp
+++ b/kbugbuster/gui/centralwidget.cpp
@@ -67,7 +67,7 @@ CentralWidget::CentralWidget( const TQCString &initialPackage,
m_searchPane->hide();
// m_listPane->hide();
- m_searchPane->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Minimum,
+ m_searchPane->setSizePolicy( TQSizePolicy( TQSizePolicy::Minimum,
TQSizePolicy::Minimum ) );
m_horSplitter->setResizeMode( m_searchPane, TQSplitter::FollowSizeHint );
diff --git a/kbugbuster/gui/cwbugdetailscontainer_base.ui b/kbugbuster/gui/cwbugdetailscontainer_base.ui
index 338a0b7b..5f6db167 100644
--- a/kbugbuster/gui/cwbugdetailscontainer_base.ui
+++ b/kbugbuster/gui/cwbugdetailscontainer_base.ui
@@ -61,7 +61,7 @@
0
-
+
100
20
diff --git a/kbugbuster/gui/kbbbookmarkmanager.h b/kbugbuster/gui/kbbbookmarkmanager.h
index 23763300..af58a461 100644
--- a/kbugbuster/gui/kbbbookmarkmanager.h
+++ b/kbugbuster/gui/kbbbookmarkmanager.h
@@ -10,7 +10,7 @@ public:
static KBookmarkManager * self() {
if ( !s_bookmarkManager )
{
- TQString bookmarksFile = locateLocal("data", TQString::tqfromLatin1("kbugbuster/bookmarks.xml"));
+ TQString bookmarksFile = locateLocal("data", TQString::fromLatin1("kbugbuster/bookmarks.xml"));
s_bookmarkManager = KBookmarkManager::managerForFile( bookmarksFile );
}
return s_bookmarkManager;
diff --git a/kbugbuster/gui/kbbmainwindow.h b/kbugbuster/gui/kbbmainwindow.h
index 71d621ec..a98edc0e 100644
--- a/kbugbuster/gui/kbbmainwindow.h
+++ b/kbugbuster/gui/kbbmainwindow.h
@@ -120,7 +120,7 @@ class KBBMainWindow : public KMainWindow, virtual public KBookmarkOwner
KToggleAction *m_disconnectedAction;
/**
- * tqStatus bar label. We need this, because the default TQt version doesn't
+ * Status bar label. We need this, because the default TQt version doesn't
* support rich text in the messages
*/
TQLabel *m_statusLabel;
diff --git a/kcachegrind/converters/hotshot2calltree b/kcachegrind/converters/hotshot2calltree
index e5c886a2..4eb8f7de 100644
--- a/kcachegrind/converters/hotshot2calltree
+++ b/kcachegrind/converters/hotshot2calltree
@@ -136,7 +136,7 @@ def return_from_call(caller_stack, call_dict, cost_now):
call_dict[called[0]] = per_file_dict
-def updatetqStatus(filecount):
+def updateStatus(filecount):
sys.stdout.write("reading File #%d \r" % filecount)
sys.stdout.flush()
def convertProfFiles(output, inputfilenames):
@@ -153,7 +153,7 @@ def convertProfFiles(output, inputfilenames):
filecount = 1
number_of_files = len(inputfilenames)
for inputfilename in inputfilenames:
- updatetqStatus(filecount)
+ updateStatus(filecount)
cost, filecount = convertHandleFilename(inputfilename, caller_stack, call_dict, cost_per_pos, cost_per_function, filecount)
total_cost += cost
if (file_limit > 0) and (filecount > file_limit):
@@ -164,7 +164,7 @@ def convertProfFiles(output, inputfilenames):
dumpResults(output, call_dict, total_cost, cost_per_pos, cost_per_function)
def convertHandleFilename(inputfilename, caller_stack, call_dict, cost_per_pos, cost_per_function, filecount):
- updatetqStatus(filecount)
+ updateStatus(filecount)
if not ((file_limit > 0) and (filecount > file_limit)):
if os.path.isdir(inputfilename):
cost, filecount = convertProfDir(inputfilename, caller_stack, call_dict, cost_per_pos, cost_per_function, filecount)
diff --git a/kcachegrind/kcachegrind/cachegrindloader.cpp b/kcachegrind/kcachegrind/cachegrindloader.cpp
index 761830fc..64483512 100644
--- a/kcachegrind/kcachegrind/cachegrindloader.cpp
+++ b/kcachegrind/kcachegrind/cachegrindloader.cpp
@@ -181,8 +181,8 @@ bool CachegrindLoader::loadTrace(TracePart* p)
CachegrindLoader l;
/* emit progress signals via the singleton loader */
- connect(&l, TQT_SIGNAL(updatetqStatus(TQString, int)),
- this, TQT_SIGNAL(updatetqStatus(TQString, int)));
+ connect(&l, TQT_SIGNAL(updateStatus(TQString, int)),
+ this, TQT_SIGNAL(updateStatus(TQString, int)));
return l.loadTraceInternal(p);
}
@@ -737,7 +737,7 @@ bool CachegrindLoader::loadTraceInternal(TracePart* part)
kdDebug() << "Loading " << _filename << " ..." << endl;
TQString statusMsg = i18n("Loading %1").tqarg(_filename);
int statusProgress = 0;
- emit updatetqStatus(statusMsg,statusProgress);
+ emit updateStatus(statusMsg,statusProgress);
#if USE_FIXCOST
@@ -815,7 +815,7 @@ bool CachegrindLoader::loadTraceInternal(TracePart* part)
* "long operations" (like file loading) are in progress,
* this can temporarly switch to another operation.
*/
- emit updatetqStatus(statusMsg,statusProgress);
+ emit updateStatus(statusMsg,statusProgress);
}
continue;
@@ -1308,7 +1308,7 @@ bool CachegrindLoader::loadTraceInternal(TracePart* part)
}
- emit updatetqStatus(statusMsg,100);
+ emit updateStatus(statusMsg,100);
_part->tqinvalidate();
if (!totalsSet) {
diff --git a/kcachegrind/kcachegrind/callgraphview.cpp b/kcachegrind/kcachegrind/callgraphview.cpp
index 5fc8dbb3..f9ebb10c 100644
--- a/kcachegrind/kcachegrind/callgraphview.cpp
+++ b/kcachegrind/kcachegrind/callgraphview.cpp
@@ -1096,7 +1096,7 @@ void CanvasNode::drawShape(TQPainter& p)
if (StoredDrawParams::selected() && _view->hasFocus()) {
_view->tqstyle().tqdrawPrimitive( TQStyle::PE_FocusRect, &p, r,
- _view->tqcolorGroup());
+ _view->colorGroup());
}
// draw afterwards to always get a frame even when zoomed
diff --git a/kcachegrind/kcachegrind/callmapview.cpp b/kcachegrind/kcachegrind/callmapview.cpp
index 3f363f29..7aa6db40 100644
--- a/kcachegrind/kcachegrind/callmapview.cpp
+++ b/kcachegrind/kcachegrind/callmapview.cpp
@@ -531,7 +531,7 @@ void CallMapView::doUpdate(int changeType)
TQColor CallMapView::groupColor(TraceFunction* f) const
{
if (!f)
- return tqcolorGroup().button();
+ return colorGroup().button();
return Configuration::functionColor(_groupType, f);
}
diff --git a/kcachegrind/kcachegrind/configdlgbase.ui b/kcachegrind/kcachegrind/configdlgbase.ui
index 9e5c0b59..575ae5f6 100644
--- a/kcachegrind/kcachegrind/configdlgbase.ui
+++ b/kcachegrind/kcachegrind/configdlgbase.ui
@@ -108,7 +108,7 @@
Fixed
-
+
16
20
@@ -186,7 +186,7 @@
Fixed
-
+
20
16
@@ -203,7 +203,7 @@
Fixed
-
+
16
20
@@ -228,7 +228,7 @@
classCombo
-
+
300
32767
@@ -330,7 +330,7 @@
fileCombo
-
+
300
32767
@@ -352,7 +352,7 @@
0
-
+
300
32767
@@ -441,7 +441,7 @@
Fixed
-
+
16
20
@@ -493,7 +493,7 @@
Expanding
-
+
16
49
@@ -520,7 +520,7 @@
Fixed
-
+
20
16
@@ -570,7 +570,7 @@
Expanding
-
+
210
0
diff --git a/kcachegrind/kcachegrind/dumpselectionbase.ui b/kcachegrind/kcachegrind/dumpselectionbase.ui
index 0643eed7..2f7ac41d 100644
--- a/kcachegrind/kcachegrind/dumpselectionbase.ui
+++ b/kcachegrind/kcachegrind/dumpselectionbase.ui
@@ -493,7 +493,7 @@
Expanding
-
+
21
20
@@ -602,7 +602,7 @@
Expanding
-
+
50
20
@@ -986,7 +986,7 @@
Expanding
-
+
20
20
@@ -1055,7 +1055,7 @@
Expanding
-
+
21
20
diff --git a/kcachegrind/kcachegrind/functionselectionbase.ui b/kcachegrind/kcachegrind/functionselectionbase.ui
index 3ab3378d..f61fcefd 100644
--- a/kcachegrind/kcachegrind/functionselectionbase.ui
+++ b/kcachegrind/kcachegrind/functionselectionbase.ui
@@ -90,7 +90,7 @@
0
-
+
32767
150
diff --git a/kcachegrind/kcachegrind/instritem.cpp b/kcachegrind/kcachegrind/instritem.cpp
index 81341672..985582a1 100644
--- a/kcachegrind/kcachegrind/instritem.cpp
+++ b/kcachegrind/kcachegrind/instritem.cpp
@@ -326,7 +326,7 @@ void InstrItem::paintArrows(TQPainter *p, const TQColorGroup &cg, int width)
const BackgroundMode bgmode = lv->viewport()->backgroundMode();
const TQColorGroup::ColorRole crole
= TQPalette::backgroundRoleFromMode( bgmode );
- if ( cg.brush( crole ) != lv->tqcolorGroup().brush( crole ) )
+ if ( cg.brush( crole ) != lv->colorGroup().brush( crole ) )
p->fillRect( 0, 0, width, height(), cg.brush( crole ) );
else
iv->paintEmptyArea( p, TQRect( 0, 0, width, height() ) );
@@ -373,7 +373,7 @@ void InstrItem::paintArrows(TQPainter *p, const TQColorGroup &cg, int width)
p->fillRect( marg + 6*i-2, (y1==0) ? y1: y1-2,
8, (y2-y1==height())? y2:y2+2,
cg.brush( TQColorGroup::Highlight ) );
- c = lv->tqcolorGroup().highlightedText();
+ c = lv->colorGroup().highlightedText();
}
#endif
p->fillRect( marg + 6*i, y1, 4, y2, c);
@@ -388,7 +388,7 @@ void InstrItem::paintArrows(TQPainter *p, const TQColorGroup &cg, int width)
if (start >= 0) {
#if 0
if (_jump[start] == ((TraceItemView*)_view)->selectedItem()) {
- c = lv->tqcolorGroup().highlightedText();
+ c = lv->colorGroup().highlightedText();
}
#endif
c = _jump[start]->isCondJump() ? red : blue;
@@ -416,13 +416,13 @@ void InstrItem::paintArrows(TQPainter *p, const TQColorGroup &cg, int width)
p->drawConvexPolygon(a);
p->setPen(c.light());
- p->tqdrawPolyline(a, 0, 5);
+ p->drawPolyline(a, 0, 5);
p->setPen(c.dark());
- p->tqdrawPolyline(a, 4, 2);
+ p->drawPolyline(a, 4, 2);
p->setPen(c.light());
- p->tqdrawPolyline(a, 5, 2);
+ p->drawPolyline(a, 5, 2);
p->setPen(c.dark());
- p->tqdrawPolyline(a, 6, 2);
+ p->drawPolyline(a, 6, 2);
}
// draw inner vertical line for start/stop
diff --git a/kcachegrind/kcachegrind/loader.h b/kcachegrind/kcachegrind/loader.h
index ee374054..f79f13d0 100644
--- a/kcachegrind/kcachegrind/loader.h
+++ b/kcachegrind/kcachegrind/loader.h
@@ -67,7 +67,7 @@ public:
TQString description() const { return _description; }
signals:
- void updatetqStatus(TQString, int);
+ void updateStatus(TQString, int);
private:
TQString _name, _description;
diff --git a/kcachegrind/kcachegrind/partgraph.cpp b/kcachegrind/kcachegrind/partgraph.cpp
index 47bda4c9..aa01e627 100644
--- a/kcachegrind/kcachegrind/partgraph.cpp
+++ b/kcachegrind/kcachegrind/partgraph.cpp
@@ -131,7 +131,7 @@ bool PartAreaWidget::isHidden(TracePart* part) const
TQColor PartAreaWidget::groupColor(TraceFunction* f) const
{
if (!f)
- return tqcolorGroup().button();
+ return colorGroup().button();
return Configuration::functionColor(_groupType, f);
}
@@ -234,7 +234,7 @@ TQString BasePartItem::text(int textNo) const
TQColor BasePartItem::backColor() const
{
- return widget()->tqcolorGroup().base();
+ return widget()->colorGroup().base();
}
double BasePartItem::value() const
diff --git a/kcachegrind/kcachegrind/partselectionbase.ui b/kcachegrind/kcachegrind/partselectionbase.ui
index 5ee69746..53320d5b 100644
--- a/kcachegrind/kcachegrind/partselectionbase.ui
+++ b/kcachegrind/kcachegrind/partselectionbase.ui
@@ -37,7 +37,7 @@
0
-
+
0
50
diff --git a/kcachegrind/kcachegrind/sourceitem.cpp b/kcachegrind/kcachegrind/sourceitem.cpp
index 9556c038..6bfc33ac 100644
--- a/kcachegrind/kcachegrind/sourceitem.cpp
+++ b/kcachegrind/kcachegrind/sourceitem.cpp
@@ -314,7 +314,7 @@ void SourceItem::paintArrows(TQPainter *p, const TQColorGroup &cg, int width)
const BackgroundMode bgmode = lv->viewport()->backgroundMode();
const TQColorGroup::ColorRole crole
= TQPalette::backgroundRoleFromMode( bgmode );
- if ( cg.brush( crole ) != lv->tqcolorGroup().brush( crole ) )
+ if ( cg.brush( crole ) != lv->colorGroup().brush( crole ) )
p->fillRect( 0, 0, width, height(), cg.brush( crole ) );
else
sv->paintEmptyArea( p, TQRect( 0, 0, width, height() ) );
@@ -391,13 +391,13 @@ void SourceItem::paintArrows(TQPainter *p, const TQColorGroup &cg, int width)
p->drawConvexPolygon(a);
p->setPen(c.light());
- p->tqdrawPolyline(a, 0, 5);
+ p->drawPolyline(a, 0, 5);
p->setPen(c.dark());
- p->tqdrawPolyline(a, 4, 2);
+ p->drawPolyline(a, 4, 2);
p->setPen(c.light());
- p->tqdrawPolyline(a, 5, 2);
+ p->drawPolyline(a, 5, 2);
p->setPen(c.dark());
- p->tqdrawPolyline(a, 6, 2);
+ p->drawPolyline(a, 6, 2);
}
// draw inner vertical line for start/stop
diff --git a/kcachegrind/kcachegrind/toplevel.cpp b/kcachegrind/kcachegrind/toplevel.cpp
index 44165742..b063dd24 100644
--- a/kcachegrind/kcachegrind/toplevel.cpp
+++ b/kcachegrind/kcachegrind/toplevel.cpp
@@ -100,8 +100,8 @@ TopLevel::TopLevel(const char *name)
#if 0
// how to do avoid main window resizing on large statusbar label?
TQSizePolicy p(TQSizePolicy::Fixed, TQSizePolicy::Expanding);
- _statusLabel->tqsetSizePolicy(p);
- _statusbar->tqsetSizePolicy(p);
+ _statusLabel->setSizePolicy(p);
+ _statusbar->setSizePolicy(p);
#endif
_statusbar->addWidget(_statusLabel, 1);
@@ -2340,7 +2340,7 @@ void TopLevel::showMessage(const TQString& msg, int ms)
_statusbar->message(msg, ms);
}
-void TopLevel::showtqStatus(TQString msg, int progress)
+void TopLevel::showStatus(TQString msg, int progress)
{
static bool msgUpdateNeeded = true;
diff --git a/kcachegrind/kcachegrind/toplevel.h b/kcachegrind/kcachegrind/toplevel.h
index c437ceae..10e7cde5 100644
--- a/kcachegrind/kcachegrind/toplevel.h
+++ b/kcachegrind/kcachegrind/toplevel.h
@@ -196,7 +196,7 @@ public slots:
void slotShowTip();
// progress in status bar, empty message disables progress display
- void showtqStatus(TQString msg, int progress);
+ void showStatus(TQString msg, int progress);
void showMessage(const TQString&, int msec);
private:
diff --git a/kcachegrind/kcachegrind/tracedata.cpp b/kcachegrind/kcachegrind/tracedata.cpp
index 526c1cb0..6e1a8ad3 100644
--- a/kcachegrind/kcachegrind/tracedata.cpp
+++ b/kcachegrind/kcachegrind/tracedata.cpp
@@ -4531,7 +4531,7 @@ void TraceData::load(const TQString& base)
updateFunctionCycles();
// clear loading messages from status bar
- if (_topLevel) _topLevel->showtqStatus(TQString(), 0);
+ if (_topLevel) _topLevel->showStatus(TQString(), 0);
}
TracePart* TraceData::addPart(const TQString& dir, const TQString& name)
@@ -4547,8 +4547,8 @@ TracePart* TraceData::addPart(const TQString& dir, const TQString& name)
if (!l) return 0;
if (_topLevel)
- _topLevel->connect(l, TQT_SIGNAL(updatetqStatus(TQString, int)),
- TQT_SLOT(showtqStatus(TQString, int)));
+ _topLevel->connect(l, TQT_SIGNAL(updateStatus(TQString, int)),
+ TQT_SLOT(showStatus(TQString, int)));
TracePart* part = new TracePart(this, file);
@@ -5015,7 +5015,7 @@ void TraceData::updateFunctionCycles()
#if 0
int fCount = _functionMap.size(), fNo = 0, progress=0, p;
TQString msg = i18n("Recalculating Function Cycles...");
- if (_topLevel) _topLevel->showtqStatus(msg,0);
+ if (_topLevel) _topLevel->showStatus(msg,0);
#endif
// DFS and collapse strong connected components (Tarjan)
@@ -5029,7 +5029,7 @@ void TraceData::updateFunctionCycles()
p = 100*fNo/fCount;
if (p> progress) {
progress = p;
- _topLevel->showtqStatus(msg, p);
+ _topLevel->showStatus(msg, p);
}
}
#endif
@@ -5047,7 +5047,7 @@ void TraceData::updateFunctionCycles()
invalidateDynamicCost();
#if 0
- if (0) if (_topLevel) _topLevel->showtqStatus(TQString(),0);
+ if (0) if (_topLevel) _topLevel->showStatus(TQString(),0);
#endif
}
diff --git a/kcachegrind/kcachegrind/treemap.cpp b/kcachegrind/kcachegrind/treemap.cpp
index c1f7f12b..52e1a83f 100644
--- a/kcachegrind/kcachegrind/treemap.cpp
+++ b/kcachegrind/kcachegrind/treemap.cpp
@@ -1517,11 +1517,11 @@ TreeMapItem* TreeMapWidget::item(int x, int y) const
if (DEBUG_DRAWING)
kdDebug(90100) << " Checking " << i->path(0).join("/") << " ("
- << i->tqitemRect().x() << "/" << i->tqitemRect().y()
- << "-" << i->tqitemRect().width()
- << "x" << i->tqitemRect().height() << ")" << endl;
+ << i->itemRect().x() << "/" << i->itemRect().y()
+ << "-" << i->itemRect().width()
+ << "x" << i->itemRect().height() << ")" << endl;
- if (i->tqitemRect().contains(x, y)) {
+ if (i->itemRect().contains(x, y)) {
if (DEBUG_DRAWING) kdDebug(90100) << " .. Got. Index " << idx << endl;
@@ -1539,7 +1539,7 @@ TreeMapItem* TreeMapWidget::item(int x, int y) const
if (DEBUG_DRAWING)
kdDebug(90100) << "item(" << x << "," << y << "): Got "
<< p->path(0).join("/") << " (Size "
- << p->tqitemRect().width() << "x" << p->tqitemRect().height()
+ << p->itemRect().width() << "x" << p->itemRect().height()
<< ", Val " << p->value() << ")" << endl;
}
@@ -1568,8 +1568,8 @@ TreeMapItem* TreeMapWidget::visibleItem(TreeMapItem* i) const
{
if (i) {
/* Must have a visible area */
- while(i && ((i->tqitemRect().width() <1) ||
- (i->tqitemRect().height() <1))) {
+ while(i && ((i->itemRect().width() <1) ||
+ (i->itemRect().height() <1))) {
TreeMapItem* p = i->parent();
if (!p) break;
int idx = p->tqchildren()->findRef(i);
@@ -1798,7 +1798,7 @@ void TreeMapWidget::contextMenuEvent( TQContextMenuEvent* e )
e->accept();
if ( e->reason() == TQContextMenuEvent::Keyboard ) {
- TQRect r = (_current) ? _current->tqitemRect() : _base->tqitemRect();
+ TQRect r = (_current) ? _current->itemRect() : _base->itemRect();
TQPoint p = TQPoint(r.left() + r.width()/2, r.top() + r.height()/2);
emit contextMenuRequested(_current, p);
}
@@ -1962,14 +1962,14 @@ void TreeMapWidget::mouseDoubleClickEvent( TQMouseEvent* e )
int nextVisible(TreeMapItem* i)
{
TreeMapItem* p = i->parent();
- if (!p || p->tqitemRect().isEmpty()) return -1;
+ if (!p || p->itemRect().isEmpty()) return -1;
int idx = p->tqchildren()->findRef(i);
if (idx<0) return -1;
while (idx < (int)p->tqchildren()->count()-1) {
idx++;
- TQRect r = p->tqchildren()->at(idx)->tqitemRect();
+ TQRect r = p->tqchildren()->at(idx)->itemRect();
if (r.width()>1 && r.height()>1)
return idx;
}
@@ -1980,14 +1980,14 @@ int nextVisible(TreeMapItem* i)
int prevVisible(TreeMapItem* i)
{
TreeMapItem* p = i->parent();
- if (!p || p->tqitemRect().isEmpty()) return -1;
+ if (!p || p->itemRect().isEmpty()) return -1;
int idx = p->tqchildren()->findRef(i);
if (idx<0) return -1;
while (idx > 0) {
idx--;
- TQRect r = p->tqchildren()->at(idx)->tqitemRect();
+ TQRect r = p->tqchildren()->at(idx)->itemRect();
if (r.width()>1 && r.height()>1)
return idx;
}
@@ -2162,7 +2162,7 @@ void TreeMapWidget::drawTreeMap()
}
else {
// only subitem
- if (!_needsRefresh->tqitemRect().isValid()) return;
+ if (!_needsRefresh->itemRect().isValid()) return;
}
// reset cached font object; it could have been changed
@@ -2180,7 +2180,7 @@ void TreeMapWidget::drawTreeMap()
TQPainter p(this);
tqstyle().tqdrawPrimitive( TQStyle::PE_FocusRect, &p,
TQRect(0, 0, TQWidget::width(), TQWidget::height()),
- tqcolorGroup() );
+ colorGroup() );
}
}
@@ -2226,7 +2226,7 @@ void TreeMapWidget::drawItem(TQPainter* p,
int dd = item->depth();
if (isTransparent(dd)) return;
- RectDrawing d(item->tqitemRect());
+ RectDrawing d(item->itemRect());
item->setSelected(isSelected);
item->setCurrent(isCurrent);
item->setShaded(_shading);
@@ -2261,15 +2261,15 @@ void TreeMapWidget::drawItems(TQPainter* p,
{
if (DEBUG_DRAWING)
kdDebug(90100) << "+drawItems(" << item->path(0).join("/") << ", "
- << item->tqitemRect().x() << "/" << item->tqitemRect().y()
- << "-" << item->tqitemRect().width() << "x"
- << item->tqitemRect().height() << "), Val " << item->value()
+ << item->itemRect().x() << "/" << item->itemRect().y()
+ << "-" << item->itemRect().width() << "x"
+ << item->itemRect().height() << "), Val " << item->value()
<< ", Sum " << item->sum() << endl;
drawItem(p, item);
item->clearFreeRects();
- TQRect origRect = item->tqitemRect();
+ TQRect origRect = item->itemRect();
int bw = item->borderWidth();
TQRect r = TQRect(origRect.x()+bw, origRect.y()+bw,
origRect.width()-2*bw, origRect.height()-2*bw);
@@ -2317,7 +2317,7 @@ void TreeMapWidget::drawItems(TQPainter* p,
i->clearItemRect();
}
// tooltip apears on whole item rect
- item->addFreeRect(item->tqitemRect());
+ item->addFreeRect(item->itemRect());
// if we have space for text...
if ((r.height() < _fontHeight) || (r.width() < _fontHeight)) return;
diff --git a/kcachegrind/kcachegrind/treemap.h b/kcachegrind/kcachegrind/treemap.h
index 1604a51c..a70f5bd4 100644
--- a/kcachegrind/kcachegrind/treemap.h
+++ b/kcachegrind/kcachegrind/treemap.h
@@ -297,7 +297,7 @@ public:
*/
void setItemRect(const TQRect& r) { _rect = r; }
void clearItemRect();
- const TQRect& tqitemRect() const { return _rect; }
+ const TQRect& itemRect() const { return _rect; }
int width() const { return _rect.width(); }
int height() const { return _rect.height(); }
diff --git a/kcachegrind/kcachegrind/utils.h b/kcachegrind/kcachegrind/utils.h
index 06052a61..7256f054 100644
--- a/kcachegrind/kcachegrind/utils.h
+++ b/kcachegrind/kcachegrind/utils.h
@@ -86,7 +86,7 @@ class FixString {
bool stripInt64(int64&, bool stripSpaces = true);
operator TQString() const
- { return TQString::tqfromLatin1(_str,_len); }
+ { return TQString::fromLatin1(_str,_len); }
private:
const char* _str;
diff --git a/kioslave/svn/ksvnd/commitdlg.ui b/kioslave/svn/ksvnd/commitdlg.ui
index 35b9a97e..8bf31911 100644
--- a/kioslave/svn/ksvnd/commitdlg.ui
+++ b/kioslave/svn/ksvnd/commitdlg.ui
@@ -58,7 +58,7 @@
Expanding
-
+
220
20
diff --git a/kioslave/svn/ksvnd/ksvnd.cpp b/kioslave/svn/ksvnd/ksvnd.cpp
index fb96c9af..50a53424 100644
--- a/kioslave/svn/ksvnd/ksvnd.cpp
+++ b/kioslave/svn/ksvnd/ksvnd.cpp
@@ -196,7 +196,7 @@ bool KSvnd::anyValidWorkingCopy( const KURL::List& wclist ) {
return false;
}
-int KSvnd::gettqStatus( const KURL::List& list ) {
+int KSvnd::getStatus( const KURL::List& list ) {
int result = 0;
uint files = 0, folders = 0, parentsentries = 0, parentshavesvn = 0, subdirhavesvn = 0, external = 0;
for ( TQValueListConstIterator it = list.begin(); it != list.end() ; ++it ) {
@@ -256,18 +256,18 @@ bool KSvnd::isFolder( const KURL& url ) {
TQStringList KSvnd::getActionMenu ( const KURL::List &list ) {
TQStringList result;
- int listtqStatus = gettqStatus( list );
+ int listStatus = getStatus( list );
- if ( !(listtqStatus & SomeAreInParentsEntries) &&
- !(listtqStatus & SomeAreExternalToParent) &&
- !(listtqStatus & SomeHaveSvn)) {
- if( list.size() == 1 && listtqStatus & SomeAreFolders) {
+ if ( !(listStatus & SomeAreInParentsEntries) &&
+ !(listStatus & SomeAreExternalToParent) &&
+ !(listStatus & SomeHaveSvn)) {
+ if( list.size() == 1 && listStatus & SomeAreFolders) {
result << "Checkout";
result << "Export";
// result << "CreateRepository";
result << "Import";
}
- } else if ( (listtqStatus & AllAreInParentsEntries) ) {
+ } else if ( (listStatus & AllAreInParentsEntries) ) {
result << "Diff";
//In SVN
// result << "ShowLog";
@@ -277,7 +277,7 @@ TQStringList KSvnd::getActionMenu ( const KURL::List &list ) {
// result << "Update to revision..."
result << "Rename";
result << "Delete";
- if( listtqStatus & SomeAreFolders && !(listtqStatus & SomeAreFiles)) {
+ if( listStatus & SomeAreFolders && !(listStatus & SomeAreFiles)) {
result << "Revert";
// result << "Cleanup";
}
@@ -285,19 +285,19 @@ TQStringList KSvnd::getActionMenu ( const KURL::List &list ) {
// result << "BranchTag";
result << "Switch";
result << "Merge";
- if( listtqStatus & SomeAreFolders && !(listtqStatus & SomeAreFiles)) {
+ if( listStatus & SomeAreFolders && !(listStatus & SomeAreFiles)) {
// result << "Export";
// result << "Relocate";
result << "_SEPARATOR_";
result << "Add";
}
result << "_SEPARATOR_";
- if( listtqStatus & SomeAreFiles && !(listtqStatus & SomeAreFolders)) {
+ if( listStatus & SomeAreFiles && !(listStatus & SomeAreFolders)) {
result << "Blame";
}
result << "CreatePatch";
- if( list.size() == 1 && listtqStatus & SomeAreFolders) {
+ if( list.size() == 1 && listStatus & SomeAreFolders) {
// result << "ApplyPatchToFolder";
}
}
@@ -306,12 +306,12 @@ TQStringList KSvnd::getActionMenu ( const KURL::List &list ) {
TQStringList KSvnd::getTopLevelActionMenu ( const KURL::List &list ) {
TQStringList result;
- int listtqStatus = gettqStatus( list );
+ int listStatus = getStatus( list );
- if ( ( listtqStatus & AllParentsHaveSvn &&
- ( ( listtqStatus & SomeAreExternalToParent ) || ( listtqStatus & SomeAreInParentsEntries ) )
- || ( listtqStatus & SomeHaveSvn ) )
+ if ( ( listStatus & AllParentsHaveSvn &&
+ ( ( listStatus & SomeAreExternalToParent ) || ( listStatus & SomeAreInParentsEntries ) )
+ || ( listStatus & SomeHaveSvn ) )
) {
result << "Update";
result << "Commit";
diff --git a/kioslave/svn/ksvnd/ksvnd.h b/kioslave/svn/ksvnd/ksvnd.h
index 78583e02..f28db8bb 100644
--- a/kioslave/svn/ksvnd/ksvnd.h
+++ b/kioslave/svn/ksvnd/ksvnd.h
@@ -56,7 +56,7 @@ k_dcop:
k_dcop_signals:
//emitted whenever something happens using subversion ;)
// void subversionNotify(const TQString&, int ,int, const TQString& , int , int, long int, const TQString&);
-// void subversiontqStatus(const TQString&,int,int,int,int,long int);
+// void subversionStatus(const TQString&,int,int,int,int,long int);
public slots:
@@ -64,7 +64,7 @@ protected:
bool isFileInSvnEntries ( const TQString filename, const TQString entfile );
bool isFileInExternals ( const TQString filename, const TQString propfile );
bool isFolder( const KURL& url );
- int gettqStatus( const KURL::List& list );
+ int getStatus( const KURL::List& list );
};
#endif
diff --git a/kioslave/svn/svnhelper/subversioncheckout.ui b/kioslave/svn/svnhelper/subversioncheckout.ui
index 3ed752e7..af848105 100644
--- a/kioslave/svn/svnhelper/subversioncheckout.ui
+++ b/kioslave/svn/svnhelper/subversioncheckout.ui
@@ -76,7 +76,7 @@
Expanding
-
+
20
20
@@ -155,7 +155,7 @@
Expanding
-
+
121
20
diff --git a/kioslave/svn/svnhelper/subversiondiff.ui b/kioslave/svn/svnhelper/subversiondiff.ui
index e647f6b6..a624e6bb 100644
--- a/kioslave/svn/svnhelper/subversiondiff.ui
+++ b/kioslave/svn/svnhelper/subversiondiff.ui
@@ -60,7 +60,7 @@
Expanding
-
+
20
20
diff --git a/kioslave/svn/svnhelper/subversionlog.ui b/kioslave/svn/svnhelper/subversionlog.ui
index 20060f73..e6135a8e 100644
--- a/kioslave/svn/svnhelper/subversionlog.ui
+++ b/kioslave/svn/svnhelper/subversionlog.ui
@@ -60,7 +60,7 @@
Expanding
-
+
20
20
diff --git a/kioslave/svn/svnhelper/subversionswitch.ui b/kioslave/svn/svnhelper/subversionswitch.ui
index c0642bc4..e5872c58 100644
--- a/kioslave/svn/svnhelper/subversionswitch.ui
+++ b/kioslave/svn/svnhelper/subversionswitch.ui
@@ -76,7 +76,7 @@
Expanding
-
+
20
20
@@ -155,7 +155,7 @@
Expanding
-
+
121
20
diff --git a/kmtrace/match.cpp b/kmtrace/match.cpp
index add7cf3c..afa83bc1 100644
--- a/kmtrace/match.cpp
+++ b/kmtrace/match.cpp
@@ -39,7 +39,7 @@ int main(int argc, char **argv)
while(!feof(map_file))
{
fgets(buf, 1024, map_file);
- TQString line = TQString::tqfromLatin1(buf).stripWhiteSpace();
+ TQString line = TQString::fromLatin1(buf).stripWhiteSpace();
TQStringList split = TQStringList::split(' ', line);
if (split.count() <= 1)
return 1;
@@ -61,7 +61,7 @@ int main(int argc, char **argv)
while(!feof(call_file))
{
fgets(buf, 1024, call_file);
- TQString line = TQString::tqfromLatin1(buf).stripWhiteSpace();
+ TQString line = TQString::fromLatin1(buf).stripWhiteSpace();
if (dict.find(line))
{
qWarning("%s", line.latin1());
diff --git a/kompare/kompare_shell.cpp b/kompare/kompare_shell.cpp
index bb1c71a9..b62c423f 100644
--- a/kompare/kompare_shell.cpp
+++ b/kompare/kompare_shell.cpp
@@ -258,7 +258,7 @@ void KompareShell::setupStatusBar()
m_generalLabel = new KSqueezedTextLabel( "", 0, "general_statusbar_label" );
statusBar()->addWidget( m_generalLabel, 1, false );
- m_generalLabel->tqsetAlignment( TQt::AlignLeft );
+ m_generalLabel->setAlignment( TQt::AlignLeft );
}
void KompareShell::slotUpdateStatusBar( int modelIndex, int differenceIndex, int modelCount, int differenceCount, int appliedCount )
@@ -438,7 +438,7 @@ void KompareShell::slotShowTextView()
// FIXME: proper error checking
m_textViewWidget = createDockWidget( i18n("Text View"), SmallIcon( "text") );
m_textViewPart = KParts::ComponentFactory::createPartInstanceFromQuery(
- TQString::tqfromLatin1("KTextEditor/Document"),
+ TQString::fromLatin1("KTextEditor/Document"),
TQString(), TQT_TQWIDGET(this), 0, TQT_TQOBJECT(this), 0, TQStringList(), &errCode );
if ( m_textViewPart )
{
diff --git a/kompare/komparepart/kompareconnectwidget.cpp b/kompare/komparepart/kompareconnectwidget.cpp
index 4d7bd603..aa35fc7f 100644
--- a/kompare/komparepart/kompareconnectwidget.cpp
+++ b/kompare/komparepart/kompareconnectwidget.cpp
@@ -46,14 +46,14 @@ KompareConnectWidgetFrame::KompareConnectWidgetFrame( KompareListView* left,
m_label ( "", this ),
m_layout ( this )
{
- tqsetSizePolicy ( TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Ignored) );
- m_wid.tqsetSizePolicy ( TQSizePolicy(TQSizePolicy::Ignored, TQSizePolicy::Ignored) );
- m_label.tqsetSizePolicy ( TQSizePolicy(TQSizePolicy::Ignored, TQSizePolicy::Fixed) );
+ setSizePolicy ( TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Ignored) );
+ m_wid.setSizePolicy ( TQSizePolicy(TQSizePolicy::Ignored, TQSizePolicy::Ignored) );
+ m_label.setSizePolicy ( TQSizePolicy(TQSizePolicy::Ignored, TQSizePolicy::Fixed) );
m_label.setMargin(3);
TQFrame* bottomLine = new TQFrame(this);
bottomLine->setFrameShape(TQFrame::HLine);
bottomLine->setFrameShadow ( TQFrame::Plain );
- bottomLine->tqsetSizePolicy ( TQSizePolicy(TQSizePolicy::Ignored, TQSizePolicy::Fixed) );
+ bottomLine->setSizePolicy ( TQSizePolicy(TQSizePolicy::Ignored, TQSizePolicy::Fixed) );
bottomLine->setFixedHeight(1);
m_layout.setSpacing(0);
m_layout.setMargin(0);
@@ -66,9 +66,9 @@ KompareConnectWidgetFrame::~KompareConnectWidgetFrame()
{
}
-TQSize KompareConnectWidgetFrame::tqsizeHint() const
+TQSize KompareConnectWidgetFrame::sizeHint() const
{
- return TQSize(50, tqstyle().tqpixelMetric( TQStyle::PM_ScrollBarExtent ) );
+ return TQSize(50, tqstyle().pixelMetric( TQStyle::PM_ScrollBarExtent ) );
}
static int kMouseOffset;
@@ -111,7 +111,7 @@ KompareConnectWidget::KompareConnectWidget( KompareListView* left, KompareListVi
{
// connect( m_settings, TQT_SIGNAL( settingsChanged() ), this, TQT_SLOT( slotDelayedRepaint() ) );
setBackgroundMode( NoBackground );
- tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Minimum ) );
+ setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Minimum ) );
setFocusProxy( parent->parentWidget() );
}
@@ -190,13 +190,13 @@ void KompareConnectWidget::paintEvent( TQPaintEvent* /* e */ )
if ( TQApplication::reverseLayout() )
{
- leftRect = m_rightView->tqitemRect( i );
- rightRect = m_leftView->tqitemRect( i );
+ leftRect = m_rightView->itemRect( i );
+ rightRect = m_leftView->itemRect( i );
}
else
{
- leftRect = m_leftView->tqitemRect( i );
- rightRect = m_rightView->tqitemRect( i );
+ leftRect = m_leftView->itemRect( i );
+ rightRect = m_rightView->itemRect( i );
}
int tl = leftRect.top();
diff --git a/kompare/komparepart/kompareconnectwidget.h b/kompare/komparepart/kompareconnectwidget.h
index cc22ed86..ec48ff61 100644
--- a/kompare/komparepart/kompareconnectwidget.h
+++ b/kompare/komparepart/kompareconnectwidget.h
@@ -76,7 +76,7 @@ public:
ViewSettings* settings, KompareSplitter* parent, const char* name = 0 );
~KompareConnectWidgetFrame();
- TQSize tqsizeHint() const;
+ TQSize sizeHint() const;
KompareConnectWidget* wid() { return &m_wid; }
diff --git a/kompare/komparepart/komparelistview.cpp b/kompare/komparepart/komparelistview.cpp
index f8779fa9..cc114859 100644
--- a/kompare/komparepart/komparelistview.cpp
+++ b/kompare/komparepart/komparelistview.cpp
@@ -54,12 +54,12 @@ KompareListViewFrame::KompareListViewFrame( bool isSource,
m_label ( isSource?"Source":"Dest", this ),
m_layout ( this )
{
- tqsetSizePolicy ( TQSizePolicy(TQSizePolicy::Ignored, TQSizePolicy::Ignored) );
- m_label.tqsetSizePolicy ( TQSizePolicy(TQSizePolicy::Ignored, TQSizePolicy::Fixed) );
+ setSizePolicy ( TQSizePolicy(TQSizePolicy::Ignored, TQSizePolicy::Ignored) );
+ m_label.setSizePolicy ( TQSizePolicy(TQSizePolicy::Ignored, TQSizePolicy::Fixed) );
TQFrame *bottomLine = new TQFrame(this);
bottomLine->setFrameShape(TQFrame::HLine);
bottomLine->setFrameShadow ( TQFrame::Plain );
- bottomLine->tqsetSizePolicy ( TQSizePolicy(TQSizePolicy::Ignored, TQSizePolicy::Fixed) );
+ bottomLine->setSizePolicy ( TQSizePolicy(TQSizePolicy::Ignored, TQSizePolicy::Fixed) );
bottomLine->setFixedHeight(1);
m_label.setMargin(3);
m_layout.setSpacing(0);
@@ -182,7 +182,7 @@ int KompareListView::lastVisibleDifference()
return -1;
}
-TQRect KompareListView::tqitemRect( int i )
+TQRect KompareListView::itemRect( int i )
{
TQListViewItem* item = itemAtIndex( i );
int x = 0;
diff --git a/kompare/komparepart/komparelistview.h b/kompare/komparepart/komparelistview.h
index b5de7661..0cd41cbf 100644
--- a/kompare/komparepart/komparelistview.h
+++ b/kompare/komparepart/komparelistview.h
@@ -55,7 +55,7 @@ public:
KompareListViewItem* itemAtIndex( int i );
int firstVisibleDifference();
int lastVisibleDifference();
- TQRect tqitemRect( int i );
+ TQRect itemRect( int i );
int minScrollId();
int maxScrollId();
int contentsWidth();
diff --git a/kompare/komparepart/komparesplitter.cpp b/kompare/komparepart/komparesplitter.cpp
index 5e30652c..009156cd 100644
--- a/kompare/komparepart/komparesplitter.cpp
+++ b/kompare/komparepart/komparesplitter.cpp
@@ -44,7 +44,7 @@ KompareSplitter::KompareSplitter( ViewSettings *settings, TQWidget * parent,
// Set up the scrollFrame
scrollFrame->setFrameStyle( TQFrame::NoFrame | TQFrame::Plain );
- scrollFrame->setLineWidth(scrollFrame->tqstyle().tqpixelMetric(TQStyle::PM_DefaultFrameWidth));
+ scrollFrame->setLineWidth(scrollFrame->tqstyle().pixelMetric(TQStyle::PM_DefaultFrameWidth));
TQGridLayout *pairtqlayout = new TQGridLayout(scrollFrame, 2, 2, 0);
m_vScroll = new TQScrollBar( Qt::Vertical, scrollFrame );
pairtqlayout->addWidget( m_vScroll, 0, 1 );
@@ -57,12 +57,12 @@ KompareSplitter::KompareSplitter( ViewSettings *settings, TQWidget * parent,
// set up our looks
setFrameStyle( TQFrame::StyledPanel | TQFrame::Sunken );
- setLineWidth( tqstyle().tqpixelMetric( TQStyle::PM_DefaultFrameWidth ) );
+ setLineWidth( tqstyle().pixelMetric( TQStyle::PM_DefaultFrameWidth ) );
setHandleWidth(50);
setChildrenCollapsible( false );
setFrameStyle( TQFrame::NoFrame );
- tqsetSizePolicy( TQSizePolicy (TQSizePolicy::Ignored, TQSizePolicy::Ignored ));
+ setSizePolicy( TQSizePolicy (TQSizePolicy::Ignored, TQSizePolicy::Ignored ));
setOpaqueResize( true );
setFocusPolicy( TQ_WheelFocus );
@@ -121,7 +121,7 @@ TQSplitterLayoutStruct *KompareSplitter::addWidget( KompareListViewFrame *w, boo
s->wid = newHandle;
newHandle->setId( d->list.count() );
s->isHandle = TRUE;
- s->sizer = pick( newHandle->tqsizeHint() );
+ s->sizer = pick( newHandle->sizeHint() );
if ( prepend )
d->list.prepend( s );
else
@@ -279,7 +279,7 @@ void KompareSplitter::doMove( bool backwards, int pos, int id, int delta,
: pick( bottomRight(w) ) - pos + 1;
if ( dd > 0 || (!isCollapsed(w) && !mayCollapse) ) {
dd = TQMAX( pick(qSmartMinSize(w)),
- TQMIN(dd, pick(w->tqmaximumSize())) );
+ TQMIN(dd, pick(w->maximumSize())) );
} else {
dd = 0;
}
diff --git a/kompare/libdialogpages/pagebase.cpp b/kompare/libdialogpages/pagebase.cpp
index 33c45dba..a2061a2b 100644
--- a/kompare/libdialogpages/pagebase.cpp
+++ b/kompare/libdialogpages/pagebase.cpp
@@ -36,7 +36,7 @@ PageBase::~PageBase()
TQSize PageBase::sizeHintForWidget( TQWidget* widget )
{
//
- // The size is computed by adding the tqsizeHint().height() of all
+ // The size is computed by adding the sizeHint().height() of all
// widget tqchildren and taking the width of the widest child and adding
// tqlayout()->margin() and tqlayout()->spacing()
//
@@ -57,7 +57,7 @@ TQSize PageBase::sizeHintForWidget( TQWidget* widget )
numChild += 1;
TQWidget *w=((TQWidget*)o);
- TQSize s = w->tqsizeHint();
+ TQSize s = w->sizeHint();
if( s.isEmpty() == true )
{
s = TQSize( 50, 100 ); // Default size
diff --git a/kompare/libdialogpages/viewpage.cpp b/kompare/libdialogpages/viewpage.cpp
index 827e8a4d..8a9f286e 100644
--- a/kompare/libdialogpages/viewpage.cpp
+++ b/kompare/libdialogpages/viewpage.cpp
@@ -37,7 +37,7 @@ ViewPage::ViewPage( TQWidget* parent ) : PageBase( parent )
{
TQWidget* page;
TQVBoxLayout* tqlayout;
- TQGroupBox* tqcolorGroupBox;
+ TQGroupBox* colorGroupBox;
TQHGroupBox* snolGroupBox;
TQHGroupBox* tabGroupBox;
TQLabel* label;
@@ -48,28 +48,28 @@ ViewPage::ViewPage( TQWidget* parent ) : PageBase( parent )
tqlayout->setMargin( KDialog::marginHint() );
// add a groupbox
- tqcolorGroupBox = new TQGroupBox( 2, Qt::Horizontal, i18n( "Colors" ), page );
- tqlayout->addWidget( tqcolorGroupBox );
- tqcolorGroupBox->setMargin( KDialog::marginHint() );
+ colorGroupBox = new TQGroupBox( 2, Qt::Horizontal, i18n( "Colors" ), page );
+ tqlayout->addWidget( colorGroupBox );
+ colorGroupBox->setMargin( KDialog::marginHint() );
// add the removeColor
- label = new TQLabel( i18n( "Removed color:" ), tqcolorGroupBox );
- m_removedColorButton = new KColorButton( tqcolorGroupBox );
+ label = new TQLabel( i18n( "Removed color:" ), colorGroupBox );
+ m_removedColorButton = new KColorButton( colorGroupBox );
label->setBuddy( m_removedColorButton );
// add the changeColor
- label = new TQLabel( i18n( "Changed color:" ), tqcolorGroupBox );
- m_changedColorButton = new KColorButton( tqcolorGroupBox );
+ label = new TQLabel( i18n( "Changed color:" ), colorGroupBox );
+ m_changedColorButton = new KColorButton( colorGroupBox );
label->setBuddy( m_changedColorButton );
// add the addColor
- label = new TQLabel( i18n( "Added color:" ), tqcolorGroupBox );
- m_addedColorButton = new KColorButton( tqcolorGroupBox );
+ label = new TQLabel( i18n( "Added color:" ), colorGroupBox );
+ m_addedColorButton = new KColorButton( colorGroupBox );
label->setBuddy( m_addedColorButton );
// add the appliedColor
- label = new TQLabel( i18n( "Applied color:" ), tqcolorGroupBox );
- m_appliedColorButton = new KColorButton( tqcolorGroupBox );
+ label = new TQLabel( i18n( "Applied color:" ), colorGroupBox );
+ m_appliedColorButton = new KColorButton( colorGroupBox );
label->setBuddy( m_appliedColorButton );
// scroll number of lines (snol)
diff --git a/kompare/libdiff2/diffhunk.cpp b/kompare/libdiff2/diffhunk.cpp
index efa7e12d..3fbd082e 100644
--- a/kompare/libdiff2/diffhunk.cpp
+++ b/kompare/libdiff2/diffhunk.cpp
@@ -97,7 +97,7 @@ TQString DiffHunk::recreateHunk() const
}
// recreate header
- hunk += TQString::tqfromLatin1( "@@ -%1,%3 +%2,%4 @@" )
+ hunk += TQString::fromLatin1( "@@ -%1,%3 +%2,%4 @@" )
.tqarg( m_sourceLine )
.tqarg( m_destinationLine )
.tqarg( slc )
@@ -106,7 +106,7 @@ TQString DiffHunk::recreateHunk() const
if ( !m_function.isEmpty() )
hunk += " " + m_function;
- hunk += TQString::tqfromLatin1( "\n" );
+ hunk += TQString::fromLatin1( "\n" );
hunk += differences;
diff --git a/kompare/libdiff2/diffmodel.cpp b/kompare/libdiff2/diffmodel.cpp
index cd348dfc..c300755b 100644
--- a/kompare/libdiff2/diffmodel.cpp
+++ b/kompare/libdiff2/diffmodel.cpp
@@ -152,13 +152,13 @@ TQString DiffModel::recreateDiff() const
TQString diff;
// recreate header
- TQString tab = TQString::tqfromLatin1( "\t" );
- TQString nl = TQString::tqfromLatin1( "\n" );
- diff += TQString::tqfromLatin1( "--- %1\t%2" ).tqarg( m_source ).tqarg( m_sourceTimestamp );
+ TQString tab = TQString::fromLatin1( "\t" );
+ TQString nl = TQString::fromLatin1( "\n" );
+ diff += TQString::fromLatin1( "--- %1\t%2" ).tqarg( m_source ).tqarg( m_sourceTimestamp );
if ( !m_sourceRevision.isEmpty() )
diff += tab + m_sourceRevision;
diff += nl;
- diff += TQString::tqfromLatin1( "+++ %1\t%2" ).tqarg( m_destination ).tqarg( m_destinationTimestamp );
+ diff += TQString::fromLatin1( "+++ %1\t%2" ).tqarg( m_destination ).tqarg( m_destinationTimestamp );
if ( !m_destinationRevision.isEmpty() )
diff += tab + m_destinationRevision;
diff += nl;
diff --git a/kompare/libdiff2/perforceparser.cpp b/kompare/libdiff2/perforceparser.cpp
index b0d54157..0e0a2aef 100644
--- a/kompare/libdiff2/perforceparser.cpp
+++ b/kompare/libdiff2/perforceparser.cpp
@@ -103,8 +103,8 @@ bool PerforceParser::parseContextDiffHeader()
destinationFileRE.exactMatch( m_contextDiffHeader1.cap( 2 ) );
kdDebug(8101) << "Matched length = " << sourceFileRE.matchedLength() << endl;
kdDebug(8101) << "Matched length = " << destinationFileRE.matchedLength() << endl;
- kdDebug(8101) << "Captured texts = " << sourceFileRE.tqcapturedTexts() << endl;
- kdDebug(8101) << "Captured texts = " << destinationFileRE.tqcapturedTexts() << endl;
+ kdDebug(8101) << "Captured texts = " << sourceFileRE.capturedTexts() << endl;
+ kdDebug(8101) << "Captured texts = " << destinationFileRE.capturedTexts() << endl;
kdDebug(8101) << "Source File : " << sourceFileRE.cap( 1 ) << endl;
kdDebug(8101) << "Destination File : " << destinationFileRE.cap( 1 ) << endl;
m_currentModel->setSourceFile ( sourceFileRE.cap( 1 ) );
@@ -117,7 +117,7 @@ bool PerforceParser::parseContextDiffHeader()
else
{
kdDebug(8101) << "Matched length = " << m_contextDiffHeader1.matchedLength() << endl;
- kdDebug(8101) << "Captured texts = " << m_contextDiffHeader1.tqcapturedTexts() << endl;
+ kdDebug(8101) << "Captured texts = " << m_contextDiffHeader1.capturedTexts() << endl;
}
}
@@ -149,8 +149,8 @@ bool PerforceParser::parseNormalDiffHeader()
destinationFileRE.exactMatch( m_normalDiffHeader.cap( 2 ) );
kdDebug(8101) << "Matched length = " << sourceFileRE.matchedLength() << endl;
kdDebug(8101) << "Matched length = " << destinationFileRE.matchedLength() << endl;
- kdDebug(8101) << "Captured texts = " << sourceFileRE.tqcapturedTexts() << endl;
- kdDebug(8101) << "Captured texts = " << destinationFileRE.tqcapturedTexts() << endl;
+ kdDebug(8101) << "Captured texts = " << sourceFileRE.capturedTexts() << endl;
+ kdDebug(8101) << "Captured texts = " << destinationFileRE.capturedTexts() << endl;
kdDebug(8101) << "Source File : " << sourceFileRE.cap( 1 ) << endl;
kdDebug(8101) << "Destination File : " << destinationFileRE.cap( 1 ) << endl;
m_currentModel->setSourceFile ( sourceFileRE.cap( 1 ) );
@@ -163,7 +163,7 @@ bool PerforceParser::parseNormalDiffHeader()
else
{
kdDebug(8101) << "Matched length = " << m_normalDiffHeader.matchedLength() << endl;
- kdDebug(8101) << "Captured texts = " << m_normalDiffHeader.tqcapturedTexts() << endl;
+ kdDebug(8101) << "Captured texts = " << m_normalDiffHeader.capturedTexts() << endl;
}
}
@@ -200,8 +200,8 @@ bool PerforceParser::parseUnifiedDiffHeader()
destinationFileRE.exactMatch( m_unifiedDiffHeader1.cap( 2 ) );
// kdDebug(8101) << "Matched length = " << sourceFileRE.matchedLength() << endl;
// kdDebug(8101) << "Matched length = " << destinationFileRE.matchedLength() << endl;
-// kdDebug(8101) << "Captured texts = " << sourceFileRE.tqcapturedTexts() << endl;
-// kdDebug(8101) << "Captured texts = " << destinationFileRE.tqcapturedTexts() << endl;
+// kdDebug(8101) << "Captured texts = " << sourceFileRE.capturedTexts() << endl;
+// kdDebug(8101) << "Captured texts = " << destinationFileRE.capturedTexts() << endl;
// kdDebug(8101) << "Source File : " << sourceFileRE.cap( 1 ) << endl;
// kdDebug(8101) << "Destination File : " << destinationFileRE.cap( 1 ) << endl;
m_currentModel->setSourceFile ( sourceFileRE.cap( 1 ) );
@@ -214,7 +214,7 @@ bool PerforceParser::parseUnifiedDiffHeader()
else
{
// kdDebug(8101) << "Matched length = " << m_unifiedDiffHeader1.matchedLength() << endl;
-// kdDebug(8101) << "Captured texts = " << m_unifiedDiffHeader1.tqcapturedTexts() << endl;
+// kdDebug(8101) << "Captured texts = " << m_unifiedDiffHeader1.capturedTexts() << endl;
}
}
diff --git a/kspy/classinfoview.cpp b/kspy/classinfoview.cpp
index 0fa16c86..87f018bb 100644
--- a/kspy/classinfoview.cpp
+++ b/kspy/classinfoview.cpp
@@ -41,7 +41,7 @@ ClassInfoView::~ClassInfoView()
void ClassInfoView::buildList( TQObject *o )
{
- TQMetaObject *mo = o->tqmetaObject();
+ TQMetaObject *mo = o->metaObject();
for (int index = 0; index < mo->numClassInfo(true); index++) {
const TQClassInfo * classInfo = mo->classInfo(index, true);
diff --git a/kspy/propsview.cpp b/kspy/propsview.cpp
index 93747c28..a432f177 100644
--- a/kspy/propsview.cpp
+++ b/kspy/propsview.cpp
@@ -69,7 +69,7 @@ PropsView::~PropsView()
void PropsView::buildList( TQObject *o )
{
- TQMetaObject *mo = o->tqmetaObject();
+ TQMetaObject *mo = o->metaObject();
TQStrList names = mo->propertyNames( true );
for ( uint i = 0; i < names.count(); i++ ) {
@@ -115,11 +115,11 @@ void PropsView::buildList( TQObject *o )
val.setNum( v.toInt() );
if (mp->isEnumType()) {
#ifdef USE_QT4
-// TQMetaObject * tqmetaObject = *(mp->meta); // FIXME
+// TQMetaObject * metaObject = *(mp->meta); // FIXME
val = TQString("%1::%2").tqarg("QT4_CANNOT_FIND_TQMETAOBJECT_FOR_TQMETAPROPERTY").tqarg(mp->valueToKey(val.toInt())); // FIXME
#else // USE_QT4
- TQMetaObject * tqmetaObject = *(mp->meta);
- val = TQString("%1::%2").tqarg(tqmetaObject->className()).tqarg(mp->valueToKey(val.toInt()));
+ TQMetaObject * metaObject = *(mp->meta);
+ val = TQString("%1::%2").tqarg(metaObject->className()).tqarg(mp->valueToKey(val.toInt()));
#endif // USE_QT4
}
break;
diff --git a/kspy/receiversview.cpp b/kspy/receiversview.cpp
index 36e06e63..0ad6f4cd 100644
--- a/kspy/receiversview.cpp
+++ b/kspy/receiversview.cpp
@@ -48,7 +48,7 @@ ReceiversView::~ReceiversView()
void ReceiversView::buildList( TQObject *o )
{
- TQMetaObject *mo = o->tqmetaObject();
+ TQMetaObject *mo = o->metaObject();
UnencapsulatedTQObject * qobject = (UnencapsulatedTQObject *) o;
TQStrList signalNames = mo->signalNames(true);
diff --git a/kspy/sigslotview.cpp b/kspy/sigslotview.cpp
index 97d024fb..d6fdba24 100644
--- a/kspy/sigslotview.cpp
+++ b/kspy/sigslotview.cpp
@@ -40,7 +40,7 @@ SigSlotView::~SigSlotView()
void SigSlotView::buildList( TQObject *o )
{
- TQMetaObject *mo = o->tqmetaObject();
+ TQMetaObject *mo = o->metaObject();
KListViewItem *sigs = new KListViewItem( this, "Signals" );
TQStrList sigList = mo->signalNames( true );
diff --git a/kuiviewer/kuiviewer.cpp b/kuiviewer/kuiviewer.cpp
index b710ce95..90fb8ea5 100644
--- a/kuiviewer/kuiviewer.cpp
+++ b/kuiviewer/kuiviewer.cpp
@@ -157,7 +157,7 @@ void KUIViewer::takeScreenshot(const TQCString &filename, int w, int h){
// resize app to be as large as desired size
adjustSize();
// Disable the saving of the size
- setAutoSaveSettings(TQString::tqfromLatin1("MainWindow"), false);
+ setAutoSaveSettings(TQString::fromLatin1("MainWindow"), false);
}
TQPixmap pixmap = TQPixmap::grabWidget( m_part->widget() );
pixmap.save( filename, "PNG" );
diff --git a/kunittest/runnergui.cpp b/kunittest/runnergui.cpp
index 4644d0e5..b932041e 100644
--- a/kunittest/runnergui.cpp
+++ b/kunittest/runnergui.cpp
@@ -211,7 +211,7 @@ namespace KUnitTest
if ( test->inherits("KUnitTest::SlotTester") )
{
- TQStrList allSlots = test->tqmetaObject()->slotNames();
+ TQStrList allSlots = test->metaObject()->slotNames();
for ( char *sl = allSlots.first(); sl; sl = allSlots.next() )
{
if ( TQString(sl).startsWith("test") )
diff --git a/kunittest/testerwidget.ui b/kunittest/testerwidget.ui
index 1f294c02..e6e92e1c 100644
--- a/kunittest/testerwidget.ui
+++ b/kunittest/testerwidget.ui
@@ -156,7 +156,7 @@
0
-
+
0
200
@@ -167,7 +167,7 @@
m_teDetails
-
+
600
200
diff --git a/poxml/parser.cpp b/poxml/parser.cpp
index b4f0161b..24b7b4cf 100644
--- a/poxml/parser.cpp
+++ b/poxml/parser.cpp
@@ -180,8 +180,8 @@ bool StructureParser::closureTag(const TQString& message, const TQString &tag)
uint index = 0;
while (true)
{
- int nextclose = message.find(TQRegExp(TQString::tqfromLatin1("]").tqarg(tag)), index);
- int nextstart = message.find(TQRegExp(TQString::tqfromLatin1("<%1[>\\s]").tqarg(tag)), index);
+ int nextclose = message.find(TQRegExp(TQString::fromLatin1("]").tqarg(tag)), index);
+ int nextstart = message.find(TQRegExp(TQString::fromLatin1("<%1[>\\s]").tqarg(tag)), index);
// qDebug("finding %d %d %d %d", nextstart, nextclose, index, inside);
if (nextclose == -1) {
#ifdef POXML_DEBUG
@@ -278,7 +278,7 @@ bool StructureParser::formatMessage(MsgBlock &msg) const
{
int slen = strlen(singletags[index]);
- if (msg.msgid.left(slen + 1) == TQString::tqfromLatin1("<%1").tqarg(singletags[index]) &&
+ if (msg.msgid.left(slen + 1) == TQString::fromLatin1("<%1").tqarg(singletags[index]) &&
!msg.msgid.at( slen + 1 ).isLetterOrNumber() )
{
#ifdef POXML_DEBUG
@@ -418,9 +418,9 @@ MsgList StructureParser::splitMessage(const MsgBlock &mb)
#endif
// the exception for poxml_* attributes is made in the closing tag
- int closing_index = message.find(TQRegExp(TQString::tqfromLatin1("]").tqarg(tag)),
+ int closing_index = message.find(TQRegExp(TQString::fromLatin1("]").tqarg(tag)),
strindex);
- int starting_index = message.find(TQRegExp(TQString::tqfromLatin1("<%1[\\s>]").tqarg(tag)),
+ int starting_index = message.find(TQRegExp(TQString::fromLatin1("<%1[\\s>]").tqarg(tag)),
strindex);
#ifdef POXML_DEBUG
@@ -529,9 +529,9 @@ MsgList StructureParser::splitMessage(const MsgBlock &mb)
qDebug("inside %s %d", message.mid(strindex, 35).latin1(), inside);
#endif
- int closing_index = message.findRev(TQRegExp(TQString::tqfromLatin1("]").tqarg(tag)),
+ int closing_index = message.findRev(TQRegExp(TQString::fromLatin1("]").tqarg(tag)),
strindex - 1);
- int starting_index = message.findRev(TQRegExp(TQString::tqfromLatin1("<%1[\\s>]").tqarg(tag)),
+ int starting_index = message.findRev(TQRegExp(TQString::fromLatin1("<%1[\\s>]").tqarg(tag)),
strindex - 1);
#ifdef POXML_DEBUG
diff --git a/poxml/split.cpp b/poxml/split.cpp
index db20f15f..54217aa2 100644
--- a/poxml/split.cpp
+++ b/poxml/split.cpp
@@ -112,7 +112,7 @@ int main( int argc, char **argv )
while (tit != translated.end())
{
MsgBlock mb;
- mb.msgid = TQString::tqfromLatin1("appended paragraph %1").tqarg(counter++);
+ mb.msgid = TQString::fromLatin1("appended paragraph %1").tqarg(counter++);
mb.msgstr = (*tit).msgid;
mb.lines += (*tit).lines;
english.append(mb);
diff --git a/poxml/transxx.cpp b/poxml/transxx.cpp
index cd3a78be..bfc2e9cf 100644
--- a/poxml/transxx.cpp
+++ b/poxml/transxx.cpp
@@ -62,7 +62,7 @@ int main(int argc, char **argv)
headerLines.gres( TQRegExp( "^Last-Translator:.*" ), "Last-Translator: transxx program " );
headerLines.gres( TQRegExp( "^Language-Team:.*" ), "Language-Team: Test Language " );
TQString revisionDate ( "PO-Revision-Date: " );
- const TQDateTime dt = TQDateTime::tqcurrentDateTime( Qt::UTC );
+ const TQDateTime dt = TQDateTime::currentDateTime( Qt::UTC );
revisionDate += dt.toString( "yyyy-MM-dd hh:mm+0000" );
headerLines.gres( TQRegExp( "^PO-Revision-Date:.*" ), revisionDate );
headerLines << "Plural-Forms: nplurals=1; plural=0;";
diff --git a/poxml/xml2pot.cpp b/poxml/xml2pot.cpp
index 658e557b..345a53e6 100644
--- a/poxml/xml2pot.cpp
+++ b/poxml/xml2pot.cpp
@@ -33,7 +33,7 @@ int main( int argc, char **argv )
}
}
- const TQDateTime now = TQDateTime::tqcurrentDateTime( Qt::UTC );
+ const TQDateTime now = TQDateTime::currentDateTime( Qt::UTC );
cout << "# SOME DESCRIPTIVE TITLE.\n";
cout << "# FIRST AUTHOR , YEAR.\n";
diff --git a/scheck/scheck.cpp b/scheck/scheck.cpp
index 5d8d3582..b1fb9f9c 100644
--- a/scheck/scheck.cpp
+++ b/scheck/scheck.cpp
@@ -918,7 +918,7 @@ void StyleCheckStyle::accelManageRecursive(TQWidget* widget)
void StyleCheckStyle::slotAccelManage()
{
//Walk through top-levels
- TQWidgetList* topLevels = TQApplication::tqtopLevelWidgets();
+ TQWidgetList* topLevels = TQApplication::topLevelWidgets();
if (!topLevels)
return;
@@ -1392,7 +1392,7 @@ void StyleCheckStyle::drawPrimitive( PrimitiveElement pe,
case PE_WindowFrame:
case PE_PanelLineEdit: {
bool sunken = flags & Style_Sunken;
- int lw = opt.isDefault() ? tqpixelMetric(PM_DefaultFrameWidth)
+ int lw = opt.isDefault() ? pixelMetric(PM_DefaultFrameWidth)
: opt.lineWidth();
if (lw == 2)
{
@@ -1502,8 +1502,8 @@ void StyleCheckStyle::drawPrimitive( PrimitiveElement pe,
p->save();
if ( flags & Style_Down )
- p->translate( tqpixelMetric( PM_ButtonShiftHorizontal ),
- tqpixelMetric( PM_ButtonShiftVertical ) );
+ p->translate( pixelMetric( PM_ButtonShiftHorizontal ),
+ pixelMetric( PM_ButtonShiftVertical ) );
if ( flags & Style_Enabled ) {
a.translate( r.x() + r.width() / 2, r.y() + r.height() / 2 );
@@ -1705,7 +1705,7 @@ void StyleCheckStyle::drawKStylePrimitive( KStylePrimitive kpe,
}
-void StyleCheckStyle::tqdrawControl( ControlElement element,
+void StyleCheckStyle::drawControl( ControlElement element,
TQPainter *p,
const TQWidget *widget,
const TQRect &r,
@@ -1727,7 +1727,7 @@ void StyleCheckStyle::tqdrawControl( ControlElement element,
if ( btnDefault || button->autoDefault() ) {
// Compensate for default indicator
- static int di = tqpixelMetric( PM_ButtonDefaultIndicator );
+ static int di = pixelMetric( PM_ButtonDefaultIndicator );
br.addCoords( di, di, -di, -di );
}
@@ -1750,14 +1750,14 @@ void StyleCheckStyle::tqdrawControl( ControlElement element,
// Shift button contents if pushed.
if ( active ) {
- x += tqpixelMetric(PM_ButtonShiftHorizontal, widget);
- y += tqpixelMetric(PM_ButtonShiftVertical, widget);
+ x += pixelMetric(PM_ButtonShiftHorizontal, widget);
+ y += pixelMetric(PM_ButtonShiftVertical, widget);
flags |= Style_Sunken;
}
// Does the button have a popup menu?
if ( button->isMenuButton() ) {
- int dx = tqpixelMetric( PM_MenuButtonIndicator, widget );
+ int dx = pixelMetric( PM_MenuButtonIndicator, widget );
drawPrimitive( PE_ArrowDown, p, TQRect(x + w - dx - 2, y + 2, dx, h - 4),
cg, flags, opt );
w -= dx;
@@ -1786,7 +1786,7 @@ void StyleCheckStyle::tqdrawControl( ControlElement element,
// Make the label indicate if the button is a default button or not
if ( active || button->isDefault() ) {
// Draw "fake" bold text - this enables the font metrics to remain
- // the same as computed in TQPushButton::tqsizeHint(), but gives
+ // the same as computed in TQPushButton::sizeHint(), but gives
// a reasonable bold effect.
int i;
@@ -1794,25 +1794,25 @@ void StyleCheckStyle::tqdrawControl( ControlElement element,
if (button->isEnabled()) // Don't draw double-shadow when disabled
for(i=0; i<2; i++)
drawItem( p, TQRect(x+i+1, y+1, w, h), AlignCenter | ShowPrefix,
- button->tqcolorGroup(), button->isEnabled(), button->pixmap(),
+ button->colorGroup(), button->isEnabled(), button->pixmap(),
removedXX(stripAccelViolations(button->text())), -1,
- active ? &button->tqcolorGroup().dark() : &button->tqcolorGroup().mid() );
+ active ? &button->colorGroup().dark() : &button->colorGroup().mid() );
// Normal Text
for(i=0; i<2; i++)
drawItem( p, TQRect(x+i, y, w, h), AlignCenter | ShowPrefix,
- button->tqcolorGroup(), button->isEnabled(), button->pixmap(),
+ button->colorGroup(), button->isEnabled(), button->pixmap(),
removedXX(stripAccelViolations(button->text())), -1,
- active ? &button->tqcolorGroup().light() : &button->tqcolorGroup().buttonText() );
+ active ? &button->colorGroup().light() : &button->colorGroup().buttonText() );
} else
- drawItem( p, TQRect(x, y, w, h), AlignCenter | ShowPrefix, button->tqcolorGroup(),
+ drawItem( p, TQRect(x, y, w, h), AlignCenter | ShowPrefix, button->colorGroup(),
button->isEnabled(), button->pixmap(), removedXX(stripAccelViolations(button->text())), -1,
- active ? &button->tqcolorGroup().light() : &button->tqcolorGroup().buttonText() );
+ active ? &button->colorGroup().light() : &button->colorGroup().buttonText() );
// Draw a focus rect if the button has focus
if ( flags & Style_HasFocus )
drawPrimitive( PE_FocusRect, p,
- TQStyle::tqvisualRect(subRect(SR_PushButtonFocusRect, widget), widget),
+ TQStyle::visualRect(subRect(SR_PushButtonFocusRect, widget), widget),
cg, flags );
break;
}
@@ -1828,7 +1828,7 @@ void StyleCheckStyle::tqdrawControl( ControlElement element,
TQRect tr = r;
if ( t->identifier() == tb->currentTab() )
tr.setBottom( tr.bottom() -
- tqpixelMetric( TQStyle::PM_DefaultFrameWidth, tb ) );
+ pixelMetric( TQStyle::PM_DefaultFrameWidth, tb ) );
TQValueVector violations = checkTitleStyle(t->text(), ShortTitle, HasAccels);
renderViolations(violations, p, r, AlignCenter |ShowPrefix, t->text());
@@ -1857,7 +1857,7 @@ void StyleCheckStyle::tqdrawControl( ControlElement element,
if (flags & Style_HasFocus)
{
- TQRect fr = tqvisualRect(subRect(SR_CheckBoxFocusRect, widget), widget);
+ TQRect fr = visualRect(subRect(SR_CheckBoxFocusRect, widget), widget);
drawPrimitive(PE_FocusRect, p, fr, cg, flags);
}
break;
@@ -1878,7 +1878,7 @@ void StyleCheckStyle::tqdrawControl( ControlElement element,
if (flags & Style_HasFocus)
{
- TQRect fr = tqvisualRect(subRect(SR_CheckBoxFocusRect, widget), widget);
+ TQRect fr = visualRect(subRect(SR_CheckBoxFocusRect, widget), widget);
drawPrimitive(PE_FocusRect, p, fr, cg, flags);
}
break;
@@ -1933,7 +1933,7 @@ void StyleCheckStyle::tqdrawControl( ControlElement element,
bool enabled = mi->isEnabled();
bool checkable = popupmenu->isCheckable();
bool active = flags & Style_Active;
- bool etchtext = tqstyleHint( SH_EtchDisabledText );
+ bool etchtext = styleHint( SH_EtchDisabledText );
bool reverse = TQApplication::reverseLayout();
int x, y, w, h;
r.rect( &x, &y, &w, &h );
@@ -1964,7 +1964,7 @@ void StyleCheckStyle::tqdrawControl( ControlElement element,
// Do we have an icon?
if ( mi->iconSet() ) {
TQIconSet::Mode mode;
- TQRect cr = tqvisualRect( TQRect(x, y, checkcol, h), r );
+ TQRect cr = visualRect( TQRect(x, y, checkcol, h), r );
// Select the correct icon from the iconset
if ( active )
@@ -2110,8 +2110,8 @@ void StyleCheckStyle::tqdrawControl( ControlElement element,
// Does the menu item have a submenu?
if ( mi->popup() ) {
PrimitiveElement arrow = reverse ? PE_ArrowLeft : PE_ArrowRight;
- int dim = tqpixelMetric(PM_MenuButtonIndicator);
- TQRect vr = tqvisualRect( TQRect( x + w - arrowHMargin - 2*itemFrame - dim,
+ int dim = pixelMetric(PM_MenuButtonIndicator);
+ TQRect vr = visualRect( TQRect( x + w - arrowHMargin - 2*itemFrame - dim,
y + h / 2 - dim / 2, dim, dim), r );
// Draw an arrow at the far end of the menu item
@@ -2164,12 +2164,12 @@ void StyleCheckStyle::tqdrawControl( ControlElement element,
}
default:
- KStyle::tqdrawControl(element, p, widget, r, cg, flags, opt);
+ KStyle::drawControl(element, p, widget, r, cg, flags, opt);
}
}
-void StyleCheckStyle::tqdrawControlMask( ControlElement element,
+void StyleCheckStyle::drawControlMask( ControlElement element,
TQPainter *p,
const TQWidget *widget,
const TQRect &r,
@@ -2190,12 +2190,12 @@ void StyleCheckStyle::tqdrawControlMask( ControlElement element,
}
default:
- KStyle::tqdrawControlMask(element, p, widget, r, opt);
+ KStyle::drawControlMask(element, p, widget, r, opt);
}
}
-void StyleCheckStyle::tqdrawComplexControl( ComplexControl control,
+void StyleCheckStyle::drawComplexControl( ComplexControl control,
TQPainter *p,
const TQWidget *widget,
const TQRect &r,
@@ -2246,7 +2246,7 @@ void StyleCheckStyle::tqdrawComplexControl( ComplexControl control,
p->drawLine(x+1, y+2, x+1, y2-2);
// Get the button bounding box
- TQRect ar = TQStyle::tqvisualRect(
+ TQRect ar = TQStyle::visualRect(
querySubControlMetrics(CC_ComboBox, widget, SC_ComboBoxArrow),
widget );
@@ -2265,7 +2265,7 @@ void StyleCheckStyle::tqdrawComplexControl( ComplexControl control,
if ( controls & SC_ComboBoxEditField )
{
const TQComboBox * cb = (const TQComboBox *) widget;
- TQRect re = TQStyle::tqvisualRect(
+ TQRect re = TQStyle::visualRect(
querySubControlMetrics( CC_ComboBox, widget,
SC_ComboBoxEditField), widget );
@@ -2289,7 +2289,7 @@ void StyleCheckStyle::tqdrawComplexControl( ComplexControl control,
p->fillRect( re.x(), re.y(), re.width(), re.height(),
cg.brush( TQColorGroup::Highlight ) );
- TQRect re = TQStyle::tqvisualRect(
+ TQRect re = TQStyle::visualRect(
subRect(SR_ComboBoxFocusRect, cb), widget);
drawPrimitive( PE_FocusRect, p, re, cg,
@@ -2377,14 +2377,14 @@ void StyleCheckStyle::tqdrawComplexControl( ComplexControl control,
default:
- KStyle::tqdrawComplexControl(control, p, widget,
+ KStyle::drawComplexControl(control, p, widget,
r, cg, flags, controls, active, opt);
break;
}
}
-void StyleCheckStyle::tqdrawComplexControlMask( ComplexControl control,
+void StyleCheckStyle::drawComplexControlMask( ComplexControl control,
TQPainter *p,
const TQWidget *widget,
const TQRect &r,
@@ -2406,7 +2406,7 @@ void StyleCheckStyle::tqdrawComplexControlMask( ComplexControl control,
}
default:
- KStyle::tqdrawComplexControlMask(control, p, widget, r, opt);
+ KStyle::drawComplexControlMask(control, p, widget, r, opt);
}
}
@@ -2422,11 +2422,11 @@ TQRect StyleCheckStyle::subRect(SubRect r, const TQWidget *widget) const
int dbw1 = 0, dbw2 = 0;
if (button->isDefault() || button->autoDefault()) {
- dbw1 = tqpixelMetric(PM_ButtonDefaultIndicator, widget);
+ dbw1 = pixelMetric(PM_ButtonDefaultIndicator, widget);
dbw2 = dbw1 * 2;
}
- int dfw1 = tqpixelMetric(PM_DefaultFrameWidth, widget) * 2,
+ int dfw1 = pixelMetric(PM_DefaultFrameWidth, widget) * 2,
dfw2 = dfw1 * 2;
return TQRect(wrect.x() + dfw1 + dbw1 + 1,
@@ -2438,7 +2438,7 @@ TQRect StyleCheckStyle::subRect(SubRect r, const TQWidget *widget) const
}
-int StyleCheckStyle::tqpixelMetric(PixelMetric m, const TQWidget *widget) const
+int StyleCheckStyle::pixelMetric(PixelMetric m, const TQWidget *widget) const
{
switch(m)
{
@@ -2465,7 +2465,7 @@ int StyleCheckStyle::tqpixelMetric(PixelMetric m, const TQWidget *widget) const
}
default:
- return KStyle::tqpixelMetric(m, widget);
+ return KStyle::pixelMetric(m, widget);
}
}
@@ -2483,8 +2483,8 @@ TQSize StyleCheckStyle::sizeFromContents( ContentsType contents,
const TQPushButton* button = (const TQPushButton*) widget;
int w = contentSize.width();
int h = contentSize.height();
- int bm = tqpixelMetric( PM_ButtonMargin, widget );
- int fw = tqpixelMetric( PM_DefaultFrameWidth, widget ) * 2;
+ int bm = pixelMetric( PM_ButtonMargin, widget );
+ int fw = pixelMetric( PM_DefaultFrameWidth, widget ) * 2;
w += bm + fw + 6; // ### Add 6 to make way for bold font.
h += bm + fw;
@@ -2495,7 +2495,7 @@ TQSize StyleCheckStyle::sizeFromContents( ContentsType contents,
w = 80;
// Compensate for default indicator
- int di = tqpixelMetric( PM_ButtonDefaultIndicator );
+ int di = pixelMetric( PM_ButtonDefaultIndicator );
w += di * 2;
h += di * 2;
}
@@ -2520,8 +2520,8 @@ TQSize StyleCheckStyle::sizeFromContents( ContentsType contents,
int w = contentSize.width(), h = contentSize.height();
if ( mi->custom() ) {
- w = mi->custom()->tqsizeHint().width();
- h = mi->custom()->tqsizeHint().height();
+ w = mi->custom()->sizeHint().width();
+ h = mi->custom()->sizeHint().height();
if ( ! mi->custom()->fullSpan() )
h += 2*itemVMargin + 2*itemFrame;
}
@@ -2658,7 +2658,7 @@ bool StyleCheckStyle::eventFilter( TQObject *object, TQEvent *event )
{
renderViolations(violations, &p, cr,lb->tqalignment() | ShowPrefix, lb->text() );
// ordinary text or pixmap label
- drawItem( &p, cr, lb->tqalignment(), lb->tqcolorGroup(), lb->isEnabled(),
+ drawItem( &p, cr, lb->tqalignment(), lb->colorGroup(), lb->isEnabled(),
0, removedXX(stripAccelViolations(lb->text())) );
}
else
@@ -2666,7 +2666,7 @@ bool StyleCheckStyle::eventFilter( TQObject *object, TQEvent *event )
renderViolations(violations, &p, cr,lb->tqalignment(), lb->text() );
// ordinary text or pixmap label
- drawItem( &p, cr, lb->tqalignment(), lb->tqcolorGroup(), lb->isEnabled(),
+ drawItem( &p, cr, lb->tqalignment(), lb->colorGroup(), lb->isEnabled(),
0, removedXX(stripAccelViolations(lb->text())) );
}
@@ -2723,7 +2723,7 @@ bool StyleCheckStyle::eventFilter( TQObject *object, TQEvent *event )
renderViolations( violations, &paint, r, AlignCenter | ShowPrefix, gb->title() );
- drawItem(&paint, r, AlignCenter | ShowPrefix, gb->tqcolorGroup(),
+ drawItem(&paint, r, AlignCenter | ShowPrefix, gb->colorGroup(),
gb->isEnabled(), 0, stripped_title );
paint.setClipRegion( pevent->region().subtract( r ) );
@@ -2740,7 +2740,7 @@ bool StyleCheckStyle::eventFilter( TQObject *object, TQEvent *event )
else
{
tqdrawPrimitive( TQStyle::PE_GroupBoxFrame, &paint, gb->frameRect(),
- gb->tqcolorGroup(), TQStyle::Style_Default,
+ gb->colorGroup(), TQStyle::Style_Default,
TQStyleOption(gb->lineWidth(), gb->midLineWidth(),
gb->frameShape(), gb->frameShadow()) );
}
diff --git a/scheck/scheck.h b/scheck/scheck.h
index 6a68063d..60eb48dd 100644
--- a/scheck/scheck.h
+++ b/scheck/scheck.h
@@ -95,7 +95,7 @@ class StyleCheckStyle : public KStyle
SFlags flags = Style_Default,
const TQStyleOption& = TQStyleOption::Default ) const;
- void tqdrawControl( ControlElement element,
+ void drawControl( ControlElement element,
TQPainter *p,
const TQWidget *widget,
const TQRect &r,
@@ -103,13 +103,13 @@ class StyleCheckStyle : public KStyle
SFlags flags = Style_Default,
const TQStyleOption& = TQStyleOption::Default ) const;
- void tqdrawControlMask( ControlElement element,
+ void drawControlMask( ControlElement element,
TQPainter *p,
const TQWidget *widget,
const TQRect &r,
const TQStyleOption& = TQStyleOption::Default ) const;
- void tqdrawComplexControl( ComplexControl control,
+ void drawComplexControl( ComplexControl control,
TQPainter *p,
const TQWidget *widget,
const TQRect &r,
@@ -119,13 +119,13 @@ class StyleCheckStyle : public KStyle
SCFlags active = SC_None,
const TQStyleOption& = TQStyleOption::Default ) const;
- void tqdrawComplexControlMask( ComplexControl control,
+ void drawComplexControlMask( ComplexControl control,
TQPainter *p,
const TQWidget *widget,
const TQRect &r,
const TQStyleOption& = TQStyleOption::Default ) const;
- int tqpixelMetric( PixelMetric m,
+ int pixelMetric( PixelMetric m,
const TQWidget *widget = 0 ) const;
TQSize sizeFromContents( ContentsType contents,
diff --git a/scripts/kde-emacs/klaralv.el b/scripts/kde-emacs/klaralv.el
index 082f9bbb..66bf8bf2 100644
--- a/scripts/kde-emacs/klaralv.el
+++ b/scripts/kde-emacs/klaralv.el
@@ -217,7 +217,7 @@
(palmtoprecord.h Record)
(palmtopuidgen.h UidGen)
(password.h Password)
- (power.h PowertqStatus PowerStatusManager )
+ (power.h PowerStatus PowerStatusManager )
(process.h Process)
(qcopenvelope_qws.h QCopEnvelope)
(qdawg.h QDawg)
diff --git a/umbrello/umbrello/associationwidget.cpp b/umbrello/umbrello/associationwidget.cpp
index 6ded541d..6d484307 100644
--- a/umbrello/umbrello/associationwidget.cpp
+++ b/umbrello/umbrello/associationwidget.cpp
@@ -2101,7 +2101,7 @@ void AssociationWidget::createAssocClassLine() {
computeAssocClassLine();
TQPen pen(getLineColor(), getLineWidth(), TQt::DashLine);
m_pAssocClassLine->setPen(pen);
- m_pAssocClassLine->tqsetVisible(true);
+ m_pAssocClassLine->setVisible(true);
}
void AssociationWidget::createAssocClassLine(ClassifierWidget* classifier,
diff --git a/umbrello/umbrello/autolayout/newautolayoutdialog.ui b/umbrello/umbrello/autolayout/newautolayoutdialog.ui
index 9301abe3..bca63027 100644
--- a/umbrello/umbrello/autolayout/newautolayoutdialog.ui
+++ b/umbrello/umbrello/autolayout/newautolayoutdialog.ui
@@ -330,7 +330,7 @@
Expanding
-
+
20
1
@@ -366,7 +366,7 @@
Expanding
-
+
277
20
diff --git a/umbrello/umbrello/classifierwidget.h b/umbrello/umbrello/classifierwidget.h
index b92b774f..f80f1289 100644
--- a/umbrello/umbrello/classifierwidget.h
+++ b/umbrello/umbrello/classifierwidget.h
@@ -101,7 +101,7 @@ public:
/**
* Return the status of showing operation signatures.
*
- * @return tqStatus of showing operation signatures.
+ * @return Status of showing operation signatures.
*/
Uml::Signature_Type getShowOpSigs() const;
@@ -173,7 +173,7 @@ public:
* Returns whether to show attribute signatures.
* Only applies when m_pObject->getBaseType() is ot_Class.
*
- * @return tqStatus of how attribute signatures are shown.
+ * @return Status of how attribute signatures are shown.
*/
Uml::Signature_Type getShowAttSigs() {
return m_ShowAttSigs;
diff --git a/umbrello/umbrello/clipboard/umldrag.cpp b/umbrello/umbrello/clipboard/umldrag.cpp
index 543a4b39..27f8dde2 100644
--- a/umbrello/umbrello/clipboard/umldrag.cpp
+++ b/umbrello/umbrello/clipboard/umldrag.cpp
@@ -108,11 +108,11 @@ void UMLDrag::setSubType(const TQCString& string, int index) {
data->setSubType(string, index);
}
-void UMLDrag::setEncodedData(const TQByteArray& tqencodedData, int index) {
- data->enc[index] = tqencodedData.copy();
+void UMLDrag::setEncodedData(const TQByteArray& encodedData, int index) {
+ data->enc[index] = encodedData.copy();
}
-TQByteArray UMLDrag::tqencodedData(const char* dataName) const {
+TQByteArray UMLDrag::encodedData(const char* dataName) const {
TQString str(dataName);
for (int i = 0; i < 4; i++) {
if ( !qstricmp(dataName,data->fmt[i]) ) {
@@ -286,7 +286,7 @@ bool UMLDrag::decodeClip1(const TQMimeSource* mimeSource, UMLObjectList& objects
if ( !mimeSource->provides("application/x-uml-clip1") ) {
return false;
}
- TQByteArray payload = mimeSource->tqencodedData("application/x-uml-clip1");
+ TQByteArray payload = mimeSource->encodedData("application/x-uml-clip1");
if ( !payload.size() ) {
return false;
}
@@ -376,7 +376,7 @@ bool UMLDrag::decodeClip2(const TQMimeSource* mimeSource, UMLObjectList& objects
if ( !mimeSource->provides("application/x-uml-clip2") ) {
return false;
}
- TQByteArray payload = mimeSource->tqencodedData("application/x-uml-clip2");
+ TQByteArray payload = mimeSource->encodedData("application/x-uml-clip2");
if ( !payload.size() ) {
return false;
}
@@ -486,7 +486,7 @@ bool UMLDrag::getClip3TypeAndID(const TQMimeSource* mimeSource,
if ( !mimeSource->provides("application/x-uml-clip3") ) {
return false;
}
- TQByteArray payload = mimeSource->tqencodedData("application/x-uml-clip3");
+ TQByteArray payload = mimeSource->encodedData("application/x-uml-clip3");
if ( !payload.size() ) {
return false;
}
@@ -543,7 +543,7 @@ bool UMLDrag::decodeClip3(const TQMimeSource* mimeSource, UMLListViewItemList& u
if ( !mimeSource->provides("application/x-uml-clip3") ) {
return false;
}
- TQByteArray payload = mimeSource->tqencodedData("application/x-uml-clip3");
+ TQByteArray payload = mimeSource->encodedData("application/x-uml-clip3");
if ( !payload.size() ) {
return false;
}
@@ -602,7 +602,7 @@ bool UMLDrag::decodeClip4(const TQMimeSource* mimeSource, UMLObjectList& objects
if ( !mimeSource->provides("application/x-uml-clip4") ) {
return false;
}
- TQByteArray payload = mimeSource->tqencodedData("application/x-uml-clip4");
+ TQByteArray payload = mimeSource->encodedData("application/x-uml-clip4");
if ( !payload.size() ) {
return false;
}
@@ -699,7 +699,7 @@ bool UMLDrag::decodeClip5(const TQMimeSource* mimeSource, UMLObjectList& objects
if ( !mimeSource->provides("application/x-uml-clip5") ) {
return false;
}
- TQByteArray payload = mimeSource->tqencodedData("application/x-uml-clip5");
+ TQByteArray payload = mimeSource->encodedData("application/x-uml-clip5");
if ( !payload.size() ) {
return false;
}
diff --git a/umbrello/umbrello/clipboard/umldrag.h b/umbrello/umbrello/clipboard/umldrag.h
index ad5e4f02..fa535399 100644
--- a/umbrello/umbrello/clipboard/umldrag.h
+++ b/umbrello/umbrello/clipboard/umldrag.h
@@ -149,7 +149,7 @@ public:
*
* @param dataName the name of the data type to return
*/
- virtual TQByteArray tqencodedData(const char* dataName) const;
+ virtual TQByteArray encodedData(const char* dataName) const;
/**
* For use when the user selects only UML Objects
diff --git a/umbrello/umbrello/codedocument.cpp b/umbrello/umbrello/codedocument.cpp
index cb571b6b..a77e948a 100644
--- a/umbrello/umbrello/codedocument.cpp
+++ b/umbrello/umbrello/codedocument.cpp
@@ -281,7 +281,7 @@ void CodeDocument::updateHeader () {
headingText.replace(TQRegExp("%filename%"),getFileName()+getFileExtension());
headingText.replace(TQRegExp("%filepath%"),getPath());
headingText.replace( TQRegExp("%time%"), TQTime::currentTime().toString());
- headingText.replace( TQRegExp("%date%"), TQDate::tqcurrentDate().toString());
+ headingText.replace( TQRegExp("%date%"), TQDate::currentDate().toString());
getHeader()->setText(headingText);
diff --git a/umbrello/umbrello/codegenerationpolicy.cpp b/umbrello/umbrello/codegenerationpolicy.cpp
index 9cac6c3a..fcb9043c 100644
--- a/umbrello/umbrello/codegenerationpolicy.cpp
+++ b/umbrello/umbrello/codegenerationpolicy.cpp
@@ -552,7 +552,7 @@ TQString CodeGenerationPolicy::getHeadingFile(const TQString& str) {
retstr.replace( TQRegExp("%author%"),TQString(getenv("USER"))); //get the user name from some where else
retstr.replace( TQRegExp("%headingpath%"),filename );
retstr.replace( TQRegExp("%time%"), TQTime::currentTime().toString());
- retstr.replace( TQRegExp("%date%"), TQDate::tqcurrentDate().toString());
+ retstr.replace( TQRegExp("%date%"), TQDate::currentDate().toString());
// the replace filepath, time parts are also in the code document updateHeader method
// (which is not a virtual function)...
diff --git a/umbrello/umbrello/codegenerators/cppcodegenerationformbase.ui b/umbrello/umbrello/codegenerators/cppcodegenerationformbase.ui
index 6ca8377b..86cee729 100644
--- a/umbrello/umbrello/codegenerators/cppcodegenerationformbase.ui
+++ b/umbrello/umbrello/codegenerators/cppcodegenerationformbase.ui
@@ -149,7 +149,7 @@
Expanding
-
+
410
113
@@ -223,7 +223,7 @@
0
-
+
32
32767
@@ -285,7 +285,7 @@
Minimum
-
+
20
20
@@ -302,7 +302,7 @@
Minimum
-
+
20
20
@@ -430,7 +430,7 @@
0
-
+
32
32767
diff --git a/umbrello/umbrello/codegenerators/perlwriter.cpp b/umbrello/umbrello/codegenerators/perlwriter.cpp
index 9d51ffde..42563ec4 100644
--- a/umbrello/umbrello/codegenerators/perlwriter.cpp
+++ b/umbrello/umbrello/codegenerators/perlwriter.cpp
@@ -168,8 +168,8 @@ void PerlWriter::writeClass(UMLClassifier *c) {
if(!str.isEmpty()) {
str.replace(TQRegExp("%filename%"),fileName);
str.replace(TQRegExp("%filepath%"),fileperl.name());
- str.replace(TQRegExp("%year%"),TQDate::tqcurrentDate().toString("yyyy"));
- str.replace(TQRegExp("%date%"),TQDate::tqcurrentDate().toString());
+ str.replace(TQRegExp("%year%"),TQDate::currentDate().toString("yyyy"));
+ str.replace(TQRegExp("%date%"),TQDate::currentDate().toString());
str.replace(TQRegExp("%time%"),TQTime::currentTime().toString());
str.replace(TQRegExp("%package-name%"),ThisPkgName);
if(str.find(TQRegExp("%PACKAGE-DECLARE%"))){
diff --git a/umbrello/umbrello/codeimport/kdevcppparser/ast.cpp b/umbrello/umbrello/codeimport/kdevcppparser/ast.cpp
index ebb10af4..4dba6be5 100644
--- a/umbrello/umbrello/codeimport/kdevcppparser/ast.cpp
+++ b/umbrello/umbrello/codeimport/kdevcppparser/ast.cpp
@@ -466,7 +466,7 @@ TQString ClassOrNamespaceNameAST::text() const
TQString str = m_name->text();
if( m_templateArgumentList.get() )
- str += TQString::tqfromLatin1("< ") + m_templateArgumentList->text() + TQString::tqfromLatin1(" >");
+ str += TQString::fromLatin1("< ") + m_templateArgumentList->text() + TQString::fromLatin1(" >");
return str;
}
diff --git a/umbrello/umbrello/codeimport/kdevcppparser/ast_utils.cpp b/umbrello/umbrello/codeimport/kdevcppparser/ast_utils.cpp
index ee6937ac..679e0f90 100644
--- a/umbrello/umbrello/codeimport/kdevcppparser/ast_utils.cpp
+++ b/umbrello/umbrello/codeimport/kdevcppparser/ast_utils.cpp
@@ -66,7 +66,7 @@ void scopeOfNode( AST* ast, TQStringList& scope )
case NodeType_ClassSpecifier:
if( ((ClassSpecifierAST*)ast)->name() ){
s = ((ClassSpecifierAST*)ast)->name()->text();
- s = s.isEmpty() ? TQString::tqfromLatin1("") : s;
+ s = s.isEmpty() ? TQString::fromLatin1("") : s;
scope.push_back( s );
}
break;
@@ -74,7 +74,7 @@ void scopeOfNode( AST* ast, TQStringList& scope )
case NodeType_Namespace:
{
AST* namespaceName = ((NamespaceAST*)ast)->namespaceName();
- s = namespaceName ? namespaceName->text() : TQString::tqfromLatin1("");
+ s = namespaceName ? namespaceName->text() : TQString::fromLatin1("");
scope.push_back( s );
}
break;
@@ -131,7 +131,7 @@ TQString declaratorToString( DeclaratorAST* declarator, const TQString& scope, b
text += scope;
if( declarator->subDeclarator() )
- text += TQString::tqfromLatin1("(") + declaratorToString(declarator->subDeclarator()) + TQString::tqfromLatin1(")");
+ text += TQString::fromLatin1("(") + declaratorToString(declarator->subDeclarator()) + TQString::fromLatin1(")");
if( declarator->declaratorId() )
text += declarator->declaratorId()->text();
diff --git a/umbrello/umbrello/codeimport/kdevcppparser/lexer.cpp b/umbrello/umbrello/codeimport/kdevcppparser/lexer.cpp
index f91813f1..7054e1a4 100644
--- a/umbrello/umbrello/codeimport/kdevcppparser/lexer.cpp
+++ b/umbrello/umbrello/codeimport/kdevcppparser/lexer.cpp
@@ -381,14 +381,14 @@ void Lexer::nextToken( Token& tk, bool stopOnNewline )
}
if( stringify ) {
- textToInsert.append( TQString::tqfromLatin1("\"") + str + TQString::tqfromLatin1("\" ") );
+ textToInsert.append( TQString::fromLatin1("\"") + str + TQString::fromLatin1("\" ") );
} else if( merge ){
textToInsert.truncate( textToInsert.length() - 1 );
textToInsert.append( str );
} else if( tok == Token_ellipsis && d->hasBind("...") ){
textToInsert.append( ellipsisArg );
} else {
- textToInsert.append( str + TQString::tqfromLatin1(" ") );
+ textToInsert.append( str + TQString::fromLatin1(" ") );
}
}
diff --git a/umbrello/umbrello/dialogs/codegenerationoptionsbase.ui b/umbrello/umbrello/dialogs/codegenerationoptionsbase.ui
index 601b5385..48ee0ff7 100644
--- a/umbrello/umbrello/dialogs/codegenerationoptionsbase.ui
+++ b/umbrello/umbrello/dialogs/codegenerationoptionsbase.ui
@@ -163,7 +163,7 @@
Fixed
-
+
30
20
@@ -180,7 +180,7 @@
Fixed
-
+
30
20
@@ -297,7 +297,7 @@ generator wants to use as output file already exists:
Expanding
-
+
16
30
@@ -314,7 +314,7 @@ generator wants to use as output file already exists:
Expanding
-
+
16
30
@@ -331,7 +331,7 @@ generator wants to use as output file already exists:
Expanding
-
+
16
30
diff --git a/umbrello/umbrello/dialogs/codegenerationwizardbase.ui b/umbrello/umbrello/dialogs/codegenerationwizardbase.ui
index 517df16e..fdd59c2c 100644
--- a/umbrello/umbrello/dialogs/codegenerationwizardbase.ui
+++ b/umbrello/umbrello/dialogs/codegenerationwizardbase.ui
@@ -88,7 +88,7 @@ for in the right hand side list
Expanding
-
+
20
20
@@ -146,7 +146,7 @@ for in the right hand side list
Fixed
-
+
20
20
@@ -190,7 +190,7 @@ for in the right hand side list
Expanding
-
+
20
20
@@ -206,7 +206,7 @@ for in the right hand side list
status
- Code Generation tqStatus
+ Code Generation Status
@@ -231,7 +231,7 @@ for in the right hand side list
GroupBox2
- Generation tqStatus
+ Generation Status
@@ -257,7 +257,7 @@ for in the right hand side list
- Generation tqStatus
+ Generation Status
true
diff --git a/umbrello/umbrello/dialogs/codeviewerdialog.cpp b/umbrello/umbrello/dialogs/codeviewerdialog.cpp
index 3f11adb3..04784752 100644
--- a/umbrello/umbrello/dialogs/codeviewerdialog.cpp
+++ b/umbrello/umbrello/dialogs/codeviewerdialog.cpp
@@ -69,7 +69,7 @@ void CodeViewerDialog::initGUI ( const char * name) {
CodeViewerDialogBaseLayout->setMargin(margin);
- resize( TQSize(width, height).expandedTo(tqminimumSizeHint()) );
+ resize( TQSize(width, height).expandedTo(minimumSizeHint()) );
}
diff --git a/umbrello/umbrello/dialogs/codevieweroptionsbase.ui b/umbrello/umbrello/dialogs/codevieweroptionsbase.ui
index ed75ea9d..1c44f8cb 100644
--- a/umbrello/umbrello/dialogs/codevieweroptionsbase.ui
+++ b/umbrello/umbrello/dialogs/codevieweroptionsbase.ui
@@ -31,7 +31,7 @@
- tqcolorGroupBox
+ colorGroupBox
diff --git a/umbrello/umbrello/dialogs/diagrampropertiespage.ui b/umbrello/umbrello/dialogs/diagrampropertiespage.ui
index 8dc7f029..da0482fa 100644
--- a/umbrello/umbrello/dialogs/diagrampropertiespage.ui
+++ b/umbrello/umbrello/dialogs/diagrampropertiespage.ui
@@ -131,7 +131,7 @@
Expanding
-
+
50
20
@@ -218,7 +218,7 @@ If 'Snap to Grid' is enabled a component will always be aligned with the grid on
Expanding
-
+
20
20
@@ -307,7 +307,7 @@ If 'Snap to Grid' is enabled a component will always be aligned with the grid on
Expanding
-
+
20
20
@@ -369,7 +369,7 @@ If 'Snap to Grid' is enabled a component will always be aligned with the grid on
Expanding
-
+
20
20
diff --git a/umbrello/umbrello/dialogs/exportallviewsdialog.cpp b/umbrello/umbrello/dialogs/exportallviewsdialog.cpp
index 443ad9e2..7560b850 100644
--- a/umbrello/umbrello/dialogs/exportallviewsdialog.cpp
+++ b/umbrello/umbrello/dialogs/exportallviewsdialog.cpp
@@ -33,7 +33,7 @@ ExportAllViewsDialog::ExportAllViewsDialog(
: ExportAllViewsDialogBase(parent,name, modal,fl) {
// create and initialize m_imageType
m_imageType = new KFileFilterCombo(this, "m_imageType");
- m_imageType->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed, 0, 0, m_imageType->sizePolicy().hasHeightForWidth()));
+ m_imageType->setSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed, 0, 0, m_imageType->sizePolicy().hasHeightForWidth()));
m_imageType->setEditable(false);
m_imageType->setMimeFilter(UMLViewImageExporterModel::supportedMimeTypes(), defaultMimeType);
diff --git a/umbrello/umbrello/dialogs/exportallviewsdialogbase.ui b/umbrello/umbrello/dialogs/exportallviewsdialogbase.ui
index e795d2c9..4a7edb52 100644
--- a/umbrello/umbrello/dialogs/exportallviewsdialogbase.ui
+++ b/umbrello/umbrello/dialogs/exportallviewsdialogbase.ui
@@ -120,7 +120,7 @@ Only the folders made by the user are created in the base directory (Logical vie
Expanding
-
+
20
16
@@ -151,7 +151,7 @@ Only the folders made by the user are created in the base directory (Logical vie
Expanding
-
+
20
20
diff --git a/umbrello/umbrello/dialogs/umlroledialog.cpp b/umbrello/umbrello/dialogs/umlroledialog.cpp
index 607ac759..255f4010 100644
--- a/umbrello/umbrello/dialogs/umlroledialog.cpp
+++ b/umbrello/umbrello/dialogs/umlroledialog.cpp
@@ -35,7 +35,7 @@ void UMLRoleDialog::setupDialog() {
m_pRoleProps = new UMLRoleProperties(this, m_pRole);
setMainWidget( m_pRoleProps );
- resize( TQSize(425, 620).expandedTo(tqminimumSizeHint()) );
+ resize( TQSize(425, 620).expandedTo(minimumSizeHint()) );
// topLayout -> addWidget( m_pParmsGB);
diff --git a/umbrello/umbrello/floatingtextwidget.cpp b/umbrello/umbrello/floatingtextwidget.cpp
index 700f9de4..94c5ec21 100644
--- a/umbrello/umbrello/floatingtextwidget.cpp
+++ b/umbrello/umbrello/floatingtextwidget.cpp
@@ -225,7 +225,7 @@ void FloatingTextWidget::changeName(const TQString& newText)
setText( newText );
UMLApp::app()->getDocument()->setModified(true);
}
- tqsetVisible( true );
+ setVisible( true );
updateComponentSize();
update();
}
@@ -265,7 +265,7 @@ void FloatingTextWidget::changeTextDlg() {
if(ok && newText != getText() && isTextValid(newText)) {
setText( newText );
- tqsetVisible( ( getText().length() > 0 ) );
+ setVisible( ( getText().length() > 0 ) );
updateComponentSize();
update();
}
@@ -302,7 +302,7 @@ void FloatingTextWidget::showOpDlg() {
opText = selectDlg.getOpText();
if (selectDlg.isClassOp()) {
Model_Utils::OpDescriptor od;
- Model_Utils::Parse_tqStatus st = Model_Utils::parseOperation(opText, od, c);
+ Model_Utils::Parse_Status st = Model_Utils::parseOperation(opText, od, c);
if (st == Model_Utils::PS_OK) {
UMLClassifierList selfAndAncestors = c->findSuperClassConcepts();
selfAndAncestors.prepend(c);
@@ -444,7 +444,7 @@ bool FloatingTextWidget::loadFromXMI( TQDomElement & qElement ) {
void FloatingTextWidget::setMessageText() {
if (m_pLink)
m_pLink->setMessageText(this);
- tqsetVisible(getText().length() > 0);
+ setVisible(getText().length() > 0);
updateComponentSize();
}
diff --git a/umbrello/umbrello/kplayerslideraction.cpp b/umbrello/umbrello/kplayerslideraction.cpp
index c5efcb65..95007d73 100644
--- a/umbrello/umbrello/kplayerslideraction.cpp
+++ b/umbrello/umbrello/kplayerslideraction.cpp
@@ -74,7 +74,7 @@ KPlayerPopupSliderAction::KPlayerPopupSliderAction (const TQString& text,
m_frame -> setFrameStyle (TQFrame::PopupPanel | TQFrame::Raised);
m_frame -> setLineWidth (2);
m_slider = new KPlayerSlider (Qt::Vertical, m_frame);
- m_frame -> resize (36, m_slider -> tqsizeHint().height() + 4);
+ m_frame -> resize (36, m_slider -> sizeHint().height() + 4);
m_slider -> setGeometry (m_frame -> contentsRect());
//CHANGED kdDebug() << "Popup slider size " << m_slider -> width() << "x" << m_slider -> height() << "\n";
connect (m_slider, TQT_SIGNAL (changed (int)), receiver, slot);
@@ -278,9 +278,9 @@ KPlayerSlider::~KPlayerSlider()
//CHANGED kdDebug() << "KPlayerSlider destroyed\n";
}
-TQSize KPlayerSlider::tqsizeHint() const
+TQSize KPlayerSlider::sizeHint() const
{
- TQSize hint = TQSlider::tqsizeHint();
+ TQSize hint = TQSlider::sizeHint();
//CHANGED int length = kPlayerSettings() -> preferredSliderLength();
int length = 200;
if ( orientation() == Qt::Horizontal )
@@ -296,10 +296,10 @@ TQSize KPlayerSlider::tqsizeHint() const
return hint;
}
-TQSize KPlayerSlider::tqminimumSizeHint() const
+TQSize KPlayerSlider::minimumSizeHint() const
{
//kdDebug() << "KPlayerSlider minimum size hint\n";
- TQSize hint = TQSlider::tqminimumSizeHint();
+ TQSize hint = TQSlider::minimumSizeHint();
//CHANGED int length = kPlayerSettings() -> minimumSliderLength();
int length = 200;
if ( orientation() == Qt::Horizontal )
diff --git a/umbrello/umbrello/kplayerslideraction.h b/umbrello/umbrello/kplayerslideraction.h
index 8c0b11ef..14866991 100644
--- a/umbrello/umbrello/kplayerslideraction.h
+++ b/umbrello/umbrello/kplayerslideraction.h
@@ -38,10 +38,10 @@ public:
/** The size hint.
*/
- virtual TQSize tqsizeHint() const;
+ virtual TQSize sizeHint() const;
/** The minimum size hint.
*/
- virtual TQSize tqminimumSizeHint() const;
+ virtual TQSize minimumSizeHint() const;
/** The minimum value.
*/
diff --git a/umbrello/umbrello/linepath.cpp b/umbrello/umbrello/linepath.cpp
index 2d23021d..df3f614d 100644
--- a/umbrello/umbrello/linepath.cpp
+++ b/umbrello/umbrello/linepath.cpp
@@ -176,7 +176,7 @@ bool LinePath::insertPoint( int pointIndex, const TQPoint &point ) {
line -> setZ( -2 );
line -> setPoints( point.x(), point.y(), ep.x(), ep.y() );
line -> setPen( getPen() );
- line -> tqsetVisible( true );
+ line -> setVisible( true );
m_LineList.insert( 1, line );
if (!bLoading)
setupSelected();
@@ -191,7 +191,7 @@ bool LinePath::insertPoint( int pointIndex, const TQPoint &point ) {
line -> setPoints( point.x(), point.y(), ep.x(), ep.y() );
line -> setZ( -2 );
line -> setPen( getPen() );
- line -> tqsetVisible( true );
+ line -> setVisible( true );
m_LineList.append( line );
if (!bLoading)
setupSelected();
@@ -205,7 +205,7 @@ bool LinePath::insertPoint( int pointIndex, const TQPoint &point ) {
line -> setPoints( point.x(), point.y(), ep.x(), ep.y() );
line -> setZ( -2 );
line -> setPen( getPen() );
- line -> tqsetVisible( true );
+ line -> setVisible( true );
m_LineList.insert( pointIndex, line );
if (!bLoading)
setupSelected();
@@ -277,7 +277,7 @@ bool LinePath::setStartEndPoints( const TQPoint &start, const TQPoint &end ) {
line -> setPoints( start.x(), start.y(), end.x(), end.y() );
line -> setZ( -2 );
line -> setPen( getPen() );
- line -> tqsetVisible( true );
+ line -> setVisible( true );
m_LineList.append( line );
return true;
}
@@ -644,7 +644,7 @@ void LinePath::growList(LineList &list, int by) {
TQCanvasLine * line = new TQCanvasLine( getCanvas() );
line -> setZ( 0 );
line -> setPen( pen );
- line -> tqsetVisible( true );
+ line -> setVisible( true );
list.append( line );
}
}
@@ -665,7 +665,7 @@ void LinePath::createHeadLines() {
case Uml::at_Realization:
growList(m_HeadList, 3);
m_pClearPoly = new TQCanvasPolygon( canvas );
- m_pClearPoly -> tqsetVisible( true );
+ m_pClearPoly -> setVisible( true );
m_pClearPoly -> setBrush( TQBrush( TQt::white ) );
m_pClearPoly -> setZ( -1 );
break;
@@ -674,7 +674,7 @@ void LinePath::createHeadLines() {
case Uml::at_Aggregation:
growList(m_HeadList, 4);
m_pClearPoly = new TQCanvasPolygon( canvas );
- m_pClearPoly -> tqsetVisible( true );
+ m_pClearPoly -> setVisible( true );
if( getAssocType() == Uml::at_Aggregation )
m_pClearPoly -> setBrush( TQBrush( TQt::white ) );
else
diff --git a/umbrello/umbrello/messagewidget.cpp b/umbrello/umbrello/messagewidget.cpp
index 6f2eea21..f3227c31 100644
--- a/umbrello/umbrello/messagewidget.cpp
+++ b/umbrello/umbrello/messagewidget.cpp
@@ -64,7 +64,7 @@ void MessageWidget::init() {
m_pOw[Uml::A] = m_pOw[Uml::B] = NULL;
m_pFText = NULL;
m_nY = 0;
- tqsetVisible(true);
+ setVisible(true);
}
MessageWidget::~MessageWidget() {
@@ -353,7 +353,7 @@ void MessageWidget::calculateWidget() {
setMessageText(m_pFText);
calculateDimensions();
- tqsetVisible(true);
+ setVisible(true);
setX(m_nPosX);
setY(m_nY);
@@ -464,7 +464,7 @@ bool MessageWidget::activate(IDChangeLog * Log /*= 0*/) {
m_pFText -> setText("");
m_pFText->setActivated();
TQString messageText = m_pFText->getText();
- m_pFText->tqsetVisible( messageText.length() > 1 );
+ m_pFText->setVisible( messageText.length() > 1 );
connect(m_pOw[Uml::A], TQT_SIGNAL(sigWidgetMoved(Uml::IDType)), this, TQT_SLOT(slotWidgetMoved(Uml::IDType)));
connect(m_pOw[Uml::B], TQT_SIGNAL(sigWidgetMoved(Uml::IDType)), this, TQT_SLOT(slotWidgetMoved(Uml::IDType)));
diff --git a/umbrello/umbrello/model_utils.cpp b/umbrello/umbrello/model_utils.cpp
index 4131d9b1..1c7a1add 100644
--- a/umbrello/umbrello/model_utils.cpp
+++ b/umbrello/umbrello/model_utils.cpp
@@ -407,7 +407,7 @@ int stringToDirection(TQString input, Uml::Parameter_Direction & result) {
return dirLen;
}
-Parse_tqStatus parseTemplate(TQString t, NameAndType& nmTp, UMLClassifier *owningScope) {
+Parse_Status parseTemplate(TQString t, NameAndType& nmTp, UMLClassifier *owningScope) {
UMLDoc *pDoc = UMLApp::app()->getDocument();
@@ -430,7 +430,7 @@ Parse_tqStatus parseTemplate(TQString t, NameAndType& nmTp, UMLClassifier *ownin
return PS_OK;
}
-Parse_tqStatus parseAttribute(TQString a, NameAndType& nmTp, UMLClassifier *owningScope,
+Parse_Status parseAttribute(TQString a, NameAndType& nmTp, UMLClassifier *owningScope,
Uml::Visibility *vis /* = 0 */) {
UMLDoc *pDoc = UMLApp::app()->getDocument();
@@ -494,7 +494,7 @@ Parse_tqStatus parseAttribute(TQString a, NameAndType& nmTp, UMLClassifier *owni
return PS_OK;
}
-Parse_tqStatus parseOperation(TQString m, OpDescriptor& desc, UMLClassifier *owningScope) {
+Parse_Status parseOperation(TQString m, OpDescriptor& desc, UMLClassifier *owningScope) {
UMLDoc *pDoc = UMLApp::app()->getDocument();
m = m.simplifyWhiteSpace();
@@ -546,7 +546,7 @@ Parse_tqStatus parseOperation(TQString m, OpDescriptor& desc, UMLClassifier *own
TQStringList args = TQStringList::split( TQRegExp("\\s*,\\s*"), arglist);
for (TQStringList::Iterator lit = args.begin(); lit != args.end(); ++lit) {
NameAndType nmTp;
- Parse_tqStatus ps = parseAttribute(*lit, nmTp, owningScope);
+ Parse_Status ps = parseAttribute(*lit, nmTp, owningScope);
if (ps)
return ps;
desc.m_args.append(nmTp);
@@ -554,7 +554,7 @@ Parse_tqStatus parseOperation(TQString m, OpDescriptor& desc, UMLClassifier *own
return PS_OK;
}
-TQString psText(Parse_tqStatus value) {
+TQString psText(Parse_Status value) {
const TQString text[] = {
i18n("OK"), i18n("Empty"), i18n("Malformed argument"),
i18n("Unknown argument type"), i18n("Illegal method name"),
diff --git a/umbrello/umbrello/model_utils.h b/umbrello/umbrello/model_utils.h
index 6660ff64..1e8bd83b 100644
--- a/umbrello/umbrello/model_utils.h
+++ b/umbrello/umbrello/model_utils.h
@@ -236,7 +236,7 @@ Uml::Programming_Language stringToProgLang(TQString str);
/**
* Return type of parseOperation()
*/
-enum Parse_tqStatus {
+enum Parse_Status {
PS_OK, PS_Empty, PS_Malformed_Arg, PS_Unknown_ArgType,
PS_Illegal_MethodName, PS_Unknown_ReturnType, PS_Unspecified_Error
};
@@ -284,7 +284,7 @@ struct OpDescriptor {
* @param owningScope Pointer to the owning scope of the template param.
* @return Error status of the parse, PS_OK for success.
*/
-Parse_tqStatus parseTemplate(TQString t, NameAndType& nmTp, UMLClassifier *owningScope);
+Parse_Status parseTemplate(TQString t, NameAndType& nmTp, UMLClassifier *owningScope);
/**
* Parses an attribute given in UML syntax.
@@ -303,7 +303,7 @@ Parse_tqStatus parseTemplate(TQString t, NameAndType& nmTp, UMLClassifier *ownin
*
* @return Error status of the parse, PS_OK for success.
*/
-Parse_tqStatus parseAttribute(TQString a, NameAndType& nmTp, UMLClassifier *owningScope,
+Parse_Status parseAttribute(TQString a, NameAndType& nmTp, UMLClassifier *owningScope,
Uml::Visibility *vis = 0);
/**
@@ -316,12 +316,12 @@ Parse_tqStatus parseAttribute(TQString a, NameAndType& nmTp, UMLClassifier *owni
* @param owningScope Pointer to the owning scope of the operation.
* @return Error status of the parse, PS_OK for success.
*/
-Parse_tqStatus parseOperation(TQString m, OpDescriptor& desc, UMLClassifier *owningScope);
+Parse_Status parseOperation(TQString m, OpDescriptor& desc, UMLClassifier *owningScope);
/**
- * Returns the Parse_tqStatus as a text.
+ * Returns the Parse_Status as a text.
*/
-TQString psText(Parse_tqStatus value);
+TQString psText(Parse_Status value);
}
diff --git a/umbrello/umbrello/seqlinewidget.cpp b/umbrello/umbrello/seqlinewidget.cpp
index 18d70a68..9b992398 100644
--- a/umbrello/umbrello/seqlinewidget.cpp
+++ b/umbrello/umbrello/seqlinewidget.cpp
@@ -28,7 +28,7 @@ SeqLineWidget::SeqLineWidget( UMLView * pView, ObjectWidget * pObject ) : TQCanv
m_pObject = pObject;
setPen( TQPen( m_pObject->getLineColor(), 0, TQt::DashLine ) );
setZ( 0 );
- tqsetVisible( true );
+ setVisible( true );
m_DestructionBox.line1 = 0;
m_nLengthY = 250;
setupDestructionBox();
@@ -83,13 +83,13 @@ void SeqLineWidget::setupDestructionBox() {
m_DestructionBox.line1 = new TQCanvasLine( m_pView->canvas() );
m_DestructionBox.setLine1Points(rect);
- m_DestructionBox.line1->tqsetVisible( true );
+ m_DestructionBox.line1->setVisible( true );
m_DestructionBox.line1->setPen( TQPen(m_pObject->getLineColor(), 2) );
m_DestructionBox.line1->setZ( 3 );
m_DestructionBox.line2 = new TQCanvasLine( m_pView -> canvas() );
m_DestructionBox.setLine2Points(rect);
- m_DestructionBox.line2->tqsetVisible( true );
+ m_DestructionBox.line2->setVisible( true );
m_DestructionBox.line2->setPen( TQPen(m_pObject->getLineColor(), 2) );
m_DestructionBox.line2->setZ( 3 );
}
diff --git a/umbrello/umbrello/toolbarstatearrow.cpp b/umbrello/umbrello/toolbarstatearrow.cpp
index 05e98734..cbcbc20f 100644
--- a/umbrello/umbrello/toolbarstatearrow.cpp
+++ b/umbrello/umbrello/toolbarstatearrow.cpp
@@ -58,7 +58,7 @@ void ToolBarStateArrow::mousePressEmpty() {
line->setPoints(m_pMouseEvent->x(), m_pMouseEvent->y(),
m_pMouseEvent->x(), m_pMouseEvent->y());
line->setPen(TQPen(TQColor("grey"), 0, TQt::DotLine));
- line->tqsetVisible(true);
+ line->setVisible(true);
line->setZ(100);
m_selectionRect.append(line);
}
diff --git a/umbrello/umbrello/toolbarstateassociation.cpp b/umbrello/umbrello/toolbarstateassociation.cpp
index 340a28dc..005e5def 100644
--- a/umbrello/umbrello/toolbarstateassociation.cpp
+++ b/umbrello/umbrello/toolbarstateassociation.cpp
@@ -132,7 +132,7 @@ void ToolBarStateAssociation::setFirstWidget() {
m_associationLine->setPoints(pos.x(), pos.y(), pos.x(), pos.y());
m_associationLine->setPen(TQPen(m_pUMLView->getLineColor(), m_pUMLView->getLineWidth(), TQt::DashLine));
- m_associationLine->tqsetVisible(true);
+ m_associationLine->setVisible(true);
m_pUMLView->viewport()->setMouseTracking(true);
}
diff --git a/umbrello/umbrello/toolbarstatemessages.cpp b/umbrello/umbrello/toolbarstatemessages.cpp
index 453c6d7c..f8e5930a 100644
--- a/umbrello/umbrello/toolbarstatemessages.cpp
+++ b/umbrello/umbrello/toolbarstatemessages.cpp
@@ -118,7 +118,7 @@ void ToolBarStateMessages::setFirstWidget(ObjectWidget* firstObject) {
m_messageLine->setPoints(m_pMouseEvent->x(), m_pMouseEvent->y(), m_pMouseEvent->x(), m_pMouseEvent->y());
m_messageLine->setPen(TQPen(m_pUMLView->getLineColor(), m_pUMLView->getLineWidth(), TQt::DashLine));
- m_messageLine->tqsetVisible(true);
+ m_messageLine->setVisible(true);
m_pUMLView->viewport()->setMouseTracking(true);
}
diff --git a/umbrello/umbrello/uml.cpp b/umbrello/umbrello/uml.cpp
index 8a305952..099b72f6 100644
--- a/umbrello/umbrello/uml.cpp
+++ b/umbrello/umbrello/uml.cpp
@@ -374,7 +374,7 @@ void UMLApp::setupZoomMenu() {
void UMLApp::initStatusBar() {
m_statusLabel = new KStatusBarLabel( i18n("Ready."), 0, statusBar() );
- m_statusLabel->setFixedHeight( m_statusLabel->tqsizeHint().height() );
+ m_statusLabel->setFixedHeight( m_statusLabel->sizeHint().height() );
m_statusLabel->setFrameStyle( TQFrame::NoFrame | TQFrame::Plain );
m_statusLabel->setMargin( 0 );
@@ -382,7 +382,7 @@ void UMLApp::initStatusBar() {
statusBar()->addWidget( m_statusLabel, 1, false );
- m_statusLabel->tqsetAlignment(TQt::AlignLeft|TQt::AlignVCenter);
+ m_statusLabel->setAlignment(TQt::AlignLeft|TQt::AlignVCenter);
connect(m_doc, TQT_SIGNAL( sigWriteToStatusBar(const TQString &) ), this, TQT_SLOT( slotStatusMsg(const TQString &) ));
}
diff --git a/umbrello/umbrello/umldoc.cpp b/umbrello/umbrello/umldoc.cpp
index 39c8ce61..8f404a86 100644
--- a/umbrello/umbrello/umldoc.cpp
+++ b/umbrello/umbrello/umldoc.cpp
@@ -1213,7 +1213,7 @@ void UMLDoc::saveToXMI(TQIODevice& file) {
TQDomElement root = doc.createElement( "XMI" );
root.setAttribute( "xmi.version", "1.2" );
- TQDateTime now = TQDateTime::tqcurrentDateTime();
+ TQDateTime now = TQDateTime::currentDateTime();
root.setAttribute( "timestamp", now.toString(Qt::ISODate));
root.setAttribute( "verified", "false");
root.setAttribute( "xmlns:UML", "http://schema.omg.org/spec/UML/1.3");
diff --git a/umbrello/umbrello/umllistview.cpp b/umbrello/umbrello/umllistview.cpp
index 6fe7b84f..bdeee008 100644
--- a/umbrello/umbrello/umllistview.cpp
+++ b/umbrello/umbrello/umllistview.cpp
@@ -86,7 +86,7 @@ protected:
return;
UMLOperation *op = static_cast(obj);
TQString text = op->toString(Uml::st_ShowSig);
- TQRect rect = lv->tqitemRect(item);
+ TQRect rect = lv->itemRect(item);
tip(rect, text);
}
};
@@ -2111,7 +2111,7 @@ bool UMLListView::createChildUMLObject( UMLListViewItem * item, Uml::Object_Type
} else if ( type == Uml::ot_Template ) {
UMLClassifier *owningClassifier = static_cast(parent);
Model_Utils::NameAndType nt;
- Model_Utils::Parse_tqStatus st = Model_Utils::parseTemplate(text, nt, owningClassifier);
+ Model_Utils::Parse_Status st = Model_Utils::parseTemplate(text, nt, owningClassifier);
if (st) {
KMessageBox::error( kapp->mainWidget(),
Model_Utils::psText(st),
@@ -2127,7 +2127,7 @@ bool UMLListView::createChildUMLObject( UMLListViewItem * item, Uml::Object_Type
UMLClassifier *owningClass = static_cast(parent);
Model_Utils::NameAndType nt;
Uml::Visibility vis;
- Model_Utils::Parse_tqStatus st;
+ Model_Utils::Parse_Status st;
st = Model_Utils::parseAttribute(text, nt, owningClass, &vis);
if (st) {
KMessageBox::error( kapp->mainWidget(),
@@ -2143,7 +2143,7 @@ bool UMLListView::createChildUMLObject( UMLListViewItem * item, Uml::Object_Type
} else if ( type == Uml::ot_Operation ) {
UMLClassifier *owningClassifier = static_cast(parent);
Model_Utils::OpDescriptor od;
- Model_Utils::Parse_tqStatus st = Model_Utils::parseOperation(text, od, owningClassifier);
+ Model_Utils::Parse_Status st = Model_Utils::parseOperation(text, od, owningClassifier);
if (st) {
KMessageBox::error( kapp->mainWidget(),
Model_Utils::psText(st),
diff --git a/umbrello/umbrello/umllistviewitem.cpp b/umbrello/umbrello/umllistviewitem.cpp
index 01680fde..c6a5f954 100644
--- a/umbrello/umbrello/umllistviewitem.cpp
+++ b/umbrello/umbrello/umllistviewitem.cpp
@@ -333,7 +333,7 @@ void UMLListViewItem::okRename( int col ) {
UMLOperation *op = static_cast(m_pObject);
UMLClassifier *parent = static_cast( op -> parent() );
Model_Utils::OpDescriptor od;
- Model_Utils::Parse_tqStatus st = Model_Utils::parseOperation(newText, od, parent);
+ Model_Utils::Parse_Status st = Model_Utils::parseOperation(newText, od, parent);
if (st == Model_Utils::PS_OK) {
// TODO: Check that no operation with the exact same profile exists.
op->setName( od.m_name );
@@ -385,7 +385,7 @@ void UMLListViewItem::okRename( int col ) {
UMLClassifier *parent = static_cast(m_pObject->parent());
Model_Utils::NameAndType nt;
Uml::Visibility vis;
- Model_Utils::Parse_tqStatus st;
+ Model_Utils::Parse_Status st;
st = Model_Utils::parseAttribute(newText, nt, parent, &vis);
if (st == Model_Utils::PS_OK) {
UMLObject *exists = parent->findChildObject(newText);
@@ -417,7 +417,7 @@ void UMLListViewItem::okRename( int col ) {
}
UMLClassifier *parent = static_cast(m_pObject->parent());
Model_Utils::NameAndType nt;
- Model_Utils::Parse_tqStatus st = Model_Utils::parseTemplate(newText, nt, parent);
+ Model_Utils::Parse_Status st = Model_Utils::parseTemplate(newText, nt, parent);
if (st == Model_Utils::PS_OK) {
UMLObject *exists = parent->findChildObject(newText);
if (exists) {
diff --git a/umbrello/umbrello/umlview.cpp b/umbrello/umbrello/umlview.cpp
index a64b770c..39ef14fb 100644
--- a/umbrello/umbrello/umlview.cpp
+++ b/umbrello/umbrello/umlview.cpp
@@ -371,7 +371,7 @@ void UMLView::print(KPrinter *pPrinter, TQPainter & pPainter) {
void UMLView::setupNewWidget(UMLWidget *w) {
w->setX( m_Pos.x() );
w->setY( m_Pos.y() );
- w->tqsetVisible( true );
+ w->setVisible( true );
w->setActivated();
w->setFont( getFont() );
w->slotColorChanged( getID() );
@@ -451,7 +451,7 @@ void UMLView::slotObjectCreated(UMLObject* o) {
UMLWidget* newWidget = Widget_Factory::createWidget(this, o);
if (newWidget == NULL)
return;
- newWidget->tqsetVisible( true );
+ newWidget->setVisible( true );
newWidget->setActivated();
newWidget->setFont( getFont() );
newWidget->slotColorChanged( getID() );
@@ -1362,7 +1362,7 @@ void UMLView::activate() {
continue;
if (obj->activate()) {
- obj->tqsetVisible(true);
+ obj->setVisible(true);
} else {
m_WidgetList.remove(obj);
delete obj;
@@ -1378,7 +1378,7 @@ void UMLView::activate() {
continue;
obj->activate(m_pDoc->getChangeLog());
- obj->tqsetVisible( true );
+ obj->setVisible( true );
}//end while
@@ -2365,7 +2365,7 @@ void UMLView::setMenu() {
if( menu != ListPopupMenu::mt_Undefined ) {
m_pMenu = new ListPopupMenu(this, menu, this);
connect(m_pMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotMenuSelection(int)));
- m_pMenu->popup( mapToGlobal( contentsToViewport(tqworldMatrix().map(m_Pos)) ) );
+ m_pMenu->popup( mapToGlobal( contentsToViewport(worldMatrix().map(m_Pos)) ) );
}
}
@@ -2797,17 +2797,17 @@ void UMLView::setZoom(int zoom) {
}
int UMLView::currentZoom() {
- return (int)(tqworldMatrix().m11()*100.0);
+ return (int)(worldMatrix().m11()*100.0);
}
void UMLView::zoomIn() {
- TQWMatrix wm = tqworldMatrix();
+ TQWMatrix wm = worldMatrix();
wm.scale(1.5,1.5); // adjust zooming step here
setZoom( (int)(wm.m11()*100.0) );
}
void UMLView::zoomOut() {
- TQWMatrix wm = tqworldMatrix();
+ TQWMatrix wm = worldMatrix();
wm.scale(2.0/3.0, 2.0/3.0); //adjust zooming step here
setZoom( (int)(wm.m11()*100.0) );
}
diff --git a/umbrello/umbrello/umlview.h b/umbrello/umbrello/umlview.h
index 4cf51b7f..8ee2d3df 100644
--- a/umbrello/umbrello/umlview.h
+++ b/umbrello/umbrello/umlview.h
@@ -1152,7 +1152,7 @@ private:
bool m_bActivated;
/**
- * tqStatus of a popupmenu on view.
+ * Status of a popupmenu on view.
* true - a popup is on view
*/
bool m_bPopupShowing;
diff --git a/umbrello/umbrello/umlwidget.h b/umbrello/umbrello/umlwidget.h
index 0cebb9d8..fd646306 100644
--- a/umbrello/umbrello/umlwidget.h
+++ b/umbrello/umbrello/umlwidget.h
@@ -466,7 +466,7 @@ public:
/**
* Set the m_bActivated flag of a widget but does not perform the Activate method
*
- * @param Active tqStatus of activation is to be set.
+ * @param Active Status of activation is to be set.
*/
void setActivated(bool Active = true);
diff --git a/umbrello/umbrello/widget_utils.cpp b/umbrello/umbrello/widget_utils.cpp
index eeb51956..5c78ef23 100644
--- a/umbrello/umbrello/widget_utils.cpp
+++ b/umbrello/umbrello/widget_utils.cpp
@@ -101,7 +101,7 @@ TQCanvasRectangle *decoratePoint(const TQPoint& p) {
SIZE, SIZE, currentView->canvas());
rect->setBrush( TQBrush(TQt::blue) );
rect->setPen( TQPen(TQt::blue) );
- rect->tqsetVisible(true);
+ rect->setVisible(true);
return rect;
}