summaryrefslogtreecommitdiffstats
path: root/cervisia
diff options
context:
space:
mode:
Diffstat (limited to 'cervisia')
-rw-r--r--cervisia/cervisiapart.cpp8
-rw-r--r--cervisia/cervisiapart.h2
-rw-r--r--cervisia/settingsdlg_advanced.ui2
-rw-r--r--cervisia/tooltip.cpp10
-rw-r--r--cervisia/updateview.cpp4
-rw-r--r--cervisia/updateview_items.cpp6
-rw-r--r--cervisia/updateview_visitors.cpp2
7 files changed, 17 insertions, 17 deletions
diff --git a/cervisia/cervisiapart.cpp b/cervisia/cervisiapart.cpp
index abc66521..6fccdae6 100644
--- a/cervisia/cervisiapart.cpp
+++ b/cervisia/cervisiapart.cpp
@@ -80,7 +80,7 @@ using Cervisia::TagDialog;
K_EXPORT_COMPONENT_FACTORY( libcervisiapart, CervisiaFactory )
-CervisiaPart::CervisiaPart( TQWidget *tqparentWidget, const char *widgetName,
+CervisiaPart::CervisiaPart( TQWidget *parentWidget, const char *widgetName,
TQObject *tqparent, const char *name, const TQStringList& /*args*/ )
: KParts::ReadOnlyPart( tqparent, name )
, hasRunningJob( false )
@@ -131,7 +131,7 @@ CervisiaPart::CervisiaPart( TQWidget *tqparentWidget, const char *widgetName,
{
Qt::Orientation o = splitHorz ? Qt::Vertical
: Qt::Horizontal;
- splitter = new TQSplitter(o, tqparentWidget, widgetName);
+ splitter = new TQSplitter(o, parentWidget, widgetName);
// avoid PartManager's warning that Part's window can't handle focus
splitter->setFocusPolicy( TQ_StrongFocus );
@@ -151,7 +151,7 @@ CervisiaPart::CervisiaPart( TQWidget *tqparentWidget, const char *widgetName,
else
setWidget(new TQLabel(i18n("This KPart is non-functional, because the "
"cvs DCOP service could not be started."),
- tqparentWidget));
+ parentWidget));
if( cvsService )
{
@@ -1692,7 +1692,7 @@ void CervisiaPart::slotJobFinished()
if( m_jobType == Commit )
{
- KNotifyClient::event(widget()->tqparentWidget()->winId(), "cvs_commit_done",
+ KNotifyClient::event(widget()->parentWidget()->winId(), "cvs_commit_done",
i18n("A CVS commit to repository %1 is done")
.tqarg(repository));
m_jobType = Unknown;
diff --git a/cervisia/cervisiapart.h b/cervisia/cervisiapart.h
index 877f5cfc..337529e0 100644
--- a/cervisia/cervisiapart.h
+++ b/cervisia/cervisiapart.h
@@ -56,7 +56,7 @@ class CervisiaPart : public KParts::ReadOnlyPart
TQ_OBJECT
public:
- CervisiaPart( TQWidget *tqparentWidget, const char *widgetName,
+ CervisiaPart( TQWidget *parentWidget, const char *widgetName,
TQObject *tqparent, const char *name=0, const TQStringList& args = TQStringList());
virtual ~CervisiaPart();
diff --git a/cervisia/settingsdlg_advanced.ui b/cervisia/settingsdlg_advanced.ui
index 78191d32..2100e8ff 100644
--- a/cervisia/settingsdlg_advanced.ui
+++ b/cervisia/settingsdlg_advanced.ui
@@ -87,7 +87,7 @@
</widget>
</grid>
</widget>
-<tqlayoutdefaults spacing="6" margin="0"/>
+<layoutdefaults spacing="6" margin="0"/>
<includehints>
<includehint>knuminput.h</includehint>
<includehint>knuminput.h</includehint>
diff --git a/cervisia/tooltip.cpp b/cervisia/tooltip.cpp
index efc5108e..d898e80c 100644
--- a/cervisia/tooltip.cpp
+++ b/cervisia/tooltip.cpp
@@ -49,8 +49,8 @@ void ToolTip::maybeTip(const TQPoint& pos)
{
text = truncateLines(text,
font(),
- tqparentWidget()->mapToGlobal(pos),
- KGlobalSettings::desktopGeometry(tqparentWidget()));
+ parentWidget()->mapToGlobal(pos),
+ KGlobalSettings::desktopGeometry(parentWidget()));
tip(rect, text);
}
}
@@ -94,12 +94,12 @@ TQString truncateLines(const TQString& text,
- desktopGeometry.top() - 10);
// calculate the tooltip's size
- const TQSimpleRichText tqlayoutedText(text, font);
+ const TQSimpleRichText layoutedText(text, font);
// only if the tooltip's size is bigger in x- and y-direction the text must
// be truncated otherwise the tip is moved to a position where it fits
- return ((tqlayoutedText.widthUsed() > maxWidth)
- && (tqlayoutedText.height() > maxHeight))
+ return ((layoutedText.widthUsed() > maxWidth)
+ && (layoutedText.height() > maxHeight))
? truncateLines(text, TQFontMetrics(font), TQSize(maxWidth, maxHeight))
: text;
}
diff --git a/cervisia/updateview.cpp b/cervisia/updateview.cpp
index 62e691ee..a60e0cd9 100644
--- a/cervisia/updateview.cpp
+++ b/cervisia/updateview.cpp
@@ -500,8 +500,8 @@ void UpdateView::syncSelection()
UpdateDirItem* dirItem(0);
if (isDirItem(item))
dirItem = static_cast<UpdateDirItem*>(item);
- else if (TQListViewItem* tqparentItem = item->tqparent())
- dirItem = static_cast<UpdateDirItem*>(tqparentItem);
+ else if (TQListViewItem* parentItem = item->tqparent())
+ dirItem = static_cast<UpdateDirItem*>(parentItem);
if (dirItem)
setDirItems.insert(dirItem);
diff --git a/cervisia/updateview_items.cpp b/cervisia/updateview_items.cpp
index efa83593..44f81853 100644
--- a/cervisia/updateview_items.cpp
+++ b/cervisia/updateview_items.cpp
@@ -54,13 +54,13 @@ TQString UpdateItem::dirPath() const
const UpdateItem* item = static_cast<UpdateItem*>(tqparent());
while (item)
{
- const UpdateItem* tqparentItem = static_cast<UpdateItem*>(item->tqparent());
- if (tqparentItem)
+ const UpdateItem* parentItem = static_cast<UpdateItem*>(item->tqparent());
+ if (parentItem)
{
path.prepend(item->m_entry.m_name + TQDir::separator());
}
- item = tqparentItem;
+ item = parentItem;
}
return path;
diff --git a/cervisia/updateview_visitors.cpp b/cervisia/updateview_visitors.cpp
index 74e7f41b..0da6940b 100644
--- a/cervisia/updateview_visitors.cpp
+++ b/cervisia/updateview_visitors.cpp
@@ -90,7 +90,7 @@ void ApplyFilterVisitor::markAllParentsAsVisible(UpdateItem* item)
}
else
{
- // if this item isn't in the map anymore all tqparents
+ // if this item isn't in the map anymore all parents
// are already removed too
break;
}