summaryrefslogtreecommitdiffstats
path: root/kdialog
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-03 20:16:47 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-03 20:16:47 +0000
commit495d08bc2db58ee7fc4ea55a7158f2f61b82fc56 (patch)
treedaabcb652c07b9a17cad88ca50b63a2d91ead4a3 /kdialog
parent50001f1757f97510e80cb1990e2f2d5b00144c2a (diff)
downloadtdebase-495d08bc2db58ee7fc4ea55a7158f2f61b82fc56.tar.gz
tdebase-495d08bc2db58ee7fc4ea55a7158f2f61b82fc56.zip
Automated conversion for enhanced compatibility with TQt for Qt4 3.4.0 TP1
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1211357 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kdialog')
-rw-r--r--kdialog/README2
-rw-r--r--kdialog/kdialog.cpp50
-rw-r--r--kdialog/klistboxdialog.cpp2
-rwxr-xr-xkdialog/progressdemo2
-rwxr-xr-xkdialog/test24
-rw-r--r--kdialog/widgets.cpp6
6 files changed, 43 insertions, 43 deletions
diff --git a/kdialog/README b/kdialog/README
index d029419c..e7df11e1 100644
--- a/kdialog/README
+++ b/kdialog/README
@@ -3,7 +3,7 @@ The syntax is very much inspired from the "dialog" command
(which shows text mode dialogs).
However the width and height attributes have been removed for
-most dialogs - Qt/KDE have layouts ;)
+most dialogs - Qt/KDE have tqlayouts ;)
A tutorial on using kdialog is available at
http://developer.kde.org/documentation/tutorials/kdialog/t1.html
diff --git a/kdialog/kdialog.cpp b/kdialog/kdialog.cpp
index 8cf9b581..297822e9 100644
--- a/kdialog/kdialog.cpp
+++ b/kdialog/kdialog.cpp
@@ -108,10 +108,10 @@ class WinIdEmbedder: public QObject
{
public:
WinIdEmbedder(bool printID, WId winId):
- TQObject(qApp), print(printID), id(winId)
+ TQObject(tqApp), print(printID), id(winId)
{
- if (qApp)
- qApp->installEventFilter(this);
+ if (tqApp)
+ tqApp->installEventFilter(this);
}
protected:
bool eventFilter(TQObject *o, TQEvent *e);
@@ -241,9 +241,9 @@ static int directCommand(KCmdLineArgs *args)
TQString text = TQString::fromLocal8Bit(args->getOption( option ));
int pos;
- while ((pos = text.find( TQString::fromLatin1("\\n") )) >= 0)
+ while ((pos = text.find( TQString::tqfromLatin1("\\n") )) >= 0)
{
- text.replace(pos, 2, TQString::fromLatin1("\n"));
+ text.tqreplace(pos, 2, TQString::tqfromLatin1("\n"));
}
if ( type == KMessageBox::WarningContinueCancel ) {
@@ -491,7 +491,7 @@ static int directCommand(KCmdLineArgs *args)
if (args->count() >= 1) {
filter = TQString::fromLocal8Bit(args->arg(0));
}
- // copied from KFileDialog::getSaveFileName(), so we can add geometry
+ // copied from KFileDialog::getSaveFileName(), so we can add tqgeometry
bool specialDir = ( startDir.at(0) == ':' );
KFileDialog dlg( specialDir ? startDir : TQString::null, filter, 0, "filedialog", true );
if ( !specialDir )
@@ -597,44 +597,44 @@ static int directCommand(KCmdLineArgs *args)
contextStr = TQString::fromLocal8Bit(args->arg(0));
}
KIcon::Group group = KIcon::NoGroup;
- if ( groupStr == TQString::fromLatin1( "Desktop" ) )
+ if ( groupStr == TQString::tqfromLatin1( "Desktop" ) )
group = KIcon::Desktop;
- else if ( groupStr == TQString::fromLatin1( "Toolbar" ) )
+ else if ( groupStr == TQString::tqfromLatin1( "Toolbar" ) )
group = KIcon::Toolbar;
- else if ( groupStr == TQString::fromLatin1( "MainToolbar" ) )
+ else if ( groupStr == TQString::tqfromLatin1( "MainToolbar" ) )
group = KIcon::MainToolbar;
- else if ( groupStr == TQString::fromLatin1( "Small" ) )
+ else if ( groupStr == TQString::tqfromLatin1( "Small" ) )
group = KIcon::Small;
- else if ( groupStr == TQString::fromLatin1( "Panel" ) )
+ else if ( groupStr == TQString::tqfromLatin1( "Panel" ) )
group = KIcon::Panel;
- else if ( groupStr == TQString::fromLatin1( "User" ) )
+ else if ( groupStr == TQString::tqfromLatin1( "User" ) )
group = KIcon::User;
KIcon::Context context = KIcon::Any;
// From kicontheme.cpp
- if ( contextStr == TQString::fromLatin1( "Devices" ) )
+ if ( contextStr == TQString::tqfromLatin1( "Devices" ) )
context = KIcon::Device;
- else if ( contextStr == TQString::fromLatin1( "MimeTypes" ) )
+ else if ( contextStr == TQString::tqfromLatin1( "MimeTypes" ) )
context = KIcon::MimeType;
- else if ( contextStr == TQString::fromLatin1( "FileSystems" ) )
+ else if ( contextStr == TQString::tqfromLatin1( "FileSystems" ) )
context = KIcon::FileSystem;
- else if ( contextStr == TQString::fromLatin1( "Applications" ) )
+ else if ( contextStr == TQString::tqfromLatin1( "Applications" ) )
context = KIcon::Application;
- else if ( contextStr == TQString::fromLatin1( "Actions" ) )
+ else if ( contextStr == TQString::tqfromLatin1( "Actions" ) )
context = KIcon::Action;
- else if ( contextStr == QString::fromLatin1( "Animations" ) )
+ else if ( contextStr == QString::tqfromLatin1( "Animations" ) )
context = KIcon::Animation;
- else if ( contextStr == QString::fromLatin1( "Categories" ) )
+ else if ( contextStr == QString::tqfromLatin1( "Categories" ) )
context = KIcon::Category;
- else if ( contextStr == QString::fromLatin1( "Emblems" ) )
+ else if ( contextStr == QString::tqfromLatin1( "Emblems" ) )
context = KIcon::Emblem;
- else if ( contextStr == QString::fromLatin1( "Emotes" ) )
+ else if ( contextStr == QString::tqfromLatin1( "Emotes" ) )
context = KIcon::Emote;
- else if ( contextStr == QString::fromLatin1( "International" ) )
+ else if ( contextStr == QString::tqfromLatin1( "International" ) )
context = KIcon::International;
- else if ( contextStr == QString::fromLatin1( "Places" ) )
+ else if ( contextStr == QString::tqfromLatin1( "Places" ) )
context = KIcon::Place;
- else if ( contextStr == QString::fromLatin1( "Status" ) )
- context = KIcon::StatusIcon;
+ else if ( contextStr == QString::tqfromLatin1( "tqStatus" ) )
+ context = KIcon::tqStatusIcon;
KIconDialog dlg(0, "icon dialog");
kapp->setTopWidget( &dlg );
diff --git a/kdialog/klistboxdialog.cpp b/kdialog/klistboxdialog.cpp
index d7abfb69..23fe18f5 100644
--- a/kdialog/klistboxdialog.cpp
+++ b/kdialog/klistboxdialog.cpp
@@ -32,7 +32,7 @@ KListBoxDialog::KListBoxDialog(TQString text, TQWidget *parent)
TQVBox *page = makeVBoxMainWidget();
label = new TQLabel(text, page);
- label->setAlignment(AlignCenter);
+ label->tqsetAlignment(AlignCenter);
table = new TQListBox(page);
table->setFocus();
diff --git a/kdialog/progressdemo b/kdialog/progressdemo
index e6f4bb48..6c2ac6af 100755
--- a/kdialog/progressdemo
+++ b/kdialog/progressdemo
@@ -1,5 +1,5 @@
#!/bin/sh
-dcopRef=`./kdialog --geometry 300x200+100-100 --progressbar "Initialising" 6`
+dcopRef=`./kdialog --tqgeometry 300x200+100-100 --progressbar "Initialising" 6`
dcop $dcopRef setProgress 1
dcop $dcopRef setLabel "Thinking really hard"
sleep 2
diff --git a/kdialog/test b/kdialog/test
index 0d41dbb0..442b9c30 100755
--- a/kdialog/test
+++ b/kdialog/test
@@ -1,6 +1,6 @@
#!/bin/sh
echo "yesno box:"
-./kdialog --geometry 400x300+100+50 --title "This is a yesno box" --yesno "Choose: yes or no"
+./kdialog --tqgeometry 400x300+100+50 --title "This is a yesno box" --yesno "Choose: yes or no"
if [ $? = 0 ]; then
echo " your choice was: yes"
else
@@ -8,7 +8,7 @@ else
fi
echo "continue or cancel warning box:"
-./kdialog --geometry 200x300+100-50 --title "This is a warningcontinuecancel box" --warningcontinuecancel "Choose: continue or cancel"
+./kdialog --tqgeometry 200x300+100-50 --title "This is a warningcontinuecancel box" --warningcontinuecancel "Choose: continue or cancel"
if [ $? = 0 ]; then
echo " your choice was: continue"
else
@@ -16,7 +16,7 @@ else
fi
echo "message box:"
-./kdialog --geometry 300x400-100-50 --title "This is a message" --msgbox "Well, this is it:\nthe message"
+./kdialog --tqgeometry 300x400-100-50 --title "This is a message" --msgbox "Well, this is it:\nthe message"
echo "input box:"
./kdialog --title "This is a input box" --inputbox "What is your name" "Joe User"
@@ -26,8 +26,8 @@ else
echo " you did not accept"
fi
-echo "input box, with geometry:"
-./kdialog --geometry 300x400-100-50 --title "This is a input box" --inputbox "What is your name" "Joe User"
+echo "input box, with tqgeometry:"
+./kdialog --tqgeometry 300x400-100-50 --title "This is a input box" --inputbox "What is your name" "Joe User"
if [ $? = 0 ]; then
echo " you accepted"
else
@@ -35,25 +35,25 @@ else
fi
echo "text box:"
-./kdialog --geometry 300x400-100-50 --miniicon "about_kde" --title "This is a text box" --textbox widgets.h 400 300
+./kdialog --tqgeometry 300x400-100-50 --miniicon "about_kde" --title "This is a text box" --textbox widgets.h 400 300
echo "menu:"
-./kdialog --miniicon "about_kde" --geometry 300x400-100-50 --title "This is a menu" --default "French" --menu "Choose one of these" a English b German c French d Spanish
+./kdialog --miniicon "about_kde" --tqgeometry 300x400-100-50 --title "This is a menu" --default "French" --menu "Choose one of these" a English b German c French d Spanish
echo "checklist:"
-./kdialog --geometry 400x300+100+50 --miniicon "about_kde" --title "This is a checklist" --checklist "Choose some of these" a English on b German off c French off d Spanish on
+./kdialog --tqgeometry 400x300+100+50 --miniicon "about_kde" --title "This is a checklist" --checklist "Choose some of these" a English on b German off c French off d Spanish on
echo "radiolist:"
-./kdialog --geometry 400x300+100+50 --miniicon "about_kde" --title "This is a radiolist" --radiolist "Choose one of these" a English off b German off c French on d Spanish off
+./kdialog --tqgeometry 400x300+100+50 --miniicon "about_kde" --title "This is a radiolist" --radiolist "Choose one of these" a English off b German off c French on d Spanish off
echo "combobox:"
-./kdialog --geometry 400x300+100+50 --miniicon "about_kde" --default "Chocolate" --title "This is a combobox" --combobox "Pick your favorite ice-cream flavor:" "Vanilla" "Chocolate" "Strawberry" "Fudge"
+./kdialog --tqgeometry 400x300+100+50 --miniicon "about_kde" --default "Chocolate" --title "This is a combobox" --combobox "Pick your favorite ice-cream flavor:" "Vanilla" "Chocolate" "Strawberry" "Fudge"
echo "passivepopup:"
-./kdialog --geometry 1x1+200+350 --title "This is a passive popup" --passivepopup "It will disappear in about 10 seconds" 10
+./kdialog --tqgeometry 1x1+200+350 --title "This is a passive popup" --passivepopup "It will disappear in about 10 seconds" 10
echo "password:"
-./kdialog --title "This is a password dialog" --geometry 400x300+100+50 --icon "desktop" --miniicon "about_kde" --password "Enter the password:"
+./kdialog --title "This is a password dialog" --tqgeometry 400x300+100+50 --icon "desktop" --miniicon "about_kde" --password "Enter the password:"
echo "Open File:"
./kdialog --getopenfilename . "*.cpp *.cc *.c |C and C++ Source Files"
diff --git a/kdialog/widgets.cpp b/kdialog/widgets.cpp
index a2064a5b..be20c51d 100644
--- a/kdialog/widgets.cpp
+++ b/kdialog/widgets.cpp
@@ -218,7 +218,7 @@ bool Widgets::checkList(TQWidget *parent, const TQString& title, const TQString&
table.setCurrentItem(0); // This is to circumvent a Qt bug
for (unsigned int i=0; i+2<args.count(); i += 3) {
- table.setSelected( i/3, args[i+2] == TQString::fromLatin1("on") );
+ table.setSelected( i/3, args[i+2] == TQString::tqfromLatin1("on") );
}
handleXGeometry(&box);
@@ -233,7 +233,7 @@ bool Widgets::checkList(TQWidget *parent, const TQString& title, const TQString&
} else {
for (unsigned int i=0; i<table.count(); i++)
if (table.isSelected(i))
- rs += TQString::fromLatin1("\"") + tags[i] + TQString::fromLatin1("\" ");
+ rs += TQString::tqfromLatin1("\"") + tags[i] + TQString::tqfromLatin1("\" ");
result.append(rs);
}
}
@@ -260,7 +260,7 @@ bool Widgets::radioBox(TQWidget *parent, const TQString& title, const TQString&
table.insertStringList(entries);
for (unsigned int i=0; i+2<args.count(); i += 3) {
- table.setSelected( i/3, args[i+2] == TQString::fromLatin1("on") );
+ table.setSelected( i/3, args[i+2] == TQString::tqfromLatin1("on") );
}
handleXGeometry(&box);