Browse Source

Remove the tq in front of these incorrectly TQt4-converted methods/data members:

tqrepaint[...]
tqinvalidate[...]
tqparent[...]
tqmask[...]
tqlayout[...]
tqalignment[...]


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1240522 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
tags/v3.5.13
tpearson 8 years ago
parent
commit
dfb7562b7e
100 changed files with 310 additions and 310 deletions
  1. +1
    -1
      akregator/HACKING
  2. +1
    -1
      akregator/src/addfeedwidgetbase.ui
  3. +4
    -4
      akregator/src/akregator_part.cpp
  4. +1
    -1
      akregator/src/akregator_part.h
  5. +20
    -20
      akregator/src/feedlistview.cpp
  6. +7
    -7
      akregator/src/librss/document.cpp
  7. +1
    -1
      akregator/src/librss/tools_p.cpp
  8. +1
    -1
      akregator/src/mk4storage/metakit/CHANGES
  9. +7
    -7
      akregator/src/mk4storage/metakit/src/column.cpp
  10. +2
    -2
      akregator/src/mk4storage/metakit/src/field.cpp
  11. +3
    -3
      akregator/src/mk4storage/metakit/src/handler.cpp
  12. +2
    -2
      akregator/src/mk4storage/metakit/tests/regress.cpp
  13. +1
    -1
      akregator/src/mk4storage/mk4confwidgetbase.ui
  14. +1
    -1
      akregator/src/propertieswidgetbase.ui
  15. +1
    -1
      akregator/src/settings_advancedbase.ui
  16. +1
    -1
      akregator/src/settings_appearance.ui
  17. +1
    -1
      akregator/src/settings_archive.ui
  18. +1
    -1
      akregator/src/settings_browser.ui
  19. +1
    -1
      akregator/src/settings_general.ui
  20. +1
    -1
      akregator/src/tagpropertieswidgetbase.ui
  21. +1
    -1
      certmanager/certificateinfowidget.ui
  22. +1
    -1
      certmanager/certificatewizard.ui
  23. +1
    -1
      certmanager/conf/appearanceconfigwidgetbase.ui
  24. +1
    -1
      certmanager/conf/dirservconfigpage.cpp
  25. +1
    -1
      certmanager/hierarchyanalyser.cpp
  26. +1
    -1
      certmanager/lib/ui/adddirectoryservicedialog.ui
  27. +1
    -1
      certmanager/lib/ui/backendconfigwidget.cpp
  28. +1
    -1
      certmanager/lib/ui/cryptoconfigmodule.cpp
  29. +1
    -1
      certmanager/lib/ui/directoryserviceswidgetbase.ui
  30. +1
    -1
      indexlib/boost-compat/shared_ptr.hpp
  31. +3
    -3
      indexlib/boost-compat/weak_ptr.hpp
  32. +1
    -1
      indexlib/manager.h
  33. +5
    -5
      indexlib/match.cpp
  34. +2
    -2
      indexlib/match.h
  35. +5
    -5
      indexlib/mempool.h
  36. +1
    -1
      kabc/frontend/mainWindow.ui
  37. +1
    -1
      kaddressbook/editors/imaddressbase.ui
  38. +2
    -2
      kaddressbook/editors/imeditorbase.ui
  39. +4
    -4
      kaddressbook/features/resourceselection.cpp
  40. +1
    -1
      kaddressbook/interfaces/xxport.cpp
  41. +1
    -1
      kaddressbook/interfaces/xxport.h
  42. +2
    -2
      kaddressbook/kaddressbook_part.cpp
  43. +1
    -1
      kaddressbook/kaddressbook_part.h
  44. +1
    -1
      kaddressbook/printing/ds_appearance.ui
  45. +1
    -1
      kaddressbook/views/configurecardviewdialog.cpp
  46. +12
    -12
      kaddressbook/views/contactlistview.cpp
  47. +1
    -1
      kaddressbook/views/contactlistview.h
  48. +6
    -6
      kaddressbook/xxport/csv_xxport.cpp
  49. +18
    -18
      kaddressbook/xxport/gnokii_xxport.cpp
  50. +2
    -2
      kaddressbook/xxport/kde2_xxport.cpp
  51. +5
    -5
      kaddressbook/xxport/ldif_xxport.cpp
  52. +1
    -1
      kaddressbook/xxport/opera_xxport.cpp
  53. +1
    -1
      kaddressbook/xxport/pab_xxport.cpp
  54. +14
    -14
      kaddressbook/xxport/vcard_xxport.cpp
  55. +1
    -1
      kalarm/Changelog
  56. +1
    -1
      kalarm/alarmlistview.cpp
  57. +2
    -2
      kalarm/editdlg.cpp
  58. +1
    -1
      kalarm/lib/label.cpp
  59. +1
    -1
      kalarm/messagewin.cpp
  60. +6
    -6
      kalarm/prefdlg.cpp
  61. +1
    -1
      kalarm/traywindow.cpp
  62. +1
    -1
      kandy/src/cmdpropertiesdialog_base.ui
  63. +1
    -1
      kandy/src/mobilegui_base.ui
  64. +1
    -1
      karm/csvexportdialog_base.ui
  65. +6
    -6
      karm/karm_part.cpp
  66. +2
    -2
      karm/karm_part.h
  67. +8
    -8
      karm/karmstorage.cpp
  68. +1
    -1
      karm/karmstorage.h
  69. +4
    -4
      karm/plannerparser.cpp
  70. +1
    -1
      karm/plannerparser.h
  71. +8
    -8
      kdgantt/KDGanttMinimizeSplitter.cpp
  72. +2
    -2
      kdgantt/KDGanttView.cpp
  73. +1
    -1
      kdgantt/KDGanttViewEventItem.cpp
  74. +10
    -10
      kdgantt/KDGanttViewItem.cpp
  75. +1
    -1
      kdgantt/KDGanttViewItem.h
  76. +18
    -18
      kdgantt/KDGanttViewSubwidgets.cpp
  77. +6
    -6
      kdgantt/KDGanttViewSubwidgets.h
  78. +1
    -1
      kdgantt/KDGanttViewSummaryItem.cpp
  79. +1
    -1
      kdgantt/KDGanttViewTaskItem.cpp
  80. +3
    -3
      kdgantt/KDGanttViewTaskLink.cpp
  81. +1
    -1
      kdgantt/KDGanttViewTaskLink.h
  82. +3
    -3
      kdgantt/KDGanttViewTaskLinkGroup.cpp
  83. +1
    -1
      kdgantt/KDGanttViewTaskLinkGroup.h
  84. +1
    -1
      kdgantt/Makefile.am
  85. +1
    -1
      kdgantt/itemAttributeDialog.ui
  86. +1
    -1
      kdgantt/qlayoutengine_p.h
  87. +10
    -10
      kgantt/kgantt/KGanttItem.cpp
  88. +4
    -4
      kgantt/kgantt/KGanttItem.h
  89. +3
    -3
      kgantt/kgantt/itemedit.ui
  90. +3
    -3
      kgantt/kgantt/itemedit2.ui
  91. +2
    -2
      kioslaves/imap4/imapparser.cc
  92. +1
    -1
      kioslaves/imap4/imapparser.h
  93. +2
    -2
      kitchensync/src/part.cpp
  94. +1
    -1
      kitchensync/src/part.h
  95. +8
    -8
      kitchensync/src/xmldiffalgo.cpp
  96. +13
    -13
      kmail/Mainpage.dox
  97. +2
    -2
      kmail/accountmanager.cpp
  98. +1
    -1
      kmail/accountmanager.h
  99. +2
    -2
      kmail/bodyvisitor.cpp
  100. +2
    -2
      kmail/bodyvisitor.h

+ 1
- 1
akregator/HACKING View File

@@ -66,7 +66,7 @@ Spaces
================================================================================

Spaces should be used between the conditional / loop type and the
conditional statement. They should not be used after tqparenthesis. However
conditional statement. They should not be used after parenthesis. However
the should be to mark of mathematical or comparative operators.

if ( foo == bar )

+ 1
- 1
akregator/src/addfeedwidgetbase.ui View File

@@ -137,7 +137,7 @@
</spacer>
</vbox>
</widget>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>klineedit.h</includehint>
<includehint>ksqueezedtextlabel.h</includehint>

+ 4
- 4
akregator/src/akregator_part.cpp View File

@@ -116,7 +116,7 @@ class Part::ApplyFiltersInterceptor : public ArticleInterceptor
}
};

Part::Part( TQWidget *tqparentWidget, const char * /*widgetName*/,
Part::Part( TQWidget *parentWidget, const char * /*widgetName*/,
TQObject *tqparent, const char *name, const TQStringList& )
: DCOPObject("AkregatorIface")
, MyBasePart(tqparent, name)
@@ -168,7 +168,7 @@ Part::Part( TQWidget *tqparentWidget, const char * /*widgetName*/,
{
m_storage = Backend::StorageFactoryRegistry::self()->getFactory("dummy")->createStorage(storageParams);

KMessageBox::error(tqparentWidget, i18n("Unable to load storage backend plugin \"%1\". No feeds are archived.").tqarg(Settings::archiveBackend()), i18n("Plugin error") );
KMessageBox::error(parentWidget, i18n("Unable to load storage backend plugin \"%1\". No feeds are archived.").tqarg(Settings::archiveBackend()), i18n("Plugin error") );
}

Filters::ArticleFilterList list;
@@ -187,7 +187,7 @@ Part::Part( TQWidget *tqparentWidget, const char * /*widgetName*/,
m_actionManager = new ActionManagerImpl(this);
ActionManager::setInstance(m_actionManager);

m_view = new Akregator::View(this, tqparentWidget, m_actionManager, "akregator_view");
m_view = new Akregator::View(this, parentWidget, m_actionManager, "akregator_view");
m_actionManager->initView(m_view);
m_actionManager->setTagSet(Kernel::self()->tagSet());

@@ -823,7 +823,7 @@ KParts::Part* Part::hitTest(TQWidget *widget, const TQPoint &globalPos)
if (!widget) {
break;
}
widget = widget->tqparentWidget();
widget = widget->parentWidget();
}
if (m_view && m_view->currentFrame() && child) {
return m_view->currentFrame()->part();

+ 1
- 1
akregator/src/akregator_part.h View File

@@ -82,7 +82,7 @@ namespace Akregator
typedef MyBasePart inherited;

/** Default constructor.*/
Part(TQWidget *tqparentWidget, const char *widgetName,
Part(TQWidget *parentWidget, const char *widgetName,
TQObject *tqparent, const char *name, const TQStringList&);

/** Destructor. */

+ 20
- 20
akregator/src/feedlistview.cpp View File

@@ -212,15 +212,15 @@ class NodeListView::CreateItemVisitor : public TreeNodeVisitor
TagNodeItem* item = 0;
TreeNode* prev = node->prevSibling();
FolderItem* tqparentItem = static_cast<FolderItem*>(m_view->findNodeItem(node->tqparent()));
if (tqparentItem)
FolderItem* parentItem = static_cast<FolderItem*>(m_view->findNodeItem(node->tqparent()));
if (parentItem)
{
if (prev)
{
item = new TagNodeItem( tqparentItem, m_view->findNodeItem(prev), node);
item = new TagNodeItem( parentItem, m_view->findNodeItem(prev), node);
}
else
item = new TagNodeItem( tqparentItem, node);
item = new TagNodeItem( parentItem, node);
}
else
{
@@ -234,8 +234,8 @@ class NodeListView::CreateItemVisitor : public TreeNodeVisitor
item->nodeChanged();
m_view->d->itemDict.insert(node, item);
m_view->connectToNode(node);
if (tqparentItem)
tqparentItem->sortChildItems(0, true);
if (parentItem)
parentItem->sortChildItems(0, true);
return true;
}

@@ -246,15 +246,15 @@ class NodeListView::CreateItemVisitor : public TreeNodeVisitor
TagFolderItem* item = 0;
TreeNode* prev = node->prevSibling();
FolderItem* tqparentItem = static_cast<FolderItem*>(m_view->findNodeItem(node->tqparent()));
if (tqparentItem)
FolderItem* parentItem = static_cast<FolderItem*>(m_view->findNodeItem(node->tqparent()));
if (parentItem)
{
if (prev)
{
item = new TagFolderItem( tqparentItem, m_view->findNodeItem(prev), node);
item = new TagFolderItem( parentItem, m_view->findNodeItem(prev), node);
}
else
item = new TagFolderItem(tqparentItem, node);
item = new TagFolderItem(parentItem, node);
}
else
{
@@ -284,15 +284,15 @@ class NodeListView::CreateItemVisitor : public TreeNodeVisitor
FolderItem* item = 0;
TreeNode* prev = node->prevSibling();
FolderItem* tqparentItem = static_cast<FolderItem*>(m_view->findNodeItem(node->tqparent()));
if (tqparentItem)
FolderItem* parentItem = static_cast<FolderItem*>(m_view->findNodeItem(node->tqparent()));
if (parentItem)
{
if (prev)
{
item = new FolderItem( tqparentItem, m_view->findNodeItem(prev), node);
item = new FolderItem( parentItem, m_view->findNodeItem(prev), node);
}
else
item = new FolderItem(tqparentItem, node);
item = new FolderItem(parentItem, node);
}
else
{
@@ -321,16 +321,16 @@ class NodeListView::CreateItemVisitor : public TreeNodeVisitor
FeedItem* item = 0;
TreeNode* prev = node->prevSibling();
FolderItem* tqparentItem = static_cast<FolderItem*>(m_view->findNodeItem(node->tqparent()));
FolderItem* parentItem = static_cast<FolderItem*>(m_view->findNodeItem(node->tqparent()));
if (tqparentItem)
if (parentItem)
{
if (prev)
{
item = new FeedItem( tqparentItem, m_view->findNodeItem(prev), node);
item = new FeedItem( parentItem, m_view->findNodeItem(prev), node);
}
else
item = new FeedItem( tqparentItem, node);
item = new FeedItem( parentItem, node);
}
else
{
@@ -534,7 +534,7 @@ void NodeListView::movableDropEvent(TQListViewItem* /*tqparent*/, TQListViewItem
{
openFolder();

Folder* tqparentNode = (dynamic_cast<FolderItem*> (d->tqparent))->node();
Folder* parentNode = (dynamic_cast<FolderItem*> (d->tqparent))->node();
TreeNode* afterMeNode = 0;
TreeNode* current = selectedNode();

@@ -542,7 +542,7 @@ void NodeListView::movableDropEvent(TQListViewItem* /*tqparent*/, TQListViewItem
afterMeNode = (dynamic_cast<TreeNodeItem*> (d->afterme))->node();

current->tqparent()->removeChild(current);
tqparentNode->insertChild(current, afterMeNode);
parentNode->insertChild(current, afterMeNode);
KListView::movableDropEvent(d->tqparent, d->afterme);
}
}

+ 7
- 7
akregator/src/librss/document.cpp View File

@@ -186,24 +186,24 @@ Document::Document(const TQDomDocument &doc) : d(new Private)
/* This is ugly but necessary since RSS 0.90 and 1.0 have a different tqparent
* node for <image>, <textinput> and <item> than RSS 0.91-0.94 and RSS 2.0.
*/
TQDomNode tqparentNode;
TQDomNode parentNode;
if (d->version == v0_90 || d->version == v1_0 || d->format == AtomFeed)
tqparentNode = rootNode;
parentNode = rootNode;
else
{
// following is a HACK for broken 0.91 feeds like xanga.com's
if (!rootNode.namedItem(TQString::tqfromLatin1("item")).isNull())
tqparentNode = rootNode;
parentNode = rootNode;
else
tqparentNode = channelNode;
parentNode = channelNode;
}
// image and textinput aren't supported by Atom.. handle in case feed provides
TQDomNode n = tqparentNode.namedItem(TQString::tqfromLatin1("image"));
TQDomNode n = parentNode.namedItem(TQString::tqfromLatin1("image"));
if (!n.isNull())
d->image = new Image(n);

n = tqparentNode.namedItem(TQString::tqfromLatin1("textinput"));
n = parentNode.namedItem(TQString::tqfromLatin1("textinput"));
if (!n.isNull())
d->textInput = new TextInput(n);

@@ -214,7 +214,7 @@ Document::Document(const TQDomDocument &doc) : d(new Private)
else
tagName=TQString::tqfromLatin1("item");

for (n = tqparentNode.firstChild(); !n.isNull(); n = n.nextSibling()) {
for (n = parentNode.firstChild(); !n.isNull(); n = n.nextSibling()) {
const TQDomElement e = n.toElement();
if (e.tagName() == tagName)
d->articles.append(Article(e, d->format, d->version));

+ 1
- 1
akregator/src/librss/tools_p.cpp View File

@@ -186,7 +186,7 @@ static void authorFromString(const TQString& strp, TQString& name, TQString& ema
// after removing the email, str might have
// the format "(Foo M. Bar)". We cut off
// tqparentheses if there are any. However, if
// parentheses if there are any. However, if
// str is of the format "Foo M. Bar (President)",
// we should not cut anything.


+ 1
- 1
akregator/src/mk4storage/metakit/CHANGES View File

@@ -203,7 +203,7 @@

Modify some recent patches that were Python 2.2 only so they would
still work with 2.1. Add a view.properties() method (returning a
dict of propname -> Property) for cases where a property is tqmasked
dict of propname -> Property) for cases where a property is masked
by a method name.

2003-03-01 Reverted changes in Mk4py/scxx, avoid Mk4tcl warning

+ 7
- 7
akregator/src/mk4storage/metakit/src/column.cpp View File

@@ -1398,30 +1398,30 @@ void c4_ColOfInts::ResizeData(int index_, int count_, bool clear_)

/* _currwidth 1: 2: 4:
* shiftPos 3 2 1 shift the offset right this much
* tqmaskPos 7 3 1 tqmask the offset with this
* maskPos 7 3 1 tqmask the offset with this
*/

const int shiftPos = _currWidth == 4 ? 1 : 4 - _currWidth;
const int tqmaskPos = (1 << shiftPos) - 1;
const int maskPos = (1 << shiftPos) - 1;

// the following code is similar to c4_Column::Resize, but at bit level

// turn insertion into deletion by inserting entire bytes
if (count_ > 0) {
unsigned off = (unsigned) index_ >> shiftPos;
int gapBytes = (count_ + tqmaskPos) >> shiftPos;
int gapBytes = (count_ + maskPos) >> shiftPos;

InsertData(off, gapBytes, clear_);

// oops, we might have inserted too low by a few entries
const int bits = (index_ & tqmaskPos) * _currWidth;
const int bits = (index_ & maskPos) * _currWidth;
if (bits) {
const int tqmaskLow = (1 << bits) - 1;
const int maskLow = (1 << bits) - 1;

// move the first few bits to start of inserted range
t4_byte* p = CopyNow(off + gapBytes);
t4_byte one = *p & tqmaskLow;
*p &= ~tqmaskLow;
t4_byte one = *p & maskLow;
*p &= ~maskLow;

* CopyNow(off) = one;
}

+ 2
- 2
akregator/src/mk4storage/metakit/src/field.cpp View File

@@ -23,7 +23,7 @@
/////////////////////////////////////////////////////////////////////////////
// c4_Field

c4_Field::c4_Field (const char*& description_, c4_Field* tqparent_)
c4_Field::c4_Field (const char*& description_, c4_Field* parent_)
: _type (0)
{
_indirect = this;
@@ -47,7 +47,7 @@ c4_Field::c4_Field (const char*& description_, c4_Field* tqparent_)

if (*description_ == '^') {
++description_;
_indirect = tqparent_;
_indirect = parent_;
d4_assert(*description_ == ']');
}


+ 3
- 3
akregator/src/mk4storage/metakit/src/handler.cpp View File

@@ -397,7 +397,7 @@ void c4_HandlerSeq::ExchangeEntries(int srcPos_, c4_HandlerSeq& dst_, int dstPos
c4_HandlerSeq& t1 = SubEntry(col, srcPos_);
c4_HandlerSeq& t2 = dst_.SubEntry(col, dstPos_);

// adjust the tqparents
// adjust the parents
t1._tqparent = this;
t2._tqparent = &dst_;

@@ -478,14 +478,14 @@ void c4_HandlerSeq::UnmappedAll()

// construct meta view from a pre-parsed field tree structure
// this will one day be converted to directly parse the description string
void c4_HandlerSeq::BuildMeta(int tqparent_, int colnum_, c4_View& meta_,
void c4_HandlerSeq::BuildMeta(int parent_, int colnum_, c4_View& meta_,
const c4_Field& field_)
{
c4_IntProp pP ("P"), pC ("C");
c4_ViewProp pF ("F");
c4_StringProp pN ("N"), pT ("T");

int n = meta_.Add(pP [tqparent_] + pC [colnum_]);
int n = meta_.Add(pP [parent_] + pC [colnum_]);
c4_View fields = pF (meta_[n]);

for (int i = 0; i < field_.NumSubFields(); ++i) {

+ 2
- 2
akregator/src/mk4storage/metakit/tests/regress.cpp View File

@@ -219,9 +219,9 @@ void FailExpr(const char* expr)
Fail(buffer);
}

int StartTest(int tqmask_, const char* name_, const char* desc_)
int StartTest(int mask_, const char* name_, const char* desc_)
{
if (tqmask_)
if (mask_)
{
#if q4_MFC && defined(_DEBUG)
TRACE("%s - %-40s *** DISABLED ***\n", name_, desc_);

+ 1
- 1
akregator/src/mk4storage/mk4confwidgetbase.ui View File

@@ -169,7 +169,7 @@
<slot>&lt;No)</slot>
</connection>
</connections>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>kurlrequester.h</includehint>
<includehint>klineedit.h</includehint>

+ 1
- 1
akregator/src/propertieswidgetbase.ui View File

@@ -456,7 +456,7 @@
<slot access="protected" specifier="pure virtual">slotUpdateComboBoxActivated( int )</slot>
<slot access="protected" specifier="pure virtual">slotUpdateCheckBoxToggled( bool )</slot>
</Q_SLOTS>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>klineedit.h</includehint>
<includehint>klineedit.h</includehint>

+ 1
- 1
akregator/src/settings_advancedbase.ui View File

@@ -150,7 +150,7 @@
<slot>setEnabled(bool)</slot>
</connection>
</connections>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>kcombobox.h</includehint>
</includehints>

+ 1
- 1
akregator/src/settings_appearance.ui View File

@@ -234,7 +234,7 @@
<slot>setValue(int)</slot>
</connection>
</connections>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>knuminput.h</includehint>
<includehint>knuminput.h</includehint>

+ 1
- 1
akregator/src/settings_archive.ui View File

@@ -168,7 +168,7 @@
<slot>setEnabled(bool)</slot>
</connection>
</connections>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>knuminput.h</includehint>
<includehint>knuminput.h</includehint>

+ 1
- 1
akregator/src/settings_browser.ui View File

@@ -202,5 +202,5 @@
<slot>setEnabled(bool)</slot>
</connection>
</connections>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

+ 1
- 1
akregator/src/settings_general.ui View File

@@ -183,5 +183,5 @@
<slot>setEnabled(bool)</slot>
</connection>
</connections>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

+ 1
- 1
akregator/src/tagpropertieswidgetbase.ui View File

@@ -128,7 +128,7 @@
</widget>
</grid>
</widget>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>kicondialog.h</includehint>
</includehints>

+ 1
- 1
certmanager/certificateinfowidget.ui View File

@@ -211,5 +211,5 @@
</widget>
</grid>
</widget>
<tqlayoutdefaults spacing="6" margin="0"/>
<layoutdefaults spacing="6" margin="0"/>
</UI>

+ 1
- 1
certmanager/certificatewizard.ui View File

@@ -550,7 +550,7 @@ If you want to change anything, press Back and make your changes; otherwise, pre
<slot access="protected">slotEmailAddressChanged(const TQString&amp;)</slot>
<slot access="protected">slotGenerateCertificate()</slot>
</Q_SLOTS>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>klineedit.h</includehint>
<includehint>kpushbutton.h</includehint>

+ 1
- 1
certmanager/conf/appearanceconfigwidgetbase.ui View File

@@ -211,5 +211,5 @@
<slot access="protected">slotBoldClicked()</slot>
<slot access="protected">slotStrikeoutClicked()</slot>
</Q_SLOTS>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

+ 1
- 1
certmanager/conf/dirservconfigpage.cpp View File

@@ -49,7 +49,7 @@

#include <kdepimmacros.h>

#if 0 // disabled, since it is aptqparently confusing
#if 0 // disabled, since it is apparently confusing
// For sync'ing kabldaprc
class KABSynchronizer
{

+ 1
- 1
certmanager/hierarchyanalyser.cpp View File

@@ -54,7 +54,7 @@ void HierarchyAnalyser::slotNextKey( const GpgME::Key & key ) {
return;
if ( key.isRoot() || !key.chainID() || !*key.chainID() )
// root keys have themselves as issuer - we don't want them to
// have tqparents, though:
// have parents, though:
mSubjectsByIssuer[0].push_back( key );
else
mSubjectsByIssuer[key.chainID()].push_back( key );

+ 1
- 1
certmanager/lib/ui/adddirectoryservicedialog.ui View File

@@ -203,5 +203,5 @@
<tabstop>PushButton3</tabstop>
<tabstop>PushButton4</tabstop>
</tabstops>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

+ 1
- 1
certmanager/lib/ui/backendconfigwidget.cpp View File

@@ -88,7 +88,7 @@ public:
/// deselect all except one for a given protocol type (radiobutton-like exclusivity)
void deselectAll( const char * protocol, TQCheckListItem* except );

void emitChanged() { static_cast<BackendConfigWidget *>( tqparentWidget() )->emitChanged( true ); }
void emitChanged() { static_cast<BackendConfigWidget *>( parentWidget() )->emitChanged( true ); }
};

// Toplevel listviewitem for a given backend (e.g. "GpgME", "Kgpg/gpg v2")

+ 1
- 1
certmanager/lib/ui/cryptoconfigmodule.cpp View File

@@ -633,7 +633,7 @@ void Kleo::CryptoConfigEntryLDAPURL::slotOpenDialog()
{
// I'm a bad boy and I do it all on the stack. Enough classes already :)
// This is just a simple dialog around the directory-services-widget
KDialogBase dialog( mPushButton->tqparentWidget(), 0, true /*modal*/,
KDialogBase dialog( mPushButton->parentWidget(), 0, true /*modal*/,
i18n( "Configure LDAP Servers" ),
KDialogBase::Default|KDialogBase::Cancel|KDialogBase::Ok,
KDialogBase::Ok, true /*separator*/ );

+ 1
- 1
certmanager/lib/ui/directoryserviceswidgetbase.ui View File

@@ -338,5 +338,5 @@ By clicking this button, you can remove the currently selected directory service
<slot access="protected">slotMoveUp()</slot>
<slot access="protected">slotMoveDown()</slot>
</Q_SLOTS>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

+ 1
- 1
indexlib/boost-compat/shared_ptr.hpp View File

@@ -445,7 +445,7 @@ template<class E, class T, class Y> std::basic_ostream<E, T> & operator<< (std::
#if (defined(__GNUC__) && (__GNUC__ < 3)) || (defined(__EDG_VERSION__) && (__EDG_VERSION__ <= 238))

// g++ 2.9x doesn't allow static_cast<X const *>(void *)
// aptqparently EDG 2.38 also doesn't accept it
// apparently EDG 2.38 also doesn't accept it

template<class D, class T> D * get_deleter(shared_ptr<T> const & p)
{

+ 3
- 3
indexlib/boost-compat/weak_ptr.hpp View File

@@ -51,11 +51,11 @@ public:
//
// has a serious problem.
//
// r.px may already have been tqinvalidated. The px(r.px)
// r.px may already have been invalidated. The px(r.px)
// conversion may require access to *r.px (virtual inheritance).
//
// It is not possible to avoid spurious access violations since
// in multithreaded programs r.px may be tqinvalidated at any point.
// in multithreaded programs r.px may be invalidated at any point.
//

template<class Y>
@@ -106,7 +106,7 @@ public:
catch(bad_weak_ptr const &)
{
// Q: how can we get here?
// A: another thread may have tqinvalidated r after the use_count test above.
// A: another thread may have invalidated r after the use_count test above.
return shared_ptr<element_type>();
}


+ 1
- 1
indexlib/manager.h View File

@@ -51,7 +51,7 @@ class memory_manager {
/** Returns the size of the block */
virtual unsigned size() const = 0;
/** Resizes the block.
* This tqinvalidates all previously returned pointers
* This invalidates all previously returned pointers
*/
virtual void resize( unsigned ) = 0;
};

+ 5
- 5
indexlib/match.cpp View File

@@ -47,17 +47,17 @@ namespace {
}

indexlib::Match::Match( std::string str, unsigned flags ):
tqmasks_( 256 ),
masks_( 256 ),
caseinsensitive_( flags & caseinsensitive ),
pattern_rest_( str, kMin( str.size(), sizeof( unsigned ) * 8 - 1 ) )
{
hot_bit_ = kMin( str.size(), sizeof( unsigned ) * 8 - 1 );
for ( unsigned i = 0; i != hot_bit_; ++i ) {
if ( caseinsensitive_ ) {
setbit( tqmasks_[ ( unsigned char )std::toupper( str[ i ] ) ], i );
setbit( tqmasks_[ ( unsigned char )std::tolower( str[ i ] ) ], i );
setbit( masks_[ ( unsigned char )std::toupper( str[ i ] ) ], i );
setbit( masks_[ ( unsigned char )std::tolower( str[ i ] ) ], i );
} else {
setbit( tqmasks_[ ( unsigned char )str[ i ] ], i );
setbit( masks_[ ( unsigned char )str[ i ] ], i );
}
}
}
@@ -69,7 +69,7 @@ bool indexlib::Match::process( const char* string ) const {
unsigned state = 0;
while ( *string ) {
state |= 1;
state &= tqmasks_[ ( unsigned char )*string ];
state &= masks_[ ( unsigned char )*string ];
state <<= 1;
++string;
if ( getbit( state, hot_bit_ ) && ( pattern_rest_ == std::string( string, pattern_rest_.size() ) ) ) return true;

+ 2
- 2
indexlib/match.h View File

@@ -64,8 +64,8 @@ class Match {
bool process( const char* string ) const;
bool process( std::string str ) const { return process( str.c_str() ); }
private:
typedef std::vector<unsigned> tqmasks_type;
tqmasks_type tqmasks_;
typedef std::vector<unsigned> masks_type;
masks_type masks_;
unsigned hot_bit_;
bool caseinsensitive_;
std::string pattern_rest_;

+ 5
- 5
indexlib/mempool.h View File

@@ -114,20 +114,20 @@ struct mempool /* : boost::noncopyable */ {
friend struct list_node_manager;
struct list_node_manager {
protected:
const mempool* tqparent_;
const mempool* parent_;
public:
explicit list_node_manager( const mempool* p = 0 ):tqparent_( p ) {}
explicit list_node_manager( const mempool* p = 0 ):parent_( p ) {}

void* rw_base( unsigned idx ) const {
return tqparent_->manager_->rw_base( idx );
return parent_->manager_->rw_base( idx );
}
const void* ronly_base( unsigned idx ) const {
return tqparent_->manager_->ronly_base( idx );
return parent_->manager_->ronly_base( idx );
}
};

START_THING( list_node, thing<list_node_manager> )
void set_tqparent( const mempool* p ) { this->tqparent_ = p; }
void set_tqparent( const mempool* p ) { this->parent_ = p; }
MEMBER( uint16_t, order, 0 )
MEMBER( uint32_t, next, 2 )
MEMBER( uint32_t, prev, 6 )

+ 1
- 1
kabc/frontend/mainWindow.ui View File

@@ -1405,5 +1405,5 @@
<slot>addressBookUnlocked()</slot>
<slot>fileOpenStd()</slot>
</Q_SLOTS>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

+ 1
- 1
kaddressbook/editors/imaddressbase.ui View File

@@ -85,5 +85,5 @@
<slot>slotProtocolChanged( const TQString &amp; )</slot>
<slot>slotProtocolChanged()</slot>
</Q_SLOTS>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

+ 2
- 2
kaddressbook/editors/imeditorbase.ui View File

@@ -152,8 +152,8 @@
</widget>
<customwidgets>
</customwidgets>
<tqlayoutdefaults spacing="6" margin="0"/>
<tqlayoutfunctions spacing="KDialog::spacingHint"/>
<layoutdefaults spacing="6" margin="0"/>
<layoutfunctions spacing="KDialog::spacingHint"/>
<includehints>
<includehint>kpushbutton.h</includehint>
<includehint>kpushbutton.h</includehint>

+ 4
- 4
kaddressbook/features/resourceselection.cpp View File

@@ -466,12 +466,12 @@ ResourceItem* ResourceSelection::selectedItem() const
ResourceItem* ResourceSelection::findSubResourceItem( KPIM::ResourceABC *resource,
const TQString &subResource )
{
TQListViewItemIterator tqparentIt( mListView );
for ( ; *tqparentIt; ++tqparentIt ) {
if ( static_cast<ResourceItem*>(*tqparentIt)->resource() != resource )
TQListViewItemIterator parentIt( mListView );
for ( ; *parentIt; ++parentIt ) {
if ( static_cast<ResourceItem*>(*parentIt)->resource() != resource )
continue;

TQListViewItemIterator childIt( *tqparentIt );
TQListViewItemIterator childIt( *parentIt );
for ( ; *childIt; ++childIt ) {
ResourceItem *item = static_cast<ResourceItem*>(*childIt);
if ( item->resourceIdentifier() == subResource )

+ 1
- 1
kaddressbook/interfaces/xxport.cpp View File

@@ -99,7 +99,7 @@ KABC::AddressBook *XXPort::addressBook() const
return mAddressBook;
}

TQWidget *XXPort::tqparentWidget() const
TQWidget *XXPort::parentWidget() const
{
return mParentWidget;
}

+ 1
- 1
kaddressbook/interfaces/xxport.h View File

@@ -146,7 +146,7 @@ class KDE_EXPORT XXPort : public TQObject, virtual public KXMLGUIClient
Returns a pointer to the tqparent widget. It can be used as tqparent for
message boxes.
*/
TQWidget *tqparentWidget() const;
TQWidget *parentWidget() const;

private slots:
void slotImportActivated( const TQString& );

+ 2
- 2
kaddressbook/kaddressbook_part.cpp View File

@@ -42,7 +42,7 @@
typedef KParts::GenericFactory< KAddressbookPart > KAddressbookFactory;
K_EXPORT_COMPONENT_FACTORY( libkaddressbookpart, KAddressbookFactory )

KAddressbookPart::KAddressbookPart( TQWidget *tqparentWidget, const char *widgetName,
KAddressbookPart::KAddressbookPart( TQWidget *parentWidget, const char *widgetName,
TQObject *tqparent, const char *name,
const TQStringList & )
: DCOPObject( "KAddressBookIface" ), KParts::ReadOnlyPart( tqparent, name )
@@ -50,7 +50,7 @@ KAddressbookPart::KAddressbookPart( TQWidget *tqparentWidget, const char *widget
setInstance( KAddressbookFactory::instance() );

// create a canvas to insert our widget
TQWidget *canvas = new TQWidget( tqparentWidget, widgetName );
TQWidget *canvas = new TQWidget( parentWidget, widgetName );
canvas->setFocusPolicy( TQ_ClickFocus );
setWidget( canvas );


+ 1
- 1
kaddressbook/kaddressbook_part.h View File

@@ -40,7 +40,7 @@ class KAddressbookPart: public KParts::ReadOnlyPart, virtual public KAddressBook
TQ_OBJECT

public:
KAddressbookPart( TQWidget *tqparentWidget, const char *widgetName,
KAddressbookPart( TQWidget *parentWidget, const char *widgetName,
TQObject *tqparent, const char *name, const TQStringList& );
virtual ~KAddressbookPart();


+ 1
- 1
kaddressbook/printing/ds_appearance.ui View File

@@ -475,5 +475,5 @@
<slot>setDisabled(bool)</slot>
</connection>
</connections>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

+ 1
- 1
kaddressbook/views/configurecardviewdialog.cpp View File

@@ -196,7 +196,7 @@ void CardViewLookNFeelPage::initGUI()
TQTabWidget *tabs = new TQTabWidget( this );

// Layout
TQVBox *loTab = new TQVBox( this, "tqlayouttab" );
TQVBox *loTab = new TQVBox( this, "layouttab" );

loTab->setSpacing( spacing );
loTab->setMargin( margin );

+ 12
- 12
kaddressbook/views/contactlistview.cpp View File

@@ -54,10 +54,10 @@ DynamicTip::DynamicTip( ContactListView *tqparent)

void DynamicTip::maybeTip( const TQPoint &pos )
{
if (!tqparentWidget()->inherits( "ContactListView" ))
if (!parentWidget()->inherits( "ContactListView" ))
return;

ContactListView *plv = (ContactListView*)tqparentWidget();
ContactListView *plv = (ContactListView*)parentWidget();
if (!plv->tooltips())
return;

@@ -109,7 +109,7 @@ void DynamicTip::maybeTip( const TQPoint &pos )
linew += fm.width( notes[i] );

if ( lastSpace >= a && notes[i] != '\n' )
if (linew >= tqparentWidget()->width()) {
if (linew >= parentWidget()->width()) {
doBreak = true;
if ( lastSpace > a ) {
i = lastSpace;
@@ -152,7 +152,7 @@ ContactListViewItem::ContactListViewItem(const KABC::Addressee &a,
const KABC::Field::List &fields,
KIMProxy *proxy )
: KListViewItem(tqparent), mAddressee(a), mFields( fields ),
tqparentListView( tqparent ), mDocument(doc), mIMProxy( proxy )
parentListView( tqparent ), mDocument(doc), mIMProxy( proxy )
{
if ( mIMProxy )
mHasIM = mIMProxy->isPresent( mAddressee.uid() );
@@ -164,15 +164,15 @@ ContactListViewItem::ContactListViewItem(const KABC::Addressee &a,
TQString ContactListViewItem::key(int column, bool ascending) const
{
// Preserve behaviour of TQListViewItem::key(), otherwise we cause a crash if the column does not exist
if ( column >= tqparentListView->columns() )
if ( column >= parentListView->columns() )
return TQString();

#if KDE_VERSION >= 319
Q_UNUSED( ascending )
if ( tqparentListView->showIM() ) {
if ( parentListView->showIM() ) {
// in this case, one column is reserved for IM presence
// so we have to process it differently
if ( column == tqparentListView->imColumn() ) {
if ( column == parentListView->imColumn() ) {
// increment by one before converting to string so that -1 is not greater than 1
// create the sort key by taking the numeric status 0 low, 5 high, and subtracting it from 5
// so that the default ascending gives online before offline, etc.
@@ -201,8 +201,8 @@ void ContactListViewItem::paintCell(TQPainter * p,
if ( !p )
return;

if (tqparentListView->singleLine()) {
p->setPen( tqparentListView->alternateColor() );
if (parentListView->singleLine()) {
p->setPen( parentListView->alternateColor() );
p->drawLine( 0, height() - 1, width, height() - 1 );
}
}
@@ -210,7 +210,7 @@ void ContactListViewItem::paintCell(TQPainter * p,

ContactListView *ContactListViewItem::tqparent()
{
return tqparentListView;
return parentListView;
}


@@ -230,9 +230,9 @@ void ContactListViewItem::refresh()
// don't show unknown presence, it's not interesting
if ( mHasIM ) {
if ( mIMProxy->presenceNumeric( mAddressee.uid() ) > 0 )
setPixmap( tqparentListView->imColumn(), mIMProxy->presenceIcon( mAddressee.uid() ) );
setPixmap( parentListView->imColumn(), mIMProxy->presenceIcon( mAddressee.uid() ) );
else
setPixmap( tqparentListView->imColumn(), TQPixmap() );
setPixmap( parentListView->imColumn(), TQPixmap() );
}

KABC::Field::List::ConstIterator it;

+ 1
- 1
kaddressbook/views/contactlistview.h View File

@@ -72,7 +72,7 @@ public:
private:
KABC::Addressee mAddressee;
KABC::Field::List mFields;
ContactListView *tqparentListView;
ContactListView *parentListView;
KABC::AddressBook *mDocument;
KIMProxy *mIMProxy;
bool mHasIM;

+ 6
- 6
kaddressbook/xxport/csv_xxport.cpp View File

@@ -50,7 +50,7 @@ bool CSVXXPort::exportContacts( const KABC::AddresseeList &list, const TQString&
return true;

if( TQFileInfo(url.path()).exists() ) {
if(KMessageBox::questionYesNo( tqparentWidget(), i18n("Do you want to overwrite file \"%1\"").tqarg( url.path()) ) == KMessageBox::No)
if(KMessageBox::questionYesNo( parentWidget(), i18n("Do you want to overwrite file \"%1\"").tqarg( url.path()) ) == KMessageBox::No)
return false;
}

@@ -58,7 +58,7 @@ bool CSVXXPort::exportContacts( const KABC::AddresseeList &list, const TQString&
KTempFile tmpFile;
if ( tmpFile.status() != 0 ) {
TQString txt = i18n( "<qt>Unable to open file <b>%1</b>.%2.</qt>" );
KMessageBox::error( tqparentWidget(), txt.tqarg( url.url() )
KMessageBox::error( parentWidget(), txt.tqarg( url.url() )
.tqarg( strerror( tmpFile.status() ) ) );
return false;
}
@@ -66,19 +66,19 @@ bool CSVXXPort::exportContacts( const KABC::AddresseeList &list, const TQString&
doExport( tmpFile.file(), list );
tmpFile.close();

return KIO::NetAccess::upload( tmpFile.name(), url, tqparentWidget() );
return KIO::NetAccess::upload( tmpFile.name(), url, parentWidget() );
} else {
TQFile file( url.path() );
if ( !file.open( IO_WriteOnly ) ) {
TQString txt = i18n( "<qt>Unable to open file <b>%1</b>.</qt>" );
KMessageBox::error( tqparentWidget(), txt.tqarg( url.path() ) );
KMessageBox::error( parentWidget(), txt.tqarg( url.path() ) );
return false;
}

doExport( &file, list );
file.close();

KMessageBox::information( tqparentWidget(), i18n( "The contacts have been exported successfully." ) );
KMessageBox::information( parentWidget(), i18n( "The contacts have been exported successfully." ) );

return true;
}
@@ -86,7 +86,7 @@ bool CSVXXPort::exportContacts( const KABC::AddresseeList &list, const TQString&

KABC::AddresseeList CSVXXPort::importContacts( const TQString& ) const
{
CSVImportDialog dlg( addressBook(), tqparentWidget() );
CSVImportDialog dlg( addressBook(), parentWidget() );
if ( dlg.exec() )
return dlg.contacts();
else

+ 18
- 18
kaddressbook/xxport/gnokii_xxport.cpp View File

@@ -528,7 +528,7 @@ KABC::AddresseeList GNOKIIXXPort::importContacts( const TQString& ) const
{
KABC::AddresseeList addrList;

if (KMessageBox::Continue != KMessageBox::warningContinueCancel(tqparentWidget(),
if (KMessageBox::Continue != KMessageBox::warningContinueCancel(parentWidget(),
i18n("<qt>Please connect your Mobile Phone to your computer and press "
"<b>Continue</b> to start importing the personal contacts.<br><br>"
"Please note that if your Mobile Phone is not properly connected "
@@ -536,7 +536,7 @@ KABC::AddresseeList GNOKIIXXPort::importContacts( const TQString& ) const
"KAddressbook will behave unresponsively.</qt>") ))
return addrList;

m_progressDlg = new KProgressDialog( tqparentWidget(), "importwidget",
m_progressDlg = new KProgressDialog( parentWidget(), "importwidget",
i18n("Mobile Phone Import"),
i18n("<qt><center>Establishing connection to the Mobile Phone.<br><br>"
"Please wait...</center></qt>") );
@@ -553,7 +553,7 @@ KABC::AddresseeList GNOKIIXXPort::importContacts( const TQString& ) const
m_progressDlg->unsetCursor();

if (!errStr.isEmpty()) {
KMessageBox::error(tqparentWidget(), errStr);
KMessageBox::error(parentWidget(), errStr);
delete m_progressDlg;
return addrList;
}
@@ -575,7 +575,7 @@ KABC::AddresseeList GNOKIIXXPort::importContacts( const TQString& ) const

bool GNOKIIXXPort::exportContacts( const KABC::AddresseeList &list, const TQString & )
{
if (KMessageBox::Continue != KMessageBox::warningContinueCancel(tqparentWidget(),
if (KMessageBox::Continue != KMessageBox::warningContinueCancel(parentWidget(),
i18n("<qt>Please connect your Mobile Phone to your computer and press "
"<b>Continue</b> to start exporting the selected personal contacts.<br><br>"
"Please note that if your Mobile Phone is not properly connected "
@@ -583,7 +583,7 @@ bool GNOKIIXXPort::exportContacts( const KABC::AddresseeList &list, const TQStri
"KAddressbook will behave unresponsively.</qt>") ))
return false;

m_progressDlg = new KProgressDialog( tqparentWidget(), "importwidget",
m_progressDlg = new KProgressDialog( parentWidget(), "importwidget",
i18n("Mobile Phone Export"),
i18n("<qt><center>Establishing connection to the Mobile Phone.<br><br>"
"Please wait...</center></qt>") );
@@ -608,7 +608,7 @@ bool GNOKIIXXPort::exportContacts( const KABC::AddresseeList &list, const TQStri
m_progressDlg->unsetCursor();

if (!errStr.isEmpty()) {
KMessageBox::error(tqparentWidget(), errStr);
KMessageBox::error(parentWidget(), errStr);
delete m_progressDlg;
return false;
}
@@ -637,7 +637,7 @@ bool GNOKIIXXPort::exportContacts( const KABC::AddresseeList &list, const TQStri
phone_count = memstat.used;

if (memstat.free >= (int) list.count()) {
if (KMessageBox::No == KMessageBox::questionYesNo(tqparentWidget(),
if (KMessageBox::No == KMessageBox::questionYesNo(parentWidget(),
i18n("<qt>Do you want the selected contacts to be <b>appended</b> to "
"the current mobile phonebook or should they <b>tqreplace</b> all "
"currently existing phonebook entries ?<br><br>"
@@ -756,7 +756,7 @@ finish:

if (!failedList.isEmpty()) {
GNOKII_DEBUG(TQString("Failed to export: %1\n").tqarg(failedList.join(", ")));
KMessageBox::informationList(tqparentWidget(),
KMessageBox::informationList(parentWidget(),
i18n("<qt>The following contacts could not be exported to the Mobile Phone. "
"Possible Reasons for this problem could be:<br><ul>"
"<li>The contacts contain more information per entry than the phone can store.</li>"
@@ -1319,7 +1319,7 @@ KABC::AddresseeList GNOKIIXXPort::importContacts( const TQString& ) const
{
KABC::AddresseeList addrList;

if (KMessageBox::Continue != KMessageBox::warningContinueCancel(tqparentWidget(),
if (KMessageBox::Continue != KMessageBox::warningContinueCancel(parentWidget(),
i18n("<qt>Please connect your Mobile Phone to your computer and press "
"<b>Continue</b> to start importing the personal contacts.<br><br>"
"Please note that if your Mobile Phone is not properly connected "
@@ -1327,7 +1327,7 @@ KABC::AddresseeList GNOKIIXXPort::importContacts( const TQString& ) const
"KAddressbook will behave unresponsively.</qt>") ))
return addrList;

m_progressDlg = new KProgressDialog( tqparentWidget(), "importwidget",
m_progressDlg = new KProgressDialog( parentWidget(), "importwidget",
i18n("Mobile Phone Import"),
i18n("<qt><center>Establishing connection to the Mobile Phone.<br><br>"
"Please wait...</center></qt>") );
@@ -1344,7 +1344,7 @@ KABC::AddresseeList GNOKIIXXPort::importContacts( const TQString& ) const
m_progressDlg->unsetCursor();

if (!errStr.isEmpty()) {
KMessageBox::error(tqparentWidget(), errStr);
KMessageBox::error(parentWidget(), errStr);
delete m_progressDlg;
return addrList;
}
@@ -1366,7 +1366,7 @@ KABC::AddresseeList GNOKIIXXPort::importContacts( const TQString& ) const

bool GNOKIIXXPort::exportContacts( const KABC::AddresseeList &list, const TQString & )
{
if (KMessageBox::Continue != KMessageBox::warningContinueCancel(tqparentWidget(),
if (KMessageBox::Continue != KMessageBox::warningContinueCancel(parentWidget(),
i18n("<qt>Please connect your Mobile Phone to your computer and press "
"<b>Continue</b> to start exporting the selected personal contacts.<br><br>"
"Please note that if your Mobile Phone is not properly connected "
@@ -1374,7 +1374,7 @@ bool GNOKIIXXPort::exportContacts( const KABC::AddresseeList &list, const TQStri
"KAddressbook will behave unresponsively.</qt>") ))
return false;

m_progressDlg = new KProgressDialog( tqparentWidget(), "importwidget",
m_progressDlg = new KProgressDialog( parentWidget(), "importwidget",
i18n("Mobile Phone Export"),
i18n("<qt><center>Establishing connection to the Mobile Phone.<br><br>"
"Please wait...</center></qt>") );
@@ -1399,7 +1399,7 @@ bool GNOKIIXXPort::exportContacts( const KABC::AddresseeList &list, const TQStri
m_progressDlg->unsetCursor();

if (!errStr.isEmpty()) {
KMessageBox::error(tqparentWidget(), errStr);
KMessageBox::error(parentWidget(), errStr);
delete m_progressDlg;
return false;
}
@@ -1428,7 +1428,7 @@ bool GNOKIIXXPort::exportContacts( const KABC::AddresseeList &list, const TQStri
phone_count = memstat.used;

if (memstat.free >= (int) list.count()) {
if (KMessageBox::No == KMessageBox::questionYesNo(tqparentWidget(),
if (KMessageBox::No == KMessageBox::questionYesNo(parentWidget(),
i18n("<qt>Do you want the selected contacts to be <b>appended</b> to "
"the current mobile phonebook or should they <b>tqreplace</b> all "
"currently existing phonebook entries ?<br><br>"
@@ -1547,7 +1547,7 @@ finish:

if (!failedList.isEmpty()) {
GNOKII_DEBUG(TQString("Failed to export: %1\n").tqarg(failedList.join(", ")));
KMessageBox::informationList(tqparentWidget(),
KMessageBox::informationList(parentWidget(),
i18n("<qt>The following contacts could not be exported to the Mobile Phone. "
"Possible Reasons for this problem could be:<br><ul>"
"<li>The contacts contain more information per entry than the phone can store.</li>"
@@ -1575,7 +1575,7 @@ finish:
KABC::AddresseeList GNOKIIXXPort::importContacts( const TQString& ) const
{
KABC::AddresseeList addrList;
KMessageBox::error(tqparentWidget(), i18n("Gnokii interface is not available.\n"
KMessageBox::error(parentWidget(), i18n("Gnokii interface is not available.\n"
"Please ask your distributor to add gnokii at compile time."));
return addrList;
}
@@ -1583,7 +1583,7 @@ KABC::AddresseeList GNOKIIXXPort::importContacts( const TQString& ) const
bool GNOKIIXXPort::exportContacts( const KABC::AddresseeList &list, const TQString & )
{
Q_UNUSED(list);
KMessageBox::error(tqparentWidget(), i18n("Gnokii interface is not available.\n"
KMessageBox::error(parentWidget(), i18n("Gnokii interface is not available.\n"
"Please ask your distributor to add gnokii at compile time."));
return true;
}

+ 2
- 2
kaddressbook/xxport/kde2_xxport.cpp View File

@@ -49,11 +49,11 @@ KABC::AddresseeList KDE2XXPort::importContacts( const TQString& ) const
{
TQString fileName = locateLocal( "data", "kabc/std.vcf" );
if ( !TQFile::exists( fileName ) ) {
KMessageBox::sorry( tqparentWidget(), i18n( "<qt>Could not find a KDE 2 address book <b>%1</b>.</qt>" ).tqarg( fileName ) );
KMessageBox::sorry( parentWidget(), i18n( "<qt>Could not find a KDE 2 address book <b>%1</b>.</qt>" ).tqarg( fileName ) );
return KABC::AddresseeList();
}

int result = KMessageBox::questionYesNoCancel( tqparentWidget(),
int result = KMessageBox::questionYesNoCancel( parentWidget(),
i18n( "Override previously imported entries?" ),
i18n( "Import KDE 2 Addressbook" ), i18n("Import"), i18n("Do Not Import") );


+ 5
- 5
kaddressbook/xxport/ldif_xxport.cpp View File

@@ -71,7 +71,7 @@ KABC::AddresseeList LDIFXXPort::importContacts( const TQString& ) const
TQFile file( fileName );
if ( !file.open( IO_ReadOnly ) ) {
TQString msg = i18n( "<qt>Unable to open <b>%1</b> for reading.</qt>" );
KMessageBox::error( tqparentWidget(), msg.tqarg( fileName ) );
KMessageBox::error( parentWidget(), msg.tqarg( fileName ) );
return addrList;
}

@@ -97,7 +97,7 @@ bool LDIFXXPort::exportContacts( const KABC::AddresseeList &list, const TQString
return true;

if( TQFileInfo(url.path()).exists() ) {
if(KMessageBox::questionYesNo( tqparentWidget(), i18n("Do you want to overwrite file \"%1\"").tqarg( url.path()) ) == KMessageBox::No)
if(KMessageBox::questionYesNo( parentWidget(), i18n("Do you want to overwrite file \"%1\"").tqarg( url.path()) ) == KMessageBox::No)
return false;
}

@@ -106,7 +106,7 @@ bool LDIFXXPort::exportContacts( const KABC::AddresseeList &list, const TQString
KTempFile tmpFile;
if ( tmpFile.status() != 0 ) {
TQString txt = i18n( "<qt>Unable to open file <b>%1</b>.%2.</qt>" );
KMessageBox::error( tqparentWidget(), txt.tqarg( url.url() )
KMessageBox::error( parentWidget(), txt.tqarg( url.url() )
.tqarg( strerror( tmpFile.status() ) ) );
return false;
}
@@ -114,14 +114,14 @@ bool LDIFXXPort::exportContacts( const KABC::AddresseeList &list, const TQString
doExport( tmpFile.file(), list );
tmpFile.close();

return KIO::NetAccess::upload( tmpFile.name(), url, tqparentWidget() );
return KIO::NetAccess::upload( tmpFile.name(), url, parentWidget() );
} else {
TQString filename = url.path();
TQFile file( filename );

if ( !file.open( IO_WriteOnly ) ) {
TQString txt = i18n( "<qt>Unable to open file <b>%1</b>.</qt>" );
KMessageBox::error( tqparentWidget(), txt.tqarg( filename ) );
KMessageBox::error( parentWidget(), txt.tqarg( filename ) );
return false;
}


+ 1
- 1
kaddressbook/xxport/opera_xxport.cpp View File

@@ -55,7 +55,7 @@ KABC::AddresseeList OperaXXPort::importContacts( const TQString& ) const
TQFile file( fileName );
if ( !file.open( IO_ReadOnly ) ) {
TQString msg = i18n( "<qt>Unable to open <b>%1</b> for reading.</qt>" );
KMessageBox::error( tqparentWidget(), msg.tqarg( fileName ) );
KMessageBox::error( parentWidget(), msg.tqarg( fileName ) );
return addrList;
}


+ 1
- 1
kaddressbook/xxport/pab_xxport.cpp View File

@@ -55,7 +55,7 @@ KABC::AddresseeList PABXXPort::importContacts( const TQString& ) const
if ( fileName.isEmpty() )
return addrList;
if ( !TQFile::exists( fileName ) ) {
KMessageBox::sorry( tqparentWidget(), i18n( "<qt>Could not find a MS Exchange Personal Address Book <b>%1</b>.</qt>" ).tqarg( fileName ) );
KMessageBox::sorry( parentWidget(), i18n( "<qt>Could not find a MS Exchange Personal Address Book <b>%1</b>.</qt>" ).tqarg( fileName ) );
return addrList;
}


+ 14
- 14
kaddressbook/xxport/vcard_xxport.cpp View File

@@ -131,7 +131,7 @@ bool VCardXXPort::exportContacts( const KABC::AddresseeList &addrList, const TQS
TQString msg = i18n( "You have selected a list of contacts, shall they be "
"exported to several files?" );

switch ( KMessageBox::questionYesNo( tqparentWidget(), msg, TQString(), i18n("Export to Several Files"), i18n("Export to One File") ) ) {
switch ( KMessageBox::questionYesNo( parentWidget(), msg, TQString(), i18n("Export to Several Files"), i18n("Export to One File") ) ) {
case KMessageBox::Yes: {
KURL baseUrl = KFileDialog::getExistingURL();
if ( baseUrl.isEmpty() )
@@ -146,7 +146,7 @@ bool VCardXXPort::exportContacts( const KABC::AddresseeList &addrList, const TQS
else
testUrl = baseUrl.url() + "/" + (*it).givenName() + "_" + (*it).familyName();

if ( KIO::NetAccess::exists( testUrl + (counter == 0 ? "" : TQString::number( counter )) + ".vcf", false, tqparentWidget() ) ) {
if ( KIO::NetAccess::exists( testUrl + (counter == 0 ? "" : TQString::number( counter )) + ".vcf", false, parentWidget() ) ) {
counter++;
url = testUrl + TQString::number( counter ) + ".vcf";
} else
@@ -208,7 +208,7 @@ KABC::AddresseeList VCardXXPort::importContacts( const TQString& ) const
#endif
} else {
if ( XXPortManager::importURL.isEmpty() )
urls = KFileDialog::getOpenURLs( TQString(), "*.vcf|vCards", tqparentWidget(),
urls = KFileDialog::getOpenURLs( TQString(), "*.vcf|vCards", parentWidget(),
i18n( "Select vCard to Import" ) );
else
urls.append( XXPortManager::importURL );
@@ -220,7 +220,7 @@ KABC::AddresseeList VCardXXPort::importContacts( const TQString& ) const
bool anyFailures = false;
KURL::List::Iterator it;
for ( it = urls.begin(); it != urls.end(); ++it ) {
if ( KIO::NetAccess::download( *it, fileName, tqparentWidget() ) ) {
if ( KIO::NetAccess::download( *it, fileName, parentWidget() ) ) {

TQFile file( fileName );

@@ -253,13 +253,13 @@ KABC::AddresseeList VCardXXPort::importContacts( const TQString& ) const
text = text.tqarg( (*it).url() );
text = text.tqarg( kapp->translate( "TQFile",
TQString(file.errorString()).latin1() ) );
KMessageBox::error( tqparentWidget(), text, caption );
KMessageBox::error( parentWidget(), text, caption );
anyFailures = true;
}
} else {
TQString text = i18n( "<qt>Unable to access vCard: %1</qt>" );
text = text.tqarg( KIO::NetAccess::lastErrorString() );
KMessageBox::error( tqparentWidget(), text, caption );
KMessageBox::error( parentWidget(), text, caption );
anyFailures = true;
}
}
@@ -267,12 +267,12 @@ KABC::AddresseeList VCardXXPort::importContacts( const TQString& ) const
if ( !XXPortManager::importURL.isEmpty() ) { // a vcard was passed via cmd
if ( addrList.isEmpty() ) {
if ( anyFailures && urls.count() > 1 )
KMessageBox::information( tqparentWidget(),
KMessageBox::information( parentWidget(),
i18n( "No contacts were imported, due to errors with the vCards." ) );
else if ( !anyFailures )
KMessageBox::information( tqparentWidget(), i18n( "The vCard does not contain any contacts." ) );
KMessageBox::information( parentWidget(), i18n( "The vCard does not contain any contacts." ) );
} else {
VCardViewerDialog dlg( addrList, tqparentWidget() );
VCardViewerDialog dlg( addrList, parentWidget() );
dlg.exec();
addrList = dlg.contacts();
}
@@ -293,7 +293,7 @@ KABC::AddresseeList VCardXXPort::parseVCard( const TQByteArray &data ) const
bool VCardXXPort::doExport( const KURL &url, const TQByteArray &data )
{
if( TQFileInfo(url.path()).exists() ) {
if(KMessageBox::questionYesNo( tqparentWidget(), i18n("Do you want to overwrite file \"%1\"").tqarg( url.path()) ) == KMessageBox::No)
if(KMessageBox::questionYesNo( parentWidget(), i18n("Do you want to overwrite file \"%1\"").tqarg( url.path()) ) == KMessageBox::No)
return false;
}
KTempFile tmpFile;
@@ -302,7 +302,7 @@ bool VCardXXPort::doExport( const KURL &url, const TQByteArray &data )
tmpFile.file()->writeBlock( data.data(), data.size() );
tmpFile.close();

return KIO::NetAccess::upload( tmpFile.name(), url, tqparentWidget() );
return KIO::NetAccess::upload( tmpFile.name(), url, parentWidget() );
}
#else
KABC::AddresseeList VCardXXPort::parseVCard( const TQString &data ) const
@@ -315,7 +315,7 @@ KABC::AddresseeList VCardXXPort::parseVCard( const TQString &data ) const
bool VCardXXPort::doExport( const KURL &url, const TQString &data )
{
if( TQFileInfo(url.path()).exists() ) {
if(KMessageBox::questionYesNo( tqparentWidget(), i18n("Do you want to overwrite file \"%1\"").tqarg( url.path()) ) == KMessageBox::No)
if(KMessageBox::questionYesNo( parentWidget(), i18n("Do you want to overwrite file \"%1\"").tqarg( url.path()) ) == KMessageBox::No)
return false;
}
KTempFile tmpFile;
@@ -327,7 +327,7 @@ bool VCardXXPort::doExport( const KURL &url, const TQString &data )
stream << data;
tmpFile.close();

return KIO::NetAccess::upload( tmpFile.name(), url, tqparentWidget() );
return KIO::NetAccess::upload( tmpFile.name(), url, parentWidget() );
}
#endif

@@ -338,7 +338,7 @@ KABC::AddresseeList VCardXXPort::filterContacts( const KABC::AddresseeList &addr
if ( addrList.isEmpty() )
return addrList;

VCardExportSelectionDialog dlg( tqparentWidget() );
VCardExportSelectionDialog dlg( parentWidget() );
if ( !dlg.exec() )
return list;


+ 1
- 1
kalarm/Changelog View File

@@ -260,7 +260,7 @@ KAlarm Change Log
- Align times in alarm list.
- Fix crash when the last recurrence of an alarm is reached.
- Fix random limit on expired alarm discard time if stepping with spinbox buttons.
- Fix dialog tqlayouts for right-to-left languages.
- Fix dialog layouts for right-to-left languages.
- Fix time spin box tqlayout for right-to-left languages.

=== Version 1.2.2 --- 27 November 2004 ===

+ 1
- 1
kalarm/alarmlistview.cpp View File

@@ -684,7 +684,7 @@ TQString AlarmListViewItem::key(int column, bool) const
*/
void AlarmListTooltip::maybeTip(const TQPoint& pt)
{
AlarmListView* listView = (AlarmListView*)tqparentWidget()->tqparentWidget();
AlarmListView* listView = (AlarmListView*)parentWidget()->parentWidget();
int column = listView->column(AlarmListView::MESSAGE_COLUMN);
int xOffset = listView->contentsX();
if (listView->header()->sectionAt(pt.x() + xOffset) == column)

+ 2
- 2
kalarm/editdlg.cpp View File

@@ -102,7 +102,7 @@ class PickAlarmFileRadio : public PickFileRadio
virtual TQString pickFile() // called when browse button is pressed to select a file to display
{
return KAlarm::browseFile(i18n("Choose Text or Image File to Display"), mDefaultDir, fileEdit()->text(),
TQString(), KFile::ExistingOnly, tqparentWidget(), "pickAlarmFile");
TQString(), KFile::ExistingOnly, parentWidget(), "pickAlarmFile");
}
private:
TQString mDefaultDir; // default directory for file browse button
@@ -119,7 +119,7 @@ class PickLogFileRadio : public PickFileRadio
virtual TQString pickFile() // called when browse button is pressed to select a log file
{
return KAlarm::browseFile(i18n("Choose Log File"), mDefaultDir, fileEdit()->text(), TQString(),
KFile::LocalOnly, tqparentWidget(), "pickLogFile");
KFile::LocalOnly, parentWidget(), "pickLogFile");
}
private:
TQString mDefaultDir; // default directory for log file browse button

+ 1
- 1
kalarm/lib/label.cpp View File

@@ -112,7 +112,7 @@ LabelFocusWidget::LabelFocusWidget(TQWidget* tqparent, const char* name)

void LabelFocusWidget::focusInEvent(TQFocusEvent*)
{
Label* tqparent = (Label*)tqparentWidget();
Label* tqparent = (Label*)parentWidget();
tqparent->activated();

}

+ 1
- 1
kalarm/messagewin.cpp View File

@@ -125,7 +125,7 @@ class MWMimeSourceFactory : public TQMimeSourceFactory
// Basic flags for the window
static const TQt::WFlags WFLAGS = TQt::WStyle_StaysOnTop | TQt::WDestructiveClose;

// Error message bit tqmasks
// Error message bit masks
enum {
ErrMsg_Speak = 0x01,
ErrMsg_AudioFile = 0x02,

+ 6
- 6
kalarm/prefdlg.cpp View File

@@ -169,7 +169,7 @@ void KAlarmPrefDlg::slotApply()
TQString errmsg = mEmailPage->validate();
if (!errmsg.isEmpty())
{
showPage(pageIndex(mEmailPage->tqparentWidget()));
showPage(pageIndex(mEmailPage->parentWidget()));
if (KMessageBox::warningYesNo(this, errmsg) != KMessageBox::Yes)
{
mValid = false;
@@ -179,7 +179,7 @@ void KAlarmPrefDlg::slotApply()
errmsg = mEditPage->validate();
if (!errmsg.isEmpty())
{
showPage(pageIndex(mEditPage->tqparentWidget()));
showPage(pageIndex(mEditPage->parentWidget()));
KMessageBox::sorry(this, errmsg);
mValid = false;
return;
@@ -825,12 +825,12 @@ FontColourPrefTab::FontColourPrefTab(TQVBox* frame)
mFontChooser = new FontColourChooser(mPage, 0, false, TQStringList(), i18n("Message Font && Color"), true, false);
mPage->setStretchFactor(mFontChooser, 1);

TQFrame* tqlayoutBox = new TQFrame(mPage);
TQHBoxLayout* htqlayout = new TQHBoxLayout(tqlayoutBox);
TQFrame* layoutBox = new TQFrame(mPage);
TQHBoxLayout* htqlayout = new TQHBoxLayout(layoutBox);
TQVBoxLayout* colourLayout = new TQVBoxLayout(htqlayout, KDialog::spacingHint());
htqlayout->addStretch();

TQHBox* box = new TQHBox(tqlayoutBox); // to group widgets for TQWhatsThis text
TQHBox* box = new TQHBox(layoutBox); // to group widgets for TQWhatsThis text
box->setSpacing(KDialog::spacingHint()/2);
colourLayout->addWidget(box);
TQLabel* label1 = new TQLabel(i18n("Di&sabled alarm color:"), box);
@@ -840,7 +840,7 @@ FontColourPrefTab::FontColourPrefTab(TQVBox* frame)
TQWhatsThis::add(box,
i18n("Choose the text color in the alarm list for disabled alarms."));

box = new TQHBox(tqlayoutBox); // to group widgets for TQWhatsThis text
box = new TQHBox(layoutBox); // to group widgets for TQWhatsThis text
box->setSpacing(KDialog::spacingHint()/2);
colourLayout->addWidget(box);
TQLabel* label2 = new TQLabel(i18n("E&xpired alarm color:"), box);

+ 1
- 1
kalarm/traywindow.cpp View File

@@ -348,7 +348,7 @@ bool TrayWindow::inSystemTray() const
*/
void TrayTooltip::maybeTip(const TQPoint&)
{
TrayWindow* tqparent = (TrayWindow*)tqparentWidget();
TrayWindow* tqparent = (TrayWindow*)parentWidget();
TQString text;
if (Daemon::monitoringAlarms())
text = kapp->aboutData()->programName();

+ 1
- 1
kandy/src/cmdpropertiesdialog_base.ui View File

@@ -168,5 +168,5 @@
<slot>editParameterName(TQListViewItem *)</slot>
<slot access="protected">slotAccept()</slot>
</Q_SLOTS>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

+ 1
- 1
kandy/src/mobilegui_base.ui View File

@@ -579,5 +579,5 @@
<slot>toggleConnection()</slot>
<slot>deleteMobPhonebook()</slot>
</Q_SLOTS>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

+ 1
- 1
karm/csvexportdialog_base.ui View File

@@ -405,7 +405,7 @@
<Q_SLOTS>
<slot>enableExportButton()</slot>
</Q_SLOTS>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>kdateedit.h</includehint>
<includehint>kdateedit.h</includehint>

+ 6
- 6
karm/karm_part.cpp View File

@@ -21,17 +21,17 @@
#include <tqpopupmenu.h>
#include "mainwindow.h"

karmPart::karmPart( TQWidget *tqparentWidget, const char *widgetName,
karmPart::karmPart( TQWidget *parentWidget, const char *widgetName,
TQObject *tqparent, const char *name )
: DCOPObject ( "KarmDCOPIface" ), KParts::ReadWritePart(tqparent, name),
_accel ( new KAccel( tqparentWidget ) ),
_watcher ( new KAccelMenuWatch( _accel, TQT_TQOBJECT(tqparentWidget) ) )
_accel ( new KAccel( parentWidget ) ),
_watcher ( new KAccelMenuWatch( _accel, TQT_TQOBJECT(parentWidget) ) )
{
// we need an instance
setInstance( karmPartFactory::instance() );

// this should be your custom internal widget
_taskView = new TaskView( tqparentWidget, widgetName );
_taskView = new TaskView( parentWidget, widgetName );

// setup PreferenceDialog.
_preferences = Preferences::instance();
@@ -387,12 +387,12 @@ karmPartFactory::~karmPartFactory()
s_instance = 0L;
}

KParts::Part* karmPartFactory::createPartObject( TQWidget *tqparentWidget, const char *widgetName,
KParts::Part* karmPartFactory::createPartObject( TQWidget *parentWidget, const char *widgetName,
TQObject *tqparent, const char *name,
const char *classname, const TQStringList &args )
{
// Create an instance of our Part
karmPart* obj = new karmPart( tqparentWidget, widgetName, tqparent, name );
karmPart* obj = new karmPart( parentWidget, widgetName, tqparent, name );

// See if we are to be read-write or not
if (TQCString(classname) == "KParts::ReadOnlyPart")

+ 2
- 2
karm/karm_part.h View File

@@ -59,7 +59,7 @@ class karmPart : public KParts::ReadWritePart, virtual public KarmDCOPIface
friend class KarmTray;

public:
karmPart(TQWidget *tqparentWidget, const char *widgetName,
karmPart(TQWidget *parentWidget, const char *widgetName,
TQObject *tqparent, const char *name);
// DCOP
void quit();
@@ -126,7 +126,7 @@ class karmPartFactory : public KParts::Factory
public:
karmPartFactory();
virtual ~karmPartFactory();
virtual KParts::Part* createPartObject( TQWidget *tqparentWidget, const char *widgetName,
virtual KParts::Part* createPartObject( TQWidget *parentWidget, const char *widgetName,
TQObject *tqparent, const char *name,
const char *classname, const TQStringList &args );
static KInstance* instance();

+ 8
- 8
karm/karmstorage.cpp View File

@@ -102,7 +102,7 @@ TQString KarmStorage::load (TaskView* view, const Preferences* preferences, TQSt

// If file doesn't exist, create a blank one to avoid ResourceLocal load
// error. We make it user and group read/write, others read. This is
// tqmasked by the users umask. (See man creat)
// masked by the users umask. (See man creat)
if ( ! remoteResource( _icalfile ) )
{
int handle;
@@ -310,11 +310,11 @@ TQString KarmStorage::save(TaskView* taskview)
kdDebug(5970) << "entering KarmStorage::save" << endl;
TQString err=TQString();

TQPtrStack< KCal::Todo > tqparents;
TQPtrStack< KCal::Todo > parents;

for (Task* task=taskview->first_child(); task; task = task->nextSibling())
{
err=writeTaskAsTodo(task, 1, tqparents );
err=writeTaskAsTodo(task, 1, parents );
}

if ( !saveCalendar() )
@@ -337,7 +337,7 @@ TQString KarmStorage::save(TaskView* taskview)
}

TQString KarmStorage::writeTaskAsTodo(Task* task, const int level,
TQPtrStack< KCal::Todo >& tqparents )
TQPtrStack< KCal::Todo >& parents )
{
TQString err;
KCal::Todo* todo;
@@ -349,16 +349,16 @@ TQString KarmStorage::writeTaskAsTodo(Task* task, const int level,
return "Could not get todo from calendar";
}
task->asTodo(todo);
if ( !tqparents.isEmpty() ) todo->setRelatedTo( tqparents.top() );
tqparents.push( todo );
if ( !parents.isEmpty() ) todo->setRelatedTo( parents.top() );
parents.push( todo );

for ( Task* nextTask = task->firstChild(); nextTask;
nextTask = nextTask->nextSibling() )
{
err = writeTaskAsTodo(nextTask, level+1, tqparents );
err = writeTaskAsTodo(nextTask, level+1, parents );
}

tqparents.pop();
parents.pop();
return err;
}


+ 1
- 1
karm/karmstorage.h View File

@@ -308,7 +308,7 @@ class KarmStorage
bool parseLine(TQString line, long *time, TQString *name, int *level,
DesktopList* desktopList);
TQString writeTaskAsTodo
(Task* task, const int level, TQPtrStack< KCal::Todo >& tqparents);
(Task* task, const int level, TQPtrStack< KCal::Todo >& parents);
bool saveCalendar();

KCal::Event* baseEvent(const Task*);

+ 4
- 4
karm/plannerparser.cpp View File

@@ -67,13 +67,13 @@ test cases:
}
// at the moment, task is still the old task or the old father task (if an endElement occurred) or not existing (if the
// new task is a top-level-task). Make task the tqparenttask, if existing.
// new task is a top-level-task). Make task the parenttask, if existing.
DesktopList dl;
if (level++>0)
{
tqparentTask=task;
task = new Task(taskName, 0, 0, dl, tqparentTask);
task->setUid(_taskView->storage()->addTask(task, tqparentTask));
parentTask=task;
task = new Task(taskName, 0, 0, dl, parentTask);
task->setUid(_taskView->storage()->addTask(task, parentTask));
}
else
{

+ 1
- 1
karm/plannerparser.h View File

@@ -54,7 +54,7 @@ private:
bool withInTasks; // within <tasks> ?
TaskView *_taskView;
Task *task;
Task *tqparentTask;
Task *parentTask;
int level; // level=1: task is top-level-task
};


+ 8
- 8
kdgantt/KDGanttMinimizeSplitter.cpp View File

@@ -90,7 +90,7 @@ void KDGanttSplitterHandle::mouseMoveEvent( TQMouseEvent *e )
if ( _activeButton != 0)
return;

TQCOORD pos = s->pick(tqparentWidget()->mapFromGlobal(e->globalPos()))
TQCOORD pos = s->pick(parentWidget()->mapFromGlobal(e->globalPos()))
- mouseOffset;
if ( opaque() ) {
s->moveSplitter( pos, id() );
@@ -159,7 +159,7 @@ void KDGanttSplitterHandle::mouseReleaseEvent( TQMouseEvent *e )
}
else {
if ( !opaque() && e->button() == Qt::LeftButton ) {
TQCOORD pos = s->pick(tqparentWidget()->mapFromGlobal(e->globalPos()))
TQCOORD pos = s->pick(parentWidget()->mapFromGlobal(e->globalPos()))
- mouseOffset;
s->setRubberband( -1 );
s->moveSplitter( pos, id() );
@@ -241,8 +241,8 @@ void KDGanttSplitterHandle::paintEvent( TQPaintEvent * )
p.setBrush( tqcolorGroup().background() );
p.setPen( tqcolorGroup().foreground() );
p.drawRect( rect() );
tqparentWidget()->tqstyle().tqdrawPrimitive( TQStyle::PE_Panel, &p, rect(),
tqparentWidget()->tqcolorGroup());
parentWidget()->tqstyle().tqdrawPrimitive( TQStyle::PE_Panel, &p, rect(),
parentWidget()->tqcolorGroup());

int sw = 8; // Hardcoded, given I didn't use styles anymore, I didn't like to use their size

@@ -256,8 +256,8 @@ void KDGanttSplitterHandle::paintEvent( TQPaintEvent * )
for ( TQValueList<TQPointArray>::Iterator it = list.begin(); it != list.end(); ++it ) {
if ( index == _activeButton ) {
p.save();
p.translate( tqparentWidget()->tqstyle().tqpixelMetric( TQStyle::PM_ButtonShiftHorizontal ),
tqparentWidget()->tqstyle().tqpixelMetric( TQStyle::PM_ButtonShiftVertical ) );
p.translate( parentWidget()->tqstyle().tqpixelMetric( TQStyle::PM_ButtonShiftHorizontal ),
parentWidget()->tqstyle().tqpixelMetric( TQStyle::PM_ButtonShiftVertical ) );
p.tqdrawPolygon( *it, true );
p.restore();
}
@@ -962,7 +962,7 @@ void KDGanttMinimizeSplitter::recalc( bool update )
}
}
if ( empty ) {
if ( tqparentWidget() != 0 && tqparentWidget()->inherits("KDGanttMinimizeSplitter") ) {
if ( parentWidget() != 0 && parentWidget()->inherits("KDGanttMinimizeSplitter") ) {
// nested splitters; be nice
maxl = maxt = 0;
} else {
@@ -1341,7 +1341,7 @@ KDGanttMinimizeSplitter::Direction KDGanttMinimizeSplitter::minimizeDirection()
}

/*
This is a copy of qGeomCalc() in qtqlayoutengine.cpp which
This is a copy of qGeomCalc() in qlayoutengine.cpp which
unfortunately isn't exported.
*/
static inline int toFixed( int i ) { return i * 256; }

+ 2
- 2
kdgantt/KDGanttView.cpp View File

@@ -691,9 +691,9 @@ void KDGanttView::setShowListView( bool show )
if(listViewIsVisible == show) return;
listViewIsVisible = show;
if (listViewIsVisible)
myListView->tqparentWidget()->show();
myListView->parentWidget()->show();
else
myListView->tqparentWidget()->hide();
myListView->parentWidget()->hide();
}



+ 1
- 1
kdgantt/KDGanttViewEventItem.cpp View File

@@ -209,7 +209,7 @@ void KDGanttViewEventItem::hideMe()
void KDGanttViewEventItem::showItem(bool show, int coordY)
{
isVisibleInGanttView = show;
tqinvalidateHeight () ;
invalidateHeight () ;
if (!show) {
hideMe();
return;

+ 10
- 10
kdgantt/KDGanttViewItem.cpp View File

@@ -133,7 +133,7 @@
overlapping tqchildren, call \a setPriority() for the childs.

Blocking of user interaction to open item:
If you want to block users to open items used as tqparents of calendar items,
If you want to block users to open items used as parents of calendar items,
call \a KDGanttView::setCalendarMode( true );

Example 1, Color:
@@ -182,16 +182,16 @@ KDGanttViewItem::KDGanttViewItem( Type type, KDGanttView* view,
Constructs an empty Gantt item.

\param type the type of the item to insert
\param tqparentItem a tqparent item under which this one goes
\param parentItem a tqparent item under which this one goes
\param lvtext the text to show in the list view
\param name the name by which the item can be identified. If no name
is specified, a unique name will be generated
*/

KDGanttViewItem::KDGanttViewItem( Type type, KDGanttViewItem* tqparentItem,
KDGanttViewItem::KDGanttViewItem( Type type, KDGanttViewItem* parentItem,
const TQString& lvtext,
const TQString& name ) :
TQListViewItem(tqparentItem,lvtext)
TQListViewItem(parentItem,lvtext)
{
initColorAndShapes(type);
generateAndInsertName( name );
@@ -224,18 +224,18 @@ KDGanttViewItem::KDGanttViewItem( Type type, KDGanttView* view,
Constructs an empty Gantt item.

\param type the type of the item to insert
\param tqparentItem a tqparent item under which this one goes
\param parentItem a tqparent item under which this one goes
\param after another item at the same level behind which this one should go
\param lvtext the text to show in the list view
\param name the name by which the item can be identified. If no name
is specified, a unique name will be generated
*/

KDGanttViewItem::KDGanttViewItem( Type type, KDGanttViewItem* tqparentItem,
KDGanttViewItem::KDGanttViewItem( Type type, KDGanttViewItem* parentItem,
KDGanttViewItem* after,
const TQString& lvtext,
const TQString& name ) :
TQListViewItem( tqparentItem, after, lvtext )
TQListViewItem( parentItem, after, lvtext )
{
initColorAndShapes(type);
generateAndInsertName( name );
@@ -1547,13 +1547,13 @@ KDGanttViewItem::Shape KDGanttViewItem::stringToShape( const TQString& string )
Creates a DOM node that describes this item.

\param doc the DOM document to which the node belongs
\param tqparentElement the element into which to insert this node
\param parentElement the element into which to insert this node
*/
void KDGanttViewItem::createNode( TQDomDocument& doc,
TQDomElement& tqparentElement )
TQDomElement& parentElement )
{
TQDomElement itemElement = doc.createElement( "Item" );
tqparentElement.appendChild( itemElement );
parentElement.appendChild( itemElement );
itemElement.setAttribute( "Type", typeToString( type() ) );

KDGanttXML::createDateTimeNode( doc, itemElement, "StartTime", startTime() );

+ 1
- 1
kdgantt/KDGanttViewItem.h View File

@@ -174,7 +174,7 @@ public:
static KDGanttViewItem* tqfind( const TQString& name );

void createNode( TQDomDocument& doc,
TQDomElement& tqparentElement );
TQDomElement& parentElement );
static KDGanttViewItem* createFromDomElement( KDGanttView* view,
TQDomElement& element );
static KDGanttViewItem* createFromDomElement( KDGanttView* view,

+ 18
- 18
kdgantt/KDGanttViewSubwidgets.cpp View File

@@ -140,13 +140,13 @@ void KDTimeTableWidget::removeItemFromTasklinks( KDGanttViewItem* item)

void KDTimeTableWidget::expandItem( TQListViewItem * item)
{
item->tqinvalidateHeight () ;
item->invalidateHeight () ;
//tqApp->processEvents();
updateMyContent();
}
void KDTimeTableWidget::collapseItem( TQListViewItem * item)
{
item->tqinvalidateHeight () ;
item->invalidateHeight () ;
//tqApp->processEvents();
updateMyContent();
}
@@ -160,7 +160,7 @@ void KDTimeTableWidget::highlightItem( TQListViewItem * item )
highlightedItem = ( KDGanttViewItem*)item;
itemwashighlighted = highlightedItem->highlight();
highlightedItem->setHighlight(true);
item->tqinvalidateHeight () ;
item->invalidateHeight () ;
myGanttView->myListView->contentsY();
updateMyContent();
}
@@ -2517,19 +2517,19 @@ void KDTimeHeaderWidget::mouseMoveEvent ( TQMouseEvent * e )
val = 0;
}
}
if (endMouseDown > -x() +tqparentWidget()->width() ) {
if (endMouseDown > -x() +parentWidget()->width() ) {
val = myGanttView->myCanvasView->horizontalScrollBar()->value() +
myGanttView->myCanvasView->horizontalScrollBar()->lineStep();

}
repaintMe(-x(),tqparentWidget()->width());
repaintMe(-x(),parentWidget()->width());
if ( val > -1 ) {
if ( val > myGanttView->myCanvasView->horizontalScrollBar()->maxValue() ) {
val = myGanttView->myCanvasView->horizontalScrollBar()->maxValue();
}
myGanttView->myCanvasView->horizontalScrollBar()->setValue( val );
}
//qDebug("mousemove %d %d %d %d",endMouseDown, -x(),tqparentWidget()->width() , e->pos().y());
//qDebug("mousemove %d %d %d %d",endMouseDown, -x(),parentWidget()->width() , e->pos().y());
}
}

@@ -3091,62 +3091,62 @@ void KDListView::startDrag ()
}

KDCanvasText::KDCanvasText( KDTimeTableWidget* canvas,
void* tqparentItem,
void* parentItem,
int type ) :
TQCanvasText(canvas)
{
myParentType = type;
myParentItem = tqparentItem;
myParentItem = parentItem;
}


KDCanvasLine::KDCanvasLine( KDTimeTableWidget* canvas,
void* tqparentItem,
void* parentItem,
int type ) :
TQCanvasLine(canvas)
{
myParentType = type;
myParentItem = tqparentItem;
myParentItem = parentItem;
}


KDCanvasPolygonItem::KDCanvasPolygonItem( KDTimeTableWidget* canvas,
void* tqparentItem,
void* parentItem,
int type ) :
TQCanvasPolygonalItem( canvas )
{
myParentType = type;
myParentItem = tqparentItem;
myParentItem = parentItem;
}


KDCanvasPolygon::KDCanvasPolygon( KDTimeTableWidget* canvas,
void* tqparentItem,
void* parentItem,
int type ) :
TQCanvasPolygon( canvas )
{
myParentType = type;
myParentItem = tqparentItem;
myParentItem = parentItem;
}


KDCanvasEllipse::KDCanvasEllipse( KDTimeTableWidget* canvas,
void* tqparentItem,
void* parentItem,
int type ) :
TQCanvasEllipse( canvas )
{
myParentType = type;
myParentItem = tqparentItem;
myParentItem = parentItem;
}


KDCanvasRectangle::KDCanvasRectangle( KDTimeTableWidget* canvas,
void* tqparentItem,
void* parentItem,
int type ) :
TQCanvasRectangle( canvas )
{
myParentType = type;
myParentItem = tqparentItem;
myParentItem = parentItem;
}



+ 6
- 6
kdgantt/KDGanttViewSubwidgets.h View File

@@ -403,7 +403,7 @@ private slots:
class KDCanvasText : public TQCanvasText
{
public:
KDCanvasText( KDTimeTableWidget* canvas, void* tqparentItem, int type );
KDCanvasText( KDTimeTableWidget* canvas, void* parentItem, int type );
int myParentType;
void* myParentItem;
};
@@ -412,7 +412,7 @@ public:
class KDCanvasLine : public TQCanvasLine
{
public:
KDCanvasLine( KDTimeTableWidget* canvas, void* tqparentItem, int type );
KDCanvasLine( KDTimeTableWidget* canvas, void* parentItem, int type );
int myParentType;
void* myParentItem;
};
@@ -421,7 +421,7 @@ public:
class KDCanvasPolygonItem: public TQCanvasPolygonalItem
{
public:
KDCanvasPolygonItem( KDTimeTableWidget* canvas, void* tqparentItem,
KDCanvasPolygonItem( KDTimeTableWidget* canvas, void* parentItem,
int type );
int myParentType;
void* myParentItem;
@@ -431,7 +431,7 @@ public:
class KDCanvasPolygon: public TQCanvasPolygon
{
public:
KDCanvasPolygon( KDTimeTableWidget* canvas, void* tqparentItem, int type );
KDCanvasPolygon( KDTimeTableWidget* canvas, void* parentItem, int type );
int myParentType;
void* myParentItem;
};
@@ -440,7 +440,7 @@ public:
class KDCanvasEllipse: public TQCanvasEllipse
{
public:
KDCanvasEllipse( KDTimeTableWidget* canvas, void* tqparentItem, int type );
KDCanvasEllipse( KDTimeTableWidget* canvas, void* parentItem, int type );
int myParentType;
void* myParentItem;
};
@@ -449,7 +449,7 @@ public:
class KDCanvasRectangle: public TQCanvasRectangle
{
public:
KDCanvasRectangle( KDTimeTableWidget* canvas, void* tqparentItem, int type );
KDCanvasRectangle( KDTimeTableWidget* canvas, void* parentItem, int type );
int myParentType;
void* myParentItem;
};

+ 1
- 1
kdgantt/KDGanttViewSummaryItem.cpp View File

@@ -267,7 +267,7 @@ void KDGanttViewSummaryItem::hideMe()
void KDGanttViewSummaryItem::showItem( bool show, int coordY )
{
isVisibleInGanttView = show;
tqinvalidateHeight () ;