summaryrefslogtreecommitdiffstats
path: root/filesharing/simple
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-16 09:59:34 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-16 09:59:34 -0600
commit83677e35509b4dafac63b76995652bdf3b49f209 (patch)
tree591f1dc22278addb439726c42896376b17bb42bd /filesharing/simple
parent808e453c56036211f57482ed847d54aca01bba68 (diff)
downloadtdenetwork-83677e35509b4dafac63b76995652bdf3b49f209.tar.gz
tdenetwork-83677e35509b4dafac63b76995652bdf3b49f209.zip
Revert "Rename a number of old tq methods that are no longer tq specific"
This reverts commit 808e453c56036211f57482ed847d54aca01bba68.
Diffstat (limited to 'filesharing/simple')
-rw-r--r--filesharing/simple/controlcenter.ui24
-rw-r--r--filesharing/simple/fileshare.cpp20
-rw-r--r--filesharing/simple/groupconfigdlg.cpp20
-rw-r--r--filesharing/simple/groupconfiggui.ui6
-rw-r--r--filesharing/simple/krichtextlabel.cpp12
-rw-r--r--filesharing/simple/krichtextlabel.h6
6 files changed, 44 insertions, 44 deletions
diff --git a/filesharing/simple/controlcenter.ui b/filesharing/simple/controlcenter.ui
index 7eec18af..26307437 100644
--- a/filesharing/simple/controlcenter.ui
+++ b/filesharing/simple/controlcenter.ui
@@ -29,7 +29,7 @@
<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>
@@ -66,7 +66,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>layout4</cstring>
+ <cstring>tqlayout4</cstring>
</property>
<hbox>
<property name="name">
@@ -84,7 +84,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="minimumSize">
+ <property name="tqminimumSize">
<size>
<width>11</width>
<height>0</height>
@@ -112,7 +112,7 @@
<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>
@@ -131,7 +131,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>layout4_2</cstring>
+ <cstring>tqlayout4_2</cstring>
</property>
<hbox>
<property name="name">
@@ -149,7 +149,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="minimumSize">
+ <property name="tqminimumSize">
<size>
<width>11</width>
<height>0</height>
@@ -177,7 +177,7 @@
<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>
@@ -185,7 +185,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>layout3</cstring>
+ <cstring>tqlayout3</cstring>
</property>
<grid>
<property name="name">
@@ -203,7 +203,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="minimumSize">
+ <property name="tqminimumSize">
<size>
<width>11</width>
<height>0</height>
@@ -251,7 +251,7 @@
</widget>
<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>
@@ -398,7 +398,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/filesharing/simple/fileshare.cpp b/filesharing/simple/fileshare.cpp
index 6b24d656..0e41554d 100644
--- a/filesharing/simple/fileshare.cpp
+++ b/filesharing/simple/fileshare.cpp
@@ -16,7 +16,7 @@
*/
#include <unistd.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqvbuttongroup.h>
#include <tqvgroupbox.h>
#include <tqlabel.h>
@@ -65,13 +65,13 @@ KFileShareConfig::KFileShareConfig(TQWidget *parent, const char *name, const TQS
{
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;
diff --git a/filesharing/simple/groupconfigdlg.cpp b/filesharing/simple/groupconfigdlg.cpp
index a57d0f79..1efe2baa 100644
--- a/filesharing/simple/groupconfigdlg.cpp
+++ b/filesharing/simple/groupconfigdlg.cpp
@@ -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;
@@ -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(), 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(), 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(), 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/groupconfiggui.ui b/filesharing/simple/groupconfiggui.ui
index 13b26dc3..7550cab0 100644
--- a/filesharing/simple/groupconfiggui.ui
+++ b/filesharing/simple/groupconfiggui.ui
@@ -86,7 +86,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -124,7 +124,7 @@
</widget>
<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>
diff --git a/filesharing/simple/krichtextlabel.cpp b/filesharing/simple/krichtextlabel.cpp
index dd9268b6..3d9dfcd0 100644
--- a/filesharing/simple/krichtextlabel.cpp
+++ b/filesharing/simple/krichtextlabel.cpp
@@ -19,7 +19,7 @@
#include "krichtextlabel.h"
#include <tqtooltip.h>
-#include <stylesheet.h>
+#include <tqstylesheet.h>
#include <tqsimplerichtext.h>
#include <kglobalsettings.h>
@@ -41,14 +41,14 @@ static TQString qrichtextify( const TQString& text )
KRichTextLabel::KRichTextLabel( const TQString &text , TQWidget *parent, const char *name )
: TQLabel ( parent, name ) {
m_defaultWidth = TQMIN(400, KGlobalSettings::desktopGeometry(this).width()*2/5);
- setAlignment( TQt::WordBreak );
+ tqsetAlignment( TQt::WordBreak );
setText(text);
}
KRichTextLabel::KRichTextLabel( TQWidget *parent, const char *name )
: TQLabel ( parent, name ) {
m_defaultWidth = TQMIN(400, KGlobalSettings::desktopGeometry(this).width()*2/5);
- setAlignment( TQt::WordBreak );
+ 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 513e1280..53a60cea 100644
--- a/filesharing/simple/krichtextlabel.h
+++ b/filesharing/simple/krichtextlabel.h
@@ -24,7 +24,7 @@
#include <tdelibs_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>
*/
@@ -46,8 +46,8 @@ public:
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: