summaryrefslogtreecommitdiffstats
path: root/filesharing/simple
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-06-22 00:30:31 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-06-22 00:30:31 +0000
commit69cac65817d949cda2672ec4f0aa73d5e66a0ba1 (patch)
tree073fde0496ea90eb5bf5cffe66a8da43a9f55fbc /filesharing/simple
parent3467e6464beac3a162839bf7078e22e3a74d73e7 (diff)
downloadtdenetwork-69cac65817d949cda2672ec4f0aa73d5e66a0ba1.tar.gz
tdenetwork-69cac65817d949cda2672ec4f0aa73d5e66a0ba1.zip
TQt4 port kdenetwork
This enables compilation under both Qt3 and Qt4 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdenetwork@1237912 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'filesharing/simple')
-rw-r--r--filesharing/simple/controlcenter.ui64
-rw-r--r--filesharing/simple/controlcenter.ui.h2
-rw-r--r--filesharing/simple/fileshare.cpp26
-rw-r--r--filesharing/simple/fileshare.h6
-rw-r--r--filesharing/simple/groupconfigdlg.cpp30
-rw-r--r--filesharing/simple/groupconfigdlg.h3
-rw-r--r--filesharing/simple/groupconfiggui.ui32
-rw-r--r--filesharing/simple/groupconfiggui.ui.h2
-rw-r--r--filesharing/simple/krichtextlabel.cpp24
-rw-r--r--filesharing/simple/krichtextlabel.h13
10 files changed, 103 insertions, 99 deletions
diff --git a/filesharing/simple/controlcenter.ui b/filesharing/simple/controlcenter.ui
index 5c635392..2ef0845c 100644
--- a/filesharing/simple/controlcenter.ui
+++ b/filesharing/simple/controlcenter.ui
@@ -1,6 +1,6 @@
<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
<class>ControlCenterGUI</class>
-<widget class="QWidget">
+<widget class="TQWidget">
<property name="name">
<cstring>ControlCenterGUI</cstring>
</property>
@@ -29,11 +29,11 @@
<property name="text">
<string>SMB and NFS servers are not installed on this machine, to enable this module the servers must be installed.</string>
</property>
- <property name="alignment">
+ <property name="tqalignment">
<set>WordBreak|AlignVCenter</set>
</property>
</widget>
- <widget class="QButtonGroup">
+ <widget class="TQButtonGroup">
<property name="name">
<cstring>shareGrp</cstring>
</property>
@@ -50,7 +50,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QRadioButton">
+ <widget class="TQRadioButton">
<property name="name">
<cstring>simpleRadio</cstring>
</property>
@@ -64,15 +64,15 @@
<number>1</number>
</property>
</widget>
- <widget class="QLayoutWidget">
+ <widget class="TQLayoutWidget">
<property name="name">
- <cstring>layout4</cstring>
+ <cstring>tqlayout4</cstring>
</property>
<hbox>
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QFrame">
+ <widget class="TQFrame">
<property name="name">
<cstring>frame4_2</cstring>
</property>
@@ -84,7 +84,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="minimumSize">
+ <property name="tqminimumSize">
<size>
<width>11</width>
<height>0</height>
@@ -112,13 +112,13 @@
<property name="text">
<string>Enable simple sharing to allow users to share folders from their HOME folder, without knowing the root password.</string>
</property>
- <property name="alignment">
+ <property name="tqalignment">
<set>WordBreak|AlignVCenter</set>
</property>
</widget>
</hbox>
</widget>
- <widget class="QRadioButton">
+ <widget class="TQRadioButton">
<property name="name">
<cstring>advancedRadio</cstring>
</property>
@@ -129,15 +129,15 @@
<number>1</number>
</property>
</widget>
- <widget class="QLayoutWidget">
+ <widget class="TQLayoutWidget">
<property name="name">
- <cstring>layout4_2</cstring>
+ <cstring>tqlayout4_2</cstring>
</property>
<hbox>
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QFrame">
+ <widget class="TQFrame">
<property name="name">
<cstring>frame4_2_2</cstring>
</property>
@@ -149,7 +149,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="minimumSize">
+ <property name="tqminimumSize">
<size>
<width>11</width>
<height>0</height>
@@ -177,21 +177,21 @@
<property name="text">
<string>Enable advanced sharing to allow users to share any folders, as long as they have write access to the needed configuration files, or they know the root password.</string>
</property>
- <property name="alignment">
+ <property name="tqalignment">
<set>WordBreak|AlignVCenter</set>
</property>
</widget>
</hbox>
</widget>
- <widget class="QLayoutWidget">
+ <widget class="TQLayoutWidget">
<property name="name">
- <cstring>layout3</cstring>
+ <cstring>tqlayout3</cstring>
</property>
<grid>
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QFrame" row="0" column="0" rowspan="2" colspan="1">
+ <widget class="TQFrame" row="0" column="0" rowspan="2" colspan="1">
<property name="name">
<cstring>frame4</cstring>
</property>
@@ -203,7 +203,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="minimumSize">
+ <property name="tqminimumSize">
<size>
<width>11</width>
<height>0</height>
@@ -219,7 +219,7 @@
<number>0</number>
</property>
</widget>
- <widget class="QCheckBox" row="1" column="1">
+ <widget class="TQCheckBox" row="1" column="1">
<property name="name">
<cstring>nfsChk</cstring>
</property>
@@ -233,7 +233,7 @@
<bool>true</bool>
</property>
</widget>
- <widget class="QCheckBox" row="0" column="1">
+ <widget class="TQCheckBox" row="0" column="1">
<property name="name">
<cstring>sambaChk</cstring>
</property>
@@ -249,9 +249,9 @@
</widget>
</grid>
</widget>
- <widget class="QLayoutWidget">
+ <widget class="TQLayoutWidget">
<property name="name">
- <cstring>layout10</cstring>
+ <cstring>tqlayout10</cstring>
</property>
<hbox>
<property name="name">
@@ -275,7 +275,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>40</width>
<height>20</height>
@@ -286,7 +286,7 @@
</widget>
</vbox>
</widget>
- <widget class="QGroupBox">
+ <widget class="TQGroupBox">
<property name="name">
<cstring>sharedFoldersGroupBox</cstring>
</property>
@@ -338,7 +338,7 @@
<enum>NoSelection</enum>
</property>
</widget>
- <widget class="QFrame">
+ <widget class="TQFrame">
<property name="name">
<cstring>shareBtnPnl</cstring>
</property>
@@ -398,7 +398,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -470,14 +470,14 @@
<include location="local" impldecl="in implementation">controlcenter.ui.h</include>
<include location="local" impldecl="in implementation">krichtextlabel.h</include>
</includes>
-<signals>
+<Q_SIGNALS>
<signal>changed()</signal>
-</signals>
-<slots>
+</Q_SIGNALS>
+<Q_SLOTS>
<slot access="private">changedSlot()</slot>
<slot>listView_selectionChanged()</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>
+</Q_SLOTS>
+<tqlayoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>krichtextlabel.h</includehint>
<includehint>klistview.h</includehint>
diff --git a/filesharing/simple/controlcenter.ui.h b/filesharing/simple/controlcenter.ui.h
index 6fb3f62f..fbd7c061 100644
--- a/filesharing/simple/controlcenter.ui.h
+++ b/filesharing/simple/controlcenter.ui.h
@@ -2,7 +2,7 @@
** ui.h extension file, included from the uic-generated form implementation.
**
** If you wish to add, delete or rename functions or slots use
-** Qt Designer which will update this file, preserving your code. Create an
+** TQt Designer which will update this file, preserving your code. Create an
** init() function in place of a constructor, and a destroy() function in
** place of a destructor.
*****************************************************************************/
diff --git a/filesharing/simple/fileshare.cpp b/filesharing/simple/fileshare.cpp
index 5b796823..2e332dd7 100644
--- a/filesharing/simple/fileshare.cpp
+++ b/filesharing/simple/fileshare.cpp
@@ -60,18 +60,18 @@ K_EXPORT_COMPONENT_FACTORY (kcm_fileshare, ShareFactory("kcmfileshare") )
#define FILESHARECONF "/etc/security/fileshare.conf"
#define FILESHARE_DEBUG 5009
-KFileShareConfig::KFileShareConfig(TQWidget *parent, const char *name, const TQStringList &):
- KCModule(ShareFactory::instance(), parent, name)
+KFileShareConfig::KFileShareConfig(TQWidget *tqparent, const char *name, const TQStringList &):
+ KCModule(ShareFactory::instance(), tqparent, name)
{
KGlobal::locale()->insertCatalogue("kfileshare");
- TQBoxLayout* layout = new TQVBoxLayout(this,0,
+ TQBoxLayout* tqlayout = new TQVBoxLayout(this,0,
KDialog::spacingHint());
/*
TQVButtonGroup *box = new TQVButtonGroup( i18n("File Sharing"), this );
- box->layout()->setSpacing( KDialog::spacingHint() );
- layout->addWidget(box);
+ box->tqlayout()->setSpacing( KDialog::spacingHint() );
+ tqlayout->addWidget(box);
noSharing=new TQRadioButton( i18n("Do &not allow users to share files"), box );
sharing=new TQRadioButton( i18n("&Allow users to share files from their HOME folder"), box);
*/
@@ -81,9 +81,9 @@ KFileShareConfig::KFileShareConfig(TQWidget *parent, const char *name, const TQS
this, TQT_SLOT(allowedUsersBtnClicked()));
TQString path = TQString::fromLocal8Bit( getenv( "PATH" ) );
- path += TQString::fromLatin1(":/usr/sbin");
- TQString sambaExec = KStandardDirs::findExe( TQString::fromLatin1("smbd"), path );
- TQString nfsExec = KStandardDirs::findExe( TQString::fromLatin1("rpc.nfsd"), path );
+ path += TQString::tqfromLatin1(":/usr/sbin");
+ TQString sambaExec = KStandardDirs::findExe( TQString::tqfromLatin1("smbd"), path );
+ TQString nfsExec = KStandardDirs::findExe( TQString::tqfromLatin1("rpc.nfsd"), path );
if ( nfsExec.isEmpty() && sambaExec.isEmpty())
{
@@ -106,7 +106,7 @@ KFileShareConfig::KFileShareConfig(TQWidget *parent, const char *name, const TQS
}
m_ccgui->infoLbl->hide();
- layout->addWidget(m_ccgui);
+ tqlayout->addWidget(m_ccgui);
updateShareListView();
connect( KNFSShare::instance(), TQT_SIGNAL( changed()),
this, TQT_SLOT(updateShareListView()));
@@ -196,7 +196,7 @@ void KFileShareConfig::allowedUsersBtnClicked() {
void KFileShareConfig::load()
{
- KSimpleConfig config(TQString::fromLatin1(FILESHARECONF),true);
+ KSimpleConfig config(TQString::tqfromLatin1(FILESHARECONF),true);
m_ccgui->shareGrp->setChecked( config.readEntry("FILESHARING", "yes") == "yes" );
@@ -299,7 +299,7 @@ void KFileShareConfig::save()
if ( ! file.open(IO_WriteOnly)) {
KMessageBox::detailedError(this,
i18n("Could not save settings."),
- i18n("Could not open file '%1' for writing: %2").arg(FILESHARECONF).arg(
+ i18n("Could not open file '%1' for writing: %2").tqarg(FILESHARECONF).tqarg(
file.errorString() ),
i18n("Saving Failed"));
return;
@@ -354,8 +354,8 @@ void KFileShareConfig::addShareBtnClicked() {
}
-PropertiesPageDlg::PropertiesPageDlg(TQWidget*parent, KFileItemList files)
- : KDialogBase(parent, "sharedlg", true,
+PropertiesPageDlg::PropertiesPageDlg(TQWidget*tqparent, KFileItemList files)
+ : KDialogBase(tqparent, "sharedlg", true,
i18n("Share Folder"), Ok|Cancel, Ok, true)
{
TQVBox* vbox = makeVBoxMainWidget();
diff --git a/filesharing/simple/fileshare.h b/filesharing/simple/fileshare.h
index 25a2eabe..098ee6e5 100644
--- a/filesharing/simple/fileshare.h
+++ b/filesharing/simple/fileshare.h
@@ -31,9 +31,10 @@ class TQListViewItem;
class KFileShareConfig : public KCModule
{
Q_OBJECT
+ TQ_OBJECT
public:
- KFileShareConfig(TQWidget *parent, const char *name, const TQStringList &);
+ KFileShareConfig(TQWidget *tqparent, const char *name, const TQStringList &);
virtual void load();
virtual void save();
@@ -65,8 +66,9 @@ class KFileShareConfig : public KCModule
class PropertiesPageDlg : public KDialogBase
{
Q_OBJECT
+ TQ_OBJECT
public:
- PropertiesPageDlg(TQWidget * parent, KFileItemList files);
+ PropertiesPageDlg(TQWidget * tqparent, KFileItemList files);
~PropertiesPageDlg() {};
bool hasChanged();
protected:
diff --git a/filesharing/simple/groupconfigdlg.cpp b/filesharing/simple/groupconfigdlg.cpp
index 470f024f..304386c4 100644
--- a/filesharing/simple/groupconfigdlg.cpp
+++ b/filesharing/simple/groupconfigdlg.cpp
@@ -48,10 +48,10 @@ static bool userMod(const TQString & user, const TQValueList<KUserGroup> & group
-GroupConfigDlg::GroupConfigDlg(TQWidget * parent,
+GroupConfigDlg::GroupConfigDlg(TQWidget * tqparent,
const TQString & fileShareGroup, bool restricted,
bool rootPassNeeded, bool simpleSharing)
- : KDialogBase(parent,"groupconfigdlg", true,
+ : KDialogBase(tqparent,"groupconfigdlg", true,
i18n("Allowed Users"), Ok|Cancel, Ok, true) ,
m_fileShareGroup(fileShareGroup),
m_restricted(restricted) ,
@@ -110,8 +110,8 @@ TQString prettyString(const KUser &user) {
TQString fromPrettyString(const TQString & s) {
// Jan Schaefer (jan)
// i j
- int i = s.find('(');
- int j = s.find(')');
+ int i = s.tqfind('(');
+ int j = s.tqfind(')');
TQString loginName = s.mid(i+1,j-i-1);
return loginName;
}
@@ -128,7 +128,7 @@ void GroupConfigDlg::slotAddUser() {
if (allUsers.count()==0) {
KMessageBox::information(this,
i18n("All users are in the %1 group already.")
- .arg(m_fileShareGroup.name()));
+ .tqarg(m_fileShareGroup.name()));
return;
}
@@ -173,7 +173,7 @@ bool GroupConfigDlg::addUser(const KUser & user, const KUserGroup & group) {
groups.append(group);
if (!userMod(user.loginName(),groups)) {
KMessageBox::sorry(this,i18n("Could not add user '%1' to group '%2'")
- .arg(user.loginName()).arg(group.name()));
+ .tqarg(user.loginName()).tqarg(group.name()));
return false;
}
return true;
@@ -185,7 +185,7 @@ bool GroupConfigDlg::removeUser(const KUser & user, const KUserGroup & group) {
groups.remove(group);
if (!userMod(user.loginName(),groups)) {
KMessageBox::sorry(this,i18n("Could not remove user '%1' from group '%2'")
- .arg(user.loginName()).arg(group.name()));
+ .tqarg(user.loginName()).tqarg(group.name()));
return false;
}
return true;
@@ -293,7 +293,7 @@ void GroupConfigDlg::slotChangeGroup() {
TQString groupName = combo->currentText();
if (groupName != m_fileShareGroup.name()) {
TQString oldGroup = m_fileShareGroup.name();
- if (allGroups.contains(KUserGroup(groupName)))
+ if (allGroups.tqcontains(KUserGroup(groupName)))
setFileShareGroup(KUserGroup(groupName));
else {
if (!createFileShareGroup(groupName)) {
@@ -333,9 +333,9 @@ void GroupConfigDlg::setFileShareGroup(const KUserGroup & group) {
updateListBox();
m_gui->groupUsersRadio->setText(
i18n("Only users of the '%1' group are allowed to share folders")
- .arg(m_fileShareGroup.name()));
+ .tqarg(m_fileShareGroup.name()));
m_gui->usersGrpBx->setTitle(i18n("Users of '%1' Group")
- .arg(m_fileShareGroup.name()));
+ .tqarg(m_fileShareGroup.name()));
m_gui->otherGroupBtn->setText(i18n("Change Group..."));
m_gui->usersGrpBx->show();
} else {
@@ -360,7 +360,7 @@ bool GroupConfigDlg::addUsersToGroup(TQValueList<KUser> users,const KUserGroup &
bool GroupConfigDlg::emptyGroup(const TQString & s) {
if (KMessageBox::No == KMessageBox::questionYesNo(this,
- i18n("Do you really want to remove all users from group '%1'?").arg(s), TQString::null, KStdGuiItem::del(), KStdGuiItem::cancel())) {
+ i18n("Do you really want to remove all users from group '%1'?").tqarg(s), TQString(), KStdGuiItem::del(), KStdGuiItem::cancel())) {
return false;
}
@@ -377,7 +377,7 @@ bool GroupConfigDlg::emptyGroup(const TQString & s) {
bool GroupConfigDlg::deleteGroup(const TQString & s) {
if (KMessageBox::No == KMessageBox::questionYesNo(this,
- i18n("Do you really want to delete group '%1'?").arg(s), TQString::null, KStdGuiItem::del(), KStdGuiItem::cancel())) {
+ i18n("Do you really want to delete group '%1'?").tqarg(s), TQString(), KStdGuiItem::del(), KStdGuiItem::cancel())) {
return false;
}
@@ -385,7 +385,7 @@ bool GroupConfigDlg::deleteGroup(const TQString & s) {
proc << "groupdel" << s;
bool result = proc.start(KProcess::Block) && proc.normalExit();
if (!result) {
- KMessageBox::sorry(this,i18n("Deleting group '%1' failed.").arg(s));
+ KMessageBox::sorry(this,i18n("Deleting group '%1' failed.").tqarg(s));
}
return result;
@@ -398,7 +398,7 @@ bool GroupConfigDlg::createFileShareGroup(const TQString & s) {
}
if (KMessageBox::No == KMessageBox::questionYesNo(this,
- i18n("This group '%1' does not exist. Should it be created?").arg(s), TQString::null, i18n("Create"), i18n("Do Not Create")))
+ i18n("This group '%1' does not exist. Should it be created?").tqarg(s), TQString(), i18n("Create"), i18n("Do Not Create")))
return false;
//debug("CreateFileShareGroup: "+s);
@@ -406,7 +406,7 @@ bool GroupConfigDlg::createFileShareGroup(const TQString & s) {
proc << "groupadd" << s;
bool result = proc.start(KProcess::Block) && proc.normalExit();
if (!result) {
- KMessageBox::sorry(this,i18n("Creation of group '%1' failed.").arg(s));
+ KMessageBox::sorry(this,i18n("Creation of group '%1' failed.").tqarg(s));
} else {
setFileShareGroup(KUserGroup(s));
}
diff --git a/filesharing/simple/groupconfigdlg.h b/filesharing/simple/groupconfigdlg.h
index 1258422c..744a9e91 100644
--- a/filesharing/simple/groupconfigdlg.h
+++ b/filesharing/simple/groupconfigdlg.h
@@ -29,8 +29,9 @@ class GroupConfigGUI;
class GroupConfigDlg : public KDialogBase
{
Q_OBJECT
+ TQ_OBJECT
public:
- GroupConfigDlg(TQWidget * parent, const TQString & fileShareGroup, bool restricted,
+ GroupConfigDlg(TQWidget * tqparent, const TQString & fileShareGroup, bool restricted,
bool rootPassNeeded, bool simpleSharing);
~GroupConfigDlg();
KUserGroup fileShareGroup() { return m_fileShareGroup; }
diff --git a/filesharing/simple/groupconfiggui.ui b/filesharing/simple/groupconfiggui.ui
index c12e1d2c..6a97c046 100644
--- a/filesharing/simple/groupconfiggui.ui
+++ b/filesharing/simple/groupconfiggui.ui
@@ -1,6 +1,6 @@
<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
<class>GroupConfigGUI</class>
-<widget class="QWidget">
+<widget class="TQWidget">
<property name="name">
<cstring>GroupConfigGUI</cstring>
</property>
@@ -19,7 +19,7 @@
<property name="margin">
<number>0</number>
</property>
- <widget class="QButtonGroup">
+ <widget class="TQButtonGroup">
<property name="name">
<cstring>buttonGroup1</cstring>
</property>
@@ -36,7 +36,7 @@
<property name="margin">
<number>0</number>
</property>
- <widget class="QRadioButton">
+ <widget class="TQRadioButton">
<property name="name">
<cstring>allUsersRadio</cstring>
</property>
@@ -47,7 +47,7 @@
<bool>true</bool>
</property>
</widget>
- <widget class="QRadioButton">
+ <widget class="TQRadioButton">
<property name="name">
<cstring>groupUsersRadio</cstring>
</property>
@@ -57,7 +57,7 @@
</widget>
</vbox>
</widget>
- <widget class="QGroupBox">
+ <widget class="TQGroupBox">
<property name="name">
<cstring>usersGrpBx</cstring>
</property>
@@ -86,7 +86,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -112,7 +112,7 @@
<string>Add User</string>
</property>
</widget>
- <widget class="QCheckBox" row="3" column="0" rowspan="1" colspan="2">
+ <widget class="TQCheckBox" row="3" column="0" rowspan="1" colspan="2">
<property name="name">
<cstring>writeAccessChk</cstring>
</property>
@@ -122,9 +122,9 @@
</widget>
</grid>
</widget>
- <widget class="QLayoutWidget">
+ <widget class="TQLayoutWidget">
<property name="name">
- <cstring>layout2</cstring>
+ <cstring>tqlayout2</cstring>
</property>
<hbox>
<property name="name">
@@ -140,7 +140,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>180</width>
<height>20</height>
@@ -185,16 +185,16 @@
</connection>
<connection>
<sender>listBox</sender>
- <signal>selectionChanged(QListBoxItem*)</signal>
+ <signal>selectionChanged(TQListBoxItem*)</signal>
<receiver>GroupConfigGUI</receiver>
- <slot>listBox_selectionChanged(QListBoxItem*)</slot>
+ <slot>listBox_selectionChanged(TQListBoxItem*)</slot>
</connection>
</connections>
<includes>
<include location="local" impldecl="in implementation">groupconfiggui.ui.h</include>
</includes>
-<slots>
- <slot>listBox_selectionChanged( QListBoxItem * i )</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>
+<Q_SLOTS>
+ <slot>listBox_selectionChanged( TQListBoxItem * i )</slot>
+</Q_SLOTS>
+<tqlayoutdefaults spacing="6" margin="11"/>
</UI>
diff --git a/filesharing/simple/groupconfiggui.ui.h b/filesharing/simple/groupconfiggui.ui.h
index 055fd6c3..49961f20 100644
--- a/filesharing/simple/groupconfiggui.ui.h
+++ b/filesharing/simple/groupconfiggui.ui.h
@@ -2,7 +2,7 @@
** ui.h extension file, included from the uic-generated form implementation.
**
** If you wish to add, delete or rename functions or slots use
-** Qt Designer which will update this file, preserving your code. Create an
+** TQt Designer which will update this file, preserving your code. Create an
** init() function in place of a constructor, and a destroy() function in
** place of a destructor.
*****************************************************************************/
diff --git a/filesharing/simple/krichtextlabel.cpp b/filesharing/simple/krichtextlabel.cpp
index 089635d7..a604b0de 100644
--- a/filesharing/simple/krichtextlabel.cpp
+++ b/filesharing/simple/krichtextlabel.cpp
@@ -35,20 +35,20 @@ static TQString qrichtextify( const TQString& text )
*it = TQStyleSheet::convertFromPlainText( *it, TQStyleSheetItem::WhiteSpaceNormal );
}
- return lines.join(TQString::null);
+ return lines.join(TQString());
}
-KRichTextLabel::KRichTextLabel( const TQString &text , TQWidget *parent, const char *name )
- : TQLabel ( parent, name ) {
- m_defaultWidth = QMIN(400, KGlobalSettings::desktopGeometry(this).width()*2/5);
- setAlignment( Qt::WordBreak );
+KRichTextLabel::KRichTextLabel( const TQString &text , TQWidget *tqparent, const char *name )
+ : TQLabel ( tqparent, name ) {
+ m_defaultWidth = TQMIN(400, KGlobalSettings::desktopGeometry(this).width()*2/5);
+ tqsetAlignment( TQt::WordBreak );
setText(text);
}
-KRichTextLabel::KRichTextLabel( TQWidget *parent, const char *name )
- : TQLabel ( parent, name ) {
- m_defaultWidth = QMIN(400, KGlobalSettings::desktopGeometry(this).width()*2/5);
- setAlignment( Qt::WordBreak );
+KRichTextLabel::KRichTextLabel( TQWidget *tqparent, const char *name )
+ : TQLabel ( tqparent, name ) {
+ m_defaultWidth = TQMIN(400, KGlobalSettings::desktopGeometry(this).width()*2/5);
+ tqsetAlignment( TQt::WordBreak );
}
void KRichTextLabel::setDefaultWidth(int defaultWidth)
@@ -62,7 +62,7 @@ TQSizePolicy KRichTextLabel::sizePolicy() const
return TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Minimum, false);
}
-TQSize KRichTextLabel::minimumSizeHint() const
+TQSize KRichTextLabel::tqminimumSizeHint() const
{
TQString qt_text = qrichtextify( text() );
int pref_width = 0;
@@ -97,9 +97,9 @@ TQSize KRichTextLabel::minimumSizeHint() const
return TQSize(pref_width, rt.height());
}
-TQSize KRichTextLabel::sizeHint() const
+TQSize KRichTextLabel::tqsizeHint() const
{
- return minimumSizeHint();
+ return tqminimumSizeHint();
}
void KRichTextLabel::setText( const TQString &text ) {
diff --git a/filesharing/simple/krichtextlabel.h b/filesharing/simple/krichtextlabel.h
index 40ead037..42e7a758 100644
--- a/filesharing/simple/krichtextlabel.h
+++ b/filesharing/simple/krichtextlabel.h
@@ -24,29 +24,30 @@
#include <kdelibs_export.h>
/**
- * @short A replacement for TQLabel that supports richtext and proper layout management
+ * @short A replacement for TQLabel that supports richtext and proper tqlayout management
*
* @author Waldo Bastian <bastian@kde.org>
*/
/*
- * QLabel
+ * TQLabel
*/
class KDEUI_EXPORT KRichTextLabel : public TQLabel {
Q_OBJECT
+ TQ_OBJECT
public:
/**
* Default constructor.
*/
- KRichTextLabel( TQWidget *parent, const char *name = 0 );
- KRichTextLabel( const TQString &text, TQWidget *parent, const char *name = 0 );
+ KRichTextLabel( TQWidget *tqparent, const char *name = 0 );
+ KRichTextLabel( const TQString &text, TQWidget *tqparent, const char *name = 0 );
int defaultWidth() const { return m_defaultWidth; }
void setDefaultWidth(int defaultWidth);
- virtual TQSize minimumSizeHint() const;
- virtual TQSize sizeHint() const;
+ virtual TQSize tqminimumSizeHint() const;
+ virtual TQSize tqsizeHint() const;
TQSizePolicy sizePolicy() const;
public slots: