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/kdenetwork@1240522 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
v3.5.13-sru
tpearson 14 years ago
parent 1fff1cf075
commit d0be1721b4

@ -259,5 +259,5 @@
<tabstop>buttonOk</tabstop> <tabstop>buttonOk</tabstop>
<tabstop>buttonCancel</tabstop> <tabstop>buttonCancel</tabstop>
</tabstops> </tabstops>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
</UI> </UI>

@ -426,5 +426,5 @@
<tabstop>buttonOk</tabstop> <tabstop>buttonOk</tabstop>
<tabstop>buttonCancel</tabstop> <tabstop>buttonCancel</tabstop>
</tabstops> </tabstops>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
</UI> </UI>

@ -441,5 +441,5 @@
<slot returnType="int">getAccess()</slot> <slot returnType="int">getAccess()</slot>
<slot returnType="TQString">getGroupKind()</slot> <slot returnType="TQString">getGroupKind()</slot>
</Q_SLOTS> </Q_SLOTS>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
</UI> </UI>

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

@ -8408,7 +8408,7 @@ This is only available if the SSL libraries have been compiled on your system an
<slot>mapToGuestCombo_activated( int i )</slot> <slot>mapToGuestCombo_activated( int i )</slot>
<slot>updateSecurityLevelHelpLbl()</slot> <slot>updateSecurityLevelHelpLbl()</slot>
</Q_SLOTS> </Q_SLOTS>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
<includehints> <includehints>
<includehint>kurlrequester.h</includehint> <includehint>kurlrequester.h</includehint>
<includehint>klineedit.h</includehint> <includehint>klineedit.h</includehint>

@ -1196,7 +1196,7 @@
<slot>reject()</slot> <slot>reject()</slot>
<slot>printersChkToggled( bool )</slot> <slot>printersChkToggled( bool )</slot>
</Q_SLOTS> </Q_SLOTS>
<tqlayoutdefaults margin='11' spacing='6'/> <layoutdefaults margin='11' spacing='6'/>
<includehints> <includehints>
<includehint>kurlrequester.h</includehint> <includehint>kurlrequester.h</includehint>
<includehint>klineedit.h</includehint> <includehint>klineedit.h</includehint>

@ -539,5 +539,5 @@
<slot>changedSlot()</slot> <slot>changedSlot()</slot>
<slot>moreOptionsPressed()</slot> <slot>moreOptionsPressed()</slot>
</Q_SLOTS> </Q_SLOTS>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
</UI> </UI>

@ -3275,7 +3275,7 @@ Only change something if you know what you are doing.</string>
<slot>storeDosAttributesChk_toggled( bool b )</slot> <slot>storeDosAttributesChk_toggled( bool b )</slot>
<slot>buttonHelp_clicked()</slot> <slot>buttonHelp_clicked()</slot>
</Q_SLOTS> </Q_SLOTS>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
<includehints> <includehints>
<includehint>kurlrequester.h</includehint> <includehint>kurlrequester.h</includehint>
<includehint>klineedit.h</includehint> <includehint>klineedit.h</includehint>

@ -328,5 +328,5 @@
<slot access="private" returnType="bool">getBoolValue( const TQString &amp; str, const TQString &amp; name )</slot> <slot access="private" returnType="bool">getBoolValue( const TQString &amp; str, const TQString &amp; name )</slot>
<slot access="private" returnType="int">getIntValue( const TQString &amp; str, const TQString &amp; name )</slot> <slot access="private" returnType="int">getIntValue( const TQString &amp; str, const TQString &amp; name )</slot>
</Q_SLOTS> </Q_SLOTS>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
</UI> </UI>

@ -297,5 +297,5 @@
<slot specifier="non virtual" returnType="TQStringList">getSelectedUsers()</slot> <slot specifier="non virtual" returnType="TQStringList">getSelectedUsers()</slot>
<slot specifier="non virtual" returnType="int">getAccess()</slot> <slot specifier="non virtual" returnType="int">getAccess()</slot>
</Q_SLOTS> </Q_SLOTS>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
</UI> </UI>

@ -348,5 +348,5 @@
<slot>expertBtnClicked()</slot> <slot>expertBtnClicked()</slot>
<slot>changedSlot()</slot> <slot>changedSlot()</slot>
</Q_SLOTS> </Q_SLOTS>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
</UI> </UI>

@ -554,5 +554,5 @@ Map requests from uid/gid 0 to the anonymous uid/gid. Note that this does not ap
<Q_SLOTS> <Q_SLOTS>
<slot>setModified()</slot> <slot>setModified()</slot>
</Q_SLOTS> </Q_SLOTS>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
</UI> </UI>

@ -152,5 +152,5 @@ The first column shows the name or address of the host, the second column shows
<Q_SLOTS> <Q_SLOTS>
<slot>listView_selectionChanged()</slot> <slot>listView_selectionChanged()</slot>
</Q_SLOTS> </Q_SLOTS>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
</UI> </UI>

@ -474,5 +474,5 @@
<functions> <functions>
<function returnType="bool">hasChanged()</function> <function returnType="bool">hasChanged()</function>
</functions> </functions>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
</UI> </UI>

@ -477,7 +477,7 @@
<slot access="private">changedSlot()</slot> <slot access="private">changedSlot()</slot>
<slot>listView_selectionChanged()</slot> <slot>listView_selectionChanged()</slot>
</Q_SLOTS> </Q_SLOTS>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
<includehints> <includehints>
<includehint>krichtextlabel.h</includehint> <includehint>krichtextlabel.h</includehint>
<includehint>klistview.h</includehint> <includehint>klistview.h</includehint>

@ -196,5 +196,5 @@
<Q_SLOTS> <Q_SLOTS>
<slot>listBox_selectionChanged( TQListBoxItem * i )</slot> <slot>listBox_selectionChanged( TQListBoxItem * i )</slot>
</Q_SLOTS> </Q_SLOTS>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
</UI> </UI>

@ -641,11 +641,11 @@ OptionsDialog::OptionsDialog(TQWidget *tqparent, const char *name)
f_List->insertItem(new FontListItem(global->fontName(i), global->font(i))); f_List->insertItem(new FontListItem(global->fontName(i), global->font(i)));
//************ Layout *************************** //************ Layout ***************************
tqlayoutTab = addPage(i18n("Layout"),i18n("Customize Output Format"), BarIcon("text_left", KIcon::SizeMedium )); layoutTab = addPage(i18n("Layout"),i18n("Customize Output Format"), BarIcon("text_left", KIcon::SizeMedium ));
TQVBoxLayout *vbox = new TQVBoxLayout(tqlayoutTab, 0, spacingHint()); TQVBoxLayout *vbox = new TQVBoxLayout(layoutTab, 0, spacingHint());
TQButtonGroup *bGroup = new TQButtonGroup(i18n("Headings"),tqlayoutTab); TQButtonGroup *bGroup = new TQButtonGroup(i18n("Headings"),layoutTab);
TQVBoxLayout *bvbox = new TQVBoxLayout(bGroup,8,5); TQVBoxLayout *bvbox = new TQVBoxLayout(bGroup,8,5);
bvbox->addSpacing(fontMetrics().lineSpacing()-4); bvbox->addSpacing(fontMetrics().lineSpacing()-4);

@ -218,7 +218,7 @@ private:
*f_ntDefBtn, *f_ntDefBtn,
*f_ntChngBtn; *f_ntChngBtn;
TQFrame *tqlayoutTab; TQFrame *layoutTab;
TQRadioButton *w_layout[3]; TQRadioButton *w_layout[3];
TQFrame *otherTab; TQFrame *otherTab;

@ -109,8 +109,8 @@ BrowseData::BrowseData(const TQString &Nhtml, const TQString &NqueryText)
//********* DictHTMLPart ****************************************** //********* DictHTMLPart ******************************************
DictHTMLPart::DictHTMLPart(TQWidget *tqparentWidget, const char *widgetname) DictHTMLPart::DictHTMLPart(TQWidget *parentWidget, const char *widgetname)
: KHTMLPart(tqparentWidget,widgetname) : KHTMLPart(parentWidget,widgetname)
{} {}

@ -81,7 +81,7 @@ class DictHTMLPart : public KHTMLPart
public: public:
DictHTMLPart(TQWidget *tqparentWidget = 0, const char *widgetname = 0); DictHTMLPart(TQWidget *parentWidget = 0, const char *widgetname = 0);
~DictHTMLPart(); ~DictHTMLPart();
signals: signals:

@ -269,6 +269,6 @@
<Q_SLOTS> <Q_SLOTS>
<slot access="protected" specifier="pure virtual">slotChanged()</slot> <slot access="protected" specifier="pure virtual">slotChanged()</slot>
</Q_SLOTS> </Q_SLOTS>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
</UI> </UI>

@ -246,8 +246,8 @@
<slot access="protected" specifier="pure virtual">slotChanged()</slot> <slot access="protected" specifier="pure virtual">slotChanged()</slot>
<slot access="protected" specifier="pure virtual">disconnectToggled(bool b)</slot> <slot access="protected" specifier="pure virtual">disconnectToggled(bool b)</slot>
</Q_SLOTS> </Q_SLOTS>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
<includehints> <includehints>
<includehint>kdatetimewidget.h</includehint> <includehint>kdatetimewidget.h</includehint>
<includehint>kdatewidget.h</includehint> <includehint>kdatewidget.h</includehint>

@ -396,6 +396,6 @@
<slot access="protected" specifier="pure virtual">slotChanged()</slot> <slot access="protected" specifier="pure virtual">slotChanged()</slot>
<slot access="protected" specifier="pure virtual">comboActivated(int)</slot> <slot access="protected" specifier="pure virtual">comboActivated(int)</slot>
</Q_SLOTS> </Q_SLOTS>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
</UI> </UI>

@ -254,8 +254,8 @@
<slot>changeEntry()</slot> <slot>changeEntry()</slot>
</Q_SLOTS> </Q_SLOTS>
<pixmapfunction>BarIconSet</pixmapfunction> <pixmapfunction>BarIconSet</pixmapfunction>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
<includehints> <includehints>
<includehint>klineedit.h</includehint> <includehint>klineedit.h</includehint>
<includehint>kurlrequester.h</includehint> <includehint>kurlrequester.h</includehint>

@ -179,8 +179,8 @@
<Q_SLOTS> <Q_SLOTS>
<slot access="protected" specifier="pure virtual">slotChanged()</slot> <slot access="protected" specifier="pure virtual">slotChanged()</slot>
</Q_SLOTS> </Q_SLOTS>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
<includehints> <includehints>
<includehint>knuminput.h</includehint> <includehint>knuminput.h</includehint>
<includehint>knuminput.h</includehint> <includehint>knuminput.h</includehint>

@ -161,8 +161,8 @@
<Q_SLOTS> <Q_SLOTS>
<slot access="protected" specifier="pure virtual">slotChanged()</slot> <slot access="protected" specifier="pure virtual">slotChanged()</slot>
</Q_SLOTS> </Q_SLOTS>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
<includehints> <includehints>
<includehint>kfontrequester.h</includehint> <includehint>kfontrequester.h</includehint>
</includehints> </includehints>

@ -124,7 +124,7 @@ void DynamicTip::settqStatus( const TQString & _status )
void DynamicTip::maybeTip( const TQPoint & _pos ) void DynamicTip::maybeTip( const TQPoint & _pos )
{ {
TQRect r( tqparentWidget()->rect() ); TQRect r( parentWidget()->rect() );
tip( r, status ); tip( r, status );
} }

@ -421,10 +421,10 @@ void KNewsTickerConfig::slotModifyNewsSource()
void KNewsTickerConfig::slotModifyNewsSource(const NewsSourceBase::Data &nsd) void KNewsTickerConfig::slotModifyNewsSource(const NewsSourceBase::Data &nsd)
{ {
if (m_modifyItem->data().subject != nsd.subject) { if (m_modifyItem->data().subject != nsd.subject) {
TQListViewItem *tqparentItem = m_modifyItem->tqparentItem(); TQListViewItem *parentItem = m_modifyItem->parentItem();
tqparentItem->takeItem(m_modifyItem); parentItem->takeItem(m_modifyItem);
if (tqparentItem->childCount() == 0) if (parentItem->childCount() == 0)
delete tqparentItem; delete parentItem;
CategoryItem *catItem = 0L; CategoryItem *catItem = 0L;

@ -44,7 +44,7 @@ class NewsSourceItem : public TQCheckListItem
void setData(const NewsSourceBase::Data &); void setData(const NewsSourceBase::Data &);
void setIcon(const TQPixmap &); void setIcon(const TQPixmap &);
TQListViewItem *tqparentItem() { return TQCheckListItem::tqparent(); } TQListViewItem *parentItem() { return TQCheckListItem::tqparent(); }
private: private:
TQString m_icon; TQString m_icon;

@ -22,9 +22,9 @@
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="tqlayoutMargin" stdset="0"> <property name="layoutMargin" stdset="0">
</property> </property>
<property name="tqlayoutSpacing" stdset="0"> <property name="layoutSpacing" stdset="0">
</property> </property>
<vbox> <vbox>
<property name="name"> <property name="name">
@ -40,9 +40,9 @@
<property name="name"> <property name="name">
<cstring>tabScrollerPreferences</cstring> <cstring>tabScrollerPreferences</cstring>
</property> </property>
<property name="tqlayoutMargin" stdset="0"> <property name="layoutMargin" stdset="0">
</property> </property>
<property name="tqlayoutSpacing" stdset="0"> <property name="layoutSpacing" stdset="0">
</property> </property>
<widget class="TQWidget"> <widget class="TQWidget">
<property name="name"> <property name="name">
@ -68,9 +68,9 @@
<property name="title"> <property name="title">
<string>General</string> <string>General</string>
</property> </property>
<property name="tqlayoutMargin" stdset="0"> <property name="layoutMargin" stdset="0">
</property> </property>
<property name="tqlayoutSpacing" stdset="0"> <property name="layoutSpacing" stdset="0">
</property> </property>
<grid> <grid>
<property name="name"> <property name="name">
@ -1160,7 +1160,7 @@ Note that the filters are processed from the top to the bottom so that of two fi
<include location="global" impldecl="in declaration">klistview.h</include> <include location="global" impldecl="in declaration">klistview.h</include>
<include location="global" impldecl="in declaration">knuminput.h</include> <include location="global" impldecl="in declaration">knuminput.h</include>
</includes> </includes>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
<includehints> <includehints>
<includehint>knuminput.h</includehint> <includehint>knuminput.h</includehint>
<includehint>knuminput.h</includehint> <includehint>knuminput.h</includehint>

@ -14,9 +14,9 @@
<height>274</height> <height>274</height>
</rect> </rect>
</property> </property>
<property name="tqlayoutMargin" stdset="0"> <property name="layoutMargin" stdset="0">
</property> </property>
<property name="tqlayoutSpacing" stdset="0"> <property name="layoutSpacing" stdset="0">
</property> </property>
<grid> <grid>
<property name="name"> <property name="name">
@ -206,7 +206,7 @@
<include location="global" impldecl="in declaration">kurllabel.h</include> <include location="global" impldecl="in declaration">kurllabel.h</include>
<include location="global" impldecl="in declaration">kseparator.h</include> <include location="global" impldecl="in declaration">kseparator.h</include>
</includes> </includes>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
<includehints> <includehints>
<includehint>kurllabel.h</includehint> <includehint>kurllabel.h</includehint>
<includehint>kseparator.h</includehint> <includehint>kseparator.h</includehint>

@ -28,9 +28,9 @@
<property name="icon"> <property name="icon">
<pixmap>image0</pixmap> <pixmap>image0</pixmap>
</property> </property>
<property name="tqlayoutMargin" stdset="0"> <property name="layoutMargin" stdset="0">
</property> </property>
<property name="tqlayoutSpacing" stdset="0"> <property name="layoutSpacing" stdset="0">
</property> </property>
<grid> <grid>
<property name="name"> <property name="name">
@ -49,9 +49,9 @@
<property name="title"> <property name="title">
<string>News Source Properties</string> <string>News Source Properties</string>
</property> </property>
<property name="tqlayoutMargin" stdset="0"> <property name="layoutMargin" stdset="0">
</property> </property>
<property name="tqlayoutSpacing" stdset="0"> <property name="layoutSpacing" stdset="0">
</property> </property>
<grid> <grid>
<property name="name"> <property name="name">
@ -404,5 +404,5 @@
<slot access="protected">slotSourceFileChanged()</slot> <slot access="protected">slotSourceFileChanged()</slot>
<slot access="protected">slotSuggestClicked()</slot> <slot access="protected">slotSuggestClicked()</slot>
</Q_SLOTS> </Q_SLOTS>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
</UI> </UI>

@ -137,7 +137,7 @@
<tabstops> <tabstops>
<tabstop>protocolListView</tabstop> <tabstop>protocolListView</tabstop>
</tabstops> </tabstops>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
<includehints> <includehints>
<includehint>klistview.h</includehint> <includehint>klistview.h</includehint>
</includehints> </includehints>

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

@ -478,7 +478,7 @@
<tabstop>addGroupButton</tabstop> <tabstop>addGroupButton</tabstop>
<tabstop>protocolListView</tabstop> <tabstop>protocolListView</tabstop>
</tabstops> </tabstops>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
<includehints> <includehints>
<includehint>klistview.h</includehint> <includehint>klistview.h</includehint>
<includehint>kpushbutton.h</includehint> <includehint>kpushbutton.h</includehint>

File diff suppressed because one or more lines are too long

@ -700,7 +700,7 @@ Kopete::Contact *ChatMessagePart::contactFromNode( const DOM::Node &n ) const
void ChatMessagePart::slotRightClick( const TQString &, const TQPoint &point ) void ChatMessagePart::slotRightClick( const TQString &, const TQPoint &point )
{ {
// look through tqparents until we find an Element // look through parents until we find an Element
DOM::Node activeNode = nodeUnderMouse(); DOM::Node activeNode = nodeUnderMouse();
while ( !activeNode.isNull() && activeNode.nodeType() != DOM::Node::ELEMENT_NODE ) while ( !activeNode.isNull() && activeNode.nodeType() != DOM::Node::ELEMENT_NODE )
activeNode = activeNode.parentNode(); activeNode = activeNode.parentNode();

@ -108,10 +108,10 @@ void EmoticonSelector::emoticonClicked(const TQString &str)
// kdDebug(14000) << "selected emoticon '" << str << "'" << endl; // kdDebug(14000) << "selected emoticon '" << str << "'" << endl;
// KDE4/TQt TODO: use qobject_cast instead. // KDE4/TQt TODO: use qobject_cast instead.
emit ItemSelected ( str ); emit ItemSelected ( str );
if ( isVisible() && tqparentWidget() && if ( isVisible() && parentWidget() &&
tqparentWidget()->inherits(TQPOPUPMENU_OBJECT_NAME_STRING) ) parentWidget()->inherits(TQPOPUPMENU_OBJECT_NAME_STRING) )
{ {
tqparentWidget()->close(); parentWidget()->close();
} }
} }

@ -96,7 +96,7 @@ FakeAccount(Kopete::Protocol *tqparent, const TQString &accountID, const char *n
} }
bool createContact( const TQString &/*contactId*/, Kopete::MetaContact */*tqparentContact*/ ) bool createContact( const TQString &/*contactId*/, Kopete::MetaContact */*parentContact*/ )
{ {
return true; return true;
} }

@ -259,7 +259,7 @@ The priority is used to determine which contact to use when you click on a metac
<tabstop>mButtonEdit</tabstop> <tabstop>mButtonEdit</tabstop>
<tabstop>mButtonRemove</tabstop> <tabstop>mButtonRemove</tabstop>
</tabstops> </tabstops>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
<includehints> <includehints>
<includehint>klistview.h</includehint> <includehint>klistview.h</includehint>
<includehint>kpushbutton.h</includehint> <includehint>kpushbutton.h</includehint>

@ -131,8 +131,8 @@ public:
class KopeteStyleNewStuff : public KNewStuff class KopeteStyleNewStuff : public KNewStuff
{ {
public: public:
KopeteStyleNewStuff(const TQString &type, TQWidget *tqparentWidget = 0) KopeteStyleNewStuff(const TQString &type, TQWidget *parentWidget = 0)
: KNewStuff( type, tqparentWidget) : KNewStuff( type, parentWidget)
{} {}
bool createUploadFile(const TQString &) bool createUploadFile(const TQString &)
@ -149,29 +149,29 @@ public:
{ {
case ChatWindowStyleManager::StyleInstallOk: case ChatWindowStyleManager::StyleInstallOk:
{ {
KMessageBox::queuedMessageBox( this->tqparentWidget(), KMessageBox::Information, i18n("The Chat Window style was successfully installed."), i18n("Install successful") ); KMessageBox::queuedMessageBox( this->parentWidget(), KMessageBox::Information, i18n("The Chat Window style was successfully installed."), i18n("Install successful") );
return true; return true;
} }
case ChatWindowStyleManager::StyleCannotOpen: case ChatWindowStyleManager::StyleCannotOpen:
{ {
KMessageBox::queuedMessageBox( this->tqparentWidget(), KMessageBox::Error, i18n("The specified archive cannot be opened.\nMake sure that the archive is valid ZIP or TAR archive."), i18n("Cannot open archive") ); KMessageBox::queuedMessageBox( this->parentWidget(), KMessageBox::Error, i18n("The specified archive cannot be opened.\nMake sure that the archive is valid ZIP or TAR archive."), i18n("Cannot open archive") );
break; break;
} }
case ChatWindowStyleManager::StyleNoDirectoryValid: case ChatWindowStyleManager::StyleNoDirectoryValid:
{ {
KMessageBox::queuedMessageBox( this->tqparentWidget(), KMessageBox::Error, i18n("Could not find a suitable place to install the Chat Window style in user directory."), i18n("Cannot find styles directory") ); KMessageBox::queuedMessageBox( this->parentWidget(), KMessageBox::Error, i18n("Could not find a suitable place to install the Chat Window style in user directory."), i18n("Cannot find styles directory") );
break; break;
} }
case ChatWindowStyleManager::StyleNotValid: case ChatWindowStyleManager::StyleNotValid:
{ {
KMessageBox::queuedMessageBox( this->tqparentWidget(), KMessageBox::Error, i18n("The specified archive does not contain a valid Chat Window style."), i18n("Invalid Style") ); KMessageBox::queuedMessageBox( this->parentWidget(), KMessageBox::Error, i18n("The specified archive does not contain a valid Chat Window style."), i18n("Invalid Style") );
break; break;
} }
case ChatWindowStyleManager::StyleUnknow: case ChatWindowStyleManager::StyleUnknow:
default: default:
{ {
KMessageBox::queuedMessageBox( this->tqparentWidget(), KMessageBox::Error, i18n("An unknow error occurred while trying to install the Chat Window style."), i18n("Unknow error") ); KMessageBox::queuedMessageBox( this->parentWidget(), KMessageBox::Error, i18n("An unknow error occurred while trying to install the Chat Window style."), i18n("Unknow error") );
break; break;
} }
} }
@ -727,7 +727,7 @@ public:
FakeAccount(Kopete::Protocol *tqparent, const TQString &accountID, const char *name) : Kopete::Account(tqparent, accountID, name){} FakeAccount(Kopete::Protocol *tqparent, const TQString &accountID, const char *name) : Kopete::Account(tqparent, accountID, name){}
~FakeAccount() ~FakeAccount()
{} {}
bool createContact( const TQString &/*contactId*/, Kopete::MetaContact */*tqparentContact*/ ){return true;} bool createContact( const TQString &/*contactId*/, Kopete::MetaContact */*parentContact*/ ){return true;}
void connect( const Kopete::OnlineStatus& /*initialtqStatus*/){} void connect( const Kopete::OnlineStatus& /*initialtqStatus*/){}
void disconnect(){} void disconnect(){}
void setOnlineStatus( const Kopete::OnlineStatus& /*status*/ , const TQString &/*reason*/){} void setOnlineStatus( const Kopete::OnlineStatus& /*status*/ , const TQString &/*reason*/){}

@ -185,7 +185,7 @@
<tabstop>installButton</tabstop> <tabstop>installButton</tabstop>
<tabstop>deleteButton</tabstop> <tabstop>deleteButton</tabstop>
</tabstops> </tabstops>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
<includehints> <includehints>
<includehint>klistbox.h</includehint> <includehint>klistbox.h</includehint>
<includehint>kpushbutton.h</includehint> <includehint>kpushbutton.h</includehint>

@ -440,7 +440,7 @@
<tabstop>textColor</tabstop> <tabstop>textColor</tabstop>
<tabstop>linkColor</tabstop> <tabstop>linkColor</tabstop>
</tabstops> </tabstops>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
<includehints> <includehints>
<includehint>kcolorbutton.h</includehint> <includehint>kcolorbutton.h</includehint>
<includehint>kcolorbutton.h</includehint> <includehint>kcolorbutton.h</includehint>

@ -388,7 +388,7 @@
<slot>setDisabled(bool)</slot> <slot>setDisabled(bool)</slot>
</connection> </connection>
</connections> </connections>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
<includehints> <includehints>
<includehint>kurlrequester.h</includehint> <includehint>kurlrequester.h</includehint>
<includehint>klineedit.h</includehint> <includehint>klineedit.h</includehint>

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

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

@ -207,7 +207,7 @@
</widget> </widget>
<customwidgets> <customwidgets>
</customwidgets> </customwidgets>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
<includehints> <includehints>
<includehint>klistview.h</includehint> <includehint>klistview.h</includehint>
<includehint>klistview.h</includehint> <includehint>klistview.h</includehint>

@ -615,7 +615,7 @@
<slot>mHueSlider_sliderPressed()</slot> <slot>mHueSlider_sliderPressed()</slot>
<slot>mHueSlider_destroyed(QObject*)</slot> <slot>mHueSlider_destroyed(QObject*)</slot>
</Q_SLOTS> </Q_SLOTS>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
<includehints> <includehints>
<includehint>kcombobox.h</includehint> <includehint>kcombobox.h</includehint>
<includehint>kcombobox.h</includehint> <includehint>kcombobox.h</includehint>

@ -248,7 +248,7 @@
<cstring>mChatViewBufferSize</cstring> <cstring>mChatViewBufferSize</cstring>
</property> </property>
<property name="whatsThis" stdset="0"> <property name="whatsThis" stdset="0">
<string>Limit the maximum number of lines visible in a chat window to improve speed for complex tqlayouts.</string> <string>Limit the maximum number of lines visible in a chat window to improve speed for complex layouts.</string>
</property> </property>
</widget> </widget>
<spacer> <spacer>
@ -304,5 +304,5 @@
<tabstop>mMaxContactNameLength</tabstop> <tabstop>mMaxContactNameLength</tabstop>
<tabstop>mChatViewBufferSize</tabstop> <tabstop>mChatViewBufferSize</tabstop>
</tabstops> </tabstops>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
</UI> </UI>

@ -384,5 +384,5 @@
<tabstop>mTrayflashNotifySetCurrentDesktopToChatViewChk</tabstop> <tabstop>mTrayflashNotifySetCurrentDesktopToChatViewChk</tabstop>
<tabstop>mRaiseMsgWindowChk</tabstop> <tabstop>mRaiseMsgWindowChk</tabstop>
</tabstops> </tabstops>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
</UI> </UI>

@ -207,5 +207,5 @@
<tabstop>mUseQueueChk</tabstop> <tabstop>mUseQueueChk</tabstop>
<tabstop>mAutoConnect</tabstop> <tabstop>mAutoConnect</tabstop>
</tabstops> </tabstops>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
</UI> </UI>

@ -349,7 +349,7 @@
<tabstop>mAutoAwayTimeout</tabstop> <tabstop>mAutoAwayTimeout</tabstop>
<tabstop>mGoAvailable</tabstop> <tabstop>mGoAvailable</tabstop>
</tabstops> </tabstops>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
<includehints> <includehints>
<includehint>klineedit.h</includehint> <includehint>klineedit.h</includehint>
</includehints> </includehints>

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

@ -229,7 +229,7 @@
<tabstop>chkChatSS</tabstop> <tabstop>chkChatSS</tabstop>
<tabstop>chkSuppressCommon</tabstop> <tabstop>chkSuppressCommon</tabstop>
</tabstops> </tabstops>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
<includehints> <includehints>
<includehint>kurlrequester.h</includehint> <includehint>kurlrequester.h</includehint>
<includehint>klineedit.h</includehint> <includehint>klineedit.h</includehint>

@ -179,5 +179,5 @@
</vbox> </vbox>
</widget> </widget>
</widget> </widget>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
</UI> </UI>

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

@ -1116,14 +1116,14 @@ bool KopeteContactListView::acceptDrag(TQDropEvent *e) const
return false; return false;
if(source_groupLVI->group() == Kopete::Group::temporary) if(source_groupLVI->group() == Kopete::Group::temporary)
return false; return false;
if(source_groupLVI->group()->tqparentGroup() == dest_groupLVI->group() ) if(source_groupLVI->group()->parentGroup() == dest_groupLVI->group() )
return false; return false;
Kopete::Group *g=dest_groupLVI->group()->tqparentGroup(); Kopete::Group *g=dest_groupLVI->group()->parentGroup();
while(g && g != Kopete::Group::toplevel) while(g && g != Kopete::Group::toplevel)
{ {
if(g==source_groupLVI->group()) if(g==source_groupLVI->group())
return false; return false;
g=g->tqparentGroup(); g=g->parentGroup();
} }
return true; return true;
} }
@ -1131,7 +1131,7 @@ bool KopeteContactListView::acceptDrag(TQDropEvent *e) const
{ {
if(source_groupLVI->group() == Kopete::Group::temporary) if(source_groupLVI->group() == Kopete::Group::temporary)
return false; return false;
if(source_groupLVI->group()->tqparentGroup() == Kopete::Group::toplevel) if(source_groupLVI->group()->parentGroup() == Kopete::Group::toplevel)
return false; return false;
return true; return true;
}*/ }*/

@ -148,7 +148,7 @@
<tabstop>icnbOpen</tabstop> <tabstop>icnbOpen</tabstop>
<tabstop>icnbClosed</tabstop> <tabstop>icnbClosed</tabstop>
</tabstops> </tabstops>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
<includehints> <includehints>
<includehint>kicondialog.h</includehint> <includehint>kicondialog.h</includehint>
<includehint>kicondialog.h</includehint> <includehint>kicondialog.h</includehint>

@ -75,12 +75,12 @@ public:
/** /**
* tqparent when top-level * tqparent when top-level
*/ */
TQListView *tqparentView() const { return m_parentView; }; TQListView *parentView() const { return m_parentView; };
/** /**
* tqparent when not top-level * tqparent when not top-level
*/ */
KopeteGroupViewItem *tqparentGroup() const { return m_parentGroup; }; KopeteGroupViewItem *parentGroup() const { return m_parentGroup; };
/** /**
* call this when the item has been moved to a different group * call this when the item has been moved to a different group

@ -570,7 +570,7 @@
<header>addressbooklinkwidget.h</header> <header>addressbooklinkwidget.h</header>
</customwidget> </customwidget>
</customwidgets> </customwidgets>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
<includehints> <includehints>
<includehint>addressbooklinkwidget.h</includehint> <includehint>addressbooklinkwidget.h</includehint>
<includehint>klineedit.h</includehint> <includehint>klineedit.h</includehint>

@ -77,7 +77,7 @@
</widget> </widget>
</vbox> </vbox>
</widget> </widget>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
<customwidgets> <customwidgets>
<customwidget> <customwidget>
<class>Kopete::UI::AddressBookLinkWidget</class> <class>Kopete::UI::AddressBookLinkWidget</class>

@ -45,7 +45,7 @@ k_dcop:
const TQString &altFileName = TQString(), uint fileSize = 0);*/ const TQString &altFileName = TQString(), uint fileSize = 0);*/
// FIXME: Do we *need* this one? Sounds error prone to me, because // FIXME: Do we *need* this one? Sounds error prone to me, because
// nicknames can contain tqparentheses too. // nicknames can contain parentheses too.
// Better add a contacttqStatus( const TQString id ) I'd say - Martijn // Better add a contacttqStatus( const TQString id ) I'd say - Martijn
TQStringList contactstqStatus(); TQStringList contactstqStatus();

@ -284,7 +284,7 @@ void KNotification::raiseWidget(TQWidget *w)
} }
else else
{ {
TQWidget *pw=w->tqparentWidget(); TQWidget *pw=w->parentWidget();
raiseWidget(pw); raiseWidget(pw);
if( TQTabWidget *tab_widget=dynamic_cast<TQTabWidget*>(pw)) if( TQTabWidget *tab_widget=dynamic_cast<TQTabWidget*>(pw))

@ -278,42 +278,42 @@ Kopete::MetaContact* Account::addContact( const TQString &contactId, const TQStr
} }
else else
{ {
// should we here add the contact to the tqparentContact if any? // should we here add the contact to the parentContact if any?
kdDebug( 14010 ) << k_funcinfo << "Contact already exists" << endl; kdDebug( 14010 ) << k_funcinfo << "Contact already exists" << endl;
} }
return c->metaContact(); return c->metaContact();
} }
MetaContact *tqparentContact = new MetaContact(); MetaContact *parentContact = new MetaContact();
if(!displayName.isEmpty()) if(!displayName.isEmpty())
tqparentContact->setDisplayName( displayName ); parentContact->setDisplayName( displayName );
//Set it as a temporary contact if requested //Set it as a temporary contact if requested
if ( isTemporary ) if ( isTemporary )
tqparentContact->setTemporary( true ); parentContact->setTemporary( true );
else else
tqparentContact->addToGroup( group ); parentContact->addToGroup( group );
if ( c ) if ( c )
{ {
c->setMetaContact( tqparentContact ); c->setMetaContact( parentContact );
if ( mode == ChangeKABC ) if ( mode == ChangeKABC )
{ {
kdDebug( 14010 ) << k_funcinfo << " changing KABC" << endl; kdDebug( 14010 ) << k_funcinfo << " changing KABC" << endl;
KABCPersistence::self()->write( tqparentContact ); KABCPersistence::self()->write( parentContact );
} }
} }
else else
{ {
if ( !createContact( contactId, tqparentContact ) ) if ( !createContact( contactId, parentContact ) )
{ {
delete tqparentContact; delete parentContact;
return 0L; return 0L;
} }
} }
ContactList::self()->addMetaContact( tqparentContact ); ContactList::self()->addMetaContact( parentContact );
return tqparentContact; return parentContact;
} }
bool Account::addContact(const TQString &contactId , MetaContact *tqparent, AddMode mode ) bool Account::addContact(const TQString &contactId , MetaContact *tqparent, AddMode mode )
@ -341,7 +341,7 @@ bool Account::addContact(const TQString &contactId , MetaContact *tqparent, AddM
} }
else else
{ {
// should we here add the contact to the tqparentContact if any? // should we here add the contact to the parentContact if any?
kdDebug( 14010 ) << "Account::addContact: Contact already exists" << endl; kdDebug( 14010 ) << "Account::addContact: Contact already exists" << endl;
} }
return false; //(the contact is not in the correct metacontact, so false) return false; //(the contact is not in the correct metacontact, so false)

@ -364,16 +364,16 @@ protected:
* You shouldn't ever call this method yourself. To add contacts, use @ref addContact(). * You shouldn't ever call this method yourself. To add contacts, use @ref addContact().
* *
* This method is called by @ref addContact(). In this method, you should create the * This method is called by @ref addContact(). In this method, you should create the
* new custom @ref Contact, using @p tqparentContact as the tqparent. * new custom @ref Contact, using @p parentContact as the tqparent.
* *
* If the metacontact is not temporary and the protocol supports it, you can add the * If the metacontact is not temporary and the protocol supports it, you can add the
* contact to the server. * contact to the server.
* *
* @param contactId the ID of the contact to create * @param contactId the ID of the contact to create
* @param tqparentContact the metacontact to add this contact to * @param parentContact the metacontact to add this contact to
* @return @c true if creating the contact succeeded, @c false on failure. * @return @c true if creating the contact succeeded, @c false on failure.
*/ */
virtual bool createContact( const TQString &contactId, MetaContact *tqparentContact ) =0; virtual bool createContact( const TQString &contactId, MetaContact *parentContact ) =0;
/** /**

@ -346,7 +346,7 @@ public: //TODO I think all theses method should be moved to the decop interface.
* Return all meta contacts with their current status * Return all meta contacts with their current status
* *
* FIXME: Do we *need* this one? Sounds error prone to me, because * FIXME: Do we *need* this one? Sounds error prone to me, because
* nicknames can contain tqparentheses too. - Martijn * nicknames can contain parentheses too. - Martijn
*/ */
TQStringList contactStatuses() const; TQStringList contactStatuses() const;

@ -146,7 +146,7 @@ const TQMimeSource *MimeSourceFactory::data( const TQString &abs_name ) const
* To find a valid KOS, we ask Kopete's account manager to locate an existing * To find a valid KOS, we ask Kopete's account manager to locate an existing
* account. We'll use the myself() instance of that account to reference its * account. We'll use the myself() instance of that account to reference its
* current KOS object, which in turn has access to the global KOS icon cache. * current KOS object, which in turn has access to the global KOS icon cache.
* Note that if the cache has been tqinvalidated in the meantime, we'll just * Note that if the cache has been invalidated in the meantime, we'll just
* get an empty pixmap back. * get an empty pixmap back.
*/ */
Account *account = AccountManager::self()->accounts().getFirst(); Account *account = AccountManager::self()->accounts().getFirst();

@ -332,7 +332,7 @@ public:
* *
* You can access icons with this method that have previously been rendered * You can access icons with this method that have previously been rendered
* using mimeSourceFor(). Note that only a cache lookup will be done, so * using mimeSourceFor(). Note that only a cache lookup will be done, so
* if the cache has been tqinvalidated due to a change of icon sets between * if the cache has been invalidated due to a change of icon sets between
* requesting the key (thus rendering the icon) and trying to access the * requesting the key (thus rendering the icon) and trying to access the
* icon by key, an invalid pixmap will be returned. * icon by key, an invalid pixmap will be returned.
*/ */

@ -465,7 +465,7 @@ Plugin* PluginManager::plugin( const TQString &_pluginId ) const
{ {
// Hack for compatibility with Plugin::pluginId(), which returns // Hack for compatibility with Plugin::pluginId(), which returns
// classname() instead of the internal name. Changing that is not easy // classname() instead of the internal name. Changing that is not easy
// as it tqinvalidates the config file, the contact list, and most likely // as it invalidates the config file, the contact list, and most likely
// other code as well. // other code as well.
// For now, just transform FooProtocol to kopete_foo. // For now, just transform FooProtocol to kopete_foo.
// FIXME: In the future we'll need to change this nevertheless to unify // FIXME: In the future we'll need to change this nevertheless to unify

@ -8,7 +8,7 @@ TQDataStream & operator<< ( TQDataStream & s, const NetworktqStatus::Properties
s << (int)p.onDemandPolicy; s << (int)p.onDemandPolicy;
s << p.service; s << p.service;
s << ( p.internet ? 1 : 0 ); s << ( p.internet ? 1 : 0 );
s << p.nettqmasks; s << p.netmasks;
return s; return s;
} }
@ -26,7 +26,7 @@ TQDataStream & operator>> ( TQDataStream & s, NetworktqStatus::Properties &p )
p.internet = true; p.internet = true;
else else
p.internet = false; p.internet = false;
s >> p.nettqmasks; s >> p.netmasks;
kdDebug() << k_funcinfo << "enum converted status is: " << p.status << endl; kdDebug() << k_funcinfo << "enum converted status is: " << p.status << endl;
return s; return s;
} }

@ -19,8 +19,8 @@ namespace NetworktqStatus
TQCString service; TQCString service;
// indicate that the connection is to 'the internet' - similar to default gateway in routing // indicate that the connection is to 'the internet' - similar to default gateway in routing
bool internet; bool internet;
// list of nettqmasks that the network connects to - overridden by above internet // list of netmasks that the network connects to - overridden by above internet
TQStringList nettqmasks; TQStringList netmasks;
// for future expansion consider // for future expansion consider
// EnumChargingModel - FlatRate, TimeCharge, VolumeCharged // EnumChargingModel - FlatRate, TimeCharge, VolumeCharged
// EnumLinktqStatus - for WLANs - VPOOR, POOR, AVERAGE, GOOD, EXCELLENT // EnumLinktqStatus - for WLANs - VPOOR, POOR, AVERAGE, GOOD, EXCELLENT

@ -218,7 +218,7 @@ TQValueList<Emoticons::Token> Emoticons::tokenize( const TQString& message, uint
// Search for where it ends // Search for where it ends
if( htmlEnd == -1 ) if( htmlEnd == -1 )
{ {
// Aptqparently this HTML entity isn't ended, something is wrong, try skip the '&' // Apparently this HTML entity isn't ended, something is wrong, try skip the '&'
// and continue // and continue
kdDebug( 14000 ) << k_funcinfo << "Broken HTML entity, trying to recover." << endl; kdDebug( 14000 ) << k_funcinfo << "Broken HTML entity, trying to recover." << endl;
inHTMLEntity = false; inHTMLEntity = false;

@ -36,7 +36,7 @@ Account::~Account()
} }
bool Account::createContact( const TQString &contactId, Kopete::MetaContact *tqparentContact ) bool Account::createContact( const TQString &contactId, Kopete::MetaContact *parentContact )
{ {
return true; return true;
} }

@ -39,7 +39,7 @@ public:
Account(Kopete::Protocol *tqparent, const TQString &accountID, const char *name=0L); Account(Kopete::Protocol *tqparent, const TQString &accountID, const char *name=0L);
~Account(); ~Account();
// pure virtual functions implementation // pure virtual functions implementation
virtual bool createContact( const TQString &contactId, MetaContact *tqparentContact ); virtual bool createContact( const TQString &contactId, MetaContact *parentContact );
virtual void connect( const Kopete::OnlineStatus& initialtqStatus = OnlineStatus() ); virtual void connect( const Kopete::OnlineStatus& initialtqStatus = OnlineStatus() );
virtual void disconnect(); virtual void disconnect();
virtual void setOnlineStatus( const Kopete::OnlineStatus& status , const TQString &reason = TQString() ); virtual void setOnlineStatus( const Kopete::OnlineStatus& status , const TQString &reason = TQString() );

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

@ -165,8 +165,8 @@
<includes> <includes>
<include location="global" impldecl="in declaration">klistviewsearchline.h</include> <include location="global" impldecl="in declaration">klistviewsearchline.h</include>
</includes> </includes>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
<includehints> <includehints>
<includehint>kactivelabel.h</includehint> <includehint>kactivelabel.h</includehint>
<includehint>klistview.h</includehint> <includehint>klistview.h</includehint>

@ -248,7 +248,7 @@ Leave it empty if you want to see the contact nickname as display name.</string>
<header>addressbooklinkwidget.h</header> <header>addressbooklinkwidget.h</header>
</customwidget> </customwidget>
</customwidgets> </customwidgets>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
<includehints> <includehints>
<includehint>kpushbutton.h</includehint> <includehint>kpushbutton.h</includehint>
<includehint>klineedit.h</includehint> <includehint>klineedit.h</includehint>

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

@ -81,5 +81,5 @@
</spacer> </spacer>
</vbox> </vbox>
</widget> </widget>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
</UI> </UI>

@ -68,7 +68,7 @@ ToolTip::~ToolTip()
void ToolTip::maybeTip( const TQPoint &pos ) void ToolTip::maybeTip( const TQPoint &pos )
{ {
if( !tqparentWidget() || !m_listView ) if( !parentWidget() || !m_listView )
return; return;
if( Item *item = dynamic_cast<Item*>( m_listView->itemAt( pos ) ) ) if( Item *item = dynamic_cast<Item*>( m_listView->itemAt( pos ) ) )
@ -122,7 +122,7 @@ ListView::ListView( TQWidget *tqparent, const char *name )
// clear the appropriate flags from the viewport - qt docs say we have to tqmask // clear the appropriate flags from the viewport - qt docs say we have to tqmask
// these flags out of the TQListView to make weirdly painted list items work, but // these flags out of the TQListView to make weirdly painted list items work, but
// that doesn't do the job. tqmasking them out of the viewport does. // that doesn't do the job. masking them out of the viewport does.
// class MyWidget : public TQWidget { public: using TQWidget::clearWFlags; }; // class MyWidget : public TQWidget { public: using TQWidget::clearWFlags; };
// static_cast<MyWidget*>( viewport() )->clearWFlags( WStaticContents ); // static_cast<MyWidget*>( viewport() )->clearWFlags( WStaticContents );
// static_cast<MyWidget*>( viewport() )->setWFlags( WNoAutoErase ); // static_cast<MyWidget*>( viewport() )->setWFlags( WNoAutoErase );

@ -1227,17 +1227,17 @@ class Item::Private
{ {
public: public:
Private( Item *item ) Private( Item *item )
: tqlayoutAnimateTimer( theLayoutAnimateTimer(), item, TQT_SLOT( slotLayoutAnimateItems() ) ) : layoutAnimateTimer( theLayoutAnimateTimer(), item, TQT_SLOT( slotLayoutAnimateItems() ) )
, animateLayout( true ), opacity( 1.0 ) , animateLayout( true ), opacity( 1.0 )
, visibilityTimer( theVisibilityTimer(), item, TQT_SLOT( slotUpdateVisibility() ) ) , visibilityTimer( theVisibilityTimer(), item, TQT_SLOT( slotUpdateVisibility() ) )
, visibilityLevel( 0 ), visibilityTarget( false ), searchMatch( true ) , visibilityLevel( 0 ), visibilityTarget( false ), searchMatch( true )
{ {
} }
TQTimer tqlayoutTimer; TQTimer layoutTimer;
//TQTimer tqlayoutAnimateTimer; //TQTimer layoutAnimateTimer;
SharedTimerRef tqlayoutAnimateTimer; SharedTimerRef layoutAnimateTimer;
SharedTimer &theLayoutAnimateTimer() SharedTimer &theLayoutAnimateTimer()
{ {
static SharedTimer timer( 10 ); static SharedTimer timer( 10 );
@ -1245,8 +1245,8 @@ public:
} }
bool animateLayout; bool animateLayout;
int tqlayoutAnimateSteps; int layoutAnimateSteps;
static const int tqlayoutAnimateStepsTotal = 10; static const int layoutAnimateStepsTotal = 10;
float opacity; float opacity;
@ -1306,8 +1306,8 @@ void Item::setEffects( bool animation, bool fading, bool folding )
void Item::initLVI() void Item::initLVI()
{ {
connect( listView()->header(), TQT_SIGNAL( sizeChange( int, int, int ) ), TQT_SLOT( slotColumnResized() ) ); connect( listView()->header(), TQT_SIGNAL( sizeChange( int, int, int ) ), TQT_SLOT( slotColumnResized() ) );
connect( &d->tqlayoutTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotLayoutItems() ) ); connect( &d->layoutTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotLayoutItems() ) );
//connect( &d->tqlayoutAnimateTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotLayoutAnimateItems() ) ); //connect( &d->layoutAnimateTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotLayoutAnimateItems() ) );
//connect( &d->visibilityTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotUpdateVisibility() ) ); //connect( &d->visibilityTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotUpdateVisibility() ) );
setVisible( false ); setVisible( false );
setTargetVisibility( true ); setTargetVisibility( true );
@ -1323,13 +1323,13 @@ void Item::slotColumnResized()
void Item::scheduleLayout() void Item::scheduleLayout()
{ {
// perform a delayed tqlayout in order to speed it all up // perform a delayed tqlayout in order to speed it all up
if ( ! d->tqlayoutTimer.isActive() ) if ( ! d->layoutTimer.isActive() )
d->tqlayoutTimer.start( 30, true ); d->layoutTimer.start( 30, true );
} }
void Item::slotLayoutItems() void Item::slotLayoutItems()
{ {
d->tqlayoutTimer.stop(); d->layoutTimer.stop();
for ( uint n = 0; n < components(); ++n ) for ( uint n = 0; n < components(); ++n )
{ {
@ -1347,14 +1347,14 @@ void Item::slotLayoutItems()
if ( Private::animateChanges && d->animateLayout && !d->visibilityTimer.isActive() ) if ( Private::animateChanges && d->animateLayout && !d->visibilityTimer.isActive() )
{ {
d->tqlayoutAnimateTimer.start(); d->layoutAnimateTimer.start();
//if ( !d->tqlayoutAnimateTimer.isActive() ) //if ( !d->layoutAnimateTimer.isActive() )
// d->tqlayoutAnimateTimer.start( 10 ); // d->layoutAnimateTimer.start( 10 );
d->tqlayoutAnimateSteps = 0; d->layoutAnimateSteps = 0;
} }
else else
{ {
d->tqlayoutAnimateSteps = Private::tqlayoutAnimateStepsTotal; d->layoutAnimateSteps = Private::layoutAnimateStepsTotal;
d->animateLayout = true; d->animateLayout = true;
} }
slotLayoutAnimateItems(); slotLayoutAnimateItems();
@ -1362,11 +1362,11 @@ void Item::slotLayoutItems()
void Item::slotLayoutAnimateItems() void Item::slotLayoutAnimateItems()
{ {
if ( ++d->tqlayoutAnimateSteps >= Private::tqlayoutAnimateStepsTotal ) if ( ++d->layoutAnimateSteps >= Private::layoutAnimateStepsTotal )
d->tqlayoutAnimateTimer.stop(); d->layoutAnimateTimer.stop();
const int s = Private::tqlayoutAnimateStepsTotal; const int s = Private::layoutAnimateStepsTotal;
const int p = TQMIN( d->tqlayoutAnimateSteps, s ); const int p = TQMIN( d->layoutAnimateSteps, s );
updateAnimationPosition( p, s ); updateAnimationPosition( p, s );
setHeight(0); setHeight(0);
@ -1457,7 +1457,7 @@ void Item::slotUpdateVisibility()
void Item::tqrepaint() void Item::tqrepaint()
{ {
// if we're about to retqlayout, don't bother painting yet. // if we're about to retqlayout, don't bother painting yet.
if ( d->tqlayoutTimer.isActive() ) if ( d->layoutTimer.isActive() )
return; return;
listView()->repaintItem( this ); listView()->repaintItem( this );
} }

@ -105,5 +105,5 @@
<tabstop>m_password</tabstop> <tabstop>m_password</tabstop>
<tabstop>m_save_passwd</tabstop> <tabstop>m_save_passwd</tabstop>
</tabstops> </tabstops>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
</UI> </UI>

@ -91,7 +91,7 @@
<tabstops> <tabstops>
<tabstop>mRemembered</tabstop> <tabstop>mRemembered</tabstop>
</tabstops> </tabstops>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
<includehints> <includehints>
<includehint>kpassdlg.h</includehint> <includehint>kpassdlg.h</includehint>
</includehints> </includehints>

@ -97,8 +97,8 @@
<include location="local" impldecl="in declaration">kopetelistview.h</include> <include location="local" impldecl="in declaration">kopetelistview.h</include>
<include location="global" impldecl="in declaration">tqheader.h</include> <include location="global" impldecl="in declaration">tqheader.h</include>
</includes> </includes>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
<includehints> <includehints>
<includehint>kactivelabel.h</includehint> <includehint>kactivelabel.h</includehint>
<includehint>kopetelistviewsearchline.h</includehint> <includehint>kopetelistviewsearchline.h</includehint>

@ -100,5 +100,5 @@
</widget> </widget>
</vbox> </vbox>
</widget> </widget>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
</UI> </UI>

@ -182,7 +182,7 @@ Do not include the '/' in the command (if you do it will be stripped off anyway)
<tabstop>addButton</tabstop> <tabstop>addButton</tabstop>
<tabstop>kPushButton3</tabstop> <tabstop>kPushButton3</tabstop>
</tabstops> </tabstops>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
<includehints> <includehints>
<includehint>klineedit.h</includehint> <includehint>klineedit.h</includehint>
<includehint>klineedit.h</includehint> <includehint>klineedit.h</includehint>

@ -97,7 +97,7 @@
</widget> </widget>
<customwidgets> <customwidgets>
</customwidgets> </customwidgets>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
<includehints> <includehints>
<includehint>klistview.h</includehint> <includehint>klistview.h</includehint>
<includehint>kpushbutton.h</includehint> <includehint>kpushbutton.h</includehint>

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

@ -189,7 +189,7 @@
<slot>m_selectOwnKey_toggled(bool)</slot> <slot>m_selectOwnKey_toggled(bool)</slot>
<slot>m_selectOwnKey_stateChanged(int)</slot> <slot>m_selectOwnKey_stateChanged(int)</slot>
</Q_SLOTS> </Q_SLOTS>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
<includehints> <includehints>
<includehint>klineedit.h</includehint> <includehint>klineedit.h</includehint>
</includehints> </includehints>

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

@ -165,16 +165,16 @@ KDialogBase( Plain, i18n("Select Public Key"), Details | Ok | Cancel, Ok, tqpare
"box enables you to use any key, even if it has not be signed.")); "box enables you to use any key, even if it has not be signed."));
if (filemode) { if (filemode) {
TQWidget *tqparentBox=new TQWidget(boutonboxoptions); TQWidget *parentBox=new TQWidget(boutonboxoptions);
TQHBoxLayout *shredBox=new TQHBoxLayout(tqparentBox,0); TQHBoxLayout *shredBox=new TQHBoxLayout(parentBox,0);
//shredBox->setFrameStyle(TQFrame::NoFrame); //shredBox->setFrameStyle(TQFrame::NoFrame);
//shredBox->setMargin(0); //shredBox->setMargin(0);
CBshred=new TQCheckBox(i18n("Shred source file"),tqparentBox); CBshred=new TQCheckBox(i18n("Shred source file"),parentBox);
TQWhatsThis::add TQWhatsThis::add
(CBshred,i18n("<b>Shred source file</b>: permanently remove source file. No recovery will be possible")); (CBshred,i18n("<b>Shred source file</b>: permanently remove source file. No recovery will be possible"));
TQString shredWhatsThis = i18n( "<qt><b>Shred source file:</b><br /><p>Checking this option will shred (overwrite several times before erasing) the files you have encrypted. This way, it is almost impossible that the source file is recovered.</p><p><b>But you must be aware that this is not secure</b> on all file systems, and that parts of the file may have been saved in a temporary file or in the spooler of your printer if you previously opened it in an editor or tried to print it. Only works on files (not on folders).</p></qt>"); TQString shredWhatsThis = i18n( "<qt><b>Shred source file:</b><br /><p>Checking this option will shred (overwrite several times before erasing) the files you have encrypted. This way, it is almost impossible that the source file is recovered.</p><p><b>But you must be aware that this is not secure</b> on all file systems, and that parts of the file may have been saved in a temporary file or in the spooler of your printer if you previously opened it in an editor or tried to print it. Only works on files (not on folders).</p></qt>");
KActiveLabel *warn= new KActiveLabel( i18n("<a href=\"whatsthis:%1\">Read this before using shredding</a>").tqarg(shredWhatsThis),tqparentBox ); KActiveLabel *warn= new KActiveLabel( i18n("<a href=\"whatsthis:%1\">Read this before using shredding</a>").tqarg(shredWhatsThis),parentBox );
shredBox->addWidget(CBshred); shredBox->addWidget(CBshred);
shredBox->addWidget(warn); shredBox->addWidget(warn);
} }

@ -452,7 +452,7 @@
<tabstop>m_soundFN</tabstop> <tabstop>m_soundFN</tabstop>
<tabstop>m_raise</tabstop> <tabstop>m_raise</tabstop>
</tabstops> </tabstops>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
<includehints> <includehints>
<includehint>klistview.h</includehint> <includehint>klistview.h</includehint>
<includehint>klineedit.h</includehint> <includehint>klineedit.h</includehint>

@ -178,7 +178,7 @@
<tabstop>Number_Auto_chatwindow</tabstop> <tabstop>Number_Auto_chatwindow</tabstop>
<tabstop>History_color</tabstop> <tabstop>History_color</tabstop>
</tabstops> </tabstops>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
<includehints> <includehints>
<includehint>knuminput.h</includehint> <includehint>knuminput.h</includehint>
<includehint>kcolorbutton.h</includehint> <includehint>kcolorbutton.h</includehint>

@ -336,7 +336,7 @@
</widget> </widget>
<customwidgets> <customwidgets>
</customwidgets> </customwidgets>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
<includehints> <includehints>
<includehint>kprogress.h</includehint> <includehint>kprogress.h</includehint>
<includehint>klineedit.h</includehint> <includehint>klineedit.h</includehint>

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

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

@ -139,7 +139,7 @@ This is not the same as webcam chat you can find in the newer Windows Messenger
</widget> </widget>
<customwidgets> <customwidgets>
</customwidgets> </customwidgets>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
<includehints> <includehints>
<includehint>kcombobox.h</includehint> <includehint>kcombobox.h</includehint>
<includehint>klineedit.h</includehint> <includehint>klineedit.h</includehint>

@ -306,8 +306,8 @@ void NowListeningPlugin::slotAdvertCurrentMusic()
{ {
if( NowListeningConfig::self()->appendStatusAdvertising() ) if( NowListeningConfig::self()->appendStatusAdvertising() )
{ {
// Check for the now listening message in tqparenthesis, // Check for the now listening message in parenthesis,
// include the header to not override other messages in tqparenthesis. // include the header to not override other messages in parenthesis.
TQRegExp statusSong( TQString(" \\(%1.*\\)$").tqarg( NowListeningConfig::header()) ); TQRegExp statusSong( TQString(" \\(%1.*\\)$").tqarg( NowListeningConfig::header()) );
// HACK: Don't keep appending the now listened song. Replace it in the status message. // HACK: Don't keep appending the now listened song. Replace it in the status message.

@ -369,7 +369,7 @@ in place of your status message.</string>
<slot>setEnabled(bool)</slot> <slot>setEnabled(bool)</slot>
</connection> </connection>
</connections> </connections>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
<includehints> <includehints>
<includehint>klistbox.h</includehint> <includehint>klistbox.h</includehint>
</includehints> </includehints>

@ -275,7 +275,7 @@
<tabstop>useSmpppd</tabstop> <tabstop>useSmpppd</tabstop>
<tabstop>accountList</tabstop> <tabstop>accountList</tabstop>
</tabstops> </tabstops>
<tqlayoutdefaults spacing="0" margin="0"/> <layoutdefaults spacing="0" margin="0"/>
<includehints> <includehints>
<includehint>kpushbutton.h</includehint> <includehint>kpushbutton.h</includehint>
<includehint>smpppdlocationwidget.h</includehint> <includehint>smpppdlocationwidget.h</includehint>

@ -139,7 +139,7 @@
</widget> </widget>
<customwidgets> <customwidgets>
</customwidgets> </customwidgets>
<tqlayoutdefaults spacing="6" margin="0"/> <layoutdefaults spacing="6" margin="0"/>
<includehints> <includehints>
<includehint>klineedit.h</includehint> <includehint>klineedit.h</includehint>
<includehint>knuminput.h</includehint> <includehint>knuminput.h</includehint>

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

@ -224,7 +224,7 @@
<includes> <includes>
<include location="global" impldecl="in implementation">knuminput.h</include> <include location="global" impldecl="in implementation">knuminput.h</include>
</includes> </includes>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
<includehints> <includehints>
<includehint>klistbox.h</includehint> <includehint>klistbox.h</includehint>
</includehints> </includehints>

@ -187,5 +187,5 @@
</spacer> </spacer>
</grid> </grid>
</widget> </widget>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
</UI> </UI>

@ -357,7 +357,7 @@ images/winpopup_protocol.png</string>
<tabstop>showThisName</tabstop> <tabstop>showThisName</tabstop>
<tabstop>includeIMAddress</tabstop> <tabstop>includeIMAddress</tabstop>
</tabstops> </tabstops>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
<includehints> <includehints>
<includehint>kurlrequester.h</includehint> <includehint>kurlrequester.h</includehint>
<includehint>klineedit.h</includehint> <includehint>klineedit.h</includehint>

@ -375,12 +375,12 @@ GaduAccount::userlistChanged()
} }
bool bool
GaduAccount::createContact( const TQString& contactId, Kopete::MetaContact* tqparentContact ) GaduAccount::createContact( const TQString& contactId, Kopete::MetaContact* parentContact )
{ {
kdDebug(14100) << "createContact " << contactId << endl; kdDebug(14100) << "createContact " << contactId << endl;
uin_t uinNumber = contactId.toUInt(); uin_t uinNumber = contactId.toUInt();
GaduContact* newContact = new GaduContact( uinNumber, tqparentContact->displayName(),this, tqparentContact ); GaduContact* newContact = new GaduContact( uinNumber, parentContact->displayName(),this, parentContact );
newContact->setParentIdentity( accountId() ); newContact->setParentIdentity( accountId() );
addNotify( uinNumber ); addNotify( uinNumber );

@ -128,7 +128,7 @@ signals:
protected: protected:
//{ //{
bool createContact( const TQString& contactId, bool createContact( const TQString& contactId,
Kopete::MetaContact* tqparentContact ); Kopete::MetaContact* parentContact );
//} //}
private slots: private slots:

@ -74,13 +74,13 @@ GaduContact::GaduContact( uin_t uin, const TQString& name, Kopete::Account* acco
TQString TQString
GaduContact::identityId() const GaduContact::identityId() const
{ {
return tqparentIdentity_; return parentIdentity_;
} }
void void
GaduContact::setParentIdentity( const TQString& id) GaduContact::setParentIdentity( const TQString& id)
{ {
tqparentIdentity_ = id; parentIdentity_ = id;
} }
uin_t uin_t

@ -96,7 +96,7 @@ private:
Kopete::ChatSession* msgManager_; Kopete::ChatSession* msgManager_;
TQString description_; TQString description_;
TQString tqparentIdentity_; TQString parentIdentity_;
GaduAccount* account_; GaduAccount* account_;
KAction* actionSendMessage_; KAction* actionSendMessage_;

@ -353,7 +353,7 @@
</widget> </widget>
<customwidgets> <customwidgets>
</customwidgets> </customwidgets>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
<includehints> <includehints>
<includehint>krestrictedline.h</includehint> <includehint>krestrictedline.h</includehint>
</includehints> </includehints>

@ -190,5 +190,5 @@ Choosing Offline status will disconnect you, with given description.</string>
<tabstop>invisibleButton_</tabstop> <tabstop>invisibleButton_</tabstop>
<tabstop>offlineButton_</tabstop> <tabstop>offlineButton_</tabstop>
</tabstops> </tabstops>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
</UI> </UI>

@ -865,7 +865,7 @@ If you do not currently have an account, please click the button to create one.<
<tabstop>ipAddress</tabstop> <tabstop>ipAddress</tabstop>
<tabstop>dccPort</tabstop> <tabstop>dccPort</tabstop>
</tabstops> </tabstops>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
<includehints> <includehints>
<includehint>klineedit.h</includehint> <includehint>klineedit.h</includehint>
<includehint>krestrictedline.h</includehint> <includehint>krestrictedline.h</includehint>

@ -267,7 +267,7 @@
</widget> </widget>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>tqlayoutImageCenter</cstring> <cstring>layoutImageCenter</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -414,7 +414,7 @@
<tabstop>valuePasswordVerify</tabstop> <tabstop>valuePasswordVerify</tabstop>
<tabstop>valueVerificationSequence</tabstop> <tabstop>valueVerificationSequence</tabstop>
</tabstops> </tabstops>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
<includehints> <includehints>
<includehint>klineedit.h</includehint> <includehint>klineedit.h</includehint>
<includehint>klineedit.h</includehint> <includehint>klineedit.h</includehint>

@ -684,7 +684,7 @@
<tabstop>onlyOnline</tabstop> <tabstop>onlyOnline</tabstop>
<tabstop>listFound</tabstop> <tabstop>listFound</tabstop>
</tabstops> </tabstops>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
<includehints> <includehints>
<includehint>krestrictedline.h</includehint> <includehint>krestrictedline.h</includehint>
<includehint>klistview.h</includehint> <includehint>klistview.h</includehint>

@ -855,11 +855,11 @@ void GroupWiseAccount::receiveFolder( const FolderItem & folder )
kdDebug( GROUPWISE_DEBUG_GLOBAL ) << k_funcinfo kdDebug( GROUPWISE_DEBUG_GLOBAL ) << k_funcinfo
<< " objectId: " << folder.id << " objectId: " << folder.id
<< " sequence: " << folder.sequence << " sequence: " << folder.sequence
<< " tqparentId: " << folder.tqparentId << " parentId: " << folder.parentId
<< " displayName: " << folder.name << endl; << " displayName: " << folder.name << endl;
if ( folder.tqparentId != 0 ) if ( folder.parentId != 0 )
{ {
kdWarning( GROUPWISE_DEBUG_GLOBAL ) << " - received a nested folder. These were not supported in GroupWise or Kopete as of Sept 2004, aborting! (tqparentId = " << folder.tqparentId << ")" << endl; kdWarning( GROUPWISE_DEBUG_GLOBAL ) << " - received a nested folder. These were not supported in GroupWise or Kopete as of Sept 2004, aborting! (parentId = " << folder.parentId << ")" << endl;
return; return;
} }
@ -910,13 +910,13 @@ void GroupWiseAccount::receiveContact( const ContactItem & contact )
kdDebug( GROUPWISE_DEBUG_GLOBAL ) << k_funcinfo kdDebug( GROUPWISE_DEBUG_GLOBAL ) << k_funcinfo
<< " objectId: " << contact.id << " objectId: " << contact.id
<< ", sequence: " << contact.sequence << ", sequence: " << contact.sequence
<< ", tqparentId: " << contact.tqparentId << ", parentId: " << contact.parentId
<< ", dn: " << contact.dn << ", dn: " << contact.dn
<< ", displayName: " << contact.displayName << endl; << ", displayName: " << contact.displayName << endl;
//kdDebug( GROUPWISE_DEBUG_GLOBAL ) << "\n dotted notation is '" << protocol()->dnToDotted( contact.dn ) << "'\n" <<endl; //kdDebug( GROUPWISE_DEBUG_GLOBAL ) << "\n dotted notation is '" << protocol()->dnToDotted( contact.dn ) << "'\n" <<endl;
// add to new style contact list // add to new style contact list
GWContactInstance * gwInst = m_serverListModel->addContactInstance( contact.id, contact.tqparentId, contact.sequence, contact.displayName, contact.dn ); GWContactInstance * gwInst = m_serverListModel->addContactInstance( contact.id, contact.parentId, contact.sequence, contact.displayName, contact.dn );
Q_ASSERT( gwInst ); Q_ASSERT( gwInst );
GroupWiseContact * c = contactForDN( contact.dn ); GroupWiseContact * c = contactForDN( contact.dn );
@ -925,21 +925,21 @@ void GroupWiseAccount::receiveContact( const ContactItem & contact )
{ {
Kopete::MetaContact *metaContact = new Kopete::MetaContact(); Kopete::MetaContact *metaContact = new Kopete::MetaContact();
metaContact->setDisplayName( contact.displayName ); metaContact->setDisplayName( contact.displayName );
c = new GroupWiseContact( this, contact.dn, metaContact, contact.id, contact.tqparentId, contact.sequence ); c = new GroupWiseContact( this, contact.dn, metaContact, contact.id, contact.parentId, contact.sequence );
Kopete::ContactList::self()->addMetaContact( metaContact ); Kopete::ContactList::self()->addMetaContact( metaContact );
} }
// add the metacontact to the ContactItem's group, if not there aleady // add the metacontact to the ContactItem's group, if not there aleady
if ( contact.tqparentId == 0 ) if ( contact.parentId == 0 )
c->metaContact()->addToGroup( Kopete::Group::topLevel() ); c->metaContact()->addToGroup( Kopete::Group::topLevel() );
else else
{ {
// check the metacontact is in the group this listing-of-the-contact is in... // check the metacontact is in the group this listing-of-the-contact is in...
GWFolder * folder = m_serverListModel->findFolderById( contact.tqparentId ); GWFolder * folder = m_serverListModel->findFolderById( contact.parentId );
if ( !folder ) // inconsistent if ( !folder ) // inconsistent
{ {
kdDebug( GROUPWISE_DEBUG_GLOBAL ) << " - ERROR - contact's folder doesn't exist on server" << endl; kdDebug( GROUPWISE_DEBUG_GLOBAL ) << " - ERROR - contact's folder doesn't exist on server" << endl;
DeleteItemTask * dit = new DeleteItemTask( client()->rootTask() ); DeleteItemTask * dit = new DeleteItemTask( client()->rootTask() );
dit->item( contact.tqparentId, contact.id ); dit->item( contact.parentId, contact.id );
// TQObject::connect( dit, TQT_SIGNAL( gotContactDeleted( const ContactItem & ) ), TQT_SLOT( receiveContactDeleted( const ContactItem & ) ) ); // TQObject::connect( dit, TQT_SIGNAL( gotContactDeleted( const ContactItem & ) ), TQT_SLOT( receiveContactDeleted( const ContactItem & ) ) );
dit->go( true ); dit->go( true );
return; return;
@ -1092,7 +1092,7 @@ void GroupWiseAccount::sendMessage( const GroupWise::ConferenceGuid &guid, const
} }
} }
bool GroupWiseAccount::createContact( const TQString& contactId, Kopete::MetaContact* tqparentContact ) bool GroupWiseAccount::createContact( const TQString& contactId, Kopete::MetaContact* parentContact )
{ {
kdDebug ( GROUPWISE_DEBUG_GLOBAL ) << k_funcinfo << "contactId: " << contactId << endl; kdDebug ( GROUPWISE_DEBUG_GLOBAL ) << k_funcinfo << "contactId: " << contactId << endl;
@ -1101,7 +1101,7 @@ bool GroupWiseAccount::createContact( const TQString& contactId, Kopete::MetaCon
// Set object id to 0 if not found - they do not exist on the server // Set object id to 0 if not found - they do not exist on the server
bool topLevel = false; bool topLevel = false;
TQValueList< FolderItem > folders; TQValueList< FolderItem > folders;
Kopete::GroupList groupList = tqparentContact->groups(); Kopete::GroupList groupList = parentContact->groups();
for ( Kopete::Group *group = groupList.first(); group; group = groupList.next() ) for ( Kopete::Group *group = groupList.first(); group; group = groupList.next() )
{ {
if ( group->type() == Kopete::Group::TopLevel ) // no need to create it on the server if ( group->type() == Kopete::Group::TopLevel ) // no need to create it on the server
@ -1117,7 +1117,7 @@ bool GroupWiseAccount::createContact( const TQString& contactId, Kopete::MetaCon
{ {
kdDebug( GROUPWISE_DEBUG_GLOBAL ) << fld->displayName << endl; kdDebug( GROUPWISE_DEBUG_GLOBAL ) << fld->displayName << endl;
//FIXME - get rid of FolderItem & co //FIXME - get rid of FolderItem & co
fi.tqparentId = ::tqqt_cast<GWFolder*>( fld->tqparent() )->id; fi.parentId = ::tqqt_cast<GWFolder*>( fld->tqparent() )->id;
fi.id = fld->id; fi.id = fld->id;
fi.name = fld->displayName; fi.name = fld->displayName;
} }
@ -1125,7 +1125,7 @@ bool GroupWiseAccount::createContact( const TQString& contactId, Kopete::MetaCon
{ {
kdDebug( GROUPWISE_DEBUG_GLOBAL ) << "folder: " << group->displayName() << kdDebug( GROUPWISE_DEBUG_GLOBAL ) << "folder: " << group->displayName() <<
"not found in server list model." << endl; "not found in server list model." << endl;
fi.tqparentId = 0; fi.parentId = 0;
fi.id = 0; fi.id = 0;
fi.name = group->displayName(); fi.name = group->displayName();
} }
@ -1144,7 +1144,7 @@ bool GroupWiseAccount::createContact( const TQString& contactId, Kopete::MetaCon
// //
// Since ToMetaContact expects synchronous contact creation // Since ToMetaContact expects synchronous contact creation
// we have to create the contact optimistically. // we have to create the contact optimistically.
GroupWiseContact * gc = new GroupWiseContact( this, contactId, tqparentContact, 0, 0, 0 ); GroupWiseContact * gc = new GroupWiseContact( this, contactId, parentContact, 0, 0, 0 );
ContactDetails dt = client()->userDetailsManager()->details( contactId ); ContactDetails dt = client()->userDetailsManager()->details( contactId );
TQString displayAs; TQString displayAs;
if ( dt.fullName.isEmpty() ) if ( dt.fullName.isEmpty() )
@ -1164,7 +1164,7 @@ bool GroupWiseAccount::createContact( const TQString& contactId, Kopete::MetaCon
// get the contact's full name to use as the display name of the created contact // get the contact's full name to use as the display name of the created contact
CreateContactTask * cct = new CreateContactTask( client()->rootTask() ); CreateContactTask * cct = new CreateContactTask( client()->rootTask() );
cct->contactFromUserId( contactId, tqparentContact->displayName(), highestFreeSequence, folders, topLevel ); cct->contactFromUserId( contactId, parentContact->displayName(), highestFreeSequence, folders, topLevel );
TQObject::connect( cct, TQT_SIGNAL( finished() ), TQT_SLOT( receiveContactCreated() ) ); TQObject::connect( cct, TQT_SIGNAL( finished() ), TQT_SLOT( receiveContactCreated() ) );
cct->go( true ); cct->go( true );
return true; return true;
@ -1470,7 +1470,7 @@ void GroupWiseAccount::syncContact( GroupWiseContact * contact )
kdDebug( GROUPWISE_DEBUG_GLOBAL ) << " = CONTACT '" << contact->nickName() << "' IS IN " << contact->metaContact()->groups().count() << " MC GROUPS, AND HAS " << m_serverListModel->instancesWithDn( contact->dn() ).count() << " CONTACT LIST INSTANCES." << endl; kdDebug( GROUPWISE_DEBUG_GLOBAL ) << " = CONTACT '" << contact->nickName() << "' IS IN " << contact->metaContact()->groups().count() << " MC GROUPS, AND HAS " << m_serverListModel->instancesWithDn( contact->dn() ).count() << " CONTACT LIST INSTANCES." << endl;
kdDebug( GROUPWISE_DEBUG_GLOBAL ) << " = LOOKING FOR NOOP GROUP MEMBERSHIPS" << endl; kdDebug( GROUPWISE_DEBUG_GLOBAL ) << " = LOOKING FOR NOOP GROUP MEMBERSHIPS" << endl;
// 1) Seek matches between CLIs and MCGs and remove from the lists without taking any action. match on objectid, tqparentid // 1) Seek matches between CLIs and MCGs and remove from the lists without taking any action. match on objectid, parentid
// 2) Each remaining unmatched pair is a move, initiate and remove - need to take care to always use greatest unused sequence number - if we have to set the sequence number to the following sequence number within the folder, we may have a problem where after the first move, we have to wait for the state of the CLIs to be updated pending the completion of the first move - this would be difficult to cope with, because our current lists would be out of date, or we'd have to restart the sync - assuming the first move created a new matched CLI-MCG pair, we could do that with little cost. // 2) Each remaining unmatched pair is a move, initiate and remove - need to take care to always use greatest unused sequence number - if we have to set the sequence number to the following sequence number within the folder, we may have a problem where after the first move, we have to wait for the state of the CLIs to be updated pending the completion of the first move - this would be difficult to cope with, because our current lists would be out of date, or we'd have to restart the sync - assuming the first move created a new matched CLI-MCG pair, we could do that with little cost.
// 3) Any remaining entries in MCG list are adds, carry out // 3) Any remaining entries in MCG list are adds, carry out
// 4) Any remaining entries in CLI list are removes, carry out // 4) Any remaining entries in CLI list are removes, carry out
@ -1531,7 +1531,7 @@ void GroupWiseAccount::syncContact( GroupWiseContact * contact )
// create contactItem parameter // create contactItem parameter
ContactItem instance; ContactItem instance;
instance.id = ( *instIt )->id; instance.id = ( *instIt )->id;
instance.tqparentId = sourceFolder->id; instance.parentId = sourceFolder->id;
instance.sequence = ( *instIt )->sequence; instance.sequence = ( *instIt )->sequence;
instance.dn = ( *instIt )->dn; instance.dn = ( *instIt )->dn;
instance.displayName = contact->nickName(); instance.displayName = contact->nickName();
@ -1579,8 +1579,8 @@ void GroupWiseAccount::syncContact( GroupWiseContact * contact )
// does this group exist on the server? Create the contact appropriately // does this group exist on the server? Create the contact appropriately
if ( destinationFolder ) if ( destinationFolder )
{ {
int tqparentId = destinationFolder->id; int parentId = destinationFolder->id;
ccit->contactFromUserId( contact->dn(), contact->metaContact()->displayName(), tqparentId ); ccit->contactFromUserId( contact->dn(), contact->metaContact()->displayName(), parentId );
} }
else else
{ {
@ -1628,7 +1628,7 @@ void GroupWiseAccount::syncContact( GroupWiseContact * contact )
TQValueList< ContactItem > instancesToChange; TQValueList< ContactItem > instancesToChange;
ContactItem instance; ContactItem instance;
instance.id = (*it)->id; instance.id = (*it)->id;
instance.tqparentId = ::tqqt_cast<GWFolder *>( (*it)->tqparent() )->id; instance.parentId = ::tqqt_cast<GWFolder *>( (*it)->tqparent() )->id;
instance.sequence = (*it)->sequence; instance.sequence = (*it)->sequence;
instance.dn = contact->dn(); instance.dn = contact->dn();
instance.displayName = contact->nickName(); instance.displayName = contact->nickName();

@ -74,7 +74,7 @@ public:
* Creates a protocol specific Kopete::Contact subclass and adds it to the supplied * Creates a protocol specific Kopete::Contact subclass and adds it to the supplied
* Kopete::MetaContact * Kopete::MetaContact
*/ */
virtual bool createContact(const TQString& contactId, Kopete::MetaContact* tqparentContact); virtual bool createContact(const TQString& contactId, Kopete::MetaContact* parentContact);
/** /**
* Delete a contact on the server * Delete a contact on the server
*/ */

@ -109,5 +109,5 @@
</spacer> </spacer>
</vbox> </vbox>
</widget> </widget>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
</UI> </UI>

@ -48,8 +48,8 @@ using namespace GroupWise;
GroupWiseContact::GroupWiseContact( Kopete::Account* account, const TQString &dn, GroupWiseContact::GroupWiseContact( Kopete::Account* account, const TQString &dn,
Kopete::MetaContact *tqparent, Kopete::MetaContact *tqparent,
const int objectId, const int tqparentId, const int sequence ) const int objectId, const int parentId, const int sequence )
: Kopete::Contact( account, GroupWiseProtocol::dnToDotted( dn ), tqparent ), m_objectId( objectId ), m_parentId( tqparentId ), : Kopete::Contact( account, GroupWiseProtocol::dnToDotted( dn ), tqparent ), m_objectId( objectId ), m_parentId( parentId ),
m_sequence( sequence ), m_actionBlock( 0 ), m_archiving( false ), m_deleting( false ), m_messageReceivedOffline( false ) m_sequence( sequence ), m_actionBlock( 0 ), m_archiving( false ), m_deleting( false ), m_messageReceivedOffline( false )
{ {
if ( dn.tqfind( '=' ) != -1 ) if ( dn.tqfind( '=' ) != -1 )

@ -61,12 +61,12 @@ public:
* @param uniqueName The userId for this contact. May be a DN, in which case it will be converted to dotted format for the contactId and stored. * @param uniqueName The userId for this contact. May be a DN, in which case it will be converted to dotted format for the contactId and stored.
* @param tqparent The Kopete::MetaContact this contact is part of. * @param tqparent The Kopete::MetaContact this contact is part of.
* @param objectId The contact's numeric object ID. * @param objectId The contact's numeric object ID.
* @param tqparentId The ID of this contact's tqparent (folder). * @param parentId The ID of this contact's tqparent (folder).
* @param sequence This contact's sequence number (The position it appears in within its tqparent). * @param sequence This contact's sequence number (The position it appears in within its tqparent).
*/ */
GroupWiseContact( Kopete::Account* account, const TQString &uniqueName, GroupWiseContact( Kopete::Account* account, const TQString &uniqueName,
Kopete::MetaContact *tqparent, Kopete::MetaContact *tqparent,
const int objectId, const int tqparentId, const int sequence ); const int objectId, const int parentId, const int sequence );
~GroupWiseContact(); ~GroupWiseContact();
@ -132,11 +132,11 @@ public:
*/ */
void setDeleting( bool deleting ); void setDeleting( bool deleting );
/** /**
* Marks this contact as having sent a message whilst aptqparently offline * Marks this contact as having sent a message whilst apparently offline
*/ */
void setMessageReceivedOffline( bool on ); void setMessageReceivedOffline( bool on );
/** /**
* Has this contact sent a message whilst aptqparently offline? * Has this contact sent a message whilst apparently offline?
*/ */
bool messageReceivedOffline() const; bool messageReceivedOffline() const;

@ -94,7 +94,7 @@ Kopete::Contact *GroupWiseProtocol::deserializeContact(
TQString accountId = serializedData[ "accountId" ]; TQString accountId = serializedData[ "accountId" ];
TQString displayName = serializedData[ "displayName" ]; TQString displayName = serializedData[ "displayName" ];
int objectId = serializedData[ "objectId" ].toInt(); int objectId = serializedData[ "objectId" ].toInt();
int tqparentId = serializedData[ "tqparentId" ].toInt(); int parentId = serializedData[ "parentId" ].toInt();
int sequence = serializedData[ "sequenceNumber" ].toInt(); int sequence = serializedData[ "sequenceNumber" ].toInt();
TQDict<Kopete::Account> accounts = Kopete::AccountManager::self()->accounts( this ); TQDict<Kopete::Account> accounts = Kopete::AccountManager::self()->accounts( this );
@ -107,7 +107,7 @@ Kopete::Contact *GroupWiseProtocol::deserializeContact(
} }
// FIXME: creating a contact with a userId here // FIXME: creating a contact with a userId here
return new GroupWiseContact(account, dn, metaContact, objectId, tqparentId, sequence ); return new GroupWiseContact(account, dn, metaContact, objectId, parentId, sequence );
} }
AddContactPage * GroupWiseProtocol::createAddContactWidget( TQWidget *tqparent, Kopete::Account * account ) AddContactPage * GroupWiseProtocol::createAddContactWidget( TQWidget *tqparent, Kopete::Account * account )

@ -278,7 +278,7 @@ void CoreProtocol::fieldsToWire( Field::FieldList fields, int depth )
continue; continue;
// GAIM writes these tags to the secure socket separately - if we can't connect, check here // GAIM writes these tags to the secure socket separately - if we can't connect, check here
// NM Protocol 1 writes them in an aptqparently arbitrary order // NM Protocol 1 writes them in an apparently arbitrary order
// tag // tag
//dout.writeRawBytes( GW_URLVAR_TAG, sizeof( GW_URLVAR_TAG ) ); //dout.writeRawBytes( GW_URLVAR_TAG, sizeof( GW_URLVAR_TAG ) );
//dout << field->tag(); //dout << field->tag();

@ -109,7 +109,7 @@ class Transfer;
* ascii text, * ascii text,
* latin1 as hexadecimal, * latin1 as hexadecimal,
* escaped tqunicode code points (encoded/escaped as \uUNICODEVALUE?, with or without a space between the end of the tqunicode value and the ? ) * escaped tqunicode code points (encoded/escaped as \uUNICODEVALUE?, with or without a space between the end of the tqunicode value and the ? )
* Outgoing messages may contain rich text, and additionally the plain text encoded as UTF8, but this plain payload is aptqparently ignored by the server * Outgoing messages may contain rich text, and additionally the plain text encoded as UTF8, but this plain payload is apparently ignored by the server
* *
*/ */
class CoreProtocol : public TQObject class CoreProtocol : public TQObject

@ -123,14 +123,14 @@ namespace GroupWise
{ {
uint id; uint id;
uint sequence; uint sequence;
uint tqparentId; uint parentId;
TQString name; TQString name;
}; };
struct ContactItem struct ContactItem
{ {
uint id; uint id;
uint tqparentId; uint parentId;
uint sequence; uint sequence;
TQString dn; TQString dn;
TQString displayName; TQString displayName;

@ -22,7 +22,7 @@
#define GWFIELD_H #define GWFIELD_H
/* Field types */ /* Field types */
/* Comments: ^1 not used ^2 ignored ^3 aptqparently only used in _field_to_string for debug */ /* Comments: ^1 not used ^2 ignored ^3 apparently only used in _field_to_string for debug */
/* Otherwise: widely used */ /* Otherwise: widely used */
#define NMFIELD_TYPE_INVALID 0 #define NMFIELD_TYPE_INVALID 0
/* ^1 */ /* ^1 */

@ -31,9 +31,9 @@ CreateContactInstanceTask::~CreateContactInstanceTask()
{ {
} }
void CreateContactInstanceTask::contactFromUserId( const TQString & userId, const TQString & displayName, const int tqparentFolder ) void CreateContactInstanceTask::contactFromUserId( const TQString & userId, const TQString & displayName, const int parentFolder )
{ {
contact( new Field::SingleField( NM_A_SZ_USERID, 0, NMFIELD_TYPE_UTF8, userId ), displayName, tqparentFolder ); contact( new Field::SingleField( NM_A_SZ_USERID, 0, NMFIELD_TYPE_UTF8, userId ), displayName, parentFolder );
} }
void CreateContactInstanceTask::contactFromUserIdAndFolder( const TQString & userId, const TQString & displayName, const int folderSequence, const TQString & folderDisplayName ) void CreateContactInstanceTask::contactFromUserIdAndFolder( const TQString & userId, const TQString & displayName, const int folderSequence, const TQString & folderDisplayName )
@ -46,9 +46,9 @@ void CreateContactInstanceTask::contactFromUserIdAndFolder( const TQString & use
m_folderDisplayName = folderDisplayName; m_folderDisplayName = folderDisplayName;
} }
void CreateContactInstanceTask::contactFromDN( const TQString & dn, const TQString & displayName, const int tqparentFolder ) void CreateContactInstanceTask::contactFromDN( const TQString & dn, const TQString & displayName, const int parentFolder )
{ {
contact( new Field::SingleField( NM_A_SZ_DN, 0, NMFIELD_TYPE_UTF8, dn ), displayName, tqparentFolder ); contact( new Field::SingleField( NM_A_SZ_DN, 0, NMFIELD_TYPE_UTF8, dn ), displayName, parentFolder );
} }
void CreateContactInstanceTask::contactFromDNAndFolder( const TQString & dn, const TQString & displayName, const int folderSequence, const TQString & folderDisplayName ) void CreateContactInstanceTask::contactFromDNAndFolder( const TQString & dn, const TQString & displayName, const int folderSequence, const TQString & folderDisplayName )
@ -61,10 +61,10 @@ void CreateContactInstanceTask::contactFromDNAndFolder( const TQString & dn, con
m_folderDisplayName = folderDisplayName; m_folderDisplayName = folderDisplayName;
} }
void CreateContactInstanceTask::contact( Field::SingleField * id, const TQString & displayName, const int tqparentFolder ) void CreateContactInstanceTask::contact( Field::SingleField * id, const TQString & displayName, const int parentFolder )
{ {
Field::FieldList lst; Field::FieldList lst;
lst.append( new Field::SingleField( NM_A_SZ_PARENT_ID, 0, NMFIELD_TYPE_UTF8, TQString::number( tqparentFolder ) ) ); lst.append( new Field::SingleField( NM_A_SZ_PARENT_ID, 0, NMFIELD_TYPE_UTF8, TQString::number( parentFolder ) ) );
// this is either a user Id or a DN // this is either a user Id or a DN
lst.append( id ); lst.append( id );
if ( displayName.isEmpty() ) // fallback so that the contact is created if ( displayName.isEmpty() ) // fallback so that the contact is created

@ -38,13 +38,13 @@ public:
/** /**
* Sets up the request message. * Sets up the request message.
*/ */
void contactFromUserId( const TQString & userId, const TQString & displayName, const int tqparentFolder ); void contactFromUserId( const TQString & userId, const TQString & displayName, const int parentFolder );
void contactFromDN( const TQString & dn, const TQString & displayName, const int tqparentFolder ); void contactFromDN( const TQString & dn, const TQString & displayName, const int parentFolder );
void contactFromUserIdAndFolder( const TQString & userId, const TQString & displayName, const int folderSequence, const TQString & folderDisplayName ); void contactFromUserIdAndFolder( const TQString & userId, const TQString & displayName, const int folderSequence, const TQString & folderDisplayName );
void contactFromDNAndFolder( const TQString & dn, const TQString & displayName, const int folderSequence, const TQString & folderDisplayName ); void contactFromDNAndFolder( const TQString & dn, const TQString & displayName, const int folderSequence, const TQString & folderDisplayName );
void onGo(); void onGo();
protected: protected:
void contact( Field::SingleField * id, const TQString & displayName, const int tqparentFolder ); void contact( Field::SingleField * id, const TQString & displayName, const int parentFolder );
void onFolderCreated(); void onFolderCreated();
private: private:
TQString m_userId; TQString m_userId;

@ -113,7 +113,7 @@ void CreateContactTask::slotContactAdded( const ContactItem & addedContact )
return; return;
} }
client()->debug( TQString( "CreateContactTask::slotContactAdded() - Contact Instance %1 was created on the server, with objectId %2 in folder %3" ).tqarg client()->debug( TQString( "CreateContactTask::slotContactAdded() - Contact Instance %1 was created on the server, with objectId %2 in folder %3" ).tqarg
( addedContact.displayName ).tqarg( addedContact.id ).tqarg( addedContact.tqparentId ) ); ( addedContact.displayName ).tqarg( addedContact.id ).tqarg( addedContact.parentId ) );
if ( m_dn.isEmpty() ) if ( m_dn.isEmpty() )
m_dn = addedContact.dn; m_dn = addedContact.dn;
@ -123,7 +123,7 @@ void CreateContactTask::slotContactAdded( const ContactItem & addedContact )
m_folders.pop_back(); m_folders.pop_back();
// clear the topLevel flag once the corresponding server side entry has been successfully created // clear the topLevel flag once the corresponding server side entry has been successfully created
if ( addedContact.tqparentId == 0 ) if ( addedContact.parentId == 0 )
m_topLevel = false; m_topLevel = false;
if ( m_folders.isEmpty() && !m_topLevel ) if ( m_folders.isEmpty() && !m_topLevel )

@ -65,7 +65,7 @@ public:
* @param topLevel is the folder also in the top level folder? * @param topLevel is the folder also in the top level folder?
*/ */
void contactFromUserId( const TQString & userId, const TQString & displayName, const int firstSeqNo, const TQValueList< FolderItem > folders, bool topLevel ); void contactFromUserId( const TQString & userId, const TQString & displayName, const int firstSeqNo, const TQValueList< FolderItem > folders, bool topLevel );
//void contactFromDN( const TQString & dn, const TQString & displayName, const int tqparentFolder ); //void contactFromDN( const TQString & dn, const TQString & displayName, const int parentFolder );
/** /**
* This task doesn't do any I/O itself, so this take prints an error and returns false; * This task doesn't do any I/O itself, so this take prints an error and returns false;
*/ */

@ -29,10 +29,10 @@ CreateFolderTask::~CreateFolderTask()
{ {
} }
void CreateFolderTask::folder( const int tqparentId, const int sequence, const TQString & displayName ) void CreateFolderTask::folder( const int parentId, const int sequence, const TQString & displayName )
{ {
Field::FieldList lst; Field::FieldList lst;
lst.append( new Field::SingleField( NM_A_SZ_PARENT_ID, 0, NMFIELD_TYPE_UTF8, TQString::number( tqparentId ) ) ); lst.append( new Field::SingleField( NM_A_SZ_PARENT_ID, 0, NMFIELD_TYPE_UTF8, TQString::number( parentId ) ) );
lst.append( new Field::SingleField( NM_A_SZ_DISPLAY_NAME, 0, NMFIELD_TYPE_UTF8, displayName ) ); lst.append( new Field::SingleField( NM_A_SZ_DISPLAY_NAME, 0, NMFIELD_TYPE_UTF8, displayName ) );
lst.append( new Field::SingleField( NM_A_SZ_SEQUENCE_NUMBER, 0, NMFIELD_TYPE_UTF8, TQString::number( sequence ) ) ); lst.append( new Field::SingleField( NM_A_SZ_SEQUENCE_NUMBER, 0, NMFIELD_TYPE_UTF8, TQString::number( sequence ) ) );
createTransfer( "createfolder", lst ); createTransfer( "createfolder", lst );

@ -35,7 +35,7 @@ Q_OBJECT
public: public:
CreateFolderTask(Task* tqparent); CreateFolderTask(Task* tqparent);
~CreateFolderTask(); ~CreateFolderTask();
void folder( const int tqparentId, const int sequence, const TQString & displayName ); void folder( const int parentId, const int sequence, const TQString & displayName );
}; };
#endif #endif

@ -29,7 +29,7 @@ DeleteItemTask::~DeleteItemTask()
{ {
} }
void DeleteItemTask::item( const int tqparentFolder, const int objectId ) void DeleteItemTask::item( const int parentFolder, const int objectId )
{ {
if ( objectId == 0 ) if ( objectId == 0 )
{ {
@ -37,7 +37,7 @@ void DeleteItemTask::item( const int tqparentFolder, const int objectId )
return; return;
} }
Field::FieldList lst; Field::FieldList lst;
lst.append( new Field::SingleField( NM_A_SZ_PARENT_ID, 0, NMFIELD_TYPE_UTF8, TQString::number( tqparentFolder ) ) ); lst.append( new Field::SingleField( NM_A_SZ_PARENT_ID, 0, NMFIELD_TYPE_UTF8, TQString::number( parentFolder ) ) );
// this is either a user Id or a DN // this is either a user Id or a DN
lst.append( new Field::SingleField( NM_A_SZ_OBJECT_ID, 0, NMFIELD_TYPE_UTF8, TQString::number( objectId ) ) ); lst.append( new Field::SingleField( NM_A_SZ_OBJECT_ID, 0, NMFIELD_TYPE_UTF8, TQString::number( objectId ) ) );
createTransfer( "deletecontact", lst ); createTransfer( "deletecontact", lst );

@ -33,7 +33,7 @@ Q_OBJECT
public: public:
DeleteItemTask(Task* tqparent); DeleteItemTask(Task* tqparent);
~DeleteItemTask(); ~DeleteItemTask();
void item( const int tqparentFolder, const int objectId ); void item( const int parentFolder, const int objectId );
}; };
#endif #endif

@ -121,9 +121,9 @@ void LoginTask::extractFolder( Field::MultiField * folderContainer )
folder.name = current->value().toString(); folder.name = current->value().toString();
// tqparent // tqparent
current = fl.findSingleField( NM_A_SZ_PARENT_ID ); current = fl.findSingleField( NM_A_SZ_PARENT_ID );
folder.tqparentId = current->value().toInt(); folder.parentId = current->value().toInt();
client()->debug( TQString( "Got folder: %1, obj: %2, tqparent: %3, seq: %3." ).tqarg( folder.name ).tqarg( folder.id ).tqarg( folder.tqparentId ).tqarg( folder.sequence ) ); client()->debug( TQString( "Got folder: %1, obj: %2, tqparent: %3, seq: %3." ).tqarg( folder.name ).tqarg( folder.id ).tqarg( folder.parentId ).tqarg( folder.sequence ) );
// tell the world about it // tell the world about it
emit gotFolder( folder ); emit gotFolder( folder );
} }
@ -139,7 +139,7 @@ void LoginTask::extractContact( Field::MultiField * contactContainer )
current = fl.findSingleField( NM_A_SZ_OBJECT_ID ); current = fl.findSingleField( NM_A_SZ_OBJECT_ID );
contact.id = current->value().toInt(); contact.id = current->value().toInt();
current = fl.findSingleField( NM_A_SZ_PARENT_ID ); current = fl.findSingleField( NM_A_SZ_PARENT_ID );
contact.tqparentId = current->value().toInt(); contact.parentId = current->value().toInt();
current = fl.findSingleField( NM_A_SZ_SEQUENCE_NUMBER ); current = fl.findSingleField( NM_A_SZ_SEQUENCE_NUMBER );
contact.sequence = current->value().toInt(); contact.sequence = current->value().toInt();
current = fl.findSingleField( NM_A_SZ_DISPLAY_NAME ); current = fl.findSingleField( NM_A_SZ_DISPLAY_NAME );
@ -206,13 +206,13 @@ ContactDetails LoginTask::extractUserDetails( Field::FieldList & fields )
if ( propList ) if ( propList )
{ {
// Hello A Nagappan. GW gave us a multiple field where we previously got a single field // Hello A Nagappan. GW gave us a multiple field where we previously got a single field
TQString tqparentName = propList->tag(); TQString parentName = propList->tag();
Field::FieldList propFields = propList->fields(); Field::FieldList propFields = propList->fields();
const Field::FieldListIterator end = propFields.end(); const Field::FieldListIterator end = propFields.end();
for ( Field::FieldListIterator it = propFields.begin(); it != end; ++it ) for ( Field::FieldListIterator it = propFields.begin(); it != end; ++it )
{ {
propField = dynamic_cast<Field::SingleField *>( *it ); propField = dynamic_cast<Field::SingleField *>( *it );
if ( propField /*&& propField->tag() == tqparentName */) if ( propField /*&& propField->tag() == parentName */)
{ {
TQString propValue = propField->value().toString(); TQString propValue = propField->value().toString();
TQString contents = propMap[ propField->tag() ]; TQString contents = propMap[ propField->tag() ];

@ -92,7 +92,7 @@ void ModifyContactListTask::processContactChange( Field::MultiField * container
current = fl.findSingleField( NM_A_SZ_OBJECT_ID ); current = fl.findSingleField( NM_A_SZ_OBJECT_ID );
contact.id = current->value().toInt(); contact.id = current->value().toInt();
current = fl.findSingleField( NM_A_SZ_PARENT_ID ); current = fl.findSingleField( NM_A_SZ_PARENT_ID );
contact.tqparentId = current->value().toInt(); contact.parentId = current->value().toInt();
current = fl.findSingleField( NM_A_SZ_SEQUENCE_NUMBER ); current = fl.findSingleField( NM_A_SZ_SEQUENCE_NUMBER );
contact.sequence = current->value().toInt(); contact.sequence = current->value().toInt();
current = fl.findSingleField( NM_A_SZ_DISPLAY_NAME ); current = fl.findSingleField( NM_A_SZ_DISPLAY_NAME );
@ -127,7 +127,7 @@ void ModifyContactListTask::processFolderChange( Field::MultiField * container )
folder.name = current->value().toString(); folder.name = current->value().toString();
// tqparent // tqparent
current = fl.findSingleField( NM_A_SZ_PARENT_ID ); current = fl.findSingleField( NM_A_SZ_PARENT_ID );
folder.tqparentId = current->value().toInt(); folder.parentId = current->value().toInt();
if ( container->method() == NMFIELD_METHOD_ADD ) if ( container->method() == NMFIELD_METHOD_ADD )
emit gotFolderAdded( folder ); emit gotFolderAdded( folder );
else if ( container->method() == NMFIELD_METHOD_DELETE ) else if ( container->method() == NMFIELD_METHOD_DELETE )

@ -39,7 +39,7 @@ void MoveContactTask::moveContact( const ContactItem & contact, const int newPar
// TODO: - write a contact_item_to_fields method and factor duplicate code like this out // TODO: - write a contact_item_to_fields method and factor duplicate code like this out
Field::FieldList contactFields; Field::FieldList contactFields;
contactFields.append( new Field::SingleField( NM_A_SZ_OBJECT_ID, 0, NMFIELD_TYPE_UTF8, contact.id ) ); contactFields.append( new Field::SingleField( NM_A_SZ_OBJECT_ID, 0, NMFIELD_TYPE_UTF8, contact.id ) );
contactFields.append( new Field::SingleField( NM_A_SZ_PARENT_ID, 0, NMFIELD_TYPE_UTF8, contact.tqparentId ) ); contactFields.append( new Field::SingleField( NM_A_SZ_PARENT_ID, 0, NMFIELD_TYPE_UTF8, contact.parentId ) );
contactFields.append( new Field::SingleField( NM_A_SZ_SEQUENCE_NUMBER, 0, NMFIELD_TYPE_UTF8, contact.sequence ) ); contactFields.append( new Field::SingleField( NM_A_SZ_SEQUENCE_NUMBER, 0, NMFIELD_TYPE_UTF8, contact.sequence ) );
if ( !contact.dn.isNull() ) if ( !contact.dn.isNull() )
contactFields.append( new Field::SingleField( NM_A_SZ_DN, 0, NMFIELD_TYPE_UTF8, contact.dn ) ); contactFields.append( new Field::SingleField( NM_A_SZ_DN, 0, NMFIELD_TYPE_UTF8, contact.dn ) );

@ -155,7 +155,7 @@ GroupWise::ContactDetails PollSearchResultsTask::extractUserDetails( Field::Fiel
Field::MultiField * propList = dynamic_cast<Field::MultiField*>( *it ); Field::MultiField * propList = dynamic_cast<Field::MultiField*>( *it );
if ( propList ) if ( propList )
{ {
TQString tqparentName = propList->tag(); TQString parentName = propList->tag();
Field::FieldList propFields = propList->fields(); Field::FieldList propFields = propList->fields();
const Field::FieldListIterator end = propFields.end(); const Field::FieldListIterator end = propFields.end();
for ( Field::FieldListIterator it = propFields.begin(); it != end; ++it ) for ( Field::FieldListIterator it = propFields.begin(); it != end; ++it )

@ -48,7 +48,7 @@ void UpdateContactTask::renameContact( const TQString & newName, const TQValueLi
{ {
Field::FieldList contactFields; Field::FieldList contactFields;
contactFields.append( new Field::SingleField( NM_A_SZ_OBJECT_ID, 0, NMFIELD_TYPE_UTF8, (*it).id ) ); contactFields.append( new Field::SingleField( NM_A_SZ_OBJECT_ID, 0, NMFIELD_TYPE_UTF8, (*it).id ) );
contactFields.append( new Field::SingleField( NM_A_SZ_PARENT_ID, 0, NMFIELD_TYPE_UTF8, (*it).tqparentId ) ); contactFields.append( new Field::SingleField( NM_A_SZ_PARENT_ID, 0, NMFIELD_TYPE_UTF8, (*it).parentId ) );
contactFields.append( new Field::SingleField( NM_A_SZ_SEQUENCE_NUMBER, 0, NMFIELD_TYPE_UTF8, (*it).sequence ) ); contactFields.append( new Field::SingleField( NM_A_SZ_SEQUENCE_NUMBER, 0, NMFIELD_TYPE_UTF8, (*it).sequence ) );
if ( !(*it).dn.isNull() ) if ( !(*it).dn.isNull() )
contactFields.append( new Field::SingleField( NM_A_SZ_DN, 0, NMFIELD_TYPE_UTF8, (*it).dn ) ); contactFields.append( new Field::SingleField( NM_A_SZ_DN, 0, NMFIELD_TYPE_UTF8, (*it).dn ) );
@ -61,7 +61,7 @@ void UpdateContactTask::renameContact( const TQString & newName, const TQValueLi
{ {
Field::FieldList contactFields; Field::FieldList contactFields;
contactFields.append( new Field::SingleField( NM_A_SZ_OBJECT_ID, 0, NMFIELD_TYPE_UTF8, (*it).id ) ); contactFields.append( new Field::SingleField( NM_A_SZ_OBJECT_ID, 0, NMFIELD_TYPE_UTF8, (*it).id ) );
contactFields.append( new Field::SingleField( NM_A_SZ_PARENT_ID, 0, NMFIELD_TYPE_UTF8, (*it).tqparentId ) ); contactFields.append( new Field::SingleField( NM_A_SZ_PARENT_ID, 0, NMFIELD_TYPE_UTF8, (*it).parentId ) );
contactFields.append( new Field::SingleField( NM_A_SZ_SEQUENCE_NUMBER, 0, NMFIELD_TYPE_UTF8, (*it).sequence ) ); contactFields.append( new Field::SingleField( NM_A_SZ_SEQUENCE_NUMBER, 0, NMFIELD_TYPE_UTF8, (*it).sequence ) );
if ( !(*it).dn.isNull() ) if ( !(*it).dn.isNull() )
contactFields.append( new Field::SingleField( NM_A_SZ_DN, 0, NMFIELD_TYPE_UTF8, (*it).dn ) ); contactFields.append( new Field::SingleField( NM_A_SZ_DN, 0, NMFIELD_TYPE_UTF8, (*it).dn ) );

@ -316,5 +316,5 @@
<data format="PNG" length="866">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b0000032949444154388db59531681b6714c77f32373c8186ef0305eea005093258900eca26d30e3174a8a807d1c9ee940e5d4a276f09a414e22974ee609a4c75a0857a70a20c199ce93424e43414aee0c26910dc8105f7410df706413a7c915551db049a3e38b87bf7bedffddfc7ff7d578be398456c6c6cbce13d441cc7b5da02fcf4e8e99bde7a8f899b501515d959f64e10e71cd949c6e8d508e6cb7cb050fae49727444d87ed08a566dc0cea545a621b96725e62c522f312c4929ff9e7725e6203439282ec0bc72f74150c30c927d89690163f539619a044564973a1980ae54c01c136a1db518a0024808942780dead16a27e7e0ca55949a81668023b242fcd2901c394663072cd408ad75e18b6d43a7076143710aa1b9049ccd326e064a5979e8f0191cfc5878544368af1b24807caa4cfe507ef8aea0bf6dd8b92de7f00bc1562c95e64416e297f216aadcfa3ca43f10da1f8243112286871507fb05c3c7059d568bde96c5885b01af2d6e4a2db10dc8ff128e0fdd39f4cbaf8576dbe170702afcf6b86467bbce57df8680f0d3230767e0e62bdc55c5e53c476742fabbc318437f209886c3cd41d4b0f74049c78ef21476ef5846cf7ded2831848d55f0aa62816caade11adb7ed2fa0f71ce9d8619ac2e627824a45a72b00e413c5a95c0cf63e052bbe2014bfa738c3de3d251dfb0f8a80fda04e6480600113cc558a11a0e10b93a9225886cff04a8d10868662eab87f37271e59f2136f85a855bfda15f9594eb7a3b4ae0b933f95e161c5ceed88f254e97f2ad49b75eedf8562e2d8fb264355314da1dbada866abe47fedb106d01f78b71fec170c8f7276ef58da3de8f64a76bf6f634283730e9d2b9b8390ce0dae565c6a8e04b0710b746678f8a8e0e18382d173a1d7151c909fe4e84ccf57be3e76245b115143584ee73f27afc8e80b4c667e4c37b7054c8be1afde0de978a9c63485fea0457cec70aa089015ab9297e0938c240573cdb7651a4a7f20f43feb304a72aac2e73bd723da1fe5746ec0682bc26070f38c345905d7e238f6077c00dd8f85280211fcd91af84b02ef94a50c004502c1394813252f14575ca09839242f9484cb42df31e763edd237ff31d6c0ffa3fe17f0fb86c7715cfb1ba8bd86cc8d2decd30000000049454e44ae426082</data> <data format="PNG" length="866">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b0000032949444154388db59531681b6714c77f32373c8186ef0305eea005093258900eca26d30e3174a8a807d1c9ee940e5d4a276f09a414e22974ee609a4c75a0857a70a20c199ce93424e43414aee0c26910dc8105f7410df706413a7c915551db049a3e38b87bf7bedffddfc7ff7d578be398456c6c6cbce13d441cc7b5da02fcf4e8e99bde7a8f899b501515d959f64e10e71cd949c6e8d508e6cb7cb050fae49727444d87ed08a566dc0cea545a621b96725e62c522f312c4929ff9e7725e6203439282ec0bc72f74150c30c927d89690163f539619a044564973a1980ae54c01c136a1db518a0024808942780dead16a27e7e0ca55949a81668023b242fcd2901c394663072cd408ad75e18b6d43a7076143710aa1b9049ccd326e064a5979e8f0191cfc5878544368af1b24807caa4cfe507ef8aea0bf6dd8b92de7f00bc1562c95e64416e297f216aadcfa3ca43f10da1f8243112286871507fb05c3c7059d568bde96c5885b01af2d6e4a2db10dc8ff128e0fdd39f4cbaf8576dbe170702afcf6b86467bbce57df8680f0d3230767e0e62bdc55c5e53c476742fabbc318437f209886c3cd41d4b0f74049c78ef21476ef5846cf7ded2831848d55f0aa62816caade11adb7ed2fa0f71ce9d8619ac2e627824a45a72b00e413c5a95c0cf63e052bbe2014bfa738c3de3d251dfb0f8a80fda04e6480600113cc558a11a0e10b93a9225886cff04a8d10868662eab87f37271e59f2136f85a855bfda15f9594eb7a3b4ae0b933f95e161c5ceed88f254e97f2ad49b75eedf8562e2d8fb264355314da1dbada866abe47fedb106d01f78b71fec170c8f7276ef58da3de8f64a76bf6f634283730e9d2b9b8390ce0dae565c6a8e04b0710b746678f8a8e0e18382d173a1d7151c909fe4e84ccf57be3e76245b115143584ee73f27afc8e80b4c667e4c37b7054c8be1afde0de978a9c63485fea0457cec70aa089015ab9297e0938c240573cdb7651a4a7f20f43feb304a72aac2e73bd723da1fe5746ec0682bc26070f38c345905d7e238f6077c00dd8f85280211fcd91af84b02ef94a50c004502c1394813252f14575ca09839242f9484cb42df31e763edd237ff31d6c0ffa3fe17f0fb86c7715cfb1ba8bd86cc8d2decd30000000049454e44ae426082</data>
</image> </image>
</images> </images>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
</UI> </UI>

@ -73,7 +73,7 @@ GroupWiseAddContactPage::~GroupWiseAddContactPage()
// i18n( "There was an error while carrying out your search. Please change your search terms or try again later." ) // i18n( "There was an error while carrying out your search. Please change your search terms or try again later." )
} }
bool GroupWiseAddContactPage::apply( Kopete::Account* account, Kopete::MetaContact* tqparentContact ) bool GroupWiseAddContactPage::apply( Kopete::Account* account, Kopete::MetaContact* parentContact )
{ {
if ( validateData() ) if ( validateData() )
{ {
@ -91,7 +91,7 @@ bool GroupWiseAddContactPage::apply( Kopete::Account* account, Kopete::MetaConta
else else
return false; return false;
return ( account->addContact ( contactId, tqparentContact, Kopete::Account::ChangeKABC ) ); return ( account->addContact ( contactId, parentContact, Kopete::Account::ChangeKABC ) );
} }
else else
return false; return false;

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

@ -384,7 +384,7 @@
</widget> </widget>
</vbox> </vbox>
</widget> </widget>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
<includehints> <includehints>
<includehint>klistbox.h</includehint> <includehint>klistbox.h</includehint>
<includehint>kpushbutton.h</includehint> <includehint>kpushbutton.h</includehint>

@ -108,7 +108,7 @@
</widget> </widget>
</vbox> </vbox>
</widget> </widget>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
<includehints> <includehints>
<includehint>klistview.h</includehint> <includehint>klistview.h</includehint>
<includehint>kpushbutton.h</includehint> <includehint>kpushbutton.h</includehint>

@ -204,7 +204,7 @@
</widget> </widget>
</vbox> </vbox>
</widget> </widget>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
<includehints> <includehints>
<includehint>klistview.h</includehint> <includehint>klistview.h</includehint>
</includehints> </includehints>

@ -382,5 +382,5 @@
<tabstop>m_details</tabstop> <tabstop>m_details</tabstop>
<tabstop>m_firstNameOperation</tabstop> <tabstop>m_firstNameOperation</tabstop>
</tabstops> </tabstops>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
</UI> </UI>

@ -88,5 +88,5 @@
</widget> </widget>
</vbox> </vbox>
</widget> </widget>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
</UI> </UI>

@ -105,7 +105,7 @@
</widget> </widget>
</hbox> </hbox>
</widget> </widget>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
<includehints> <includehints>
<includehint>klistview.h</includehint> <includehint>klistview.h</includehint>
</includehints> </includehints>

@ -189,5 +189,5 @@
</widget> </widget>
</vbox> </vbox>
</widget> </widget>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
</UI> </UI>

@ -131,5 +131,5 @@
</widget> </widget>
</vbox> </vbox>
</widget> </widget>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
</UI> </UI>

@ -191,7 +191,7 @@ public slots:
void appendMessage( const TQString &message, MessageType type = Default ); void appendMessage( const TQString &message, MessageType type = Default );
protected: protected:
virtual bool createContact( const TQString &contactId, Kopete::MetaContact *tqparentContact ) ; virtual bool createContact( const TQString &contactId, Kopete::MetaContact *parentContact ) ;
private slots: private slots:
void engineStatusChanged(KIRC::Engine::tqStatus newtqStatus); void engineStatusChanged(KIRC::Engine::tqStatus newtqStatus);

@ -46,11 +46,11 @@ class ChannelListItem : public KListViewItem
virtual void paintCell( TQPainter *p, const TQColorGroup &cg, int column, int width, int align ); virtual void paintCell( TQPainter *p, const TQColorGroup &cg, int column, int width, int align );
private: private:
KListView *tqparentList; KListView *parentList;
}; };
ChannelListItem::ChannelListItem( KListView *tqparent, TQString arg1, TQString arg2, TQString arg3 ) : ChannelListItem::ChannelListItem( KListView *tqparent, TQString arg1, TQString arg2, TQString arg3 ) :
KListViewItem( tqparent, tqparent->lastItem() ), tqparentList( tqparent ) KListViewItem( tqparent, tqparent->lastItem() ), parentList( tqparent )
{ {
setText(0, arg1); setText(0, arg1);
setText(1, arg2); setText(1, arg2);

@ -159,5 +159,5 @@
<tabstop>addID</tabstop> <tabstop>addID</tabstop>
<tabstop>tabWidget3</tabstop> <tabstop>tabWidget3</tabstop>
</tabstops> </tabstops>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
</UI> </UI>

@ -1015,7 +1015,7 @@
<tabstop>commandEdit</tabstop> <tabstop>commandEdit</tabstop>
<tabstop>addButton</tabstop> <tabstop>addButton</tabstop>
</tabstops> </tabstops>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
<includehints> <includehints>
<includehint>klistview.h</includehint> <includehint>klistview.h</includehint>
</includehints> </includehints>

@ -378,5 +378,5 @@
<slot access="protected">accept()</slot> <slot access="protected">accept()</slot>
<slot access="protected">reject()</slot> <slot access="protected">reject()</slot>
</Q_SLOTS> </Q_SLOTS>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
</UI> </UI>

@ -1184,11 +1184,11 @@ void JabberAccount::slotContactAddedNotifyDialogClosed( const TQString & contact
if(dialog->added()) if(dialog->added())
{ {
Kopete::MetaContact *tqparentContact=dialog->addContact(); Kopete::MetaContact *parentContact=dialog->addContact();
if(tqparentContact) if(parentContact)
{ {
TQStringList groupNames; TQStringList groupNames;
Kopete::GroupList groupList = tqparentContact->groups(); Kopete::GroupList groupList = parentContact->groups();
for(Kopete::Group *group = groupList.first(); group; group = groupList.next()) for(Kopete::Group *group = groupList.first(); group; group = groupList.next())
groupNames += group->displayName(); groupNames += group->displayName();
@ -1196,7 +1196,7 @@ void JabberAccount::slotContactAddedNotifyDialogClosed( const TQString & contact
// XMPP::Jid jid ( contactId ); // XMPP::Jid jid ( contactId );
item.setJid ( jid ); item.setJid ( jid );
item.setName ( tqparentContact->displayName() ); item.setName ( parentContact->displayName() );
item.setGroups ( groupNames ); item.setGroups ( groupNames );
// add the new contact to our roster. // add the new contact to our roster.

@ -168,12 +168,12 @@ protected:
* method should have the "dirty" flag set. * method should have the "dirty" flag set.
* *
* This method should simply be used to intantiate the new contact, everything else * This method should simply be used to intantiate the new contact, everything else
* (updating the GUI, tqparenting to meta contact, etc.) is being taken care of. * (updating the GUI, parenting to meta contact, etc.) is being taken care of.
* *
* @param contactId The unique ID for this protocol * @param contactId The unique ID for this protocol
* @param tqparentContact The metacontact to add this contact to * @param parentContact The metacontact to add this contact to
*/ */
virtual bool createContact (const TQString & contactID, Kopete::MetaContact * tqparentContact); virtual bool createContact (const TQString & contactID, Kopete::MetaContact * parentContact);

@ -117,7 +117,7 @@ void JabberChatSession::slotUpdateDisplayName ()
if ( !mResource.isEmpty () ) if ( !mResource.isEmpty () )
jid.setResource ( mResource ); jid.setResource ( mResource );
TQString statusText = i18n("a contact's online status in tqparenthesis.", " (%1)") TQString statusText = i18n("a contact's online status in parenthesis.", " (%1)")
.tqarg( chatMembers.first()->onlinetqStatus().description() ); .tqarg( chatMembers.first()->onlinetqStatus().description() );
if ( jid.resource().isEmpty () ) if ( jid.resource().isEmpty () )
setDisplayName ( chatMembers.first()->metaContact()->displayName () + statusText ); setDisplayName ( chatMembers.first()->metaContact()->displayName () + statusText );

@ -1298,7 +1298,7 @@ void JabberContact::slotDiscoFinished( )
XMPP::RosterItem ri = rosterItem(); XMPP::RosterItem ri = rosterItem();
Kopete::MetaContact *mc=metaContact(); Kopete::MetaContact *mc=metaContact();
JabberAccount *tqparentAccount=account(); JabberAccount *parentAccount=account();
Kopete::OnlineStatus status=onlinetqStatus(); Kopete::OnlineStatus status=onlinetqStatus();
kdDebug(JABBER_DEBUG_GLOBAL) << k_funcinfo << ri.jid().full() << " is not a contact but a gateway - " << this << endl; kdDebug(JABBER_DEBUG_GLOBAL) << k_funcinfo << ri.jid().full() << " is not a contact but a gateway - " << this << endl;
@ -1315,7 +1315,7 @@ void JabberContact::slotDiscoFinished( )
Kopete::ContactList::self()->removeMetaContact( mc ); Kopete::ContactList::self()->removeMetaContact( mc );
//we need to create the transport when 'this' is already deleted, so transport->myself() will not conflict with it //we need to create the transport when 'this' is already deleted, so transport->myself() will not conflict with it
JabberTransport *transport = new JabberTransport( tqparentAccount , ri , tr_type ); JabberTransport *transport = new JabberTransport( parentAccount , ri , tr_type );
if(!Kopete::AccountManager::self()->registerAccount( transport )) if(!Kopete::AccountManager::self()->registerAccount( transport ))
return; return;
transport->myself()->setOnlineStatus( status ); //push back the online status transport->myself()->setOnlineStatus( status ); //push back the online status

@ -38,11 +38,11 @@
#include "xmpp_tasks.h" #include "xmpp_tasks.h"
JabberTransport::JabberTransport (JabberAccount * tqparentAccount, const XMPP::RosterItem & item, const TQString& gateway_type) JabberTransport::JabberTransport (JabberAccount * parentAccount, const XMPP::RosterItem & item, const TQString& gateway_type)
: Kopete::Account ( tqparentAccount->protocol(), tqparentAccount->accountId()+"/"+ item.jid().bare() ) : Kopete::Account ( parentAccount->protocol(), parentAccount->accountId()+"/"+ item.jid().bare() )
{ {
m_status=Creating; m_status=Creating;
m_account = tqparentAccount; m_account = parentAccount;
m_account->addTransport( this,item.jid().bare() ); m_account->addTransport( this,item.jid().bare() );
JabberContact *myContact = m_account->contactPool()->addContact ( item , Kopete::ContactList::self()->myself(), false ); JabberContact *myContact = m_account->contactPool()->addContact ( item , Kopete::ContactList::self()->myself(), false );
@ -88,11 +88,11 @@ JabberTransport::JabberTransport (JabberAccount * tqparentAccount, const XMPP::R
m_status=Normal; m_status=Normal;
} }
JabberTransport::JabberTransport( JabberAccount * tqparentAccount, const TQString & _accountId ) JabberTransport::JabberTransport( JabberAccount * parentAccount, const TQString & _accountId )
: Kopete::Account ( tqparentAccount->protocol(), _accountId ) : Kopete::Account ( parentAccount->protocol(), _accountId )
{ {
m_status=Creating; m_status=Creating;
m_account = tqparentAccount; m_account = parentAccount;
const TQString contactJID_s = configGroup()->readEntry("GatewayJID"); const TQString contactJID_s = configGroup()->readEntry("GatewayJID");

@ -45,18 +45,18 @@ class JabberTransport : public Kopete::Account
public: public:
/** /**
* constructor called when the transport is created by info from server (i.e not when loading kopete) * constructor called when the transport is created by info from server (i.e not when loading kopete)
* @param tqparentAccount is the tqparent jabber account. * @param parentAccount is the tqparent jabber account.
* @param item is the roster item of the gateway * @param item is the roster item of the gateway
* @param gateway_type eg: "msn" or "icq" only used when the account is not loaded from config file for determining the icon * @param gateway_type eg: "msn" or "icq" only used when the account is not loaded from config file for determining the icon
*/ */
JabberTransport (JabberAccount * tqparentAccount, const XMPP::RosterItem &item, const TQString& gateway_type=TQString()); JabberTransport (JabberAccount * parentAccount, const XMPP::RosterItem &item, const TQString& gateway_type=TQString());
/** /**
* constructor called when the transport is loaded from config * constructor called when the transport is loaded from config
* @param tqparentAccount is the tqparent jabber account. * @param parentAccount is the tqparent jabber account.
* @param accountId is the accountId * @param accountId is the accountId
*/ */
JabberTransport (JabberAccount * tqparentAccount, const TQString &accountId ); JabberTransport (JabberAccount * parentAccount, const TQString &accountId );
~JabberTransport (); ~JabberTransport ();
@ -123,12 +123,12 @@ protected:
* method should have the "dirty" flag set. * method should have the "dirty" flag set.
* *
* This method should simply be used to intantiate the new contact, everything else * This method should simply be used to intantiate the new contact, everything else
* (updating the GUI, tqparenting to meta contact, etc.) is being taken care of. * (updating the GUI, parenting to meta contact, etc.) is being taken care of.
* *
* @param contactId The unique ID for this protocol * @param contactId The unique ID for this protocol
* @param tqparentContact The metacontact to add this contact to * @param parentContact The metacontact to add this contact to
*/ */
virtual bool createContact (const TQString & contactID, Kopete::MetaContact * tqparentContact); virtual bool createContact (const TQString & contactID, Kopete::MetaContact * parentContact);
private: private:
JabberAccount *m_account; JabberAccount *m_account;

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

@ -34,7 +34,7 @@ namespace buzz {
Task::Task(Task * tqparent) : Task::Task(Task * tqparent) :
state_(STATE_INIT), state_(STATE_INIT),
tqparent_(tqparent), parent_(tqparent),
blocked_(false), blocked_(false),
done_(false), done_(false),
aborted_(false), aborted_(false),
@ -43,8 +43,8 @@ Task::Task(Task * tqparent) :
child_error_(false), child_error_(false),
start_time_(0) { start_time_(0) {
runner_ = ((tqparent == NULL) ? (TaskRunner *)this : tqparent->GetRunner()); runner_ = ((tqparent == NULL) ? (TaskRunner *)this : tqparent->GetRunner());
if (tqparent_ != NULL) { if (parent_ != NULL) {
tqparent_->AddChild(this); parent_->AddChild(this);
} }
} }
@ -224,7 +224,7 @@ Task::AbortAllChildren() {
void void
Task::Stop() { Task::Stop() {
AbortAllChildren(); // No need to wake because we're either awake or in abort AbortAllChildren(); // No need to wake because we're either awake or in abort
tqparent_->OnChildStopped(this); parent_->OnChildStopped(this);
} }
void void

@ -115,9 +115,9 @@ public:
unsigned long long ElapsedTime(); unsigned long long ElapsedTime();
virtual void Poll() {} virtual void Poll() {}
Task * GetParent() { return tqparent_; } Task * GetParent() { return parent_; }
TaskRunner * GetRunner() { return runner_; } TaskRunner * GetRunner() { return runner_; }
virtual Task * GetParent(int code) { return tqparent_->GetParent(code); } virtual Task * GetParent(int code) { return parent_->GetParent(code); }
// Called from outside to stop task without any more callbacks // Called from outside to stop task without any more callbacks
void Abort(bool nowake = false); void Abort(bool nowake = false);
@ -162,7 +162,7 @@ private:
void OnChildStopped(Task * child); void OnChildStopped(Task * child);
int state_; int state_;
Task * tqparent_; Task * parent_;
TaskRunner * runner_; TaskRunner * runner_;
bool blocked_; bool blocked_;
bool done_; bool done_;

@ -42,7 +42,7 @@ typedef struct _MSALAWDecoderClass
{ {
/* the MSALAWDecoder derivates from MSFilter, so the MSFilter class MUST be the first of the MSALAWDecoder class /* the MSALAWDecoder derivates from MSFilter, so the MSFilter class MUST be the first of the MSALAWDecoder class
in order to the class mechanism to work*/ in order to the class mechanism to work*/
MSFilterClass tqparent_class; MSFilterClass parent_class;
} MSALAWDecoderClass; } MSALAWDecoderClass;
/* PUBLIC */ /* PUBLIC */

@ -42,7 +42,7 @@ typedef struct _MSALAWEncoderClass
{ {
/* the MSALAWEncoder derivates from MSFilter, so the MSFilter class MUST be the first of the MSALAWEncoder class /* the MSALAWEncoder derivates from MSFilter, so the MSFilter class MUST be the first of the MSALAWEncoder class
in order to the class mechanism to work*/ in order to the class mechanism to work*/
MSFilterClass tqparent_class; MSFilterClass parent_class;
} MSALAWEncoderClass; } MSALAWEncoderClass;
/* PUBLIC */ /* PUBLIC */

@ -45,7 +45,7 @@ typedef struct _MSGSMDecoderClass
{ {
/* the MSGSMDecoder derivates from MSFilter, so the MSFilter class MUST be the first of the MSGSMDecoder class /* the MSGSMDecoder derivates from MSFilter, so the MSFilter class MUST be the first of the MSGSMDecoder class
in order to the class mechanism to work*/ in order to the class mechanism to work*/
MSFilterClass tqparent_class; MSFilterClass parent_class;
} MSGSMDecoderClass; } MSGSMDecoderClass;
/* PUBLIC */ /* PUBLIC */

@ -44,7 +44,7 @@ typedef struct _MSGSMEncoderClass
{ {
/* the MSGSMEncoder derivates from MSFilter, so the MSFilter class MUST be the first of the MSGSMEncoder class /* the MSGSMEncoder derivates from MSFilter, so the MSFilter class MUST be the first of the MSGSMEncoder class
in order to the class mechanism to work*/ in order to the class mechanism to work*/
MSFilterClass tqparent_class; MSFilterClass parent_class;
} MSGSMEncoderClass; } MSGSMEncoderClass;
/* PUBLIC */ /* PUBLIC */

@ -45,7 +45,7 @@ typedef struct _MSLPC10DecoderClass
{ {
/* the MSLPC10Decoder derivates from MSFilter, so the MSFilter class MUST be the first of the MSLPC10Decoder class /* the MSLPC10Decoder derivates from MSFilter, so the MSFilter class MUST be the first of the MSLPC10Decoder class
in order to the class mechanism to work*/ in order to the class mechanism to work*/
MSFilterClass tqparent_class; MSFilterClass parent_class;
} MSLPC10DecoderClass; } MSLPC10DecoderClass;
/* PUBLIC */ /* PUBLIC */

@ -57,7 +57,7 @@ typedef struct _MSLPC10EncoderClass
{ {
/* the MSLPC10Encoder derivates from MSFilter, so the MSFilter class MUST be the first of the MSLPC10Encoder class /* the MSLPC10Encoder derivates from MSFilter, so the MSFilter class MUST be the first of the MSLPC10Encoder class
in order to the class mechanism to work*/ in order to the class mechanism to work*/
MSFilterClass tqparent_class; MSFilterClass parent_class;
} MSLPC10EncoderClass; } MSLPC10EncoderClass;
/* PUBLIC */ /* PUBLIC */

@ -42,7 +42,7 @@ typedef struct _MSMULAWDecoderClass
{ {
/* the MSMULAWDecoder derivates from MSFilter, so the MSFilter class MUST be the first of the MSMULAWDecoder class /* the MSMULAWDecoder derivates from MSFilter, so the MSFilter class MUST be the first of the MSMULAWDecoder class
in order to the class mechanism to work*/ in order to the class mechanism to work*/
MSFilterClass tqparent_class; MSFilterClass parent_class;
} MSMULAWDecoderClass; } MSMULAWDecoderClass;
/* PUBLIC */ /* PUBLIC */

@ -42,7 +42,7 @@ typedef struct _MSMULAWEncoderClass
{ {
/* the MSMULAWEncoder derivates from MSFilter, so the MSFilter class MUST be the first of the MSMULAWEncoder class /* the MSMULAWEncoder derivates from MSFilter, so the MSFilter class MUST be the first of the MSMULAWEncoder class
in order to the class mechanism to work*/ in order to the class mechanism to work*/
MSFilterClass tqparent_class; MSFilterClass parent_class;
} MSMULAWEncoderClass; } MSMULAWEncoderClass;
/* PUBLIC */ /* PUBLIC */

@ -57,7 +57,7 @@ struct _MSAVDecoderClass
{ {
/* the MSAVDecoder derivates from MSFilter, so the MSFilter class MUST be the first of the MSAVDecoder class /* the MSAVDecoder derivates from MSFilter, so the MSFilter class MUST be the first of the MSAVDecoder class
in order to the class mechanism to work*/ in order to the class mechanism to work*/
MSFilterClass tqparent_class; MSFilterClass parent_class;
}; };
typedef struct _MSAVDecoderClass MSAVDecoderClass; typedef struct _MSAVDecoderClass MSAVDecoderClass;

@ -58,7 +58,7 @@ struct _MSAVEncoderClass
{ {
/* the MSAVEncoder derivates from MSFilter, so the MSFilter class MUST be the first of the MSAVEncoder class /* the MSAVEncoder derivates from MSFilter, so the MSFilter class MUST be the first of the MSAVEncoder class
in order to the class mechanism to work*/ in order to the class mechanism to work*/
MSFilterClass tqparent_class; MSFilterClass parent_class;
}; };
typedef struct _MSAVEncoderClass MSAVEncoderClass; typedef struct _MSAVEncoderClass MSAVEncoderClass;

@ -44,7 +44,7 @@ typedef struct _MSCopyClass
{ {
/* the MSCopy derivates from MSFilter, so the MSFilter class MUST be the first of the MSCopy class /* the MSCopy derivates from MSFilter, so the MSFilter class MUST be the first of the MSCopy class
in order to the class mechanism to work*/ in order to the class mechanism to work*/
MSFilterClass tqparent_class; MSFilterClass parent_class;
} MSCopyClass; } MSCopyClass;
/* PUBLIC */ /* PUBLIC */

@ -51,15 +51,15 @@ void ms_fdispatcher_init(MSFdispatcher *obj)
void ms_fdispatcher_class_init(MSFdispatcherClass *klass) void ms_fdispatcher_class_init(MSFdispatcherClass *klass)
{ {
MSFilterClass *tqparent_class=MS_FILTER_CLASS(klass); MSFilterClass *parent_class=MS_FILTER_CLASS(klass);
ms_filter_class_init(tqparent_class); ms_filter_class_init(parent_class);
ms_filter_class_set_name(tqparent_class,"fdispatcher"); ms_filter_class_set_name(parent_class,"fdispatcher");
tqparent_class->max_finputs=MS_FDISPATCHER_MAX_INPUTS; parent_class->max_finputs=MS_FDISPATCHER_MAX_INPUTS;
tqparent_class->max_foutputs=MS_FDISPATCHER_MAX_OUTPUTS; parent_class->max_foutputs=MS_FDISPATCHER_MAX_OUTPUTS;
tqparent_class->r_maxgran=MS_FDISPATCHER_DEF_GRAN; parent_class->r_maxgran=MS_FDISPATCHER_DEF_GRAN;
tqparent_class->w_maxgran=MS_FDISPATCHER_DEF_GRAN; parent_class->w_maxgran=MS_FDISPATCHER_DEF_GRAN;
tqparent_class->destroy=(MSFilterDestroyFunc)ms_fdispatcher_destroy; parent_class->destroy=(MSFilterDestroyFunc)ms_fdispatcher_destroy;
tqparent_class->process=(MSFilterProcessFunc)ms_fdispatcher_process; parent_class->process=(MSFilterProcessFunc)ms_fdispatcher_process;
} }

@ -44,7 +44,7 @@ typedef struct _MSFdispatcherClass
{ {
/* the MSFdispatcher derivates from MSFilter, so the MSFilter class MUST be the first of the MSFdispatcher class /* the MSFdispatcher derivates from MSFilter, so the MSFilter class MUST be the first of the MSFdispatcher class
in order to the class mechanism to work*/ in order to the class mechanism to work*/
MSFilterClass tqparent_class; MSFilterClass parent_class;
} MSFdispatcherClass; } MSFdispatcherClass;
/* PUBLIC */ /* PUBLIC */

@ -49,7 +49,7 @@ typedef struct _MSILBCDecoderClass
{ {
/* the MSILBCDecoder derivates from MSFilter, so the MSFilter class MUST be the first of the MSILBCDecoder class /* the MSILBCDecoder derivates from MSFilter, so the MSFilter class MUST be the first of the MSILBCDecoder class
in order to the class mechanism to work*/ in order to the class mechanism to work*/
MSFilterClass tqparent_class; MSFilterClass parent_class;
} MSILBCDecoderClass; } MSILBCDecoderClass;
/* PUBLIC */ /* PUBLIC */

@ -64,7 +64,7 @@ typedef struct _MSILBCEncoderClass
{ {
/* the MSILBCEncoder derivates from MSFilter, so the MSFilter class MUST be the first of the MSILBCEncoder class /* the MSILBCEncoder derivates from MSFilter, so the MSFilter class MUST be the first of the MSILBCEncoder class
in order to the class mechanism to work*/ in order to the class mechanism to work*/
MSFilterClass tqparent_class; MSFilterClass parent_class;
} MSILBCEncoderClass; } MSILBCEncoderClass;
/* PUBLIC */ /* PUBLIC */

@ -38,7 +38,7 @@ typedef struct _MSNoSync
typedef struct _MSNoSyncClass typedef struct _MSNoSyncClass
{ {
/* the MSSyncClass must be the first field of the class in order to the class mechanism to work*/ /* the MSSyncClass must be the first field of the class in order to the class mechanism to work*/
MSSyncClass tqparent_class; MSSyncClass parent_class;
} MSNoSyncClass; } MSNoSyncClass;

@ -53,7 +53,7 @@ struct _MSOssReadClass
{ {
/* the MSOssRead derivates from MSSoundRead, so the MSSoundRead class MUST be the first of the MSOssRead class /* the MSOssRead derivates from MSSoundRead, so the MSSoundRead class MUST be the first of the MSOssRead class
in order to the class mechanism to work*/ in order to the class mechanism to work*/
MSSoundReadClass tqparent_class; MSSoundReadClass parent_class;
}; };
typedef struct _MSOssReadClass MSOssReadClass; typedef struct _MSOssReadClass MSOssReadClass;

@ -52,7 +52,7 @@ struct _MSOssWriteClass
{ {
/* the MSOssWrite derivates from MSSoundWrite, so the MSSoundWrite class MUST be the first of the MSOssWrite class /* the MSOssWrite derivates from MSSoundWrite, so the MSSoundWrite class MUST be the first of the MSOssWrite class
in order to the class mechanism to work*/ in order to the class mechanism to work*/
MSSoundWriteClass tqparent_class; MSSoundWriteClass parent_class;
}; };
typedef struct _MSOssWriteClass MSOssWriteClass; typedef struct _MSOssWriteClass MSOssWriteClass;

@ -51,14 +51,14 @@ void ms_qdispatcher_init(MSQdispatcher *obj)
void ms_qdispatcher_class_init(MSQdispatcherClass *klass) void ms_qdispatcher_class_init(MSQdispatcherClass *klass)
{ {
MSFilterClass *tqparent_class=MS_FILTER_CLASS(klass); MSFilterClass *parent_class=MS_FILTER_CLASS(klass);
ms_filter_class_init(tqparent_class); ms_filter_class_init(parent_class);
ms_filter_class_set_name(tqparent_class,"qdispatcher"); ms_filter_class_set_name(parent_class,"qdispatcher");
tqparent_class->max_qinputs=MS_TQDISPATCHER_MAX_INPUTS; parent_class->max_qinputs=MS_TQDISPATCHER_MAX_INPUTS;
tqparent_class->max_qoutputs=MS_TQDISPATCHER_MAX_OUTPUTS; parent_class->max_qoutputs=MS_TQDISPATCHER_MAX_OUTPUTS;
tqparent_class->destroy=(MSFilterDestroyFunc)ms_qdispatcher_destroy; parent_class->destroy=(MSFilterDestroyFunc)ms_qdispatcher_destroy;
tqparent_class->process=(MSFilterProcessFunc)ms_qdispatcher_process; parent_class->process=(MSFilterProcessFunc)ms_qdispatcher_process;
} }

@ -43,7 +43,7 @@ typedef struct _MSQdispatcherClass
{ {
/* the MSQdispatcher derivates from MSFilter, so the MSFilter class MUST be the first of the MSQdispatcher class /* the MSQdispatcher derivates from MSFilter, so the MSFilter class MUST be the first of the MSQdispatcher class
in order to the class mechanism to work*/ in order to the class mechanism to work*/
MSFilterClass tqparent_class; MSFilterClass parent_class;
} MSQdispatcherClass; } MSQdispatcherClass;
/* PUBLIC */ /* PUBLIC */

@ -55,7 +55,7 @@ typedef struct _MSReadClass
{ {
/* the MSRead derivates from MSFilter, so the MSFilter class MUST be the first of the MSRead class /* the MSRead derivates from MSFilter, so the MSFilter class MUST be the first of the MSRead class
in order to the class mechanism to work*/ in order to the class mechanism to work*/
MSFilterClass tqparent_class; MSFilterClass parent_class;
} MSReadClass; } MSReadClass;
/* PUBLIC */ /* PUBLIC */

@ -59,7 +59,7 @@ struct _MSRingPlayerClass
{ {
/* the MSRingPlayer derivates from MSFilter, so the MSFilter class MUST be the first of the MSRingPlayer class /* the MSRingPlayer derivates from MSFilter, so the MSFilter class MUST be the first of the MSRingPlayer class
in order to the class mechanism to work*/ in order to the class mechanism to work*/
MSFilterClass tqparent_class; MSFilterClass parent_class;
}; };
typedef struct _MSRingPlayerClass MSRingPlayerClass; typedef struct _MSRingPlayerClass MSRingPlayerClass;

@ -55,7 +55,7 @@ struct _MSRtpRecvClass
{ {
/* the MSCopy derivates from MSFilter, so the MSFilter class MUST be the first of the MSCopy class /* the MSCopy derivates from MSFilter, so the MSFilter class MUST be the first of the MSCopy class
in order to the class mechanism to work*/ in order to the class mechanism to work*/
MSFilterClass tqparent_class; MSFilterClass parent_class;
}; };
typedef struct _MSRtpRecvClass MSRtpRecvClass; typedef struct _MSRtpRecvClass MSRtpRecvClass;

@ -59,7 +59,7 @@ struct _MSRtpSendClass
{ {
/* the MSRtpSend derivates from MSFilter, so the MSFilter class MUST be the first of the MSCopy class /* the MSRtpSend derivates from MSFilter, so the MSFilter class MUST be the first of the MSCopy class
in order to the class mechanism to work*/ in order to the class mechanism to work*/
MSFilterClass tqparent_class; MSFilterClass parent_class;
}; };
typedef struct _MSRtpSendClass MSRtpSendClass; typedef struct _MSRtpSendClass MSRtpSendClass;

@ -51,7 +51,7 @@ typedef struct _MSSdlOut MSSdlOut;
struct _MSSdlOutClass struct _MSSdlOutClass
{ {
MSFilterClass tqparent_class; MSFilterClass parent_class;
}; };
typedef struct _MSSdlOutClass MSSdlOutClass; typedef struct _MSSdlOutClass MSSdlOutClass;

@ -38,7 +38,7 @@ struct _MSSoundReadClass
{ {
/* the MSOssRead derivates from MSFilter, so the MSFilter class MUST be the first of the MSOssRead class /* the MSOssRead derivates from MSFilter, so the MSFilter class MUST be the first of the MSOssRead class
in order to the class mechanism to work*/ in order to the class mechanism to work*/
MSFilterClass tqparent_class; MSFilterClass parent_class;
gint (*set_device)(MSSoundRead *, gint devid); gint (*set_device)(MSSoundRead *, gint devid);
void (*start)(MSSoundRead *); void (*start)(MSSoundRead *);
void (*stop)(MSSoundRead*); void (*stop)(MSSoundRead*);

@ -38,7 +38,7 @@ struct _MSSoundWriteClass
{ {
/* the MSOssWrite derivates from MSFilter, so the MSFilter class MUST be the first of the MSOssWrite class /* the MSOssWrite derivates from MSFilter, so the MSFilter class MUST be the first of the MSOssWrite class
in order to the class mechanism to work*/ in order to the class mechanism to work*/
MSFilterClass tqparent_class; MSFilterClass parent_class;
gint (*set_device)(MSSoundWrite *, gint devid); gint (*set_device)(MSSoundWrite *, gint devid);
void (*start)(MSSoundWrite *); void (*start)(MSSoundWrite *);
void (*stop)(MSSoundWrite*); void (*stop)(MSSoundWrite*);

@ -42,7 +42,7 @@ typedef struct _MSTimer
typedef struct _MSTimerClass typedef struct _MSTimerClass
{ {
/* the MSSyncClass must be the first field of the class in order to the class mechanism to work*/ /* the MSSyncClass must be the first field of the class in order to the class mechanism to work*/
MSSyncClass tqparent_class; MSSyncClass parent_class;
} MSTimerClass; } MSTimerClass;

@ -42,7 +42,7 @@ typedef struct _MSTrueSpeechDecoderClass
so the MSFilter class MUST be the first of the MSTrueSpechDecoder so the MSFilter class MUST be the first of the MSTrueSpechDecoder
class class
in order for the class mechanism to work*/ in order for the class mechanism to work*/
MSFilterClass tqparent_class; MSFilterClass parent_class;
Win32CodecDriver* driver; Win32CodecDriver* driver;
} MSTrueSpeechDecoderClass; } MSTrueSpeechDecoderClass;

@ -46,7 +46,7 @@ typedef struct _MSTrueSpeechEncoderClass
so the MSFilter class MUST be the first of the MSTrueSpechEncoder so the MSFilter class MUST be the first of the MSTrueSpechEncoder
class class
in order for the class mechanism to work*/ in order for the class mechanism to work*/
MSFilterClass tqparent_class; MSFilterClass parent_class;
Win32CodecDriver* driver; Win32CodecDriver* driver;
} MSTrueSpeechEncoderClass; } MSTrueSpeechEncoderClass;

@ -61,7 +61,7 @@ typedef struct _MSV4l MSV4l;
struct _MSV4lClass struct _MSV4lClass
{ {
MSVideoSourceClass tqparent_class; MSVideoSourceClass parent_class;
}; };

@ -45,7 +45,7 @@ typedef struct _MSVideoSourceClass
{ {
/* the MSVideoSource derivates from MSFilter, so the MSFilter class MUST be the first of the MSVideoSource class /* the MSVideoSource derivates from MSFilter, so the MSFilter class MUST be the first of the MSVideoSource class
in order to the class mechanism to work*/ in order to the class mechanism to work*/
MSFilterClass tqparent_class; MSFilterClass parent_class;
gint (*set_device)(MSVideoSource *s, const gchar *name); gint (*set_device)(MSVideoSource *s, const gchar *name);
void (*start)(MSVideoSource *s); void (*start)(MSVideoSource *s);
void (*stop)(MSVideoSource *s); void (*stop)(MSVideoSource *s);

@ -45,7 +45,7 @@ typedef struct _MSWriteClass
{ {
/* the MSWrite derivates from MSFilter, so the MSFilter class MUST be the first of the MSWrite class /* the MSWrite derivates from MSFilter, so the MSFilter class MUST be the first of the MSWrite class
in order to the class mechanism to work*/ in order to the class mechanism to work*/
MSFilterClass tqparent_class; MSFilterClass parent_class;
} MSWriteClass; } MSWriteClass;
/* PUBLIC */ /* PUBLIC */

@ -177,7 +177,7 @@ struct _RtpSession
RtpSessionMode mode; RtpSessionMode mode;
struct _RtpScheduler *sched; struct _RtpScheduler *sched;
guint32 flags; guint32 flags;
gint tqmask_pos; /* the position in the scheduler tqmask of RtpSession */ gint mask_pos; /* the position in the scheduler tqmask of RtpSession */
gpointer user_data; gpointer user_data;
/* telephony events extension */ /* telephony events extension */

@ -177,7 +177,7 @@ void rtp_scheduler_add_session(RtpScheduler *sched, RtpSession *session)
/* find a free pos in the session tqmask*/ /* find a free pos in the session tqmask*/
for (i=0;i<sched->max_sessions;i++){ for (i=0;i<sched->max_sessions;i++){
if (!ORTP_FD_ISSET(i,&sched->all_sessions.rtpset)){ if (!ORTP_FD_ISSET(i,&sched->all_sessions.rtpset)){
session->tqmask_pos=i; session->mask_pos=i;
session_set_set(&sched->all_sessions,session); session_set_set(&sched->all_sessions,session);
/* make a new session scheduled not blockable if it has not started*/ /* make a new session scheduled not blockable if it has not started*/
if (session->flags & RTP_SESSION_RECV_NOT_STARTED) if (session->flags & RTP_SESSION_RECV_NOT_STARTED)

@ -37,7 +37,7 @@ struct _RtpScheduler {
gint w_max; gint w_max;
SessionSet e_sessions; /* tqmask of session that have error event */ SessionSet e_sessions; /* tqmask of session that have error event */
gint e_max; gint e_max;
gint max_sessions; /* the number of position in the tqmasks */ gint max_sessions; /* the number of position in the masks */
/* GMutex *unblock_select_mutex; */ /* GMutex *unblock_select_mutex; */
GCond *unblock_select_cond; GCond *unblock_select_cond;
GMutex *lock; GMutex *lock;

@ -67,7 +67,7 @@ gint session_set_and(SessionSet *sched_set, gint maxs, SessionSet *user_set, Ses
tqmask2=(guint32*)&user_set->rtpset; tqmask2=(guint32*)&user_set->rtpset;
tqmask3=(guint32*)&result_set->rtpset; tqmask3=(guint32*)&result_set->rtpset;
while(i<maxs+1){ while(i<maxs+1){
*tqmask3=(*tqmask1) & (*tqmask2); /* computes the AND between the two tqmasks*/ *tqmask3=(*tqmask1) & (*tqmask2); /* computes the AND between the two masks*/
/* and unset the sessions that have been found from the sched_set */ /* and unset the sessions that have been found from the sched_set */
*tqmask1=(*tqmask1) & (~(*tqmask3)); *tqmask1=(*tqmask1) & (~(*tqmask3));
if ((*tqmask3)!=0){ if ((*tqmask3)!=0){
@ -116,12 +116,12 @@ int session_set_select(SessionSet *recvs, SessionSet *sends, SessionSet *errors)
SessionSet temp; SessionSet temp;
RtpScheduler *sched=ortp_get_scheduler(); RtpScheduler *sched=ortp_get_scheduler();
/*lock the scheduler to not read the tqmasks while they are being modified by the scheduler*/ /*lock the scheduler to not read the masks while they are being modified by the scheduler*/
rtp_scheduler_lock(sched); rtp_scheduler_lock(sched);
while(1){ while(1){
/* computes the SessionSet intersection (in the other words tqmask intersection) between /* computes the SessionSet intersection (in the other words tqmask intersection) between
the tqmask given by the user and scheduler tqmasks */ the tqmask given by the user and scheduler masks */
if (recvs!=NULL){ if (recvs!=NULL){
bits=session_set_and(&sched->r_sessions,sched->all_max,recvs,&temp); bits=session_set_and(&sched->r_sessions,sched->all_max,recvs,&temp);
if (bits>0){ if (bits>0){

@ -87,9 +87,9 @@ typedef struct _SessionSet SessionSet;
SessionSet * session_set_new(); SessionSet * session_set_new();
#define session_set_init(ss) ORTP_FD_ZERO(&(ss)->rtpset) #define session_set_init(ss) ORTP_FD_ZERO(&(ss)->rtpset)
#define session_set_set(ss,rtpsession) ORTP_FD_SET((rtpsession)->tqmask_pos,&(ss)->rtpset) #define session_set_set(ss,rtpsession) ORTP_FD_SET((rtpsession)->mask_pos,&(ss)->rtpset)
#define session_set_is_set(ss,rtpsession) ORTP_FD_ISSET((rtpsession)->tqmask_pos,&(ss)->rtpset) #define session_set_is_set(ss,rtpsession) ORTP_FD_ISSET((rtpsession)->mask_pos,&(ss)->rtpset)
#define session_set_clr(ss,rtpsession) ORTP_FD_CLR((rtpsession)->tqmask_pos,&(ss)->rtpset) #define session_set_clr(ss,rtpsession) ORTP_FD_CLR((rtpsession)->mask_pos,&(ss)->rtpset)
#define session_set_copy(dest,src) memcpy(&(dest)->rtpset,&(src)->rtpset,sizeof(ortp_fd_set)) #define session_set_copy(dest,src) memcpy(&(dest)->rtpset,&(src)->rtpset,sizeof(ortp_fd_set))

@ -205,7 +205,7 @@ void SrvResolver::qdns_done()
if(!d->qdns) if(!d->qdns)
return; return;
// aptqparently we sometimes get this signal even though the results aren't ready // apparently we sometimes get this signal even though the results aren't ready
if(d->qdns->isWorking()) if(d->qdns->isWorking())
return; return;
d->t.stop(); d->t.stop();
@ -266,7 +266,7 @@ void SrvResolver::ndns_done()
if(!d->qdns) if(!d->qdns)
return; return;
// aptqparently we sometimes get this signal even though the results aren't ready // apparently we sometimes get this signal even though the results aren't ready
if(d->qdns->isWorking()) if(d->qdns->isWorking())
return; return;

@ -409,7 +409,7 @@ void AdvancedConnector::dns_done()
//if(!d->qdns) //if(!d->qdns)
// return; // return;
// aptqparently we sometimes get this signal even though the results aren' t ready // apparently we sometimes get this signal even though the results aren' t ready
//if(d->qdns->isWorking()) //if(d->qdns->isWorking())
// return; // return;

@ -465,7 +465,7 @@ namespace XMPP
current = TQDomElement(); current = TQDomElement();
} }
else else
current = current.tqparentNode().toElement(); current = current.parentNode().toElement();
} }
if(in->lastRead() == '/') if(in->lastRead() == '/')

@ -33,9 +33,9 @@ using namespace XMPP;
static TQDomElement stripExtraNS(const TQDomElement &e) static TQDomElement stripExtraNS(const TQDomElement &e)
{ {
// find closest tqparent with a namespace // find closest tqparent with a namespace
TQDomNode par = e.tqparentNode(); TQDomNode par = e.parentNode();
while(!par.isNull() && par.namespaceURI().isNull()) while(!par.isNull() && par.namespaceURI().isNull())
par = par.tqparentNode(); par = par.parentNode();
bool noShowNS = false; bool noShowNS = false;
if(!par.isNull() && par.namespaceURI() == e.namespaceURI()) if(!par.isNull() && par.namespaceURI() == e.namespaceURI())
noShowNS = true; noShowNS = true;

@ -470,9 +470,9 @@ void Client::streamCloseFinished()
static TQDomElement oldStyleNS(const TQDomElement &e) static TQDomElement oldStyleNS(const TQDomElement &e)
{ {
// find closest tqparent with a namespace // find closest tqparent with a namespace
TQDomNode par = e.tqparentNode(); TQDomNode par = e.parentNode();
while(!par.isNull() && par.namespaceURI().isNull()) while(!par.isNull() && par.namespaceURI().isNull())
par = par.tqparentNode(); par = par.parentNode();
bool noShowNS = false; bool noShowNS = false;
if(!par.isNull() && par.namespaceURI() == e.namespaceURI()) if(!par.isNull() && par.namespaceURI() == e.namespaceURI())
noShowNS = true; noShowNS = true;
@ -588,7 +588,7 @@ static TQDomElement addCorrectNS(const TQDomElement &e)
// find closest xmlns // find closest xmlns
TQDomNode n = e; TQDomNode n = e;
while(!n.isNull() && !n.toElement().hasAttribute("xmlns")) while(!n.isNull() && !n.toElement().hasAttribute("xmlns"))
n = n.tqparentNode(); n = n.parentNode();
TQString ns; TQString ns;
if(n.isNull() || !n.toElement().hasAttribute("xmlns")) if(n.isNull() || !n.toElement().hasAttribute("xmlns"))
ns = "jabber:client"; ns = "jabber:client";

@ -654,9 +654,9 @@ bool JT_PushPresence::take(const TQDomElement &e)
static TQDomElement oldStyleNS(const TQDomElement &e) static TQDomElement oldStyleNS(const TQDomElement &e)
{ {
// find closest tqparent with a namespace // find closest tqparent with a namespace
TQDomNode par = e.tqparentNode(); TQDomNode par = e.parentNode();
while(!par.isNull() && par.namespaceURI().isNull()) while(!par.isNull() && par.namespaceURI().isNull())
par = par.tqparentNode(); par = par.parentNode();
bool noShowNS = false; bool noShowNS = false;
if(!par.isNull() && par.namespaceURI() == e.namespaceURI()) if(!par.isNull() && par.namespaceURI() == e.namespaceURI())
noShowNS = true; noShowNS = true;
@ -724,7 +724,7 @@ static TQDomElement addCorrectNS(const TQDomElement &e)
// find closest xmlns // find closest xmlns
TQDomNode n = e; TQDomNode n = e;
while(!n.isNull() && !n.toElement().hasAttribute("xmlns")) while(!n.isNull() && !n.toElement().hasAttribute("xmlns"))
n = n.tqparentNode(); n = n.parentNode();
TQString ns; TQString ns;
if(n.isNull() || !n.toElement().hasAttribute("xmlns")) if(n.isNull() || !n.toElement().hasAttribute("xmlns"))
ns = "jabber:client"; ns = "jabber:client";

@ -98,7 +98,7 @@
</widget> </widget>
<customwidgets> <customwidgets>
</customwidgets> </customwidgets>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
<includehints> <includehints>
<includehint>klineedit.h</includehint> <includehint>klineedit.h</includehint>
</includehints> </includehints>

@ -193,7 +193,7 @@
<slot>close()</slot> <slot>close()</slot>
</connection> </connection>
</connections> </connections>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
<includehints> <includehints>
<includehint>kpushbutton.h</includehint> <includehint>kpushbutton.h</includehint>
<includehint>kpushbutton.h</includehint> <includehint>kpushbutton.h</includehint>

@ -79,7 +79,7 @@ and then your new password twice.</string>
</widget> </widget>
<customwidgets> <customwidgets>
</customwidgets> </customwidgets>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
<includehints> <includehints>
<includehint>kpassdlg.h</includehint> <includehint>kpassdlg.h</includehint>
<includehint>kpassdlg.h</includehint> <includehint>kpassdlg.h</includehint>

@ -126,5 +126,5 @@
<slot>slotBowse()</slot> <slot>slotBowse()</slot>
<slot>slotJoin()</slot> <slot>slotJoin()</slot>
</Q_SLOTS> </Q_SLOTS>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
</UI> </UI>

@ -178,7 +178,7 @@
<slot>slotClick(int row, int col, int button, const QPoint&amp; mousePos)</slot> <slot>slotClick(int row, int col, int button, const QPoint&amp; mousePos)</slot>
<slot>slotDoubleClick(int row, int col, int button, const QPoint&amp; mousePos)</slot> <slot>slotDoubleClick(int row, int col, int button, const QPoint&amp; mousePos)</slot>
</Q_SLOTS> </Q_SLOTS>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
<includehints> <includehints>
<includehint>kdialog.h</includehint> <includehint>kdialog.h</includehint>
</includehints> </includehints>

@ -100,7 +100,7 @@
<data format="XPM.GZ" length="2846">789c75d54953dd381007f03b9fe255fa969aea585ea59a9a039084256c0f0810a6e6204b32fbfe58a7e6bb8fddff3609c90ce6f27b6acbea764bfef07e72b0b53e79ff61ee6ee6672761128efdede47dbcbfb878fef3af3ffe9e7b67eac9f05fb849feeeb7b977d3d9244c36ae2ed300ef7b50664cac337127b626cf9db885f3a22e075325762694324edfc4de74954c4e6b705ed595dc4fe2ceb842c6fdd16093e5be6e24be1e9ce7856f647e7f227685ad647db4230e65d178194fe26eb8c43cb8903f89df1e5d4a3c1d8a7d9559acff40dccf57c1e5e0d20c97b811fb2ad928f31f8b43e59b56c6dde0aa1d2ef1ba3895b194f5901d5cd7755307b93f8add70c9f87470636a5be2fe7d71d5b416f905b1b399433db706dbcc3695d4930ab1192ef1e660d7b8429fbf216e6dd2f9b3c1a18d59443df7c4a9772dcec5dd70897707f7a355c2f33f8a8bc66678fe17b5cb50bf4f62eb7223fd430fe2d0a40cf7afc2ce1658cff9e0646c9521fe515cfad2209f457555607ee99f543bafcf3f1337aecbe4fdd005eccb4ceacd976217cacccaf8bdd8b719fa830fd57926f5e62b38984ceac12fea5ac7a5bf53eb23c689e156f3e5353834fafc67b5c3faf862b491fcf949dd66526f967aa61082ce77a04e46eac7f23e536c8b1ce3ab70e80cf291fe4ba96f70a91fefc33137c8675edcb555867807c7d220bf95d139eedf53d746fa95b3d1fafc85c15dd666b9bc0fb670b4c88fbcba3f2164fcebab518f1bb1f10eef9f23dc6abf7003c760a45f7977748efbafc579db68fc231cfb05cbf34fd429c7fb3f1d5da0decba3b15fb85677c89fe4bceb8a7e39c8bf529b1cfd78acce612e5f8d7c315eb699e697d441dfcf0e9c8c9e4f97ea02f5a4237595cbf9c84be2fe80a9b17fa3ba413da8535bac97d2abf17ee53ce9ea100af8014ed6211f1d4faec27e9c8d463d19eb69fa7a231f525b7501275fa3bfcd683d9feed46d055fa9638e7c3e8fd6f3fbf6d518bf51a702cf43beb61dfbe71c4efd8692f8157572a8dff6abd10fd7ea0ef3d1c2e806cf43bfdace75a817d6e3a2b7e8974db8df7118bf57772df617fadf875062ff213fdf7738ce8f2775897a30fab58d49e7cfe1ae6ad11ff3eadae23c5d52fb12df4fa3ee2fb91ffd1b626cb05fb6e0ae8ea8d799ba89e8d799daeaf7e159ed1accff32da62bfcbf7a08b7dc658ffa2da27d47baa6e615a56077d1fe887d4cf88f59caa6327ef87e57bd20d7fb2fee90c17137b6e3970e4c41d1f8dbf7f8fe1633ee1533ee373bee04bbee26b3e7e1bc3377ccb773ce37b7ee0477ee2677ee179be7913b3c08bfc913ff1675ee2655ee155fec26bbcfe26668337798ba7bccd3bbccb5f798ff7f980bfbd8939e48c0de75c70c915d7dcb06547fc630c11796a2950a4441d1dd1319dd0299dbd8939a70bbaecc7afe89a6ee896ee6846f774fe36777aa0c73ee2899ee985e6698116e9e1e7faf4511fe9137da6255aa6155aa52fbfd6b08f59a375daa04ddaa2296d8fbffe14b343bbf495f6689f0ee8dbffc41c524686722aa8a4ea7f626a6ac892f3ecc9fbff8e99ce7ceb838f3ef9eefb6fbfc4787fe48ffdc98fb3f431fffc3ef72fd6519eaa</data> <data format="XPM.GZ" length="2846">789c75d54953dd381007f03b9fe255fa969aea585ea59a9a039084256c0f0810a6e6204b32fbfe58a7e6bb8fddff3609c90ce6f27b6acbea764bfef07e72b0b53e79ff61ee6ee6672761128efdede47dbcbfb878fef3af3ffe9e7b67eac9f05fb849feeeb7b977d3d9244c36ae2ed300ef7b50664cac337127b626cf9db885f3a22e075325762694324edfc4de74954c4e6b705ed595dc4fe2ceb842c6fdd16093e5be6e24be1e9ce7856f647e7f227685ad647db4230e65d178194fe26eb8c43cb8903f89df1e5d4a3c1d8a7d9559acff40dccf57c1e5e0d20c97b811fb2ad928f31f8b43e59b56c6dde0aa1d2ef1ba3895b194f5901d5cd7755307b93f8add70c9f87470636a5be2fe7d71d5b416f905b1b399433db706dbcc3695d4930ab1192ef1e660d7b8429fbf216e6dd2f9b3c1a18d59443df7c4a9772dcec5dd70897707f7a355c2f33f8a8bc66678fe17b5cb50bf4f62eb7223fd430fe2d0a40cf7afc2ce1658cff9e0646c9521fe515cfad2209f457555607ee99f543bafcf3f1337aecbe4fdd005eccb4ceacd976217cacccaf8bdd8b719fa830fd57926f5e62b38984ceac12fea5ac7a5bf53eb23c689e156f3e5353834fafc67b5c3faf862b491fcf949dd66526f967aa61082ce77a04e46eac7f23e536c8b1ce3ab70e80cf291fe4ba96f70a91fefc33137c8675edcb555867807c7d220bf95d139eedf53d746fa95b3d1fafc85c15dd666b9bc0fb670b4c88fbcba3f2164fcebab518f1bb1f10eef9f23dc6abf7003c760a45f7977748efbafc579db68fc231cfb05cbf34fd429c7fb3f1d5da0decba3b15fb85677c89fe4bceb8a7e39c8bf529b1cfd78acce612e5f8d7c315eb699e697d441dfcf0e9c8c9e4f97ea02f5a4237595cbf9c84be2fe80a9b17fa3ba413da8535bac97d2abf17ee53ce9ea100af8014ed6211f1d4faec27e9c8d463d19eb69fa7a231f525b7501275fa3bfcd683d9feed46d055fa9638e7c3e8fd6f3fbf6d518bf51a702cf43beb61dfbe71c4efd8692f8157572a8dff6abd10fd7ea0ef3d1c2e806cf43bfdace75a817d6e3a2b7e8974db8df7118bf57772df617fadf875062ff213fdf7738ce8f2775897a30fab58d49e7cfe1ae6ad11ff3eadae23c5d52fb12df4fa3ee2fb91ffd1b626cb05fb6e0ae8ea8d799ba89e8d799daeaf7e159ed1accff32da62bfcbf7a08b7dc658ffa2da27d47baa6e615a56077d1fe887d4cf88f59caa6327ef87e57bd20d7fb2fee90c17137b6e3970e4c41d1f8dbf7f8fe1633ee1533ee373bee04bbee26b3e7e1bc3377ccb773ce37b7ee0477ee2677ee179be7913b3c08bfc913ff1675ee2655ee155fec26bbcfe26668337798ba7bccd3bbccb5f798ff7f980bfbd8939e48c0de75c70c915d7dcb06547fc630c11796a2950a4441d1dd1319dd0299dbd8939a70bbaecc7afe89a6ee896ee6846f774fe36777aa0c73ee2899ee985e6698116e9e1e7faf4511fe9137da6255aa6155aa52fbfd6b08f59a375daa04ddaa2296d8fbffe14b343bbf495f6689f0ee8dbffc41c524686722aa8a4ea7f626a6ac892f3ecc9fbff8e99ce7ceb838f3ef9eefb6fbfc4787fe48ffdc98fb3f431fffc3ef72fd6519eaa</data>
</image> </image>
</images> </images>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
<includehints> <includehints>
<includehint>kactivelabel.h</includehint> <includehint>kactivelabel.h</includehint>
</includehints> </includehints>

@ -986,7 +986,7 @@ If two resources have the same priority, the messages will be sent to the one co
<tabstop>cbSendDisplayedEvent</tabstop> <tabstop>cbSendDisplayedEvent</tabstop>
<tabstop>cbSendComposingEvent</tabstop> <tabstop>cbSendComposingEvent</tabstop>
</tabstops> </tabstops>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
<includehints> <includehints>
<includehint>kopetepasswordwidget.h</includehint> <includehint>kopetepasswordwidget.h</includehint>
</includehints> </includehints>

@ -55,7 +55,7 @@
</widget> </widget>
<widget class="TQLayoutWidget" row="0" column="2"> <widget class="TQLayoutWidget" row="0" column="2">
<property name="name"> <property name="name">
<cstring>tqlayoutServerEntry</cstring> <cstring>layoutServerEntry</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -309,7 +309,7 @@
<tabstop>lePassword</tabstop> <tabstop>lePassword</tabstop>
<tabstop>lePasswordVerify</tabstop> <tabstop>lePasswordVerify</tabstop>
</tabstops> </tabstops>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
<includehints> <includehints>
<includehint>kpushbutton.h</includehint> <includehint>kpushbutton.h</includehint>
<includehint>knuminput.h</includehint> <includehint>knuminput.h</includehint>

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

@ -155,5 +155,5 @@
</widget> </widget>
</vbox> </vbox>
</widget> </widget>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
</UI> </UI>

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

@ -1055,7 +1055,7 @@
<tabstop>lePhoneCell</tabstop> <tabstop>lePhoneCell</tabstop>
<tabstop>teAbout</tabstop> <tabstop>teAbout</tabstop>
</tabstops> </tabstops>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
<includehints> <includehints>
<includehint>kurllabel.h</includehint> <includehint>kurllabel.h</includehint>
<includehint>kurllabel.h</includehint> <includehint>kurllabel.h</includehint>

@ -76,7 +76,7 @@ bool JabberAddContactPage::validateData ()
} }
bool JabberAddContactPage::apply ( Kopete::Account *account, Kopete::MetaContact *tqparentContact ) bool JabberAddContactPage::apply ( Kopete::Account *account, Kopete::MetaContact *parentContact )
{ {
if( canadd && validateData () ) if( canadd && validateData () )
@ -90,25 +90,25 @@ bool JabberAddContactPage::apply ( Kopete::Account *account, Kopete::MetaContact
{ {
XMPP::JT_Gateway * gatewayTask = new XMPP::JT_Gateway ( jaccount->client()->rootTask () ); XMPP::JT_Gateway * gatewayTask = new XMPP::JT_Gateway ( jaccount->client()->rootTask () );
JabberAddContactPage_there_is_no_possibility_to_add_assync_WORKAROUND *workaround = JabberAddContactPage_there_is_no_possibility_to_add_assync_WORKAROUND *workaround =
new JabberAddContactPage_there_is_no_possibility_to_add_assync_WORKAROUND( transport , tqparentContact , gatewayTask ); new JabberAddContactPage_there_is_no_possibility_to_add_assync_WORKAROUND( transport , parentContact , gatewayTask );
TQObject::connect (gatewayTask, TQT_SIGNAL (finished ()), workaround, TQT_SLOT (slotJidReceived())); TQObject::connect (gatewayTask, TQT_SIGNAL (finished ()), workaround, TQT_SLOT (slotJidReceived()));
gatewayTask->set ( transport->myself()->contactId() , contactId ); gatewayTask->set ( transport->myself()->contactId() , contactId );
gatewayTask->go ( true ); gatewayTask->go ( true );
return true; return true;
} }
TQString displayName = tqparentContact->displayName (); TQString displayName = parentContact->displayName ();
/* /*
if ( displayName.isEmpty () ) if ( displayName.isEmpty () )
displayName = contactId; displayName = contactId;
*/ */
// collect all group names // collect all group names
TQStringList groupNames; TQStringList groupNames;
Kopete::GroupList groupList = tqparentContact->groups(); Kopete::GroupList groupList = parentContact->groups();
for(Kopete::Group *group = groupList.first(); group; group = groupList.next()) for(Kopete::Group *group = groupList.first(); group; group = groupList.next())
groupNames += group->displayName(); groupNames += group->displayName();
if ( jaccount->addContact ( contactId, tqparentContact, Kopete::Account::ChangeKABC ) ) if ( jaccount->addContact ( contactId, parentContact, Kopete::Account::ChangeKABC ) )
{ {
XMPP::RosterItem item; XMPP::RosterItem item;
XMPP::Jid jid ( contactId ); XMPP::Jid jid ( contactId );
@ -167,25 +167,25 @@ void JabberAddContactPage_there_is_no_possibility_to_add_assync_WORKAROUND::slot
TQString contactId=task->prompt(); TQString contactId=task->prompt();
Kopete::MetaContact* tqparentContact=metacontact; Kopete::MetaContact* parentContact=metacontact;
JabberAccount *jaccount=transport->account();; JabberAccount *jaccount=transport->account();;
/*\ /*\
* this is a copy of the end of JabberAddContactPage::apply * this is a copy of the end of JabberAddContactPage::apply
\*/ \*/
TQString displayName = tqparentContact->displayName (); TQString displayName = parentContact->displayName ();
/* /*
if ( displayName.isEmpty () ) if ( displayName.isEmpty () )
displayName = contactId; displayName = contactId;
*/ */
// collect all group names // collect all group names
TQStringList groupNames; TQStringList groupNames;
Kopete::GroupList groupList = tqparentContact->groups(); Kopete::GroupList groupList = parentContact->groups();
for(Kopete::Group *group = groupList.first(); group; group = groupList.next()) for(Kopete::Group *group = groupList.first(); group; group = groupList.next())
groupNames += group->displayName(); groupNames += group->displayName();
if ( jaccount->addContact ( contactId, tqparentContact, Kopete::Account::ChangeKABC ) ) if ( jaccount->addContact ( contactId, parentContact, Kopete::Account::ChangeKABC ) )
{ {
XMPP::RosterItem item; XMPP::RosterItem item;
XMPP::Jid jid ( contactId ); XMPP::Jid jid ( contactId );

@ -63,10 +63,10 @@ void MeanwhileAccount::setPlugin(MeanwhilePlugin *plugin)
bool MeanwhileAccount::createContact( bool MeanwhileAccount::createContact(
const TQString & contactId , const TQString & contactId ,
Kopete::MetaContact * tqparentContact) Kopete::MetaContact * parentContact)
{ {
MeanwhileContact* newContact = new MeanwhileContact(contactId, MeanwhileContact* newContact = new MeanwhileContact(contactId,
tqparentContact->displayName(), this, tqparentContact); parentContact->displayName(), this, parentContact);
MeanwhileProtocol *p = static_cast<MeanwhileProtocol *>(protocol()); MeanwhileProtocol *p = static_cast<MeanwhileProtocol *>(protocol());

@ -44,7 +44,7 @@ public:
~MeanwhileAccount(); ~MeanwhileAccount();
virtual bool createContact(const TQString &contactId, virtual bool createContact(const TQString &contactId,
Kopete::MetaContact *tqparentContact); Kopete::MetaContact *parentContact);
virtual void connectWithPassword(const TQString &password); virtual void connectWithPassword(const TQString &password);

@ -107,5 +107,5 @@
</spacer> </spacer>
</vbox> </vbox>
</widget> </widget>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
</UI> </UI>

@ -430,7 +430,7 @@
<tabstops> <tabstops>
<tabstop>mScreenName</tabstop> <tabstop>mScreenName</tabstop>
</tabstops> </tabstops>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
<includehints> <includehints>
<includehint>kopetepasswordwidget.h</includehint> <includehint>kopetepasswordwidget.h</includehint>
</includehints> </includehints>

@ -209,7 +209,7 @@
<includes> <includes>
<include location="global" impldecl="in implementation">knuminput.h</include> <include location="global" impldecl="in implementation">knuminput.h</include>
</includes> </includes>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
<includehints> <includehints>
<includehint>knuminput.h</includehint> <includehint>knuminput.h</includehint>
<includehint>knuminput.h</includehint> <includehint>knuminput.h</includehint>

@ -126,7 +126,7 @@ public slots:
void slotErrorMessageReceived( int type, const TQString &msg ); void slotErrorMessageReceived( int type, const TQString &msg );
protected: protected:
virtual bool createContact( const TQString &contactId, Kopete::MetaContact *tqparentContact ); virtual bool createContact( const TQString &contactId, Kopete::MetaContact *parentContact );
private slots: private slots:

@ -93,5 +93,5 @@
</spacer> </spacer>
</vbox> </vbox>
</widget> </widget>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
</UI> </UI>

@ -100,7 +100,7 @@
<tabstop>m_addId</tabstop> <tabstop>m_addId</tabstop>
<tabstop>m_addNewline</tabstop> <tabstop>m_addNewline</tabstop>
</tabstops> </tabstops>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
<includehints> <includehints>
<includehint>ktextedit.h</includehint> <includehint>ktextedit.h</includehint>
</includehints> </includehints>

@ -1412,7 +1412,7 @@ Only check this option if the normal connection doesn't work.</string>
<tabstop>m_blp</tabstop> <tabstop>m_blp</tabstop>
<tabstop>m_RLButton</tabstop> <tabstop>m_RLButton</tabstop>
</tabstops> </tabstops>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
<includehints> <includehints>
<includehint>kopetepasswordwidget.h</includehint> <includehint>kopetepasswordwidget.h</includehint>
<includehint>kcombobox.h</includehint> <includehint>kcombobox.h</includehint>

@ -217,5 +217,5 @@ If not, the user has not added you to their list, or has removed you.</string>
</spacer> </spacer>
</vbox> </vbox>
</widget> </widget>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
</UI> </UI>

@ -235,9 +235,9 @@ AIMAccount::~AIMAccount()
{ {
} }
OscarContact *AIMAccount::createNewContact( const TQString &contactId, Kopete::MetaContact *tqparentContact, const SSI& ssiItem ) OscarContact *AIMAccount::createNewContact( const TQString &contactId, Kopete::MetaContact *parentContact, const SSI& ssiItem )
{ {
AIMContact* contact = new AIMContact( this, contactId, tqparentContact, TQString(), ssiItem ); AIMContact* contact = new AIMContact( this, contactId, parentContact, TQString(), ssiItem );
if ( !ssiItem.alias().isEmpty() ) if ( !ssiItem.alias().isEmpty() )
contact->setProperty( Kopete::Global::Properties::self()->nickName(), ssiItem.alias() ); contact->setProperty( Kopete::Global::Properties::self()->nickName(), ssiItem.alias() );

@ -133,7 +133,7 @@ protected:
* Implement virtual method from OscarAccount * Implement virtual method from OscarAccount
* This allows OscarAccount to take care of adding new contacts * This allows OscarAccount to take care of adding new contacts
*/ */
OscarContact *createNewContact( const TQString &contactId, Kopete::MetaContact *tqparentContact, const SSI& ssiItem ); OscarContact *createNewContact( const TQString &contactId, Kopete::MetaContact *parentContact, const SSI& ssiItem );
TQString sanitizedMessage( const TQString& message ); TQString sanitizedMessage( const TQString& message );

@ -26,9 +26,9 @@
<property name="title"> <property name="title">
<string>Contact Information</string> <string>Contact Information</string>
</property> </property>
<property name="tqlayoutMargin" stdset="0"> <property name="layoutMargin" stdset="0">
</property> </property>
<property name="tqlayoutSpacing" stdset="0"> <property name="layoutSpacing" stdset="0">
</property> </property>
<grid> <grid>
<property name="name"> <property name="name">
@ -60,5 +60,5 @@
<tabstops> <tabstops>
<tabstop>addSN</tabstop> <tabstop>addSN</tabstop>
</tabstops> </tabstops>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
</UI> </UI>

@ -533,7 +533,7 @@
<tabstop>rbBlockAIM</tabstop> <tabstop>rbBlockAIM</tabstop>
<tabstop>rbBlockDenyList</tabstop> <tabstop>rbBlockDenyList</tabstop>
</tabstops> </tabstops>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
<includehints> <includehints>
<includehint>kopetepasswordwidget.h</includehint> <includehint>kopetepasswordwidget.h</includehint>
</includehints> </includehints>

@ -18,7 +18,7 @@
<height>400</height> <height>400</height>
</size> </size>
</property> </property>
<property name="tqlayoutMargin" stdset="0"> <property name="layoutMargin" stdset="0">
</property> </property>
<vbox> <vbox>
<property name="name"> <property name="name">
@ -239,7 +239,7 @@
<tabstop>txtOnlineSince</tabstop> <tabstop>txtOnlineSince</tabstop>
<tabstop>txtAwayMessage</tabstop> <tabstop>txtAwayMessage</tabstop>
</tabstops> </tabstops>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
<includehints> <includehints>
<includehint>ktextbrowser.h</includehint> <includehint>ktextbrowser.h</includehint>
</includehints> </includehints>

@ -120,5 +120,5 @@
</spacer> </spacer>
</grid> </grid>
</widget> </widget>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
</UI> </UI>

@ -375,9 +375,9 @@ void ICQAccount::setOnlineStatus( const Kopete::OnlineStatus& status, const TQSt
} }
OscarContact *ICQAccount::createNewContact( const TQString &contactId, Kopete::MetaContact *tqparentContact, const SSI& ssiItem ) OscarContact *ICQAccount::createNewContact( const TQString &contactId, Kopete::MetaContact *parentContact, const SSI& ssiItem )
{ {
ICQContact* contact = new ICQContact( this, contactId, tqparentContact, TQString(), ssiItem ); ICQContact* contact = new ICQContact( this, contactId, parentContact, TQString(), ssiItem );
if ( !ssiItem.alias().isEmpty() ) if ( !ssiItem.alias().isEmpty() )
contact->setProperty( Kopete::Global::Properties::self()->nickName(), ssiItem.alias() ); contact->setProperty( Kopete::Global::Properties::self()->nickName(), ssiItem.alias() );

@ -69,7 +69,7 @@ public:
void setUserProfile( const TQString &profile ); void setUserProfile( const TQString &profile );
protected: protected:
virtual OscarContact *createNewContact( const TQString &contactId, Kopete::MetaContact *tqparentContact, const SSI& ssiItem ); virtual OscarContact *createNewContact( const TQString &contactId, Kopete::MetaContact *parentContact, const SSI& ssiItem );
virtual TQString sanitizedMessage( const TQString& message ); virtual TQString sanitizedMessage( const TQString& message );

@ -115,7 +115,7 @@
<data format="PNG" length="736">89504e470d0a1a0a0000000d49484452000000100000001008060000001ff3ff61000002a749444154388d7d91cd4b945114c69f73ef3b33ea7ca838a6a32681501194d2975050b4c82f92dc042e5a550b5bf60744bb16b58a8268218144d026da64da228a0a2b52d1c8c8c48f2c54669c19df79df793fefbd2d662469860e1cb870cef3e339cf2500989b5b88e56cb78b0857f2b6d3e67b0e0b0503baf4e57bdbb21eb8b6fadedf7fda4599a2e999f9bdb66b5fb75db79b3164b8c6b3504af8426852885adff3272dc31cb14c313e38d827fe0568593d77225811b8d8d810475555a89e88e0791e0c330f2515cc7c9e6ccb822f8d6f00964a009e6b5f8ed554211a0d235c5501ce1874c30411414a89582cdc0625c3e964e64c3900b35de768301000e70c1ae7608c81738e80a6a1b2b202b16814cd4d8946ced550b90c98e33a158c113ccf47ceccc3cc5b080534282591d94c637d6d1d5bd92c2ccb3af2f0d1e8bd92135cd7370184018088c0350ec639a291086291083ccf432e6740d3822c994cc54a1c5886f5d1755d48a920a584520a4a291000251508844c3a83baf82e1051e90996e5dc5959fe0d21fd4270424208015184e9ba8e0f139350d050460fd6de7ec80e5786313b3307c33021a484effb104222994c61ecc52b380ec1cbfcc281fcd33dd3379af7ec04d0f497c5ae8977afc77b7acf6262620a7a2e0d2505a0181a1a1388d735209f5a41647504bb833fdcad8de4e896c9864edd5edb00006d9bd49468c4c0406f318b420b2121a440eaf324226d3588b79c0f6a536303d6fc2a9e5d4d5c1bb8bfb6cc769829f7cd2010aaf77741f7dbb095d1517bb81b0dadf57dd1907bf3f1a5448b5656b52d2ea6c62b6bf076ad09355f17cc939d84face736185d10bd9d9541dfbbb5c1010018c1158f14d44205600ad878ebdf9f47cfceec6a6e5b0d6e39a1139d8a5b1e2707878e47f660a15aaddfcb9a4df4a3f79d921abf7f52cda1d737f0030624881b39160420000000049454e44ae426082</data> <data format="PNG" length="736">89504e470d0a1a0a0000000d49484452000000100000001008060000001ff3ff61000002a749444154388d7d91cd4b945114c69f73ef3b33ea7ca838a6a32681501194d2975050b4c82f92dc042e5a550b5bf60744bb16b58a8268218144d026da64da228a0a2b52d1c8c8c48f2c54669c19df79df793fefbd2d662469860e1cb870cef3e339cf2500989b5b88e56cb78b0857f2b6d3e67b0e0b0503baf4e57bdbb21eb8b6fadedf7fda4599a2e999f9bdb66b5fb75db79b3164b8c6b3504af8426852885adff3272dc31cb14c313e38d827fe0568593d77225811b8d8d810475555a89e88e0791e0c330f2515cc7c9e6ccb822f8d6f00964a009e6b5f8ed554211a0d235c5501ce1874c30411414a89582cdc0625c3e964e64c3900b35de768301000e70c1ae7608c81738e80a6a1b2b202b16814cd4d8946ced550b90c98e33a158c113ccf47ceccc3cc5b080534282591d94c637d6d1d5bd92c2ccb3af2f0d1e8bd92135cd7370184018088c0350ec639a291086291083ccf432e6740d3822c994cc54a1c5886f5d1755d48a920a584520a4a291000251508844c3a83baf82e1051e90996e5dc5959fe0d21fd4270424208015184e9ba8e0f139350d050460fd6de7ec80e5786313b3307c33021a484effb104222994c61ecc52b380ec1cbfcc281fcd33dd3379af7ec04d0f497c5ae8977afc77b7acf6262620a7a2e0d2505a0181a1a1388d735209f5a41647504bb833fdcad8de4e896c9864edd5edb00006d9bd49468c4c0406f318b420b2121a440eaf324226d3588b79c0f6a536303d6fc2a9e5d4d5c1bb8bfb6cc769829f7cd2010aaf77741f7dbb095d1517bb81b0dadf57dd1907bf3f1a5448b5656b52d2ea6c62b6bf076ad09355f17cc939d84face736185d10bd9d9541dfbbb5c1010018c1158f14d44205600ad878ebdf9f47cfceec6a6e5b0d6e39a1139d8a5b1e2707878e47f660a15aaddfcb9a4df4a3f79d921abf7f52cda1d737f0030624881b39160420000000049454e44ae426082</data>
</image> </image>
</images> </images>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
<includehints> <includehints>
<includehint>kpushbutton.h</includehint> <includehint>kpushbutton.h</includehint>
</includehints> </includehints>

@ -66,13 +66,13 @@ void ICQAddContactPage::showEvent(TQShowEvent *e)
AddContactPage::showEvent(e); AddContactPage::showEvent(e);
} }
bool ICQAddContactPage::apply(Kopete::Account* , Kopete::MetaContact *tqparentContact ) bool ICQAddContactPage::apply(Kopete::Account* , Kopete::MetaContact *parentContact )
{ {
kdDebug(14153) << k_funcinfo << "called; adding contact..." << endl; kdDebug(14153) << k_funcinfo << "called; adding contact..." << endl;
TQString contactId = addUI->uinEdit->text(); TQString contactId = addUI->uinEdit->text();
kdDebug(14153) << k_funcinfo << "uin=" << contactId << endl; kdDebug(14153) << k_funcinfo << "uin=" << contactId << endl;
return mAccount->addContact(contactId, tqparentContact, Kopete::Account::ChangeKABC ); return mAccount->addContact(contactId, parentContact, Kopete::Account::ChangeKABC );
} }

@ -39,7 +39,7 @@ public:
~ICQAddContactPage(); ~ICQAddContactPage();
virtual bool validateData(); virtual bool validateData();
virtual bool apply(Kopete::Account* , Kopete::MetaContact *tqparentContact); virtual bool apply(Kopete::Account* , Kopete::MetaContact *parentContact);
void setUINFromSearch( const TQString& ); void setUINFromSearch( const TQString& );

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

@ -479,7 +479,7 @@ If you do not currently have an ICQ account, please click the button to create o
<tabstop>chkHideIP</tabstop> <tabstop>chkHideIP</tabstop>
<tabstop>chkWebAware</tabstop> <tabstop>chkWebAware</tabstop>
</tabstops> </tabstops>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
<includehints> <includehints>
<includehint>kopetepasswordwidget.h</includehint> <includehint>kopetepasswordwidget.h</includehint>
</includehints> </includehints>

@ -607,5 +607,5 @@
<tabstop>emailEdit</tabstop> <tabstop>emailEdit</tabstop>
<tabstop>homepageEdit</tabstop> <tabstop>homepageEdit</tabstop>
</tabstops> </tabstops>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
</UI> </UI>

@ -112,5 +112,5 @@
</spacer> </spacer>
</grid> </grid>
</widget> </widget>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
</UI> </UI>

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

@ -479,7 +479,7 @@
<tabstop>closeButton</tabstop> <tabstop>closeButton</tabstop>
<tabstop>searchResults</tabstop> <tabstop>searchResults</tabstop>
</tabstops> </tabstops>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
<includehints> <includehints>
<includehint>kpushbutton.h</includehint> <includehint>kpushbutton.h</includehint>
<includehint>kpushbutton.h</includehint> <includehint>kpushbutton.h</includehint>

@ -245,5 +245,5 @@
</spacer> </spacer>
</vbox> </vbox>
</widget> </widget>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
</UI> </UI>

@ -101,7 +101,7 @@ Spaces
================================================================================ ================================================================================
Spaces should be used between the conditional / loop type and the Spaces should be used between the conditional / loop type and the
conditional statement. They should also not be used after tqparenthesis. However conditional statement. They should also not be used after parenthesis. However
the should be to mark of mathematical or comparative operators. the should be to mark of mathematical or comparative operators.
if ( foo == bar ) if ( foo == bar )
@ -188,7 +188,7 @@ written in this document. Those files that don't match will be corrected eventua
To make things easier on you, kate modelines are provided at the end of certain files To make things easier on you, kate modelines are provided at the end of certain files
to help enforce the coding style. If you're using the new C S&S Indenter that will be in to help enforce the coding style. If you're using the new C S&S Indenter that will be in
KDE 3.4, I can provide a patch that will automatically implement the space padding around KDE 3.4, I can provide a patch that will automatically implement the space padding around
tqparenthesis. Please mail me so I can send it to you. parenthesis. Please mail me so I can send it to you.
Matt Rogers <mattr@kde.org> Matt Rogers <mattr@kde.org>

@ -158,7 +158,7 @@ void AimLoginTask::sendLoginRequest()
outbuf->addTLV(0x0001, client()->userId().length(), client()->userId().latin1()); outbuf->addTLV(0x0001, client()->userId().length(), client()->userId().latin1());
TQByteArray digest( 17 ); //aptqparently MD5 digests are 16 bytes long TQByteArray digest( 17 ); //apparently MD5 digests are 16 bytes long
encodePassword( digest ); encodePassword( digest );
digest[16] = '\0'; //do this so that addTLV sees a NULL-terminator digest[16] = '\0'; //do this so that addTLV sees a NULL-terminator

@ -555,7 +555,7 @@ Connection* OscarAccount::setupConnection( const TQString& server, uint port )
bool OscarAccount::createContact(const TQString &contactId, bool OscarAccount::createContact(const TQString &contactId,
Kopete::MetaContact *tqparentContact) Kopete::MetaContact *parentContact)
{ {
/* We're not even online or connecting /* We're not even online or connecting
* (when getting server contacts), so don't bother * (when getting server contacts), so don't bother
@ -577,10 +577,10 @@ bool OscarAccount::createContact(const TQString &contactId,
*/ */
TQValueList<TLV> dummyList; TQValueList<TLV> dummyList;
if ( tqparentContact->isTemporary() ) if ( parentContact->isTemporary() )
{ {
SSI tempItem( contactId, 0, 0, 0xFFFF, dummyList, 0 ); SSI tempItem( contactId, 0, 0, 0xFFFF, dummyList, 0 );
return createNewContact( contactId, tqparentContact, tempItem ); return createNewContact( contactId, parentContact, tempItem );
} }
SSI ssiItem = d->engine->ssiManager()->findContact( contactId ); SSI ssiItem = d->engine->ssiManager()->findContact( contactId );
@ -597,7 +597,7 @@ bool OscarAccount::createContact(const TQString &contactId,
else else
{ {
kdDebug(OSCAR_GEN_DEBUG) << k_funcinfo << "Didn't find contact in list, creating new contact" << endl; kdDebug(OSCAR_GEN_DEBUG) << k_funcinfo << "Didn't find contact in list, creating new contact" << endl;
return createNewContact( contactId, tqparentContact, ssiItem ); return createNewContact( contactId, parentContact, ssiItem );
} }
} }
else else
@ -608,7 +608,7 @@ bool OscarAccount::createContact(const TQString &contactId,
kdDebug(OSCAR_GEN_DEBUG) << k_funcinfo << "Adding " << contactId << " to server side list" << endl; kdDebug(OSCAR_GEN_DEBUG) << k_funcinfo << "Adding " << contactId << " to server side list" << endl;
TQString groupName; TQString groupName;
Kopete::GroupList kopeteGroups = tqparentContact->groups(); //get the group list Kopete::GroupList kopeteGroups = parentContact->groups(); //get the group list
if ( kopeteGroups.isEmpty() || kopeteGroups.first() == Kopete::Group::topLevel() ) if ( kopeteGroups.isEmpty() || kopeteGroups.first() == Kopete::Group::topLevel() )
{ {
@ -617,7 +617,7 @@ bool OscarAccount::createContact(const TQString &contactId,
} }
else else
{ {
//aptqparently kopeteGroups.first() can be invalid. Attempt to prevent //apparently kopeteGroups.first() can be invalid. Attempt to prevent
//crashes in SSIData::findGroup(const TQString& name) //crashes in SSIData::findGroup(const TQString& name)
groupName = kopeteGroups.first() ? kopeteGroups.first()->displayName() : i18n("Buddies"); groupName = kopeteGroups.first() ? kopeteGroups.first()->displayName() : i18n("Buddies");
@ -631,7 +631,7 @@ bool OscarAccount::createContact(const TQString &contactId,
return false; return false;
} }
d->addContactMap[Oscar::normalize( contactId )] = tqparentContact; d->addContactMap[Oscar::normalize( contactId )] = parentContact;
addContactToSSI( Oscar::normalize( contactId ), groupName, true ); addContactToSSI( Oscar::normalize( contactId ), groupName, true );
return true; return true;
} }

@ -134,16 +134,16 @@ protected:
* Adds a contact to a meta contact * Adds a contact to a meta contact
*/ */
virtual bool createContact(const TQString &contactId, virtual bool createContact(const TQString &contactId,
Kopete::MetaContact *tqparentContact ); Kopete::MetaContact *parentContact );
/** /**
* Protocols using Oscar must implement this to perform the instantiation * Protocols using Oscar must implement this to perform the instantiation
* of their contact for Kopete. Called by @ref createContact(). * of their contact for Kopete. Called by @ref createContact().
* @param contactId theprotocol unique id of the contact * @param contactId theprotocol unique id of the contact
* @param tqparentContact the tqparent metacontact * @param parentContact the tqparent metacontact
* @return whether the creation succeeded or not * @return whether the creation succeeded or not
*/ */
virtual OscarContact *createNewContact( const TQString &contactId, Kopete::MetaContact *tqparentContact, const SSI& ssiItem ) = 0; virtual OscarContact *createNewContact( const TQString &contactId, Kopete::MetaContact *parentContact, const SSI& ssiItem ) = 0;
virtual TQString sanitizedMessage( const TQString& message ) = 0; virtual TQString sanitizedMessage( const TQString& message ) = 0;

@ -54,5 +54,5 @@
</spacer> </spacer>
</grid> </grid>
</widget> </widget>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
</UI> </UI>

@ -45,5 +45,5 @@
</widget> </widget>
</vbox> </vbox>
</widget> </widget>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
</UI> </UI>

@ -166,5 +166,5 @@
<tabstop>visibleContacts</tabstop> <tabstop>visibleContacts</tabstop>
<tabstop>invisibleContacts</tabstop> <tabstop>invisibleContacts</tabstop>
</tabstops> </tabstops>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
</UI> </UI>

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

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

@ -179,7 +179,7 @@
<tabstop>program</tabstop> <tabstop>program</tabstop>
<tabstop>provider</tabstop> <tabstop>provider</tabstop>
</tabstops> </tabstops>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
<includehints> <includehints>
<includehint>kurlrequester.h</includehint> <includehint>kurlrequester.h</includehint>
<includehint>klineedit.h</includehint> <includehint>klineedit.h</includehint>

@ -170,9 +170,9 @@ void SMSAccount::slotSendingFailure(const Kopete::Message &msg, const TQString &
} }
bool SMSAccount::createContact( const TQString &contactId, bool SMSAccount::createContact( const TQString &contactId,
Kopete::MetaContact * tqparentContact ) Kopete::MetaContact * parentContact )
{ {
if (new SMSContact(this, contactId, tqparentContact->displayName(), tqparentContact)) if (new SMSContact(this, contactId, parentContact->displayName(), parentContact))
return true; return true;
else else
return false; return false;

@ -68,7 +68,7 @@ protected slots:
protected: protected:
bool createContact(const TQString &contactId, Kopete::MetaContact *tqparentContact); bool createContact(const TQString &contactId, Kopete::MetaContact *parentContact);
private: private:
bool theSubEnable; bool theSubEnable;

@ -428,7 +428,7 @@
<includes> <includes>
<include location="global" impldecl="in implementation">knuminput.h</include> <include location="global" impldecl="in implementation">knuminput.h</include>
</includes> </includes>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
<includehints> <includehints>
<includehint>krestrictedline.h</includehint> <includehint>krestrictedline.h</includehint>
</includehints> </includehints>

@ -139,5 +139,5 @@
<tabstop>addNr</tabstop> <tabstop>addNr</tabstop>
<tabstop>addName</tabstop> <tabstop>addName</tabstop>
</tabstops> </tabstops>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
</UI> </UI>

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

@ -58,9 +58,9 @@ KActionMenu* TestbedAccount::actionMenu()
return mActionMenu; return mActionMenu;
} }
bool TestbedAccount::createContact(const TQString& contactId, Kopete::MetaContact* tqparentContact) bool TestbedAccount::createContact(const TQString& contactId, Kopete::MetaContact* parentContact)
{ {
TestbedContact* newContact = new TestbedContact( this, contactId, TestbedContact::Echo, tqparentContact->displayName(), tqparentContact ); TestbedContact* newContact = new TestbedContact( this, contactId, TestbedContact::Echo, parentContact->displayName(), parentContact );
return newContact != 0L; return newContact != 0L;
} }

@ -48,7 +48,7 @@ public:
* Creates a protocol specific Kopete::Contact subclass and adds it to the supplie * Creates a protocol specific Kopete::Contact subclass and adds it to the supplie
* Kopete::MetaContact * Kopete::MetaContact
*/ */
virtual bool createContact(const TQString& contactId, Kopete::MetaContact* tqparentContact); virtual bool createContact(const TQString& contactId, Kopete::MetaContact* parentContact);
/** /**
* Called when Kopete is set globally away * Called when Kopete is set globally away
*/ */

@ -156,5 +156,5 @@
</widget> </widget>
</vbox> </vbox>
</widget> </widget>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
</UI> </UI>

@ -103,5 +103,5 @@
</spacer> </spacer>
</vbox> </vbox>
</widget> </widget>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
</UI> </UI>

@ -180,7 +180,7 @@
<tabstop>mHostGroup</tabstop> <tabstop>mHostGroup</tabstop>
<tabstop>mRefresh</tabstop> <tabstop>mRefresh</tabstop>
</tabstops> </tabstops>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
<includehints> <includehints>
<includehint>kcombobox.h</includehint> <includehint>kcombobox.h</includehint>
<includehint>klineedit.h</includehint> <includehint>klineedit.h</includehint>

@ -347,7 +347,7 @@ However, the recommended way is to ask your administrator to create this directo
<Q_SLOTS> <Q_SLOTS>
<slot>installSamba()</slot> <slot>installSamba()</slot>
</Q_SLOTS> </Q_SLOTS>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
<includehints> <includehints>
<includehint>kpushbutton.h</includehint> <includehint>kpushbutton.h</includehint>
<includehint>knuminput.h</includehint> <includehint>knuminput.h</includehint>

@ -208,7 +208,7 @@
<tabstop>sOS</tabstop> <tabstop>sOS</tabstop>
<tabstop>sServer</tabstop> <tabstop>sServer</tabstop>
</tabstops> </tabstops>
<tqlayoutdefaults spacing="6" margin="0"/> <layoutdefaults spacing="6" margin="0"/>
<includehints> <includehints>
<includehint>klineedit.h</includehint> <includehint>klineedit.h</includehint>
<includehint>klineedit.h</includehint> <includehint>klineedit.h</includehint>

@ -75,12 +75,12 @@ bool WPAccount::checkHost(const TQString &Name)
} }
} }
bool WPAccount::createContact(const TQString &contactId, Kopete::MetaContact *tqparentContact ) bool WPAccount::createContact(const TQString &contactId, Kopete::MetaContact *parentContact )
{ {
// kdDebug(14170) << "[WPAccount::createContact] contactId: " << contactId << endl; // kdDebug(14170) << "[WPAccount::createContact] contactId: " << contactId << endl;
if (!contacts()[contactId]) { if (!contacts()[contactId]) {
WPContact *newContact = new WPContact(this, contactId, tqparentContact->displayName(), tqparentContact); WPContact *newContact = new WPContact(this, contactId, parentContact->displayName(), parentContact);
return newContact != 0; return newContact != 0;
} else { } else {
kdDebug(14170) << "[WPAccount::addContact] Contact already exists" << endl; kdDebug(14170) << "[WPAccount::addContact] Contact already exists" << endl;

@ -92,7 +92,7 @@ public slots:
void setOnlineStatus( const Kopete::OnlineStatus &status , const TQString &reason = TQString()); void setOnlineStatus( const Kopete::OnlineStatus &status , const TQString &reason = TQString());
protected: protected:
virtual bool createContact(const TQString &contactId, Kopete::MetaContact *tqparentContact); virtual bool createContact(const TQString &contactId, Kopete::MetaContact *parentContact);
private slots: private slots:
// void updateAccountId(); // void updateAccountId();

@ -152,7 +152,7 @@ void authresp_0x0b(const char *seed, const char *sn, const char *password, char
while (*magic_ptr != (int)NULL) { while (*magic_ptr != (int)NULL) {
const char *loc; const char *loc;
/* Ignore tqparentheses. */ /* Ignore parentheses. */
if (*magic_ptr == '(' || *magic_ptr == ')') { if (*magic_ptr == '(' || *magic_ptr == ')') {
magic_ptr++; magic_ptr++;

@ -93,5 +93,5 @@
</spacer> </spacer>
</vbox> </vbox>
</widget> </widget>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
</UI> </UI>

@ -463,5 +463,5 @@
<Q_SLOTS> <Q_SLOTS>
<slot access="private" specifier="nicht virtual">slotSelectPicture()</slot> <slot access="private" specifier="nicht virtual">slotSelectPicture()</slot>
</Q_SLOTS> </Q_SLOTS>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
</UI> </UI>

@ -643,5 +643,5 @@
<tabstop>homepageEdit</tabstop> <tabstop>homepageEdit</tabstop>
<tabstop>yahooIdEdit</tabstop> <tabstop>yahooIdEdit</tabstop>
</tabstops> </tabstops>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
</UI> </UI>

@ -333,5 +333,5 @@
<slot>btnCancel_clicked()</slot> <slot>btnCancel_clicked()</slot>
<slot>btnInvite_clicked()</slot> <slot>btnInvite_clicked()</slot>
</Q_SLOTS> </Q_SLOTS>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
</UI> </UI>

@ -115,5 +115,5 @@
</spacer> </spacer>
</grid> </grid>
</widget> </widget>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
</UI> </UI>

@ -92,5 +92,5 @@
<tabstops> <tabstops>
<tabstop>radioOnline</tabstop> <tabstop>radioOnline</tabstop>
</tabstops> </tabstops>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
</UI> </UI>

@ -155,5 +155,5 @@
<data format="XPM.GZ" length="4833">789c8597596f23470e80dfe75718c3b7c182e9eabb11ec834fc9873cbeaf601fc86ec9966df994cfc5fef794483633934d10c836fcb9582cde55fee5dbd2d9de68e9db2f5f9ee7349fb64bed153d2d7deb5e66b38fdffef3efff7ef99aa64b8baf2c5b4abffeebcb57dc5c6a9720499290640b8613e110ff22eb941b07657e7256f90be742e4a7c6a9ed076791c7a1732efbd784d3f817615a71167db0e55c0a17ce95c88f8ced3c7e74d6f306cea29fd159f583b3e8a75367d18f5bce8df0b63389be67e3ccfcd97716fd78e22cfaf1d459edefedcbedbc63e75af4cf85b33edeb8616cfef1b5b39eb7e72cf6c28b7166fb53678df7b5b3fadf388b3d503a8b3d40c6b9eaa35767d9cf37c6a5e53f73d6f3769d55bedf5f2789ac6bfcf2de1fda33ce4cdfbb716eeb6fce1acf1de3c2f2bbe7acf573605cdafe2b67f5efd359f20bb97165febe38b3c453fd2bfa7cd0a67165fea97c9db416ff1de3b1e9d77a6d12567bf8c159ed9d1ab7969fc2b8d378e2ba304579c93769bd719457fd524f2184cae221f51bd250a8fd3c35ae4cfec1b8b6fa06e3c6eaffc859d651f215b2d0c7efdab8327b969d459e9e8d7bfd57c68df587c43be4c1e20b685c1b9f0b17c1e283cfce927f96f911ca40d63fcbce7afebd31eb3a91b3fa37376ead9e64dea5759606a94f546eb23499883d9bc69932bef4acf22cf594725c1f8bfca9b3c8d3aa711e82c82bb73de3817111a4fe2171d67e1a1b97ba8e87ce5a8f12bfb48b2cfae8ceb85206894f9666135bff2e5c45d6fae894a3393a3f5be13aaeb7729eca4ff2d6ce3f5b701ef2b1c95f0aa7715dfb4de657519675d0fc8d8c9ba0f527f12faab234fd8fc695f1ab716dfa3f84ebb2089dec5f779678d381711d74beae398b7f540b3751bfd6e39ab1c9033b6bbd07e326687dcb3c2da8ecf47cfa301e9bbe37e389c94b3c0a2edba0f5f361dc194b3c8b36eed77acf9c453fab7f6d95587e6e8d83c957c25dc9668fdc5fc538b2c6e3a6e754e7adcc836252b6a9d69bccffb2ad535d67e98fb2ab538befaab3e8439947e5b84e82f6ffa17165f1bd7096fcc1ccb8b67a981b375a0f20f92d2775b078493dd54c75aaef0de9dfba75167fea2eb2f683dc5771388d753fbe396b7fca7c6b52ea2c5e57ce621fcbfdd26464f1812767ed8f63e3ced665de34c464fe9e1bb3d5b3f45bc3dca67a7fc9fba7697b46a9bf66cc13cb8fcc8b66c2960f3832b6f3988dad1e2828b799c53371d6f9766b9c5b7f4afe286983f5c3aeb3be177ace6c1ecc9cb51f6a678def8a7169f351fca710f5a93d9db3d64febacf9981aa76a2f5e3b6b7d5d1af7f6df3aebfb67e4acf93f72d6f972675cd83c7d77d67cac3bebfdfce9acf7eb87b3c66b665cdabc5feed9f44bfd51caade59395dbc4fc3f33cecc9f9b9e35bf786fdccfffc459e7ffc059eb7fe2acefcfd459df13dbceda5f4367bddffed8affdf0665c243a6f769c351f6367f51f7ad6fcefcf9dd57e72567fd959e3dd3a6bbc3b677daf34ce6affadb3dadbdb57263a5f46ce7adf8e9dd5dededfbe5e2f9cb5de5b678df7bb71a5fa59f767dccf77cd57d6f7136c185b7e79d359f3159cf53df7e8acf19e19f7f57ee5acef9b0d67f5b733b6fa844b63f38f07ceea9fcc3fca5b9bef58199b3dbce5acefa53567bd6fee8c73d54f95b3fa3b34b6fcc3b3b3f6dba1b3f6afe6a788fb6bad9f1f3f08f19b90b18ddff0f3dafefc2fe4bb284948f1b7f1e2e73fca4ff012af708ad77883b77f2f8f33bc8b9aeff1011ff1099f718e2ff88a6ff88e1ff8196da33fc92fe30aaee21aaee3060e70889bb885dbb88323dc8d7a407df941be8dd2dfa3ec5e94dac7033cc4233cc6133cc5333cc78bffb327c18029669863812556d1ef1a9ba8168080a1850ec608daaf30814bb882296ec035dc486426700b33b8837b78c0213cc2133ce367af3f7a93c01c5e700b5ee10d6fe11d093ee01396610556f104d6601d36a2d77abf0da2f41036610bb6b1841d18c12e7c873dd887033884233886133885b318297d3fc558e114cee1021208d1e01432c8a180122aa8e3c5190f2322c63bb507995aea62bc37698c9f34a14bba822d9ad235ddd02dcde80e87744f0f7fc823d1233de1363d634d737aa1577aa3ebf8047ba70ffaa4655aa1555aa375b37f0c298e6923ca0fb0a1212cd3266dd136edd08876e93bedd13e1dd0211d997e88f6031dd3099d624e67744e17f15f8b40296594cb273ef61632aa5ff34515d5d43032707c19449fd6e993db283b8217ee62fc0630fa31bf1cdf037c493bb1724ef98a162d30e56bcae185467cc3b731dfa0f935f919dff13daef1033ff2133fc77d039e73d41da55ff90d268b8afba17ea27d30a18edff9833f7999577895d7a88421aff31b6fc0e04ff5c6314acc031ef2266cc4c7ce036ff12ca66a10ff75d95eacfd2ccf3b0bfd38e651ac93f7d83b77f84e47d1e6f1222e0bf9c5ef3ff7a3f690766f4ffd0490aa85affffbf5cbef985d44a8</data> <data format="XPM.GZ" length="4833">789c8597596f23470e80dfe75718c3b7c182e9eabb11ec834fc9873cbeaf601fc86ec9966df994cfc5fef794483633934d10c836fcb9582cde55fee5dbd2d9de68e9db2f5f9ee7349fb64bed153d2d7deb5e66b38fdffef3efff7ef99aa64b8baf2c5b4abffeebcb57dc5c6a9720499290640b8613e110ff22eb941b07657e7256f90be742e4a7c6a9ed076791c7a1732efbd784d3f817615a71167db0e55c0a17ce95c88f8ced3c7e74d6f306cea29fd159f583b3e8a75367d18f5bce8df0b63389be67e3ccfcd97716fd78e22cfaf1d459edefedcbedbc63e75af4cf85b33edeb8616cfef1b5b39eb7e72cf6c28b7166fb53678df7b5b3fadf388b3d503a8b3d40c6b9eaa35767d9cf37c6a5e53f73d6f3769d55bedf5f2789ac6bfcf2de1fda33ce4cdfbb716eeb6fce1acf1de3c2f2bbe7acf573605cdafe2b67f5efd359f20bb97165febe38b3c453fd2bfa7cd0a67165fea97c9db416ff1de3b1e9d77a6d12567bf8c159ed9d1ab7969fc2b8d378e2ba304579c93769bd719457fd524f2184cae221f51bd250a8fd3c35ae4cfec1b8b6fa06e3c6eaffc859d651f215b2d0c7efdab8327b969d459e9e8d7bfd57c68df587c43be4c1e20b685c1b9f0b17c1e283cfce927f96f911ca40d63fcbce7afebd31eb3a91b3fa37376ead9e64dea5759606a94f546eb23499883d9bc69932bef4acf22cf594725c1f8bfca9b3c8d3aa711e82c82bb73de3817111a4fe2171d67e1a1b97ba8e87ce5a8f12bfb48b2cfae8ceb85206894f9666135bff2e5c45d6fae894a3393a3f5be13aaeb7729eca4ff2d6ce3f5b701ef2b1c95f0aa7715dfb4de657519675d0fc8d8c9ba0f527f12faab234fd8fc695f1ab716dfa3f84ebb2089dec5f779678d381711d74beae398b7f540b3751bfd6e39ab1c9033b6bbd07e326687dcb3c2da8ecf47cfa301e9bbe37e389c94b3c0a2edba0f5f361dc194b3c8b36eed77acf9c453fab7f6d95587e6e8d83c957c25dc9668fdc5fc538b2c6e3a6e754e7adcc836252b6a9d69bccffb2ad535d67e98fb2ab538befaab3e8439947e5b84e82f6ffa17165f1bd7096fcc1ccb8b67a981b375a0f20f92d2775b078493dd54c75aaef0de9dfba75167fea2eb2f683dc5771388d753fbe396b7fca7c6b52ea2c5e57ce621fcbfdd26464f1812767ed8f63e3ced665de34c464fe9e1bb3d5b3f45bc3dca67a7fc9fba7697b46a9bf66cc13cb8fcc8b66c2960f3832b6f3988dad1e2828b799c53371d6f9766b9c5b7f4afe286983f5c3aeb3be177ace6c1ecc9cb51f6a678def8a7169f351fca710f5a93d9db3d64febacf9981aa76a2f5e3b6b7d5d1af7f6df3aebfb67e4acf93f72d6f972675cd83c7d77d67cac3bebfdfce9acf7eb87b3c66b665cdabc5feed9f44bfd51caade59395dbc4fc3f33cecc9f9b9e35bf786fdccfffc459e7ffc059eb7fe2acefcfd459df13dbceda5f4367bddffed8affdf0665c243a6f769c351f6367f51f7ad6fcefcf9dd57e72567fd959e3dd3a6bbc3b677daf34ce6affadb3dadbdb57263a5f46ce7adf8e9dd5dededfbe5e2f9cb5de5b678df7bb71a5fa59f767dccf77cd57d6f7136c185b7e79d359f3159cf53df7e8acf19e19f7f57ee5acef9b0d67f5b733b6fa844b63f38f07ceea9fcc3fca5b9bef58199b3dbce5acefa53567bd6fee8c73d54f95b3fa3b34b6fcc3b3b3f6dba1b3f6afe6a788fb6bad9f1f3f08f19b90b18ddff0f3dafefc2fe4bb284948f1b7f1e2e73fca4ff012af708ad77883b77f2f8f33bc8b9aeff1011ff1099f718e2ff88a6ff88e1ff8196da33fc92fe30aaee21aaee3060e70889bb885dbb88323dc8d7a407df941be8dd2dfa3ec5e94dac7033cc4233cc6133cc5333cc78bffb327c18029669863812556d1ef1a9ba8168080a1850ec608daaf30814bb882296ec035dc486426700b33b8837b78c0213cc2133ce367af3f7a93c01c5e700b5ee10d6fe11d093ee01396610556f104d6601d36a2d77abf0da2f41036610bb6b1841d18c12e7c873dd887033884233886133885b318297d3fc558e114cee1021208d1e01432c8a180122aa8e3c5190f2322c63bb507995aea62bc37698c9f34a14bba822d9ad235ddd02dcde80e87744f0f7fc823d1233de1363d634d737aa1577aa3ebf8047ba70ffaa4655aa1555aa375b37f0c298e6923ca0fb0a1212cd3266dd136edd08876e93bedd13e1dd0211d997e88f6031dd3099d624e67744e17f15f8b40296594cb273ef61632aa5ff34515d5d43032707c19449fd6e993db283b8217ee62fc0630fa31bf1cdf037c493bb1724ef98a162d30e56bcae185467cc3b731dfa0f935f919dff13daef1033ff2133fc77d039e73d41da55ff90d268b8afba17ea27d30a18edff9833f7999577895d7a88421aff31b6fc0e04ff5c6314acc031ef2266cc4c7ce036ff12ca66a10ff75d95eacfd2ccf3b0bfd38e651ac93f7d83b77f84e47d1e6f1222e0bf9c5ef3ff7a3f690766f4ffd0490aa85affffbf5cbef985d44a8</data>
</image> </image>
</images> </images>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
</UI> </UI>

@ -229,5 +229,5 @@
<tabstop>stateEdit</tabstop> <tabstop>stateEdit</tabstop>
<tabstop>countryEdit</tabstop> <tabstop>countryEdit</tabstop>
</tabstops> </tabstops>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
</UI> </UI>

@ -663,7 +663,7 @@ YahooContact *YahooAccount::contact( const TQString &id )
return static_cast<YahooContact *>(contacts()[id]); return static_cast<YahooContact *>(contacts()[id]);
} }
bool YahooAccount::createContact(const TQString &contactId, Kopete::MetaContact *tqparentContact ) bool YahooAccount::createContact(const TQString &contactId, Kopete::MetaContact *parentContact )
{ {
// kdDebug(YAHOO_GEN_DEBUG) << " contactId: " << contactId; // kdDebug(YAHOO_GEN_DEBUG) << " contactId: " << contactId;
@ -674,7 +674,7 @@ bool YahooAccount::createContact(const TQString &contactId, Kopete::MetaContact
// -- actualy (oct 2004) this method is only called when new contact are added. but this will // -- actualy (oct 2004) this method is only called when new contact are added. but this will
// maybe change and you will be noticed --Olivier // maybe change and you will be noticed --Olivier
YahooContact *newContact = new YahooContact( this, contactId, YahooContact *newContact = new YahooContact( this, contactId,
tqparentContact->displayName(), tqparentContact ); parentContact->displayName(), parentContact );
return newContact != 0; return newContact != 0;
} }
else else

@ -153,7 +153,7 @@ protected:
/** /**
* Adds our Yahoo contact to a metacontact * Adds our Yahoo contact to a metacontact
*/ */
virtual bool createContact(const TQString &contactId, Kopete::MetaContact *tqparentContact); virtual bool createContact(const TQString &contactId, Kopete::MetaContact *parentContact);
virtual bool createChatContact( const TQString &nick ); virtual bool createChatContact( const TQString &nick );

@ -487,12 +487,12 @@ IPWidget::IPWidget( TQWidget *tqparent, bool isnewaccount, const char *name )
"If unsure, contact your Internet Service Provider"); "If unsure, contact your Internet Service Provider");
ipLayout->addWidget(sub_label, 1, 0); ipLayout->addWidget(sub_label, 1, 0);
subnettqmask_l = new IPLineEdit(ipWidget); subnetmask_l = new IPLineEdit(ipWidget);
sub_label->setBuddy(subnettqmask_l); sub_label->setBuddy(subnetmask_l);
ipLayout->addWidget(subnettqmask_l, 1, 1); ipLayout->addWidget(subnetmask_l, 1, 1);
TQWhatsThis::add(sub_label,tmp); TQWhatsThis::add(sub_label,tmp);
TQWhatsThis::add(subnettqmask_l,tmp); TQWhatsThis::add(subnetmask_l,tmp);
autoname = new TQCheckBox(i18n("&Auto-configure hostname from this IP"), tqparent); autoname = new TQCheckBox(i18n("&Auto-configure hostname from this IP"), tqparent);
autoname->setChecked(gpppdata.autoname()); autoname->setChecked(gpppdata.autoname());
@ -523,7 +523,7 @@ IPWidget::IPWidget( TQWidget *tqparent, bool isnewaccount, const char *name )
} }
else { else {
ipaddress_l->setText(gpppdata.ipaddr()); ipaddress_l->setText(gpppdata.ipaddr());
subnettqmask_l->setText(gpppdata.subnettqmask()); subnetmask_l->setText(gpppdata.subnettqmask());
staticadd_rb->setChecked(true); staticadd_rb->setChecked(true);
autoname->setChecked(false); autoname->setChecked(false);
} }
@ -560,7 +560,7 @@ void IPWidget::save() {
gpppdata.setSubnettqmask("0.0.0.0"); gpppdata.setSubnettqmask("0.0.0.0");
} else { } else {
gpppdata.setIpaddr(ipaddress_l->text()); gpppdata.setIpaddr(ipaddress_l->text());
gpppdata.setSubnettqmask(subnettqmask_l->text()); gpppdata.setSubnettqmask(subnetmask_l->text());
} }
gpppdata.setAutoname(autoname->isChecked()); gpppdata.setAutoname(autoname->isChecked());
} }
@ -571,13 +571,13 @@ void IPWidget::hitIPSelect( int i ) {
ipaddress_label->setEnabled(false); ipaddress_label->setEnabled(false);
sub_label->setEnabled(false); sub_label->setEnabled(false);
ipaddress_l->setEnabled(false); ipaddress_l->setEnabled(false);
subnettqmask_l->setEnabled(false); subnetmask_l->setEnabled(false);
} }
else { else {
ipaddress_label->setEnabled(true); ipaddress_label->setEnabled(true);
sub_label->setEnabled(true); sub_label->setEnabled(true);
ipaddress_l->setEnabled(true); ipaddress_l->setEnabled(true);
subnettqmask_l->setEnabled(true); subnetmask_l->setEnabled(true);
} }
} }

@ -139,7 +139,7 @@ private:
TQRadioButton *staticadd_rb; TQRadioButton *staticadd_rb;
IPLineEdit *ipaddress_l; IPLineEdit *ipaddress_l;
IPLineEdit *subnettqmask_l; IPLineEdit *subnetmask_l;
TQCheckBox *autoname; TQCheckBox *autoname;
}; };

@ -249,10 +249,10 @@ MonthlyWidget::MonthlyWidget(TQWidget *tqparent) :
bbox->tqlayout(); bbox->tqlayout();
currentMonth(); currentMonth();
tqlayoutWidget(); layoutWidget();
} }
void MonthlyWidget::tqlayoutWidget() { void MonthlyWidget::layoutWidget() {
if(tl) if(tl)
delete tl; delete tl;

@ -51,7 +51,7 @@ private slots:
void slotSelectionChanged(); void slotSelectionChanged();
private: private:
void tqlayoutWidget(); void layoutWidget();
void plotMonth(); void plotMonth();
/** /**

@ -1,4 +1,4 @@
// helper macros for tqlayouting // helper macros for layouting
#ifndef __MACROS__H__ #ifndef __MACROS__H__
#define __MACROS__H__ #define __MACROS__H__

@ -160,8 +160,8 @@
<function specifier="non virtual">load()</function> <function specifier="non virtual">load()</function>
<function specifier="non virtual">save()</function> <function specifier="non virtual">save()</function>
</functions> </functions>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
<includehints> <includehints>
<includehint>klistview.h</includehint> <includehint>klistview.h</includehint>
</includehints> </includehints>

@ -100,6 +100,6 @@
<includes> <includes>
<include location="global" impldecl="in implementation">kdialogbase.h</include> <include location="global" impldecl="in implementation">kdialogbase.h</include>
</includes> </includes>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
</UI> </UI>

@ -343,8 +343,8 @@ Remote Desktop Connection only supports systems that use VNC.</string>
<functions> <functions>
<function access="protected" specifier="non virtual">enableBrowsingArea( bool enable )</function> <function access="protected" specifier="non virtual">enableBrowsingArea( bool enable )</function>
</functions> </functions>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
<includehints> <includehints>
<includehint>kcombobox.h</includehint> <includehint>kcombobox.h</includehint>
</includehints> </includehints>

@ -179,7 +179,7 @@ void MainDialogWidget::enableBrowsingArea( bool enable )
setMinimumSize(tqminimumSize().width(), (h > 0) ? h : 0); setMinimumSize(tqminimumSize().width(), (h > 0) ? h : 0);
resize(width(), height()-hOffset); resize(width(), height()-hOffset);
TQTimer::singleShot( 0, tqparentWidget(), TQT_SLOT( adjustSize() ) ); TQTimer::singleShot( 0, parentWidget(), TQT_SLOT( adjustSize() ) );
} }
if (enable) if (enable)

@ -68,7 +68,7 @@
+ if ( g_embed_wnd ) + if ( g_embed_wnd )
+ { + {
+ XRetqparentWindow(g_display, g_wnd, g_embed_wnd, 0, 0); + XReparentWindow(g_display, g_wnd, g_embed_wnd, 0, 0);
+ } + }
+ +
input_tqmask = KeyPressMask | KeyReleaseMask | ButtonPressMask | ButtonReleaseMask | input_tqmask = KeyPressMask | KeyReleaseMask | ButtonPressMask | ButtonReleaseMask |

@ -343,7 +343,7 @@
</widget> </widget>
<widget class="TQLabel" row="3" column="0"> <widget class="TQLabel" row="3" column="0">
<property name="name"> <property name="name">
<cstring>tqlayoutLabel</cstring> <cstring>layoutLabel</cstring>
</property> </property>
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy> <sizepolicy>
@ -509,6 +509,6 @@
<function specifier="non virtual">setUseKWallet( bool b )</function> <function specifier="non virtual">setUseKWallet( bool b )</function>
<function specifier="non virtual" returnType="bool">useKWallet()</function> <function specifier="non virtual" returnType="bool">useKWallet()</function>
</functions> </functions>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
</UI> </UI>

@ -160,6 +160,6 @@
<function specifier="non virtual">setUseKWallet( bool b )</function> <function specifier="non virtual">setUseKWallet( bool b )</function>
<function specifier="non virtual" returnType="bool">useKWallet()</function> <function specifier="non virtual" returnType="bool">useKWallet()</function>
</functions> </functions>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
</UI> </UI>

@ -188,7 +188,7 @@
<property name="frameShadow"> <property name="frameShadow">
<enum>Plain</enum> <enum>Plain</enum>
</property> </property>
<property name="tqlayoutMargin" stdset="0"> <property name="layoutMargin" stdset="0">
</property> </property>
<vbox> <vbox>
<property name="name"> <property name="name">
@ -495,7 +495,7 @@ Most VNC clients use a display number instead of the actual port. This display n
<tabstop>passwordInput</tabstop> <tabstop>passwordInput</tabstop>
<tabstop>portInput</tabstop> <tabstop>portInput</tabstop>
</tabstops> </tabstops>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
<includehints> <includehints>
<includehint>knuminput.h</includehint> <includehint>knuminput.h</includehint>
<includehint>knuminput.h</includehint> <includehint>knuminput.h</includehint>

@ -181,7 +181,7 @@ void Configuration::loadFromKConfig() {
for (int i = 0; i < num; i++) for (int i = 0; i < num; i++)
invitationList.push_back(Invitation(&c, i)); invitationList.push_back(Invitation(&c, i));
tqinvalidateOldInvitations(); invalidateOldInvitations();
if (invNum != invitationList.size()) if (invNum != invitationList.size())
emit invitationNumChanged(invitationList.size()); emit invitationNumChanged(invitationList.size());
@ -212,7 +212,7 @@ void Configuration::saveToKConfig() {
} }
void Configuration::saveToDialogs() { void Configuration::saveToDialogs() {
tqinvalidateOldInvitations(); invalidateOldInvitations();
TQValueList<Invitation>::iterator it = invitationList.begin(); TQValueList<Invitation>::iterator it = invitationList.begin();
while (it != invitationList.end()) { while (it != invitationList.end()) {
Invitation &inv = *(it++); Invitation &inv = *(it++);
@ -241,7 +241,7 @@ Invitation Configuration::createInvitation() {
return inv; return inv;
} }
void Configuration::tqinvalidateOldInvitations() { void Configuration::invalidateOldInvitations() {
TQValueList<Invitation>::iterator it = invitationList.begin(); TQValueList<Invitation>::iterator it = invitationList.begin();
while (it != invitationList.end()) { while (it != invitationList.end()) {
if (!(*it).isValid()) if (!(*it).isValid())

@ -97,7 +97,7 @@ private:
void saveToDialogs(); void saveToDialogs();
Invitation createInvitation(); Invitation createInvitation();
void closeInvDlg(); void closeInvDlg();
void tqinvalidateOldInvitations(); void invalidateOldInvitations();
void setKInetdEnabled(const TQDateTime &date); void setKInetdEnabled(const TQDateTime &date);
void setKInetdEnabled(bool enabled); void setKInetdEnabled(bool enabled);
void setKInetdServiceRegistrationEnabled(bool enabled); void setKInetdServiceRegistrationEnabled(bool enabled);

@ -204,5 +204,5 @@
</spacer> </spacer>
</grid> </grid>
</widget> </widget>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
</UI> </UI>

@ -192,6 +192,6 @@
<signal>emailInviteClicked()</signal> <signal>emailInviteClicked()</signal>
<signal>manageInviteClicked()</signal> <signal>manageInviteClicked()</signal>
</Q_SIGNALS> </Q_SIGNALS>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
</UI> </UI>

@ -209,7 +209,7 @@
<slot>listSizeChanged( int i )</slot> <slot>listSizeChanged( int i )</slot>
<slot>listSelectionChanged()</slot> <slot>listSelectionChanged()</slot>
</Q_SLOTS> </Q_SLOTS>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
<includehints> <includehints>
<includehint>klistview.h</includehint> <includehint>klistview.h</includehint>
</includehints> </includehints>

@ -236,6 +236,6 @@ Give the information below to the person that you want to invite (&lt;a href="wh
</widget> </widget>
</grid> </grid>
</widget> </widget>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
</UI> </UI>

@ -36,7 +36,7 @@ rfbSendtqCursorShape(cl)
rfbFramebufferUpdateRectHeader rect; rfbFramebufferUpdateRectHeader rect;
rfbXCursorColors colors; rfbXCursorColors colors;
int saved_ublen; int saved_ublen;
int bitmapRowBytes, tqmaskBytes, dataBytes; int bitmapRowBytes, maskBytes, dataBytes;
int i, j; int i, j;
CARD8 *bitmapData; CARD8 *bitmapData;
CARD8 bitmapByte; CARD8 bitmapByte;
@ -85,21 +85,21 @@ rfbSendtqCursorShape(cl)
/* Calculate data sizes. */ /* Calculate data sizes. */
bitmapRowBytes = (pCursor->width + 7) / 8; bitmapRowBytes = (pCursor->width + 7) / 8;
tqmaskBytes = bitmapRowBytes * pCursor->height; maskBytes = bitmapRowBytes * pCursor->height;
dataBytes = (cl->useRichCursorEncoding) ? dataBytes = (cl->useRichCursorEncoding) ?
(pCursor->width * pCursor->height * (pCursor->width * pCursor->height *
(cl->format.bitsPerPixel / 8)) : tqmaskBytes; (cl->format.bitsPerPixel / 8)) : maskBytes;
/* Send buffer contents if needed. */ /* Send buffer contents if needed. */
if ( cl->ublen + sz_rfbFramebufferUpdateRectHeader + if ( cl->ublen + sz_rfbFramebufferUpdateRectHeader +
sz_rfbXCursorColors + tqmaskBytes + dataBytes > UPDATE_BUF_SIZE ) { sz_rfbXCursorColors + maskBytes + dataBytes > UPDATE_BUF_SIZE ) {
if (!rfbSendUpdateBuf(cl)) if (!rfbSendUpdateBuf(cl))
return FALSE; return FALSE;
} }
if ( cl->ublen + sz_rfbFramebufferUpdateRectHeader + if ( cl->ublen + sz_rfbFramebufferUpdateRectHeader +
sz_rfbXCursorColors + tqmaskBytes + dataBytes > UPDATE_BUF_SIZE ) { sz_rfbXCursorColors + maskBytes + dataBytes > UPDATE_BUF_SIZE ) {
return FALSE; /* FIXME. */ return FALSE; /* FIXME. */
} }
@ -347,7 +347,7 @@ void rfbConvertLSBCursorBitmapOrMask(int width,int height,unsigned char* bitmap)
/* Cursor creation. You "paint" a cursor and let these routines do the work */ /* Cursor creation. You "paint" a cursor and let these routines do the work */
rfbCursorPtr rfbMakeXCursor(int width,int height,char* cursorString,char* tqmaskString) rfbCursorPtr rfbMakeXCursor(int width,int height,char* cursorString,char* maskString)
{ {
int i,j,w=(width+7)/8; int i,j,w=(width+7)/8;
rfbCursorPtr cursor = (rfbCursorPtr)calloc(1,sizeof(rfbCursor)); rfbCursorPtr cursor = (rfbCursorPtr)calloc(1,sizeof(rfbCursor));
@ -364,9 +364,9 @@ rfbCursorPtr rfbMakeXCursor(int width,int height,char* cursorString,char* tqmask
for(i=0,bit=0x80;i<width;i++,bit=(bit&1)?0x80:bit>>1,cp++) for(i=0,bit=0x80;i<width;i++,bit=(bit&1)?0x80:bit>>1,cp++)
if(*cp!=' ') cursor->source[j*w+i/8]|=bit; if(*cp!=' ') cursor->source[j*w+i/8]|=bit;
if(tqmaskString) { if(maskString) {
cursor->tqmask = (unsigned char*)calloc(w,height); cursor->tqmask = (unsigned char*)calloc(w,height);
for(j=0,cp=tqmaskString;j<height;j++) for(j=0,cp=maskString;j<height;j++)
for(i=0,bit=0x80;i<width;i++,bit=(bit&1)?0x80:bit>>1,cp++) for(i=0,bit=0x80;i<width;i++,bit=(bit&1)?0x80:bit>>1,cp++)
if(*cp!=' ') cursor->tqmask[j*w+i/8]|=bit; if(*cp!=' ') cursor->tqmask[j*w+i/8]|=bit;
} else } else

@ -744,7 +744,7 @@ extern Bool rfbSendtqCursorShape(rfbClientPtr cl/*, rfbScreenInfoPtr pScreen*/);
extern Bool rfbSendSoftCursor(rfbClientPtr cl, Bool cursorWasChanged); extern Bool rfbSendSoftCursor(rfbClientPtr cl, Bool cursorWasChanged);
extern unsigned char rfbReverseByte[0x100]; extern unsigned char rfbReverseByte[0x100];
extern void rfbConvertLSBCursorBitmapOrMask(int width,int height,unsigned char* bitmap); extern void rfbConvertLSBCursorBitmapOrMask(int width,int height,unsigned char* bitmap);
extern rfbCursorPtr rfbMakeXCursor(int width,int height,char* cursorString,char* tqmaskString); extern rfbCursorPtr rfbMakeXCursor(int width,int height,char* cursorString,char* maskString);
extern char* rfbMakeMaskForXCursor(int width,int height,char* cursorString); extern char* rfbMakeMaskForXCursor(int width,int height,char* cursorString);
extern void MakeXCursorFromRichCursor(rfbScreenInfoPtr rfbScreen,rfbCursorPtr cursor); extern void MakeXCursorFromRichCursor(rfbScreenInfoPtr rfbScreen,rfbCursorPtr cursor);
extern void MakeRichCursorFromXCursor(rfbScreenInfoPtr rfbScreen,rfbCursorPtr cursor); extern void MakeRichCursorFromXCursor(rfbScreenInfoPtr rfbScreen,rfbCursorPtr cursor);

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

@ -333,5 +333,5 @@
<Q_SLOTS> <Q_SLOTS>
<slot access="protected">passwordChanged(const QString &amp;)</slot> <slot access="protected">passwordChanged(const QString &amp;)</slot>
</Q_SLOTS> </Q_SLOTS>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
</UI> </UI>

@ -382,7 +382,7 @@
<slot>kcl_clicked(TQListViewItem *)</slot> <slot>kcl_clicked(TQListViewItem *)</slot>
<slot>kvl_clicked(TQListViewItem*)</slot> <slot>kvl_clicked(TQListViewItem*)</slot>
</Q_SLOTS> </Q_SLOTS>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
<includehints> <includehints>
<includehint>klistview.h</includehint> <includehint>klistview.h</includehint>
<includehint>knuminput.h</includehint> <includehint>knuminput.h</includehint>

@ -1059,5 +1059,5 @@
<slot>coloursSetEnable()</slot> <slot>coloursSetEnable()</slot>
<slot>changed()</slot> <slot>changed()</slot>
</Q_SLOTS> </Q_SLOTS>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
</UI> </UI>

@ -536,5 +536,5 @@
<slot access="protected">showWallpaperPixmap(const QString &amp;)</slot> <slot access="protected">showWallpaperPixmap(const QString &amp;)</slot>
<slot>changed()</slot> <slot>changed()</slot>
</Q_SLOTS> </Q_SLOTS>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
</UI> </UI>

@ -1253,7 +1253,7 @@
<slot>chanaged()</slot> <slot>chanaged()</slot>
<slot>changed()</slot> <slot>changed()</slot>
</Q_SLOTS> </Q_SLOTS>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
<includehints> <includehints>
<includehint>kcolorbutton.h</includehint> <includehint>kcolorbutton.h</includehint>
<includehint>kcolorbutton.h</includehint> <includehint>kcolorbutton.h</includehint>

@ -314,7 +314,7 @@
<slot access="protected">showWallpaperPixmap(const QString &amp;)</slot> <slot access="protected">showWallpaperPixmap(const QString &amp;)</slot>
<slot>changed()</slot> <slot>changed()</slot>
</Q_SLOTS> </Q_SLOTS>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
<includehints> <includehints>
<includehint>kurlrequester.h</includehint> <includehint>kurlrequester.h</includehint>
<includehint>klineedit.h</includehint> <includehint>klineedit.h</includehint>

@ -248,5 +248,5 @@
<includes> <includes>
<include location="global" impldecl="in declaration">kseparator.h</include> <include location="global" impldecl="in declaration">kseparator.h</include>
</includes> </includes>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
</UI> </UI>

@ -168,5 +168,5 @@
</widget> </widget>
</vbox> </vbox>
</widget> </widget>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
</UI> </UI>

@ -53,5 +53,5 @@
<slot access="protected">showWallpaperPixmap(const QString &amp;)</slot> <slot access="protected">showWallpaperPixmap(const QString &amp;)</slot>
<slot>changed()</slot> <slot>changed()</slot>
</Q_SLOTS> </Q_SLOTS>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
</UI> </UI>

@ -187,7 +187,7 @@
<slot>changed()</slot> <slot>changed()</slot>
<slot>server_changed()</slot> <slot>server_changed()</slot>
</Q_SLOTS> </Q_SLOTS>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
<includehints> <includehints>
<includehint>keditlistbox.h</includehint> <includehint>keditlistbox.h</includehint>
<includehint>klineedit.h</includehint> <includehint>klineedit.h</includehint>

@ -190,7 +190,7 @@
<slot>kpbAbort_clicked()</slot> <slot>kpbAbort_clicked()</slot>
<slot>kpbNew_clicked()</slot> <slot>kpbNew_clicked()</slot>
</Q_SLOTS> </Q_SLOTS>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
<includehints> <includehints>
<includehint>klistview.h</includehint> <includehint>klistview.h</includehint>
<includehint>kpushbutton.h</includehint> <includehint>kpushbutton.h</includehint>

@ -227,7 +227,7 @@
<slot>sendClicked()</slot> <slot>sendClicked()</slot>
<slot>fileClicked()</slot> <slot>fileClicked()</slot>
</Q_SLOTS> </Q_SLOTS>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
<includehints> <includehints>
<includehint>alistbox.h</includehint> <includehint>alistbox.h</includehint>
<includehint>kcombobox.h</includehint> <includehint>kcombobox.h</includehint>

@ -196,9 +196,9 @@ void DisplayMgrMDI::reparentReq()
s = o; s = o;
while(s->tqparentWidget()){ while(s->parentWidget()){
kdDebug(5008) << "Got a: " << s->className() << endl; kdDebug(5008) << "Got a: " << s->className() << endl;
s = s->tqparentWidget(); s = s->parentWidget();
if(s->inherits("KMainWindow")) if(s->inherits("KMainWindow"))
break; break;

@ -1114,12 +1114,12 @@ void TextLine::clearSelection()
i->setSelectiontqStatus( Item::NoSelection ); i->setSelectiontqStatus( Item::NoSelection );
} }
void TextLine::appendItem( Item *i, int tqlayoutUpdatePolicy ) void TextLine::appendItem( Item *i, int layoutUpdatePolicy )
{ {
m_items.append( i ); m_items.append( i );
i->setLine(this); i->setLine(this);
if ( tqlayoutUpdatePolicy == UpdateMaxHeight ) if ( layoutUpdatePolicy == UpdateMaxHeight )
m_maxHeight = kMax( m_maxHeight, i->height() ); m_maxHeight = kMax( m_maxHeight, i->height() );
} }

@ -323,7 +323,7 @@ public:
void clearSelection(); void clearSelection();
// transfers ownership // transfers ownership
void appendItem( Item *i, int tqlayoutUpdatePolicy = NoUpdate ); void appendItem( Item *i, int layoutUpdatePolicy = NoUpdate );
bool isEmpty() const { return m_items.isEmpty(); } bool isEmpty() const { return m_items.isEmpty(); }

@ -188,7 +188,7 @@ Both these functions should be overriden and return your widget type,
and set your widget. For setWidget you should connect required and set your widget. For setWidget you should connect required
Q_SIGNALS and eventFilters you are using. Q_SIGNALS and eventFilters you are using.
Make sure to call the tqparents setWidget in setWidget so it can connect Make sure to call the parents setWidget in setWidget so it can connect
filters etc. filters etc.
BEWARE: You might get the widget into setWidget being null (from the BEWARE: You might get the widget into setWidget being null (from the
@ -222,7 +222,7 @@ Call the destructor as such:
delete widget(); delete widget();
setWidget(0); setWidget(0);
This will clear the widget from now and all tqparents and delete it. This will clear the widget from now and all parents and delete it.
you never want it deleted twice. (deleting 0 won't hurt) you never want it deleted twice. (deleting 0 won't hurt)
=head2 2.2 The Perl code =head2 2.2 The Perl code

@ -711,7 +711,7 @@ void PukeController::closefd(int fd)
PObject *po = 0x0; PObject *po = 0x0;
while(it.current()){ while(it.current()){
/* /*
* Delete all the tqlayouts first * Delete all the layouts first
* *
*/ */
if(it.current()->type == POBJECT_LAYOUT){ if(it.current()->type == POBJECT_LAYOUT){

@ -762,14 +762,14 @@ void servercontroller::WindowSelected(TQListViewItem *item)
if ( !item ) if ( !item )
return; return;
TQListViewItem *tqparent_server = item->tqparent(); TQListViewItem *parent_server = item->tqparent();
if(!tqparent_server) if(!parent_server)
return; return;
TQString txt = TQString(tqparent_server->text(0)) + "_" + item->text(0) + "_toplevel"; TQString txt = TQString(parent_server->text(0)) + "_" + item->text(0) + "_toplevel";
TQWidget *obj = dynamic_cast<TQWidget *>( objFinder::tqfind(txt.utf8(), "KSircTopLevel")); TQWidget *obj = dynamic_cast<TQWidget *>( objFinder::tqfind(txt.utf8(), "KSircTopLevel"));
if(obj == 0x0){ if(obj == 0x0){
txt =TQString(tqparent_server->text(0)) + "_!" + item->text(0) + "_toplevel"; txt =TQString(parent_server->text(0)) + "_!" + item->text(0) + "_toplevel";
obj = dynamic_cast<TQWidget *>( objFinder::tqfind(txt.utf8(), "KSircTopLevel")); obj = dynamic_cast<TQWidget *>( objFinder::tqfind(txt.utf8(), "KSircTopLevel"));
} }

@ -93,7 +93,7 @@ int announce(NEW_CTL_MSG *request, const char *remote_machine, char *disp, int
request->r_name); request->r_name);
} else if (strstr(request->l_name,"\033")) { } else if (strstr(request->l_name,"\033")) {
syslog(LOG_WARNING, syslog(LOG_WARNING,
"blocked VT100 FLASH BOMB to user: %s (aptqparently from: %s)", "blocked VT100 FLASH BOMB to user: %s (apparently from: %s)",
request->r_name, remote_machine); request->r_name, remote_machine);
} else { } else {
if ((pid = fork())) { if ((pid = fork())) {

@ -114,8 +114,8 @@ void AddressValidator::setValidAddresses(MyString addressSpecs)
{ {
pos=nextPart.find('/'); pos=nextPart.find('/');
MyString netStr=nextPart.left(pos); MyString netStr=nextPart.left(pos);
MyString tqmaskStr=nextPart.mid(pos+1); MyString maskStr=nextPart.mid(pos+1);
int tqmask=inet_addr(tqmaskStr.data()); int tqmask=inet_addr(maskStr.data());
int net= (inet_addr(netStr.data()) & tqmask); int net= (inet_addr(netStr.data()) & tqmask);
dcerr<<"setValidAddresses: net/tqmask: " dcerr<<"setValidAddresses: net/tqmask: "
<<std::ios::hex<<net<<"/"<<tqmask<<std::ios::dec<<std::endl; <<std::ios::hex<<net<<"/"<<tqmask<<std::ios::dec<<std::endl;

@ -35,7 +35,7 @@
Client::Client(NetManager* tqparent, int socketFD, int closeOnDelete) Client::Client(NetManager* tqparent, int socketFD, int closeOnDelete)
:tqparentServer(tqparent) :parentServer(tqparent)
,m_fd(socketFD) ,m_fd(socketFD)
,m_done(0) ,m_done(0)
,m_closeOnDelete(closeOnDelete) ,m_closeOnDelete(closeOnDelete)
@ -46,7 +46,7 @@ Client::Client(NetManager* tqparent, int socketFD, int closeOnDelete)
} }
Client::Client() Client::Client()
:tqparentServer(0) :parentServer(0)
,m_fd(-1) ,m_fd(-1)
,m_done(1) ,m_done(1)
,m_closeOnDelete(1) ,m_closeOnDelete(1)
@ -55,7 +55,7 @@ Client::Client()
} }
Client::Client(const Client& c) Client::Client(const Client& c)
:tqparentServer(c.tqparentServer) :parentServer(c.parentServer)
,m_fd(c.m_fd) ,m_fd(c.m_fd)
,m_creationTime(c.m_creationTime) ,m_creationTime(c.m_creationTime)
,m_done(c.m_done) ,m_done(c.m_done)
@ -74,7 +74,7 @@ int Client::tryToGetInfo()
return 1; return 1;
} }
dcerr<<"tryToGetInfo: calling data.getFile()"<<std::endl; dcerr<<"tryToGetInfo: calling data.getFile()"<<std::endl;
if (!tqparentServer->isInformed()) return 0; if (!parentServer->isInformed()) return 0;
//we fork now, so that writing to the client can't block the server process //we fork now, so that writing to the client can't block the server process
/* int pid=fork(); /* int pid=fork();
if (pid==-1) if (pid==-1)
@ -91,7 +91,7 @@ int Client::tryToGetInfo()
//child //child
//this one does it all :-) //this one does it all :-)
dcerr<<"tryToGetInfo: sending data to client"<<std::endl; dcerr<<"tryToGetInfo: sending data to client"<<std::endl;
tqparentServer->writeDataToFD(fd(),0); parentServer->writeDataToFD(fd(),0);
close(); close();
//exit(0); //exit(0);
return 1; return 1;

@ -34,7 +34,7 @@ class Client
void close(); void close();
time_t age() {return time(0)-m_creationTime;}; time_t age() {return time(0)-m_creationTime;};
private: private:
NetManager *tqparentServer; NetManager *parentServer;
int m_fd; int m_fd;
//if something goes wrong close the connection after a timeout //if something goes wrong close the connection after a timeout
time_t m_creationTime; time_t m_creationTime;

@ -191,8 +191,8 @@ struct in_addr NetScanner::getIPfromArray(unsigned int index)
{ {
//mdcerr<<"net/tqmask combination detected"<<std::endl; //mdcerr<<"net/tqmask combination detected"<<std::endl;
MyString netStr(tmp.left(tmp.find("/"))); MyString netStr(tmp.left(tmp.find("/")));
MyString tqmaskStr(tmp.mid(tmp.find("/")+1)); MyString maskStr(tmp.mid(tmp.find("/")+1));
unsigned int tqmask(IPAddress(tqmaskStr).asInt()); unsigned int tqmask(IPAddress(maskStr).asInt());
unsigned int net(IPAddress(netStr).asInt()&tqmask); unsigned int net(IPAddress(netStr).asInt()&tqmask);
if ((~tqmask)<indexLeft) if ((~tqmask)<indexLeft)
{ {

@ -112,22 +112,22 @@ Document::Document(const TQDomDocument &doc) : d(new Private)
/* This is ugly but necessary since RSS 0.90 and 1.0 have a different tqparent /* 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. * 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) if (d->version == v0_90 || d->version == v1_0)
tqparentNode = rootNode; parentNode = rootNode;
else else
tqparentNode = channelNode; parentNode = channelNode;
TQDomNode n = tqparentNode.namedItem(TQString::tqfromLatin1("image")); TQDomNode n = parentNode.namedItem(TQString::tqfromLatin1("image"));
if (!n.isNull()) if (!n.isNull())
d->image = new Image(n); d->image = new Image(n);
n = tqparentNode.namedItem(TQString::tqfromLatin1("textinput")); n = parentNode.namedItem(TQString::tqfromLatin1("textinput"));
if (!n.isNull()) if (!n.isNull())
d->textInput = new TextInput(n); d->textInput = new TextInput(n);
// Our (hopefully faster) version of elementsByTagName() // Our (hopefully faster) version of elementsByTagName()
for (n = tqparentNode.firstChild(); !n.isNull(); n = n.nextSibling()) { for (n = parentNode.firstChild(); !n.isNull(); n = n.nextSibling()) {
const TQDomElement e = n.toElement(); const TQDomElement e = n.toElement();
if (e.tagName() == TQString::tqfromLatin1("item")) if (e.tagName() == TQString::tqfromLatin1("item"))
d->articles.append(Article(e)); d->articles.append(Article(e));

@ -141,5 +141,5 @@
</property> </property>
</widget> </widget>
</widget> </widget>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
</UI> </UI>

@ -354,8 +354,8 @@
<function specifier="non virtual">load( const IfConfig &amp; ifconfig )</function> <function specifier="non virtual">load( const IfConfig &amp; ifconfig )</function>
<function specifier="non virtual">save( IfConfig &amp; ifconfig )</function> <function specifier="non virtual">save( IfConfig &amp; ifconfig )</function>
</functions> </functions>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
<includehints> <includehints>
<includehint>klineedit.h</includehint> <includehint>klineedit.h</includehint>
<includehint>klineedit.h</includehint> <includehint>klineedit.h</includehint>

@ -149,8 +149,8 @@
<slot>load( const IfConfig &amp; ifconfig )</slot> <slot>load( const IfConfig &amp; ifconfig )</slot>
<slot>save( IfConfig &amp; ifconfig )</slot> <slot>save( IfConfig &amp; ifconfig )</slot>
</Q_SLOTS> </Q_SLOTS>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
<includehints> <includehints>
<includehint>knuminput.h</includehint> <includehint>knuminput.h</includehint>
<includehint>knuminput.h</includehint> <includehint>knuminput.h</includehint>

@ -489,8 +489,8 @@
<includes> <includes>
<include location="global" impldecl="in implementation">kdialog.h</include> <include location="global" impldecl="in implementation">kdialog.h</include>
</includes> </includes>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
<includehints> <includehints>
<includehint>klineedit.h</includehint> <includehint>klineedit.h</includehint>
<includehint>kurlrequester.h</includehint> <includehint>kurlrequester.h</includehint>

@ -78,12 +78,12 @@ void MainConfig::slotChangeNumConfigs( int newnumber )
if ( config->m_numConfigs < newnumber ) // number of configs raised if ( config->m_numConfigs < newnumber ) // number of configs raised
{ {
int diff = newnumber - config->m_numConfigs; int diff = newnumber - config->m_numConfigs;
( (KCMWifi*)tqparentWidget() )->addConfigTab( diff, false ); ( (KCMWifi*)parentWidget() )->addConfigTab( diff, false );
} }
else // number of configs lowered else // number of configs lowered
{ {
int diff = config->m_numConfigs - newnumber; int diff = config->m_numConfigs - newnumber;
( (KCMWifi*)tqparentWidget() )->delConfigTab( diff ); ( (KCMWifi*)parentWidget() )->delConfigTab( diff );
} }
} }

@ -156,7 +156,7 @@
</widget> </widget>
</vbox> </vbox>
</widget> </widget>
<tqlayoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
<includehints> <includehints>
<includehint>kpushbutton.h</includehint> <includehint>kpushbutton.h</includehint>
<includehint>kcombobox.h</includehint> <includehint>kcombobox.h</includehint>

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

Loading…
Cancel
Save