Finished remaining porting to new TQt API

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1214736 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
v3.5.13-sru
tpearson 14 years ago
parent f7e71d4771
commit bab4089069

@ -25,7 +25,7 @@ protected:
{ {
Q_UNUSED(className); Q_UNUSED(className);
Q_UNUSED(args); Q_UNUSED(args);
return new KFileAudioPreview( dynamic_cast<TQWidget*>( parent ), name ); return TQT_TQOBJECT(new KFileAudioPreview( dynamic_cast<TQWidget*>( parent ), name ));
} }
}; };
@ -41,7 +41,7 @@ class KFileAudioPreview::KFileAudioPreviewPrivate
public: public:
KFileAudioPreviewPrivate( TQWidget *parent ) KFileAudioPreviewPrivate( TQWidget *parent )
{ {
player = KParts::ComponentFactory::createInstanceFromQuery<KMediaPlayer::Player>( "KMediaPlayer/Player", TQString::null, parent ); player = KParts::ComponentFactory::createInstanceFromQuery<KMediaPlayer::Player>( "KMediaPlayer/Player", TQString(), TQT_TQOBJECT(parent) );
} }
~KFileAudioPreviewPrivate() ~KFileAudioPreviewPrivate()

@ -33,6 +33,7 @@ class KTEXTEDITOR_EXPORT Document : public KTextEditor::Editor
friend class PrivateDocument; friend class PrivateDocument;
Q_OBJECT Q_OBJECT
TQ_OBJECT
public: public:
Document ( TQObject *parent = 0, const char *name = 0 ); Document ( TQObject *parent = 0, const char *name = 0 );

@ -41,6 +41,7 @@ class KTEXTEDITOR_EXPORT Editor : public KParts::ReadWritePart
friend class PrivateEditor; friend class PrivateEditor;
Q_OBJECT Q_OBJECT
TQ_OBJECT
public: public:
/** /**

@ -57,7 +57,7 @@ EditorChooser::EditorChooser(TQWidget *parent,const char *name) :
{ {
if ((*it)->desktopEntryName().contains(editor)) if ((*it)->desktopEntryName().contains(editor))
{ {
d->chooser->editorCombo->insertItem(i18n("System Default (%1)").arg((*it)->name())); d->chooser->editorCombo->insertItem(TQString(i18n("System Default (%1)").arg((*it)->name())));
break; break;
} }
} }
@ -82,7 +82,7 @@ void EditorChooser::readAppSetting(const TQString& postfix){
if (editor.isEmpty()) d->chooser->editorCombo->setCurrentItem(0); if (editor.isEmpty()) d->chooser->editorCombo->setCurrentItem(0);
else else
{ {
int idx=d->elements.findIndex(editor); int idx=d->elements.tqfindIndex(editor);
idx=idx+1; idx=idx+1;
d->chooser->editorCombo->setCurrentItem(idx); d->chooser->editorCombo->setCurrentItem(idx);
} }

@ -1,6 +1,6 @@
<!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <!DOCTYPE UI><UI version="3.2" stdsetdef="1">
<class>EditorChooser_UI</class> <class>EditorChooser_UI</class>
<widget class="QWidget"> <widget class="TQWidget">
<property name="name"> <property name="name">
<cstring>EditorChooser</cstring> <cstring>EditorChooser</cstring>
</property> </property>
@ -27,7 +27,7 @@
<property name="name"> <property name="name">
<cstring>unnamed</cstring> <cstring>unnamed</cstring>
</property> </property>
<widget class="QLabel"> <widget class="TQLabel">
<property name="name"> <property name="name">
<cstring>TextLabel1</cstring> <cstring>TextLabel1</cstring>
</property> </property>
@ -44,7 +44,7 @@
<set>WordBreak|AlignVCenter|AlignLeft</set> <set>WordBreak|AlignVCenter|AlignLeft</set>
</property> </property>
</widget> </widget>
<widget class="QComboBox"> <widget class="TQComboBox">
<property name="name"> <property name="name">
<cstring>editorCombo</cstring> <cstring>editorCombo</cstring>
</property> </property>

@ -75,8 +75,8 @@ bool TemplateInterface::expandMacros( TQMap<TQString, TQString> &map, TQWidget *
KABC::StdAddressBook *addrBook = 0; KABC::StdAddressBook *addrBook = 0;
KABC::Addressee userAddress; KABC::Addressee userAddress;
TQDateTime datetime = TQDateTime::tqcurrentDateTime(); TQDateTime datetime = TQDateTime::tqcurrentDateTime();
TQDate date = datetime.date(); TQDate date = TQT_TQDATE_OBJECT(datetime.date());
TQTime time = datetime.time(); TQTime time = TQT_TQTIME_OBJECT(datetime.time());
TQMap<TQString,TQString>::Iterator it; TQMap<TQString,TQString>::Iterator it;
for ( it = map.begin(); it != map.end(); ++it ) for ( it = map.begin(); it != map.end(); ++it )
@ -173,7 +173,7 @@ bool TemplateInterface::insertTemplateText ( uint line, uint column, const TQStr
} }
} }
TQString placeholder = rx.cap( 1 ); TQString placeholder = rx.cap( 1 );
if ( ! enhancedInitValues.contains( placeholder ) ) if ( ! enhancedInitValues.tqcontains( placeholder ) )
enhancedInitValues[ placeholder ] = ""; enhancedInitValues[ placeholder ] = "";
pos += rx.matchedLength(); pos += rx.matchedLength();

@ -92,7 +92,7 @@ AddresseeDialog::AddresseeDialog( TQWidget *parent, bool multiple ) :
topLayout->addLayout( selectedLayout ); topLayout->addLayout( selectedLayout );
topLayout->setSpacing( spacingHint() ); topLayout->setSpacing( spacingHint() );
TQGroupBox *selectedGroup = new TQGroupBox( 1, Horizontal, i18n("Selected"), TQGroupBox *selectedGroup = new TQGroupBox( 1, Qt::Horizontal, i18n("Selected"),
topWidget ); topWidget );
selectedLayout->addWidget( selectedGroup ); selectedLayout->addWidget( selectedGroup );

@ -92,17 +92,17 @@ void AddresseeHelper::initSettings()
bool AddresseeHelper::containsTitle( const TQString& title ) const bool AddresseeHelper::containsTitle( const TQString& title ) const
{ {
return mTitles.tqfind( title ) != mTitles.end(); return mTitles.find( title ) != mTitles.end();
} }
bool AddresseeHelper::containsPrefix( const TQString& prefix ) const bool AddresseeHelper::containsPrefix( const TQString& prefix ) const
{ {
return mPrefixes.tqfind( prefix ) != mPrefixes.end(); return mPrefixes.find( prefix ) != mPrefixes.end();
} }
bool AddresseeHelper::containsSuffix( const TQString& suffix ) const bool AddresseeHelper::containsSuffix( const TQString& suffix ) const
{ {
return mSuffixes.tqfind( suffix ) != mSuffixes.end(); return mSuffixes.find( suffix ) != mSuffixes.end();
} }
bool AddresseeHelper::tradeAsFamilyName() const bool AddresseeHelper::tradeAsFamilyName() const

@ -190,7 +190,7 @@ void AddressLineEdit::keyPressEvent(TQKeyEvent *e)
void AddressLineEdit::mouseReleaseEvent( TQMouseEvent * e ) void AddressLineEdit::mouseReleaseEvent( TQMouseEvent * e )
{ {
if (m_useCompletion && (e->button() == MidButton)) if (m_useCompletion && (e->button() == Qt::MidButton))
{ {
m_smartPaste = true; m_smartPaste = true;
KLineEdit::mouseReleaseEvent(e); KLineEdit::mouseReleaseEvent(e);
@ -293,7 +293,7 @@ void AddressLineEdit::doCompletion(bool ctrlT)
TQString prevAddr; TQString prevAddr;
TQString s(text()); TQString s(text());
int n = s.findRev(','); int n = s.tqfindRev(',');
if (n >= 0) if (n >= 0)
{ {
@ -465,7 +465,7 @@ void AddressLineEdit::startLoadingLDAPEntries()
TQString s( *s_LDAPText ); TQString s( *s_LDAPText );
// TODO cache last? // TODO cache last?
TQString prevAddr; TQString prevAddr;
int n = s.findRev(','); int n = s.tqfindRev(',');
if (n>= 0) if (n>= 0)
{ {
prevAddr = s.left(n+1) + ' '; prevAddr = s.left(n+1) + ' ';

@ -66,7 +66,7 @@ EmailSelector::EmailSelector( const TQStringList &emails, const TQString &curren
TQFrame *topFrame = plainPage(); TQFrame *topFrame = plainPage();
TQBoxLayout *topLayout = new TQVBoxLayout( topFrame ); TQBoxLayout *topLayout = new TQVBoxLayout( topFrame );
mButtonGroup = new TQButtonGroup( 1, Horizontal, i18n("Email Addresses"), mButtonGroup = new TQButtonGroup( 1, Qt::Horizontal, i18n("Email Addresses"),
topFrame ); topFrame );
topLayout->addWidget( mButtonGroup ); topLayout->addWidget( mButtonGroup );
@ -100,7 +100,7 @@ TQString EmailSelector::getEmail( const TQStringList &emails, const TQString &cu
return result; return result;
} }
class EntryItem : public QListViewItem class EntryItem : public TQListViewItem
{ {
public: public:
EntryItem( TQListView *parent, const Addressee &addressee, EntryItem( TQListView *parent, const Addressee &addressee,

@ -46,7 +46,7 @@ EmailSelectDialog::EmailSelectDialog( const TQStringList &emails, const TQString
TQFrame *topFrame = plainPage(); TQFrame *topFrame = plainPage();
TQBoxLayout *topLayout = new TQVBoxLayout( topFrame ); TQBoxLayout *topLayout = new TQVBoxLayout( topFrame );
mButtonGroup = new TQButtonGroup( 1, Horizontal, i18n("Email Addresses"), mButtonGroup = new TQButtonGroup( 1, Qt::Horizontal, i18n("Email Addresses"),
topFrame ); topFrame );
mButtonGroup->setRadioButtonExclusive( true ); mButtonGroup->setRadioButtonExclusive( true );
topLayout->addWidget( mButtonGroup ); topLayout->addWidget( mButtonGroup );
@ -80,7 +80,7 @@ TQString EmailSelectDialog::getEmail( const TQStringList &emails, const TQString
return result; return result;
} }
class EditEntryItem : public QListViewItem class EditEntryItem : public TQListViewItem
{ {
public: public:
EditEntryItem( TQListView *parent, const Addressee &addressee, EditEntryItem( TQListView *parent, const Addressee &addressee,

@ -113,7 +113,7 @@ void BinaryFormat::saveAll( AddressBook*, Resource *resource, TQFile *file )
} }
// set real number of entries // set real number of entries
stream.device()->at( 2 * sizeof( TQ_UINT32 ) ); stream.tqdevice()->at( 2 * sizeof( TQ_UINT32 ) );
stream << counter; stream << counter;
} }
@ -140,12 +140,12 @@ bool BinaryFormat::checkHeader( TQDataStream &stream ) const
} }
if ( magic != 0x2e93e ) { if ( magic != 0x2e93e ) {
kdError() << i18n("File '%1' is not binary format.").arg( file->name() ) << endl; kdError() << TQString(i18n("File '%1' is not binary format.").arg( file->name() )) << endl;
return false; return false;
} }
if ( version != BINARY_FORMAT_VERSION ) { if ( version != BINARY_FORMAT_VERSION ) {
kdError() << i18n("File '%1' is the wrong version.").arg( file->name() ) << endl; kdError() << TQString(i18n("File '%1' is the wrong version.").arg( file->name() )) << endl;
return false; return false;
} }

@ -58,7 +58,7 @@ void readKMailEntry( const TQString &kmailEntry, KABC::AddressBook *ab )
TQString comment; TQString comment;
if ( entry.at( entry.length() -1 ) == ')' ) { if ( entry.at( entry.length() -1 ) == ')' ) {
int br = entry.findRev( '(' ); int br = entry.tqfindRev( '(' );
if ( br >= 0 ) { if ( br >= 0 ) {
comment = entry.mid( br + 1, entry.length() - br - 2 ); comment = entry.mid( br + 1, entry.length() - br - 2 );
entry.truncate( br ); entry.truncate( br );
@ -68,7 +68,7 @@ void readKMailEntry( const TQString &kmailEntry, KABC::AddressBook *ab )
} }
} }
int posSpace = entry.findRev( ' ' ); int posSpace = entry.tqfindRev( ' ' );
if ( posSpace < 0 ) { if ( posSpace < 0 ) {
email = entry; email = entry;
if ( !comment.isEmpty() ) { if ( !comment.isEmpty() ) {
@ -91,7 +91,7 @@ void readKMailEntry( const TQString &kmailEntry, KABC::AddressBook *ab )
} }
if ( name.at( name.length() -1 ) == ')' ) { if ( name.at( name.length() -1 ) == ')' ) {
int br = name.findRev( '(' ); int br = name.tqfindRev( '(' );
if ( br >= 0 ) { if ( br >= 0 ) {
comment = name.mid( br + 1, name.length() - br - 2 ) + " " + comment; comment = name.mid( br + 1, name.length() - br - 2 ) + " " + comment;
name.truncate( br ); name.truncate( br );

@ -408,7 +408,7 @@ void LdapSearch::makeSearchData( TQStringList& ret, LdapResultList& resList )
} }
LdapResult sr; LdapResult sr;
sr.clientNumber = mClients.findIndex( (*it1).client ); sr.clientNumber = mClients.tqfindIndex( (*it1).client );
sr.name = name; sr.name = name;
sr.email = mail; sr.email = mail;
resList.append( sr ); resList.append( sr );

@ -607,8 +607,8 @@ void LdapConfigWidget::setFlags( int flags )
// First delete all the child widgets. // First delete all the child widgets.
// FIXME: I hope it's correct // FIXME: I hope it's correct
const TQObjectList *ch = children(); const TQObjectList ch = childrenListObject();
TQObjectList ch2 = *ch; TQObjectList ch2 = ch;
TQObject *obj; TQObject *obj;
TQWidget *widget; TQWidget *widget;

@ -50,7 +50,8 @@ namespace KABC {
class KABC_EXPORT LdapConfigWidget : public TQWidget class KABC_EXPORT LdapConfigWidget : public TQWidget
{ {
Q_OBJECT Q_OBJECT
Q_PROPERTY( LCW_Flags flags READ flags WRITE setFlags ) TQ_OBJECT
TQ_PROPERTY( LCW_Flags flags READ flags WRITE setFlags )
Q_PROPERTY( TQString user READ user WRITE setUser ) Q_PROPERTY( TQString user READ user WRITE setUser )
Q_PROPERTY( TQString password READ password WRITE setPassword ) Q_PROPERTY( TQString password READ password WRITE setPassword )
Q_PROPERTY( TQString bindDN READ bindDN WRITE setBindDN ) Q_PROPERTY( TQString bindDN READ bindDN WRITE setBindDN )
@ -69,7 +70,7 @@ namespace KABC {
Q_PROPERTY( bool authSASL READ isAuthSASL WRITE setAuthSASL ) Q_PROPERTY( bool authSASL READ isAuthSASL WRITE setAuthSASL )
Q_PROPERTY( int sizeLimit READ sizeLimit WRITE setSizeLimit ) Q_PROPERTY( int sizeLimit READ sizeLimit WRITE setSizeLimit )
Q_PROPERTY( int timeLimit READ timeLimit WRITE setTimeLimit ) Q_PROPERTY( int timeLimit READ timeLimit WRITE setTimeLimit )
Q_SETS ( LCW_Flags ) TQ_SETS ( LCW_Flags )
public: public:

@ -58,7 +58,7 @@ void LDAPUrl::setDn( const TQString &dn)
bool LDAPUrl::hasExtension( const TQString &key ) const bool LDAPUrl::hasExtension( const TQString &key ) const
{ {
return m_extensions.contains( key ); return m_extensions.tqcontains( key );
} }
LDAPUrl::Extension LDAPUrl::extension( const TQString &key ) const LDAPUrl::Extension LDAPUrl::extension( const TQString &key ) const

@ -178,7 +178,7 @@ bool LDIF::splitControl( const TQCString &line, TQString &oid, bool &critical,
critical = false; critical = false;
bool url = splitLine( line, tmp, value ); bool url = splitLine( line, tmp, value );
kdDebug(5700) << "splitControl: value: " << TQString::fromUtf8(value, value.size()) << endl; kdDebug(5700) << "splitControl: value: " << TQString(TQString::fromUtf8(value, value.size())) << endl;
if ( tmp.isEmpty() ) { if ( tmp.isEmpty() ) {
tmp = TQString::fromUtf8( value, value.size() ); tmp = TQString::fromUtf8( value, value.size() );
value.resize( 0 ); value.resize( 0 );
@ -211,7 +211,7 @@ LDIF::ParseVal LDIF::processLine()
if ( attrLower == "version" ) { if ( attrLower == "version" ) {
if ( !mDn.isEmpty() ) retval = Err; if ( !mDn.isEmpty() ) retval = Err;
} else if ( attrLower == "dn" ) { } else if ( attrLower == "dn" ) {
kdDebug(5700) << "ldapentry dn: " << TQString::fromUtf8( mVal, mVal.size() ) << endl; kdDebug(5700) << "ldapentry dn: " << TQString(TQString::fromUtf8( mVal, mVal.size() )) << endl;
mDn = TQString::fromUtf8( mVal, mVal.size() ); mDn = TQString::fromUtf8( mVal, mVal.size() );
mModType = Mod_None; mModType = Mod_None;
retval = NewEntry; retval = NewEntry;

@ -87,11 +87,11 @@ bool LDIFConverter::addresseeToLDIF( const Addressee &addr, TQString &str )
const Address workAddr = addr.address( Address::Work ); const Address workAddr = addr.address( Address::Work );
ldif_out( t, "dn", TQString( "cn=%1,mail=%2" ) ldif_out( t, "dn", TQString( "cn=%1,mail=%2" )
.arg( addr.formattedName().simplifyWhiteSpace() ) .arg( TQString(addr.formattedName()).simplifyWhiteSpace() )
.arg( addr.preferredEmail() ) ); .arg( addr.preferredEmail() ) );
ldif_out( t, "givenname", addr.givenName() ); ldif_out( t, "givenname", addr.givenName() );
ldif_out( t, "sn", addr.familyName() ); ldif_out( t, "sn", addr.familyName() );
ldif_out( t, "cn", addr.formattedName().simplifyWhiteSpace() ); ldif_out( t, "cn", TQString(addr.formattedName()).simplifyWhiteSpace() );
ldif_out( t, "uid", addr.uid() ); ldif_out( t, "uid", addr.uid() );
ldif_out( t, "nickname", addr.nickName() ); ldif_out( t, "nickname", addr.nickName() );
ldif_out( t, "xmozillanickname", addr.nickName() ); ldif_out( t, "xmozillanickname", addr.nickName() );
@ -152,7 +152,7 @@ bool LDIFConverter::addresseeToLDIF( const Addressee &addr, TQString &str )
ldif_out( t, "homeurl", addr.url().prettyURL() ); ldif_out( t, "homeurl", addr.url().prettyURL() );
ldif_out( t, "description", addr.note() ); ldif_out( t, "description", addr.note() );
if (addr.revision().isValid()) if (addr.revision().isValid())
ldif_out(t, "modifytimestamp", dateToVCardString( addr.revision()) ); ldif_out(t, "modifytimestamp", dateToVCardString( TQT_TQDATETIME_OBJECT(addr.revision())) );
t << "objectclass: top\n"; t << "objectclass: top\n";
t << "objectclass: person\n"; t << "objectclass: person\n";
@ -271,7 +271,7 @@ bool LDIFConverter::evaluatePair( Addressee &a, Address &homeAddr,
} }
if ( fieldname == TQString::tqfromLatin1( "mail" ) || if ( fieldname == TQString::tqfromLatin1( "mail" ) ||
fieldname == TQString::tqfromLatin1( "mozillasecondemail" ) ) { // mozilla fieldname == TQString::tqfromLatin1( "mozillasecondemail" ) ) { // mozilla
if ( a.emails().findIndex( value ) == -1 ) if ( a.emails().tqfindIndex( value ) == -1 )
a.insertEmail( value ); a.insertEmail( value );
return true; return true;
} }
@ -489,8 +489,8 @@ addComment:
if ( fieldname == TQString::tqfromLatin1( "objectclass" ) ) // ignore if ( fieldname == TQString::tqfromLatin1( "objectclass" ) ) // ignore
return true; return true;
kdWarning() << TQString("LDIFConverter: Unknown field for '%1': '%2=%3'\n") kdWarning() << TQString(TQString("LDIFConverter: Unknown field for '%1': '%2=%3'\n")
.arg(a.formattedName()).arg(fieldname).arg(value); .arg(a.formattedName()).arg(fieldname).arg(value));
return true; return true;
} }
@ -554,7 +554,7 @@ TQString LDIFConverter::makeLDIFfieldString( TQString formatStr, TQString value,
} }
// generate the new string and split it to 72 chars/line // generate the new string and split it to 72 chars/line
TQCString txt = (formatStr.arg(value)).utf8(); TQCString txt = TQString(formatStr.arg(value)).utf8();
if (allowEncode) { if (allowEncode) {
len = txt.length(); len = txt.length();

@ -82,7 +82,7 @@ void ResourceDirConfig::loadSettings( KRES::Resource *res )
return; return;
} }
mFormatBox->setCurrentItem( mFormatTypes.findIndex( resource->format() ) ); mFormatBox->setCurrentItem( mFormatTypes.tqfindIndex( resource->format() ) );
mFileNameEdit->setURL( resource->path() ); mFileNameEdit->setURL( resource->path() );
if ( mFileNameEdit->url().isEmpty() ) if ( mFileNameEdit->url().isEmpty() )

@ -86,7 +86,7 @@ void ResourceFileConfig::loadSettings( KRES::Resource *res )
return; return;
} }
mFormatBox->setCurrentItem( mFormatTypes.findIndex( resource->format() ) ); mFormatBox->setCurrentItem( mFormatTypes.tqfindIndex( resource->format() ) );
mFileNameEdit->setURL( resource->fileName() ); mFileNameEdit->setURL( resource->fileName() );
if ( mFileNameEdit->url().isEmpty() ) if ( mFileNameEdit->url().isEmpty() )

@ -122,8 +122,8 @@ ResourceLDAPKIO::~ResourceLDAPKIO()
void ResourceLDAPKIO::enter_loop() void ResourceLDAPKIO::enter_loop()
{ {
TQWidget dummy(0,0,WType_Dialog | WShowModal); TQWidget dummy(0,0,(WFlags)(WType_Dialog | WShowModal));
dummy.setFocusPolicy( TQWidget::NoFocus ); dummy.setFocusPolicy( TQ_NoFocus );
qt_enter_modal(&dummy); qt_enter_modal(&dummy);
tqApp->enter_loop(); tqApp->enter_loop();
qt_leave_modal(&dummy); qt_leave_modal(&dummy);
@ -308,7 +308,7 @@ bool ResourceLDAPKIO::AddresseeToLDIF( TQByteArray &ldif, const Addressee &addr,
} }
tmp += "\n"; tmp += "\n";
kdDebug(7125) << "ldif: " << TQString::fromUtf8(tmp) << endl; kdDebug(7125) << "ldif: " << TQString(TQString::fromUtf8(tmp)) << endl;
ldif = tmp; ldif = tmp;
return true; return true;
} }
@ -330,49 +330,49 @@ void ResourceLDAPKIO::init()
handle them in the load() method below. handle them in the load() method below.
These are the default values These are the default values
*/ */
if ( !mAttributes.contains("objectClass") ) if ( !mAttributes.tqcontains("objectClass") )
mAttributes.insert( "objectClass", "inetOrgPerson" ); mAttributes.insert( "objectClass", "inetOrgPerson" );
if ( !mAttributes.contains("commonName") ) if ( !mAttributes.tqcontains("commonName") )
mAttributes.insert( "commonName", "cn" ); mAttributes.insert( "commonName", "cn" );
if ( !mAttributes.contains("formattedName") ) if ( !mAttributes.tqcontains("formattedName") )
mAttributes.insert( "formattedName", "displayName" ); mAttributes.insert( "formattedName", "displayName" );
if ( !mAttributes.contains("familyName") ) if ( !mAttributes.tqcontains("familyName") )
mAttributes.insert( "familyName", "sn" ); mAttributes.insert( "familyName", "sn" );
if ( !mAttributes.contains("givenName") ) if ( !mAttributes.tqcontains("givenName") )
mAttributes.insert( "givenName", "givenName" ); mAttributes.insert( "givenName", "givenName" );
if ( !mAttributes.contains("mail") ) if ( !mAttributes.tqcontains("mail") )
mAttributes.insert( "mail", "mail" ); mAttributes.insert( "mail", "mail" );
if ( !mAttributes.contains("mailAlias") ) if ( !mAttributes.tqcontains("mailAlias") )
mAttributes.insert( "mailAlias", "" ); mAttributes.insert( "mailAlias", "" );
if ( !mAttributes.contains("phoneNumber") ) if ( !mAttributes.tqcontains("phoneNumber") )
mAttributes.insert( "phoneNumber", "homePhone" ); mAttributes.insert( "phoneNumber", "homePhone" );
if ( !mAttributes.contains("telephoneNumber") ) if ( !mAttributes.tqcontains("telephoneNumber") )
mAttributes.insert( "telephoneNumber", "telephoneNumber" ); mAttributes.insert( "telephoneNumber", "telephoneNumber" );
if ( !mAttributes.contains("facsimileTelephoneNumber") ) if ( !mAttributes.tqcontains("facsimileTelephoneNumber") )
mAttributes.insert( "facsimileTelephoneNumber", "facsimileTelephoneNumber" ); mAttributes.insert( "facsimileTelephoneNumber", "facsimileTelephoneNumber" );
if ( !mAttributes.contains("mobile") ) if ( !mAttributes.tqcontains("mobile") )
mAttributes.insert( "mobile", "mobile" ); mAttributes.insert( "mobile", "mobile" );
if ( !mAttributes.contains("pager") ) if ( !mAttributes.tqcontains("pager") )
mAttributes.insert( "pager", "pager" ); mAttributes.insert( "pager", "pager" );
if ( !mAttributes.contains("description") ) if ( !mAttributes.tqcontains("description") )
mAttributes.insert( "description", "description" ); mAttributes.insert( "description", "description" );
if ( !mAttributes.contains("title") ) if ( !mAttributes.tqcontains("title") )
mAttributes.insert( "title", "title" ); mAttributes.insert( "title", "title" );
if ( !mAttributes.contains("street") ) if ( !mAttributes.tqcontains("street") )
mAttributes.insert( "street", "street" ); mAttributes.insert( "street", "street" );
if ( !mAttributes.contains("state") ) if ( !mAttributes.tqcontains("state") )
mAttributes.insert( "state", "st" ); mAttributes.insert( "state", "st" );
if ( !mAttributes.contains("city") ) if ( !mAttributes.tqcontains("city") )
mAttributes.insert( "city", "l" ); mAttributes.insert( "city", "l" );
if ( !mAttributes.contains("organization") ) if ( !mAttributes.tqcontains("organization") )
mAttributes.insert( "organization", "o" ); mAttributes.insert( "organization", "o" );
if ( !mAttributes.contains("postalcode") ) if ( !mAttributes.tqcontains("postalcode") )
mAttributes.insert( "postalcode", "postalCode" ); mAttributes.insert( "postalcode", "postalCode" );
if ( !mAttributes.contains("uid") ) if ( !mAttributes.tqcontains("uid") )
mAttributes.insert( "uid", "uid" ); mAttributes.insert( "uid", "uid" );
if ( !mAttributes.contains("jpegPhoto") ) if ( !mAttributes.tqcontains("jpegPhoto") )
mAttributes.insert( "jpegPhoto", "jpegPhoto" ); mAttributes.insert( "jpegPhoto", "jpegPhoto" );
d->mLDAPUrl = KURL(); d->mLDAPUrl = KURL();

@ -281,7 +281,7 @@ AttributesDialog::AttributesDialog( const TQMap<TQString, TQString> &attributes,
for ( i = 1; i < mMapCombo->count(); i++ ) { for ( i = 1; i < mMapCombo->count(); i++ ) {
TQDictIterator<KLineEdit> it2( mLineEditDict ); TQDictIterator<KLineEdit> it2( mLineEditDict );
for ( ; it2.current(); ++it2 ) { for ( ; it2.current(); ++it2 ) {
if ( mMapList[ i ].contains( it2.currentKey() ) ) { if ( mMapList[ i ].tqcontains( it2.currentKey() ) ) {
if ( mMapList[ i ][ it2.currentKey() ] != it2.current()->text() ) break; if ( mMapList[ i ][ it2.currentKey() ] != it2.current()->text() ) break;
} else { } else {
if ( mDefaultMap[ it2.currentKey() ] != it2.current()->text() ) break; if ( mDefaultMap[ it2.currentKey() ] != it2.current()->text() ) break;

@ -79,7 +79,7 @@ void ResourceNetConfig::loadSettings( KRES::Resource *res )
return; return;
} }
mFormatBox->setCurrentItem( mFormatTypes.findIndex( resource->format() ) ); mFormatBox->setCurrentItem( mFormatTypes.tqfindIndex( resource->format() ) );
mUrlEdit->setURL( resource->url().url() ); mUrlEdit->setURL( resource->url().url() );
} }

@ -54,8 +54,8 @@ ResourceSelectDialog::ResourceSelectDialog( AddressBook *ab, TQWidget *parent, c
KButtonBox *buttonBox = new KButtonBox( this ); KButtonBox *buttonBox = new KButtonBox( this );
buttonBox->addStretch(); buttonBox->addStretch();
buttonBox->addButton( KStdGuiItem::ok(), this, TQT_SLOT( accept() ) ); buttonBox->addButton( KStdGuiItem::ok(), TQT_TQOBJECT(this), TQT_SLOT( accept() ) );
buttonBox->addButton( KStdGuiItem::cancel(), this, TQT_SLOT( reject() ) ); buttonBox->addButton( KStdGuiItem::cancel(), TQT_TQOBJECT(this), TQT_SLOT( reject() ) );
buttonBox->layout(); buttonBox->layout();
mainLayout->addWidget( buttonBox ); mainLayout->addWidget( buttonBox );

@ -212,11 +212,11 @@ void Addressee::setNameFromString( const TQString &s )
setName( str ); setName( str );
// clear all name parts // clear all name parts
setPrefix( TQString::null ); setPrefix( TQString() );
setGivenName( TQString::null ); setGivenName( TQString() );
setAdditionalName( TQString::null ); setAdditionalName( TQString() );
setFamilyName( TQString::null ); setFamilyName( TQString() );
setSuffix( TQString::null ); setSuffix( TQString() );
if ( str.isEmpty() ) if ( str.isEmpty() )
return; return;
@ -391,7 +391,7 @@ TQString Addressee::fullEmail( const TQString &email ) const
} else { } else {
e = email; e = email;
} }
if ( e.isEmpty() ) return TQString::null; if ( e.isEmpty() ) return TQString();
TQString text; TQString text;
if ( realName().isEmpty() ) if ( realName().isEmpty() )
@ -444,7 +444,7 @@ void Addressee::removeEmail( const TQString &email )
TQString Addressee::preferredEmail() const TQString Addressee::preferredEmail() const
{ {
if ( mData->emails.count() == 0 ) return TQString::null; if ( mData->emails.count() == 0 ) return TQString();
else return mData->emails.first(); else return mData->emails.first();
} }
@ -755,7 +755,7 @@ void Addressee::insertCategory( const TQString &c )
detach(); detach();
mData->empty = false; mData->empty = false;
if ( mData->categories.findIndex( c ) != -1 ) return; if ( mData->categories.tqfindIndex( c ) != -1 ) return;
mData->categories.append( c ); mData->categories.append( c );
} }
@ -772,7 +772,7 @@ void Addressee::removeCategory( const TQString &c )
bool Addressee::hasCategory( const TQString &c ) const bool Addressee::hasCategory( const TQString &c ) const
{ {
return ( mData->categories.findIndex( c ) != -1 ); return ( mData->categories.tqfindIndex( c ) != -1 );
} }
void Addressee::setCategories( const TQStringList &c ) void Addressee::setCategories( const TQStringList &c )

@ -13,64 +13,64 @@
# Field Category : Categories the field belongs to (see Field::FieldCategory). # Field Category : Categories the field belongs to (see Field::FieldCategory).
# Output function: Function used to convert type to string for debug output (optional) # Output function: Function used to convert type to string for debug output (optional)
ALE,name,,QString,name ALE,name,,TQString,name
ALFE,formatted name,,QString,formattedName,Frequent ALFE,formatted name,,TQString,formattedName,Frequent
ALFE,family name,,QString,familyName,Frequent ALFE,family name,,TQString,familyName,Frequent
ALFE,given name,,QString,givenName,Frequent ALFE,given name,,TQString,givenName,Frequent
ALFE,additional names,,QString,additionalName ALFE,additional names,,TQString,additionalName
ALFE,honorific prefixes,,QString,prefix ALFE,honorific prefixes,,TQString,prefix
ALFE,honorific suffixes,,QString,suffix ALFE,honorific suffixes,,TQString,suffix
ALFE,nick name,,QString,nickName,Personal ALFE,nick name,,TQString,nickName,Personal
ALFE,birthday,,QDateTime,birthday,Personal,.toString() ALFE,birthday,,TQDateTime,birthday,Personal,.toString()
#Address address #Address address
LF,home address street,,QString,homeAddressStreet,Address|Personal LF,home address street,,TQString,homeAddressStreet,Address|Personal
LF,home address city,,QString,homeAddressLocality,Address|Personal LF,home address city,,TQString,homeAddressLocality,Address|Personal
LF,home address state,,QString,homeAddressRegion,Address|Personal LF,home address state,,TQString,homeAddressRegion,Address|Personal
LF,home address zip code,,QString,homeAddressPostalCode,Address|Personal LF,home address zip code,,TQString,homeAddressPostalCode,Address|Personal
LF,home address country,,QString,homeAddressCountry,Address|Personal LF,home address country,,TQString,homeAddressCountry,Address|Personal
LF,home address label,,QString,homeAddressLabel,Address|Personal LF,home address label,,TQString,homeAddressLabel,Address|Personal
LF,business address street,,QString,businessAddressStreet,Address|Organization LF,business address street,,TQString,businessAddressStreet,Address|Organization
LF,business address city,,QString,businessAddressLocality,Address|Organization LF,business address city,,TQString,businessAddressLocality,Address|Organization
LF,business address state,,QString,businessAddressRegion,Address|Organization LF,business address state,,TQString,businessAddressRegion,Address|Organization
LF,business address zip code,,QString,businessAddressPostalCode,Address|Organization LF,business address zip code,,TQString,businessAddressPostalCode,Address|Organization
LF,business address country,,QString,businessAddressCountry,Address|Organization LF,business address country,,TQString,businessAddressCountry,Address|Organization
LF,business address label,,QString,businessAddressLabel,Address|Organization LF,business address label,,TQString,businessAddressLabel,Address|Organization
#phoneNumbers #phoneNumbers
LF,home phone,,QString,homePhone,Personal|Frequent LF,home phone,,TQString,homePhone,Personal|Frequent
LF,business phone,,QString,businessPhone,Organization|Frequent LF,business phone,,TQString,businessPhone,Organization|Frequent
LF,mobile phone,,QString,mobilePhone,Frequent LF,mobile phone,,TQString,mobilePhone,Frequent
LF,home fax,,QString,homeFax LF,home fax,,TQString,homeFax
LF,business fax,,QString,businessFax LF,business fax,,TQString,businessFax
LF,car phone,,QString,carPhone LF,car phone,,TQString,carPhone
LF,ISDN,,QString,isdn LF,ISDN,,TQString,isdn
LF,pager,,QString,pager LF,pager,,TQString,pager
#emails #emails
LF,email address,,QString,email,Email|Frequent LF,email address,,TQString,email,Email|Frequent
ALFE,mail client,,QString,mailer,Email ALFE,mail client,,TQString,mailer,Email
ALE,time zone,,TimeZone,timeZone,,.asString() ALE,time zone,,TimeZone,timeZone,,.asString()
ALE,geographic position,,Geo,geo,,.asString() ALE,geographic position,,Geo,geo,,.asString()
ALFE,title,person,QString,title,Organization ALFE,title,person,TQString,title,Organization
ALFE,role,person in organization,QString,role,Organization ALFE,role,person in organization,TQString,role,Organization
ALFE,organization,,QString,organization,Organization ALFE,organization,,TQString,organization,Organization
ALFE,department,,QString,department,Organization ALFE,department,,TQString,department,Organization
ALFE,note,,QString,note ALFE,note,,TQString,note
ALE,product identifier,,QString,productId ALE,product identifier,,TQString,productId
ALE,revision date,,QDateTime,revision,,.toString() ALE,revision date,,TQDateTime,revision,,.toString()
ALE,sort string,,QString,sortString ALE,sort string,,TQString,sortString
ALF,homepage,,KURL,url,,.url() ALF,homepage,,KURL,url,,.url()

@ -344,7 +344,7 @@ bool Field::setValue( KABC::Addressee &a, const TQString &value )
return true; return true;
} }
case FieldImpl::Birthday: case FieldImpl::Birthday:
a.setBirthday( TQDate::fromString( value, Qt::ISODate ) ); a.setBirthday( TQT_TQDATE_OBJECT(TQDate::fromString( value, Qt::ISODate )) );
return true; return true;
case FieldImpl::CustomField: case FieldImpl::CustomField:
a.insertCustom( mImpl->app(), mImpl->key(), value ); a.insertCustom( mImpl->app(), mImpl->key(), value );
@ -360,7 +360,7 @@ TQString Field::sortKey( const KABC::Addressee &a )
--CASEVALUE-- --CASEVALUE--
case FieldImpl::Birthday: case FieldImpl::Birthday:
if ( a.birthday().isValid() ) { if ( a.birthday().isValid() ) {
TQDate date = a.birthday().date(); TQDate date = TQT_TQDATE_OBJECT(a.birthday().date());
TQString key; TQString key;
key.sprintf( "%02d-%02d", date.month(), date.day() ); key.sprintf( "%02d-%02d", date.month(), date.day() );
return key; return key;

@ -55,7 +55,7 @@ if (!open( H_OUT, ">../addressee.h" ) ) {
print H_OUT " /**\n"; print H_OUT " /**\n";
print H_OUT " Return translated label for $entryNames[$i] field.\n"; print H_OUT " Return translated label for $entryNames[$i] field.\n";
print H_OUT " */\n"; print H_OUT " */\n";
print H_OUT " static QString $entryNames[$i]Label();\n\n"; print H_OUT " static TQString $entryNames[$i]Label();\n\n";
} }
} else { } else {
print H_OUT; print H_OUT;
@ -100,7 +100,7 @@ if (!open( CPP_OUT, ">../addressee.cpp" ) ) {
$labelwords[$j] = ucfirst $labelwords[$j]; $labelwords[$j] = ucfirst $labelwords[$j];
} }
$label = join ' ', @labelwords; $label = join ' ', @labelwords;
print CPP_OUT "QString Addressee::$entryNames[$i]Label()\n{\n"; print CPP_OUT "TQString Addressee::$entryNames[$i]Label()\n{\n";
if ( $entryComments[$i] ) { if ( $entryComments[$i] ) {
print CPP_OUT " return i18n(\"$entryComments[$i]\",\"$label\");\n"; print CPP_OUT " return i18n(\"$entryComments[$i]\",\"$label\");\n";
} else { } else {
@ -112,7 +112,7 @@ if (!open( CPP_OUT, ">../addressee.cpp" ) ) {
for( $i=0; $i<@entryNames; ++$i ) { for( $i=0; $i<@entryNames; ++$i ) {
if ( $entryCtrl[$i] =~ /E/ ) { if ( $entryCtrl[$i] =~ /E/ ) {
if ( $entryNames[$i] !~ "revision" ) { if ( $entryNames[$i] !~ "revision" ) {
if ( $entryTypes[$i] =~ "QString" ) { if ( $entryTypes[$i] =~ "TQString" ) {
print CPP_OUT " if ( mData->$entryNames[$i] != a.mData->$entryNames[$i] &&\n"; print CPP_OUT " if ( mData->$entryNames[$i] != a.mData->$entryNames[$i] &&\n";
print CPP_OUT " !( mData->$entryNames[$i].isEmpty() && a.mData->$entryNames[$i].isEmpty() ) ) {\n"; print CPP_OUT " !( mData->$entryNames[$i].isEmpty() && a.mData->$entryNames[$i].isEmpty() ) ) {\n";
print CPP_OUT " kdDebug(5700) << \"$entryNames[$i] differs\" << endl;\n"; print CPP_OUT " kdDebug(5700) << \"$entryNames[$i] differs\" << endl;\n";
@ -184,7 +184,7 @@ if (!open( CPP_OUT, ">../field.cpp" ) ) {
for( $i=0; $i<@entryNames; ++$i ) { for( $i=0; $i<@entryNames; ++$i ) {
if ( $entryCtrl[$i] !~ /A/ ) { next; } if ( $entryCtrl[$i] !~ /A/ ) { next; }
if ( $entryCtrl[$i] !~ /F/ ) { next; } if ( $entryCtrl[$i] !~ /F/ ) { next; }
if ( $entryTypes[$i] ne "QString" ) { next; } if ( $entryTypes[$i] ne "TQString" ) { next; }
print CPP_OUT " case FieldImpl::" . ucfirst($entryNames[$i]) . ":\n"; print CPP_OUT " case FieldImpl::" . ucfirst($entryNames[$i]) . ":\n";
print CPP_OUT " return a.$entryNames[$i]();\n"; print CPP_OUT " return a.$entryNames[$i]();\n";
} }
@ -192,7 +192,7 @@ if (!open( CPP_OUT, ">../field.cpp" ) ) {
for( $i=0; $i<@entryNames; ++$i ) { for( $i=0; $i<@entryNames; ++$i ) {
if ( $entryCtrl[$i] !~ /A/ ) { next; } if ( $entryCtrl[$i] !~ /A/ ) { next; }
if ( $entryCtrl[$i] !~ /F/ ) { next; } if ( $entryCtrl[$i] !~ /F/ ) { next; }
if ( $entryTypes[$i] ne "QString" ) { next; } if ( $entryTypes[$i] ne "TQString" ) { next; }
print CPP_OUT " case FieldImpl::" . ucfirst($entryNames[$i]) . ":\n"; print CPP_OUT " case FieldImpl::" . ucfirst($entryNames[$i]) . ":\n";
print CPP_OUT " a.set" . ucfirst($entryNames[$i]) . "( value );\n"; print CPP_OUT " a.set" . ucfirst($entryNames[$i]) . "( value );\n";
print CPP_OUT " return true;\n"; print CPP_OUT " return true;\n";

@ -140,7 +140,7 @@ ContentLine::_parse()
vDebug("parse"); vDebug("parse");
// Unqote newlines // Unqote newlines
strRep_ = strRep_.replace( TQRegExp( "\\\\n" ), "\n" ); strRep_ = strRep_.tqreplace( TQRegExp( "\\\\n" ), "\n" );
int split = strRep_.tqfind(':'); int split = strRep_.tqfind(':');
@ -275,7 +275,7 @@ ContentLine::_assemble()
} }
// Quote newlines // Quote newlines
line = line.replace( TQRegExp( "\n" ), "\\n" ); line = line.tqreplace( TQRegExp( "\n" ), "\\n" );
// Fold lines longer than 72 chars // Fold lines longer than 72 chars
const int maxLen = 72; const int maxLen = 72;

@ -173,7 +173,7 @@ DateValue::_parse()
/////////////////////////////////////////////////////////////// DATE /////////////////////////////////////////////////////////////// DATE
dateStr.replace(TQRegExp("-"), ""); dateStr.tqreplace(TQRegExp("-"), "");
kdDebug(5710) << "dateStr: " << dateStr << endl; kdDebug(5710) << "dateStr: " << dateStr << endl;
@ -208,7 +208,7 @@ DateValue::_parse()
//////////////////////////////////////////////////// SECOND FRACTION //////////////////////////////////////////////////// SECOND FRACTION
int secFracSep = timeStr.findRev(','); int secFracSep = timeStr.tqfindRev(',');
if (secFracSep != -1 && zoneSep != -1) { // zoneSep checked to avoid errors. if (secFracSep != -1 && zoneSep != -1) { // zoneSep checked to avoid errors.
TQCString quirkafleeg = "0." + timeStr.mid(secFracSep + 1, zoneSep); TQCString quirkafleeg = "0." + timeStr.mid(secFracSep + 1, zoneSep);
@ -217,7 +217,7 @@ DateValue::_parse()
/////////////////////////////////////////////////////////////// HMS /////////////////////////////////////////////////////////////// HMS
timeStr.replace(TQRegExp(":"), ""); timeStr.tqreplace(TQRegExp(":"), "");
hour_ = timeStr.left(2).toInt(); hour_ = timeStr.left(2).toInt();
minute_ = timeStr.mid(2, 2).toInt(); minute_ = timeStr.mid(2, 2).toInt();
@ -398,7 +398,7 @@ DateValue::setZoneMinute(unsigned int i)
assembled_ = false; assembled_ = false;
} }
QDate TQDate
DateValue::qdate() DateValue::qdate()
{ {
parse(); parse();
@ -406,7 +406,7 @@ DateValue::qdate()
return d; return d;
} }
QTime TQTime
DateValue::qtime() DateValue::qtime()
{ {
parse(); parse();
@ -415,7 +415,7 @@ DateValue::qtime()
return t; return t;
} }
QDateTime TQDateTime
DateValue::qdt() DateValue::qdt()
{ {
parse(); parse();

@ -99,7 +99,7 @@ Entity::~Entity()
// empty // empty
} }
QCString TQCString
Entity::asString() Entity::asString()
{ {
// vDebug("Entity::asString()"); // vDebug("Entity::asString()");

@ -31,7 +31,7 @@ using namespace VCARD;
// There are 31 possible types, not including extensions. // There are 31 possible types, not including extensions.
// URI is a custom field designed to store the upstream URI for each contact // URI is a custom field designed to store the upstream URI for each contact
// in order to handle certain limited CardDAV systems such as Zimbra // in order to handle certain limited CardDAV systems such as Zimbra
const QCString const TQCString
VCARD::paramNames [] = VCARD::paramNames [] =
{ {
"NAME", "NAME",
@ -228,7 +228,7 @@ VCARD::EntityTypeToValueType(EntityType e)
return t; return t;
} }
QCString TQCString
VCARD::EntityTypeToParamName(EntityType e) VCARD::EntityTypeToParamName(EntityType e)
{ {
if ( e > EntityUnknown ) e = EntityUnknown; if ( e > EntityUnknown ) e = EntityUnknown;

@ -97,14 +97,14 @@ LangValue::_assemble()
strRep_ += TQCString('-') + it.current(); strRep_ += TQCString('-') + it.current();
} }
QCString TQCString
LangValue::primary() LangValue::primary()
{ {
parse(); parse();
return primary_; return primary_;
} }
QStrList TQStrList
LangValue::subtags() LangValue::subtags()
{ {
parse(); parse();

@ -98,7 +98,7 @@ OrgValue::numValues()
return valueList_.count(); return valueList_.count();
} }
QCString TQCString
OrgValue::value(unsigned int i) OrgValue::value(unsigned int i)
{ {
parse(); parse();

@ -116,13 +116,13 @@ Param::setValue(const TQCString & value)
assembled_ = false; assembled_ = false;
} }
QCString TQCString
Param::name() Param::name()
{ {
return name_; return name_;
} }
QCString TQCString
Param::value() Param::value()
{ {
return value_; return value_;

@ -98,7 +98,7 @@ TextListValue::numValues()
return valueList_.count(); return valueList_.count();
} }
QCString TQCString
TextListValue::value(unsigned int i) TextListValue::value(unsigned int i)
{ {
parse(); parse();

@ -103,14 +103,14 @@ URIValue::_assemble()
strRep_ = scheme_ + ':' + schemeSpecificPart_; strRep_ = scheme_ + ':' + schemeSpecificPart_;
} }
QCString TQCString
URIValue::scheme() URIValue::scheme()
{ {
parse(); parse();
return scheme_; return scheme_;
} }
QCString TQCString
URIValue::schemeSpecificPart() URIValue::schemeSpecificPart()
{ {
parse(); parse();

@ -56,8 +56,8 @@ class KVCARD_EXPORT AdrParam : public Param
private: private:
QStrList adrTypeList_; TQStrList adrTypeList_;
QCString textParam_; TQCString textParam_;
}; };
} }

@ -39,8 +39,8 @@ class KVCARD_EXPORT ContentLine : public Entity
#include "ContentLine-generated.h" #include "ContentLine-generated.h"
QCString group() { parse(); return group_; } TQCString group() { parse(); return group_; }
QCString name() { parse(); return name_; } TQCString name() { parse(); return name_; }
Value * value() { parse(); return value_; } Value * value() { parse(); return value_; }
ParamList paramList() { parse(); return paramList_; } ParamList paramList() { parse(); return paramList_; }
ParamType paramType() { parse(); return paramType_; } ParamType paramType() { parse(); return paramType_; }
@ -63,8 +63,8 @@ class KVCARD_EXPORT ContentLine : public Entity
private: private:
QCString group_; TQCString group_;
QCString name_; TQCString name_;
TQPtrList<Param> paramList_; TQPtrList<Param> paramList_;
Value * value_; Value * value_;

@ -36,7 +36,7 @@ class KVCARD_EXPORT EmailParam : public Param
#include "EmailParam-generated.h" #include "EmailParam-generated.h"
QCString emailType() { parse(); return emailType_; } TQCString emailType() { parse(); return emailType_; }
bool pref() { parse(); return pref_; } bool pref() { parse(); return pref_; }
void setEmailType(const TQCString & s) void setEmailType(const TQCString & s)
@ -47,7 +47,7 @@ class KVCARD_EXPORT EmailParam : public Param
private: private:
QCString emailType_; TQCString emailType_;
bool pref_; bool pref_;
}; };

@ -54,7 +54,7 @@ class KVCARD_EXPORT VCard : public Entity
private: private:
QCString group_; TQCString group_;
TQPtrList<ContentLine> contentLineList_; TQPtrList<ContentLine> contentLineList_;
}; };

@ -41,12 +41,12 @@ bool VCardLineX::isValid() const
switch( name[0] ) { switch( name[0] ) {
case 'a': case 'a':
if ( name == VCARD_ADR && qualified && if ( name == VCARD_ADR && qualified &&
(qualifiers.contains(VCARD_ADR_DOM) || (qualifiers.tqcontains(VCARD_ADR_DOM) ||
qualifiers.contains(VCARD_ADR_INTL) || qualifiers.tqcontains(VCARD_ADR_INTL) ||
qualifiers.contains(VCARD_ADR_POSTAL) || qualifiers.tqcontains(VCARD_ADR_POSTAL) ||
qualifiers.contains(VCARD_ADR_HOME) || qualifiers.tqcontains(VCARD_ADR_HOME) ||
qualifiers.contains(VCARD_ADR_WORK) || qualifiers.tqcontains(VCARD_ADR_WORK) ||
qualifiers.contains(VCARD_ADR_PREF) qualifiers.tqcontains(VCARD_ADR_PREF)
) ) ) )
return true; return true;
@ -63,18 +63,18 @@ bool VCardLineX::isValid() const
if ( name == VCARD_CATEGORIES ) if ( name == VCARD_CATEGORIES )
return true; return true;
if ( name == VCARD_CLASS && qualified && if ( name == VCARD_CLASS && qualified &&
(qualifiers.contains(VCARD_CLASS_PUBLIC) || (qualifiers.tqcontains(VCARD_CLASS_PUBLIC) ||
qualifiers.contains(VCARD_CLASS_PRIVATE) || qualifiers.tqcontains(VCARD_CLASS_PRIVATE) ||
qualifiers.contains(VCARD_CLASS_CONFIDENTIAL) qualifiers.tqcontains(VCARD_CLASS_CONFIDENTIAL)
) ) ) )
return true; return true;
break; break;
case 'e': case 'e':
if ( name == VCARD_EMAIL && qualified && if ( name == VCARD_EMAIL && qualified &&
(qualifiers.contains(VCARD_EMAIL_INTERNET) || (qualifiers.tqcontains(VCARD_EMAIL_INTERNET) ||
qualifiers.contains(VCARD_EMAIL_PREF) || qualifiers.tqcontains(VCARD_EMAIL_PREF) ||
qualifiers.contains(VCARD_EMAIL_X400) qualifiers.tqcontains(VCARD_EMAIL_X400)
) ) ) )
return true; return true;
break; break;
@ -91,8 +91,8 @@ bool VCardLineX::isValid() const
case 'k': case 'k':
if ( name == VCARD_KEY && qualified && if ( name == VCARD_KEY && qualified &&
(qualifiers.contains(VCARD_KEY_X509) || (qualifiers.tqcontains(VCARD_KEY_X509) ||
qualifiers.contains(VCARD_KEY_PGP) qualifiers.tqcontains(VCARD_KEY_PGP)
) ) ) )
return true; return true;
break; break;
@ -150,20 +150,20 @@ bool VCardLineX::isValid() const
case 't': case 't':
if ( name == VCARD_TEL && qualified && if ( name == VCARD_TEL && qualified &&
(qualifiers.contains(VCARD_TEL_HOME) || (qualifiers.tqcontains(VCARD_TEL_HOME) ||
qualifiers.contains(VCARD_TEL_WORK) || qualifiers.tqcontains(VCARD_TEL_WORK) ||
qualifiers.contains(VCARD_TEL_PREF) || qualifiers.tqcontains(VCARD_TEL_PREF) ||
qualifiers.contains(VCARD_TEL_VOICE) || qualifiers.tqcontains(VCARD_TEL_VOICE) ||
qualifiers.contains(VCARD_TEL_FAX) || qualifiers.tqcontains(VCARD_TEL_FAX) ||
qualifiers.contains(VCARD_TEL_MSG) || qualifiers.tqcontains(VCARD_TEL_MSG) ||
qualifiers.contains(VCARD_TEL_CELL) || qualifiers.tqcontains(VCARD_TEL_CELL) ||
qualifiers.contains(VCARD_TEL_PAGER) || qualifiers.tqcontains(VCARD_TEL_PAGER) ||
qualifiers.contains(VCARD_TEL_BBS) || qualifiers.tqcontains(VCARD_TEL_BBS) ||
qualifiers.contains(VCARD_TEL_MODEM) || qualifiers.tqcontains(VCARD_TEL_MODEM) ||
qualifiers.contains(VCARD_TEL_CAR) || qualifiers.tqcontains(VCARD_TEL_CAR) ||
qualifiers.contains(VCARD_TEL_ISDN) || qualifiers.tqcontains(VCARD_TEL_ISDN) ||
qualifiers.contains(VCARD_TEL_VIDEO) || qualifiers.tqcontains(VCARD_TEL_VIDEO) ||
qualifiers.contains(VCARD_TEL_PCS) qualifiers.tqcontains(VCARD_TEL_PCS)
) ) ) )
return true; return true;
if ( name == VCARD_TZ ) if ( name == VCARD_TZ )
@ -266,33 +266,33 @@ KABC::Addressee VCard21Parser::readFromString( const TQString &data)
if ( (*i).name == VCARD_TEL ) { if ( (*i).name == VCARD_TEL ) {
int type = 0; int type = 0;
if ( (*i).qualified ) { if ( (*i).qualified ) {
if ( (*i).qualifiers.contains( VCARD_TEL_HOME ) ) if ( (*i).qualifiers.tqcontains( VCARD_TEL_HOME ) )
type |= PhoneNumber::Home; type |= PhoneNumber::Home;
if ( (*i).qualifiers.contains( VCARD_TEL_WORK ) ) if ( (*i).qualifiers.tqcontains( VCARD_TEL_WORK ) )
type |= PhoneNumber::Work; type |= PhoneNumber::Work;
if ( (*i).qualifiers.contains( VCARD_TEL_PREF ) ) if ( (*i).qualifiers.tqcontains( VCARD_TEL_PREF ) )
type |= PhoneNumber::Pref; type |= PhoneNumber::Pref;
// if ( (*i).qualifiers.contains( VCARD_TEL_VOICE ) ) // if ( (*i).qualifiers.tqcontains( VCARD_TEL_VOICE ) )
// type |= PhoneNumber::Voice; // type |= PhoneNumber::Voice;
if ( (*i).qualifiers.contains( VCARD_TEL_FAX ) ) if ( (*i).qualifiers.tqcontains( VCARD_TEL_FAX ) )
type |= PhoneNumber::Fax; type |= PhoneNumber::Fax;
if ( (*i).qualifiers.contains( VCARD_TEL_MSG ) ) if ( (*i).qualifiers.tqcontains( VCARD_TEL_MSG ) )
type |= PhoneNumber::Msg; type |= PhoneNumber::Msg;
if ( (*i).qualifiers.contains( VCARD_TEL_CELL ) ) if ( (*i).qualifiers.tqcontains( VCARD_TEL_CELL ) )
type |= PhoneNumber::Cell; type |= PhoneNumber::Cell;
if ( (*i).qualifiers.contains( VCARD_TEL_PAGER ) ) if ( (*i).qualifiers.tqcontains( VCARD_TEL_PAGER ) )
type |= PhoneNumber::Pager; type |= PhoneNumber::Pager;
if ( (*i).qualifiers.contains( VCARD_TEL_BBS ) ) if ( (*i).qualifiers.tqcontains( VCARD_TEL_BBS ) )
type |= PhoneNumber::Bbs; type |= PhoneNumber::Bbs;
if ( (*i).qualifiers.contains( VCARD_TEL_MODEM ) ) if ( (*i).qualifiers.tqcontains( VCARD_TEL_MODEM ) )
type |= PhoneNumber::Modem; type |= PhoneNumber::Modem;
if ( (*i).qualifiers.contains( VCARD_TEL_CAR ) ) if ( (*i).qualifiers.tqcontains( VCARD_TEL_CAR ) )
type |= PhoneNumber::Car; type |= PhoneNumber::Car;
if ( (*i).qualifiers.contains( VCARD_TEL_ISDN ) ) if ( (*i).qualifiers.tqcontains( VCARD_TEL_ISDN ) )
type |= PhoneNumber::Isdn; type |= PhoneNumber::Isdn;
if ( (*i).qualifiers.contains( VCARD_TEL_VIDEO ) ) if ( (*i).qualifiers.tqcontains( VCARD_TEL_VIDEO ) )
type |= PhoneNumber::Video; type |= PhoneNumber::Video;
if ( (*i).qualifiers.contains( VCARD_TEL_PCS ) ) if ( (*i).qualifiers.tqcontains( VCARD_TEL_PCS ) )
type |= PhoneNumber::Pcs; type |= PhoneNumber::Pcs;
} }
addressee.insertPhoneNumber( PhoneNumber( (*i).parameters[ 0 ], type ) ); addressee.insertPhoneNumber( PhoneNumber( (*i).parameters[ 0 ], type ) );
@ -304,19 +304,19 @@ KABC::Addressee VCard21Parser::readFromString( const TQString &data)
if ( (*i).name == VCARD_ADR ) { if ( (*i).name == VCARD_ADR ) {
int type = 0; int type = 0;
if ( (*i).qualified ) { if ( (*i).qualified ) {
if ( (*i).qualifiers.contains( VCARD_ADR_DOM ) ) if ( (*i).qualifiers.tqcontains( VCARD_ADR_DOM ) )
type |= Address::Dom; type |= Address::Dom;
if ( (*i).qualifiers.contains( VCARD_ADR_INTL ) ) if ( (*i).qualifiers.tqcontains( VCARD_ADR_INTL ) )
type |= Address::Intl; type |= Address::Intl;
if ( (*i).qualifiers.contains( VCARD_ADR_POSTAL ) ) if ( (*i).qualifiers.tqcontains( VCARD_ADR_POSTAL ) )
type |= Address::Postal; type |= Address::Postal;
if ( (*i).qualifiers.contains( VCARD_ADR_PARCEL ) ) if ( (*i).qualifiers.tqcontains( VCARD_ADR_PARCEL ) )
type |= Address::Parcel; type |= Address::Parcel;
if ( (*i).qualifiers.contains( VCARD_ADR_HOME ) ) if ( (*i).qualifiers.tqcontains( VCARD_ADR_HOME ) )
type |= Address::Home; type |= Address::Home;
if ( (*i).qualifiers.contains( VCARD_ADR_WORK ) ) if ( (*i).qualifiers.tqcontains( VCARD_ADR_WORK ) )
type |= Address::Work; type |= Address::Work;
if ( (*i).qualifiers.contains( VCARD_ADR_PREF ) ) if ( (*i).qualifiers.tqcontains( VCARD_ADR_PREF ) )
type |= Address::Pref; type |= Address::Pref;
} }
addressee.insertAddress( readAddressFromQStringList( (*i).parameters, type ) ); addressee.insertAddress( readAddressFromQStringList( (*i).parameters, type ) );
@ -492,7 +492,7 @@ VCard21ParserImpl *VCard21ParserImpl::parseVCard( const TQString& vc, int *err )
_vcl.parameters = TQStringList::split( ';', value, true ); _vcl.parameters = TQStringList::split( ';', value, true );
if ( qp ) { // decode the quoted printable if ( qp ) { // decode the quoted printable
for ( TQStringList::Iterator z = _vcl.parameters.begin(); z != _vcl.parameters.end(); ++z ) for ( TQStringList::Iterator z = _vcl.parameters.begin(); z != _vcl.parameters.end(); ++z )
*z = KCodecs::quotedPrintableDecode( (*z).latin1() ); *z = KCodecs::quotedPrintableDecode( TQCString((*z).latin1()) );
} }
} }
} else { } else {
@ -556,7 +556,7 @@ TQString VCard21ParserImpl::getValue(const TQString& name, const TQString& quali
const TQString lowqualifier = qualifier.lower(); const TQString lowqualifier = qualifier.lower();
for (TQValueListIterator<VCardLineX> i = _vcdata->begin();i != _vcdata->end();++i) { for (TQValueListIterator<VCardLineX> i = _vcdata->begin();i != _vcdata->end();++i) {
if ((*i).name == lowname && (*i).qualified && (*i).qualifiers.contains(lowqualifier)) { if ((*i).name == lowname && (*i).qualified && (*i).qualifiers.tqcontains(lowqualifier)) {
if ((*i).parameters.count() > 0) if ((*i).parameters.count() > 0)
return (*i).parameters[0]; return (*i).parameters[0];
else return failed; else return failed;
@ -598,7 +598,7 @@ TQStringList VCard21ParserImpl::getValues(const TQString& name, const TQString&
const TQString lowname = name.lower(); const TQString lowname = name.lower();
const TQString lowqualifier = qualifier.lower(); const TQString lowqualifier = qualifier.lower();
for (TQValueListIterator<VCardLineX> i = _vcdata->begin();i != _vcdata->end();++i) { for (TQValueListIterator<VCardLineX> i = _vcdata->begin();i != _vcdata->end();++i) {
if ((*i).name == lowname && (*i).qualified && (*i).qualifiers.contains(lowqualifier)) if ((*i).name == lowname && (*i).qualified && (*i).qualifiers.tqcontains(lowqualifier))
return (*i).parameters; return (*i).parameters;
} }
// failed. // failed.

@ -331,8 +331,8 @@ void VCardFormatImpl::saveAddressee( const Addressee &addressee, VCARD::VCard *v
addTextValue( v, EntityCategories, addressee.categories().join(",") ); addTextValue( v, EntityCategories, addressee.categories().join(",") );
addDateValue( v, EntityBirthday, addressee.birthday().date() ); addDateValue( v, EntityBirthday, TQT_TQDATE_OBJECT(addressee.birthday().date()) );
addDateTimeValue( v, EntityRevision, addressee.revision() ); addDateTimeValue( v, EntityRevision, TQT_TQDATETIME_OBJECT(addressee.revision()) );
addGeoValue( v, addressee.geo() ); addGeoValue( v, addressee.geo() );
addUTCValue( v, addressee.timeZone() ); addUTCValue( v, addressee.timeZone() );
@ -540,11 +540,11 @@ void VCardFormatImpl::addNValue( VCARD::VCard *vcard, const Addressee &a )
ContentLine cl; ContentLine cl;
cl.setName(EntityTypeToParamName( EntityN ) ); cl.setName(EntityTypeToParamName( EntityN ) );
NValue *v = new NValue; NValue *v = new NValue;
v->setFamily( a.familyName().utf8() ); v->setFamily( TQString(a.familyName()).utf8() );
v->setGiven( a.givenName().utf8() ); v->setGiven( TQString(a.givenName()).utf8() );
v->setMiddle( a.additionalName().utf8() ); v->setMiddle( TQString(a.additionalName()).utf8() );
v->setPrefix( a.prefix().utf8() ); v->setPrefix( TQString(a.prefix()).utf8() );
v->setSuffix( a.suffix().utf8() ); v->setSuffix( TQString(a.suffix()).utf8() );
cl.setValue( v ); cl.setValue( v );
vcard->add(cl); vcard->add(cl);

@ -124,7 +124,7 @@ TQStringList VCardLine::parameterList() const
void VCardLine::addParameter( const TQString& param, const TQString& value ) void VCardLine::addParameter( const TQString& param, const TQString& value )
{ {
TQStringList &list = mParamMap[ param ]; TQStringList &list = mParamMap[ param ];
if ( list.findIndex( value ) == -1 ) // not included yet if ( list.tqfindIndex( value ) == -1 ) // not included yet
list.append( value ); list.append( value );
} }

@ -134,7 +134,7 @@ VCard::List VCardParser::parseVCards( const TQString& text )
bool wasBase64Encoded = false; bool wasBase64Encoded = false;
params = vCardLine.parameterList(); params = vCardLine.parameterList();
if ( params.findIndex( "encoding" ) != -1 ) { // have to decode the data if ( params.tqfindIndex( "encoding" ) != -1 ) { // have to decode the data
TQByteArray input; TQByteArray input;
input = TQCString(value.latin1()); input = TQCString(value.latin1());
if ( vCardLine.parameter( "encoding" ).lower() == "b" || if ( vCardLine.parameter( "encoding" ).lower() == "b" ||
@ -155,18 +155,18 @@ VCard::List VCardParser::parseVCards( const TQString& text )
output = TQCString(value.latin1()); output = TQCString(value.latin1());
} }
if ( params.findIndex( "charset" ) != -1 ) { // have to convert the data if ( params.tqfindIndex( "charset" ) != -1 ) { // have to convert the data
TQTextCodec *codec = TQTextCodec *codec =
TQTextCodec::codecForName( vCardLine.parameter( "charset" ).latin1() ); TQTextCodec::codecForName( vCardLine.parameter( "charset" ).latin1() );
if ( codec ) { if ( codec ) {
vCardLine.setValue( codec->toUnicode( output ) ); vCardLine.setValue( codec->toUnicode( output ) );
} else { } else {
vCardLine.setValue( TQString::fromUtf8( output ) ); vCardLine.setValue( TQString(TQString::fromUtf8( output )) );
} }
} else if ( wasBase64Encoded ) { } else if ( wasBase64Encoded ) {
vCardLine.setValue( output ); vCardLine.setValue( output );
} else { // if charset not given, assume it's in UTF-8 (as used in previous KDE versions) } else { // if charset not given, assume it's in UTF-8 (as used in previous KDE versions)
vCardLine.setValue( TQString::fromUtf8( output ) ); vCardLine.setValue( TQString(TQString::fromUtf8( output )) );
} }
currentVCard.addLine( vCardLine ); currentVCard.addLine( vCardLine );

@ -36,7 +36,7 @@ static bool needsEncoding( const TQString &value )
{ {
uint length = value.length(); uint length = value.length();
for ( uint i = 0; i < length; ++i ) { for ( uint i = 0; i < length; ++i ) {
char c = value.at( i ).latin1(); char c = value.tqat( i ).latin1();
if ( (c < 33 || c > 126) && c != ' ' && c != '=' ) if ( (c < 33 || c > 126) && c != ' ' && c != '=' )
return true; return true;
} }
@ -138,7 +138,7 @@ TQString VCardTool::createVCards( Addressee::List list, VCard::Version version )
card.addLine( createAgent( version, (*addrIt).agent() ) ); card.addLine( createAgent( version, (*addrIt).agent() ) );
// BDAY // BDAY
card.addLine( VCardLine( "BDAY", createDateTime( (*addrIt).birthday() ) ) ); card.addLine( VCardLine( "BDAY", createDateTime( TQT_TQDATETIME_OBJECT((*addrIt).birthday()) ) ) );
// CATEGORIES // CATEGORIES
if ( version == VCard::v3_0 ) { if ( version == VCard::v3_0 ) {
@ -174,7 +174,7 @@ TQString VCardTool::createVCards( Addressee::List list, VCard::Version version )
} }
// FN // FN
VCardLine fnLine( "FN", (*addrIt).formattedName() ); VCardLine fnLine( "FN", TQString((*addrIt).formattedName()) );
if ( version == VCard::v2_1 && needsEncoding( (*addrIt).formattedName() ) ) { if ( version == VCard::v2_1 && needsEncoding( (*addrIt).formattedName() ) ) {
fnLine.addParameter( "charset", "UTF-8" ); fnLine.addParameter( "charset", "UTF-8" );
fnLine.addParameter( "encoding", "QUOTED-PRINTABLE" ); fnLine.addParameter( "encoding", "QUOTED-PRINTABLE" );
@ -199,7 +199,7 @@ TQString VCardTool::createVCards( Addressee::List list, VCard::Version version )
card.addLine( createPicture( "LOGO", (*addrIt).logo() ) ); card.addLine( createPicture( "LOGO", (*addrIt).logo() ) );
// MAILER // MAILER
VCardLine mailerLine( "MAILER", (*addrIt).mailer() ); VCardLine mailerLine( "MAILER", TQString((*addrIt).mailer()) );
if ( version == VCard::v2_1 && needsEncoding( (*addrIt).mailer() ) ) { if ( version == VCard::v2_1 && needsEncoding( (*addrIt).mailer() ) ) {
mailerLine.addParameter( "charset", "UTF-8" ); mailerLine.addParameter( "charset", "UTF-8" );
mailerLine.addParameter( "encoding", "QUOTED-PRINTABLE" ); mailerLine.addParameter( "encoding", "QUOTED-PRINTABLE" );
@ -222,7 +222,7 @@ TQString VCardTool::createVCards( Addressee::List list, VCard::Version version )
card.addLine( nLine ); card.addLine( nLine );
// NAME // NAME
VCardLine nameLine( "NAME", (*addrIt).name() ); VCardLine nameLine( "NAME", TQString((*addrIt).name()) );
if ( version == VCard::v2_1 && needsEncoding( (*addrIt).name() ) ) { if ( version == VCard::v2_1 && needsEncoding( (*addrIt).name() ) ) {
nameLine.addParameter( "charset", "UTF-8" ); nameLine.addParameter( "charset", "UTF-8" );
nameLine.addParameter( "encoding", "QUOTED-PRINTABLE" ); nameLine.addParameter( "encoding", "QUOTED-PRINTABLE" );
@ -231,10 +231,10 @@ TQString VCardTool::createVCards( Addressee::List list, VCard::Version version )
// NICKNAME // NICKNAME
if ( version == VCard::v3_0 ) if ( version == VCard::v3_0 )
card.addLine( VCardLine( "NICKNAME", (*addrIt).nickName() ) ); card.addLine( VCardLine( "NICKNAME", TQString((*addrIt).nickName()) ) );
// NOTE // NOTE
VCardLine noteLine( "NOTE", (*addrIt).note() ); VCardLine noteLine( "NOTE", TQString((*addrIt).note()) );
if ( version == VCard::v2_1 && needsEncoding( (*addrIt).note() ) ) { if ( version == VCard::v2_1 && needsEncoding( (*addrIt).note() ) ) {
noteLine.addParameter( "charset", "UTF-8" ); noteLine.addParameter( "charset", "UTF-8" );
noteLine.addParameter( "encoding", "QUOTED-PRINTABLE" ); noteLine.addParameter( "encoding", "QUOTED-PRINTABLE" );
@ -258,13 +258,13 @@ TQString VCardTool::createVCards( Addressee::List list, VCard::Version version )
// PROID // PROID
if ( version == VCard::v3_0 ) if ( version == VCard::v3_0 )
card.addLine( VCardLine( "PRODID", (*addrIt).productId() ) ); card.addLine( VCardLine( "PRODID", TQString((*addrIt).productId()) ) );
// REV // REV
card.addLine( VCardLine( "REV", createDateTime( (*addrIt).revision() ) ) ); card.addLine( VCardLine( "REV", createDateTime( TQT_TQDATETIME_OBJECT((*addrIt).revision()) ) ) );
// ROLE // ROLE
VCardLine roleLine( "ROLE", (*addrIt).role() ); VCardLine roleLine( "ROLE", TQString((*addrIt).role()) );
if ( version == VCard::v2_1 && needsEncoding( (*addrIt).role() ) ) { if ( version == VCard::v2_1 && needsEncoding( (*addrIt).role() ) ) {
roleLine.addParameter( "charset", "UTF-8" ); roleLine.addParameter( "charset", "UTF-8" );
roleLine.addParameter( "encoding", "QUOTED-PRINTABLE" ); roleLine.addParameter( "encoding", "QUOTED-PRINTABLE" );
@ -273,7 +273,7 @@ TQString VCardTool::createVCards( Addressee::List list, VCard::Version version )
// SORT-STRING // SORT-STRING
if ( version == VCard::v3_0 ) if ( version == VCard::v3_0 )
card.addLine( VCardLine( "SORT-STRING", (*addrIt).sortString() ) ); card.addLine( VCardLine( "SORT-STRING", TQString((*addrIt).sortString()) ) );
// SOUND // SOUND
card.addLine( createSound( (*addrIt).sound() ) ); card.addLine( createSound( (*addrIt).sound() ) );
@ -294,7 +294,7 @@ TQString VCardTool::createVCards( Addressee::List list, VCard::Version version )
} }
// TITLE // TITLE
VCardLine titleLine( "TITLE", (*addrIt).title() ); VCardLine titleLine( "TITLE", TQString((*addrIt).title()) );
if ( version == VCard::v2_1 && needsEncoding( (*addrIt).title() ) ) { if ( version == VCard::v2_1 && needsEncoding( (*addrIt).title() ) ) {
titleLine.addParameter( "charset", "UTF-8" ); titleLine.addParameter( "charset", "UTF-8" );
titleLine.addParameter( "encoding", "QUOTED-PRINTABLE" ); titleLine.addParameter( "encoding", "QUOTED-PRINTABLE" );
@ -428,7 +428,7 @@ Addressee::List VCardTool::parseVCards( const TQString& vcard )
// EMAIL // EMAIL
else if ( identifier == "email" ) { else if ( identifier == "email" ) {
const TQStringList types = (*lineIt).parameters( "type" ); const TQStringList types = (*lineIt).parameters( "type" );
addr.insertEmail( (*lineIt).value().asString(), types.findIndex( "PREF" ) != -1 ); addr.insertEmail( (*lineIt).value().asString(), types.tqfindIndex( "PREF" ) != -1 );
} }
// FN // FN
@ -653,16 +653,16 @@ Picture VCardTool::parsePicture( const VCardLine &line )
Picture pic; Picture pic;
const TQStringList params = line.parameterList(); const TQStringList params = line.parameterList();
if ( params.findIndex( "encoding" ) != -1 ) { if ( params.tqfindIndex( "encoding" ) != -1 ) {
TQImage img; TQImage img;
img.loadFromData( line.value().asByteArray() ); img.loadFromData( line.value().asByteArray() );
pic.setData( img ); pic.setData( img );
} else if ( params.findIndex( "value" ) != -1 ) { } else if ( params.tqfindIndex( "value" ) != -1 ) {
if ( line.parameter( "value" ).lower() == "uri" ) if ( line.parameter( "value" ).lower() == "uri" )
pic.setUrl( line.value().asString() ); pic.setUrl( line.value().asString() );
} }
if ( params.findIndex( "type" ) != -1 ) if ( params.tqfindIndex( "type" ) != -1 )
pic.setType( line.parameter( "type" ) ); pic.setType( line.parameter( "type" ) );
return pic; return pic;
@ -700,9 +700,9 @@ Sound VCardTool::parseSound( const VCardLine &line )
Sound snd; Sound snd;
const TQStringList params = line.parameterList(); const TQStringList params = line.parameterList();
if ( params.findIndex( "encoding" ) != -1 ) if ( params.tqfindIndex( "encoding" ) != -1 )
snd.setData( line.value().asByteArray() ); snd.setData( line.value().asByteArray() );
else if ( params.findIndex( "value" ) != -1 ) { else if ( params.tqfindIndex( "value" ) != -1 ) {
if ( line.parameter( "value" ).lower() == "uri" ) if ( line.parameter( "value" ).lower() == "uri" )
snd.setUrl( line.value().asString() ); snd.setUrl( line.value().asString() );
} }
@ -738,12 +738,12 @@ Key VCardTool::parseKey( const VCardLine &line )
Key key; Key key;
const TQStringList params = line.parameterList(); const TQStringList params = line.parameterList();
if ( params.findIndex( "encoding" ) != -1 ) if ( params.tqfindIndex( "encoding" ) != -1 )
key.setBinaryData( line.value().asByteArray() ); key.setBinaryData( line.value().asByteArray() );
else else
key.setTextData( line.value().asString() ); key.setTextData( line.value().asString() );
if ( params.findIndex( "type" ) != -1 ) { if ( params.tqfindIndex( "type" ) != -1 ) {
if ( line.parameter( "type" ).lower() == "x509" ) if ( line.parameter( "type" ).lower() == "x509" )
key.setType( Key::X509 ); key.setType( Key::X509 );
else if ( line.parameter( "type" ).lower() == "pgp" ) else if ( line.parameter( "type" ).lower() == "pgp" )
@ -814,7 +814,7 @@ Agent VCardTool::parseAgent( const VCardLine &line )
Agent agent; Agent agent;
const TQStringList params = line.parameterList(); const TQStringList params = line.parameterList();
if ( params.findIndex( "value" ) != -1 ) { if ( params.tqfindIndex( "value" ) != -1 ) {
if ( line.parameter( "value" ).lower() == "uri" ) if ( line.parameter( "value" ).lower() == "uri" )
agent.setUrl( line.value().asString() ); agent.setUrl( line.value().asString() );
} else { } else {

@ -90,7 +90,7 @@ void KateArbitraryHighlight::addHighlightToView(KateSuperRangeList* list, KateVi
} }
void KateArbitraryHighlight::slotRangeListDeleted(TQObject* obj) { void KateArbitraryHighlight::slotRangeListDeleted(TQObject* obj) {
int id=m_docHLs.findRef(static_cast<KateSuperRangeList*>(obj)); int id=m_docHLs.tqfindRef(static_cast<KateSuperRangeList*>(obj));
if (id>=0) m_docHLs.take(id); if (id>=0) m_docHLs.take(id);
for (TQMap<KateView*, TQPtrList<KateSuperRangeList>* >::Iterator it = m_viewHLs.begin(); it != m_viewHLs.end(); ++it) for (TQMap<KateView*, TQPtrList<KateSuperRangeList>* >::Iterator it = m_viewHLs.begin(); it != m_viewHLs.end(); ++it)
@ -152,7 +152,7 @@ KateView* KateArbitraryHighlight::viewForRange(KateSuperRange* range)
{ {
for (TQMap<KateView*, TQPtrList<KateSuperRangeList>* >::Iterator it = m_viewHLs.begin(); it != m_viewHLs.end(); ++it) for (TQMap<KateView*, TQPtrList<KateSuperRangeList>* >::Iterator it = m_viewHLs.begin(); it != m_viewHLs.end(); ++it)
for (KateSuperRangeList* l = (*it)->first(); l; l = (*it)->next()) for (KateSuperRangeList* l = (*it)->first(); l; l = (*it)->next())
if (l->contains(range)) if (l->tqcontains(range))
return it.key(); return it.key();
// This must belong to a document-global highlight // This must belong to a document-global highlight

@ -1411,7 +1411,7 @@ void KateXmlIndent::getLineInfo (uint line, uint &prevIndent, int &numTags,
uint pos, len = text.length(); uint pos, len = text.length();
bool seenOpen = false; bool seenOpen = false;
for(pos = 0; pos < len; ++pos) { for(pos = 0; pos < len; ++pos) {
int ch = text.at(pos).tqunicode(); int ch = text.tqat(pos).tqunicode();
switch(ch) { switch(ch) {
case '<': case '<':
seenOpen = true; seenOpen = true;
@ -1467,11 +1467,11 @@ void KateXmlIndent::getLineInfo (uint line, uint &prevIndent, int &numTags,
if(unclosedTag) { if(unclosedTag) {
// find the start of the next attribute, so we can align with it // find the start of the next attribute, so we can align with it
do { do {
lastCh = text.at(++attrCol).tqunicode(); lastCh = text.tqat(++attrCol).tqunicode();
}while(lastCh && lastCh != ' ' && lastCh != '\t'); }while(lastCh && lastCh != ' ' && lastCh != '\t');
while(lastCh == ' ' || lastCh == '\t') { while(lastCh == ' ' || lastCh == '\t') {
lastCh = text.at(++attrCol).tqunicode(); lastCh = text.tqat(++attrCol).tqunicode();
} }
attrCol = prevLine->cursorX(attrCol, tabWidth); attrCol = prevLine->cursorX(attrCol, tabWidth);
@ -1606,7 +1606,7 @@ TQString KateCSAndSIndent::findOpeningCommentIndentation(const KateDocCursor &st
{ {
KateTextLine::Ptr textLine = doc->plainKateTextLine(cur.line()); KateTextLine::Ptr textLine = doc->plainKateTextLine(cur.line());
int pos = textLine->string().findRev("/*"); int pos = textLine->string().tqfindRev("/*");
// FIXME: /* inside /* is possible. This screws up in that case... // FIXME: /* inside /* is possible. This screws up in that case...
if (pos >= 0) if (pos >= 0)
return initialWhitespace(textLine, pos); return initialWhitespace(textLine, pos);
@ -2372,9 +2372,9 @@ void KateVarIndent::slotVariableChanged( const TQString &var, const TQString &va
{ {
d->couples = 0; d->couples = 0;
TQStringList l = TQStringList::split( " ", val ); TQStringList l = TQStringList::split( " ", val );
if ( l.contains("parens") ) d->couples |= Parens; if ( l.tqcontains("parens") ) d->couples |= Parens;
if ( l.contains("braces") ) d->couples |= Braces; if ( l.tqcontains("braces") ) d->couples |= Braces;
if ( l.contains("brackets") ) d->couples |= Brackets; if ( l.tqcontains("brackets") ) d->couples |= Brackets;
} }
else if ( var == "var-indent-couple-attribute" ) else if ( var == "var-indent-couple-attribute" )
{ {

@ -86,7 +86,7 @@ class KateFileLoader
public: public:
KateFileLoader (const TQString &filename, TQTextCodec *codec, bool removeTrailingSpaces) KateFileLoader (const TQString &filename, TQTextCodec *codec, bool removeTrailingSpaces)
: m_file (filename) : m_file (filename)
, m_buffer (kMin (m_file.size(), KATE_FILE_LOADER_BS)) , m_buffer (kMin ((TQ_ULONG)m_file.size(), KATE_FILE_LOADER_BS))
, m_codec (codec) , m_codec (codec)
, m_decoder (m_codec->makeDecoder()) , m_decoder (m_codec->makeDecoder())
, m_position (0) , m_position (0)

@ -157,7 +157,7 @@ bool KateCommands::CoreCommands::exec(Kate::View *view,
} }
else if ( cmd == "set-highlight" ) else if ( cmd == "set-highlight" )
{ {
TQString val = _cmd.section( ' ', 1 ).lower(); TQString val = TQString(_cmd.section( ' ', 1 )).lower();
for ( uint i=0; i < v->doc()->hlModeCount(); i++ ) for ( uint i=0; i < v->doc()->hlModeCount(); i++ )
{ {
if ( v->doc()->hlModeName( i ).lower() == val ) if ( v->doc()->hlModeName( i ).lower() == val )
@ -408,7 +408,7 @@ int KateCommands::SedReplace::sedMagic( KateDocument *doc, int &line,
TQString rep=repOld; TQString rep=repOld;
// now set the backreferences in the replacement // now set the backreferences in the replacement
TQStringList backrefs=matcher.capturedTexts(); TQStringList backrefs=matcher.tqcapturedTexts();
int refnum=1; int refnum=1;
TQStringList::Iterator i = backrefs.begin(); TQStringList::Iterator i = backrefs.begin();
@ -442,7 +442,7 @@ int KateCommands::SedReplace::sedMagic( KateDocument *doc, int &line,
// TODO if replace contains \n, // TODO if replace contains \n,
// change the line number and // change the line number and
// check for text that needs be searched behind the last inserted newline. // check for text that needs be searched behind the last inserted newline.
int lns = rep.contains('\n'); int lns = rep.tqcontains('\n');
if ( lns ) if ( lns )
{ {
line += lns; line += lns;
@ -451,7 +451,7 @@ int KateCommands::SedReplace::sedMagic( KateDocument *doc, int &line,
{ {
// if ( endcol >= startcol + len ) // if ( endcol >= startcol + len )
endcol -= (startcol + len); endcol -= (startcol + len);
uint sc = rep.length() - rep.findRev('\n') - 1; uint sc = rep.length() - rep.tqfindRev('\n') - 1;
matches += sedMagic( doc, line, find, repOld, delim, noCase, repeat, sc, endcol ); matches += sedMagic( doc, line, find, repOld, delim, noCase, repeat, sc, endcol );
} }
} }

@ -51,7 +51,7 @@
*@short Listbox showing codecompletion *@short Listbox showing codecompletion
*@author Jonas B. Jacobi <j.jacobi@gmx.de> *@author Jonas B. Jacobi <j.jacobi@gmx.de>
*/ */
class KateCCListBox : public QListBox class KateCCListBox : public TQListBox
{ {
public: public:
/** /**
@ -90,7 +90,7 @@ class KateCCListBox : public QListBox
} }
}; };
class KateCompletionItem : public QListBoxText class KateCompletionItem : public TQListBoxText
{ {
public: public:
KateCompletionItem( TQListBox* lb, KTextEditor::CompletionEntry entry ) KateCompletionItem( TQListBox* lb, KTextEditor::CompletionEntry entry )
@ -113,7 +113,7 @@ KateCodeCompletion::KateCodeCompletion( KateView* view )
, m_view( view ) , m_view( view )
, m_commentLabel( 0 ) , m_commentLabel( 0 )
{ {
m_completionPopup = new TQVBox( 0, 0, WType_Popup ); m_completionPopup = new TQVBox( 0, 0, (WFlags)WType_Popup );
m_completionPopup->setFrameStyle( TQFrame::Box | TQFrame::Plain ); m_completionPopup->setFrameStyle( TQFrame::Box | TQFrame::Plain );
m_completionPopup->setLineWidth( 1 ); m_completionPopup->setLineWidth( 1 );
@ -163,9 +163,9 @@ void KateCodeCompletion::showCompletionBox(
bool KateCodeCompletion::eventFilter( TQObject *o, TQEvent *e ) bool KateCodeCompletion::eventFilter( TQObject *o, TQEvent *e )
{ {
if ( o != m_completionPopup && if ( TQT_BASE_OBJECT(o) != TQT_BASE_OBJECT(m_completionPopup) &&
o != m_completionListBox && TQT_BASE_OBJECT(o) != TQT_BASE_OBJECT(m_completionListBox) &&
o != m_completionListBox->viewport() ) TQT_BASE_OBJECT(o) != TQT_BASE_OBJECT(m_completionListBox->viewport()) )
return false; return false;
if( e->type() == TQEvent::Hide ) if( e->type() == TQEvent::Hide )
@ -392,7 +392,7 @@ void KateCodeCompletion::showComment()
} }
KateArgHint::KateArgHint( KateView* parent, const char* name ) KateArgHint::KateArgHint( KateView* parent, const char* name )
: TQFrame( parent, name, WType_Popup ) : TQFrame( parent, name, (WFlags)WType_Popup )
{ {
setBackgroundColor( black ); setBackgroundColor( black );
setPaletteForegroundColor( Qt::black ); setPaletteForegroundColor( Qt::black );
@ -404,7 +404,7 @@ KateArgHint::KateArgHint( KateView* parent, const char* name )
m_markCurrentFunction = true; m_markCurrentFunction = true;
setFocusPolicy( StrongFocus ); setFocusPolicy( TQ_StrongFocus );
setFocusProxy( parent ); setFocusProxy( parent );
reset( -1, -1 ); reset( -1, -1 );
@ -533,7 +533,7 @@ void KateArgHint::show()
bool KateArgHint::eventFilter( TQObject*, TQEvent* e ) bool KateArgHint::eventFilter( TQObject*, TQEvent* e )
{ {
if( isVisible() && e->type() == TQEvent::KeyPress ){ if( isVisible() && e->type() == TQEvent::KeyPress ){
TQKeyEvent* ke = static_cast<TQKeyEvent*>( e ); TQKeyEvent* ke = TQT_TQKEYEVENT( e );
if( (ke->state() & ControlButton) && ke->key() == Key_Left ){ if( (ke->state() & ControlButton) && ke->key() == Key_Left ){
setCurrentFunction( currentFunction() - 1 ); setCurrentFunction( currentFunction() - 1 );
ke->accept(); ke->accept();

@ -50,7 +50,7 @@ class KateCodeCompletionCommentLabel : public TQLabel
public: public:
KateCodeCompletionCommentLabel( TQWidget* parent, const TQString& text) : TQLabel( parent, "toolTipTip", KateCodeCompletionCommentLabel( TQWidget* parent, const TQString& text) : TQLabel( parent, "toolTipTip",
WStyle_StaysOnTop | WStyle_Customize | WStyle_NoBorder | WStyle_Tool | WX11BypassWM ) (WFlags)(WStyle_StaysOnTop | WStyle_Customize | WStyle_NoBorder | WStyle_Tool | WX11BypassWM) )
{ {
setMargin(1); setMargin(1);
setIndent(0); setIndent(0);

@ -363,9 +363,9 @@ void KateCodeFoldingTree::debugDump()
void KateCodeFoldingTree::dumpNode(KateCodeFoldingNode *node, const TQString &prefix) void KateCodeFoldingTree::dumpNode(KateCodeFoldingNode *node, const TQString &prefix)
{ {
//output node properties //output node properties
kdDebug(13000)<<prefix<<TQString("Type: %1, startLineValid %2, startLineRel %3, endLineValid %4, endLineRel %5, visible %6"). kdDebug(13000)<<prefix<<TQString(TQString("Type: %1, startLineValid %2, startLineRel %3, endLineValid %4, endLineRel %5, visible %6").
arg(node->type).arg(node->startLineValid).arg(node->startLineRel).arg(node->endLineValid). arg(node->type).arg(node->startLineValid).arg(node->startLineRel).arg(node->endLineValid).
arg(node->endLineRel).arg(node->visible)<<endl; arg(node->endLineRel).arg(node->visible))<<endl;
//output child node properties recursive //output child node properties recursive
if (node->noChildren()) if (node->noChildren())
@ -1330,7 +1330,7 @@ void KateCodeFoldingTree::toggleRegionVisibility(unsigned int line)
lineMapping.clear(); lineMapping.clear();
hiddenLinesCountCacheValid = false; hiddenLinesCountCacheValid = false;
kdDebug(13000)<<TQString("KateCodeFoldingTree::toggleRegionVisibility() %1").arg(line)<<endl; kdDebug(13000)<<TQString(TQString("KateCodeFoldingTree::toggleRegionVisibility() %1").arg(line))<<endl;
findAllNodesOpenedOrClosedAt(line); findAllNodesOpenedOrClosedAt(line);
for (int i=0; i<(int)nodesForLine.count(); i++) for (int i=0; i<(int)nodesForLine.count(); i++)

@ -79,7 +79,7 @@ class KateCodeFoldingNode
inline KateCodeFoldingNode *child (uint index) const { return m_children[index]; } inline KateCodeFoldingNode *child (uint index) const { return m_children[index]; }
inline int findChild (KateCodeFoldingNode *node, uint start = 0) const { return m_children.find (node, start); } inline int findChild (KateCodeFoldingNode *node, uint start = 0) const { return m_children.tqfind (node, start); }
inline void appendChild (KateCodeFoldingNode *node) { m_children.resize(m_children.size()+1); m_children[m_children.size()-1] = node; } inline void appendChild (KateCodeFoldingNode *node) { m_children.resize(m_children.size()+1); m_children[m_children.size()-1] = node; }

@ -1062,7 +1062,7 @@ void KateSaveConfigTab::defaults()
//END KateSaveConfigTab //END KateSaveConfigTab
//BEGIN PluginListItem //BEGIN PluginListItem
class KatePartPluginListItem : public QCheckListItem class KatePartPluginListItem : public TQCheckListItem
{ {
public: public:
KatePartPluginListItem(bool checked, uint i, const TQString &name, TQListView *parent); KatePartPluginListItem(bool checked, uint i, const TQString &name, TQListView *parent);
@ -1284,7 +1284,7 @@ KateHlConfigPage::KateHlConfigPage (TQWidget *parent, KateDocument *doc)
TQHBox *hb1 = new TQHBox( gbInfo); TQHBox *hb1 = new TQHBox( gbInfo);
new TQLabel( i18n("Author:"), hb1 ); new TQLabel( i18n("Author:"), hb1 );
author = new TQLabel (hb1); author = new TQLabel (hb1);
author->setTextFormat (Qt::RichText); author->setTextFormat (TQt::RichText);
// license // license
TQHBox *hb2 = new TQHBox( gbInfo); TQHBox *hb2 = new TQHBox( gbInfo);
@ -1476,8 +1476,8 @@ void KateHlDownloadDialog::listDataReceived(KIO::Job *, const TQByteArray &data)
listData+=TQString(data); listData+=TQString(data);
kdDebug(13000)<<TQString("CurrentListData: ")<<listData<<endl<<endl; kdDebug(13000)<<TQString("CurrentListData: ")<<listData<<endl<<endl;
kdDebug(13000)<<TQString("Data length: %1").arg(data.size())<<endl; kdDebug(13000)<<TQString(TQString("Data length: %1").arg(data.size()))<<endl;
kdDebug(13000)<<TQString("listData length: %1").arg(listData.length())<<endl; kdDebug(13000)<<TQString(TQString("listData length: %1").arg(listData.length()))<<endl;
if (data.size()==0) if (data.size()==0)
{ {
if (listData.length()>0) if (listData.length()>0)

@ -1179,7 +1179,7 @@ bool KateDocument::editInsertText ( uint line, uint col, const TQString &str )
while ( (pos = s.tqfind('\t')) > -1 ) while ( (pos = s.tqfind('\t')) > -1 )
{ {
l = tw - ( (col + pos)%tw ); l = tw - ( (col + pos)%tw );
s.replace( pos, 1, TQString().fill( ' ', l ) ); s.tqreplace( pos, 1, TQString().fill( ' ', l ) );
} }
} }
@ -1734,7 +1734,7 @@ bool KateDocument::searchText (unsigned int startLine, unsigned int startCol, co
bool KateDocument::searchText (unsigned int startLine, unsigned int startCol, const TQRegExp &regexp, unsigned int *foundAtLine, unsigned int *foundAtCol, unsigned int *matchLen, bool backwards) bool KateDocument::searchText (unsigned int startLine, unsigned int startCol, const TQRegExp &regexp, unsigned int *foundAtLine, unsigned int *foundAtCol, unsigned int *matchLen, bool backwards)
{ {
kdDebug(13020)<<"KateDocument::searchText( "<<startLine<<", "<<startCol<<", "<<regexp.pattern()<<", "<<backwards<<" )"<<endl; kdDebug(13020)<<"KateDocument::searchText( "<<startLine<<", "<<startCol<<", "<<TQString(regexp.pattern())<<", "<<backwards<<" )"<<endl;
if (regexp.isEmpty() || !regexp.isValid()) if (regexp.isEmpty() || !regexp.isValid())
return false; return false;
@ -2151,12 +2151,12 @@ void KateDocument::clearMarks()
void KateDocument::setPixmap( MarkInterface::MarkTypes type, const TQPixmap& pixmap ) void KateDocument::setPixmap( MarkInterface::MarkTypes type, const TQPixmap& pixmap )
{ {
m_markPixmaps.replace( type, new TQPixmap( pixmap ) ); m_markPixmaps.tqreplace( type, new TQPixmap( pixmap ) );
} }
void KateDocument::setDescription( MarkInterface::MarkTypes type, const TQString& description ) void KateDocument::setDescription( MarkInterface::MarkTypes type, const TQString& description )
{ {
m_markDescriptions.replace( type, new TQString( description ) ); m_markDescriptions.tqreplace( type, new TQString( description ) );
} }
TQPixmap *KateDocument::markPixmap( MarkInterface::MarkTypes type ) TQPixmap *KateDocument::markPixmap( MarkInterface::MarkTypes type )
@ -2934,7 +2934,7 @@ void KateDocument::removeSuperCursor(KateSuperCursor *cursor, bool privateC) {
bool KateDocument::ownedView(KateView *view) { bool KateDocument::ownedView(KateView *view) {
// do we own the given view? // do we own the given view?
return (m_views.containsRef(view) > 0); return (m_views.tqcontainsRef(view) > 0);
} }
bool KateDocument::isLastView(int numViews) { bool KateDocument::isLastView(int numViews) {
@ -3232,7 +3232,7 @@ void KateDocument::paste ( KateView* view )
if (s.isEmpty()) if (s.isEmpty())
return; return;
uint lines = s.contains (TQChar ('\n')); uint lines = s.tqcontains (TQChar ('\n'));
m_undoDontMerge = true; m_undoDontMerge = true;
@ -3983,7 +3983,7 @@ void KateDocument::transform( KateView *v, const KateTextCursor &c,
! p && ! highlight()->isInWord( l->getChar( start - 1 )) ) || ! p && ! highlight()->isInWord( l->getChar( start - 1 )) ) ||
( p && ! highlight()->isInWord( s.at( p-1 ) ) ) ( p && ! highlight()->isInWord( s.at( p-1 ) ) )
) )
s[p] = s.at(p).upper(); s[p] = s.tqat(p).upper();
p++; p++;
} }
} }
@ -4672,7 +4672,7 @@ void KateDocument::readVariableLine( TQString t, bool onlyViewAndRenderer )
TQStringList types (TQStringList::split(';', kvLineMime.cap(1))); TQStringList types (TQStringList::split(';', kvLineMime.cap(1)));
// no matching type found // no matching type found
if (!types.contains (mimeType ())) if (!types.tqcontains (mimeType ()))
return; return;
s = kvLineMime.cap(2); s = kvLineMime.cap(2);
@ -4701,14 +4701,14 @@ void KateDocument::readVariableLine( TQString t, bool onlyViewAndRenderer )
{ {
p += kvVar.matchedLength(); p += kvVar.matchedLength();
var = kvVar.cap( 1 ); var = kvVar.cap( 1 );
val = kvVar.cap( 2 ).stripWhiteSpace(); val = TQString(kvVar.cap( 2 )).stripWhiteSpace();
bool state; // store booleans here bool state; // store booleans here
int n; // store ints here int n; // store ints here
// only apply view & renderer config stuff // only apply view & renderer config stuff
if (onlyViewAndRenderer) if (onlyViewAndRenderer)
{ {
if ( vvl.contains( var ) ) // FIXME define above if ( vvl.tqcontains( var ) ) // FIXME define above
setViewVariable( var, val ); setViewVariable( var, val );
} }
else else
@ -4773,7 +4773,7 @@ void KateDocument::readVariableLine( TQString t, bool onlyViewAndRenderer )
{ {
TQStringList l; TQStringList l;
l << "unix" << "dos" << "mac"; l << "unix" << "dos" << "mac";
if ( (n = l.findIndex( val.lower() )) != -1 ) if ( (n = l.tqfindIndex( val.lower() )) != -1 )
m_config->setEol( n ); m_config->setEol( n );
} }
else if ( var == "encoding" ) else if ( var == "encoding" )
@ -4791,7 +4791,7 @@ void KateDocument::readVariableLine( TQString t, bool onlyViewAndRenderer )
} }
// VIEW SETTINGS // VIEW SETTINGS
else if ( vvl.contains( var ) ) else if ( vvl.tqcontains( var ) )
setViewVariable( var, val ); setViewVariable( var, val );
else else
{ {
@ -4862,14 +4862,14 @@ bool KateDocument::checkBoolValue( TQString val, bool *result )
val = val.stripWhiteSpace().lower(); val = val.stripWhiteSpace().lower();
TQStringList l; TQStringList l;
l << "1" << "on" << "true"; l << "1" << "on" << "true";
if ( l.contains( val ) ) if ( l.tqcontains( val ) )
{ {
*result = true; *result = true;
return true; return true;
} }
l.clear(); l.clear();
l << "0" << "off" << "false"; l << "0" << "off" << "false";
if ( l.contains( val ) ) if ( l.tqcontains( val ) )
{ {
*result = false; *result = false;
return true; return true;
@ -4893,7 +4893,7 @@ bool KateDocument::checkColorValue( TQString val, TQColor &c )
// KTextEditor::variable // KTextEditor::variable
TQString KateDocument::variable( const TQString &name ) const TQString KateDocument::variable( const TQString &name ) const
{ {
if ( m_storedVariables.contains( name ) ) if ( m_storedVariables.tqcontains( name ) )
return m_storedVariables[ name ]; return m_storedVariables[ name ];
return ""; return "";
@ -4964,7 +4964,7 @@ bool KateDocument::createDigest( TQCString &result )
if ( f.open( IO_ReadOnly) ) if ( f.open( IO_ReadOnly) )
{ {
KMD5 md5; KMD5 md5;
ret = md5.update( f ); ret = md5.update( TQT_TQIODEVICE_OBJECT(f) );
md5.hexDigest( result ); md5.hexDigest( result );
f.close(); f.close();
ret = true; ret = true;

@ -126,7 +126,7 @@ void KateFileTypeManager::save (TQPtrList<KateFileType> *v)
for (uint z=0; z < g.count(); z++) for (uint z=0; z < g.count(); z++)
{ {
if (newg.findIndex (g[z]) == -1) if (newg.tqfindIndex (g[z]) == -1)
config.deleteGroup (g[z]); config.deleteGroup (g[z]);
} }
@ -187,7 +187,7 @@ int KateFileTypeManager::fileType (KateDocument *doc)
for (uint z=0; z < m_types.count(); z++) for (uint z=0; z < m_types.count(); z++)
{ {
if (m_types.at(z)->mimetypes.findIndex (mt->name()) > -1) if (m_types.at(z)->mimetypes.tqfindIndex (mt->name()) > -1)
types.append (m_types.at(z)); types.append (m_types.at(z));
} }
@ -539,9 +539,9 @@ void KateViewFileTypeAction::slotAboutToShow()
TQString hlName = KateFactory::self()->fileTypeManager()->list()->at(z)->name; TQString hlName = KateFactory::self()->fileTypeManager()->list()->at(z)->name;
TQString hlSection = KateFactory::self()->fileTypeManager()->list()->at(z)->section; TQString hlSection = KateFactory::self()->fileTypeManager()->list()->at(z)->section;
if ( !hlSection.isEmpty() && (names.contains(hlName) < 1) ) if ( !hlSection.isEmpty() && (names.tqcontains(hlName) < 1) )
{ {
if (subMenusName.contains(hlSection) < 1) if (subMenusName.tqcontains(hlSection) < 1)
{ {
subMenusName << hlSection; subMenusName << hlSection;
TQPopupMenu *menu = new TQPopupMenu (); TQPopupMenu *menu = new TQPopupMenu ();
@ -549,11 +549,11 @@ void KateViewFileTypeAction::slotAboutToShow()
popupMenu()->insertItem (hlSection, menu); popupMenu()->insertItem (hlSection, menu);
} }
int m = subMenusName.findIndex (hlSection); int m = subMenusName.tqfindIndex (hlSection);
names << hlName; names << hlName;
subMenus.at(m)->insertItem ( hlName, this, TQT_SLOT(setType(int)), 0, z+1); subMenus.at(m)->insertItem ( hlName, this, TQT_SLOT(setType(int)), 0, z+1);
} }
else if (names.contains(hlName) < 1) else if (names.tqcontains(hlName) < 1)
{ {
names << hlName; names << hlName;
popupMenu()->insertItem ( hlName, this, TQT_SLOT(setType(int)), 0, z+1); popupMenu()->insertItem ( hlName, this, TQT_SLOT(setType(int)), 0, z+1);
@ -576,7 +576,7 @@ void KateViewFileTypeAction::slotAboutToShow()
const KateFileType *t = 0; const KateFileType *t = 0;
if ((t = KateFactory::self()->fileTypeManager()->fileType (doc->fileType()))) if ((t = KateFactory::self()->fileTypeManager()->fileType (doc->fileType())))
{ {
int i = subMenusName.findIndex (t->section); int i = subMenusName.tqfindIndex (t->section);
if (i >= 0 && subMenus.at(i)) if (i >= 0 && subMenus.at(i))
subMenus.at(i)->setItemChecked (doc->fileType()+1, true); subMenus.at(i)->setItemChecked (doc->fileType()+1, true);
else else

@ -661,7 +661,7 @@ int KateHlKeyword::checkHgl(const TQString& text, int offset, int len)
if (wordLen < minLen) return 0; if (wordLen < minLen) return 0;
if ( dict[wordLen] && dict[wordLen]->find(TQConstString(text.tqunicode() + offset, wordLen).string()) ) if ( dict[wordLen] && dict[wordLen]->tqfind(TQConstString(text.tqunicode() + offset, wordLen).string()) )
return offset2; return offset2;
return 0; return 0;
@ -815,7 +815,7 @@ int KateHlCOct::checkHgl(const TQString& text, int offset, int len)
int offset2 = offset; int offset2 = offset;
while ((len > 0) && (text[offset2] >= '0' && text[offset2] <= '7')) while ((len > 0) && (text.at(offset2) >= '0' && text.at(offset2) <= '7'))
{ {
offset2++; offset2++;
len--; len--;
@ -958,7 +958,7 @@ int KateHlRegExpr::checkHgl(const TQString& text, int offset, int /*len*/)
TQStringList *KateHlRegExpr::capturedTexts() TQStringList *KateHlRegExpr::capturedTexts()
{ {
return new TQStringList(Expr->capturedTexts()); return new TQStringList(Expr->tqcapturedTexts());
} }
KateHlItem *KateHlRegExpr::clone(const TQStringList *args) KateHlItem *KateHlRegExpr::clone(const TQStringList *args)
@ -1038,7 +1038,7 @@ static int checkEscapedChar(const TQString& text, int offset, int& len)
// replaced with something else but // replaced with something else but
// for right now they work // for right now they work
// check for hexdigits // check for hexdigits
for (i = 0; (len > 0) && (i < 2) && (text[offset] >= '0' && text[offset] <= '9' || (text[offset] & 0xdf) >= 'A' && (text[offset] & 0xdf) <= 'F'); i++) for (i = 0; (len > 0) && (i < 2) && (text.at(offset) >= '0' && text.at(offset) <= '9' || (text[offset] & 0xdf) >= 'A' && (text[offset] & 0xdf) <= 'F'); i++)
{ {
offset++; offset++;
len--; len--;
@ -1051,7 +1051,7 @@ static int checkEscapedChar(const TQString& text, int offset, int& len)
case '0': case '1': case '2': case '3' : case '0': case '1': case '2': case '3' :
case '4': case '5': case '6': case '7' : case '4': case '5': case '6': case '7' :
for (i = 0; (len > 0) && (i < 3) && (text[offset] >='0'&& text[offset] <='7'); i++) for (i = 0; (len > 0) && (i < 3) && (text.at(offset) >='0'&& text.at(offset) <='7'); i++)
{ {
offset++; offset++;
len--; len--;
@ -1293,7 +1293,7 @@ int KateHighlighting::makeDynamicContext(KateHlContext *model, const TQStringLis
QPair<KateHlContext *, TQString> key(model, args->front()); QPair<KateHlContext *, TQString> key(model, args->front());
short value; short value;
if (dynamicCtxs.contains(key)) if (dynamicCtxs.tqcontains(key))
value = dynamicCtxs[key]; value = dynamicCtxs[key];
else else
{ {
@ -1931,12 +1931,12 @@ KateHlItem *KateHighlighting::createKateHlItem(KateSyntaxContextData *data,
if (!beginRegionStr.isEmpty()) if (!beginRegionStr.isEmpty())
{ {
regionId = RegionList->findIndex(beginRegionStr); regionId = RegionList->tqfindIndex(beginRegionStr);
if (regionId==-1) // if the region name doesn't already exist, add it to the list if (regionId==-1) // if the region name doesn't already exist, add it to the list
{ {
(*RegionList)<<beginRegionStr; (*RegionList)<<beginRegionStr;
regionId = RegionList->findIndex(beginRegionStr); regionId = RegionList->tqfindIndex(beginRegionStr);
} }
regionId++; regionId++;
@ -1946,12 +1946,12 @@ KateHlItem *KateHighlighting::createKateHlItem(KateSyntaxContextData *data,
if (!endRegionStr.isEmpty()) if (!endRegionStr.isEmpty())
{ {
regionId2 = RegionList->findIndex(endRegionStr); regionId2 = RegionList->tqfindIndex(endRegionStr);
if (regionId2==-1) // if the region name doesn't already exist, add it to the list if (regionId2==-1) // if the region name doesn't already exist, add it to the list
{ {
(*RegionList)<<endRegionStr; (*RegionList)<<endRegionStr;
regionId2 = RegionList->findIndex(endRegionStr); regionId2 = RegionList->tqfindIndex(endRegionStr);
} }
regionId2 = -regionId2 - 1; regionId2 = -regionId2 - 1;
@ -2206,7 +2206,7 @@ void KateHighlighting::readGlobalKeywordConfig()
// remove any weakDelimitars (if any) from the default list and store this list. // remove any weakDelimitars (if any) from the default list and store this list.
for (uint s=0; s < weakDeliminator.length(); s++) for (uint s=0; s < weakDeliminator.length(); s++)
{ {
int f = deliminator.find (weakDeliminator[s]); int f = deliminator.tqfind (weakDeliminator[s]);
if (f > -1) if (f > -1)
deliminator.remove (f, 1); deliminator.remove (f, 1);
@ -2365,20 +2365,20 @@ int KateHighlighting::getIdFromString(TQStringList *ContextNameList, TQString tm
} }
} }
else if ( tmpLineEndContext.contains("##")) else if ( tmpLineEndContext.tqcontains("##"))
{ {
int o = tmpLineEndContext.tqfind("##"); int o = tmpLineEndContext.tqfind("##");
// FIXME at least with 'foo##bar'-style contexts the rules are picked up // FIXME at least with 'foo##bar'-style contexts the rules are picked up
// but the default attribute is not // but the default attribute is not
TQString tmp=tmpLineEndContext.mid(o+2); TQString tmp=tmpLineEndContext.mid(o+2);
if (!embeddedHls.contains(tmp)) embeddedHls.insert(tmp,KateEmbeddedHlInfo()); if (!embeddedHls.tqcontains(tmp)) embeddedHls.insert(tmp,KateEmbeddedHlInfo());
unres=tmp+':'+tmpLineEndContext.left(o); unres=tmp+':'+tmpLineEndContext.left(o);
context=0; context=0;
} }
else else
{ {
context=ContextNameList->findIndex(buildPrefix+tmpLineEndContext); context=ContextNameList->tqfindIndex(buildPrefix+tmpLineEndContext);
if (context==-1) if (context==-1)
{ {
context=tmpLineEndContext.toInt(); context=tmpLineEndContext.toInt();
@ -2777,7 +2777,7 @@ int KateHighlighting::addToContextList(const TQString &ident, int ctx0)
KateHlIncludeRule *ir=new KateHlIncludeRule(i,m_contexts[i]->items.count(),incCtxN,includeAttrib); KateHlIncludeRule *ir=new KateHlIncludeRule(i,m_contexts[i]->items.count(),incCtxN,includeAttrib);
//use the same way to determine cross hl file references as other items do //use the same way to determine cross hl file references as other items do
if (!embeddedHls.contains(incSet)) if (!embeddedHls.tqcontains(incSet))
embeddedHls.insert(incSet,KateEmbeddedHlInfo()); embeddedHls.insert(incSet,KateEmbeddedHlInfo());
else else
kdDebug(13010)<<"Skipping embeddedHls.insert for "<<incCtxN<<endl; kdDebug(13010)<<"Skipping embeddedHls.insert for "<<incCtxN<<endl;
@ -2850,7 +2850,7 @@ int KateHighlighting::addToContextList(const TQString &ident, int ctx0)
//BEGIN Resolve multiline region if possible //BEGIN Resolve multiline region if possible
if (!m_additionalData[ ident ]->multiLineRegion.isEmpty()) { if (!m_additionalData[ ident ]->multiLineRegion.isEmpty()) {
long commentregionid=RegionList.findIndex( m_additionalData[ ident ]->multiLineRegion ); long commentregionid=RegionList.tqfindIndex( m_additionalData[ ident ]->multiLineRegion );
if (-1==commentregionid) { if (-1==commentregionid) {
errorsAndWarnings+=i18n( errorsAndWarnings+=i18n(
"<B>%1</B>: Specified multiline comment region (%2) could not be resolved<BR>" "<B>%1</B>: Specified multiline comment region (%2) could not be resolved<BR>"
@ -3086,7 +3086,7 @@ int KateHlManager::realWildcardFind(const TQString &fileName)
if (highlight->priority() > pri) if (highlight->priority() > pri)
{ {
pri = highlight->priority(); pri = highlight->priority();
hl = hlList.findRef (highlight); hl = hlList.tqfindRef (highlight);
} }
} }
return hl; return hl;
@ -3124,7 +3124,7 @@ int KateHlManager::mimeFind( KateDocument *doc )
if (highlight->priority() > pri) if (highlight->priority() > pri)
{ {
pri = highlight->priority(); pri = highlight->priority();
hl = hlList.findRef (highlight); hl = hlList.tqfindRef (highlight);
} }
} }
@ -3421,9 +3421,9 @@ void KateViewHighlightAction::slotAboutToShow()
if (!KateHlManager::self()->hlHidden(z)) if (!KateHlManager::self()->hlHidden(z))
{ {
if ( !hlSection.isEmpty() && (names.contains(hlName) < 1) ) if ( !hlSection.isEmpty() && (names.tqcontains(hlName) < 1) )
{ {
if (subMenusName.contains(hlSection) < 1) if (subMenusName.tqcontains(hlSection) < 1)
{ {
subMenusName << hlSection; subMenusName << hlSection;
TQPopupMenu *menu = new TQPopupMenu (); TQPopupMenu *menu = new TQPopupMenu ();
@ -3431,11 +3431,11 @@ void KateViewHighlightAction::slotAboutToShow()
popupMenu()->insertItem ( '&' + hlSection, menu); popupMenu()->insertItem ( '&' + hlSection, menu);
} }
int m = subMenusName.findIndex (hlSection); int m = subMenusName.tqfindIndex (hlSection);
names << hlName; names << hlName;
subMenus.at(m)->insertItem ( '&' + hlName, this, TQT_SLOT(setHl(int)), 0, z); subMenus.at(m)->insertItem ( '&' + hlName, this, TQT_SLOT(setHl(int)), 0, z);
} }
else if (names.contains(hlName) < 1) else if (names.tqcontains(hlName) < 1)
{ {
names << hlName; names << hlName;
popupMenu()->insertItem ( '&' + hlName, this, TQT_SLOT(setHl(int)), 0, z); popupMenu()->insertItem ( '&' + hlName, this, TQT_SLOT(setHl(int)), 0, z);
@ -3454,7 +3454,7 @@ void KateViewHighlightAction::slotAboutToShow()
} }
popupMenu()->setItemChecked (0, false); popupMenu()->setItemChecked (0, false);
int i = subMenusName.findIndex (KateHlManager::self()->hlSection(doc->hlMode())); int i = subMenusName.tqfindIndex (KateHlManager::self()->hlSection(doc->hlMode()));
if (i >= 0 && subMenus.at(i)) if (i >= 0 && subMenus.at(i))
subMenus.at(i)->setItemChecked (doc->hlMode(), true); subMenus.at(i)->setItemChecked (doc->hlMode(), true);
else else

@ -1135,7 +1135,7 @@ void KateIndentJScriptManager::parseScriptHeader(const TQString &filePath,
if (currentState==NOTHING) if (currentState==NOTHING)
{ {
if (keyValue.exactMatch(line)) { if (keyValue.exactMatch(line)) {
TQStringList sl=keyValue.capturedTexts(); TQStringList sl=keyValue.tqcapturedTexts();
kdDebug(13050)<<"key:"<<sl[1]<<endl<<"value:"<<sl[2]<<endl; kdDebug(13050)<<"key:"<<sl[1]<<endl<<"value:"<<sl[2]<<endl;
kdDebug(13050)<<"key-length:"<<sl[1].length()<<endl<<"value-length:"<<sl[2].length()<<endl; kdDebug(13050)<<"key-length:"<<sl[1].length()<<endl<<"value-length:"<<sl[2].length()<<endl;
TQString key=sl[1]; TQString key=sl[1];

@ -192,9 +192,9 @@ bool KatePrinter::print (KateDocument *doc)
tags["d"] = KGlobal::locale()->formatDateTime(dt, true, false); tags["d"] = KGlobal::locale()->formatDateTime(dt, true, false);
tags["D"] = KGlobal::locale()->formatDateTime(dt, false, false); tags["D"] = KGlobal::locale()->formatDateTime(dt, false, false);
tags["h"] = KGlobal::locale()->formatTime(dt.time(), false); tags["h"] = KGlobal::locale()->formatTime(TQT_TQTIME_OBJECT(dt.time()), false);
tags["y"] = KGlobal::locale()->formatDate(dt.date(), true); tags["y"] = KGlobal::locale()->formatDate(TQT_TQDATE_OBJECT(dt.date()), true);
tags["Y"] = KGlobal::locale()->formatDate(dt.date(), false); tags["Y"] = KGlobal::locale()->formatDate(TQT_TQDATE_OBJECT(dt.date()), false);
tags["f"] = doc->url().fileName(); tags["f"] = doc->url().fileName();
tags["U"] = doc->url().prettyURL(); tags["U"] = doc->url().prettyURL();
if ( selectionOnly ) if ( selectionOnly )

@ -545,8 +545,8 @@ void KateRenderer::paintTextLine(TQPainter& paint, const KateLineRange* range, i
// input method edit area // input method edit area
const TQColorGroup& cg = m_view->tqcolorGroup(); const TQColorGroup& cg = m_view->tqcolorGroup();
int h1, s1, v1, h2, s2, v2; int h1, s1, v1, h2, s2, v2;
cg.color( TQColorGroup::Base ).hsv( &h1, &s1, &v1 ); TQColor(cg.color( TQColorGroup::Base )).hsv( &h1, &s1, &v1 );
cg.color( TQColorGroup::Background ).hsv( &h2, &s2, &v2 ); TQColor(cg.color( TQColorGroup::Background )).hsv( &h2, &s2, &v2 );
fillColor.setHsv( h1, s1, ( v1 + v2 ) / 2 ); fillColor.setHsv( h1, s1, ( v1 + v2 ) / 2 );
} }
else if (!selectionPainted && (isSel || currentHL.itemSet(KateAttribute::BGColor))) else if (!selectionPainted && (isSel || currentHL.itemSet(KateAttribute::BGColor)))

@ -80,7 +80,7 @@
This widget is designed to work with the KateStyleListView class exclusively. This widget is designed to work with the KateStyleListView class exclusively.
Added by anders, jan 23 2002. Added by anders, jan 23 2002.
*/ */
class KateStyleListItem : public QListViewItem class KateStyleListItem : public TQListViewItem
{ {
public: public:
KateStyleListItem( TQListViewItem *parent=0, const TQString & stylename=0, KateStyleListItem( TQListViewItem *parent=0, const TQString & stylename=0,
@ -141,7 +141,7 @@ class KateStyleListItem : public QListViewItem
to use our own palette (that is set on the viewport rather than on the listview to use our own palette (that is set on the viewport rather than on the listview
itself). itself).
*/ */
class KateStyleListCaption : public QListViewItem class KateStyleListCaption : public TQListViewItem
{ {
public: public:
KateStyleListCaption( TQListView *parent, const TQString & name ); KateStyleListCaption( TQListView *parent, const TQString & name );
@ -244,7 +244,7 @@ uint KateSchemaManager::number (const TQString &name)
return 1; return 1;
int i; int i;
if ((i = m_schemas.findIndex(name)) > -1) if ((i = m_schemas.tqfindIndex(name)) > -1)
return i; return i;
return 0; return 0;
@ -416,7 +416,7 @@ void KateSchemaConfigColorTab::schemaChanged ( int newSchema )
m_linenumber->disconnect( TQT_SIGNAL( changed( const TQColor & ) ) ); m_linenumber->disconnect( TQT_SIGNAL( changed( const TQColor & ) ) );
// If we havent this schema, read in from config file // If we havent this schema, read in from config file
if ( ! m_schemas.contains( newSchema ) ) if ( ! m_schemas.tqcontains( newSchema ) )
{ {
// fallback defaults // fallback defaults
TQColor tmp0 (KGlobalSettings::baseColor()); TQColor tmp0 (KGlobalSettings::baseColor());
@ -746,7 +746,7 @@ void KateSchemaConfigHighlightTab::schemaChanged (uint schema)
m_hlDict[m_schema]->setAutoDelete (true); m_hlDict[m_schema]->setAutoDelete (true);
} }
if (!m_hlDict[m_schema]->find(m_hl)) if (!m_hlDict[m_schema]->tqfind(m_hl))
{ {
kdDebug(13030) << "NEW HL, create list" << endl; kdDebug(13030) << "NEW HL, create list" << endl;
@ -775,9 +775,9 @@ void KateSchemaConfigHighlightTab::schemaChanged (uint schema)
m_styles->viewport()->setPalette( p ); m_styles->viewport()->setPalette( p );
TQDict<KateStyleListCaption> prefixes; TQDict<KateStyleListCaption> prefixes;
for ( KateHlItemData *itemData = m_hlDict[m_schema]->find(m_hl)->last(); for ( KateHlItemData *itemData = m_hlDict[m_schema]->tqfind(m_hl)->last();
itemData != 0L; itemData != 0L;
itemData = m_hlDict[m_schema]->find(m_hl)->prev()) itemData = m_hlDict[m_schema]->tqfind(m_hl)->prev())
{ {
kdDebug(13030) << "insert items " << itemData->name << endl; kdDebug(13030) << "insert items " << itemData->name << endl;
@ -969,7 +969,7 @@ void KateSchemaConfigPage::newSchema ()
// soft update, no load from disk // soft update, no load from disk
KateFactory::self()->schemaManager()->update (false); KateFactory::self()->schemaManager()->update (false);
int i = KateFactory::self()->schemaManager()->list ().findIndex (t); int i = KateFactory::self()->schemaManager()->list ().tqfindIndex (t);
update (); update ();
if (i > -1) if (i > -1)
@ -1021,7 +1021,7 @@ void KateViewSchemaAction::slotAboutToShow()
{ {
TQString hlName = KateFactory::self()->schemaManager()->list().operator[](z); TQString hlName = KateFactory::self()->schemaManager()->list().operator[](z);
if (names.contains(hlName) < 1) if (names.tqcontains(hlName) < 1)
{ {
names << hlName; names << hlName;
popupMenu()->insertItem ( hlName, this, TQT_SLOT(setSchema(int)), 0, z+1); popupMenu()->insertItem ( hlName, this, TQT_SLOT(setSchema(int)), 0, z+1);

@ -393,7 +393,7 @@ void KateSearch::replaceOne()
if (ccap <= ncaps ) { if (ccap <= ncaps ) {
substitute = m_re.cap( ccap ); substitute = m_re.cap( ccap );
} else { } else {
kdDebug()<<"KateSearch::replaceOne(): you don't have "<<ccap<<" backreferences in regexp '"<<m_re.pattern()<<"'"<<endl; kdDebug()<<"KateSearch::replaceOne(): you don't have "<<ccap<<" backreferences in regexp '"<<TQString(m_re.pattern())<<"'"<<endl;
break; break;
} }
} else if ( argument == 'n' ) { } else if ( argument == 'n' ) {
@ -418,13 +418,13 @@ void KateSearch::replaceOne()
replaces++; replaces++;
// if we inserted newlines, we better adjust. // if we inserted newlines, we better adjust.
uint newlines = replaceWith.contains('\n'); uint newlines = replaceWith.tqcontains('\n');
if ( newlines ) if ( newlines )
{ {
if ( ! s.flags.backward ) if ( ! s.flags.backward )
{ {
s.cursor.setLine( s.cursor.line() + newlines ); s.cursor.setLine( s.cursor.line() + newlines );
s.cursor.setCol( replaceWith.length() - replaceWith.findRev('\n') ); s.cursor.setCol( replaceWith.length() - replaceWith.tqfindRev('\n') );
} }
// selection? // selection?
if ( s.flags.selected ) if ( s.flags.selected )
@ -885,7 +885,7 @@ while ( (p = pattern.tqfind( '\\' + delim, p )) > -1 )\
{ {
flags = re_rep2.cap( 1 ); flags = re_rep2.cap( 1 );
pattern = re_rep2.cap( 2 ); pattern = re_rep2.cap( 2 );
replacement = re_rep2.cap( 3 ).stripWhiteSpace(); replacement = TQString(re_rep2.cap( 3 )).stripWhiteSpace();
} }
else else
{ {

@ -113,7 +113,7 @@ void KateSpell::spellcheck( const KateTextCursor &from, const KateTextCursor &to
<< "ISO 8859-9" << "ISO 8859-13" << "ISO 8859-15" << "UTF-8" << "ISO 8859-9" << "ISO 8859-13" << "ISO 8859-15" << "UTF-8"
<< "KOI8-R" << "KOI8-U" << "CP1251" << "CP1255"; << "KOI8-R" << "KOI8-U" << "CP1251" << "CP1255";
int enc = ksEncodings.findIndex( m_view->doc()->encoding() ); int enc = ksEncodings.tqfindIndex( m_view->doc()->encoding() );
if ( enc > -1 ) if ( enc > -1 )
{ {
ksc->setEncoding( enc ); ksc->setEncoding( enc );

@ -410,8 +410,8 @@ bool KateSuperRange::owns(const KateTextCursor& cursor) const
{ {
if (!includes(cursor)) return false; if (!includes(cursor)) return false;
if (children()) if (!childrenListObject().isEmpty())
for (TQObjectListIt it(*children()); *it; ++it) for (TQObjectListIt it(childrenListObject()); *it; ++it)
if ((*it)->inherits("KateSuperRange")) if ((*it)->inherits("KateSuperRange"))
if (static_cast<KateSuperRange*>(*it)->owns(cursor)) if (static_cast<KateSuperRange*>(*it)->owns(cursor))
return false; return false;
@ -636,7 +636,7 @@ bool KateSuperRangeList::rangesInclude(const KateTextCursor& cursor)
void KateSuperRangeList::slotEliminated() void KateSuperRangeList::slotEliminated()
{ {
if (sender()) { if (sender()) {
KateSuperRange* range = static_cast<KateSuperRange*>(const_cast<TQObject*>(sender())); KateSuperRange* range = static_cast<KateSuperRange*>(const_cast<TQObject*>(TQT_TQOBJECT_CONST(sender())));
emit rangeEliminated(range); emit rangeEliminated(range);
if (m_trackingBoundaries) { if (m_trackingBoundaries) {
@ -662,7 +662,7 @@ void KateSuperRangeList::slotDeleted(TQObject* range)
m_columnBoundaries.removeRef(r->m_end); m_columnBoundaries.removeRef(r->m_end);
} }
int index = findRef(r); int index = tqfindRef(r);
if (index != -1) if (index != -1)
take(index); take(index);
//else kdDebug(13020)<<"Range not found in list"<<endl; //else kdDebug(13020)<<"Range not found in list"<<endl;

@ -238,7 +238,7 @@ int KateTextLine::cursorX(uint pos, uint tabChars) const
{ {
uint x = 0; uint x = 0;
const uint n = kMin (pos, m_text.length()); const uint n = kMin (pos, (uint)m_text.length());
const TQChar *tqunicode = m_text.tqunicode(); const TQChar *tqunicode = m_text.tqunicode();
for ( uint z = 0; z < n; z++) for ( uint z = 0; z < n; z++)
@ -282,12 +282,12 @@ bool KateTextLine::searchText (uint startCol, const TQString &text, uint *foundA
if ( col == (int) m_text.length() ) ++startCol; if ( col == (int) m_text.length() ) ++startCol;
do { do {
index = m_text.findRev( text, col, casesensitive ); index = m_text.tqfindRev( text, col, casesensitive );
col--; col--;
} while ( col >= 0 && l + index >= startCol ); } while ( col >= 0 && l + index >= startCol );
} }
else else
index = m_text.find (text, startCol, casesensitive); index = m_text.tqfind (text, startCol, casesensitive);
if (index > -1) if (index > -1)
{ {

@ -131,7 +131,7 @@ KateView::KateView( KateDocument *doc, TQWidget *parent, const char * name )
doc->addView( this ); doc->addView( this );
setFocusProxy( m_viewInternal ); setFocusProxy( m_viewInternal );
setFocusPolicy( StrongFocus ); setFocusPolicy( TQ_StrongFocus );
if (!doc->singleViewMode()) { if (!doc->singleViewMode()) {
setXMLFile( "katepartui.rc" ); setXMLFile( "katepartui.rc" );
@ -187,21 +187,21 @@ KateView::~KateView()
void KateView::setupConnections() void KateView::setupConnections()
{ {
connect( m_doc, TQT_SIGNAL(undoChanged()), connect( m_doc, TQT_SIGNAL(undoChanged()),
this, TQT_SLOT(slotNewUndo()) ); TQT_TQOBJECT(this), TQT_SLOT(slotNewUndo()) );
connect( m_doc, TQT_SIGNAL(hlChanged()), connect( m_doc, TQT_SIGNAL(hlChanged()),
this, TQT_SLOT(slotHlChanged()) ); TQT_TQOBJECT(this), TQT_SLOT(slotHlChanged()) );
connect( m_doc, TQT_SIGNAL(canceled(const TQString&)), connect( m_doc, TQT_SIGNAL(canceled(const TQString&)),
this, TQT_SLOT(slotSaveCanceled(const TQString&)) ); TQT_TQOBJECT(this), TQT_SLOT(slotSaveCanceled(const TQString&)) );
connect( m_viewInternal, TQT_SIGNAL(dropEventPass(TQDropEvent*)), connect( m_viewInternal, TQT_SIGNAL(dropEventPass(TQDropEvent*)),
this, TQT_SIGNAL(dropEventPass(TQDropEvent*)) ); TQT_TQOBJECT(this), TQT_SIGNAL(dropEventPass(TQDropEvent*)) );
connect(this,TQT_SIGNAL(cursorPositionChanged()),this,TQT_SLOT(slotStatusMsg())); connect(this,TQT_SIGNAL(cursorPositionChanged()),this,TQT_SLOT(slotStatusMsg()));
connect(this,TQT_SIGNAL(newStatus()),this,TQT_SLOT(slotStatusMsg())); connect(this,TQT_SIGNAL(newStatus()),this,TQT_SLOT(slotStatusMsg()));
connect(m_doc, TQT_SIGNAL(undoChanged()), this, TQT_SLOT(slotStatusMsg())); connect(m_doc, TQT_SIGNAL(undoChanged()), TQT_TQOBJECT(this), TQT_SLOT(slotStatusMsg()));
if ( m_doc->browserView() ) if ( m_doc->browserView() )
{ {
connect( this, TQT_SIGNAL(dropEventPass(TQDropEvent*)), connect( this, TQT_SIGNAL(dropEventPass(TQDropEvent*)),
this, TQT_SLOT(slotDropEventPass(TQDropEvent*)) ); TQT_TQOBJECT(this), TQT_SLOT(slotDropEventPass(TQDropEvent*)) );
} }
} }
@ -212,21 +212,21 @@ void KateView::setupActions()
m_toggleWriteLock = 0; m_toggleWriteLock = 0;
m_cut = a=KStdAction::cut(this, TQT_SLOT(cut()), ac); m_cut = a=KStdAction::cut(TQT_TQOBJECT(this), TQT_SLOT(cut()), ac);
a->setWhatsThis(i18n("Cut the selected text and move it to the clipboard")); a->setWhatsThis(i18n("Cut the selected text and move it to the clipboard"));
m_paste = a=KStdAction::pasteText(this, TQT_SLOT(paste()), ac); m_paste = a=KStdAction::pasteText(TQT_TQOBJECT(this), TQT_SLOT(paste()), ac);
a->setWhatsThis(i18n("Paste previously copied or cut clipboard contents")); a->setWhatsThis(i18n("Paste previously copied or cut clipboard contents"));
m_copy = a=KStdAction::copy(this, TQT_SLOT(copy()), ac); m_copy = a=KStdAction::copy(TQT_TQOBJECT(this), TQT_SLOT(copy()), ac);
a->setWhatsThis(i18n( "Use this command to copy the currently selected text to the system clipboard.")); a->setWhatsThis(i18n( "Use this command to copy the currently selected text to the system clipboard."));
m_copyHTML = a = new KAction(i18n("Copy as &HTML"), "editcopy", 0, this, TQT_SLOT(copyHTML()), ac, "edit_copy_html"); m_copyHTML = a = new KAction(i18n("Copy as &HTML"), "editcopy", 0, TQT_TQOBJECT(this), TQT_SLOT(copyHTML()), ac, "edit_copy_html");
a->setWhatsThis(i18n( "Use this command to copy the currently selected text as HTML to the system clipboard.")); a->setWhatsThis(i18n( "Use this command to copy the currently selected text as HTML to the system clipboard."));
if (!m_doc->readOnly()) if (!m_doc->readOnly())
{ {
a=KStdAction::save(this, TQT_SLOT(save()), ac); a=KStdAction::save(TQT_TQOBJECT(this), TQT_SLOT(save()), ac);
a->setWhatsThis(i18n("Save the current document")); a->setWhatsThis(i18n("Save the current document"));
a=m_editUndo = KStdAction::undo(m_doc, TQT_SLOT(undo()), ac); a=m_editUndo = KStdAction::undo(m_doc, TQT_SLOT(undo()), ac);
@ -235,56 +235,56 @@ void KateView::setupActions()
a=m_editRedo = KStdAction::redo(m_doc, TQT_SLOT(redo()), ac); a=m_editRedo = KStdAction::redo(m_doc, TQT_SLOT(redo()), ac);
a->setWhatsThis(i18n("Revert the most recent undo operation")); a->setWhatsThis(i18n("Revert the most recent undo operation"));
(new KAction(i18n("&Word Wrap Document"), "", 0, this, TQT_SLOT(applyWordWrap()), ac, "tools_apply_wordwrap"))->setWhatsThis( (new KAction(i18n("&Word Wrap Document"), "", 0, TQT_TQOBJECT(this), TQT_SLOT(applyWordWrap()), ac, "tools_apply_wordwrap"))->setWhatsThis(
i18n("Use this command to wrap all lines of the current document which are longer than the width of the" i18n("Use this command to wrap all lines of the current document which are longer than the width of the"
" current view, to fit into this view.<br><br> This is a static word wrap, meaning it is not updated" " current view, to fit into this view.<br><br> This is a static word wrap, meaning it is not updated"
" when the view is resized.")); " when the view is resized."));
// setup Tools menu // setup Tools menu
a=new KAction(i18n("&Indent"), "indent", Qt::CTRL+Qt::Key_I, this, TQT_SLOT(indent()), ac, "tools_indent"); a=new KAction(i18n("&Indent"), "indent", Qt::CTRL+Qt::Key_I, TQT_TQOBJECT(this), TQT_SLOT(indent()), ac, "tools_indent");
a->setWhatsThis(i18n("Use this to indent a selected block of text.<br><br>" a->setWhatsThis(i18n("Use this to indent a selected block of text.<br><br>"
"You can configure whether tabs should be honored and used or replaced with spaces, in the configuration dialog.")); "You can configure whether tabs should be honored and used or replaced with spaces, in the configuration dialog."));
a=new KAction(i18n("&Unindent"), "unindent", Qt::CTRL+Qt::SHIFT+Qt::Key_I, this, TQT_SLOT(unIndent()), ac, "tools_unindent"); a=new KAction(i18n("&Unindent"), "unindent", Qt::CTRL+Qt::SHIFT+Qt::Key_I, TQT_TQOBJECT(this), TQT_SLOT(unIndent()), ac, "tools_unindent");
a->setWhatsThis(i18n("Use this to unindent a selected block of text.")); a->setWhatsThis(i18n("Use this to unindent a selected block of text."));
a=new KAction(i18n("&Clean Indentation"), 0, this, TQT_SLOT(cleanIndent()), ac, "tools_cleanIndent"); a=new KAction(i18n("&Clean Indentation"), 0, TQT_TQOBJECT(this), TQT_SLOT(cleanIndent()), ac, "tools_cleanIndent");
a->setWhatsThis(i18n("Use this to clean the indentation of a selected block of text (only tabs/only spaces)<br><br>" a->setWhatsThis(i18n("Use this to clean the indentation of a selected block of text (only tabs/only spaces)<br><br>"
"You can configure whether tabs should be honored and used or replaced with spaces, in the configuration dialog.")); "You can configure whether tabs should be honored and used or replaced with spaces, in the configuration dialog."));
a=new KAction(i18n("&Align"), 0, this, TQT_SLOT(align()), ac, "tools_align"); a=new KAction(i18n("&Align"), 0, TQT_TQOBJECT(this), TQT_SLOT(align()), ac, "tools_align");
a->setWhatsThis(i18n("Use this to align the current line or block of text to its proper indent level.")); a->setWhatsThis(i18n("Use this to align the current line or block of text to its proper indent level."));
a=new KAction(i18n("C&omment"), CTRL+Qt::Key_D, this, TQT_SLOT(comment()), a=new KAction(i18n("C&omment"), CTRL+Qt::Key_D, TQT_TQOBJECT(this), TQT_SLOT(comment()),
ac, "tools_comment"); ac, "tools_comment");
a->setWhatsThis(i18n("This command comments out the current line or a selected block of text.<BR><BR>" a->setWhatsThis(i18n("This command comments out the current line or a selected block of text.<BR><BR>"
"The characters for single/multiple line comments are defined within the language's highlighting.")); "The characters for single/multiple line comments are defined within the language's highlighting."));
a=new KAction(i18n("Unco&mment"), CTRL+SHIFT+Qt::Key_D, this, TQT_SLOT(uncomment()), a=new KAction(i18n("Unco&mment"), CTRL+SHIFT+Qt::Key_D, TQT_TQOBJECT(this), TQT_SLOT(uncomment()),
ac, "tools_uncomment"); ac, "tools_uncomment");
a->setWhatsThis(i18n("This command removes comments from the current line or a selected block of text.<BR><BR>" a->setWhatsThis(i18n("This command removes comments from the current line or a selected block of text.<BR><BR>"
"The characters for single/multiple line comments are defined within the language's highlighting.")); "The characters for single/multiple line comments are defined within the language's highlighting."));
a = m_toggleWriteLock = new KToggleAction( a = m_toggleWriteLock = new KToggleAction(
i18n("&Read Only Mode"), 0, 0, i18n("&Read Only Mode"), 0, 0,
this, TQT_SLOT( toggleWriteLock() ), TQT_TQOBJECT(this), TQT_SLOT( toggleWriteLock() ),
ac, "tools_toggle_write_lock" ); ac, "tools_toggle_write_lock" );
a->setWhatsThis( i18n("Lock/unlock the document for writing") ); a->setWhatsThis( i18n("Lock/unlock the document for writing") );
a = new KAction( i18n("Uppercase"), CTRL + Qt::Key_U, this, a = new KAction( i18n("Uppercase"), CTRL + Qt::Key_U, TQT_TQOBJECT(this),
TQT_SLOT(uppercase()), ac, "tools_uppercase" ); TQT_SLOT(uppercase()), ac, "tools_uppercase" );
a->setWhatsThis( i18n("Convert the selection to uppercase, or the character to the " a->setWhatsThis( i18n("Convert the selection to uppercase, or the character to the "
"right of the cursor if no text is selected.") ); "right of the cursor if no text is selected.") );
a = new KAction( i18n("Lowercase"), CTRL + SHIFT + Qt::Key_U, this, a = new KAction( i18n("Lowercase"), CTRL + SHIFT + Qt::Key_U, TQT_TQOBJECT(this),
TQT_SLOT(lowercase()), ac, "tools_lowercase" ); TQT_SLOT(lowercase()), ac, "tools_lowercase" );
a->setWhatsThis( i18n("Convert the selection to lowercase, or the character to the " a->setWhatsThis( i18n("Convert the selection to lowercase, or the character to the "
"right of the cursor if no text is selected.") ); "right of the cursor if no text is selected.") );
a = new KAction( i18n("Capitalize"), CTRL + ALT + Qt::Key_U, this, a = new KAction( i18n("Capitalize"), CTRL + ALT + Qt::Key_U, TQT_TQOBJECT(this),
TQT_SLOT(capitalize()), ac, "tools_capitalize" ); TQT_SLOT(capitalize()), ac, "tools_capitalize" );
a->setWhatsThis( i18n("Capitalize the selection, or the word under the " a->setWhatsThis( i18n("Capitalize the selection, or the word under the "
"cursor if no text is selected.") ); "cursor if no text is selected.") );
a = new KAction( i18n("Join Lines"), CTRL + Qt::Key_J, this, a = new KAction( i18n("Join Lines"), CTRL + Qt::Key_J, TQT_TQOBJECT(this),
TQT_SLOT( joinLines() ), ac, "tools_join_lines" ); TQT_SLOT( joinLines() ), ac, "tools_join_lines" );
} }
else else
@ -298,13 +298,13 @@ void KateView::setupActions()
a=KStdAction::print( m_doc, TQT_SLOT(print()), ac ); a=KStdAction::print( m_doc, TQT_SLOT(print()), ac );
a->setWhatsThis(i18n("Print the current document.")); a->setWhatsThis(i18n("Print the current document."));
a=new KAction(i18n("Reloa&d"), "reload", KStdAccel::reload(), this, TQT_SLOT(reloadFile()), ac, "file_reload"); a=new KAction(i18n("Reloa&d"), "reload", KStdAccel::reload(), TQT_TQOBJECT(this), TQT_SLOT(reloadFile()), ac, "file_reload");
a->setWhatsThis(i18n("Reload the current document from disk.")); a->setWhatsThis(i18n("Reload the current document from disk."));
a=KStdAction::saveAs(this, TQT_SLOT(saveAs()), ac); a=KStdAction::saveAs(TQT_TQOBJECT(this), TQT_SLOT(saveAs()), ac);
a->setWhatsThis(i18n("Save the current document to disk, with a name of your choice.")); a->setWhatsThis(i18n("Save the current document to disk, with a name of your choice."));
a=KStdAction::gotoLine(this, TQT_SLOT(gotoLine()), ac); a=KStdAction::gotoLine(TQT_TQOBJECT(this), TQT_SLOT(gotoLine()), ac);
a->setWhatsThis(i18n("This command opens a dialog and lets you choose a line that you want the cursor to move to.")); a->setWhatsThis(i18n("This command opens a dialog and lets you choose a line that you want the cursor to move to."));
a=new KAction(i18n("&Configure Editor..."), 0, m_doc, TQT_SLOT(configDialog()),ac, "set_confdlg"); a=new KAction(i18n("&Configure Editor..."), 0, m_doc, TQT_SLOT(configDialog()),ac, "set_confdlg");
@ -324,45 +324,45 @@ void KateView::setupActions()
new KateViewIndentationAction (m_doc, i18n("&Indentation"),ac,"tools_indentation"); new KateViewIndentationAction (m_doc, i18n("&Indentation"),ac,"tools_indentation");
// html export // html export
a = new KAction(i18n("E&xport as HTML..."), 0, 0, this, TQT_SLOT(exportAsHTML()), ac, "file_export_html"); a = new KAction(i18n("E&xport as HTML..."), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(exportAsHTML()), ac, "file_export_html");
a->setWhatsThis(i18n("This command allows you to export the current document" a->setWhatsThis(i18n("This command allows you to export the current document"
" with all highlighting information into a HTML document.")); " with all highlighting information into a HTML document."));
m_selectAll = a=KStdAction::selectAll(this, TQT_SLOT(selectAll()), ac); m_selectAll = a=KStdAction::selectAll(TQT_TQOBJECT(this), TQT_SLOT(selectAll()), ac);
a->setWhatsThis(i18n("Select the entire text of the current document.")); a->setWhatsThis(i18n("Select the entire text of the current document."));
m_deSelect = a=KStdAction::deselect(this, TQT_SLOT(clearSelection()), ac); m_deSelect = a=KStdAction::deselect(TQT_TQOBJECT(this), TQT_SLOT(clearSelection()), ac);
a->setWhatsThis(i18n("If you have selected something within the current document, this will no longer be selected.")); a->setWhatsThis(i18n("If you have selected something within the current document, this will no longer be selected."));
a=new KAction(i18n("Enlarge Font"), "viewmag+", 0, m_viewInternal, TQT_SLOT(slotIncFontSizes()), ac, "incFontSizes"); a=new KAction(i18n("Enlarge Font"), "viewmag+", 0, TQT_TQOBJECT(m_viewInternal), TQT_SLOT(slotIncFontSizes()), ac, "incFontSizes");
a->setWhatsThis(i18n("This increases the display font size.")); a->setWhatsThis(i18n("This increases the display font size."));
a=new KAction(i18n("Shrink Font"), "viewmag-", 0, m_viewInternal, TQT_SLOT(slotDecFontSizes()), ac, "decFontSizes"); a=new KAction(i18n("Shrink Font"), "viewmag-", 0, TQT_TQOBJECT(m_viewInternal), TQT_SLOT(slotDecFontSizes()), ac, "decFontSizes");
a->setWhatsThis(i18n("This decreases the display font size.")); a->setWhatsThis(i18n("This decreases the display font size."));
a= m_toggleBlockSelection = new KToggleAction( a= m_toggleBlockSelection = new KToggleAction(
i18n("Bl&ock Selection Mode"), CTRL + SHIFT + Key_B, i18n("Bl&ock Selection Mode"), CTRL + SHIFT + Key_B,
this, TQT_SLOT(toggleBlockSelectionMode()), TQT_TQOBJECT(this), TQT_SLOT(toggleBlockSelectionMode()),
ac, "set_verticalSelect"); ac, "set_verticalSelect");
a->setWhatsThis(i18n("This command allows switching between the normal (line based) selection mode and the block selection mode.")); a->setWhatsThis(i18n("This command allows switching between the normal (line based) selection mode and the block selection mode."));
a= m_toggleInsert = new KToggleAction( a= m_toggleInsert = new KToggleAction(
i18n("Overwr&ite Mode"), Key_Insert, i18n("Overwr&ite Mode"), Key_Insert,
this, TQT_SLOT(toggleInsert()), TQT_TQOBJECT(this), TQT_SLOT(toggleInsert()),
ac, "set_insert" ); ac, "set_insert" );
a->setWhatsThis(i18n("Choose whether you want the text you type to be inserted or to overwrite existing text.")); a->setWhatsThis(i18n("Choose whether you want the text you type to be inserted or to overwrite existing text."));
KToggleAction *toggleAction; KToggleAction *toggleAction;
a= m_toggleDynWrap = toggleAction = new KToggleAction( a= m_toggleDynWrap = toggleAction = new KToggleAction(
i18n("&Dynamic Word Wrap"), Key_F10, i18n("&Dynamic Word Wrap"), Key_F10,
this, TQT_SLOT(toggleDynWordWrap()), TQT_TQOBJECT(this), TQT_SLOT(toggleDynWordWrap()),
ac, "view_dynamic_word_wrap" ); ac, "view_dynamic_word_wrap" );
a->setWhatsThis(i18n("If this option is checked, the text lines will be wrapped at the view border on the screen.")); a->setWhatsThis(i18n("If this option is checked, the text lines will be wrapped at the view border on the screen."));
a= m_setDynWrapIndicators = new KSelectAction(i18n("Dynamic Word Wrap Indicators"), 0, ac, "dynamic_word_wrap_indicators"); a= m_setDynWrapIndicators = new KSelectAction(i18n("Dynamic Word Wrap Indicators"), 0, ac, "dynamic_word_wrap_indicators");
a->setWhatsThis(i18n("Choose when the Dynamic Word Wrap Indicators should be displayed")); a->setWhatsThis(i18n("Choose when the Dynamic Word Wrap Indicators should be displayed"));
connect(m_setDynWrapIndicators, TQT_SIGNAL(activated(int)), this, TQT_SLOT(setDynWrapIndicators(int))); connect(m_setDynWrapIndicators, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(setDynWrapIndicators(int)));
TQStringList list2; TQStringList list2;
list2.append(i18n("&Off")); list2.append(i18n("&Off"));
list2.append(i18n("Follow &Line Numbers")); list2.append(i18n("Follow &Line Numbers"));
@ -371,14 +371,14 @@ void KateView::setupActions()
a= toggleAction=m_toggleFoldingMarkers = new KToggleAction( a= toggleAction=m_toggleFoldingMarkers = new KToggleAction(
i18n("Show Folding &Markers"), Key_F9, i18n("Show Folding &Markers"), Key_F9,
this, TQT_SLOT(toggleFoldingMarkers()), TQT_TQOBJECT(this), TQT_SLOT(toggleFoldingMarkers()),
ac, "view_folding_markers" ); ac, "view_folding_markers" );
a->setWhatsThis(i18n("You can choose if the codefolding marks should be shown, if codefolding is possible.")); a->setWhatsThis(i18n("You can choose if the codefolding marks should be shown, if codefolding is possible."));
toggleAction->setCheckedState(i18n("Hide Folding &Markers")); toggleAction->setCheckedState(i18n("Hide Folding &Markers"));
a= m_toggleIconBar = toggleAction = new KToggleAction( a= m_toggleIconBar = toggleAction = new KToggleAction(
i18n("Show &Icon Border"), Key_F6, i18n("Show &Icon Border"), Key_F6,
this, TQT_SLOT(toggleIconBorder()), TQT_TQOBJECT(this), TQT_SLOT(toggleIconBorder()),
ac, "view_border"); ac, "view_border");
a=toggleAction; a=toggleAction;
a->setWhatsThis(i18n("Show/hide the icon border.<BR><BR> The icon border shows bookmark symbols, for instance.")); a->setWhatsThis(i18n("Show/hide the icon border.<BR><BR> The icon border shows bookmark symbols, for instance."));
@ -386,21 +386,21 @@ void KateView::setupActions()
a= toggleAction=m_toggleLineNumbers = new KToggleAction( a= toggleAction=m_toggleLineNumbers = new KToggleAction(
i18n("Show &Line Numbers"), Key_F11, i18n("Show &Line Numbers"), Key_F11,
this, TQT_SLOT(toggleLineNumbersOn()), TQT_TQOBJECT(this), TQT_SLOT(toggleLineNumbersOn()),
ac, "view_line_numbers" ); ac, "view_line_numbers" );
a->setWhatsThis(i18n("Show/hide the line numbers on the left hand side of the view.")); a->setWhatsThis(i18n("Show/hide the line numbers on the left hand side of the view."));
toggleAction->setCheckedState(i18n("Hide &Line Numbers")); toggleAction->setCheckedState(i18n("Hide &Line Numbers"));
a= m_toggleScrollBarMarks = toggleAction = new KToggleAction( a= m_toggleScrollBarMarks = toggleAction = new KToggleAction(
i18n("Show Scroll&bar Marks"), 0, i18n("Show Scroll&bar Marks"), 0,
this, TQT_SLOT(toggleScrollBarMarks()), TQT_TQOBJECT(this), TQT_SLOT(toggleScrollBarMarks()),
ac, "view_scrollbar_marks"); ac, "view_scrollbar_marks");
a->setWhatsThis(i18n("Show/hide the marks on the vertical scrollbar.<BR><BR>The marks, for instance, show bookmarks.")); a->setWhatsThis(i18n("Show/hide the marks on the vertical scrollbar.<BR><BR>The marks, for instance, show bookmarks."));
toggleAction->setCheckedState(i18n("Hide Scroll&bar Marks")); toggleAction->setCheckedState(i18n("Hide Scroll&bar Marks"));
a = toggleAction = m_toggleWWMarker = new KToggleAction( a = toggleAction = m_toggleWWMarker = new KToggleAction(
i18n("Show Static &Word Wrap Marker"), 0, i18n("Show Static &Word Wrap Marker"), 0,
this, TQT_SLOT( toggleWWMarker() ), TQT_TQOBJECT(this), TQT_SLOT( toggleWWMarker() ),
ac, "view_word_wrap_marker" ); ac, "view_word_wrap_marker" );
a->setWhatsThis( i18n( a->setWhatsThis( i18n(
"Show/hide the Word Wrap Marker, a vertical line drawn at the word " "Show/hide the Word Wrap Marker, a vertical line drawn at the word "
@ -409,7 +409,7 @@ void KateView::setupActions()
a= m_switchCmdLine = new KAction( a= m_switchCmdLine = new KAction(
i18n("Switch to Command Line"), Key_F7, i18n("Switch to Command Line"), Key_F7,
this, TQT_SLOT(switchToCmdLine()), TQT_TQOBJECT(this), TQT_SLOT(switchToCmdLine()),
ac, "switch_to_cmd_line" ); ac, "switch_to_cmd_line" );
a->setWhatsThis(i18n("Show/hide the command line on the bottom of the view.")); a->setWhatsThis(i18n("Show/hide the command line on the bottom of the view."));
@ -421,10 +421,10 @@ void KateView::setupActions()
list.append("&Macintosh"); list.append("&Macintosh");
m_setEndOfLine->setItems(list); m_setEndOfLine->setItems(list);
m_setEndOfLine->setCurrentItem (m_doc->config()->eol()); m_setEndOfLine->setCurrentItem (m_doc->config()->eol());
connect(m_setEndOfLine, TQT_SIGNAL(activated(int)), this, TQT_SLOT(setEol(int))); connect(m_setEndOfLine, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(setEol(int)));
// encoding menu // encoding menu
new KateViewEncodingAction (m_doc, this, i18n("E&ncoding"), ac, "set_encoding"); new KateViewEncodingAction (m_doc, this, i18n("E&ncoding"), TQT_TQOBJECT(ac), "set_encoding");
m_search->createActions( ac ); m_search->createActions( ac );
m_spell->createActions( ac ); m_spell->createActions( ac );
@ -432,144 +432,144 @@ void KateView::setupActions()
slotSelectionChanged (); slotSelectionChanged ();
connect (this, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotSelectionChanged())); connect (this, TQT_SIGNAL(selectionChanged()), TQT_TQOBJECT(this), TQT_SLOT(slotSelectionChanged()));
} }
void KateView::setupEditActions() void KateView::setupEditActions()
{ {
m_editActions = new KActionCollection( m_viewInternal, this, "edit_actions" ); m_editActions = new KActionCollection( m_viewInternal, TQT_TQOBJECT(this), "edit_actions" );
KActionCollection* ac = m_editActions; KActionCollection* ac = m_editActions;
new KAction( new KAction(
i18n("Move Word Left"), CTRL + Key_Left, i18n("Move Word Left"), CTRL + Key_Left,
this,TQT_SLOT(wordLeft()), TQT_TQOBJECT(this),TQT_SLOT(wordLeft()),
ac, "word_left" ); ac, "word_left" );
new KAction( new KAction(
i18n("Select Character Left"), SHIFT + Key_Left, i18n("Select Character Left"), SHIFT + Key_Left,
this,TQT_SLOT(shiftCursorLeft()), TQT_TQOBJECT(this),TQT_SLOT(shiftCursorLeft()),
ac, "select_char_left" ); ac, "select_char_left" );
new KAction( new KAction(
i18n("Select Word Left"), SHIFT + CTRL + Key_Left, i18n("Select Word Left"), SHIFT + CTRL + Key_Left,
this, TQT_SLOT(shiftWordLeft()), TQT_TQOBJECT(this), TQT_SLOT(shiftWordLeft()),
ac, "select_word_left" ); ac, "select_word_left" );
new KAction( new KAction(
i18n("Move Word Right"), CTRL + Key_Right, i18n("Move Word Right"), CTRL + Key_Right,
this, TQT_SLOT(wordRight()), TQT_TQOBJECT(this), TQT_SLOT(wordRight()),
ac, "word_right" ); ac, "word_right" );
new KAction( new KAction(
i18n("Select Character Right"), SHIFT + Key_Right, i18n("Select Character Right"), SHIFT + Key_Right,
this, TQT_SLOT(shiftCursorRight()), TQT_TQOBJECT(this), TQT_SLOT(shiftCursorRight()),
ac, "select_char_right" ); ac, "select_char_right" );
new KAction( new KAction(
i18n("Select Word Right"), SHIFT + CTRL + Key_Right, i18n("Select Word Right"), SHIFT + CTRL + Key_Right,
this,TQT_SLOT(shiftWordRight()), TQT_TQOBJECT(this),TQT_SLOT(shiftWordRight()),
ac, "select_word_right" ); ac, "select_word_right" );
new KAction( new KAction(
i18n("Move to Beginning of Line"), Key_Home, i18n("Move to Beginning of Line"), Key_Home,
this, TQT_SLOT(home()), TQT_TQOBJECT(this), TQT_SLOT(home()),
ac, "beginning_of_line" ); ac, "beginning_of_line" );
new KAction( new KAction(
i18n("Move to Beginning of Document"), KStdAccel::home(), i18n("Move to Beginning of Document"), KStdAccel::home(),
this, TQT_SLOT(top()), TQT_TQOBJECT(this), TQT_SLOT(top()),
ac, "beginning_of_document" ); ac, "beginning_of_document" );
new KAction( new KAction(
i18n("Select to Beginning of Line"), SHIFT + Key_Home, i18n("Select to Beginning of Line"), SHIFT + Key_Home,
this, TQT_SLOT(shiftHome()), TQT_TQOBJECT(this), TQT_SLOT(shiftHome()),
ac, "select_beginning_of_line" ); ac, "select_beginning_of_line" );
new KAction( new KAction(
i18n("Select to Beginning of Document"), SHIFT + CTRL + Key_Home, i18n("Select to Beginning of Document"), SHIFT + CTRL + Key_Home,
this, TQT_SLOT(shiftTop()), TQT_TQOBJECT(this), TQT_SLOT(shiftTop()),
ac, "select_beginning_of_document" ); ac, "select_beginning_of_document" );
new KAction( new KAction(
i18n("Move to End of Line"), Key_End, i18n("Move to End of Line"), Key_End,
this, TQT_SLOT(end()), TQT_TQOBJECT(this), TQT_SLOT(end()),
ac, "end_of_line" ); ac, "end_of_line" );
new KAction( new KAction(
i18n("Move to End of Document"), KStdAccel::end(), i18n("Move to End of Document"), KStdAccel::end(),
this, TQT_SLOT(bottom()), TQT_TQOBJECT(this), TQT_SLOT(bottom()),
ac, "end_of_document" ); ac, "end_of_document" );
new KAction( new KAction(
i18n("Select to End of Line"), SHIFT + Key_End, i18n("Select to End of Line"), SHIFT + Key_End,
this, TQT_SLOT(shiftEnd()), TQT_TQOBJECT(this), TQT_SLOT(shiftEnd()),
ac, "select_end_of_line" ); ac, "select_end_of_line" );
new KAction( new KAction(
i18n("Select to End of Document"), SHIFT + CTRL + Key_End, i18n("Select to End of Document"), SHIFT + CTRL + Key_End,
this, TQT_SLOT(shiftBottom()), TQT_TQOBJECT(this), TQT_SLOT(shiftBottom()),
ac, "select_end_of_document" ); ac, "select_end_of_document" );
new KAction( new KAction(
i18n("Select to Previous Line"), SHIFT + Key_Up, i18n("Select to Previous Line"), SHIFT + Key_Up,
this, TQT_SLOT(shiftUp()), TQT_TQOBJECT(this), TQT_SLOT(shiftUp()),
ac, "select_line_up" ); ac, "select_line_up" );
new KAction( new KAction(
i18n("Scroll Line Up"),"", CTRL + Key_Up, i18n("Scroll Line Up"),"", CTRL + Key_Up,
this, TQT_SLOT(scrollUp()), TQT_TQOBJECT(this), TQT_SLOT(scrollUp()),
ac, "scroll_line_up" ); ac, "scroll_line_up" );
new KAction(i18n("Move to Next Line"), Key_Down, this, TQT_SLOT(down()), new KAction(i18n("Move to Next Line"), Key_Down, TQT_TQOBJECT(this), TQT_SLOT(down()),
ac, "move_line_down"); ac, "move_line_down");
new KAction(i18n("Move to Previous Line"), Key_Up, this, TQT_SLOT(up()), new KAction(i18n("Move to Previous Line"), Key_Up, TQT_TQOBJECT(this), TQT_SLOT(up()),
ac, "move_line_up"); ac, "move_line_up");
new KAction(i18n("Move Character Right"), Key_Right, this, new KAction(i18n("Move Character Right"), Key_Right, TQT_TQOBJECT(this),
TQT_SLOT(cursorRight()), ac, "move_cursor_right"); TQT_SLOT(cursorRight()), ac, "move_cursor_right");
new KAction(i18n("Move Character Left"), Key_Left, this, TQT_SLOT(cursorLeft()), new KAction(i18n("Move Character Left"), Key_Left, TQT_TQOBJECT(this), TQT_SLOT(cursorLeft()),
ac, "move_cusor_left"); ac, "move_cusor_left");
new KAction( new KAction(
i18n("Select to Next Line"), SHIFT + Key_Down, i18n("Select to Next Line"), SHIFT + Key_Down,
this, TQT_SLOT(shiftDown()), TQT_TQOBJECT(this), TQT_SLOT(shiftDown()),
ac, "select_line_down" ); ac, "select_line_down" );
new KAction( new KAction(
i18n("Scroll Line Down"), CTRL + Key_Down, i18n("Scroll Line Down"), CTRL + Key_Down,
this, TQT_SLOT(scrollDown()), TQT_TQOBJECT(this), TQT_SLOT(scrollDown()),
ac, "scroll_line_down" ); ac, "scroll_line_down" );
new KAction( new KAction(
i18n("Scroll Page Up"), KStdAccel::prior(), i18n("Scroll Page Up"), KStdAccel::prior(),
this, TQT_SLOT(pageUp()), TQT_TQOBJECT(this), TQT_SLOT(pageUp()),
ac, "scroll_page_up" ); ac, "scroll_page_up" );
new KAction( new KAction(
i18n("Select Page Up"), SHIFT + Key_PageUp, i18n("Select Page Up"), SHIFT + Key_PageUp,
this, TQT_SLOT(shiftPageUp()), TQT_TQOBJECT(this), TQT_SLOT(shiftPageUp()),
ac, "select_page_up" ); ac, "select_page_up" );
new KAction( new KAction(
i18n("Move to Top of View"), CTRL + Key_PageUp, i18n("Move to Top of View"), CTRL + Key_PageUp,
this, TQT_SLOT(topOfView()), TQT_TQOBJECT(this), TQT_SLOT(topOfView()),
ac, "move_top_of_view" ); ac, "move_top_of_view" );
new KAction( new KAction(
i18n("Select to Top of View"), CTRL + SHIFT + Key_PageUp, i18n("Select to Top of View"), CTRL + SHIFT + Key_PageUp,
this, TQT_SLOT(shiftTopOfView()), TQT_TQOBJECT(this), TQT_SLOT(shiftTopOfView()),
ac, "select_top_of_view" ); ac, "select_top_of_view" );
new KAction( new KAction(
i18n("Scroll Page Down"), KStdAccel::next(), i18n("Scroll Page Down"), KStdAccel::next(),
this, TQT_SLOT(pageDown()), TQT_TQOBJECT(this), TQT_SLOT(pageDown()),
ac, "scroll_page_down" ); ac, "scroll_page_down" );
new KAction( new KAction(
i18n("Select Page Down"), SHIFT + Key_PageDown, i18n("Select Page Down"), SHIFT + Key_PageDown,
this, TQT_SLOT(shiftPageDown()), TQT_TQOBJECT(this), TQT_SLOT(shiftPageDown()),
ac, "select_page_down" ); ac, "select_page_down" );
new KAction( new KAction(
i18n("Move to Bottom of View"), CTRL + Key_PageDown, i18n("Move to Bottom of View"), CTRL + Key_PageDown,
this, TQT_SLOT(bottomOfView()), TQT_TQOBJECT(this), TQT_SLOT(bottomOfView()),
ac, "move_bottom_of_view" ); ac, "move_bottom_of_view" );
new KAction( new KAction(
i18n("Select to Bottom of View"), CTRL + SHIFT + Key_PageDown, i18n("Select to Bottom of View"), CTRL + SHIFT + Key_PageDown,
this, TQT_SLOT(shiftBottomOfView()), TQT_TQOBJECT(this), TQT_SLOT(shiftBottomOfView()),
ac, "select_bottom_of_view" ); ac, "select_bottom_of_view" );
new KAction( new KAction(
i18n("Move to Matching Bracket"), CTRL + Key_6, i18n("Move to Matching Bracket"), CTRL + Key_6,
this, TQT_SLOT(toMatchingBracket()), TQT_TQOBJECT(this), TQT_SLOT(toMatchingBracket()),
ac, "to_matching_bracket" ); ac, "to_matching_bracket" );
new KAction( new KAction(
i18n("Select to Matching Bracket"), SHIFT + CTRL + Key_6, i18n("Select to Matching Bracket"), SHIFT + CTRL + Key_6,
this, TQT_SLOT(shiftToMatchingBracket()), TQT_TQOBJECT(this), TQT_SLOT(shiftToMatchingBracket()),
ac, "select_matching_bracket" ); ac, "select_matching_bracket" );
// anders: shortcuts doing any changes should not be created in browserextension // anders: shortcuts doing any changes should not be created in browserextension
@ -577,30 +577,30 @@ void KateView::setupEditActions()
{ {
new KAction( new KAction(
i18n("Transpose Characters"), CTRL + Key_T, i18n("Transpose Characters"), CTRL + Key_T,
this, TQT_SLOT(transpose()), TQT_TQOBJECT(this), TQT_SLOT(transpose()),
ac, "transpose_char" ); ac, "transpose_char" );
new KAction( new KAction(
i18n("Delete Line"), CTRL + Key_K, i18n("Delete Line"), CTRL + Key_K,
this, TQT_SLOT(killLine()), TQT_TQOBJECT(this), TQT_SLOT(killLine()),
ac, "delete_line" ); ac, "delete_line" );
new KAction( new KAction(
i18n("Delete Word Left"), KStdAccel::deleteWordBack(), i18n("Delete Word Left"), KStdAccel::deleteWordBack(),
this, TQT_SLOT(deleteWordLeft()), TQT_TQOBJECT(this), TQT_SLOT(deleteWordLeft()),
ac, "delete_word_left" ); ac, "delete_word_left" );
new KAction( new KAction(
i18n("Delete Word Right"), KStdAccel::deleteWordForward(), i18n("Delete Word Right"), KStdAccel::deleteWordForward(),
this, TQT_SLOT(deleteWordRight()), TQT_TQOBJECT(this), TQT_SLOT(deleteWordRight()),
ac, "delete_word_right" ); ac, "delete_word_right" );
new KAction(i18n("Delete Next Character"), Key_Delete, new KAction(i18n("Delete Next Character"), Key_Delete,
this, TQT_SLOT(keyDelete()), TQT_TQOBJECT(this), TQT_SLOT(keyDelete()),
ac, "delete_next_character"); ac, "delete_next_character");
KAction *a = new KAction(i18n("Backspace"), Key_Backspace, KAction *a = new KAction(i18n("Backspace"), Key_Backspace,
this, TQT_SLOT(backspace()), TQT_TQOBJECT(this), TQT_SLOT(backspace()),
ac, "backspace"); ac, "backspace");
KShortcut cut = a->shortcut(); KShortcut cut = a->shortcut();
cut.append( KKey( SHIFT + Key_Backspace ) ); cut.append( KKey( SHIFT + Key_Backspace ) );
@ -608,9 +608,9 @@ void KateView::setupEditActions()
} }
connect( this, TQT_SIGNAL(gotFocus(Kate::View*)), connect( this, TQT_SIGNAL(gotFocus(Kate::View*)),
this, TQT_SLOT(slotGotFocus()) ); TQT_TQOBJECT(this), TQT_SLOT(slotGotFocus()) );
connect( this, TQT_SIGNAL(lostFocus(Kate::View*)), connect( this, TQT_SIGNAL(lostFocus(Kate::View*)),
this, TQT_SLOT(slotLostFocus()) ); TQT_TQOBJECT(this), TQT_SLOT(slotLostFocus()) );
m_editActions->readShortcutSettings( "Katepart Shortcuts" ); m_editActions->readShortcutSettings( "Katepart Shortcuts" );
@ -628,14 +628,14 @@ void KateView::setupCodeFolding()
new KAction( i18n("Collapse Toplevel"), CTRL+SHIFT+Key_Minus, new KAction( i18n("Collapse Toplevel"), CTRL+SHIFT+Key_Minus,
m_doc->foldingTree(),TQT_SLOT(collapseToplevelNodes()),ac,"folding_toplevel"); m_doc->foldingTree(),TQT_SLOT(collapseToplevelNodes()),ac,"folding_toplevel");
new KAction( i18n("Expand Toplevel"), CTRL+SHIFT+Key_Plus, new KAction( i18n("Expand Toplevel"), CTRL+SHIFT+Key_Plus,
this,TQT_SLOT(slotExpandToplevel()),ac,"folding_expandtoplevel"); TQT_TQOBJECT(this),TQT_SLOT(slotExpandToplevel()),ac,"folding_expandtoplevel");
new KAction( i18n("Collapse One Local Level"), CTRL+Key_Minus, new KAction( i18n("Collapse One Local Level"), CTRL+Key_Minus,
this,TQT_SLOT(slotCollapseLocal()),ac,"folding_collapselocal"); TQT_TQOBJECT(this),TQT_SLOT(slotCollapseLocal()),ac,"folding_collapselocal");
new KAction( i18n("Expand One Local Level"), CTRL+Key_Plus, new KAction( i18n("Expand One Local Level"), CTRL+Key_Plus,
this,TQT_SLOT(slotExpandLocal()),ac,"folding_expandlocal"); TQT_TQOBJECT(this),TQT_SLOT(slotExpandLocal()),ac,"folding_expandlocal");
#ifdef DEBUGACCELS #ifdef DEBUGACCELS
KAccel* debugAccels = new KAccel(this,this); KAccel* debugAccels = new KAccel(this,TQT_TQOBJECT(this));
debugAccels->insert("KATE_DUMP_REGION_TREE",i18n("Show the code folding region tree"),"","Ctrl+Shift+Alt+D",m_doc,TQT_SLOT(dumpRegionTree())); debugAccels->insert("KATE_DUMP_REGION_TREE",i18n("Show the code folding region tree"),"","Ctrl+Shift+Alt+D",m_doc,TQT_SLOT(dumpRegionTree()));
debugAccels->insert("KATE_TEMPLATE_TEST",i18n("Basic template code test"),"","Ctrl+Shift+Alt+T",m_doc,TQT_SLOT(testTemplateCode())); debugAccels->insert("KATE_TEMPLATE_TEST",i18n("Basic template code test"),"","Ctrl+Shift+Alt+T",m_doc,TQT_SLOT(testTemplateCode()));
debugAccels->setEnabled(true); debugAccels->setEnabled(true);
@ -665,15 +665,15 @@ void KateView::setupCodeCompletion()
{ {
m_codeCompletion = new KateCodeCompletion(this); m_codeCompletion = new KateCodeCompletion(this);
connect( m_codeCompletion, TQT_SIGNAL(completionAborted()), connect( m_codeCompletion, TQT_SIGNAL(completionAborted()),
this, TQT_SIGNAL(completionAborted())); TQT_TQOBJECT(this), TQT_SIGNAL(completionAborted()));
connect( m_codeCompletion, TQT_SIGNAL(completionDone()), connect( m_codeCompletion, TQT_SIGNAL(completionDone()),
this, TQT_SIGNAL(completionDone())); TQT_TQOBJECT(this), TQT_SIGNAL(completionDone()));
connect( m_codeCompletion, TQT_SIGNAL(argHintHidden()), connect( m_codeCompletion, TQT_SIGNAL(argHintHidden()),
this, TQT_SIGNAL(argHintHidden())); TQT_TQOBJECT(this), TQT_SIGNAL(argHintHidden()));
connect( m_codeCompletion, TQT_SIGNAL(completionDone(KTextEditor::CompletionEntry)), connect( m_codeCompletion, TQT_SIGNAL(completionDone(KTextEditor::CompletionEntry)),
this, TQT_SIGNAL(completionDone(KTextEditor::CompletionEntry))); TQT_TQOBJECT(this), TQT_SIGNAL(completionDone(KTextEditor::CompletionEntry)));
connect( m_codeCompletion, TQT_SIGNAL(filterInsertString(KTextEditor::CompletionEntry*,TQString*)), connect( m_codeCompletion, TQT_SIGNAL(filterInsertString(KTextEditor::CompletionEntry*,TQString*)),
this, TQT_SIGNAL(filterInsertString(KTextEditor::CompletionEntry*,TQString*))); TQT_TQOBJECT(this), TQT_SIGNAL(filterInsertString(KTextEditor::CompletionEntry*,TQString*)));
} }
void KateView::slotGotFocus() void KateView::slotGotFocus()
@ -1613,7 +1613,7 @@ void KateView::copy() const
if (!hasSelection()) if (!hasSelection())
return; return;
TQApplication::clipboard()->setText(selection ()); TQApplication::tqclipboard()->setText(selection ());
} }
void KateView::copyHTML() void KateView::copyHTML()
@ -1629,7 +1629,7 @@ void KateView::copyHTML()
drag->addDragObject( htmltextdrag); drag->addDragObject( htmltextdrag);
drag->addDragObject( new TQTextDrag( selection())); drag->addDragObject( new TQTextDrag( selection()));
TQApplication::clipboard()->setData(drag); TQApplication::tqclipboard()->setData(drag);
} }
TQString KateView::selectionAsHtml() TQString KateView::selectionAsHtml()
@ -1748,7 +1748,7 @@ void KateView::lineAsHTML (KateTextLine::Ptr line, uint startCol, uint length, T
charAttributes = m_renderer->attribute(line->attribute(curPos)); charAttributes = m_renderer->attribute(line->attribute(curPos));
if ( ! stylecache.contains( line->attribute(curPos) ) ) if ( ! stylecache.tqcontains( line->attribute(curPos) ) )
{ {
TQString textdecoration; TQString textdecoration;
TQString style; TQString style;

@ -73,7 +73,7 @@ KateScrollBar::KateScrollBar (Orientation orientation, KateViewInternal* parent,
void KateScrollBar::mousePressEvent(TQMouseEvent* e) void KateScrollBar::mousePressEvent(TQMouseEvent* e)
{ {
if (e->button() == MidButton) if (e->button() == Qt::MidButton)
m_middleMouseDown = true; m_middleMouseDown = true;
TQScrollBar::mousePressEvent(e); TQScrollBar::mousePressEvent(e);
@ -94,7 +94,7 @@ void KateScrollBar::mouseMoveEvent(TQMouseEvent* e)
{ {
TQScrollBar::mouseMoveEvent(e); TQScrollBar::mouseMoveEvent(e);
if (e->state() | LeftButton) if (e->state() | Qt::LeftButton)
redrawMarks(); redrawMarks();
} }
@ -212,7 +212,7 @@ void KateScrollBar::sliderMaybeMoved(int value)
//END //END
//BEGIN KateCmdLnWhatsThis //BEGIN KateCmdLnWhatsThis
class KateCmdLnWhatsThis : public QWhatsThis class KateCmdLnWhatsThis : public TQWhatsThis
{ {
public: public:
KateCmdLnWhatsThis( KateCmdLine *parent ) KateCmdLnWhatsThis( KateCmdLine *parent )
@ -685,7 +685,7 @@ const int iconPaneWidth = 16;
const int halfIPW = 8; const int halfIPW = 8;
KateIconBorder::KateIconBorder ( KateViewInternal* internalView, TQWidget *parent ) KateIconBorder::KateIconBorder ( KateViewInternal* internalView, TQWidget *parent )
: TQWidget(parent, "", Qt::WStaticContents | Qt::WRepaintNoErase | Qt::WResizeNoErase ) : TQWidget(parent, "", (WFlags)(WStaticContents | WRepaintNoErase | WResizeNoErase) )
, m_view( internalView->m_view ) , m_view( internalView->m_view )
, m_doc( internalView->m_doc ) , m_doc( internalView->m_doc )
, m_viewInternal( internalView ) , m_viewInternal( internalView )
@ -795,10 +795,10 @@ int KateIconBorder::lineNumberWidth() const
int width = m_lineNumbersOn ? ((int)log10((double)(m_view->doc()->numLines())) + 1) * m_maxCharWidth + 4 : 0; int width = m_lineNumbersOn ? ((int)log10((double)(m_view->doc()->numLines())) + 1) * m_maxCharWidth + 4 : 0;
if (m_view->dynWordWrap() && m_dynWrapIndicatorsOn) { if (m_view->dynWordWrap() && m_dynWrapIndicatorsOn) {
width = kMax(style().scrollBarExtent().width() + 4, width); width = kMax(tqstyle().scrollBarExtent().width() + 4, width);
if (m_cachedLNWidth != width || m_oldBackgroundColor != m_view->renderer()->config()->iconBarColor()) { if (m_cachedLNWidth != width || m_oldBackgroundColor != m_view->renderer()->config()->iconBarColor()) {
int w = style().scrollBarExtent().width(); int w = tqstyle().scrollBarExtent().width();
int h = m_view->renderer()->config()->fontMetrics()->height(); int h = m_view->renderer()->config()->fontMetrics()->height();
TQSize newSize(w, h); TQSize newSize(w, h);
@ -1069,7 +1069,7 @@ void KateIconBorder::mouseReleaseEvent( TQMouseEvent* e )
{ {
BorderArea area = positionToArea( e->pos() ); BorderArea area = positionToArea( e->pos() );
if( area == IconBorder) { if( area == IconBorder) {
if (e->button() == LeftButton) { if (e->button() == Qt::LeftButton) {
if( m_doc->editableMarks() & KateViewConfig::global()->defaultMarkType() ) { if( m_doc->editableMarks() & KateViewConfig::global()->defaultMarkType() ) {
if( m_doc->mark( cursorOnLine ) & KateViewConfig::global()->defaultMarkType() ) if( m_doc->mark( cursorOnLine ) & KateViewConfig::global()->defaultMarkType() )
m_doc->removeMark( cursorOnLine, KateViewConfig::global()->defaultMarkType() ); m_doc->removeMark( cursorOnLine, KateViewConfig::global()->defaultMarkType() );
@ -1080,7 +1080,7 @@ void KateIconBorder::mouseReleaseEvent( TQMouseEvent* e )
} }
} }
else else
if (e->button() == RightButton) { if (e->button() == Qt::RightButton) {
showMarkMenu( cursorOnLine, TQCursor::pos() ); showMarkMenu( cursorOnLine, TQCursor::pos() );
} }
} }

@ -52,12 +52,12 @@
#include <tqvbox.h> #include <tqvbox.h>
KateViewInternal::KateViewInternal(KateView *view, KateDocument *doc) KateViewInternal::KateViewInternal(KateView *view, KateDocument *doc)
: TQWidget (view, "", Qt::WStaticContents | Qt::WRepaintNoErase | Qt::WResizeNoErase ) : TQWidget (view, "", (WFlags)(WStaticContents | WRepaintNoErase | WResizeNoErase) )
, editSessionNumber (0) , editSessionNumber (0)
, editIsRunning (false) , editIsRunning (false)
, m_view (view) , m_view (view)
, m_doc (doc) , m_doc (doc)
, cursor (doc, true, 0, 0, this) , cursor (doc, true, 0, 0, TQT_TQOBJECT(this))
, possibleTripleClick (false) , possibleTripleClick (false)
, m_dummy (0) , m_dummy (0)
, m_startPos(doc, true, 0,0) , m_startPos(doc, true, 0,0)
@ -94,7 +94,7 @@ KateViewInternal::KateViewInternal(KateView *view, KateDocument *doc)
// //
// scrollbar for lines // scrollbar for lines
// //
m_lineScroll = new KateScrollBar(TQScrollBar::Vertical, this); m_lineScroll = new KateScrollBar(Qt::Vertical, this);
m_lineScroll->show(); m_lineScroll->show();
m_lineScroll->setTracking (true); m_lineScroll->setTracking (true);
@ -106,7 +106,7 @@ KateViewInternal::KateViewInternal(KateView *view, KateDocument *doc)
// bottom corner box // bottom corner box
m_dummy = new TQWidget(m_view); m_dummy = new TQWidget(m_view);
m_dummy->setFixedHeight(style().scrollBarExtent().width()); m_dummy->setFixedHeight(tqstyle().scrollBarExtent().width());
if (m_view->dynWordWrap()) if (m_view->dynWordWrap())
m_dummy->hide(); m_dummy->hide();
@ -131,7 +131,7 @@ KateViewInternal::KateViewInternal(KateView *view, KateDocument *doc)
// //
// scrollbar for columns // scrollbar for columns
// //
m_columnScroll = new TQScrollBar(TQScrollBar::Horizontal,m_view); m_columnScroll = new TQScrollBar(Qt::Horizontal,m_view);
// hide the column scrollbar in the dynamic word wrap mode // hide the column scrollbar in the dynamic word wrap mode
if (m_view->dynWordWrap()) if (m_view->dynWordWrap())
@ -174,7 +174,7 @@ KateViewInternal::KateViewInternal(KateView *view, KateDocument *doc)
// set initial cursor // set initial cursor
setCursor( KCursor::ibeamCursor() ); setCursor( KCursor::ibeamCursor() );
m_mouseCursor = IbeamCursor; m_mouseCursor = TQt::IbeamCursor;
// call mouseMoveEvent also if no mouse button is pressed // call mouseMoveEvent also if no mouse button is pressed
setMouseTracking(true); setMouseTracking(true);
@ -425,7 +425,7 @@ void KateViewInternal::scrollPos(KateTextCursor& c, bool force, bool calledExter
updateView(false, viewLinesScrolled); updateView(false, viewLinesScrolled);
int scrollHeight = -(viewLinesScrolled * (int)m_view->renderer()->fontHeight()); int scrollHeight = -(viewLinesScrolled * (int)m_view->renderer()->fontHeight());
int scrollbarWidth = style().scrollBarExtent().width(); int scrollbarWidth = tqstyle().scrollBarExtent().width();
// //
// updates are for working around the scrollbar leaving blocks in the view // updates are for working around the scrollbar leaving blocks in the view
@ -2438,7 +2438,7 @@ bool KateViewInternal::isTargetSelected( const TQPoint& p )
bool KateViewInternal::eventFilter( TQObject *obj, TQEvent *e ) bool KateViewInternal::eventFilter( TQObject *obj, TQEvent *e )
{ {
if (obj == m_lineScroll) if (TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(m_lineScroll))
{ {
// the second condition is to make sure a scroll on the vertical bar doesn't cause a horizontal scroll ;) // the second condition is to make sure a scroll on the vertical bar doesn't cause a horizontal scroll ;)
if (e->type() == TQEvent::Wheel && m_lineScroll->minValue() != m_lineScroll->maxValue()) if (e->type() == TQEvent::Wheel && m_lineScroll->minValue() != m_lineScroll->maxValue())
@ -2649,9 +2649,9 @@ void KateViewInternal::keyReleaseEvent( TQKeyEvent* e )
if (m_selChangedByUser) if (m_selChangedByUser)
{ {
TQApplication::clipboard()->setSelectionMode( true ); TQApplication::tqclipboard()->setSelectionMode( true );
m_view->copy(); m_view->copy();
TQApplication::clipboard()->setSelectionMode( false ); TQApplication::tqclipboard()->setSelectionMode( false );
m_selChangedByUser = false; m_selChangedByUser = false;
} }
@ -2693,7 +2693,7 @@ void KateViewInternal::mousePressEvent( TQMouseEvent* e )
{ {
switch (e->button()) switch (e->button())
{ {
case LeftButton: case Qt::LeftButton:
m_selChangedByUser = false; m_selChangedByUser = false;
if (possibleTripleClick) if (possibleTripleClick)
@ -2702,7 +2702,7 @@ void KateViewInternal::mousePressEvent( TQMouseEvent* e )
m_selectionMode = Line; m_selectionMode = Line;
if ( e->state() & Qt::ShiftButton ) if ( e->state() & TQt::ShiftButton )
{ {
updateSelection( cursor, true ); updateSelection( cursor, true );
} }
@ -2711,9 +2711,9 @@ void KateViewInternal::mousePressEvent( TQMouseEvent* e )
m_view->selectLine( cursor ); m_view->selectLine( cursor );
} }
TQApplication::clipboard()->setSelectionMode( true ); TQApplication::tqclipboard()->setSelectionMode( true );
m_view->copy(); m_view->copy();
TQApplication::clipboard()->setSelectionMode( false ); TQApplication::tqclipboard()->setSelectionMode( false );
// Keep the line at the select anchor selected during further // Keep the line at the select anchor selected during further
// mouse selection // mouse selection
@ -2752,7 +2752,7 @@ void KateViewInternal::mousePressEvent( TQMouseEvent* e )
m_selectionMode = Mouse; m_selectionMode = Mouse;
} }
if ( e->state() & Qt::ShiftButton ) if ( e->state() & TQt::ShiftButton )
{ {
if (selectAnchor.line() < 0) if (selectAnchor.line() < 0)
selectAnchor = cursor; selectAnchor = cursor;
@ -2762,7 +2762,7 @@ void KateViewInternal::mousePressEvent( TQMouseEvent* e )
selStartCached.setLine( -1 ); // tqinvalidate selStartCached.setLine( -1 ); // tqinvalidate
} }
if( !( e->state() & Qt::ShiftButton ) && isTargetSelected( e->pos() ) ) if( !( e->state() & TQt::ShiftButton ) && isTargetSelected( e->pos() ) )
{ {
dragInfo.state = diPending; dragInfo.state = diPending;
dragInfo.start = e->pos(); dragInfo.start = e->pos();
@ -2771,7 +2771,7 @@ void KateViewInternal::mousePressEvent( TQMouseEvent* e )
{ {
dragInfo.state = diNone; dragInfo.state = diNone;
if ( e->state() & Qt::ShiftButton ) if ( e->state() & TQt::ShiftButton )
{ {
placeCursor( e->pos(), true, false ); placeCursor( e->pos(), true, false );
if ( selStartCached.line() >= 0 ) if ( selStartCached.line() >= 0 )
@ -2820,10 +2820,10 @@ void KateViewInternal::mouseDoubleClickEvent(TQMouseEvent *e)
{ {
switch (e->button()) switch (e->button())
{ {
case LeftButton: case Qt::LeftButton:
m_selectionMode = Word; m_selectionMode = Word;
if ( e->state() & Qt::ShiftButton ) if ( e->state() & TQt::ShiftButton )
{ {
KateTextCursor oldSelectStart = m_view->selectStart; KateTextCursor oldSelectStart = m_view->selectStart;
KateTextCursor oldSelectEnd = m_view->selectEnd; KateTextCursor oldSelectEnd = m_view->selectEnd;
@ -2889,9 +2889,9 @@ void KateViewInternal::mouseDoubleClickEvent(TQMouseEvent *e)
// Move cursor to end (or beginning) of selected word // Move cursor to end (or beginning) of selected word
if (m_view->hasSelection()) if (m_view->hasSelection())
{ {
TQApplication::clipboard()->setSelectionMode( true ); TQApplication::tqclipboard()->setSelectionMode( true );
m_view->copy(); m_view->copy();
TQApplication::clipboard()->setSelectionMode( false ); TQApplication::tqclipboard()->setSelectionMode( false );
// Shift+DC before the "cached" word should move the cursor to the // Shift+DC before the "cached" word should move the cursor to the
// beginning of the selection, not the end // beginning of the selection, not the end
@ -2927,15 +2927,15 @@ void KateViewInternal::mouseReleaseEvent( TQMouseEvent* e )
{ {
switch (e->button()) switch (e->button())
{ {
case LeftButton: case Qt::LeftButton:
m_selectionMode = Default; m_selectionMode = Default;
// selStartCached.setLine( -1 ); // selStartCached.setLine( -1 );
if (m_selChangedByUser) if (m_selChangedByUser)
{ {
TQApplication::clipboard()->setSelectionMode( true ); TQApplication::tqclipboard()->setSelectionMode( true );
m_view->copy(); m_view->copy();
TQApplication::clipboard()->setSelectionMode( false ); TQApplication::tqclipboard()->setSelectionMode( false );
// Set cursor to edge of selection... which edge depends on what // Set cursor to edge of selection... which edge depends on what
// "direction" the selection was made in // "direction" the selection was made in
if ( m_view->selectStart < selectAnchor ) if ( m_view->selectStart < selectAnchor )
@ -2956,14 +2956,14 @@ void KateViewInternal::mouseReleaseEvent( TQMouseEvent* e )
e->accept (); e->accept ();
break; break;
case MidButton: case Qt::MidButton:
placeCursor( e->pos() ); placeCursor( e->pos() );
if( m_doc->isReadWrite() ) if( m_doc->isReadWrite() )
{ {
TQApplication::clipboard()->setSelectionMode( true ); TQApplication::tqclipboard()->setSelectionMode( true );
m_view->paste (); m_view->paste ();
TQApplication::clipboard()->setSelectionMode( false ); TQApplication::tqclipboard()->setSelectionMode( false );
} }
e->accept (); e->accept ();
@ -2977,7 +2977,7 @@ void KateViewInternal::mouseReleaseEvent( TQMouseEvent* e )
void KateViewInternal::mouseMoveEvent( TQMouseEvent* e ) void KateViewInternal::mouseMoveEvent( TQMouseEvent* e )
{ {
if( e->state() & LeftButton ) if( e->state() & Qt::LeftButton )
{ {
if (dragInfo.state == diPending) if (dragInfo.state == diPending)
{ {
@ -3033,13 +3033,13 @@ void KateViewInternal::mouseMoveEvent( TQMouseEvent* e )
// the arrow cursor as other Qt text editing widgets do // the arrow cursor as other Qt text editing widgets do
if (m_mouseCursor != ArrowCursor) { if (m_mouseCursor != ArrowCursor) {
setCursor( KCursor::arrowCursor() ); setCursor( KCursor::arrowCursor() );
m_mouseCursor = ArrowCursor; m_mouseCursor = TQt::ArrowCursor;
} }
} else { } else {
// normal text cursor // normal text cursor
if (m_mouseCursor != IbeamCursor) { if (m_mouseCursor != IbeamCursor) {
setCursor( KCursor::ibeamCursor() ); setCursor( KCursor::ibeamCursor() );
m_mouseCursor = IbeamCursor; m_mouseCursor = TQt::IbeamCursor;
} }
} }

@ -33,6 +33,7 @@
#include <tqpoint.h> #include <tqpoint.h>
#include <tqtimer.h> #include <tqtimer.h>
#include <tqintdict.h> #include <tqintdict.h>
#include <tqdragobject.h>
class KateView; class KateView;
class KateIconBorder; class KateIconBorder;
@ -221,7 +222,7 @@ class KateViewInternal : public TQWidget
int scrollX; int scrollX;
int scrollY; int scrollY;
Qt::tqCursorShape m_mouseCursor; Qt::CursorShape m_mouseCursor;
KateSuperCursor cursor; KateSuperCursor cursor;
KateTextCursor displayCursor; KateTextCursor displayCursor;

@ -204,7 +204,7 @@ void ISearchPluginView::setAutoWrap( bool autoWrap )
bool ISearchPluginView::eventFilter( TQObject* o, TQEvent* e ) bool ISearchPluginView::eventFilter( TQObject* o, TQEvent* e )
{ {
if( o != m_combo->lineEdit() ) if( TQT_BASE_OBJECT(o) != TQT_BASE_OBJECT(m_combo->lineEdit()) )
return false; return false;
if( e->type() == TQEvent::FocusIn ) { if( e->type() == TQEvent::FocusIn ) {

@ -206,7 +206,7 @@ void KDataToolPluginView::slotToolActivated( const KDataToolInfo &info, const TQ
TQString datatype = "TQString"; TQString datatype = "TQString";
// If unsupported (and if we have a single word indeed), try application/x-singleword // If unsupported (and if we have a single word indeed), try application/x-singleword
if ( !info.mimeTypes().contains( mimetype ) && m_singleWord ) if ( !info.mimeTypes().tqcontains( mimetype ) && m_singleWord )
mimetype = "application/x-singleword"; mimetype = "application/x-singleword";
kdDebug() << "Running tool with datatype=" << datatype << " mimetype=" << mimetype << endl; kdDebug() << "Running tool with datatype=" << datatype << " mimetype=" << mimetype << endl;

@ -784,7 +784,7 @@ void KCertPart::slotSelectionChanged(TQListViewItem *x) {
KPKCS12Item *p12i = dynamic_cast<KPKCS12Item*>(x); KPKCS12Item *p12i = dynamic_cast<KPKCS12Item*>(x);
_p12 = NULL; _p12 = NULL;
_ca = NULL; _ca = NULL;
if (x && x->parent() == _parentCA) { if (x && x->tqparent() == _parentCA) {
if (!x5i) { if (!x5i) {
return; return;
} }
@ -797,7 +797,7 @@ void KCertPart::slotSelectionChanged(TQListViewItem *x) {
_save->setEnabled(true); _save->setEnabled(true);
_curName = x5i->_prettyName; _curName = x5i->_prettyName;
displayCACert(_ca); displayCACert(_ca);
} else if (x && x->parent() == NULL && x->rtti() == 1) { } else if (x && x->tqparent() == NULL && x->rtti() == 1) {
if (!x5i) { if (!x5i) {
return; return;
} }
@ -810,7 +810,7 @@ void KCertPart::slotSelectionChanged(TQListViewItem *x) {
_save->setEnabled(false); _save->setEnabled(false);
_curName = x5i->_prettyName; _curName = x5i->_prettyName;
displayCACert(_ca); displayCACert(_ca);
} else if (x && x->parent() == _parentP12) { } else if (x && x->tqparent() == _parentP12) {
if (!p12i) { if (!p12i) {
return; return;
} }

@ -225,7 +225,7 @@ extern "C" KDE_EXPORT int kdemain(int _argc, char *_argv[])
if (args->isSet("list")) if (args->isSet("list"))
{ {
cout << i18n("The following modules are available:").local8Bit() << endl; cout << static_cast<const char *>(i18n("The following modules are available:").local8Bit()) << endl;
listModules( "Settings/" ); listModules( "Settings/" );
@ -246,7 +246,7 @@ extern "C" KDE_EXPORT int kdemain(int _argc, char *_argv[])
.arg(!(*it)->comment().isEmpty() ? (*it)->comment() .arg(!(*it)->comment().isEmpty() ? (*it)->comment()
: i18n("No description available")); : i18n("No description available"));
cout << entry.local8Bit() << endl; cout << static_cast<const char *>(entry.local8Bit()) << endl;
} }
return 0; return 0;
} }

@ -58,9 +58,9 @@ CupsAddSmb::CupsAddSmb(TQWidget *parent, const char *name)
connect(m_doit, TQT_SIGNAL(clicked()), TQT_SLOT(slotActionClicked())); connect(m_doit, TQT_SIGNAL(clicked()), TQT_SLOT(slotActionClicked()));
m_bar = new TQProgressBar(this); m_bar = new TQProgressBar(this);
m_text = new KActiveLabel(this); m_text = new KActiveLabel(this);
QLabel *m_title = new TQLabel(i18n("Export Printer Driver to Windows Clients"), this); TQLabel *m_title = new TQLabel(i18n("Export Printer Driver to Windows Clients"), this);
setCaption(m_title->text()); setCaption(m_title->text());
QFont f(m_title->font()); TQFont f(m_title->font());
f.setBold(true); f.setBold(true);
m_title->setFont(f); m_title->setFont(f);
KSeparator *m_sep = new KSeparator(Qt::Horizontal, this); KSeparator *m_sep = new KSeparator(Qt::Horizontal, this);
@ -100,15 +100,15 @@ CupsAddSmb::CupsAddSmb(TQWidget *parent, const char *name)
TQWhatsThis::add( m_passwdlab, txt ); TQWhatsThis::add( m_passwdlab, txt );
TQWhatsThis::add( m_passwded, txt ); TQWhatsThis::add( m_passwded, txt );
QHBoxLayout *l0 = new TQHBoxLayout(this, 10, 10); TQHBoxLayout *l0 = new TQHBoxLayout(this, 10, 10);
QVBoxLayout *l1 = new TQVBoxLayout(0, 0, 10); TQVBoxLayout *l1 = new TQVBoxLayout(0, 0, 10);
l0->addWidget(m_side); l0->addWidget(m_side);
l0->addLayout(l1); l0->addLayout(l1);
l1->addWidget(m_title); l1->addWidget(m_title);
l1->addWidget(m_sep); l1->addWidget(m_sep);
l1->addWidget(m_text); l1->addWidget(m_text);
TQGridLayout *l3 = new TQGridLayout( 0, 3, 2, 0, 10 ); TQGridLayout *l3 = new TQGridLayout( 0, 3, 2, 0, 10 );
l1->addLayout( l3 ); l1->addLayout( TQT_TQLAYOUT(l3) );
l3->addWidget( m_loginlab, 1, 0 ); l3->addWidget( m_loginlab, 1, 0 );
l3->addWidget( m_passwdlab, 2, 0 ); l3->addWidget( m_passwdlab, 2, 0 );
l3->addWidget( m_serverlab, 0, 0 ); l3->addWidget( m_serverlab, 0, 0 );
@ -120,7 +120,7 @@ CupsAddSmb::CupsAddSmb(TQWidget *parent, const char *name)
l1->addWidget(m_bar); l1->addWidget(m_bar);
l1->addWidget( m_textinfo ); l1->addWidget( m_textinfo );
l1->addSpacing(30); l1->addSpacing(30);
QHBoxLayout *l2 = new TQHBoxLayout(0, 0, 10); TQHBoxLayout *l2 = new TQHBoxLayout(0, 0, 10);
l1->addLayout(l2); l1->addLayout(l2);
l2->addStretch(1); l2->addStretch(1);
l2->addWidget(m_doit); l2->addWidget(m_doit);
@ -147,7 +147,7 @@ void CupsAddSmb::slotActionClicked()
void CupsAddSmb::slotReceived(KProcess*, char *buf, int buflen) void CupsAddSmb::slotReceived(KProcess*, char *buf, int buflen)
{ {
QString line; TQString line;
int index(0); int index(0);
bool partial(false); bool partial(false);
static bool incomplete(false); static bool incomplete(false);
@ -160,7 +160,7 @@ void CupsAddSmb::slotReceived(KProcess*, char *buf, int buflen)
partial = true; partial = true;
while (index < buflen) while (index < buflen)
{ {
QChar c(buf[index++]); TQChar c(buf[index++]);
if (c == '\n') if (c == '\n')
{ {
partial = false; partial = false;
@ -253,7 +253,7 @@ void CupsAddSmb::doNextAction()
m_state = None; m_state = None;
if (m_proc.isRunning()) if (m_proc.isRunning())
{ {
QCString s = m_actions[m_actionindex++].latin1(); TQCString s = m_actions[m_actionindex++].latin1();
m_bar->setProgress(m_bar->progress()+1); m_bar->setProgress(m_bar->progress()+1);
kdDebug(500) << "NEXT ACTION = " << s << endl; kdDebug(500) << "NEXT ACTION = " << s << endl;
if (s == "quit") if (s == "quit")
@ -289,7 +289,7 @@ void CupsAddSmb::doNextAction()
m_state = AddPrinter; m_state = AddPrinter;
//m_text->setText(i18n("Installing printer %1").arg(m_actions[m_actionindex])); //m_text->setText(i18n("Installing printer %1").arg(m_actions[m_actionindex]));
m_textinfo->setText(i18n("Installing printer %1").arg(m_actions[m_actionindex])); m_textinfo->setText(i18n("Installing printer %1").arg(m_actions[m_actionindex]));
QCString dest = m_actions[m_actionindex].local8Bit(); TQCString dest = m_actions[m_actionindex].local8Bit();
if (s == "addprinter") if (s == "addprinter")
s.append(" ").append(dest).append(" ").append(dest).append(" \"").append(dest).append("\" \"\""); s.append(" ").append(dest).append(" ").append(dest).append(" \"").append(dest).append("\" \"\"");
else else

@ -59,19 +59,19 @@ protected:
private: private:
KProcess m_proc; KProcess m_proc;
QStringList m_buffer; TQStringList m_buffer;
int m_state; int m_state;
QStringList m_actions; TQStringList m_actions;
int m_actionindex; int m_actionindex;
bool m_status; bool m_status;
QProgressBar *m_bar; TQProgressBar *m_bar;
QString m_dest; TQString m_dest;
SidePixmap *m_side; SidePixmap *m_side;
QPushButton *m_doit, *m_cancel; TQPushButton *m_doit, *m_cancel;
KActiveLabel *m_text; KActiveLabel *m_text;
TQLabel *m_textinfo; TQLabel *m_textinfo;
TQLineEdit *m_logined, *m_passwded, *m_servered; TQLineEdit *m_logined, *m_passwded, *m_servered;
QString m_datadir; TQString m_datadir;
}; };
#endif #endif

@ -36,10 +36,10 @@ AddressDialog::AddressDialog(TQWidget *parent, const char *name)
type_->insertItem(i18n("Allow")); type_->insertItem(i18n("Allow"));
type_->insertItem(i18n("Deny")); type_->insertItem(i18n("Deny"));
QLabel *l1 = new TQLabel(i18n("Type:"), w); TQLabel *l1 = new TQLabel(i18n("Type:"), w);
QLabel *l2 = new TQLabel(i18n("Address:"), w); TQLabel *l2 = new TQLabel(i18n("Address:"), w);
QGridLayout *m1 = new TQGridLayout(w, 2, 2, 0, 5); TQGridLayout *m1 = new TQGridLayout(w, 2, 2, 0, 5);
m1->setColStretch(1, 1); m1->setColStretch(1, 1);
m1->addWidget(l1, 0, 0, Qt::AlignRight); m1->addWidget(l1, 0, 0, Qt::AlignRight);
m1->addWidget(l2, 1, 0, Qt::AlignRight); m1->addWidget(l2, 1, 0, Qt::AlignRight);

@ -35,8 +35,8 @@ public:
static TQString editAddress(const TQString& s, TQWidget *parent = 0); static TQString editAddress(const TQString& s, TQWidget *parent = 0);
private: private:
QComboBox *type_; TQComboBox *type_;
QLineEdit *address_; TQLineEdit *address_;
}; };
#endif #endif

@ -33,7 +33,7 @@
BrowseDialog::BrowseDialog(TQWidget *parent, const char *name) BrowseDialog::BrowseDialog(TQWidget *parent, const char *name)
: KDialogBase(parent, name, true, TQString::null, Ok|Cancel, Ok, true) : KDialogBase(parent, name, true, TQString::null, Ok|Cancel, Ok, true)
{ {
QWidget *dummy = new TQWidget(this); TQWidget *dummy = new TQWidget(this);
setMainWidget(dummy); setMainWidget(dummy);
type_ = new TQComboBox(dummy); type_ = new TQComboBox(dummy);
from_ = new TQLineEdit(dummy); from_ = new TQLineEdit(dummy);
@ -44,11 +44,11 @@ BrowseDialog::BrowseDialog(TQWidget *parent, const char *name)
type_->insertItem(i18n("Relay")); type_->insertItem(i18n("Relay"));
type_->insertItem(i18n("Poll")); type_->insertItem(i18n("Poll"));
QLabel *l1 = new TQLabel(i18n("Type:"), dummy); TQLabel *l1 = new TQLabel(i18n("Type:"), dummy);
QLabel *l2 = new TQLabel(i18n("From:"), dummy); TQLabel *l2 = new TQLabel(i18n("From:"), dummy);
QLabel *l3 = new TQLabel(i18n("To:"), dummy); TQLabel *l3 = new TQLabel(i18n("To:"), dummy);
QGridLayout *m1 = new TQGridLayout(dummy, 3, 2, 0, 5); TQGridLayout *m1 = new TQGridLayout(dummy, 3, 2, 0, 5);
m1->addWidget(l1, 0, 0, Qt::AlignRight); m1->addWidget(l1, 0, 0, Qt::AlignRight);
m1->addWidget(l2, 1, 0, Qt::AlignRight); m1->addWidget(l2, 1, 0, Qt::AlignRight);
m1->addWidget(l3, 2, 0, Qt::AlignRight); m1->addWidget(l3, 2, 0, Qt::AlignRight);
@ -111,7 +111,7 @@ TQString BrowseDialog::editAddress(const TQString& s, TQWidget *parent, CupsdCon
{ {
BrowseDialog dlg(parent); BrowseDialog dlg(parent);
dlg.setInfos(conf); dlg.setInfos(conf);
QStringList l = TQStringList::split(TQRegExp("\\s"), s, false); TQStringList l = TQStringList::split(TQRegExp("\\s"), s, false);
if (l.count() > 1) if (l.count() > 1)
{ {
if (l[0] == "Send") dlg.type_->setCurrentItem(0); if (l[0] == "Send") dlg.type_->setCurrentItem(0);

@ -42,8 +42,8 @@ protected slots:
void slotTypeChanged(int); void slotTypeChanged(int);
private: private:
QComboBox *type_; TQComboBox *type_;
QLineEdit *from_, *to_; TQLineEdit *from_, *to_;
}; };
#endif #endif

@ -70,10 +70,10 @@ CupsdBrowsingPage::CupsdBrowsingPage(TQWidget *parent, const char *name)
TQLabel *l5 = new TQLabel(i18n("Browse order:"), this); TQLabel *l5 = new TQLabel(i18n("Browse order:"), this);
TQLabel *l6 = new TQLabel(i18n("Browse options:"), this); TQLabel *l6 = new TQLabel(i18n("Browse options:"), this);
QGridLayout *m1 = new TQGridLayout(this, 8, 2, 10, 7); TQGridLayout *m1 = new TQGridLayout(this, 8, 2, 10, 7);
m1->setRowStretch(7, 1); m1->setRowStretch(7, 1);
m1->setColStretch(1, 1); m1->setColStretch(1, 1);
QHBoxLayout *m2 = new TQHBoxLayout(0, 0, 10); TQHBoxLayout *m2 = new TQHBoxLayout(0, 0, 10);
m1->addMultiCellLayout(m2, 0, 0, 0, 1); m1->addMultiCellLayout(m2, 0, 0, 0, 1);
m2->addWidget(browsing_); m2->addWidget(browsing_);
m2->addWidget(cups_); m2->addWidget(cups_);
@ -90,7 +90,7 @@ CupsdBrowsingPage::CupsdBrowsingPage(TQWidget *parent, const char *name)
m1->addWidget(browsetimeout_, 3, 1); m1->addWidget(browsetimeout_, 3, 1);
m1->addWidget(browseaddresses_, 4, 1); m1->addWidget(browseaddresses_, 4, 1);
m1->addWidget(browseorder_, 5, 1); m1->addWidget(browseorder_, 5, 1);
QGridLayout *m3 = new TQGridLayout(0, 2, 2, 0, 5); TQGridLayout *m3 = new TQGridLayout(0, 2, 2, 0, 5);
m1->addLayout(m3, 6, 1); m1->addLayout(m3, 6, 1);
m3->addWidget(useimplicitclasses_, 0, 0); m3->addWidget(useimplicitclasses_, 0, 0);
m3->addWidget(useanyclasses_, 0, 1); m3->addWidget(useanyclasses_, 0, 1);
@ -127,8 +127,8 @@ bool CupsdBrowsingPage::loadConfig(CupsdConf *conf, TQString&)
{ {
conf_ = conf; conf_ = conf;
browsing_->setChecked(conf_->browsing_); browsing_->setChecked(conf_->browsing_);
cups_->setChecked(conf_->browseprotocols_.findIndex("CUPS") != -1); cups_->setChecked(conf_->browseprotocols_.tqfindIndex("CUPS") != -1);
slp_->setChecked(conf_->browseprotocols_.findIndex("SLP") != -1); slp_->setChecked(conf_->browseprotocols_.tqfindIndex("SLP") != -1);
browseport_->setValue(conf_->browseport_); browseport_->setValue(conf_->browseport_);
browseinterval_->setValue(conf_->browseinterval_); browseinterval_->setValue(conf_->browseinterval_);
browsetimeout_->setValue(conf_->browsetimeout_); browsetimeout_->setValue(conf_->browsetimeout_);
@ -145,7 +145,7 @@ bool CupsdBrowsingPage::loadConfig(CupsdConf *conf, TQString&)
bool CupsdBrowsingPage::saveConfig(CupsdConf *conf, TQString&) bool CupsdBrowsingPage::saveConfig(CupsdConf *conf, TQString&)
{ {
conf->browsing_ = browsing_->isChecked(); conf->browsing_ = browsing_->isChecked();
QStringList l; TQStringList l;
if (cups_->isChecked()) l << "CUPS"; if (cups_->isChecked()) l << "CUPS";
if (slp_->isChecked()) l << "SLP"; if (slp_->isChecked()) l << "SLP";
conf->browseprotocols_ = l; conf->browseprotocols_ = l;
@ -196,7 +196,7 @@ void CupsdBrowsingPage::slotEdit(int index)
void CupsdBrowsingPage::slotDefaultList() void CupsdBrowsingPage::slotDefaultList()
{ {
browseaddresses_->clear(); browseaddresses_->clear();
QStringList l; TQStringList l;
l << "Send 255.255.255.255"; l << "Send 255.255.255.255";
browseaddresses_->insertItems(l); browseaddresses_->insertItems(l);
} }

@ -47,9 +47,9 @@ protected slots:
private: private:
KIntNumInput *browseport_, *browseinterval_, *browsetimeout_; KIntNumInput *browseport_, *browseinterval_, *browsetimeout_;
EditList *browseaddresses_; EditList *browseaddresses_;
QComboBox *browseorder_; TQComboBox *browseorder_;
QCheckBox *browsing_, *cups_, *slp_; TQCheckBox *browsing_, *cups_, *slp_;
QCheckBox *useimplicitclasses_, *hideimplicitmembers_, *useshortnames_, *useanyclasses_; TQCheckBox *useimplicitclasses_, *hideimplicitmembers_, *useshortnames_, *useanyclasses_;
}; };
#endif #endif

@ -114,7 +114,7 @@ bool CupsdComment::loadComments()
{ {
comments_.setAutoDelete(true); comments_.setAutoDelete(true);
comments_.clear(); comments_.clear();
QFile f(locate("data", "kdeprint/cupsd.conf.template")); TQFile f(locate("data", "kdeprint/cupsd.conf.template"));
if (f.exists() && f.open(IO_ReadOnly)) if (f.exists() && f.open(IO_ReadOnly))
{ {
Comment *comm; Comment *comm;

@ -100,7 +100,7 @@ CupsdConf::CupsdConf()
maxrequestsize_ = "0"; maxrequestsize_ = "0";
clienttimeout_ = 300; clienttimeout_ = 300;
// listenaddresses_ // listenaddresses_
QString logdir = findDir(TQStringList("/var/log/cups") TQString logdir = findDir(TQStringList("/var/log/cups")
<< "/var/spool/cups/log" << "/var/spool/cups/log"
<< "/var/cups/log"); << "/var/cups/log");
accesslog_ = logdir+"/access_log"; accesslog_ = logdir+"/access_log";
@ -139,12 +139,12 @@ CupsdConf::~CupsdConf()
bool CupsdConf::loadFromFile(const TQString& filename) bool CupsdConf::loadFromFile(const TQString& filename)
{ {
QFile f(filename); TQFile f(filename);
if (!f.exists() || !f.open(IO_ReadOnly)) return false; if (!f.exists() || !f.open(IO_ReadOnly)) return false;
else else
{ {
QTextStream t(&f); TQTextStream t(&f);
QString line; TQString line;
bool done(false), value(true); bool done(false), value(true);
while (!done && value) while (!done && value)
{ {
@ -175,12 +175,12 @@ bool CupsdConf::loadFromFile(const TQString& filename)
bool CupsdConf::saveToFile(const TQString& filename) bool CupsdConf::saveToFile(const TQString& filename)
{ {
QFile f(filename); TQFile f(filename);
if (!f.open(IO_WriteOnly)) if (!f.open(IO_WriteOnly))
return false; return false;
else else
{ {
QTextStream t(&f); TQTextStream t(&f);
t << comments_["header"] << endl; t << comments_["header"] << endl;
t << "# Server" << endl << endl; t << "# Server" << endl << endl;
@ -448,7 +448,7 @@ bool CupsdConf::saveToFile(const TQString& filename)
if (browsing_) t << "BrowseShortNames " << (useshortnames_ ? "Yes" : "No") << endl; if (browsing_) t << "BrowseShortNames " << (useshortnames_ ? "Yes" : "No") << endl;
t << endl << "# Unknown" << endl; t << endl << "# Unknown" << endl;
for (TQValueList< QPair<TQString,TQString> >::ConstIterator it=unknown_.begin(); it!=unknown_.end(); ++it) for (TQValueList< TQPair<TQString,TQString> >::ConstIterator it=unknown_.begin(); it!=unknown_.end(); ++it)
t << (*it).first << " " << (*it).second << endl; t << (*it).first << " " << (*it).second << endl;
return true; return true;
@ -457,7 +457,7 @@ bool CupsdConf::saveToFile(const TQString& filename)
bool CupsdConf::parseLocation(CupsLocation *location, TQTextStream& file) bool CupsdConf::parseLocation(CupsLocation *location, TQTextStream& file)
{ {
QString line; TQString line;
bool done(false); bool done(false);
bool value(true); bool value(true);
while (!done && value) while (!done && value)
@ -520,7 +520,7 @@ bool CupsdConf::parseOption(const TQString& line)
else if (keyword == "browsing") browsing_ = (value.lower() != "off"); else if (keyword == "browsing") browsing_ = (value.lower() != "off");
else if (keyword == "classification") else if (keyword == "classification")
{ {
QString cl = value.lower(); TQString cl = value.lower();
if (cl == "none") classification_ = CLASS_NONE; if (cl == "none") classification_ = CLASS_NONE;
else if (cl == "classified") classification_ = CLASS_CLASSIFIED; else if (cl == "classified") classification_ = CLASS_CLASSIFIED;
else if (cl == "confidential") classification_ = CLASS_CONFIDENTIAL; else if (cl == "confidential") classification_ = CLASS_CONFIDENTIAL;
@ -600,7 +600,7 @@ bool CupsdConf::parseOption(const TQString& line)
else else
{ {
// unrecognized option // unrecognized option
unknown_ << QPair<TQString,TQString>(keyword, value); unknown_ << TQPair<TQString,TQString>(keyword, value);
} }
return true; return true;
} }
@ -609,7 +609,7 @@ bool CupsdConf::loadAvailableResources()
{ {
KConfig conf("kdeprintrc"); KConfig conf("kdeprintrc");
conf.setGroup("CUPS"); conf.setGroup("CUPS");
QString host = conf.readEntry("Host",cupsServer()); TQString host = conf.readEntry("Host",cupsServer());
int port = conf.readNumEntry("Port",ippPort()); int port = conf.readNumEntry("Port",ippPort());
http_t *http_ = httpConnect(host.local8Bit(),port); http_t *http_ = httpConnect(host.local8Bit(),port);
@ -633,7 +633,7 @@ bool CupsdConf::loadAvailableResources()
request_ = cupsDoRequest(http_, request_, "/printers/"); request_ = cupsDoRequest(http_, request_, "/printers/");
if (request_) if (request_)
{ {
QString name; TQString name;
int type(0); int type(0);
ipp_attribute_t *attr = request_->attrs; ipp_attribute_t *attr = request_->attrs;
while (attr) while (attr)
@ -662,7 +662,7 @@ bool CupsdConf::loadAvailableResources()
request_ = cupsDoRequest(http_, request_, "/classes/"); request_ = cupsDoRequest(http_, request_, "/classes/");
if (request_) if (request_)
{ {
QString name; TQString name;
int type(0); int type(0);
ipp_attribute_t *attr = request_->attrs; ipp_attribute_t *attr = request_->attrs;
while (attr) while (attr)
@ -717,7 +717,7 @@ CupsLocation::CupsLocation(const CupsLocation& loc)
bool CupsLocation::parseResource(const TQString& line) bool CupsLocation::parseResource(const TQString& line)
{ {
QString str = line.simplifyWhiteSpace(); TQString str = line.simplifyWhiteSpace();
int p1 = line.tqfind(' '), p2 = line.tqfind('>'); int p1 = line.tqfind(' '), p2 = line.tqfind('>');
if (p1 != -1 && p2 != -1) if (p1 != -1 && p2 != -1)
{ {
@ -826,7 +826,7 @@ int CupsResource::typeFromPath(const TQString& path)
TQString CupsResource::textToPath(const TQString& text) TQString CupsResource::textToPath(const TQString& text)
{ {
QString path("/"); TQString path("/");
if (text == i18n("Administration")) path = "/admin"; if (text == i18n("Administration")) path = "/admin";
else if (text == i18n("All printers")) path = "/printers"; else if (text == i18n("All printers")) path = "/printers";
else if (text == i18n("All classes")) path = "/classes"; else if (text == i18n("All classes")) path = "/classes";
@ -847,7 +847,7 @@ TQString CupsResource::textToPath(const TQString& text)
TQString CupsResource::pathToText(const TQString& path) TQString CupsResource::pathToText(const TQString& path)
{ {
QString text(i18n("Base", "Root")); TQString text(i18n("Base", "Root"));
if (path == "/admin") text = i18n("Administration"); if (path == "/admin") text = i18n("Administration");
else if (path == "/printers") text = i18n("All printers"); else if (path == "/printers") text = i18n("All printers");
else if (path == "/classes") text = i18n("All classes"); else if (path == "/classes") text = i18n("All classes");

@ -64,8 +64,8 @@ struct CupsdConf
static CupsdConf *unique_; static CupsdConf *unique_;
// Server // Server
QString servername_; TQString servername_;
QString serveradmin_; TQString serveradmin_;
int classification_; int classification_;
TQString otherclassname_; TQString otherclassname_;
bool classoverride_; bool classoverride_;
@ -138,7 +138,7 @@ struct CupsdConf
CupsdComment comments_; CupsdComment comments_;
// unrecognized options // unrecognized options
TQValueList< QPair<TQString,TQString> > unknown_; TQValueList< TQPair<TQString,TQString> > unknown_;
}; };
struct CupsLocation struct CupsLocation
@ -150,14 +150,14 @@ struct CupsLocation
bool parseResource(const TQString& line); bool parseResource(const TQString& line);
CupsResource *resource_; CupsResource *resource_;
QString resourcename_; TQString resourcename_;
int authtype_; int authtype_;
int authclass_; int authclass_;
QString authname_; TQString authname_;
int encryption_; int encryption_;
int satisfy_; int satisfy_;
int order_; int order_;
QStringList addresses_; TQStringList addresses_;
}; };
struct CupsResource struct CupsResource
@ -168,8 +168,8 @@ struct CupsResource
void setPath(const TQString& path); void setPath(const TQString& path);
int type_; int type_;
QString path_; TQString path_;
QString text_; TQString text_;
static TQString textToPath(const TQString& text); static TQString textToPath(const TQString& text);
static TQString pathToText(const TQString& path); static TQString pathToText(const TQString& path);

@ -50,7 +50,7 @@
#include <cups/cups.h> #include <cups/cups.h>
static bool dynamically_loaded = false; static bool dynamically_loaded = false;
static QString pass_string; static TQString pass_string;
extern "C" extern "C"
{ {
@ -70,15 +70,15 @@ extern "C"
int getServerPid() int getServerPid()
{ {
QDir dir("/proc",TQString::null,TQDir::Name,TQDir::Dirs); TQDir dir("/proc",TQString::null,TQDir::Name,TQDir::Dirs);
for (uint i=0;i<dir.count();i++) for (uint i=0;i<dir.count();i++)
{ {
if (dir[i] == "." || dir[i] == ".." || dir[i] == "self") continue; if (dir[i] == "." || dir[i] == ".." || dir[i] == "self") continue;
QFile f("/proc/" + dir[i] + "/cmdline"); TQFile f("/proc/" + dir[i] + "/cmdline");
if (f.exists() && f.open(IO_ReadOnly)) if (f.exists() && f.open(IO_ReadOnly))
{ {
QTextStream t(&f); TQTextStream t(&f);
QString line; TQString line;
t >> line; t >> line;
f.close(); f.close();
if (line.right(5) == "cupsd" || if (line.right(5) == "cupsd" ||
@ -92,8 +92,8 @@ int getServerPid()
const char* getPassword(const char*) const char* getPassword(const char*)
{ {
QString user(cupsUser()); TQString user(cupsUser());
QString pass; TQString pass;
if (KIO::PasswordDialog::getNameAndPassword(user, pass, NULL) == TQDialog::Accepted) if (KIO::PasswordDialog::getNameAndPassword(user, pass, NULL) == TQDialog::Accepted)
{ {
@ -142,7 +142,7 @@ void CupsdDialog::addConfPage(CupsdPage *page)
KIcon::SizeMedium KIcon::SizeMedium
); );
QVBox *box = addVBoxPage(page->pageLabel(), page->header(), icon); TQVBox *box = addVBoxPage(page->pageLabel(), page->header(), icon);
page->reparent(box, TQPoint(0,0)); page->reparent(box, TQPoint(0,0));
pagelist_.append(page); pagelist_.append(page);
} }
@ -177,15 +177,15 @@ bool CupsdDialog::setConfigFile(const TQString& filename)
if (conf_->unknown_.count() > 0) if (conf_->unknown_.count() > 0)
{ {
// there were some unknown options, warn the user // there were some unknown options, warn the user
QString msg; TQString msg;
for (TQValueList< QPair<TQString,TQString> >::ConstIterator it=conf_->unknown_.begin(); it!=conf_->unknown_.end(); ++it) for (TQValueList< TQPair<TQString,TQString> >::ConstIterator it=conf_->unknown_.begin(); it!=conf_->unknown_.end(); ++it)
msg += ((*it).first + " = " + (*it).second + "<br>"); msg += ((*it).first + " = " + (*it).second + "<br>");
msg.prepend("<p>" + i18n("Some options were not recognized by this configuration tool. " msg.prepend("<p>" + i18n("Some options were not recognized by this configuration tool. "
"They will be left untouched and you won't be able to change them.") + "</p>"); "They will be left untouched and you won't be able to change them.") + "</p>");
KMessageBox::sorry(this, msg, i18n("Unrecognized Options")); KMessageBox::sorry(this, msg, i18n("Unrecognized Options"));
} }
bool ok(true); bool ok(true);
QString msg; TQString msg;
for (pagelist_.first();pagelist_.current() && ok;pagelist_.next()) for (pagelist_.first();pagelist_.current() && ok;pagelist_.next())
ok = pagelist_.current()->loadConfig(conf_, msg); ok = pagelist_.current()->loadConfig(conf_, msg);
if (!ok) if (!ok)
@ -227,7 +227,7 @@ bool CupsdDialog::configure(const TQString& filename, TQWidget *parent, TQString
cupsSetPasswordCB(getPassword); cupsSetPasswordCB(getPassword);
// load config file from server // load config file from server
QString fn(filename); TQString fn(filename);
if (fn.isEmpty()) if (fn.isEmpty())
{ {
fn = cupsGetConf(); fn = cupsGetConf();
@ -240,7 +240,7 @@ bool CupsdDialog::configure(const TQString& filename, TQWidget *parent, TQString
// check read state (only if needed) // check read state (only if needed)
if (!fn.isEmpty()) if (!fn.isEmpty())
{ {
QFileInfo fi(fn); TQFileInfo fi(fn);
if (!fi.exists() || !fi.isReadable() || !fi.isWritable()) if (!fi.exists() || !fi.isReadable() || !fi.isWritable())
errormsg = i18n("Internal error: file '%1' not readable/writable!").arg(fn); errormsg = i18n("Internal error: file '%1' not readable/writable!").arg(fn);
// check file size // check file size
@ -260,7 +260,7 @@ bool CupsdDialog::configure(const TQString& filename, TQWidget *parent, TQString
CupsdDialog dlg(parent); CupsdDialog dlg(parent);
if (dlg.setConfigFile(fn) && dlg.exec()) if (dlg.setConfigFile(fn) && dlg.exec())
{ {
QCString encodedFn = TQFile::encodeName(fn); TQCString encodedFn = TQFile::encodeName(fn);
if (!needUpload) if (!needUpload)
KMessageBox::information(parent, KMessageBox::information(parent,
i18n("The config file has not been uploaded to the " i18n("The config file has not been uploaded to the "
@ -289,7 +289,7 @@ void CupsdDialog::slotOk()
if (conf_ && !filename_.isEmpty()) if (conf_ && !filename_.isEmpty())
{ // try to save the file { // try to save the file
bool ok(true); bool ok(true);
QString msg; TQString msg;
CupsdConf newconf_; CupsdConf newconf_;
for (pagelist_.first();pagelist_.current() && ok;pagelist_.next()) for (pagelist_.first();pagelist_.current() && ok;pagelist_.next())
ok = pagelist_.current()->saveConfig(&newconf_, msg); ok = pagelist_.current()->saveConfig(&newconf_, msg);
@ -328,18 +328,18 @@ int CupsdDialog::serverOwner()
int pid = getServerPid(); int pid = getServerPid();
if (pid > 0) if (pid > 0)
{ {
QString str; TQString str;
str.sprintf("/proc/%d/status",pid); str.sprintf("/proc/%d/status",pid);
QFile f(str); TQFile f(str);
if (f.exists() && f.open(IO_ReadOnly)) if (f.exists() && f.open(IO_ReadOnly))
{ {
QTextStream t(&f); TQTextStream t(&f);
while (!t.eof()) while (!t.eof())
{ {
str = t.readLine(); str = t.readLine();
if (str.tqfind("Uid:",0,false) == 0) if (str.tqfind("Uid:",0,false) == 0)
{ {
QStringList list = TQStringList::split('\t', str, false); TQStringList list = TQStringList::split('\t', str, false);
if (list.count() >= 2) if (list.count() >= 2)
{ {
bool ok; bool ok;

@ -51,7 +51,7 @@ CupsdDirPage::CupsdDirPage(TQWidget *parent, const char *name)
TQLabel *l6 = new TQLabel(i18n("Server files:"), this); TQLabel *l6 = new TQLabel(i18n("Server files:"), this);
TQLabel *l7 = new TQLabel(i18n("Temporary files:"), this); TQLabel *l7 = new TQLabel(i18n("Temporary files:"), this);
QGridLayout *m1 = new TQGridLayout(this, 8, 2, 10, 7); TQGridLayout *m1 = new TQGridLayout(this, 8, 2, 10, 7);
m1->setRowStretch(7, 1); m1->setRowStretch(7, 1);
m1->setColStretch(1, 1); m1->setColStretch(1, 1);
m1->addWidget(l1, 0, 0, Qt::AlignRight); m1->addWidget(l1, 0, 0, Qt::AlignRight);

@ -51,7 +51,7 @@ CupsdFilterPage::CupsdFilterPage(TQWidget *parent, const char *name)
TQLabel *l3 = new TQLabel(i18n("RIP cache:"), this); TQLabel *l3 = new TQLabel(i18n("RIP cache:"), this);
TQLabel *l4 = new TQLabel(i18n("Filter limit:"), this); TQLabel *l4 = new TQLabel(i18n("Filter limit:"), this);
QGridLayout *m1 = new TQGridLayout(this, 5, 2, 10, 7); TQGridLayout *m1 = new TQGridLayout(this, 5, 2, 10, 7);
m1->setRowStretch(4, 1); m1->setRowStretch(4, 1);
m1->setColStretch(1, 1); m1->setColStretch(1, 1);
m1->addWidget(l1, 0, 0, Qt::AlignRight); m1->addWidget(l1, 0, 0, Qt::AlignRight);

@ -37,7 +37,7 @@ public:
void setInfos(CupsdConf*); void setInfos(CupsdConf*);
private: private:
QLineEdit *user_, *group_; TQLineEdit *user_, *group_;
KIntNumInput *filterlimit_; KIntNumInput *filterlimit_;
SizeWidget *ripcache_; SizeWidget *ripcache_;
}; };

@ -56,7 +56,7 @@ CupsdJobsPage::CupsdJobsPage(TQWidget *parent, const char *name)
TQLabel *l2 = new TQLabel(i18n("Max jobs per printer:"), this); TQLabel *l2 = new TQLabel(i18n("Max jobs per printer:"), this);
TQLabel *l3 = new TQLabel(i18n("Max jobs per user:"), this); TQLabel *l3 = new TQLabel(i18n("Max jobs per user:"), this);
QGridLayout *m1 = new TQGridLayout(this, 7, 2, 10, 7); TQGridLayout *m1 = new TQGridLayout(this, 7, 2, 10, 7);
m1->setRowStretch(6, 1); m1->setRowStretch(6, 1);
m1->setColStretch(1, 1); m1->setColStretch(1, 1);
m1->addWidget(keepjobhistory_, 0, 1); m1->addWidget(keepjobhistory_, 0, 1);

@ -41,7 +41,7 @@ protected slots:
private: private:
KIntNumInput *maxjobs_, *maxjobsperprinter_, *maxjobsperuser_; KIntNumInput *maxjobs_, *maxjobsperprinter_, *maxjobsperuser_;
QCheckBox *keepjobhistory_, *keepjobfiles_, *autopurgejobs_; TQCheckBox *keepjobhistory_, *keepjobfiles_, *autopurgejobs_;
}; };
#endif #endif

@ -63,7 +63,7 @@ CupsdLogPage::CupsdLogPage(TQWidget *parent, const char *name)
loglevel_->setCurrentItem(2); loglevel_->setCurrentItem(2);
QGridLayout *m1 = new TQGridLayout(this, 6, 2, 10, 7); TQGridLayout *m1 = new TQGridLayout(this, 6, 2, 10, 7);
m1->setRowStretch(5, 1); m1->setRowStretch(5, 1);
m1->setColStretch(1, 1); m1->setColStretch(1, 1);
m1->addWidget(l1, 0, 0, Qt::AlignRight); m1->addWidget(l1, 0, 0, Qt::AlignRight);

@ -37,7 +37,7 @@ public:
private: private:
QDirLineEdit *accesslog_, *errorlog_, *pagelog_; QDirLineEdit *accesslog_, *errorlog_, *pagelog_;
QComboBox *loglevel_; TQComboBox *loglevel_;
SizeWidget *maxlogsize_; SizeWidget *maxlogsize_;
}; };

@ -71,7 +71,7 @@ CupsdNetworkPage::CupsdNetworkPage(TQWidget *parent, const char *name)
TQLabel *l5 = new TQLabel(i18n("Client timeout:"), this); TQLabel *l5 = new TQLabel(i18n("Client timeout:"), this);
TQLabel *l6 = new TQLabel(i18n("Listen to:"), this); TQLabel *l6 = new TQLabel(i18n("Listen to:"), this);
QGridLayout *m1 = new TQGridLayout(this, 8, 2, 10, 7); TQGridLayout *m1 = new TQGridLayout(this, 8, 2, 10, 7);
m1->setRowStretch(7, 1); m1->setRowStretch(7, 1);
m1->setColStretch(1, 1); m1->setColStretch(1, 1);
m1->addWidget(l1, 0, 0, Qt::AlignRight); m1->addWidget(l1, 0, 0, Qt::AlignRight);
@ -135,7 +135,7 @@ void CupsdNetworkPage::setInfos(CupsdConf *conf)
void CupsdNetworkPage::slotAdd() void CupsdNetworkPage::slotAdd()
{ {
QString s = PortDialog::newListen(this, conf_); TQString s = PortDialog::newListen(this, conf_);
if (!s.isEmpty()) if (!s.isEmpty())
listen_->insertItem(s); listen_->insertItem(s);
} }
@ -151,7 +151,7 @@ void CupsdNetworkPage::slotEdit(int index)
void CupsdNetworkPage::slotDefaultList() void CupsdNetworkPage::slotDefaultList()
{ {
listen_->clear(); listen_->clear();
QStringList l; TQStringList l;
l << "Listen *:631"; l << "Listen *:631";
listen_->insertItems(l); listen_->insertItems(l);
} }

@ -46,8 +46,8 @@ protected slots:
private: private:
KIntNumInput *keepalivetimeout_, *maxclients_, *clienttimeout_; KIntNumInput *keepalivetimeout_, *maxclients_, *clienttimeout_;
QComboBox *hostnamelookup_; TQComboBox *hostnamelookup_;
QCheckBox *keepalive_; TQCheckBox *keepalive_;
EditList *listen_; EditList *listen_;
SizeWidget *maxrequestsize_; SizeWidget *maxrequestsize_;
}; };

@ -52,7 +52,7 @@ CupsdSecurityPage::CupsdSecurityPage(TQWidget *parent, const char *name)
TQLabel *l4 = new TQLabel(i18n("Encryption key:"), this); TQLabel *l4 = new TQLabel(i18n("Encryption key:"), this);
TQLabel *l5 = new TQLabel(i18n("Locations:"), this); TQLabel *l5 = new TQLabel(i18n("Locations:"), this);
QGridLayout *m1 = new TQGridLayout(this, 6, 2, 10, 7); TQGridLayout *m1 = new TQGridLayout(this, 6, 2, 10, 7);
m1->setRowStretch(5, 1); m1->setRowStretch(5, 1);
m1->setColStretch(1, 1); m1->setColStretch(1, 1);
m1->addWidget(l1, 0, 0, Qt::AlignRight); m1->addWidget(l1, 0, 0, Qt::AlignRight);

@ -46,7 +46,7 @@ protected slots:
void slotDeleted(int); void slotDeleted(int);
private: private:
QLineEdit *remoteroot_, *systemgroup_; TQLineEdit *remoteroot_, *systemgroup_;
QDirLineEdit *encryptcert_, *encryptkey_; QDirLineEdit *encryptcert_, *encryptkey_;
EditList *locations_; EditList *locations_;

@ -94,7 +94,7 @@ CupsdServerPage::CupsdServerPage(TQWidget *parent, const char *name)
printcapformat_->setCurrentItem(0); printcapformat_->setCurrentItem(0);
classChanged(0); classChanged(0);
QGridLayout *m1 = new TQGridLayout(this, 9, 2, 10, 7); TQGridLayout *m1 = new TQGridLayout(this, 9, 2, 10, 7);
m1->setRowStretch(8, 1); m1->setRowStretch(8, 1);
m1->setColStretch(1, 1); m1->setColStretch(1, 1);
m1->addWidget(l1, 0, 0, Qt::AlignRight); m1->addWidget(l1, 0, 0, Qt::AlignRight);
@ -110,13 +110,13 @@ CupsdServerPage::CupsdServerPage(TQWidget *parent, const char *name)
m1->addWidget(language_, 5, 1); m1->addWidget(language_, 5, 1);
m1->addWidget(printcap_, 6, 1); m1->addWidget(printcap_, 6, 1);
m1->addWidget(printcapformat_, 7, 1); m1->addWidget(printcapformat_, 7, 1);
QHBoxLayout *m2 = new TQHBoxLayout(0, 0, 5); TQHBoxLayout *m2 = new TQHBoxLayout(0, 0, 5);
m1->addLayout(m2, 2, 1); m1->addLayout(m2, 2, 1);
m2->addWidget(classification_); m2->addWidget(classification_);
m2->addWidget(otherclassname_); m2->addWidget(otherclassname_);
QWidget *w = new TQWidget(this); TQWidget *w = new TQWidget(this);
w->setFixedWidth(20); w->setFixedWidth(20);
QHBoxLayout *m3 = new TQHBoxLayout(0, 0, 0); TQHBoxLayout *m3 = new TQHBoxLayout(0, 0, 0);
m1->addLayout(m3, 3, 1); m1->addLayout(m3, 3, 1);
m3->addWidget(w); m3->addWidget(w);
m3->addWidget(classoverride_); m3->addWidget(classoverride_);

@ -41,9 +41,9 @@ protected slots:
void classChanged(int); void classChanged(int);
private: private:
QLineEdit *servername_, *serveradmin_, *language_, *printcap_, *otherclassname_; TQLineEdit *servername_, *serveradmin_, *language_, *printcap_, *otherclassname_;
QComboBox *classification_, *charset_, *printcapformat_; TQComboBox *classification_, *charset_, *printcapformat_;
QCheckBox *classoverride_; TQCheckBox *classoverride_;
}; };
#endif #endif

@ -32,20 +32,20 @@ CupsdSplash::CupsdSplash(TQWidget *parent, const char *name)
setPageLabel(i18n("Welcome")); setPageLabel(i18n("Welcome"));
setPixmap("go"); setPixmap("go");
QVBoxLayout *main_ = new TQVBoxLayout(this, 10, 10); TQVBoxLayout *main_ = new TQVBoxLayout(this, 10, 10);
QHBoxLayout *sub_ = new TQHBoxLayout(0, 0, 10); TQHBoxLayout *sub_ = new TQHBoxLayout(0, 0, 10);
main_->addLayout(sub_); main_->addLayout(sub_);
QLabel *cupslogo_ = new TQLabel(this); TQLabel *cupslogo_ = new TQLabel(this);
QString logopath = locate("data", TQString("kdeprint/cups_logo.png")); TQString logopath = locate("data", TQString("kdeprint/cups_logo.png"));
cupslogo_->setPixmap(logopath.isEmpty() ? TQPixmap() : TQPixmap(logopath)); cupslogo_->setPixmap(logopath.isEmpty() ? TQPixmap() : TQPixmap(logopath));
cupslogo_->tqsetAlignment(Qt::AlignCenter); cupslogo_->tqsetAlignment(Qt::AlignCenter);
QLabel *kupslogo_ = new TQLabel(this); TQLabel *kupslogo_ = new TQLabel(this);
logopath = locate("data", TQString("kdeprint/kde_logo.png")); logopath = locate("data", TQString("kdeprint/kde_logo.png"));
kupslogo_->setPixmap(logopath.isEmpty() ? TQPixmap() : TQPixmap(logopath)); kupslogo_->setPixmap(logopath.isEmpty() ? TQPixmap() : TQPixmap(logopath));
kupslogo_->tqsetAlignment(Qt::AlignCenter); kupslogo_->tqsetAlignment(Qt::AlignCenter);
QLabel *helptxt_ = new TQLabel(this); TQLabel *helptxt_ = new TQLabel(this);
helptxt_->setText(i18n( "<p>This tool will help you to configure graphically the server of the CUPS printing system. " helptxt_->setText(i18n( "<p>This tool will help you to configure graphically the server of the CUPS printing system. "
"The available options are grouped into sets of related topics and can be accessed " "The available options are grouped into sets of related topics and can be accessed "
"quickly through the icon view located on the left. Each option has a default value that is " "quickly through the icon view located on the left. Each option has a default value that is "

@ -81,7 +81,7 @@ void EditList::setText(int index, const TQString& s)
{ {
if (list_->text(index) != s) if (list_->text(index) != s)
{ {
QListBoxItem *it = list_->findItem(s, Qt::ExactMatch); TQListBoxItem *it = list_->tqfindItem(s, TQt::ExactMatch);
if (!it) if (!it)
list_->changeItem(s, index); list_->changeItem(s, index);
else else
@ -97,13 +97,13 @@ void EditList::clear()
void EditList::insertItem(const TQString& s) void EditList::insertItem(const TQString& s)
{ {
if (!list_->findItem(s, Qt::ExactMatch)) if (!list_->tqfindItem(s, TQt::ExactMatch))
list_->insertItem(s); list_->insertItem(s);
} }
void EditList::insertItem(const TQPixmap& icon, const TQString& s) void EditList::insertItem(const TQPixmap& icon, const TQString& s)
{ {
if (!list_->findItem(s, Qt::ExactMatch)) if (!list_->tqfindItem(s, TQt::ExactMatch))
list_->insertItem(icon, s); list_->insertItem(icon, s);
} }

@ -54,7 +54,7 @@ protected slots:
private: private:
KListBox *list_; KListBox *list_;
QPushButton *addbtn_, *editbtn_, *delbtn_, *defbtn_; TQPushButton *addbtn_, *editbtn_, *delbtn_, *defbtn_;
}; };
#endif #endif

@ -35,7 +35,7 @@
LocationDialog::LocationDialog(TQWidget *parent, const char *name) LocationDialog::LocationDialog(TQWidget *parent, const char *name)
: KDialogBase(parent, name, true, TQString::null, Ok|Cancel, Ok, true) : KDialogBase(parent, name, true, TQString::null, Ok|Cancel, Ok, true)
{ {
QWidget *dummy = new TQWidget(this); TQWidget *dummy = new TQWidget(this);
setMainWidget(dummy); setMainWidget(dummy);
resource_ = new TQComboBox(dummy); resource_ = new TQComboBox(dummy);
authtype_ = new TQComboBox(dummy); authtype_ = new TQComboBox(dummy);
@ -69,16 +69,16 @@ LocationDialog::LocationDialog(TQWidget *parent, const char *name)
connect(authclass_, TQT_SIGNAL(activated(int)), TQT_SLOT(slotClassChanged(int))); connect(authclass_, TQT_SIGNAL(activated(int)), TQT_SLOT(slotClassChanged(int)));
connect(authtype_, TQT_SIGNAL(activated(int)), TQT_SLOT(slotTypeChanged(int))); connect(authtype_, TQT_SIGNAL(activated(int)), TQT_SLOT(slotTypeChanged(int)));
QLabel *l1 = new TQLabel(i18n("Resource:"), dummy); TQLabel *l1 = new TQLabel(i18n("Resource:"), dummy);
QLabel *l2 = new TQLabel(i18n("Authentication:"), dummy); TQLabel *l2 = new TQLabel(i18n("Authentication:"), dummy);
QLabel *l3 = new TQLabel(i18n("Class:"), dummy); TQLabel *l3 = new TQLabel(i18n("Class:"), dummy);
QLabel *l4 = new TQLabel(i18n("Names:"), dummy); TQLabel *l4 = new TQLabel(i18n("Names:"), dummy);
QLabel *l5 = new TQLabel(i18n("Encryption:"), dummy); TQLabel *l5 = new TQLabel(i18n("Encryption:"), dummy);
QLabel *l6 = new TQLabel(i18n("Satisfy:"), dummy); TQLabel *l6 = new TQLabel(i18n("Satisfy:"), dummy);
QLabel *l7 = new TQLabel(i18n("ACL order:"), dummy); TQLabel *l7 = new TQLabel(i18n("ACL order:"), dummy);
QLabel *l8 = new TQLabel(i18n("ACL addresses:"),dummy); TQLabel *l8 = new TQLabel(i18n("ACL addresses:"),dummy);
QGridLayout *m1 = new TQGridLayout(dummy, 8, 2, 0, 5); TQGridLayout *m1 = new TQGridLayout(dummy, 8, 2, 0, 5);
m1->setColStretch(1, 1); m1->setColStretch(1, 1);
m1->addWidget(l1, 0, 0, Qt::AlignRight); m1->addWidget(l1, 0, 0, Qt::AlignRight);
m1->addWidget(l2, 1, 0, Qt::AlignRight); m1->addWidget(l2, 1, 0, Qt::AlignRight);
@ -141,7 +141,7 @@ void LocationDialog::fillLocation(CupsLocation *loc)
void LocationDialog::setLocation(CupsLocation *loc) void LocationDialog::setLocation(CupsLocation *loc)
{ {
int index = conf_->resources_.findRef(loc->resource_); int index = conf_->resources_.tqfindRef(loc->resource_);
resource_->setCurrentItem(index); resource_->setCurrentItem(index);
authtype_->setCurrentItem(loc->authtype_); authtype_->setCurrentItem(loc->authtype_);
authclass_->setCurrentItem(loc->authclass_); authclass_->setCurrentItem(loc->authclass_);

@ -49,8 +49,8 @@ protected slots:
void slotDefaultList(); void slotDefaultList();
private: private:
QComboBox *resource_, *authtype_, *authclass_, *encryption_, *satisfy_, *order_; TQComboBox *resource_, *authtype_, *authclass_, *encryption_, *satisfy_, *order_;
QLineEdit *authname_; TQLineEdit *authname_;
EditList *addresses_; EditList *addresses_;
CupsdConf *conf_; CupsdConf *conf_;
}; };

@ -33,19 +33,19 @@
PortDialog::PortDialog(TQWidget *parent, const char *name) PortDialog::PortDialog(TQWidget *parent, const char *name)
: KDialogBase(parent, name, true, TQString::null, Ok|Cancel, Ok, true) : KDialogBase(parent, name, true, TQString::null, Ok|Cancel, Ok, true)
{ {
QWidget *dummy = new TQWidget(this); TQWidget *dummy = new TQWidget(this);
setMainWidget(dummy); setMainWidget(dummy);
address_ = new TQLineEdit(dummy); address_ = new TQLineEdit(dummy);
port_ = new TQSpinBox(0, 9999, 1, dummy); port_ = new TQSpinBox(0, 9999, 1, dummy);
port_->setValue(631); port_->setValue(631);
usessl_ = new TQCheckBox(i18n("Use SSL encryption"), dummy); usessl_ = new TQCheckBox(i18n("Use SSL encryption"), dummy);
QLabel *l1 = new TQLabel(i18n("Address:"), dummy); TQLabel *l1 = new TQLabel(i18n("Address:"), dummy);
QLabel *l2 = new TQLabel(i18n("Port:"), dummy); TQLabel *l2 = new TQLabel(i18n("Port:"), dummy);
QVBoxLayout *m1 = new TQVBoxLayout(dummy, 0, 10); TQVBoxLayout *m1 = new TQVBoxLayout(dummy, 0, 10);
QGridLayout *m2 = new TQGridLayout(0, 3, 2, 0, 5); TQGridLayout *m2 = new TQGridLayout(0, 3, 2, 0, 5);
m1->addLayout(m2); m1->addLayout(TQT_TQLAYOUT(m2));
m2->addWidget(l1, 0, 0, Qt::AlignRight); m2->addWidget(l1, 0, 0, Qt::AlignRight);
m2->addWidget(l2, 1, 0, Qt::AlignRight); m2->addWidget(l2, 1, 0, Qt::AlignRight);
m2->addMultiCellWidget(usessl_, 2, 2, 0, 1); m2->addMultiCellWidget(usessl_, 2, 2, 0, 1);
@ -97,7 +97,7 @@ TQString PortDialog::editListen(const TQString& s, TQWidget *parent, CupsdConf *
if (p != -1) if (p != -1)
{ {
dlg.usessl_->setChecked(s.left(p).startsWith("SSL")); dlg.usessl_->setChecked(s.left(p).startsWith("SSL"));
QString addr = s.mid(p+1).stripWhiteSpace(); TQString addr = s.mid(p+1).stripWhiteSpace();
int p1 = addr.tqfind(':'); int p1 = addr.tqfind(':');
if (p1 == -1) if (p1 == -1)
{ {

@ -38,9 +38,9 @@ public:
static TQString editListen(const TQString& s, TQWidget *parent = 0, CupsdConf *conf = 0); static TQString editListen(const TQString& s, TQWidget *parent = 0, CupsdConf *conf = 0);
private: private:
QLineEdit *address_; TQLineEdit *address_;
QSpinBox *port_; TQSpinBox *port_;
QCheckBox *usessl_; TQCheckBox *usessl_;
}; };
#endif #endif

@ -33,7 +33,7 @@ QDirLineEdit::QDirLineEdit(bool file, TQWidget *parent, const char *name)
button_->setPixmap(SmallIcon("fileopen")); button_->setPixmap(SmallIcon("fileopen"));
connect(button_,TQT_SIGNAL(clicked()),TQT_SLOT(buttonClicked())); connect(button_,TQT_SIGNAL(clicked()),TQT_SLOT(buttonClicked()));
QHBoxLayout *main_ = new TQHBoxLayout(this, 0, 3); TQHBoxLayout *main_ = new TQHBoxLayout(this, 0, 3);
main_->addWidget(edit_); main_->addWidget(edit_);
main_->addWidget(button_); main_->addWidget(button_);
@ -56,7 +56,7 @@ TQString QDirLineEdit::url()
void QDirLineEdit::buttonClicked() void QDirLineEdit::buttonClicked()
{ {
QString dirname; TQString dirname;
if (!fileedit_) if (!fileedit_)
dirname = KFileDialog::getExistingDirectory(edit_->text(), this); dirname = KFileDialog::getExistingDirectory(edit_->text(), this);
else else

@ -41,8 +41,8 @@ private slots:
void buttonClicked(); void buttonClicked();
private: private:
QLineEdit *edit_; TQLineEdit *edit_;
QPushButton *button_; TQPushButton *button_;
bool fileedit_; bool fileedit_;
}; };

@ -44,10 +44,10 @@ QDirMultiLineEdit::QDirMultiLineEdit(TQWidget *parent, const char *name)
connect(m_remove, TQT_SIGNAL(clicked()), TQT_SLOT(slotRemoveClicked())); connect(m_remove, TQT_SIGNAL(clicked()), TQT_SLOT(slotRemoveClicked()));
m_remove->setEnabled(false); m_remove->setEnabled(false);
m_view->setFixedHeight(QMAX(m_view->fontMetrics().lineSpacing()*3+m_view->lineWidth()*2, m_add->tqsizeHint().height()*2)); m_view->setFixedHeight(TQMAX(m_view->fontMetrics().lineSpacing()*3+m_view->lineWidth()*2, m_add->tqsizeHint().height()*2));
QHBoxLayout *l0 = new TQHBoxLayout(this, 0, 3); TQHBoxLayout *l0 = new TQHBoxLayout(this, 0, 3);
QVBoxLayout *l1 = new TQVBoxLayout(0, 0, 0); TQVBoxLayout *l1 = new TQVBoxLayout(0, 0, 0);
l0->addWidget(m_view); l0->addWidget(m_view);
l0->addLayout(l1); l0->addLayout(l1);
l1->addWidget(m_add); l1->addWidget(m_add);
@ -68,8 +68,8 @@ void QDirMultiLineEdit::setURLs(const TQStringList& urls)
TQStringList QDirMultiLineEdit::urls() TQStringList QDirMultiLineEdit::urls()
{ {
QListViewItem *item = m_view->firstChild(); TQListViewItem *item = m_view->firstChild();
QStringList l; TQStringList l;
while (item) while (item)
{ {
l << item->text(0); l << item->text(0);
@ -80,20 +80,20 @@ TQStringList QDirMultiLineEdit::urls()
void QDirMultiLineEdit::addURL(const TQString& url) void QDirMultiLineEdit::addURL(const TQString& url)
{ {
QListViewItem *item = new TQListViewItem(m_view, url); TQListViewItem *item = new TQListViewItem(m_view, url);
item->setRenameEnabled(0, true); item->setRenameEnabled(0, true);
} }
void QDirMultiLineEdit::slotAddClicked() void QDirMultiLineEdit::slotAddClicked()
{ {
QString dirname = KFileDialog::getExistingDirectory(TQString::null, this); TQString dirname = KFileDialog::getExistingDirectory(TQString::null, this);
if (!dirname.isEmpty()) if (!dirname.isEmpty())
addURL(dirname); addURL(dirname);
} }
void QDirMultiLineEdit::slotRemoveClicked() void QDirMultiLineEdit::slotRemoveClicked()
{ {
QListViewItem *item = m_view->currentItem(); TQListViewItem *item = m_view->currentItem();
if (item) if (item)
{ {
delete item; delete item;

@ -47,7 +47,7 @@ private slots:
private: private:
KListView *m_view; KListView *m_view;
QPushButton *m_add, *m_remove; TQPushButton *m_add, *m_remove;
}; };
#endif #endif

@ -58,9 +58,9 @@ CupsInfos::CupsInfos()
load(); load();
/* host_ = cupsServer(); /* host_ = cupsServer();
login_ = cupsUser(); login_ = cupsUser();
if (login_.isEmpty()) login_ = TQString::null; if (login_.isEmpty()) login_ = TQString();
port_ = ippPort(); port_ = ippPort();
password_ = TQString::null;*/ password_ = TQString();*/
cupsSetPasswordCB(cupsGetPasswordCB); cupsSetPasswordCB(cupsGetPasswordCB);
} }
@ -106,7 +106,7 @@ void CupsInfos::setSavePassword( bool on )
const char* CupsInfos::getPasswordCB() const char* CupsInfos::getPasswordCB()
{ {
QPair<TQString,TQString> pwd = KMFactory::self()->requestPassword( count_, login_, host_, port_ ); TQPair<TQString,TQString> pwd = KMFactory::self()->requestPassword( count_, login_, host_, port_ );
if ( pwd.first.isEmpty() && pwd.second.isEmpty() ) if ( pwd.first.isEmpty() && pwd.second.isEmpty() )
return NULL; return NULL;
@ -129,8 +129,8 @@ void CupsInfos::load()
KMFactory::self()->initPassword( login_, password_, host_, port_ ); KMFactory::self()->initPassword( login_, password_, host_, port_ );
} }
else else
password_ = TQString::null; password_ = TQString();
if (login_.isEmpty()) login_ = TQString::null; if (login_.isEmpty()) login_ = TQString();
reallogin_ = cupsUser(); reallogin_ = cupsUser();
// synchronize with CUPS // synchronize with CUPS

@ -57,11 +57,11 @@ protected:
private: private:
static CupsInfos *unique_; static CupsInfos *unique_;
QString host_; TQString host_;
int port_; int port_;
QString login_; TQString login_;
QString password_; TQString password_;
QString reallogin_; TQString reallogin_;
bool savepwd_; bool savepwd_;
int count_; int count_;

@ -114,7 +114,7 @@ void ImagePosition::paintEvent(TQPaintEvent*)
ph = (pw * 4) / 3; ph = (pw * 4) / 3;
py = (height() - ph) / 2; py = (height() - ph) / 2;
} }
QRect page(px, py, pw, ph), img(0, 0, pix_.width(), pix_.height()); TQRect page(px, py, pw, ph), img(0, 0, pix_.width(), pix_.height());
// compute img position // compute img position
horiz = position_%3; horiz = position_%3;
@ -134,7 +134,7 @@ void ImagePosition::paintEvent(TQPaintEvent*)
img.moveTopLeft(TQPoint(x,y)); img.moveTopLeft(TQPoint(x,y));
// draw page // draw page
QPainter p(this); TQPainter p(this);
draw3DPage(&p,page); draw3DPage(&p,page);
// draw img // draw img

@ -64,7 +64,7 @@ void ImagePreview::paintEvent(TQPaintEvent*){
p.drawImage(x,y,tmpImage); p.drawImage(x,y,tmpImage);
p.end(); p.end();
bitBlt(this, TQPoint(0, 0), &buffer, buffer.rect(), Qt::CopyROP); bitBlt(this, TQPoint(0, 0), &buffer, buffer.rect(), TQt::CopyROP);
} }
void ImagePreview::setBlackAndWhite(bool on){ void ImagePreview::setBlackAndWhite(bool on){

@ -48,20 +48,20 @@ void IppReportDlg::slotUser1()
printer.setDocName(caption()); printer.setDocName(caption());
if (printer.setup(this)) if (printer.setup(this))
{ {
QPainter painter(&printer); TQPainter painter(&printer);
QPaintDeviceMetrics metrics(&printer); TQPaintDeviceMetrics metrics(&printer);
// report is printed using QSimpleRichText // report is printed using TQSimpleRichText
QSimpleRichText rich(m_edit->text(), font()); TQSimpleRichText rich(m_edit->text(), font());
rich.setWidth(&painter, metrics.width()); rich.setWidth(&painter, metrics.width());
int margin = (int)(1.5 / 2.54 * metrics.logicalDpiY()); // 1.5 cm int margin = (int)(1.5 / 2.54 * metrics.logicalDpiY()); // 1.5 cm
QRect r(margin, margin, metrics.width()-2*margin, metrics.height()-2*margin); TQRect r(margin, margin, metrics.width()-2*margin, metrics.height()-2*margin);
int hh = rich.height(), page(1); int hh = rich.height(), page(1);
while (1) while (1)
{ {
rich.draw(&painter, margin, margin, r, tqcolorGroup()); rich.draw(&painter, margin, margin, r, tqcolorGroup());
QString s = caption() + ": " + TQString::number(page); TQString s = caption() + ": " + TQString::number(page);
QRect br = painter.fontMetrics().boundingRect(s); TQRect br = painter.fontMetrics().boundingRect(s);
painter.drawText(r.right()-br.width()-5, r.top()-br.height()-4, br.width()+5, br.height()+4, Qt::AlignRight|Qt::AlignTop, s); painter.drawText(r.right()-br.width()-5, r.top()-br.height()-4, br.width()+5, br.height()+4, Qt::AlignRight|Qt::AlignTop, s);
r.moveBy(0, r.height()-10); r.moveBy(0, r.height()-10);
painter.translate(0, -(r.height()-10)); painter.translate(0, -(r.height()-10));
@ -78,8 +78,8 @@ void IppReportDlg::slotUser1()
void IppReportDlg::report(IppRequest *req, int group, const TQString& caption) void IppReportDlg::report(IppRequest *req, int group, const TQString& caption)
{ {
QString str_report; TQString str_report;
QTextStream t(&str_report, IO_WriteOnly); TQTextStream t(&str_report, IO_WriteOnly);
if (req->htmlReport(group, t)) if (req->htmlReport(group, t))
{ {

@ -103,7 +103,7 @@ void dumpRequest(ipp_t *req, bool answer = false, const TQString& s = TQString::
TQString errorString(int status) TQString errorString(int status)
{ {
QString str; TQString str;
switch (status) switch (status)
{ {
case IPP_FORBIDDEN: case IPP_FORBIDDEN:
@ -134,7 +134,7 @@ IppRequest::IppRequest()
{ {
request_ = 0; request_ = 0;
port_ = -1; port_ = -1;
host_ = TQString::null; host_ = TQString();
dump_ = 0; dump_ = 0;
init(); init();
} }
@ -226,7 +226,7 @@ int IppRequest::status()
TQString IppRequest::statusMessage() TQString IppRequest::statusMessage()
{ {
QString msg; TQString msg;
switch (status()) switch (status())
{ {
case -2: case -2:
@ -294,7 +294,7 @@ bool IppRequest::boolean(const TQString& name, bool& value)
bool IppRequest::doFileRequest(const TQString& res, const TQString& filename) bool IppRequest::doFileRequest(const TQString& res, const TQString& filename)
{ {
QString myHost = host_; TQString myHost = host_;
int myPort = port_; int myPort = port_;
if (myHost.isEmpty()) myHost = CupsInfos::self()->host(); if (myHost.isEmpty()) myHost = CupsInfos::self()->host();
if (myPort <= 0) myPort = CupsInfos::self()->port(); if (myPort <= 0) myPort = CupsInfos::self()->port();
@ -361,8 +361,8 @@ bool IppRequest::htmlReport(int group, TQTextStream& output)
attr = attr->next; attr = attr->next;
// print each attribute // print each attribute
ipp_uchar_t *d; ipp_uchar_t *d;
QCString dateStr; TQCString dateStr;
QDateTime dt; TQDateTime dt;
bool bg(false); bool bg(false);
while (attr && attr->group_tag == group) while (attr && attr->group_tag == group)
{ {
@ -443,7 +443,7 @@ TQMap<TQString,TQString> IppRequest::toMap(int group)
attr = attr->next; attr = attr->next;
continue; continue;
} }
QString value; TQString value;
for (int i=0; i<attr->num_values; i++) for (int i=0; i<attr->num_values; i++)
{ {
switch (attr->value_tag) switch (attr->value_tag)
@ -496,14 +496,14 @@ void IppRequest::setMap(const TQMap<TQString,TQString>& opts)
if (!request_) if (!request_)
return; return;
QRegExp re("^\"|\"$"); TQRegExp re("^\"|\"$");
cups_option_t *options = NULL; cups_option_t *options = NULL;
int n = 0; int n = 0;
for (TQMap<TQString,TQString>::ConstIterator it=opts.begin(); it!=opts.end(); ++it) for (TQMap<TQString,TQString>::ConstIterator it=opts.begin(); it!=opts.end(); ++it)
{ {
if (it.key().startsWith("kde-") || it.key().startsWith("app-")) if (it.key().startsWith("kde-") || it.key().startsWith("app-"))
continue; continue;
QString value = it.data().stripWhiteSpace(), lovalue; TQString value = it.data().stripWhiteSpace(), lovalue;
value.replace(re, ""); value.replace(re, "");
lovalue = value.lower(); lovalue = value.lower();

@ -33,7 +33,7 @@ static void mapToCupsOptions(const TQMap<TQString,TQString>& opts, TQString& cmd
TQSize rangeToSize(const TQString& s) TQSize rangeToSize(const TQString& s)
{ {
QString range = s; TQString range = s;
int p(-1); int p(-1);
int from, to; int from, to;
@ -67,11 +67,11 @@ bool KCupsPrinterImpl::setupCommand(TQString& cmd, KPrinter *printer)
// check printer object // check printer object
if (!printer) return false; if (!printer) return false;
QString hoststr = TQString::tqfromLatin1("%1:%2").arg(CupsInfos::self()->host()).arg(CupsInfos::self()->port()); TQString hoststr = TQString::tqfromLatin1("%1:%2").arg(CupsInfos::self()->host()).arg(CupsInfos::self()->port());
cmd = TQString::tqfromLatin1("cupsdoprint -P %1 -J %3 -H %2").arg(quote(printer->printerName())).arg(quote(hoststr)).arg(quote(printer->docName())); cmd = TQString::tqfromLatin1("cupsdoprint -P %1 -J %3 -H %2").arg(quote(printer->printerName())).arg(quote(hoststr)).arg(quote(printer->docName()));
if (!CupsInfos::self()->login().isEmpty()) if (!CupsInfos::self()->login().isEmpty())
{ {
QString userstr(CupsInfos::self()->login()); TQString userstr(CupsInfos::self()->login());
//if (!CupsInfos::self()->password().isEmpty()) //if (!CupsInfos::self()->password().isEmpty())
// userstr += (":" + CupsInfos::self()->password()); // userstr += (":" + CupsInfos::self()->password());
cmd.append(" -U ").append(quote(userstr)); cmd.append(" -U ").append(quote(userstr));
@ -83,9 +83,9 @@ bool KCupsPrinterImpl::setupCommand(TQString& cmd, KPrinter *printer)
void KCupsPrinterImpl::preparePrinting(KPrinter *printer) void KCupsPrinterImpl::preparePrinting(KPrinter *printer)
{ {
// process orientation // process orientation
QString o = printer->option("orientation-requested"); TQString o = printer->option("orientation-requested");
printer->setOption("kde-orientation",(o == "4" || o == "5" ? "Landscape" : "Portrait")); printer->setOption("kde-orientation",(o == "4" || o == "5" ? "Landscape" : "Portrait"));
// if it's a Qt application, then convert orientation as it will be handled by Qt directly // if it's a TQt application, then convert orientation as it will be handled by TQt directly
if (printer->applicationType() == KPrinter::Dialog) if (printer->applicationType() == KPrinter::Dialog)
printer->setOption("orientation-requested",(o == "5" || o == "6" ? "6" : "3")); printer->setOption("orientation-requested",(o == "5" || o == "6" ? "6" : "3"));
@ -94,7 +94,7 @@ void KCupsPrinterImpl::preparePrinting(KPrinter *printer)
// page ranges are handled by CUPS, so application should print all pages // page ranges are handled by CUPS, so application should print all pages
if (printer->pageSelection() == KPrinter::SystemSide) if (printer->pageSelection() == KPrinter::SystemSide)
{ // Qt => CUPS { // TQt => CUPS
// translations // translations
if (!printer->option("kde-range").isEmpty()) if (!printer->option("kde-range").isEmpty())
printer->setOption("page-ranges",printer->option("kde-range")); printer->setOption("page-ranges",printer->option("kde-range"));
@ -110,7 +110,7 @@ void KCupsPrinterImpl::preparePrinting(KPrinter *printer)
TQString range = printer->option("kde-range"); TQString range = printer->option("kde-range");
if (!range.isEmpty()) if (!range.isEmpty())
{ {
QSize s = rangeToSize(range); TQSize s = rangeToSize(range);
printer->setOption("kde-from",TQString::number(s.width())); printer->setOption("kde-from",TQString::number(s.width()));
printer->setOption("kde-to",TQString::number(s.height())); printer->setOption("kde-to",TQString::number(s.height()));
} }
@ -127,7 +127,7 @@ void KCupsPrinterImpl::broadcastOption(const TQString& key, const TQString& valu
KPrinterImpl::broadcastOption("orientation-requested",(value == "Landscape" ? "4" : "3")); KPrinterImpl::broadcastOption("orientation-requested",(value == "Landscape" ? "4" : "3"));
else if (key == "kde-pagesize") else if (key == "kde-pagesize")
{ {
QString pagename = TQString::tqfromLatin1(pageSizeToPageName((KPrinter::PageSize)value.toInt())); TQString pagename = TQString::tqfromLatin1(pageSizeToPageName((KPrinter::PageSize)value.toInt()));
KPrinterImpl::broadcastOption("PageSize",pagename); KPrinterImpl::broadcastOption("PageSize",pagename);
// simple hack for classes // simple hack for classes
KPrinterImpl::broadcastOption("media",pagename); KPrinterImpl::broadcastOption("media",pagename);
@ -138,7 +138,7 @@ void KCupsPrinterImpl::broadcastOption(const TQString& key, const TQString& valu
static void mapToCupsOptions(const TQMap<TQString,TQString>& opts, TQString& cmd) static void mapToCupsOptions(const TQMap<TQString,TQString>& opts, TQString& cmd)
{ {
QString optstr; TQString optstr;
for (TQMap<TQString,TQString>::ConstIterator it=opts.begin(); it!=opts.end(); ++it) for (TQMap<TQString,TQString>::ConstIterator it=opts.begin(); it!=opts.end(); ++it)
{ {
// only encode those options that doesn't start with "kde-" or "app-". // only encode those options that doesn't start with "kde-" or "app-".

@ -44,7 +44,7 @@ KMConfigCupsDir::KMConfigCupsDir(TQWidget *parent)
TQVBoxLayout *lay0 = new TQVBoxLayout(this, 0, KDialog::spacingHint()); TQVBoxLayout *lay0 = new TQVBoxLayout(this, 0, KDialog::spacingHint());
lay0->addWidget(m_dirbox); lay0->addWidget(m_dirbox);
lay0->addStretch(1); lay0->addStretch(1);
TQVBoxLayout *lay1 = new TQVBoxLayout(m_dirbox->layout(), 10); TQVBoxLayout *lay1 = new TQVBoxLayout(TQT_TQLAYOUT(m_dirbox->layout()), 10);
lay1->addWidget(m_stddir); lay1->addWidget(m_stddir);
lay1->addWidget(m_installdir); lay1->addWidget(m_installdir);

@ -35,7 +35,7 @@ public:
private: private:
KURLRequester *m_installdir; KURLRequester *m_installdir;
QCheckBox *m_stddir; TQCheckBox *m_stddir;
}; };
#endif #endif

@ -33,7 +33,7 @@
#include <kconfig.h> #include <kconfig.h>
#include <kstringhandler.h> #include <kstringhandler.h>
class PortValidator : public QIntValidator class PortValidator : public TQIntValidator
{ {
public: public:
PortValidator(TQWidget *parent, const char *name = 0); PortValidator(TQWidget *parent, const char *name = 0);
@ -41,7 +41,7 @@ public:
}; };
PortValidator::PortValidator(TQWidget *parent, const char *name) PortValidator::PortValidator(TQWidget *parent, const char *name)
: TQIntValidator(1, 65535, parent, name) : TQIntValidator(1, 65535, TQT_TQOBJECT(parent), name)
{ {
} }
@ -62,18 +62,18 @@ KMCupsConfigWidget::KMCupsConfigWidget(TQWidget *parent, const char *name)
: TQWidget(parent,name) : TQWidget(parent,name)
{ {
// widget creation // widget creation
QGroupBox *m_hostbox = new TQGroupBox(0, Qt::Vertical, i18n("Server Information"), this); TQGroupBox *m_hostbox = new TQGroupBox(0, Qt::Vertical, i18n("Server Information"), this);
QGroupBox *m_loginbox = new TQGroupBox(0, Qt::Vertical, i18n("Account Information"), this); TQGroupBox *m_loginbox = new TQGroupBox(0, Qt::Vertical, i18n("Account Information"), this);
QLabel *m_hostlabel = new TQLabel(i18n("&Host:"), m_hostbox); TQLabel *m_hostlabel = new TQLabel(i18n("&Host:"), m_hostbox);
QLabel *m_portlabel = new TQLabel(i18n("&Port:"), m_hostbox); TQLabel *m_portlabel = new TQLabel(i18n("&Port:"), m_hostbox);
m_host = new TQLineEdit(m_hostbox); m_host = new TQLineEdit(m_hostbox);
m_port = new TQLineEdit(m_hostbox); m_port = new TQLineEdit(m_hostbox);
m_hostlabel->setBuddy(m_host); m_hostlabel->setBuddy(m_host);
m_portlabel->setBuddy(m_port); m_portlabel->setBuddy(m_port);
m_port->setValidator(new PortValidator(m_port)); m_port->setValidator(new PortValidator(m_port));
m_login = new TQLineEdit(m_loginbox); m_login = new TQLineEdit(m_loginbox);
QLabel *m_loginlabel = new TQLabel(i18n("&User:"), m_loginbox); TQLabel *m_loginlabel = new TQLabel(i18n("&User:"), m_loginbox);
QLabel *m_passwordlabel = new TQLabel(i18n("Pass&word:"), m_loginbox); TQLabel *m_passwordlabel = new TQLabel(i18n("Pass&word:"), m_loginbox);
m_password = new TQLineEdit(m_loginbox); m_password = new TQLineEdit(m_loginbox);
m_password->setEchoMode(TQLineEdit::Password); m_password->setEchoMode(TQLineEdit::Password);
m_savepwd = new TQCheckBox( i18n( "&Store password in configuration file" ), m_loginbox ); m_savepwd = new TQCheckBox( i18n( "&Store password in configuration file" ), m_loginbox );
@ -84,16 +84,16 @@ KMCupsConfigWidget::KMCupsConfigWidget(TQWidget *parent, const char *name)
m_passwordlabel->setBuddy(m_password); m_passwordlabel->setBuddy(m_password);
// layout creation // layout creation
QVBoxLayout *lay0 = new TQVBoxLayout(this, 0, 10); TQVBoxLayout *lay0 = new TQVBoxLayout(this, 0, 10);
lay0->addWidget(m_hostbox,1); lay0->addWidget(m_hostbox,1);
lay0->addWidget(m_loginbox,1); lay0->addWidget(m_loginbox,1);
QGridLayout *lay2 = new TQGridLayout(m_hostbox->layout(), 2, 2, 10); TQGridLayout *lay2 = new TQGridLayout(m_hostbox->layout(), 2, 2, 10);
lay2->setColStretch(1,1); lay2->setColStretch(1,1);
lay2->addWidget(m_hostlabel,0,0); lay2->addWidget(m_hostlabel,0,0);
lay2->addWidget(m_portlabel,1,0); lay2->addWidget(m_portlabel,1,0);
lay2->addWidget(m_host,0,1); lay2->addWidget(m_host,0,1);
lay2->addWidget(m_port,1,1); lay2->addWidget(m_port,1,1);
QGridLayout *lay3 = new TQGridLayout(m_loginbox->layout(), 4, 2, 10); TQGridLayout *lay3 = new TQGridLayout(m_loginbox->layout(), 4, 2, 10);
lay3->setColStretch(1,1); lay3->setColStretch(1,1);
lay3->addWidget(m_loginlabel,0,0); lay3->addWidget(m_loginlabel,0,0);
lay3->addWidget(m_passwordlabel,1,0); lay3->addWidget(m_passwordlabel,1,0);

@ -36,8 +36,8 @@ public:
void saveConfig(KConfig*); void saveConfig(KConfig*);
protected: protected:
QLineEdit *m_host, *m_port, *m_login, *m_password; TQLineEdit *m_host, *m_port, *m_login, *m_password;
QCheckBox *m_anonymous, *m_savepwd; TQCheckBox *m_anonymous, *m_savepwd;
}; };
#endif #endif

@ -53,7 +53,7 @@ int KMCupsJobManager::actions()
bool KMCupsJobManager::sendCommandSystemJob(const TQPtrList<KMJob>& jobs, int action, const TQString& argstr) bool KMCupsJobManager::sendCommandSystemJob(const TQPtrList<KMJob>& jobs, int action, const TQString& argstr)
{ {
IppRequest req; IppRequest req;
QString uri; TQString uri;
bool value(true); bool value(true);
TQPtrListIterator<KMJob> it(jobs); TQPtrListIterator<KMJob> it(jobs);
@ -65,7 +65,7 @@ bool KMCupsJobManager::sendCommandSystemJob(const TQPtrList<KMJob>& jobs, int ac
req.addURI(IPP_TAG_OPERATION,"job-uri",it.current()->uri()); req.addURI(IPP_TAG_OPERATION,"job-uri",it.current()->uri());
req.addName(IPP_TAG_OPERATION,"requesting-user-name",CupsInfos::self()->login()); req.addName(IPP_TAG_OPERATION,"requesting-user-name",CupsInfos::self()->login());
/* /*
QString jobHost; TQString jobHost;
if (!it.current()->uri().isEmpty()) if (!it.current()->uri().isEmpty())
{ {
KURL url(it.current()->uri()); KURL url(it.current()->uri());
@ -111,7 +111,7 @@ bool KMCupsJobManager::sendCommandSystemJob(const TQPtrList<KMJob>& jobs, int ac
bool KMCupsJobManager::listJobs(const TQString& prname, KMJobManager::JobType type, int limit) bool KMCupsJobManager::listJobs(const TQString& prname, KMJobManager::JobType type, int limit)
{ {
IppRequest req; IppRequest req;
QStringList keys; TQStringList keys;
CupsInfos *infos = CupsInfos::self(); CupsInfos *infos = CupsInfos::self();
// wanted attributes // wanted attributes
@ -167,10 +167,10 @@ void KMCupsJobManager::parseListAnswer(IppRequest& req, KMPrinter *pr)
{ {
ipp_attribute_t *attr = req.first(); ipp_attribute_t *attr = req.first();
KMJob *job = new KMJob(); KMJob *job = new KMJob();
QString uri; TQString uri;
while (attr) while (attr)
{ {
QString name(attr->name); TQString name(attr->name);
if (name == "job-id") job->setId(attr->values[0].integer); if (name == "job-id") job->setId(attr->values[0].integer);
else if (name == "job-uri") job->setUri(TQString::fromLocal8Bit(attr->values[0].string.text)); else if (name == "job-uri") job->setUri(TQString::fromLocal8Bit(attr->values[0].string.text));
else if (name == "job-name") job->setName(TQString::fromLocal8Bit(attr->values[0].string.text)); else if (name == "job-name") job->setName(TQString::fromLocal8Bit(attr->values[0].string.text));
@ -211,8 +211,8 @@ void KMCupsJobManager::parseListAnswer(IppRequest& req, KMPrinter *pr)
else if (name == "job-media-sheets-completed") job->setProcessedPages(attr->values[0].integer); else if (name == "job-media-sheets-completed") job->setProcessedPages(attr->values[0].integer);
else if (name == "job-printer-uri" && !pr->isRemote()) else if (name == "job-printer-uri" && !pr->isRemote())
{ {
QString str(attr->values[0].string.text); TQString str(attr->values[0].string.text);
int p = str.findRev('/'); int p = str.tqfindRev('/');
if (p != -1) if (p != -1)
job->setPrinter(str.mid(p+1)); job->setPrinter(str.mid(p+1));
} }
@ -326,8 +326,8 @@ bool KMCupsJobManager::changePriority(const TQPtrList<KMJob>& jobs, bool up)
for (; it.current() && result; ++it) for (; it.current() && result; ++it)
{ {
int value = it.current()->attribute(0).toInt(); int value = it.current()->attribute(0).toInt();
if (up) value = QMIN(value+10, 100); if (up) value = TQMIN(value+10, 100);
else value = QMAX(value-10, 1); else value = TQMAX(value-10, 1);
IppRequest req; IppRequest req;
/* /*
@ -351,8 +351,8 @@ bool KMCupsJobManager::changePriority(const TQPtrList<KMJob>& jobs, bool up)
static TQString processRange(const TQString& range) static TQString processRange(const TQString& range)
{ {
QStringList l = TQStringList::split(',', range, false); TQStringList l = TQStringList::split(',', range, false);
QString s; TQString s;
for (TQStringList::ConstIterator it=l.begin(); it!=l.end(); ++it) for (TQStringList::ConstIterator it=l.begin(); it!=l.end(); ++it)
{ {
s.append(*it); s.append(*it);
@ -387,15 +387,15 @@ bool KMCupsJobManager::editJobAttributes(KMJob *j)
TQMap<TQString,TQString> opts = req.toMap(IPP_TAG_JOB); TQMap<TQString,TQString> opts = req.toMap(IPP_TAG_JOB);
// translate the "Copies" option to non-CUPS syntax // translate the "Copies" option to non-CUPS syntax
if (opts.contains("copies")) if (opts.tqcontains("copies"))
opts["kde-copies"] = opts["copies"]; opts["kde-copies"] = opts["copies"];
if (opts.contains("page-set")) if (opts.tqcontains("page-set"))
opts["kde-pageset"] = (opts["page-set"] == "even" ? "2" : (opts["page-set"] == "odd" ? "1" : "0")); opts["kde-pageset"] = (opts["page-set"] == "even" ? "2" : (opts["page-set"] == "odd" ? "1" : "0"));
if (opts.contains("OutputOrder")) if (opts.tqcontains("OutputOrder"))
opts["kde-pageorder"] = opts["OutputOrder"]; opts["kde-pageorder"] = opts["OutputOrder"];
if (opts.contains("multiple-document-handling")) if (opts.tqcontains("multiple-document-handling"))
opts["kde-collate"] = (opts["multiple-document-handling"] == "separate-documents-collated-copies" ? "Collate" : "Uncollate"); opts["kde-collate"] = (opts["multiple-document-handling"] == "separate-documents-collated-copies" ? "Collate" : "Uncollate");
if (opts.contains("page-ranges")) if (opts.tqcontains("page-ranges"))
opts["kde-range"] = opts["page-ranges"]; opts["kde-range"] = opts["page-ranges"];
// find printer and construct dialog // find printer and construct dialog

@ -100,7 +100,7 @@ TQString KMCupsManager::driverDbCreationProgram()
TQString KMCupsManager::driverDirectory() TQString KMCupsManager::driverDirectory()
{ {
QString d = cupsInstallDir(); TQString d = cupsInstallDir();
if (d.isEmpty()) if (d.isEmpty())
d = "/usr"; d = "/usr";
d.append("/share/cups/model"); d.append("/share/cups/model");
@ -113,7 +113,7 @@ TQString KMCupsManager::cupsInstallDir()
{ {
KConfig *conf= KMFactory::self()->printConfig(); KConfig *conf= KMFactory::self()->printConfig();
conf->setGroup("CUPS"); conf->setGroup("CUPS");
QString dir = conf->readPathEntry("InstallDir"); TQString dir = conf->readPathEntry("InstallDir");
return dir; return dir;
} }
@ -126,7 +126,7 @@ bool KMCupsManager::createPrinter(KMPrinter *p)
{ {
bool isclass = p->isClass(false), result(false); bool isclass = p->isClass(false), result(false);
IppRequest req; IppRequest req;
QString uri; TQString uri;
uri = printerURI(p,false); uri = printerURI(p,false);
req.addURI(IPP_TAG_OPERATION,"printer-uri",uri); req.addURI(IPP_TAG_OPERATION,"printer-uri",uri);
@ -136,8 +136,8 @@ bool KMCupsManager::createPrinter(KMPrinter *p)
if (isclass) if (isclass)
{ {
req.setOperation(CUPS_ADD_CLASS); req.setOperation(CUPS_ADD_CLASS);
QStringList members = p->members(), uris; TQStringList members = p->members(), uris;
QString s; TQString s;
s = TQString::fromLocal8Bit("ipp://%1/printers/").arg(CupsInfos::self()->hostaddr()); s = TQString::fromLocal8Bit("ipp://%1/printers/").arg(CupsInfos::self()->hostaddr());
for (TQStringList::ConstIterator it=members.begin(); it!=members.end(); ++it) for (TQStringList::ConstIterator it=members.begin(); it!=members.end(); ++it)
uris.append(s+(*it)); uris.append(s+(*it));
@ -160,7 +160,7 @@ bool KMCupsManager::createPrinter(KMPrinter *p)
} }
if (!p->option("kde-banners").isEmpty()) if (!p->option("kde-banners").isEmpty())
{ {
QStringList bans = TQStringList::split(',',p->option("kde-banners"),false); TQStringList bans = TQStringList::split(',',p->option("kde-banners"),false);
while (bans.count() < 2) while (bans.count() < 2)
bans.append("none"); bans.append("none");
req.addName(IPP_TAG_PRINTER,"job-sheets-default",bans); req.addName(IPP_TAG_PRINTER,"job-sheets-default",bans);
@ -215,7 +215,7 @@ bool KMCupsManager::setDefaultPrinter(KMPrinter *p)
bool KMCupsManager::setPrinterState(KMPrinter *p, int state) bool KMCupsManager::setPrinterState(KMPrinter *p, int state)
{ {
IppRequest req; IppRequest req;
QString uri; TQString uri;
req.setOperation(state); req.setOperation(state);
uri = printerURI(p, true); uri = printerURI(p, true);
@ -231,7 +231,7 @@ bool KMCupsManager::completePrinter(KMPrinter *p)
if (completePrinterShort(p)) if (completePrinterShort(p))
{ {
// driver informations // driver informations
QString ppdname = downloadDriver(p); TQString ppdname = downloadDriver(p);
ppd_file_t *ppd = (ppdname.isEmpty() ? NULL : ppdOpenFile(ppdname.local8Bit())); ppd_file_t *ppd = (ppdname.isEmpty() ? NULL : ppdOpenFile(ppdname.local8Bit()));
if (ppd) if (ppd)
{ {
@ -261,8 +261,8 @@ bool KMCupsManager::completePrinter(KMPrinter *p)
bool KMCupsManager::completePrinterShort(KMPrinter *p) bool KMCupsManager::completePrinterShort(KMPrinter *p)
{ {
IppRequest req; IppRequest req;
QStringList keys; TQStringList keys;
QString uri; TQString uri;
req.setOperation(IPP_GET_PRINTER_ATTRIBUTES); req.setOperation(IPP_GET_PRINTER_ATTRIBUTES);
uri = printerURI(p, true); uri = printerURI(p, true);
@ -328,7 +328,7 @@ bool KMCupsManager::completePrinterShort(KMPrinter *p)
if (req.doRequest("/printers/")) if (req.doRequest("/printers/"))
{ {
QString value; TQString value;
if (req.text("printer-info",value)) p->setDescription(value); if (req.text("printer-info",value)) p->setDescription(value);
// disabled location // disabled location
//if (req.text("printer-location",value)) p->setLocation(value); //if (req.text("printer-location",value)) p->setLocation(value);
@ -341,10 +341,10 @@ bool KMCupsManager::completePrinterShort(KMPrinter *p)
*/ */
p->setDevice( value ); p->setDevice( value );
} }
QStringList values; TQStringList values;
/* if (req.uri("member-uris",values)) /* if (req.uri("member-uris",values))
{ {
QStringList members; TQStringList members;
for (TQStringList::ConstIterator it=values.begin(); it!=values.end(); ++it) for (TQStringList::ConstIterator it=values.begin(); it!=values.end(); ++it)
{ {
int p = (*it).findRev('/'); int p = (*it).findRev('/');
@ -390,7 +390,7 @@ bool KMCupsManager::testPrinter(KMPrinter *p)
{ {
return KMManager::testPrinter(p); return KMManager::testPrinter(p);
/* /*
QString testpage = testPage(); TQString testpage = testPage();
if (testpage.isEmpty()) if (testpage.isEmpty())
{ {
setErrorMsg(i18n("Unable to locate test page.")); setErrorMsg(i18n("Unable to locate test page."));
@ -398,7 +398,7 @@ bool KMCupsManager::testPrinter(KMPrinter *p)
} }
IppRequest req; IppRequest req;
QString uri; TQString uri;
req.setOperation(IPP_PRINT_JOB); req.setOperation(IPP_PRINT_JOB);
uri = printerURI(p); uri = printerURI(p);
@ -421,7 +421,7 @@ void KMCupsManager::listPrinters()
void KMCupsManager::loadServerPrinters() void KMCupsManager::loadServerPrinters()
{ {
IppRequest req; IppRequest req;
QStringList keys; TQStringList keys;
// get printers // get printers
req.setOperation(CUPS_GET_PRINTERS); req.setOperation(CUPS_GET_PRINTERS);
@ -456,7 +456,7 @@ void KMCupsManager::loadServerPrinters()
req.addKeyword(IPP_TAG_OPERATION,"requested-attributes",TQString::tqfromLatin1("printer-name")); req.addKeyword(IPP_TAG_OPERATION,"requested-attributes",TQString::tqfromLatin1("printer-name"));
if (req.doRequest("/printers/")) if (req.doRequest("/printers/"))
{ {
QString s = TQString::null; TQString s = TQString::null;
req.name("printer-name",s); req.name("printer-name",s);
setHardDefault(findPrinter(s)); setHardDefault(findPrinter(s));
} }
@ -479,10 +479,10 @@ void KMCupsManager::processRequest(IppRequest* req)
KMPrinter *printer = new KMPrinter(); KMPrinter *printer = new KMPrinter();
while (attr) while (attr)
{ {
QString attrname(attr->name); TQString attrname(attr->name);
if (attrname == "printer-name") if (attrname == "printer-name")
{ {
QString value = TQString::fromLocal8Bit(attr->values[0].string.text); TQString value = TQString::fromLocal8Bit(attr->values[0].string.text);
printer->setName(value); printer->setName(value);
printer->setPrinterName(value); printer->setPrinterName(value);
} }
@ -550,7 +550,7 @@ DrMain* KMCupsManager::loadPrinterDriver(KMPrinter *p, bool)
} }
} }
QString fname = downloadDriver(p); TQString fname = downloadDriver(p);
DrMain *driver(0); DrMain *driver(0);
if (!fname.isEmpty()) if (!fname.isEmpty())
{ {
@ -574,10 +574,10 @@ DrMain* KMCupsManager::loadFileDriver(const TQString& filename)
DrMain* KMCupsManager::loadMaticDriver(const TQString& drname) DrMain* KMCupsManager::loadMaticDriver(const TQString& drname)
{ {
QStringList comps = TQStringList::split('/', drname, false); TQStringList comps = TQStringList::split('/', drname, false);
QString tmpFile = locateLocal("tmp", "foomatic_" + kapp->randomString(8)); TQString tmpFile = locateLocal("tmp", "foomatic_" + kapp->randomString(8));
QString PATH = getenv("PATH") + TQString::tqfromLatin1(":/usr/sbin:/usr/local/sbin:/opt/sbin:/opt/local/sbin"); TQString PATH = getenv("PATH") + TQString::tqfromLatin1(":/usr/sbin:/usr/local/sbin:/opt/sbin:/opt/local/sbin");
QString exe = KStandardDirs::findExe("foomatic-datafile", PATH); TQString exe = KStandardDirs::findExe("foomatic-datafile", PATH);
if (exe.isEmpty()) if (exe.isEmpty())
{ {
setErrorMsg(i18n("Unable to find the executable foomatic-datafile " setErrorMsg(i18n("Unable to find the executable foomatic-datafile "
@ -586,7 +586,7 @@ DrMain* KMCupsManager::loadMaticDriver(const TQString& drname)
} }
KPipeProcess in; KPipeProcess in;
QFile out(tmpFile); TQFile out(tmpFile);
TQString cmd = KProcess::quote(exe); TQString cmd = KProcess::quote(exe);
cmd += " -t cups -d "; cmd += " -t cups -d ";
cmd += KProcess::quote(comps[2]); cmd += KProcess::quote(comps[2]);
@ -594,8 +594,8 @@ DrMain* KMCupsManager::loadMaticDriver(const TQString& drname)
cmd += KProcess::quote(comps[1]); cmd += KProcess::quote(comps[1]);
if (in.open(cmd) && out.open(IO_WriteOnly)) if (in.open(cmd) && out.open(IO_WriteOnly))
{ {
QTextStream tin(&in), tout(&out); TQTextStream tin(&in), tout(&out);
QString line; TQString line;
while (!tin.atEnd()) while (!tin.atEnd())
{ {
line = tin.readLine(); line = tin.readLine();
@ -641,11 +641,11 @@ void KMCupsManager::saveDriverFile(DrMain *driver, const TQString& filename)
{ {
kdDebug( 500 ) << "Saving PPD file with template=" << driver->get( "template" ) << endl; kdDebug( 500 ) << "Saving PPD file with template=" << driver->get( "template" ) << endl;
TQIODevice *in = KFilterDev::deviceForFile( driver->get( "template" ) ); TQIODevice *in = KFilterDev::deviceForFile( driver->get( "template" ) );
QFile out(filename); TQFile out(filename);
if (in && in->open(IO_ReadOnly) && out.open(IO_WriteOnly)) if (in && in->open(IO_ReadOnly) && out.open(IO_WriteOnly))
{ {
QTextStream tin(in), tout(&out); TQTextStream tin(in), tout(&out);
QString line, keyword; TQString line, keyword;
bool isnumeric(false); bool isnumeric(false);
DrBase *opt(0); DrBase *opt(0);
@ -676,7 +676,7 @@ void KMCupsManager::saveDriverFile(DrMain *driver, const TQString& filename)
}*/ }*/
else if ((p=line.tqfind("'default'")) != -1 && !keyword.isEmpty() && opt && isnumeric) else if ((p=line.tqfind("'default'")) != -1 && !keyword.isEmpty() && opt && isnumeric)
{ {
QString prefix = line.left(p+9); TQString prefix = line.left(p+9);
tout << prefix << " => '" << opt->valueText() << '\''; tout << prefix << " => '" << opt->valueText() << '\'';
if (line.tqfind(',',p) != -1) if (line.tqfind(',',p) != -1)
tout << ','; tout << ',';
@ -735,14 +735,14 @@ void KMCupsManager::saveDriverFile(DrMain *driver, const TQString& filename)
bool KMCupsManager::savePrinterDriver(KMPrinter *p, DrMain *d) bool KMCupsManager::savePrinterDriver(KMPrinter *p, DrMain *d)
{ {
QString tmpfilename = locateLocal("tmp","print_") + kapp->randomString(8); TQString tmpfilename = locateLocal("tmp","print_") + kapp->randomString(8);
// first save the driver in a temporary file // first save the driver in a temporary file
saveDriverFile(d,tmpfilename); saveDriverFile(d,tmpfilename);
// then send a request // then send a request
IppRequest req; IppRequest req;
QString uri; TQString uri;
bool result(false); bool result(false);
req.setOperation(CUPS_ADD_PRINTER); req.setOperation(CUPS_ADD_PRINTER);
@ -786,7 +786,7 @@ void KMCupsManager::unloadCupsdConf()
bool KMCupsManager::restartServer() bool KMCupsManager::restartServer()
{ {
QString msg; TQString msg;
bool (*f1)(TQString&) = (bool(*)(TQString&))loadCupsdConfFunction("restartServer"); bool (*f1)(TQString&) = (bool(*)(TQString&))loadCupsdConfFunction("restartServer");
bool result(false); bool result(false);
if (f1) if (f1)
@ -815,16 +815,16 @@ bool KMCupsManager::configureServer(TQWidget *parent)
TQStringList KMCupsManager::detectLocalPrinters() TQStringList KMCupsManager::detectLocalPrinters()
{ {
QStringList list; TQStringList list;
IppRequest req; IppRequest req;
req.setOperation(CUPS_GET_DEVICES); req.setOperation(CUPS_GET_DEVICES);
if (req.doRequest("/")) if (req.doRequest("/"))
{ {
QString desc, uri, printer, cl; TQString desc, uri, printer, cl;
ipp_attribute_t *attr = req.first(); ipp_attribute_t *attr = req.first();
while (attr) while (attr)
{ {
QString attrname(attr->name); TQString attrname(attr->name);
if (attrname == "device-info") desc = attr->values[0].string.text; if (attrname == "device-info") desc = attr->values[0].string.text;
else if (attrname == "device-make-and-model") printer = attr->values[0].string.text; else if (attrname == "device-make-and-model") printer = attr->values[0].string.text;
else if (attrname == "device-uri") uri = attr->values[0].string.text; else if (attrname == "device-uri") uri = attr->values[0].string.text;
@ -865,7 +865,7 @@ void KMCupsManager::exportDriver()
if (m_currentprinter && m_currentprinter->isLocal() && if (m_currentprinter && m_currentprinter->isLocal() &&
!m_currentprinter->isClass(true) && !m_currentprinter->isSpecial()) !m_currentprinter->isClass(true) && !m_currentprinter->isSpecial())
{ {
QString path = cupsInstallDir(); TQString path = cupsInstallDir();
if (path.isEmpty()) if (path.isEmpty())
path = "/usr/share/cups"; path = "/usr/share/cups";
else else
@ -879,7 +879,7 @@ void KMCupsManager::printerIppReport()
if (m_currentprinter && !m_currentprinter->isSpecial()) if (m_currentprinter && !m_currentprinter->isSpecial())
{ {
IppRequest req; IppRequest req;
QString uri; TQString uri;
req.setOperation(IPP_GET_PRINTER_ATTRIBUTES); req.setOperation(IPP_GET_PRINTER_ATTRIBUTES);
uri = printerURI(m_currentprinter, true); uri = printerURI(m_currentprinter, true);
@ -913,7 +913,7 @@ TQString KMCupsManager::stateInformation()
return TQString("%1: %2") return TQString("%1: %2")
.arg(i18n("Server")) .arg(i18n("Server"))
.arg(CupsInfos::self()->host()[0] != '/' ? .arg(CupsInfos::self()->host()[0] != '/' ?
TQString("%1:%2").arg(CupsInfos::self()->host()).arg(CupsInfos::self()->port()) TQString(TQString("%1:%2").arg(CupsInfos::self()->host()).arg(CupsInfos::self()->port()))
: CupsInfos::self()->host()); : CupsInfos::self()->host());
} }
@ -1016,11 +1016,11 @@ void KMCupsManager::hostPingFailedSlot() {
static void extractMaticData(TQString& buf, const TQString& filename) static void extractMaticData(TQString& buf, const TQString& filename)
{ {
QFile f(filename); TQFile f(filename);
if (f.exists() && f.open(IO_ReadOnly)) if (f.exists() && f.open(IO_ReadOnly))
{ {
QTextStream t(&f); TQTextStream t(&f);
QString line; TQString line;
while (!t.eof()) while (!t.eof())
{ {
line = t.readLine(); line = t.readLine();
@ -1032,7 +1032,7 @@ static void extractMaticData(TQString& buf, const TQString& filename)
static TQString printerURI(KMPrinter *p, bool use) static TQString printerURI(KMPrinter *p, bool use)
{ {
QString uri; TQString uri;
if (use && !p->uri().isEmpty()) if (use && !p->uri().isEmpty())
uri = p->uri().prettyURL(); uri = p->uri().prettyURL();
else else
@ -1042,7 +1042,7 @@ static TQString printerURI(KMPrinter *p, bool use)
static TQString downloadDriver(KMPrinter *p) static TQString downloadDriver(KMPrinter *p)
{ {
QString driverfile, prname = p->printerName(); TQString driverfile, prname = p->printerName();
bool changed(false); bool changed(false);
/* /*

@ -32,13 +32,13 @@ KMPropBanners::KMPropBanners(TQWidget *parent, const char *name)
m_startbanner = new TQLabel(this); m_startbanner = new TQLabel(this);
m_stopbanner = new TQLabel(this); m_stopbanner = new TQLabel(this);
QLabel *l1 = new TQLabel(i18n("&Starting banner:"), this); TQLabel *l1 = new TQLabel(i18n("&Starting banner:"), this);
QLabel *l2 = new TQLabel(i18n("&Ending banner:"), this); TQLabel *l2 = new TQLabel(i18n("&Ending banner:"), this);
l1->setBuddy(m_startbanner); l1->setBuddy(m_startbanner);
l2->setBuddy(m_stopbanner); l2->setBuddy(m_stopbanner);
QGridLayout *main_ = new TQGridLayout(this, 3, 2, 10, 10); TQGridLayout *main_ = new TQGridLayout(this, 3, 2, 10, 10);
main_->setColStretch(1,1); main_->setColStretch(1,1);
main_->setRowStretch(2,1); main_->setRowStretch(2,1);
main_->addWidget(l1,0,0); main_->addWidget(l1,0,0);
@ -59,7 +59,7 @@ void KMPropBanners::setPrinter(KMPrinter *p)
{ {
if (p && p->isPrinter()) if (p && p->isPrinter())
{ {
QStringList l = TQStringList::split(',',p->option("kde-banners"),false); TQStringList l = TQStringList::split(',',p->option("kde-banners"),false);
while ( l.count() < 2 ) while ( l.count() < 2 )
l.append( "none" ); l.append( "none" );
m_startbanner->setText(i18n(mapBanner(l[0]).utf8())); m_startbanner->setText(i18n(mapBanner(l[0]).utf8()));

@ -36,8 +36,8 @@ protected:
void configureWizard(KMWizard*); void configureWizard(KMWizard*);
private: private:
QLabel *m_startbanner; TQLabel *m_startbanner;
QLabel *m_stopbanner; TQLabel *m_stopbanner;
}; };
#endif #endif

@ -36,15 +36,15 @@ KMPropQuota::KMPropQuota(TQWidget *parent, const char *name)
m_sizelimit = new TQLabel(this); m_sizelimit = new TQLabel(this);
m_pagelimit = new TQLabel(this); m_pagelimit = new TQLabel(this);
QLabel *l1 = new TQLabel(i18n("&Period:"), this); TQLabel *l1 = new TQLabel(i18n("&Period:"), this);
QLabel *l2 = new TQLabel(i18n("&Size limit (KB):"), this); TQLabel *l2 = new TQLabel(i18n("&Size limit (KB):"), this);
QLabel *l3 = new TQLabel(i18n("&Page limit:"), this); TQLabel *l3 = new TQLabel(i18n("&Page limit:"), this);
l1->setBuddy(m_period); l1->setBuddy(m_period);
l2->setBuddy(m_sizelimit); l2->setBuddy(m_sizelimit);
l3->setBuddy(m_pagelimit); l3->setBuddy(m_pagelimit);
QGridLayout *main_ = new TQGridLayout(this, 4, 2, 10, 10); TQGridLayout *main_ = new TQGridLayout(this, 4, 2, 10, 10);
main_->setColStretch(1,1); main_->setColStretch(1,1);
main_->setRowStretch(3,1); main_->setRowStretch(3,1);
main_->addWidget(l1,0,0); main_->addWidget(l1,0,0);

@ -36,9 +36,9 @@ protected:
void configureWizard(KMWizard*); void configureWizard(KMWizard*);
private: private:
QLabel *m_period; TQLabel *m_period;
QLabel *m_sizelimit; TQLabel *m_sizelimit;
QLabel *m_pagelimit; TQLabel *m_pagelimit;
}; };
#endif #endif

@ -32,7 +32,7 @@ KMPropUsers::KMPropUsers(TQWidget *parent, const char *name)
m_text->setPaper(tqcolorGroup().background()); m_text->setPaper(tqcolorGroup().background());
m_text->setFrameStyle(TQFrame::NoFrame); m_text->setFrameStyle(TQFrame::NoFrame);
QVBoxLayout *l0 = new TQVBoxLayout(this, 10, 0); TQVBoxLayout *l0 = new TQVBoxLayout(this, 10, 0);
l0->addWidget(m_text, 1); l0->addWidget(m_text, 1);
m_title = i18n("Users"); m_title = i18n("Users");
@ -48,8 +48,8 @@ void KMPropUsers::setPrinter(KMPrinter *p)
{ {
if (p && p->isPrinter()) if (p && p->isPrinter())
{ {
QString txt("<p>%1:<ul>%1</ul></p>"); TQString txt("<p>%1:<ul>%1</ul></p>");
QStringList users; TQStringList users;
if (!p->option("requesting-user-name-denied").isEmpty()) if (!p->option("requesting-user-name-denied").isEmpty())
{ {
txt = txt.arg(i18n("Denied users")); txt = txt.arg(i18n("Denied users"));
@ -66,7 +66,7 @@ void KMPropUsers::setPrinter(KMPrinter *p)
} }
if (users.count() > 0) if (users.count() > 0)
{ {
QString s; TQString s;
for (TQStringList::ConstIterator it=users.begin(); it!=users.end(); ++it) for (TQStringList::ConstIterator it=users.begin(); it!=users.end(); ++it)
s.append("<li>").append(*it).append("</li>"); s.append("<li>").append(*it).append("</li>");
txt = txt.arg(s); txt = txt.arg(s);

@ -36,7 +36,7 @@ protected:
void configureWizard(KMWizard*); void configureWizard(KMWizard*);
private: private:
QTextView *m_text; TQTextView *m_text;
}; };
#endif #endif

@ -31,7 +31,7 @@
TQStringList defaultBanners() TQStringList defaultBanners()
{ {
QStringList bans; TQStringList bans;
TQPtrList<KMPrinter> *list = KMFactory::self()->manager()->printerList(false); TQPtrList<KMPrinter> *list = KMFactory::self()->manager()->printerList(false);
if (list && list->count() > 0) if (list && list->count() > 0)
{ {
@ -39,7 +39,7 @@ TQStringList defaultBanners()
for (;it.current() && !it.current()->isPrinter(); ++it) ; for (;it.current() && !it.current()->isPrinter(); ++it) ;
if (it.current() && KMFactory::self()->manager()->completePrinter(it.current())) if (it.current() && KMFactory::self()->manager()->completePrinter(it.current()))
{ {
QString s = list->getFirst()->option("kde-banners-supported"); TQString s = list->getFirst()->option("kde-banners-supported");
bans = TQStringList::split(',',s,false); bans = TQStringList::split(',',s,false);
} }
} }
@ -89,18 +89,18 @@ KMWBanners::KMWBanners(TQWidget *parent, const char *name)
m_start = new TQComboBox(this); m_start = new TQComboBox(this);
m_end = new TQComboBox(this); m_end = new TQComboBox(this);
QLabel *l1 = new TQLabel(i18n("&Starting banner:"),this); TQLabel *l1 = new TQLabel(i18n("&Starting banner:"),this);
QLabel *l2 = new TQLabel(i18n("&Ending banner:"),this); TQLabel *l2 = new TQLabel(i18n("&Ending banner:"),this);
l1->setBuddy(m_start); l1->setBuddy(m_start);
l2->setBuddy(m_end); l2->setBuddy(m_end);
QLabel *l0 = new TQLabel(this); TQLabel *l0 = new TQLabel(this);
l0->setText(i18n("<p>Select the default banners associated with this printer. These " l0->setText(i18n("<p>Select the default banners associated with this printer. These "
"banners will be inserted before and/or after each print job sent " "banners will be inserted before and/or after each print job sent "
"to the printer. If you don't want to use banners, select <b>No Banner</b>.</p>")); "to the printer. If you don't want to use banners, select <b>No Banner</b>.</p>"));
QGridLayout *lay = new TQGridLayout(this, 5, 2, 0, 10); TQGridLayout *lay = new TQGridLayout(this, 5, 2, 0, 10);
lay->setColStretch(1,1); lay->setColStretch(1,1);
lay->addRowSpacing(1,20); lay->addRowSpacing(1,20);
lay->setRowStretch(4,1); lay->setRowStretch(4,1);
@ -128,11 +128,11 @@ void KMWBanners::initPrinter(KMPrinter *p)
m_end->insertItem( i18n( mapBanner(*it).utf8() ) ); m_end->insertItem( i18n( mapBanner(*it).utf8() ) );
} }
} }
QStringList l = TQStringList::split(',',p->option("kde-banners"),false); TQStringList l = TQStringList::split(',',p->option("kde-banners"),false);
while (l.count() < 2) while (l.count() < 2)
l.append("none"); l.append("none");
m_start->setCurrentItem(m_bans.findIndex(l[0])); m_start->setCurrentItem(m_bans.tqfindIndex(l[0]));
m_end->setCurrentItem(m_bans.findIndex(l[1])); m_end->setCurrentItem(m_bans.tqfindIndex(l[1]));
} }
} }

@ -34,8 +34,8 @@ public:
void updatePrinter(KMPrinter*); void updatePrinter(KMPrinter*);
private: private:
QComboBox *m_start, *m_end; TQComboBox *m_start, *m_end;
QStringList m_bans; TQStringList m_bans;
}; };
TQString mapBanner( const TQString& ); TQString mapBanner( const TQString& );

@ -37,18 +37,18 @@ KMWFax::KMWFax(TQWidget *parent, const char *name)
m_title = i18n("Fax Serial Device"); m_title = i18n("Fax Serial Device");
m_nextpage = KMWizard::Driver; m_nextpage = KMWizard::Driver;
QLabel *lab = new TQLabel(this); TQLabel *lab = new TQLabel(this);
lab->setText(i18n("<p>Select the device which your serial Fax/Modem is connected to.</p>")); lab->setText(i18n("<p>Select the device which your serial Fax/Modem is connected to.</p>"));
m_list = new KListBox(this); m_list = new KListBox(this);
QVBoxLayout *l1 = new TQVBoxLayout(this,0,10); TQVBoxLayout *l1 = new TQVBoxLayout(this,0,10);
l1->addWidget(lab,0); l1->addWidget(lab,0);
l1->addWidget(m_list,1); l1->addWidget(m_list,1);
// initialize // initialize
IppRequest req; IppRequest req;
req.setOperation(CUPS_GET_DEVICES); req.setOperation(CUPS_GET_DEVICES);
QString uri = TQString::tqfromLatin1("ipp://%1/printers/").arg(CupsInfos::self()->hostaddr()); TQString uri = TQString::tqfromLatin1("ipp://%1/printers/").arg(CupsInfos::self()->hostaddr());
req.addURI(IPP_TAG_OPERATION,"printer-uri",uri); req.addURI(IPP_TAG_OPERATION,"printer-uri",uri);
if (req.doRequest("/")) if (req.doRequest("/"))
{ {
@ -76,6 +76,6 @@ bool KMWFax::isValid(TQString& msg)
void KMWFax::updatePrinter(KMPrinter *printer) void KMWFax::updatePrinter(KMPrinter *printer)
{ {
QString uri = m_list->currentText(); TQString uri = m_list->currentText();
printer->setDevice(uri); printer->setDevice(uri);
} }

@ -34,7 +34,7 @@ KMWIpp::KMWIpp(TQWidget *parent, const char *name)
m_ID = KMWizard::IPP; m_ID = KMWizard::IPP;
m_title = i18n("Remote IPP server"); m_title = i18n("Remote IPP server");
m_nextpage = KMWizard::IPPSelect; m_nextpage = KMWizard::IPPSelect;
lineEdit( 1 )->setValidator( new TQIntValidator( this ) ); lineEdit( 1 )->setValidator( new TQIntValidator( TQT_TQOBJECT(this) ) );
setInfo(i18n("<p>Enter the information concerning the remote IPP server " setInfo(i18n("<p>Enter the information concerning the remote IPP server "
"owning the targeted printer. This wizard will poll the server " "owning the targeted printer. This wizard will poll the server "

@ -52,7 +52,7 @@ KMWIppPrinter::KMWIppPrinter(TQWidget *parent, const char *name)
m_list->setFrameStyle(TQFrame::WinPanel|TQFrame::Sunken); m_list->setFrameStyle(TQFrame::WinPanel|TQFrame::Sunken);
m_list->setLineWidth(1); m_list->setLineWidth(1);
QLabel *l1 = new TQLabel(i18n("&Printer URI:"),this); TQLabel *l1 = new TQLabel(i18n("&Printer URI:"),this);
m_uri = new TQLineEdit(this); m_uri = new TQLineEdit(this);
@ -78,9 +78,9 @@ KMWIppPrinter::KMWIppPrinter(TQWidget *parent, const char *name)
connect(m_ippreport, TQT_SIGNAL(clicked()), TQT_SLOT(slotIppReport())); connect(m_ippreport, TQT_SIGNAL(clicked()), TQT_SLOT(slotIppReport()));
// layout // layout
QHBoxLayout *lay3 = new TQHBoxLayout(this, 0, 10); TQHBoxLayout *lay3 = new TQHBoxLayout(this, 0, 10);
QVBoxLayout *lay2 = new TQVBoxLayout(0, 0, 0); TQVBoxLayout *lay2 = new TQVBoxLayout(0, 0, 0);
QHBoxLayout *lay4 = new TQHBoxLayout(0, 0, 0); TQHBoxLayout *lay4 = new TQHBoxLayout(0, 0, 0);
lay3->addWidget(m_list,1); lay3->addWidget(m_list,1);
lay3->addLayout(lay2,1); lay3->addLayout(lay2,1);
@ -134,12 +134,12 @@ void KMWIppPrinter::slotScanFinished()
TQPtrListIterator<NetworkScanner::SocketInfo> it(*list); TQPtrListIterator<NetworkScanner::SocketInfo> it(*list);
for (;it.current();++it) for (;it.current();++it)
{ {
QString name; TQString name;
if (it.current()->Name.isEmpty()) if (it.current()->Name.isEmpty())
name = i18n("Unknown host - 1 is the IP", "<Unknown> (%1)").arg(it.current()->IP); name = i18n("Unknown host - 1 is the IP", "<Unknown> (%1)").arg(it.current()->IP);
else else
name = it.current()->Name; name = it.current()->Name;
QListViewItem *item = new TQListViewItem(m_list,name,it.current()->IP,TQString::number(it.current()->Port)); TQListViewItem *item = new TQListViewItem(m_list,name,it.current()->IP,TQString::number(it.current()->Port));
item->setPixmap(0,SmallIcon("kdeprint_printer")); item->setPixmap(0,SmallIcon("kdeprint_printer"));
} }
} }
@ -151,8 +151,8 @@ void KMWIppPrinter::slotPrinterSelected(TQListViewItem *item)
// trying to get printer attributes // trying to get printer attributes
IppRequest req; IppRequest req;
QString uri; TQString uri;
QStringList keys; TQStringList keys;
req.setOperation(IPP_GET_PRINTER_ATTRIBUTES); req.setOperation(IPP_GET_PRINTER_ATTRIBUTES);
req.setHost(item->text(1)); req.setHost(item->text(1));
@ -168,7 +168,7 @@ void KMWIppPrinter::slotPrinterSelected(TQListViewItem *item)
req.addKeyword(IPP_TAG_OPERATION,"requested-attributes",keys); req.addKeyword(IPP_TAG_OPERATION,"requested-attributes",keys);
if (req.doRequest("/ipp/") && (req.status() == IPP_OK || req.status() == IPP_OK_SUBST || req.status() == IPP_OK_CONFLICT)) if (req.doRequest("/ipp/") && (req.status() == IPP_OK || req.status() == IPP_OK_SUBST || req.status() == IPP_OK_CONFLICT))
{ {
QString value, txt; TQString value, txt;
int state; int state;
if (req.name("printer-name",value)) txt.append(i18n("<b>Name</b>: %1<br>").arg(value)); if (req.name("printer-name",value)) txt.append(i18n("<b>Name</b>: %1<br>").arg(value));
if (req.text("printer-location",value) && !value.isEmpty()) txt.append(i18n("<b>Location</b>: %1<br>").arg(value)); if (req.text("printer-location",value) && !value.isEmpty()) txt.append(i18n("<b>Location</b>: %1<br>").arg(value));
@ -203,8 +203,8 @@ void KMWIppPrinter::slotPrinterSelected(TQListViewItem *item)
void KMWIppPrinter::slotIppReport() void KMWIppPrinter::slotIppReport()
{ {
IppRequest req; IppRequest req;
QString uri("ipp://%1:%2/ipp"); TQString uri("ipp://%1:%2/ipp");
QListViewItem *item = m_list->currentItem(); TQListViewItem *item = m_list->currentItem();
if (item) if (item)
{ {
@ -215,7 +215,7 @@ void KMWIppPrinter::slotIppReport()
req.addURI(IPP_TAG_OPERATION, "printer-uri", uri); req.addURI(IPP_TAG_OPERATION, "printer-uri", uri);
if (req.doRequest("/ipp/")) if (req.doRequest("/ipp/"))
{ {
QString caption = i18n("IPP Report for %1").arg(item->text(0)); TQString caption = i18n("IPP Report for %1").arg(item->text(0));
static_cast<KMCupsManager*>(KMManager::self())->ippReport(req, IPP_TAG_PRINTER, caption); static_cast<KMCupsManager*>(KMManager::self())->ippReport(req, IPP_TAG_PRINTER, caption);
} }
else else

@ -48,9 +48,9 @@ protected slots:
private: private:
KListView *m_list; KListView *m_list;
NetworkScanner *m_scanner; NetworkScanner *m_scanner;
QLineEdit *m_uri; TQLineEdit *m_uri;
QTextView *m_info; TQTextView *m_info;
QPushButton *m_ippreport; TQPushButton *m_ippreport;
}; };
#endif #endif

@ -38,7 +38,7 @@ KMWIppSelect::KMWIppSelect(TQWidget *parent, const char *name)
m_list = new KListBox(this); m_list = new KListBox(this);
QVBoxLayout *lay = new TQVBoxLayout(this, 0, 0); TQVBoxLayout *lay = new TQVBoxLayout(this, 0, 0);
lay->addWidget(m_list); lay->addWidget(m_list);
} }
@ -55,7 +55,7 @@ bool KMWIppSelect::isValid(TQString& msg)
void KMWIppSelect::initPrinter(KMPrinter *p) void KMWIppSelect::initPrinter(KMPrinter *p)
{ {
// storage variables // storage variables
QString host, login, password; TQString host, login, password;
int port; int port;
// save config // save config
@ -73,7 +73,7 @@ void KMWIppSelect::initPrinter(KMPrinter *p)
CupsInfos::self()->setPassword(url.pass()); CupsInfos::self()->setPassword(url.pass());
CupsInfos::self()->setPort(url.port()); CupsInfos::self()->setPort(url.port());
IppRequest req; IppRequest req;
QString uri; TQString uri;
req.setOperation(CUPS_GET_PRINTERS); req.setOperation(CUPS_GET_PRINTERS);
uri = TQString::tqfromLatin1("ipp://%1/printers/").arg(CupsInfos::self()->hostaddr()); uri = TQString::tqfromLatin1("ipp://%1/printers/").arg(CupsInfos::self()->hostaddr());
req.addURI(IPP_TAG_OPERATION,"printer-uri",uri); req.addURI(IPP_TAG_OPERATION,"printer-uri",uri);
@ -100,7 +100,7 @@ void KMWIppSelect::initPrinter(KMPrinter *p)
void KMWIppSelect::updatePrinter(KMPrinter *p) void KMWIppSelect::updatePrinter(KMPrinter *p)
{ {
KURL url = p->device(); KURL url = p->device();
QString path = m_list->currentText(); TQString path = m_list->currentText();
path.prepend("/printers/"); path.prepend("/printers/");
url.setPath(path); url.setPath(path);
p->setDevice(url.url()); p->setDevice(url.url());

@ -42,21 +42,21 @@ KMWOther::KMWOther(TQWidget *parent, const char *name)
m_nextpage = KMWizard::Driver; m_nextpage = KMWizard::Driver;
m_uri = new TQLineEdit(this); m_uri = new TQLineEdit(this);
QLabel *l1 = new TQLabel(this); TQLabel *l1 = new TQLabel(this);
l1->setText(i18n("<p>Enter the URI corresponding to the printer to be installed. " l1->setText(i18n("<p>Enter the URI corresponding to the printer to be installed. "
"Examples:</p><ul>" "Examples:</p><ul>"
"<li>smb://[login[:passwd]@]server/printer</li>" "<li>smb://[login[:passwd]@]server/printer</li>"
"<li>lpd://server/queue</li>" "<li>lpd://server/queue</li>"
"<li>parallel:/dev/lp0</li></ul>")); "<li>parallel:/dev/lp0</li></ul>"));
QLabel *l2 = new TQLabel(i18n("URI:"), this); TQLabel *l2 = new TQLabel(i18n("URI:"), this);
m_uriview = new KListView( this ); m_uriview = new KListView( this );
m_uriview->addColumn( "" ); m_uriview->addColumn( "" );
m_uriview->header()->hide(); m_uriview->header()->hide();
m_uriview->setSorting( -1 ); m_uriview->setSorting( -1 );
connect( m_uriview, TQT_SIGNAL( pressed( TQListViewItem* ) ), TQT_SLOT( slotPressed( TQListViewItem* ) ) ); connect( m_uriview, TQT_SIGNAL( pressed( TQListViewItem* ) ), TQT_SLOT( slotPressed( TQListViewItem* ) ) );
QVBoxLayout *lay1 = new TQVBoxLayout(this, 0, 15); TQVBoxLayout *lay1 = new TQVBoxLayout(this, 0, 15);
QVBoxLayout *lay2 = new TQVBoxLayout(0, 0, 5); TQVBoxLayout *lay2 = new TQVBoxLayout(0, 0, 5);
lay1->addWidget(l1); lay1->addWidget(l1);
lay1->addLayout(lay2); lay1->addLayout(lay2);
lay1->addWidget( m_uriview ); lay1->addWidget( m_uriview );

@ -39,7 +39,7 @@ protected slots:
void slotPressed( TQListViewItem* ); void slotPressed( TQListViewItem* );
private: private:
QLineEdit *m_uri; TQLineEdit *m_uri;
KListView *m_uriview; KListView *m_uriview;
}; };

@ -93,20 +93,20 @@ KMWQuota::KMWQuota(TQWidget *parent, const char *name)
m_timeunit->insertItem(i18n(time_keywords[i])); m_timeunit->insertItem(i18n(time_keywords[i]));
m_timeunit->setCurrentItem(3); m_timeunit->setCurrentItem(3);
QLabel *lab1 = new TQLabel(i18n("&Period:"), this); TQLabel *lab1 = new TQLabel(i18n("&Period:"), this);
QLabel *lab2 = new TQLabel(i18n("&Size limit (KB):"), this); TQLabel *lab2 = new TQLabel(i18n("&Size limit (KB):"), this);
QLabel *lab3 = new TQLabel(i18n("&Page limit:"), this); TQLabel *lab3 = new TQLabel(i18n("&Page limit:"), this);
lab1->setBuddy(m_period); lab1->setBuddy(m_period);
lab2->setBuddy(m_sizelimit); lab2->setBuddy(m_sizelimit);
lab3->setBuddy(m_pagelimit); lab3->setBuddy(m_pagelimit);
QLabel *lab4 = new TQLabel(i18n("<p>Set here the quota for this printer. Using limits of <b>0</b> means " TQLabel *lab4 = new TQLabel(i18n("<p>Set here the quota for this printer. Using limits of <b>0</b> means "
"that no quota will be used. This is equivalent to set quota period to " "that no quota will be used. This is equivalent to set quota period to "
"<b><nobr>No quota</nobr></b> (-1). Quota limits are defined on a per-user base and " "<b><nobr>No quota</nobr></b> (-1). Quota limits are defined on a per-user base and "
"applied to all users.</p>"), this); "applied to all users.</p>"), this);
QGridLayout *l0 = new TQGridLayout(this, 5, 3, 0, 10); TQGridLayout *l0 = new TQGridLayout(this, 5, 3, 0, 10);
l0->setRowStretch(4, 1); l0->setRowStretch(4, 1);
l0->setColStretch(1, 1); l0->setColStretch(1, 1);
l0->addMultiCellWidget(lab4, 0, 0, 0, 2); l0->addMultiCellWidget(lab4, 0, 0, 0, 2);

@ -37,10 +37,10 @@ public:
void updatePrinter(KMPrinter*); void updatePrinter(KMPrinter*);
private: private:
QSpinBox *m_period; TQSpinBox *m_period;
QSpinBox *m_sizelimit; TQSpinBox *m_sizelimit;
QSpinBox *m_pagelimit; TQSpinBox *m_pagelimit;
QComboBox *m_timeunit; TQComboBox *m_timeunit;
}; };
#endif #endif

@ -41,13 +41,13 @@ KMWUsers::KMWUsers(TQWidget *parent, const char *name)
m_type->insertItem(i18n("Allowed Users")); m_type->insertItem(i18n("Allowed Users"));
m_type->insertItem(i18n("Denied Users")); m_type->insertItem(i18n("Denied Users"));
QLabel *lab1 = new TQLabel(i18n("Define here a group of allowed/denied users for this printer."), this); TQLabel *lab1 = new TQLabel(i18n("Define here a group of allowed/denied users for this printer."), this);
QLabel *lab2 = new TQLabel(i18n("&Type:"), this); TQLabel *lab2 = new TQLabel(i18n("&Type:"), this);
lab2->setBuddy(m_type); lab2->setBuddy(m_type);
QVBoxLayout *l0 = new TQVBoxLayout(this, 0, 10); TQVBoxLayout *l0 = new TQVBoxLayout(this, 0, 10);
QHBoxLayout *l1 = new TQHBoxLayout(0, 0, 10); TQHBoxLayout *l1 = new TQHBoxLayout(0, 0, 10);
l0->addWidget(lab1, 0); l0->addWidget(lab1, 0);
l0->addLayout(l1, 0); l0->addLayout(l1, 0);
l1->addWidget(lab2, 0); l1->addWidget(lab2, 0);
@ -61,7 +61,7 @@ KMWUsers::~KMWUsers()
void KMWUsers::initPrinter(KMPrinter *p) void KMWUsers::initPrinter(KMPrinter *p)
{ {
QStringList l; TQStringList l;
int i(1); int i(1);
if (!p->option("requesting-user-name-denied").isEmpty()) if (!p->option("requesting-user-name-denied").isEmpty())
{ {
@ -85,12 +85,12 @@ void KMWUsers::updatePrinter(KMPrinter *p)
p->removeOption("requesting-user-name-denied"); p->removeOption("requesting-user-name-denied");
p->removeOption("requesting-user-name-allowed"); p->removeOption("requesting-user-name-allowed");
QString str; TQString str;
if (m_users->count() > 0) if (m_users->count() > 0)
str = m_users->items().join(","); str = m_users->items().join(",");
else else
str = (m_type->currentItem() == 0 ? "all" : "none"); str = (m_type->currentItem() == 0 ? "all" : "none");
QString optname = (m_type->currentItem() == 0 ? "requesting-user-name-allowed" : "requesting-user-name-denied"); TQString optname = (m_type->currentItem() == 0 ? "requesting-user-name-allowed" : "requesting-user-name-denied");
p->setOption(optname, str); p->setOption(optname, str);
} }
#include "kmwusers.moc" #include "kmwusers.moc"

@ -37,7 +37,7 @@ public:
private: private:
KEditListBox *m_users; KEditListBox *m_users;
QComboBox *m_type; TQComboBox *m_type;
}; };
#endif #endif

@ -110,7 +110,7 @@ KPHpgl2Page::KPHpgl2Page(TQWidget *parent, const char *name)
setTitle("HP-GL/2"); setTitle("HP-GL/2");
QGroupBox *box = new TQGroupBox(0, Qt::Vertical, i18n("HP-GL/2 Options"), this); TQGroupBox *box = new TQGroupBox(0, Qt::Vertical, i18n("HP-GL/2 Options"), this);
m_blackplot = new TQCheckBox(i18n("&Use only black pen"), box); m_blackplot = new TQCheckBox(i18n("&Use only black pen"), box);
TQWhatsThis::add(m_blackplot, whatsThisBlackplotHpgl2Page); TQWhatsThis::add(m_blackplot, whatsThisBlackplotHpgl2Page);
@ -124,11 +124,11 @@ KPHpgl2Page::KPHpgl2Page(TQWidget *parent, const char *name)
m_penwidth->setRange(0, 10000, 100, true); m_penwidth->setRange(0, 10000, 100, true);
TQWhatsThis::add(m_penwidth, whatsThisPenwidthHpgl2Page); TQWhatsThis::add(m_penwidth, whatsThisPenwidthHpgl2Page);
QVBoxLayout *l0 = new TQVBoxLayout(this, 0, 10); TQVBoxLayout *l0 = new TQVBoxLayout(this, 0, 10);
l0->addWidget(box); l0->addWidget(box);
l0->addStretch(1); l0->addStretch(1);
QVBoxLayout *l1 = new TQVBoxLayout(box->layout(), 10); TQVBoxLayout *l1 = new TQVBoxLayout(TQT_TQLAYOUT(box->layout()), 10);
l1->addWidget(m_blackplot); l1->addWidget(m_blackplot);
l1->addWidget(m_fitplot); l1->addWidget(m_fitplot);
l1->addWidget(m_penwidth); l1->addWidget(m_penwidth);
@ -141,10 +141,10 @@ KPHpgl2Page::~KPHpgl2Page()
void KPHpgl2Page::setOptions(const TQMap<TQString,TQString>& opts) void KPHpgl2Page::setOptions(const TQMap<TQString,TQString>& opts)
{ {
QString value; TQString value;
if (opts.contains("blackplot") && ((value=opts["blackplot"]).isEmpty() || value == "true")) if (opts.tqcontains("blackplot") && ((value=opts["blackplot"]).isEmpty() || value == "true"))
m_blackplot->setChecked(true); m_blackplot->setChecked(true);
if (opts.contains("fitplot") && ((value=opts["fitplot"]).isEmpty() || value == "true")) if (opts.tqcontains("fitplot") && ((value=opts["fitplot"]).isEmpty() || value == "true"))
m_fitplot->setChecked(true); m_fitplot->setChecked(true);
if (!(value=opts["penwidth"]).isEmpty()) if (!(value=opts["penwidth"]).isEmpty())
m_penwidth->setValue(value.toInt()); m_penwidth->setValue(value.toInt());

@ -36,7 +36,7 @@ public:
private: private:
KIntNumInput *m_penwidth; KIntNumInput *m_penwidth;
QCheckBox *m_blackplot, *m_fitplot; TQCheckBox *m_blackplot, *m_fitplot;
}; };
#endif #endif

@ -236,11 +236,11 @@ KPImagePage::KPImagePage(DrMain *driver, TQWidget *parent, const char *name)
setTitle(i18n("Image")); setTitle(i18n("Image"));
QGroupBox *colorbox = new TQGroupBox(0, Qt::Vertical, i18n("Color Settings"), this); TQGroupBox *colorbox = new TQGroupBox(0, Qt::Vertical, i18n("Color Settings"), this);
TQWhatsThis::add(this, whatsThisImagePage); TQWhatsThis::add(this, whatsThisImagePage);
QGroupBox *sizebox = new TQGroupBox(0, Qt::Vertical, i18n("Image Size"), this); TQGroupBox *sizebox = new TQGroupBox(0, Qt::Vertical, i18n("Image Size"), this);
TQWhatsThis::add(sizebox, whatsThisSizeImagePage); TQWhatsThis::add(sizebox, whatsThisSizeImagePage);
QGroupBox *positionbox = new TQGroupBox(0, Qt::Vertical, i18n("Image Position"), this); TQGroupBox *positionbox = new TQGroupBox(0, Qt::Vertical, i18n("Image Position"), this);
TQWhatsThis::add(positionbox, whatsThisPositionImagePage); TQWhatsThis::add(positionbox, whatsThisPositionImagePage);
m_brightness = new KIntNumInput(100, colorbox); m_brightness = new KIntNumInput(100, colorbox);
@ -275,12 +275,12 @@ KPImagePage::KPImagePage(DrMain *driver, TQWidget *parent, const char *name)
m_hue->setEnabled(useColor); m_hue->setEnabled(useColor);
m_saturation->setEnabled(useColor); m_saturation->setEnabled(useColor);
QImage img(locate("data", "kdeprint/preview.png")); TQImage img(locate("data", "kdeprint/preview.png"));
m_preview->setImage(img); m_preview->setImage(img);
KSeparator *sep = new KSeparator(Qt::Horizontal, colorbox); KSeparator *sep = new KSeparator(Qt::Horizontal, colorbox);
QPushButton *defbtn = new TQPushButton(i18n("&Default Settings"), colorbox); TQPushButton *defbtn = new TQPushButton(i18n("&Default Settings"), colorbox);
TQWhatsThis::add(defbtn, whatsThisResetButtonImagePage); TQWhatsThis::add(defbtn, whatsThisResetButtonImagePage);
connect(defbtn, TQT_SIGNAL(clicked()), TQT_SLOT(slotDefaultClicked())); connect(defbtn, TQT_SIGNAL(clicked()), TQT_SLOT(slotDefaultClicked()));
slotDefaultClicked(); slotDefaultClicked();
@ -301,19 +301,19 @@ KPImagePage::KPImagePage(DrMain *driver, TQWidget *parent, const char *name)
m_sizetype->setCurrentItem(0); m_sizetype->setCurrentItem(0);
slotSizeTypeChanged(0); slotSizeTypeChanged(0);
QLabel *lab = new TQLabel(i18n("&Image size type:"), sizebox); TQLabel *lab = new TQLabel(i18n("&Image size type:"), sizebox);
lab->setBuddy(m_sizetype); lab->setBuddy(m_sizetype);
m_position = new ImagePosition(positionbox); m_position = new ImagePosition(positionbox);
TQWhatsThis::add(m_position, whatsThisPreviewPositionImagePage); TQWhatsThis::add(m_position, whatsThisPreviewPositionImagePage);
QRadioButton *bottom = new TQRadioButton(positionbox); TQRadioButton *bottom = new TQRadioButton(positionbox);
QRadioButton *top = new TQRadioButton(positionbox); TQRadioButton *top = new TQRadioButton(positionbox);
QRadioButton *vcenter = new TQRadioButton(positionbox); TQRadioButton *vcenter = new TQRadioButton(positionbox);
QRadioButton *left = new TQRadioButton(positionbox); TQRadioButton *left = new TQRadioButton(positionbox);
QRadioButton *right = new TQRadioButton(positionbox); TQRadioButton *right = new TQRadioButton(positionbox);
QRadioButton *hcenter = new TQRadioButton(positionbox); TQRadioButton *hcenter = new TQRadioButton(positionbox);
QSize sz = bottom->tqsizeHint(); TQSize sz = bottom->tqsizeHint();
bottom->setFixedSize(sz); bottom->setFixedSize(sz);
vcenter->setFixedSize(sz); vcenter->setFixedSize(sz);
top->setFixedSize(sz); top->setFixedSize(sz);
@ -348,12 +348,12 @@ KPImagePage::KPImagePage(DrMain *driver, TQWidget *parent, const char *name)
m_horizgrp->setButton(1); m_horizgrp->setButton(1);
slotPositionChanged(); slotPositionChanged();
QGridLayout *l0 = new TQGridLayout(this, 2, 2, 0, 10); TQGridLayout *l0 = new TQGridLayout(this, 2, 2, 0, 10);
l0->addMultiCellWidget(colorbox, 0, 0, 0, 1); l0->addMultiCellWidget(colorbox, 0, 0, 0, 1);
l0->addWidget(sizebox, 1, 0); l0->addWidget(sizebox, 1, 0);
l0->addWidget(positionbox, 1, 1); l0->addWidget(positionbox, 1, 1);
l0->setColStretch(0, 1); l0->setColStretch(0, 1);
QGridLayout *l1 = new TQGridLayout(colorbox->layout(), 5, 2, 10); TQGridLayout *l1 = new TQGridLayout(colorbox->layout(), 5, 2, 10);
l1->addWidget(m_brightness, 0, 0); l1->addWidget(m_brightness, 0, 0);
l1->addWidget(m_hue, 1, 0); l1->addWidget(m_hue, 1, 0);
l1->addWidget(m_saturation, 2, 0); l1->addWidget(m_saturation, 2, 0);
@ -361,16 +361,16 @@ KPImagePage::KPImagePage(DrMain *driver, TQWidget *parent, const char *name)
l1->addWidget(m_gamma, 4, 0); l1->addWidget(m_gamma, 4, 0);
l1->addMultiCellWidget(m_preview, 0, 3, 1, 1); l1->addMultiCellWidget(m_preview, 0, 3, 1, 1);
l1->addWidget(defbtn, 4, 1); l1->addWidget(defbtn, 4, 1);
QVBoxLayout *l2 = new TQVBoxLayout(sizebox->layout(), 3); TQVBoxLayout *l2 = new TQVBoxLayout(TQT_TQLAYOUT(sizebox->layout()), 3);
l2->addStretch(1); l2->addStretch(1);
l2->addWidget(lab); l2->addWidget(lab);
l2->addWidget(m_sizetype); l2->addWidget(m_sizetype);
l2->addSpacing(10); l2->addSpacing(10);
l2->addWidget(m_size); l2->addWidget(m_size);
l2->addStretch(1); l2->addStretch(1);
QGridLayout *l3 = new TQGridLayout(positionbox->layout(), 2, 2, 10); TQGridLayout *l3 = new TQGridLayout(positionbox->layout(), 2, 2, 10);
QHBoxLayout *l4 = new TQHBoxLayout(0, 0, 10); TQHBoxLayout *l4 = new TQHBoxLayout(0, 0, 10);
QVBoxLayout *l5 = new TQVBoxLayout(0, 0, 10); TQVBoxLayout *l5 = new TQVBoxLayout(0, 0, 10);
l3->addLayout(l4, 0, 1); l3->addLayout(l4, 0, 1);
l3->addLayout(l5, 1, 0); l3->addLayout(l5, 1, 0);
l3->addWidget(m_position, 1, 1); l3->addWidget(m_position, 1, 1);
@ -388,7 +388,7 @@ KPImagePage::~KPImagePage()
void KPImagePage::setOptions(const TQMap<TQString,TQString>& opts) void KPImagePage::setOptions(const TQMap<TQString,TQString>& opts)
{ {
QString value; TQString value;
if (!(value=opts["brightness"]).isEmpty()) if (!(value=opts["brightness"]).isEmpty())
m_brightness->setValue(value.toInt()); m_brightness->setValue(value.toInt());
if (!(value=opts["hue"]).isEmpty()) if (!(value=opts["hue"]).isEmpty())
@ -434,7 +434,7 @@ void KPImagePage::getOptions(TQMap<TQString,TQString>& opts, bool incldef)
if (incldef || m_gamma->value() != 1000) if (incldef || m_gamma->value() != 1000)
opts["gamma"] = TQString::number(m_gamma->value()); opts["gamma"] = TQString::number(m_gamma->value());
QString name; TQString name;
if (incldef) if (incldef)
{ {
opts["ppi"] = "0"; opts["ppi"] = "0";

@ -46,9 +46,9 @@ protected slots:
private: private:
KIntNumInput *m_brightness, *m_hue, *m_saturation, *m_gamma; KIntNumInput *m_brightness, *m_hue, *m_saturation, *m_gamma;
QComboBox *m_sizetype; TQComboBox *m_sizetype;
KIntNumInput *m_size; KIntNumInput *m_size;
QButtonGroup *m_vertgrp, *m_horizgrp; TQButtonGroup *m_vertgrp, *m_horizgrp;
ImagePreview *m_preview; ImagePreview *m_preview;
ImagePosition *m_position; ImagePosition *m_position;
}; };

@ -144,7 +144,7 @@ KPSchedulePage::KPSchedulePage(TQWidget *parent, const char *name)
m_time->insertItem(i18n("Third Shift (12 am - 8 am)")); m_time->insertItem(i18n("Third Shift (12 am - 8 am)"));
m_time->insertItem(i18n("Specified Time")); m_time->insertItem(i18n("Specified Time"));
TQWhatsThis::add(m_time, whatsThisScheduledPrinting); TQWhatsThis::add(m_time, whatsThisScheduledPrinting);
m_tedit = new QTimeEdit(this); m_tedit = new TQTimeEdit(this);
m_tedit->setAutoAdvance(true); m_tedit->setAutoAdvance(true);
m_tedit->setTime(TQTime::currentTime()); m_tedit->setTime(TQTime::currentTime());
m_tedit->setEnabled(false); m_tedit->setEnabled(false);
@ -157,13 +157,13 @@ KPSchedulePage::KPSchedulePage(TQWidget *parent, const char *name)
TQWhatsThis::add(m_priority, whatsThisJobPriority); TQWhatsThis::add(m_priority, whatsThisJobPriority);
m_priority->setRange(1, 100, 10, true); m_priority->setRange(1, 100, 10, true);
QLabel *lab = new TQLabel(i18n("&Scheduled printing:"), this); TQLabel *lab = new TQLabel(i18n("&Scheduled printing:"), this);
lab->setBuddy(m_time); lab->setBuddy(m_time);
TQWhatsThis::add(lab, whatsThisScheduledPrinting); TQWhatsThis::add(lab, whatsThisScheduledPrinting);
QLabel *lab1 = new TQLabel(i18n("&Billing information:"), this); TQLabel *lab1 = new TQLabel(i18n("&Billing information:"), this);
TQWhatsThis::add(lab1, whatsThisBillingInfo); TQWhatsThis::add(lab1, whatsThisBillingInfo);
lab1->setBuddy(m_billing); lab1->setBuddy(m_billing);
QLabel *lab2 = new TQLabel(i18n("T&op/Bottom page label:"), this); TQLabel *lab2 = new TQLabel(i18n("T&op/Bottom page label:"), this);
TQWhatsThis::add(lab2, whatsThisPageLabel); TQWhatsThis::add(lab2, whatsThisPageLabel);
lab2->setBuddy(m_pagelabel); lab2->setBuddy(m_pagelabel);
m_priority->setLabel(i18n("&Job priority:"), Qt::AlignVCenter|Qt::AlignLeft); m_priority->setLabel(i18n("&Job priority:"), Qt::AlignVCenter|Qt::AlignLeft);
@ -172,9 +172,9 @@ KPSchedulePage::KPSchedulePage(TQWidget *parent, const char *name)
KSeparator *sep0 = new KSeparator(this); KSeparator *sep0 = new KSeparator(this);
sep0->setFixedHeight(10); sep0->setFixedHeight(10);
QGridLayout *l0 = new TQGridLayout(this, 6, 2, 0, 7); TQGridLayout *l0 = new TQGridLayout(this, 6, 2, 0, 7);
l0->addWidget(lab, 0, 0); l0->addWidget(lab, 0, 0);
QHBoxLayout *l1 = new TQHBoxLayout(0, 0, 5); TQHBoxLayout *l1 = new TQHBoxLayout(0, 0, 5);
l0->addLayout(l1, 0, 1); l0->addLayout(l1, 0, 1);
l1->addWidget(m_time); l1->addWidget(m_time);
l1->addWidget(m_tedit); l1->addWidget(m_tedit);
@ -205,7 +205,7 @@ bool KPSchedulePage::isValid(TQString& msg)
void KPSchedulePage::setOptions(const TQMap<TQString,TQString>& opts) void KPSchedulePage::setOptions(const TQMap<TQString,TQString>& opts)
{ {
QString t = opts["job-hold-until"]; TQString t = opts["job-hold-until"];
if (!t.isEmpty()) if (!t.isEmpty())
{ {
int item(-1); int item(-1);
@ -220,8 +220,8 @@ void KPSchedulePage::setOptions(const TQMap<TQString,TQString>& opts)
else if (t == "third-shift") item = 7; else if (t == "third-shift") item = 7;
else else
{ {
QTime qt = TQTime::fromString(t); TQTime qt = TQT_TQTIME_OBJECT(TQTime::fromString(t));
m_tedit->setTime(qt.addSecs(-3600 * m_gmtdiff)); m_tedit->setTime(TQT_TQTIME_OBJECT(qt.addSecs(-3600 * m_gmtdiff)));
item = 8; item = 8;
} }
@ -231,7 +231,7 @@ void KPSchedulePage::setOptions(const TQMap<TQString,TQString>& opts)
slotTimeChanged(); slotTimeChanged();
} }
} }
QRegExp re("^\"|\"$"); TQRegExp re("^\"|\"$");
t = opts["job-billing"].stripWhiteSpace(); t = opts["job-billing"].stripWhiteSpace();
t.replace(re, ""); t.replace(re, "");
m_billing->setText(t); m_billing->setText(t);
@ -247,7 +247,7 @@ void KPSchedulePage::getOptions(TQMap<TQString,TQString>& opts, bool incldef)
{ {
if (incldef || m_time->currentItem() != 0) if (incldef || m_time->currentItem() != 0)
{ {
QString t; TQString t;
switch (m_time->currentItem()) switch (m_time->currentItem())
{ {
case 0: t = "no-hold"; break; case 0: t = "no-hold"; break;

@ -23,7 +23,7 @@
#include <kprintdialogpage.h> #include <kprintdialogpage.h>
class TQComboBox; class TQComboBox;
class QTimeEdit; class TQTimeEdit;
class TQLineEdit; class TQLineEdit;
class KIntNumInput; class KIntNumInput;
@ -42,9 +42,9 @@ protected slots:
void slotTimeChanged(); void slotTimeChanged();
private: private:
QComboBox *m_time; TQComboBox *m_time;
QTimeEdit *m_tedit; TQTimeEdit *m_tedit;
QLineEdit *m_billing, *m_pagelabel; TQLineEdit *m_billing, *m_pagelabel;
KIntNumInput *m_priority; KIntNumInput *m_priority;
int m_gmtdiff; int m_gmtdiff;
}; };

@ -84,13 +84,13 @@ KPTagsPage::KPTagsPage(bool ro, TQWidget *parent, const char *name)
m_tags->setReadOnly(ro); m_tags->setReadOnly(ro);
TQWhatsThis::add(m_tags, whatsThisAdditionalTagsTable); TQWhatsThis::add(m_tags, whatsThisAdditionalTagsTable);
QVBoxLayout *l0 = new TQVBoxLayout(this, 0, 5); TQVBoxLayout *l0 = new TQVBoxLayout(this, 0, 5);
l0->addWidget(m_tags); l0->addWidget(m_tags);
if (ro) if (ro)
{ {
QLabel *lab = new TQLabel(i18n("Read-Only"), this); TQLabel *lab = new TQLabel(i18n("Read-Only"), this);
QFont f = lab->font(); TQFont f = lab->font();
f.setBold(true); f.setBold(true);
lab->setFont(f); lab->setFont(f);
lab->tqsetAlignment(AlignVCenter|AlignRight); lab->tqsetAlignment(AlignVCenter|AlignRight);
@ -104,10 +104,10 @@ KPTagsPage::~KPTagsPage()
bool KPTagsPage::isValid(TQString& msg) bool KPTagsPage::isValid(TQString& msg)
{ {
QRegExp re("\\s"); TQRegExp re("\\s");
for (int r=0; r<m_tags->numCols(); r++) for (int r=0; r<m_tags->numCols(); r++)
{ {
QString tag(m_tags->text(r, 0)); TQString tag(m_tags->text(r, 0));
if (tag.isEmpty()) if (tag.isEmpty())
continue; continue;
else if (tag.tqfind(re) != -1) else if (tag.tqfind(re) != -1)
@ -122,13 +122,13 @@ bool KPTagsPage::isValid(TQString& msg)
void KPTagsPage::setOptions(const TQMap<TQString,TQString>& opts) void KPTagsPage::setOptions(const TQMap<TQString,TQString>& opts)
{ {
int r(0); int r(0);
QRegExp re("^\"|\"$"); TQRegExp re("^\"|\"$");
for (TQMap<TQString,TQString>::ConstIterator it=opts.begin(); it!=opts.end() && r<m_tags->numRows(); ++it) for (TQMap<TQString,TQString>::ConstIterator it=opts.begin(); it!=opts.end() && r<m_tags->numRows(); ++it)
{ {
if (it.key().startsWith("KDEPrint-")) if (it.key().startsWith("KDEPrint-"))
{ {
m_tags->setText(r, 0, it.key().mid(9)); m_tags->setText(r, 0, it.key().mid(9));
QString data = it.data(); TQString data = it.data();
m_tags->setText(r, 1, data.replace(re, "")); m_tags->setText(r, 1, data.replace(re, ""));
r++; r++;
} }
@ -144,7 +144,7 @@ void KPTagsPage::getOptions(TQMap<TQString,TQString>& opts, bool)
{ {
for (int r=0; r<m_tags->numRows(); r++) for (int r=0; r<m_tags->numRows(); r++)
{ {
QString tag(m_tags->text(r, 0)), val(m_tags->text(r, 1)); TQString tag(m_tags->text(r, 0)), val(m_tags->text(r, 1));
if (!tag.isEmpty()) if (!tag.isEmpty())
{ {
tag.prepend("KDEPrint-"); tag.prepend("KDEPrint-");

@ -38,7 +38,7 @@ public:
TQSize tqminimumSizeHint() const; TQSize tqminimumSizeHint() const;
private: private:
QTable *m_tags; TQTable *m_tags;
}; };
#endif #endif

@ -188,11 +188,11 @@ KPTextPage::KPTextPage(DrMain *driver, TQWidget *parent, const char *name)
setTitle(i18n("Text")); setTitle(i18n("Text"));
m_block = false; m_block = false;
QGroupBox *formatbox = new TQGroupBox(0, Qt::Vertical, i18n("Text Format"), this); TQGroupBox *formatbox = new TQGroupBox(0, Qt::Vertical, i18n("Text Format"), this);
TQWhatsThis::add(formatbox, whatsThisFormatTextPage); TQWhatsThis::add(formatbox, whatsThisFormatTextPage);
QGroupBox *prettybox = new TQGroupBox(0, Qt::Vertical, i18n("Syntax Highlighting"), this); TQGroupBox *prettybox = new TQGroupBox(0, Qt::Vertical, i18n("Syntax Highlighting"), this);
TQWhatsThis::add(prettybox, whatsThisPrettyprintFrameTextPage); TQWhatsThis::add(prettybox, whatsThisPrettyprintFrameTextPage);
QGroupBox *marginbox = new TQGroupBox(0, Qt::Vertical, i18n("Margins"), this); TQGroupBox *marginbox = new TQGroupBox(0, Qt::Vertical, i18n("Margins"), this);
TQWhatsThis::add(marginbox, whatsThisMarginsTextPage); TQWhatsThis::add(marginbox, whatsThisMarginsTextPage);
m_cpi = new KIntNumInput(10, formatbox); m_cpi = new KIntNumInput(10, formatbox);
@ -213,9 +213,9 @@ KPTextPage::KPTextPage(DrMain *driver, TQWidget *parent, const char *name)
m_prettypix = new TQLabel(prettybox); m_prettypix = new TQLabel(prettybox);
TQWhatsThis::add(m_prettypix, whatsThisPrettyprintPreviewIconTextPage); TQWhatsThis::add(m_prettypix, whatsThisPrettyprintPreviewIconTextPage);
m_prettypix->tqsetAlignment(Qt::AlignCenter); m_prettypix->tqsetAlignment(Qt::AlignCenter);
QRadioButton *off = new TQRadioButton(i18n("&Disabled"), prettybox); TQRadioButton *off = new TQRadioButton(i18n("&Disabled"), prettybox);
TQWhatsThis::add(off, whatsThisPrettyprintButtonOffTextPage); TQWhatsThis::add(off, whatsThisPrettyprintButtonOffTextPage);
QRadioButton *on = new TQRadioButton(i18n("&Enabled"), prettybox); TQRadioButton *on = new TQRadioButton(i18n("&Enabled"), prettybox);
TQWhatsThis::add(on, whatsThisPrettyprintButtonOnTextPage); TQWhatsThis::add(on, whatsThisPrettyprintButtonOnTextPage);
m_prettyprint = new TQButtonGroup(prettybox); m_prettyprint = new TQButtonGroup(prettybox);
m_prettyprint->hide(); m_prettyprint->hide();
@ -229,20 +229,20 @@ KPTextPage::KPTextPage(DrMain *driver, TQWidget *parent, const char *name)
TQWhatsThis::add(m_margin, whatsThisMarginsTextPage); TQWhatsThis::add(m_margin, whatsThisMarginsTextPage);
m_margin->setPageSize(595, 842); m_margin->setPageSize(595, 842);
QGridLayout *l0 = new TQGridLayout(this, 2, 2, 0, 10); TQGridLayout *l0 = new TQGridLayout(this, 2, 2, 0, 10);
l0->addWidget(formatbox, 0, 0); l0->addWidget(formatbox, 0, 0);
l0->addWidget(prettybox, 0, 1); l0->addWidget(prettybox, 0, 1);
l0->addMultiCellWidget(marginbox, 1, 1, 0, 1); l0->addMultiCellWidget(marginbox, 1, 1, 0, 1);
QVBoxLayout *l1 = new TQVBoxLayout(formatbox->layout(), 5); TQVBoxLayout *l1 = new TQVBoxLayout(TQT_TQLAYOUT(formatbox->layout()), 5);
l1->addWidget(m_cpi); l1->addWidget(m_cpi);
l1->addWidget(m_lpi); l1->addWidget(m_lpi);
l1->addWidget(sep); l1->addWidget(sep);
l1->addWidget(m_columns); l1->addWidget(m_columns);
QGridLayout *l2 = new TQGridLayout(prettybox->layout(), 2, 2, 10); TQGridLayout *l2 = new TQGridLayout(TQT_TQLAYOUT(prettybox->layout()), 2, 2, 10);
l2->addWidget(off, 0, 0); l2->addWidget(off, 0, 0);
l2->addWidget(on, 1, 0); l2->addWidget(on, 1, 0);
l2->addMultiCellWidget(m_prettypix, 0, 1, 1, 1); l2->addMultiCellWidget(m_prettypix, 0, 1, 1, 1);
QVBoxLayout *l3 = new TQVBoxLayout(marginbox->layout(), 10); TQVBoxLayout *l3 = new TQVBoxLayout(TQT_TQLAYOUT(marginbox->layout()), 10);
l3->addWidget(m_margin); l3->addWidget(m_margin);
} }
@ -252,7 +252,7 @@ KPTextPage::~KPTextPage()
void KPTextPage::setOptions(const TQMap<TQString,TQString>& opts) void KPTextPage::setOptions(const TQMap<TQString,TQString>& opts)
{ {
QString value; TQString value;
if (!(value=opts["cpi"]).isEmpty()) if (!(value=opts["cpi"]).isEmpty())
m_cpi->setValue(value.toInt()); m_cpi->setValue(value.toInt());
@ -261,14 +261,14 @@ void KPTextPage::setOptions(const TQMap<TQString,TQString>& opts)
if (!(value=opts["columns"]).isEmpty()) if (!(value=opts["columns"]).isEmpty())
m_columns->setValue(value.toInt()); m_columns->setValue(value.toInt());
int ID(0); int ID(0);
if (opts.contains("prettyprint") && (opts["prettyprint"].isEmpty() || opts["prettyprint"] == "true")) if (opts.tqcontains("prettyprint") && (opts["prettyprint"].isEmpty() || opts["prettyprint"] == "true"))
ID = 1; ID = 1;
m_prettyprint->setButton(ID); m_prettyprint->setButton(ID);
slotPrettyChanged(ID); slotPrettyChanged(ID);
// get default margins // get default margins
m_currentps = opts["PageSize"]; m_currentps = opts["PageSize"];
QString orient = opts["orientation-requested"]; TQString orient = opts["orientation-requested"];
bool landscape = (orient == "4" || orient == "5"); bool landscape = (orient == "4" || orient == "5");
initPageSize(landscape); initPageSize(landscape);
@ -331,7 +331,7 @@ void KPTextPage::getOptions(TQMap<TQString,TQString>& opts, bool incldef)
void KPTextPage::slotPrettyChanged(int ID) void KPTextPage::slotPrettyChanged(int ID)
{ {
QString iconstr = (ID == 0 ? "kdeprint_nup1" : "kdeprint_prettyprint"); TQString iconstr = (ID == 0 ? "kdeprint_nup1" : "kdeprint_prettyprint");
m_prettypix->setPixmap(UserIcon(iconstr)); m_prettypix->setPixmap(UserIcon(iconstr));
} }

@ -47,10 +47,10 @@ protected:
private: private:
KIntNumInput *m_cpi, *m_lpi, *m_columns; KIntNumInput *m_cpi, *m_lpi, *m_columns;
QButtonGroup *m_prettyprint; TQButtonGroup *m_prettyprint;
MarginWidget *m_margin; MarginWidget *m_margin;
QLabel *m_prettypix; TQLabel *m_prettypix;
QString m_currentps; TQString m_currentps;
bool m_block; bool m_block;
}; };

@ -61,7 +61,7 @@ DriverItem* DrBase::createItem(DriverItem *parent, DriverItem *after)
void DrBase::setOptions(const TQMap<TQString,TQString>& opts) void DrBase::setOptions(const TQMap<TQString,TQString>& opts)
{ {
if (opts.contains(name())) setValueText(opts[name()]); if (opts.tqcontains(name())) setValueText(opts[name()]);
} }
void DrBase::getOptions(TQMap<TQString,TQString>& opts, bool incldef) void DrBase::getOptions(TQMap<TQString,TQString>& opts, bool incldef)
@ -278,7 +278,7 @@ DrBase* DrGroup::findOption(const TQString& name, DrGroup **parentGroup)
DrGroup* DrGroup::findGroup(DrGroup *grp, DrGroup ** parentGroup) DrGroup* DrGroup::findGroup(DrGroup *grp, DrGroup ** parentGroup)
{ {
DrGroup *group = (m_subgroups.findRef(grp) == -1 ? 0 : grp); DrGroup *group = (m_subgroups.tqfindRef(grp) == -1 ? 0 : grp);
if (!group) if (!group)
{ {
TQPtrListIterator<DrGroup> it(m_subgroups); TQPtrListIterator<DrGroup> it(m_subgroups);
@ -464,11 +464,11 @@ void DrIntegerOption::setValueText(const TQString& s)
TQString DrIntegerOption::fixedVal() TQString DrIntegerOption::fixedVal()
{ {
QStringList vals = TQStringList::split("|", get("fixedvals"), false); TQStringList vals = TQStringList::split("|", get("fixedvals"), false);
if (vals.count() == 0) if (vals.count() == 0)
return valueText(); return valueText();
int d(0); int d(0);
QString val; TQString val;
for (TQStringList::Iterator it=vals.begin(); it!=vals.end(); ++it) for (TQStringList::Iterator it=vals.begin(); it!=vals.end(); ++it)
{ {
int thisVal = (*it).toInt(); int thisVal = (*it).toInt();
@ -514,11 +514,11 @@ void DrFloatOption::setValueText(const TQString& s)
TQString DrFloatOption::fixedVal() TQString DrFloatOption::fixedVal()
{ {
QStringList vals = TQStringList::split("|", get("fixedvals"), false); TQStringList vals = TQStringList::split("|", get("fixedvals"), false);
if (vals.count() == 0) if (vals.count() == 0)
return valueText(); return valueText();
float d(0); float d(0);
QString val; TQString val;
for (TQStringList::Iterator it=vals.begin(); it!=vals.end(); ++it) for (TQStringList::Iterator it=vals.begin(); it!=vals.end(); ++it)
{ {
float thisVal = (*it).toFloat(); float thisVal = (*it).toFloat();

@ -71,7 +71,7 @@ public:
const TQString& get(const TQString& key) const { return m_map[key]; } const TQString& get(const TQString& key) const { return m_map[key]; }
void set(const TQString& key, const TQString& val) { m_map[key] = val; } void set(const TQString& key, const TQString& val) { m_map[key] = val; }
bool has(const TQString& key) const { return m_map.contains(key); } bool has(const TQString& key) const { return m_map.tqcontains(key); }
const TQString& name() const { return m_name; } const TQString& name() const { return m_name; }
void setName(const TQString& s) { m_name = s; } void setName(const TQString& s) { m_name = s; }
bool conflict() const { return m_conflict; } bool conflict() const { return m_conflict; }

@ -94,8 +94,8 @@ DriverView::DriverView(TQWidget *parent, const char *name)
m_driver = 0; m_driver = 0;
QSplitter *splitter = new TQSplitter(this); TQSplitter *splitter = new TQSplitter(this);
splitter->setOrientation(TQSplitter::Vertical); splitter->setOrientation(Qt::Vertical);
TQVBoxLayout *vbox = new TQVBoxLayout(this, 0, 10); TQVBoxLayout *vbox = new TQVBoxLayout(this, 0, 10);
vbox->addWidget(splitter); vbox->addWidget(splitter);

@ -58,15 +58,15 @@ OptionNumericView::OptionNumericView(TQWidget *parent, const char *name)
m_edit = new TQLineEdit(this); m_edit = new TQLineEdit(this);
m_slider = new TQSlider(Qt::Horizontal,this); m_slider = new TQSlider(Qt::Horizontal,this);
m_slider->setTickmarks(TQSlider::Below); m_slider->setTickmarks(TQSlider::Below);
QLabel *lab = new TQLabel(i18n("Value:"),this); TQLabel *lab = new TQLabel(i18n("Value:"),this);
m_minval = new TQLabel(this); m_minval = new TQLabel(this);
m_maxval = new TQLabel(this); m_maxval = new TQLabel(this);
m_integer = true; m_integer = true;
QVBoxLayout *main_ = new TQVBoxLayout(this, 0, 10); TQVBoxLayout *main_ = new TQVBoxLayout(this, 0, 10);
QHBoxLayout *sub_ = new TQHBoxLayout(0, 0, 10); TQHBoxLayout *sub_ = new TQHBoxLayout(0, 0, 10);
QHBoxLayout *sub2_ = new TQHBoxLayout(0, 0, 5); TQHBoxLayout *sub2_ = new TQHBoxLayout(0, 0, 5);
main_->addStretch(1); main_->addStretch(1);
main_->addLayout(sub_,0); main_->addLayout(sub_,0);
main_->addLayout(sub2_,0); main_->addLayout(sub2_,0);
@ -164,9 +164,9 @@ OptionStringView::OptionStringView(TQWidget *parent, const char *name)
: OptionBaseView(parent,name) : OptionBaseView(parent,name)
{ {
m_edit = new TQLineEdit(this); m_edit = new TQLineEdit(this);
QLabel *lab = new TQLabel(i18n("String value:"),this); TQLabel *lab = new TQLabel(i18n("String value:"),this);
QVBoxLayout *main_ = new TQVBoxLayout(this, 0, 5); TQVBoxLayout *main_ = new TQVBoxLayout(this, 0, 5);
main_->addStretch(1); main_->addStretch(1);
main_->addWidget(lab,0); main_->addWidget(lab,0);
main_->addWidget(m_edit,0); main_->addWidget(m_edit,0);
@ -193,7 +193,7 @@ OptionListView::OptionListView(TQWidget *parent, const char *name)
{ {
m_list = new KListBox(this); m_list = new KListBox(this);
QVBoxLayout *main_ = new TQVBoxLayout(this, 0, 10); TQVBoxLayout *main_ = new TQVBoxLayout(this, 0, 10);
main_->addWidget(m_list); main_->addWidget(m_list);
connect(m_list,TQT_SIGNAL(selectionChanged()),TQT_SLOT(slotSelectionChanged())); connect(m_list,TQT_SIGNAL(selectionChanged()),TQT_SLOT(slotSelectionChanged()));
@ -219,7 +219,7 @@ void OptionListView::setOption(DrBase *opt)
void OptionListView::setValue(const TQString& val) void OptionListView::setValue(const TQString& val)
{ {
m_list->setCurrentItem(m_choices.findIndex(val)); m_list->setCurrentItem(m_choices.tqfindIndex(val));
} }
void OptionListView::slotSelectionChanged() void OptionListView::slotSelectionChanged()
@ -238,12 +238,12 @@ OptionBooleanView::OptionBooleanView(TQWidget *parent, const char *name)
m_group = new TQVButtonGroup(this); m_group = new TQVButtonGroup(this);
m_group->setFrameStyle(TQFrame::NoFrame); m_group->setFrameStyle(TQFrame::NoFrame);
QRadioButton *btn = new TQRadioButton(m_group); TQRadioButton *btn = new TQRadioButton(m_group);
btn->setCursor(KCursor::handCursor()); btn->setCursor(KCursor::handCursor());
btn = new TQRadioButton(m_group); btn = new TQRadioButton(m_group);
btn->setCursor(KCursor::handCursor()); btn->setCursor(KCursor::handCursor());
QVBoxLayout *main_ = new TQVBoxLayout(this, 0, 10); TQVBoxLayout *main_ = new TQVBoxLayout(this, 0, 10);
main_->addWidget(m_group); main_->addWidget(m_group);
connect(m_group,TQT_SIGNAL(clicked(int)),TQT_SLOT(slotSelected(int))); connect(m_group,TQT_SIGNAL(clicked(int)),TQT_SLOT(slotSelected(int)));
@ -255,9 +255,9 @@ void OptionBooleanView::setOption(DrBase *opt)
{ {
TQPtrListIterator<DrBase> it(*(((DrBooleanOption*)opt)->choices())); TQPtrListIterator<DrBase> it(*(((DrBooleanOption*)opt)->choices()));
m_choices.clear(); m_choices.clear();
m_group->find(0)->setText(it.toFirst()->get("text")); static_cast<TQButton*>(m_group->find(0))->setText(it.toFirst()->get("text"));
m_choices.append(it.toFirst()->name()); m_choices.append(it.toFirst()->name());
m_group->find(1)->setText(it.toLast()->get("text")); static_cast<TQButton*>(m_group->find(1))->setText(it.toLast()->get("text"));
m_choices.append(it.toLast()->name()); m_choices.append(it.toLast()->name());
setValue(opt->valueText()); setValue(opt->valueText());
} }
@ -265,13 +265,13 @@ void OptionBooleanView::setOption(DrBase *opt)
void OptionBooleanView::setValue(const TQString& val) void OptionBooleanView::setValue(const TQString& val)
{ {
int ID = m_choices.findIndex(val); int ID = m_choices.tqfindIndex(val);
m_group->setButton(ID); m_group->setButton(ID);
} }
void OptionBooleanView::slotSelected(int ID) void OptionBooleanView::slotSelected(int ID)
{ {
QString s = m_choices[ID]; TQString s = m_choices[ID];
emit valueChanged(s); emit valueChanged(s);
} }
@ -308,7 +308,7 @@ DrOptionView::DrOptionView(TQWidget *parent, const char *name)
setColumnLayout(0, Qt::Vertical ); setColumnLayout(0, Qt::Vertical );
layout()->setSpacing( KDialog::spacingHint() ); layout()->setSpacing( KDialog::spacingHint() );
layout()->setMargin( KDialog::marginHint() ); layout()->setMargin( KDialog::marginHint() );
QVBoxLayout *main_ = new TQVBoxLayout(layout(), KDialog::marginHint()); TQVBoxLayout *main_ = new TQVBoxLayout(TQT_TQLAYOUT(layout()), KDialog::marginHint());
main_->addWidget(m_stack); main_->addWidget(m_stack);
m_item = 0; m_item = 0;

@ -63,9 +63,9 @@ protected slots:
void slotEditChanged(const TQString&); void slotEditChanged(const TQString&);
private: private:
QLineEdit *m_edit; TQLineEdit *m_edit;
QSlider *m_slider; TQSlider *m_slider;
QLabel *m_minval, *m_maxval; TQLabel *m_minval, *m_maxval;
bool m_integer; bool m_integer;
}; };
@ -77,7 +77,7 @@ public:
void setValue(const TQString& val); void setValue(const TQString& val);
private: private:
QLineEdit *m_edit; TQLineEdit *m_edit;
}; };
class OptionListView : public OptionBaseView class OptionListView : public OptionBaseView
@ -93,7 +93,7 @@ protected slots:
private: private:
KListBox *m_list; KListBox *m_list;
QStringList m_choices; TQStringList m_choices;
}; };
class OptionBooleanView : public OptionBaseView class OptionBooleanView : public OptionBaseView
@ -108,8 +108,8 @@ protected slots:
void slotSelected(int); void slotSelected(int);
private: private:
QVButtonGroup *m_group; TQVButtonGroup *m_group;
QStringList m_choices; TQStringList m_choices;
}; };
class DrOptionView : public TQGroupBox class DrOptionView : public TQGroupBox
@ -127,7 +127,7 @@ public slots:
void slotItemSelected(TQListViewItem*); void slotItemSelected(TQListViewItem*);
private: private:
QWidgetStack *m_stack; TQWidgetStack *m_stack;
DriverItem *m_item; DriverItem *m_item;
bool m_block; bool m_block;
bool m_allowfixed; bool m_allowfixed;

@ -53,7 +53,7 @@ bool Foomatic2Loader::readFromFile( const TQString& filename )
TQFile f( filename ); TQFile f( filename );
m_foodata.clear(); m_foodata.clear();
if ( f.open( IO_ReadOnly ) ) if ( f.open( IO_ReadOnly ) )
return read( &f ); return read( TQT_TQIODEVICE(&f) );
return false; return false;
} }
@ -63,7 +63,7 @@ bool Foomatic2Loader::readFromBuffer( const TQString& buffer )
TQBuffer d( buf ); TQBuffer d( buf );
m_foodata.clear(); m_foodata.clear();
if ( d.open( IO_ReadOnly ) ) if ( d.open( IO_ReadOnly ) )
return read( &d ); return read( TQT_TQIODEVICE(&d) );
return false; return false;
} }
@ -151,7 +151,7 @@ DrMain* Foomatic2Loader::buildDriver() const
driver->set( "matic_printer", v.mapFind( "id" ).data().toString() ); driver->set( "matic_printer", v.mapFind( "id" ).data().toString() );
driver->set( "matic_driver", v.mapFind( "driver" ).data().toString() ); driver->set( "matic_driver", v.mapFind( "driver" ).data().toString() );
driver->set( "text", TQString( "%1 %2 (%3)" ).arg( driver->get( "manufacturer" ) ).arg( driver->get( "model" ) ).arg( driver->get( "matic_driver" ) ) ); driver->set( "text", TQString( "%1 %2 (%3)" ).arg( driver->get( "manufacturer" ) ).arg( driver->get( "model" ) ).arg( driver->get( "matic_driver" ) ) );
if ( m_foodata.contains( "POSTPIPE" ) ) if ( m_foodata.tqcontains( "POSTPIPE" ) )
driver->set( "postpipe", m_foodata.tqfind( "POSTPIPE" ).data().toString() ); driver->set( "postpipe", m_foodata.tqfind( "POSTPIPE" ).data().toString() );
v = v.mapFind( "args" ).data(); v = v.mapFind( "args" ).data();
if ( !v.isNull() && v.type() == TQVariant::List ) if ( !v.isNull() && v.type() == TQVariant::List )
@ -166,7 +166,7 @@ DrMain* Foomatic2Loader::buildDriver() const
{ {
TQString group = DrGroup::groupForOption( opt->name() ); TQString group = DrGroup::groupForOption( opt->name() );
DrGroup *grp = NULL; DrGroup *grp = NULL;
if ( !groups.contains( group ) ) if ( !groups.tqcontains( group ) )
{ {
grp = new DrGroup; grp = new DrGroup;
grp->set( "text", group ); grp->set( "text", group );

@ -20,6 +20,7 @@
#ifndef FOOMATIC2LOADER_H #ifndef FOOMATIC2LOADER_H
#define FOOMATIC2LOADER_H #define FOOMATIC2LOADER_H
#include <tqmap.h>
#include <tqvariant.h> #include <tqvariant.h>
#include <kdelibs_export.h> #include <kdelibs_export.h>

@ -39,7 +39,7 @@
* Boston, MA 02110-1301, USA. * Boston, MA 02110-1301, USA.
**/ **/
#define YYSTYPE QVariant #define YYSTYPE TQVariant
#define YYPARSE_PARAM fooloader #define YYPARSE_PARAM fooloader
#define YYDEBUG 1 #define YYDEBUG 1

@ -18,12 +18,12 @@
* Boston, MA 02110-1301, USA. * Boston, MA 02110-1301, USA.
**/ **/
#define YYSTYPE QVariant #define YYSTYPE TQVariant
#define YYPARSE_PARAM fooloader #define YYPARSE_PARAM fooloader
#define YYDEBUG 1 #define YYDEBUG 1
#include <stdlib.h> #include <stdlib.h>
#include <qvariant.h> #include <tqvariant.h>
#include "foomatic2loader.h" #include "foomatic2loader.h"
void yyerror(const char*) {} void yyerror(const char*) {}
@ -48,7 +48,7 @@ foodata: VAR '=' '{' fieldlist '}' ';' { static_cast<Foomatic2Loader*>(fooloa
; ;
fieldlist: assignment { $$ = $1; } fieldlist: assignment { $$ = $1; }
| fieldlist ',' assignment { QMap<QString,QVariant>::ConstIterator it = $3.mapBegin(); $1.asMap().insert(it.key(), it.data()); $$ = $1; } | fieldlist ',' assignment { TQMap<TQString,TQVariant>::ConstIterator it = $3.mapBegin(); $1.asMap().insert(it.key(), it.data()); $$ = $1; }
; ;
assignment: STRING '=' '>' value { $$.asMap().insert($1.toString(), $4); } assignment: STRING '=' '>' value { $$.asMap().insert($1.toString(), $4); }
@ -58,13 +58,13 @@ valuelist: value { $$.asList().append($1); }
| valuelist ',' value { $1.asList().append($3); $$ = $1; } | valuelist ',' value { $1.asList().append($3); $$ = $1; }
; ;
value: UNDEF { $$ = QVariant(); } value: UNDEF { $$ = TQVariant(); }
| STRING { $$ = $1; } | STRING { $$ = $1; }
| NUMBER { $$ = $1; } | NUMBER { $$ = $1; }
| '[' valuelist ']' { $$ = $2; } | '[' valuelist ']' { $$ = $2; }
| '{' fieldlist '}' { $$ = $2; } | '{' fieldlist '}' { $$ = $2; }
| '[' ']' { $$ = QVariant(); } | '[' ']' { $$ = TQVariant(); }
| '{' '}' { $$ = QVariant(); } | '{' '}' { $$ = TQVariant(); }
; ;
%% %%

@ -57,7 +57,7 @@ bool KdeprintChecker::check(KConfig *conf, const TQString& group)
{ {
if (!group.isEmpty()) if (!group.isEmpty())
conf->setGroup(group); conf->setGroup(group);
QStringList uris = conf->readListEntry("Require"); TQStringList uris = conf->readListEntry("Require");
return check(uris); return check(uris);
} }

@ -48,7 +48,7 @@ extern "C"
} }
} }
class StatusWindow : public QWidget class StatusWindow : public TQWidget
{ {
public: public:
StatusWindow(int pid = -1); StatusWindow(int pid = -1);
@ -56,14 +56,14 @@ public:
int pid() const { return m_pid; } int pid() const { return m_pid; }
private: private:
QLabel *m_label; TQLabel *m_label;
QPushButton *m_button; TQPushButton *m_button;
int m_pid; int m_pid;
QLabel *m_icon; TQLabel *m_icon;
}; };
StatusWindow::StatusWindow(int pid) StatusWindow::StatusWindow(int pid)
: TQWidget(NULL, "StatusWindow", WType_TopLevel|WStyle_DialogBorder|WStyle_StaysOnTop|WDestructiveClose), m_pid(pid) : TQWidget(NULL, "StatusWindow", (WFlags)(WType_TopLevel|WStyle_DialogBorder|WStyle_StaysOnTop|WDestructiveClose)), m_pid(pid)
{ {
m_label = new TQLabel(this); m_label = new TQLabel(this);
m_label->tqsetAlignment(AlignCenter); m_label->tqsetAlignment(AlignCenter);
@ -72,7 +72,7 @@ StatusWindow::StatusWindow(int pid)
m_icon->setPixmap(DesktopIcon("fileprint")); m_icon->setPixmap(DesktopIcon("fileprint"));
m_icon->tqsetAlignment(AlignCenter); m_icon->tqsetAlignment(AlignCenter);
KWin::setIcons(winId(), *(m_icon->pixmap()), SmallIcon("fileprint")); KWin::setIcons(winId(), *(m_icon->pixmap()), SmallIcon("fileprint"));
QGridLayout *l0 = new TQGridLayout(this, 2, 3, 10, 10); TQGridLayout *l0 = new TQGridLayout(this, 2, 3, 10, 10);
l0->setRowStretch(0, 1); l0->setRowStretch(0, 1);
l0->setColStretch(1, 1); l0->setColStretch(1, 1);
l0->addMultiCellWidget(m_label, 0, 0, 1, 2); l0->addMultiCellWidget(m_label, 0, 0, 1, 2);
@ -112,7 +112,7 @@ KDEPrintd::~KDEPrintd()
int KDEPrintd::print(const TQString& cmd, const TQStringList& files, bool remflag) int KDEPrintd::print(const TQString& cmd, const TQStringList& files, bool remflag)
{ {
KPrintProcess *proc = new KPrintProcess; KPrintProcess *proc = new KPrintProcess;
QString command(cmd); TQString command(cmd);
TQRegExp re( "\\$out\\{([^}]*)\\}" ); TQRegExp re( "\\$out\\{([^}]*)\\}" );
connect(proc,TQT_SIGNAL(printTerminated(KPrintProcess*)),TQT_SLOT(slotPrintTerminated(KPrintProcess*))); connect(proc,TQT_SIGNAL(printTerminated(KPrintProcess*)),TQT_SLOT(slotPrintTerminated(KPrintProcess*)));
@ -161,7 +161,7 @@ void KDEPrintd::slotPrintError( KPrintProcess *proc, const TQString& msg )
TQString KDEPrintd::openPassDlg(const TQString& user) TQString KDEPrintd::openPassDlg(const TQString& user)
{ {
QString user_(user), pass_, result; TQString user_(user), pass_, result;
if (KIO::PasswordDialog::getNameAndPassword(user_, pass_, NULL) == KDialog::Accepted) if (KIO::PasswordDialog::getNameAndPassword(user_, pass_, NULL) == KDialog::Accepted)
result.append(user_).append(":").append(pass_); result.append(user_).append(":").append(pass_);
return result; return result;
@ -263,7 +263,7 @@ void KDEPrintd::processRequest()
info.comment = i18n( "Printing system" ); info.comment = i18n( "Printing system" );
TQDataStream input( params, IO_WriteOnly ); TQDataStream input( params, IO_WriteOnly );
input << info << i18n( "Authentication failed (user name=%1)" ).arg( info.username ) << 0L << (long int) req->seqNbr; input << info << TQString(i18n( "Authentication failed (user name=%1)" ).arg( info.username )) << 0L << (long int) req->seqNbr;
if ( callingDcopClient()->call( "kded", "kpasswdserver", "queryAuthInfo(KIO::AuthInfo,TQString,long int,long int)", if ( callingDcopClient()->call( "kded", "kpasswdserver", "queryAuthInfo(KIO::AuthInfo,TQString,long int,long int)",
params, replyType, reply ) ) params, replyType, reply ) )
{ {

@ -149,8 +149,8 @@ KFileList::KFileList(TQWidget *parent, const char *name)
"Drag file(s) here or use the button to open a file dialog. " "Drag file(s) here or use the button to open a file dialog. "
"Leave empty for <b>&lt;STDIN&gt;</b>.")); "Leave empty for <b>&lt;STDIN&gt;</b>."));
QHBoxLayout *l0 = new TQHBoxLayout(this, 0, KDialog::spacingHint()); TQHBoxLayout *l0 = new TQHBoxLayout(this, 0, KDialog::spacingHint());
QVBoxLayout *l1 = new TQVBoxLayout(0, 0, 1); TQVBoxLayout *l1 = new TQVBoxLayout(0, 0, 1);
l0->addWidget(m_files); l0->addWidget(m_files);
l0->addLayout(l1); l0->addLayout(l1);
l1->addWidget(m_add); l1->addWidget(m_add);
@ -185,7 +185,7 @@ void KFileList::addFiles(const KURL::List& files)
if (files.count() > 0) if (files.count() > 0)
{ {
// search last item in current list, to add new ones at the end // search last item in current list, to add new ones at the end
QListViewItem *item = m_files->firstChild(); TQListViewItem *item = m_files->firstChild();
while (item && item->nextSibling()) while (item && item->nextSibling())
item = item->nextSibling(); item = item->nextSibling();
@ -225,8 +225,8 @@ void KFileList::setFileList(const TQStringList& files)
TQStringList KFileList::fileList() const TQStringList KFileList::fileList() const
{ {
QStringList l; TQStringList l;
QListViewItem *item = m_files->firstChild(); TQListViewItem *item = m_files->firstChild();
while (item) while (item)
{ {
l << item->text(2); l << item->text(2);
@ -255,7 +255,7 @@ void KFileList::slotRemoveFile()
void KFileList::slotOpenFile() void KFileList::slotOpenFile()
{ {
QListViewItem *item = m_files->currentItem(); TQListViewItem *item = m_files->currentItem();
if (item) if (item)
{ {
KURL url( item->text( 2 ) ); KURL url( item->text( 2 ) );
@ -271,7 +271,7 @@ TQSize KFileList::tqsizeHint() const
void KFileList::selection(TQPtrList<TQListViewItem>& l) void KFileList::selection(TQPtrList<TQListViewItem>& l)
{ {
l.setAutoDelete(false); l.setAutoDelete(false);
QListViewItem *item = m_files->firstChild(); TQListViewItem *item = m_files->firstChild();
while (item) while (item)
{ {
if (item->isSelected()) if (item->isSelected())
@ -299,7 +299,7 @@ void KFileList::slotUp()
selection(l); selection(l);
if (l.count() == 1 && l.first()->itemAbove()) if (l.count() == 1 && l.first()->itemAbove())
{ {
QListViewItem *item(l.first()), *clone; TQListViewItem *item(l.first()), *clone;
clone = new TQListViewItem(m_files, item->itemAbove()->itemAbove(), item->text(0), item->text(1), item->text(2)); clone = new TQListViewItem(m_files, item->itemAbove()->itemAbove(), item->text(0), item->text(1), item->text(2));
clone->setPixmap(0, *(item->pixmap(0))); clone->setPixmap(0, *(item->pixmap(0)));
delete item; delete item;
@ -314,7 +314,7 @@ void KFileList::slotDown()
selection(l); selection(l);
if (l.count() == 1 && l.first()->itemBelow()) if (l.count() == 1 && l.first()->itemBelow())
{ {
QListViewItem *item(l.first()), *clone; TQListViewItem *item(l.first()), *clone;
clone = new TQListViewItem(m_files, item->itemBelow(), item->text(0), item->text(1), item->text(2)); clone = new TQListViewItem(m_files, item->itemBelow(), item->text(0), item->text(1), item->text(2));
clone->setPixmap(0, *(item->pixmap(0))); clone->setPixmap(0, *(item->pixmap(0)));
delete item; delete item;

@ -55,7 +55,7 @@ protected:
private: private:
KListView *m_files; KListView *m_files;
QToolButton *m_add, *m_remove, *m_open, *m_up, *m_down; TQToolButton *m_add, *m_remove, *m_open, *m_up, *m_down;
bool m_block; bool m_block;
}; };

@ -28,19 +28,19 @@
struct KDEPRINT_EXPORT KMDBEntry struct KDEPRINT_EXPORT KMDBEntry
{ {
// the file location of the driver // the file location of the driver
QString file; TQString file;
// normal information // normal information
QString manufacturer; TQString manufacturer;
QString model; TQString model;
QString modelname; TQString modelname;
// information used for auto-detection // information used for auto-detection
QString pnpmanufacturer; TQString pnpmanufacturer;
QString pnpmodel; TQString pnpmodel;
// short driver description (if any) // short driver description (if any)
QString description; TQString description;
// tell whether this is the recommended driver // tell whether this is the recommended driver
bool recommended; bool recommended;
QString drivercomment; TQString drivercomment;
KMDBEntry(); KMDBEntry();
bool validate(bool checkIt = true); bool validate(bool checkIt = true);

@ -209,11 +209,11 @@ void KMFactory::loadFactory(const TQString& syst)
{ {
if (!m_factory) if (!m_factory)
{ {
QString sys(syst); TQString sys(syst);
if (sys.isEmpty()) if (sys.isEmpty())
// load default configured print plugin // load default configured print plugin
sys = printSystem(); sys = printSystem();
QString libname = TQString::tqfromLatin1("kdeprint_%1").arg(sys); TQString libname = TQString::tqfromLatin1("kdeprint_%1").arg(sys);
m_factory = KLibLoader::self()->factory(TQFile::encodeName(libname)); m_factory = KLibLoader::self()->factory(TQFile::encodeName(libname));
if (!m_factory) if (!m_factory)
{ {
@ -240,7 +240,7 @@ TQString KMFactory::printSystem()
{ {
KConfig *conf = printConfig(); KConfig *conf = printConfig();
conf->setGroup("General"); conf->setGroup("General");
QString sys = conf->readEntry("PrintSystem"); TQString sys = conf->readEntry("PrintSystem");
if (sys.isEmpty()) if (sys.isEmpty())
{ {
// perform auto-detection (will at least return "lpdunix") // perform auto-detection (will at least return "lpdunix")
@ -295,7 +295,7 @@ void KMFactory::reload(const TQString& syst, bool saveSyst)
TQValueList<KMFactory::PluginInfo> KMFactory::pluginList() TQValueList<KMFactory::PluginInfo> KMFactory::pluginList()
{ {
QDir d(locate("data", "kdeprint/plugins/"), "*.print", TQDir::Name, TQDir::Files); TQDir d(locate("data", "kdeprint/plugins/"), "*.print", TQDir::Name, TQDir::Files);
TQValueList<PluginInfo> list; TQValueList<PluginInfo> list;
for (uint i=0; i<d.count(); i++) for (uint i=0; i<d.count(); i++)
{ {
@ -309,7 +309,7 @@ TQValueList<KMFactory::PluginInfo> KMFactory::pluginList()
KMFactory::PluginInfo KMFactory::pluginInfo(const TQString& name) KMFactory::PluginInfo KMFactory::pluginInfo(const TQString& name)
{ {
QString path(name); TQString path(name);
if (path[0] != '/') if (path[0] != '/')
path = locate("data", TQString::tqfromLatin1("kdeprint/plugins/%1.print").arg(name)); path = locate("data", TQString::tqfromLatin1("kdeprint/plugins/%1.print").arg(name));
KSimpleConfig conf(path); KSimpleConfig conf(path);
@ -333,7 +333,7 @@ KMFactory::PluginInfo KMFactory::pluginInfo(const TQString& name)
void KMFactory::registerObject(KPReloadObject *obj, bool priority) void KMFactory::registerObject(KPReloadObject *obj, bool priority)
{ {
// check if object already registered, then add it // check if object already registered, then add it
if (m_objects.findRef(obj) == -1) if (m_objects.tqfindRef(obj) == -1)
{ {
if (priority) if (priority)
m_objects.prepend(obj); m_objects.prepend(obj);
@ -376,7 +376,7 @@ void KMFactory::slot_pluginChanged(pid_t pid)
UNLOAD_OBJECT(m_printconfig); UNLOAD_OBJECT(m_printconfig);
// Then reload everything and notified registered objects. // Then reload everything and notified registered objects.
// Do NOT re-save the new print system. // Do NOT re-save the new print system.
QString syst = printSystem(); TQString syst = printSystem();
reload(syst, false); reload(syst, false);
} }
} }
@ -412,7 +412,7 @@ void KMFactory::saveConfig()
// need to reload the config file. // need to reload the config file.
} }
QPair<TQString,TQString> KMFactory::requestPassword( int& seqNbr, const TQString& user, const TQString& host, int port ) TQPair<TQString,TQString> KMFactory::requestPassword( int& seqNbr, const TQString& user, const TQString& host, int port )
{ {
DCOPRef kdeprintd( "kded", "kdeprintd" ); DCOPRef kdeprintd( "kded", "kdeprintd" );
/** /**
@ -431,11 +431,11 @@ QPair<TQString,TQString> KMFactory::requestPassword( int& seqNbr, const TQString
if ( l.count() == 3 ) if ( l.count() == 3 )
{ {
seqNbr = l[ 2 ].toInt(); seqNbr = l[ 2 ].toInt();
return QPair<TQString,TQString>( l[ 0 ], l[ 1 ] ); return TQPair<TQString,TQString>( l[ 0 ], l[ 1 ] );
} }
} }
} }
return QPair<TQString,TQString>( TQString::null, TQString::null ); return TQPair<TQString,TQString>( TQString::null, TQString::null );
} }
void KMFactory::initPassword( const TQString& user, const TQString& password, const TQString& host, int port ) void KMFactory::initPassword( const TQString& user, const TQString& password, const TQString& host, int port )

@ -50,12 +50,12 @@ class KDEPRINT_EXPORT KMFactory : public TQObject, public DCOPObject
public: public:
struct PluginInfo struct PluginInfo
{ {
QString name; TQString name;
QString comment; TQString comment;
QStringList detectUris; TQStringList detectUris;
int detectPrecedence; int detectPrecedence;
QStringList mimeTypes; TQStringList mimeTypes;
QString primaryMimeType; TQString primaryMimeType;
}; };
static KMFactory* self(); static KMFactory* self();
@ -92,7 +92,7 @@ public:
}; };
Settings* settings() const { return m_settings; } Settings* settings() const { return m_settings; }
QPair<TQString,TQString> requestPassword( int& seqNbr, const TQString& user, const TQString& host = "localhost", int port = 0 ); TQPair<TQString,TQString> requestPassword( int& seqNbr, const TQString& user, const TQString& host = "localhost", int port = 0 );
void initPassword( const TQString& user, const TQString& password, const TQString& host = "localhsot", int port = 0 ); void initPassword( const TQString& user, const TQString& password, const TQString& host = "localhsot", int port = 0 );
k_dcop: k_dcop:

@ -163,7 +163,7 @@ bool KMManager::setDefaultPrinter(const TQString& name)
bool KMManager::testPrinter(KMPrinter *prt) bool KMManager::testPrinter(KMPrinter *prt)
{ {
// standard Test mechanism // standard Test mechanism
QString testpage = testPage(); TQString testpage = testPage();
if (testpage.isEmpty()) if (testpage.isEmpty())
{ {
setErrorMsg(i18n("Unable to locate test page.")); setErrorMsg(i18n("Unable to locate test page."));
@ -352,7 +352,7 @@ bool KMManager::savePrinterDriver(KMPrinter*,DrMain*)
bool KMManager::uncompressFile(const TQString& filename, TQString& destname) bool KMManager::uncompressFile(const TQString& filename, TQString& destname)
{ {
QFile f(filename); TQFile f(filename);
bool result(true); bool result(true);
destname = TQString::null; destname = TQString::null;
if (f.exists() && f.open(IO_ReadOnly)) if (f.exists() && f.open(IO_ReadOnly))
@ -458,7 +458,7 @@ bool KMManager::createSpecialPrinter(KMPrinter *p)
bool KMManager::removeSpecialPrinter(KMPrinter *p) bool KMManager::removeSpecialPrinter(KMPrinter *p)
{ {
if (p && p->isSpecial() && m_printers.findRef(p) != -1) if (p && p->isSpecial() && m_printers.tqfindRef(p) != -1)
{ {
m_printers.removeRef(p); m_printers.removeRef(p);
return m_specialmgr->savePrinters(); return m_specialmgr->savePrinters();
@ -473,9 +473,9 @@ bool KMManager::removeSpecialPrinter(KMPrinter *p)
*/ */
TQStringList KMManager::detectLocalPrinters() TQStringList KMManager::detectLocalPrinters()
{ {
QStringList list; TQStringList list;
for (int i=0; i<3; i++) for (int i=0; i<3; i++)
list << TQString::null << TQString::tqfromLatin1("parallel:/dev/lp%1").arg(i) << i18n("Parallel Port #%1").arg(i+1) << TQString::null; list << TQString() << TQString::tqfromLatin1("parallel:/dev/lp%1").arg(i) << i18n("Parallel Port #%1").arg(i+1) << TQString();
return list; return list;
} }

@ -165,7 +165,7 @@ bool KMPrinter::autoConfigure(KPrinter *printer, TQWidget *parent)
fName = ( printer->docName() + "." + ext ); fName = ( printer->docName() + "." + ext );
else else
{ {
int p = fName.findRev( '.' ); int p = fName.tqfindRev( '.' );
if ( p == -1 ) if ( p == -1 )
fName.append( "." ).append( ext ); fName.append( "." ).append( ext );
else else

@ -147,7 +147,7 @@ public:
void setOwnSoftDefault(bool on) { m_ownsoftdefault = on; } void setOwnSoftDefault(bool on) { m_ownsoftdefault = on; }
static int compare(KMPrinter *p1, KMPrinter *p2); static int compare(KMPrinter *p1, KMPrinter *p2);
const TQString& option(const TQString& key) const { return m_options[key]; } const TQString& option(const TQString& key) const { return m_options[key]; }
bool hasOption(const TQString& key) const { return m_options.contains(key); } bool hasOption(const TQString& key) const { return m_options.tqcontains(key); }
void setOption(const TQString& key, const TQString& value) { if (!key.isEmpty()) m_options[key] = value; } void setOption(const TQString& key, const TQString& value) { if (!key.isEmpty()) m_options[key] = value; }
void removeOption(const TQString& key) { m_options.remove(key); } void removeOption(const TQString& key) { m_options.remove(key); }
TQMap<TQString,TQString> options() const { return m_options; } TQMap<TQString,TQString> options() const { return m_options; }
@ -176,33 +176,33 @@ public:
protected: protected:
// mandantory information // mandantory information
QString m_name; // identification name TQString m_name; // identification name
QString m_printername; // real printer name TQString m_printername; // real printer name
QString m_instancename; // instance name (human-readable) TQString m_instancename; // instance name (human-readable)
int m_type; // printer type (any PrinterType flag OR-ed together) int m_type; // printer type (any PrinterType flag OR-ed together)
PrinterState m_state; // printer state PrinterState m_state; // printer state
/** /**
* Represent the device as a string, to provide native * Represent the device as a string, to provide native
* support for exotic devices. Conversion to URL is done * support for exotic devices. Conversion to URL is done
* only when really needed * only when really needed
*/ */
QString m_device; // printer device TQString m_device; // printer device
// class specific information // class specific information
QStringList m_members; // members of the class TQStringList m_members; // members of the class
// other useful information that should be completed by manager on demand // other useful information that should be completed by manager on demand
QString m_description; // short description, comment TQString m_description; // short description, comment
QString m_location; // printer location TQString m_location; // printer location
KURL m_uri; // URI printer identification KURL m_uri; // URI printer identification
QString m_manufacturer; // printer manufacturer (driver) TQString m_manufacturer; // printer manufacturer (driver)
QString m_model; // printer model (driver) TQString m_model; // printer model (driver)
QString m_driverinfo; // short driver info (ex: nick name in PPD) TQString m_driverinfo; // short driver info (ex: nick name in PPD)
// DB driver entry (used when creating a printer). Internal use only !!! // DB driver entry (used when creating a printer). Internal use only !!!
KMDBEntry *m_dbentry; KMDBEntry *m_dbentry;
DrMain *m_driver; DrMain *m_driver;
QString m_pixmap; TQString m_pixmap;
// default flags // default flags
bool m_harddefault; bool m_harddefault;

@ -107,11 +107,11 @@ bool KMSpecialManager::loadPrinters()
if (m_loaded) return true; if (m_loaded) return true;
bool result(true); bool result(true);
QString localDir = KGlobal::dirs()->localkdedir(); TQString localDir = KGlobal::dirs()->localkdedir();
QStringList files = KGlobal::dirs()->findAllResources("data", "kdeprint/specials.desktop"); TQStringList files = KGlobal::dirs()->findAllResources("data", "kdeprint/specials.desktop");
// local files should processed last, so we need to reorder the list // local files should processed last, so we need to reorder the list
// and put local files at the end // and put local files at the end
QStringList orderedFiles; TQStringList orderedFiles;
for (TQStringList::ConstIterator it=files.begin(); it!=files.end(); ++it) for (TQStringList::ConstIterator it=files.begin(); it!=files.end(); ++it)
{ {
if ((*it).startsWith(localDir)) if ((*it).startsWith(localDir))

@ -50,10 +50,10 @@ TQString KMThreadJob::jobFile()
bool KMThreadJob::saveJobs() bool KMThreadJob::saveJobs()
{ {
QFile f(jobFile()); TQFile f(jobFile());
if (f.open(IO_WriteOnly)) if (f.open(IO_WriteOnly))
{ {
QTextStream t(&f); TQTextStream t(&f);
TQIntDictIterator<KMJob> it(m_jobs); TQIntDictIterator<KMJob> it(m_jobs);
for (;it.current();++it) for (;it.current();++it)
t << it.current()->id() << CHARSEP << it.current()->name() << CHARSEP << it.current()->printer() << CHARSEP << it.current()->owner() << CHARSEP << it.current()->size() << endl; t << it.current()->id() << CHARSEP << it.current()->name() << CHARSEP << it.current()->printer() << CHARSEP << it.current()->owner() << CHARSEP << it.current()->size() << endl;
@ -64,11 +64,11 @@ bool KMThreadJob::saveJobs()
bool KMThreadJob::loadJobs() bool KMThreadJob::loadJobs()
{ {
QFile f(jobFile()); TQFile f(jobFile());
if (f.exists() && f.open(IO_ReadOnly)) if (f.exists() && f.open(IO_ReadOnly))
{ {
QTextStream t(&f); TQTextStream t(&f);
QString line; TQString line;
m_jobs.clear(); m_jobs.clear();
while (!t.eof()) while (!t.eof())

@ -143,7 +143,7 @@ void KMUiManager::setupPropertyDialog(KPrinterPropertyDialog *dlg)
// retrieve the KPrinter object // retrieve the KPrinter object
KPrinter *prt(0); KPrinter *prt(0);
if (dlg->parent() && dlg->parent()->isA("KPrintDialog")) if (dlg->parent() && dlg->tqparent()->isA("KPrintDialog"))
prt = static_cast<KPrintDialog*>(dlg->parent())->printer(); prt = static_cast<KPrintDialog*>(dlg->parent())->printer();
// add margin page // add margin page

@ -179,8 +179,8 @@ void KMVirtualManager::setAsDefault(KMPrinter *p, const TQString& name, TQWidget
void KMVirtualManager::refresh() void KMVirtualManager::refresh()
{ {
QFileInfo fi(TQDir::homeDirPath() + TQFile::decodeName("/.cups/.lpoptions")); TQFileInfo fi(TQDir::homeDirPath() + TQFile::decodeName("/.cups/.lpoptions"));
QFileInfo fi2(TQFile::decodeName("/etc/cups/lpoptions")); TQFileInfo fi2(TQFile::decodeName("/etc/cups/lpoptions"));
// if root, then only use global file: trick -> use twice the same file // if root, then only use global file: trick -> use twice the same file
if (getuid() == 0) if (getuid() == 0)
@ -246,14 +246,14 @@ void KMVirtualManager::virtualList(TQPtrList<KMPrinter>& list, const TQString& p
void KMVirtualManager::loadFile(const TQString& filename) void KMVirtualManager::loadFile(const TQString& filename)
{ {
QFile f(filename); TQFile f(filename);
if (f.exists() && f.open(IO_ReadOnly)) if (f.exists() && f.open(IO_ReadOnly))
{ {
QTextStream t(&f); TQTextStream t(&f);
QString line; TQString line;
QStringList words; TQStringList words;
QStringList pair; TQStringList pair;
KMPrinter *printer, *realprinter; KMPrinter *printer, *realprinter;
while (!t.eof()) while (!t.eof())
@ -317,10 +317,10 @@ void KMVirtualManager::triggerSave()
void KMVirtualManager::saveFile(const TQString& filename) void KMVirtualManager::saveFile(const TQString& filename)
{ {
QFile f(filename); TQFile f(filename);
if (f.open(IO_WriteOnly)) if (f.open(IO_WriteOnly))
{ {
QTextStream t(&f); TQTextStream t(&f);
TQPtrListIterator<KMPrinter> it(m_manager->m_printers); TQPtrListIterator<KMPrinter> it(m_manager->m_printers);
for (;it.current();++it) for (;it.current();++it)
{ {
@ -347,7 +347,7 @@ void KMVirtualManager::saveFile(const TQString& filename)
bool KMVirtualManager::testInstance(KMPrinter *p) bool KMVirtualManager::testInstance(KMPrinter *p)
{ {
QString testpage = KMManager::self()->testPage(); TQString testpage = KMManager::self()->testPage();
if (testpage.isEmpty()) if (testpage.isEmpty())
return false; return false;
else else

@ -164,7 +164,7 @@ KPCopiesPage::KPCopiesPage(KPrinter *prt, TQWidget *parent, const char *name)
setId(KPrinter::CopiesPage); setId(KPrinter::CopiesPage);
// widget creation // widget creation
QButtonGroup *m_pagebox = new TQButtonGroup(0, Qt::Vertical, i18n("Page Selection"), this); TQButtonGroup *m_pagebox = new TQButtonGroup(0, Qt::Vertical, i18n("Page Selection"), this);
TQWhatsThis::add(m_pagebox, whatsThisPageSelectionLabel); TQWhatsThis::add(m_pagebox, whatsThisPageSelectionLabel);
m_all = new TQRadioButton(i18n("&All"), m_pagebox); m_all = new TQRadioButton(i18n("&All"), m_pagebox);
TQWhatsThis::add(m_all, whatsThisAllPagesLabel); TQWhatsThis::add(m_all, whatsThisAllPagesLabel);
@ -177,9 +177,9 @@ KPCopiesPage::KPCopiesPage(KPrinter *prt, TQWidget *parent, const char *name)
connect(m_range, TQT_SIGNAL(clicked()), m_rangeedit, TQT_SLOT(setFocus())); connect(m_range, TQT_SIGNAL(clicked()), m_rangeedit, TQT_SLOT(setFocus()));
TQToolTip::add(m_rangeedit, i18n("<p>Enter pages or group of pages to print separated by commas (1,2-5,8).</p>")); TQToolTip::add(m_rangeedit, i18n("<p>Enter pages or group of pages to print separated by commas (1,2-5,8).</p>"));
// TQWhatsThis::add(m_rangeedit, i18n("<p>Enter pages or group of pages to print separated by commas (1,2-5,8).</p>")); // TQWhatsThis::add(m_rangeedit, i18n("<p>Enter pages or group of pages to print separated by commas (1,2-5,8).</p>"));
//QLabel *m_rangeexpl = new TQLabel(m_pagebox); //TQLabel *m_rangeexpl = new TQLabel(m_pagebox);
//m_rangeexpl->setText(i18n("<p>Enter pages or group of pages to print separated by commas (1,2-5,8).</p>")); //m_rangeexpl->setText(i18n("<p>Enter pages or group of pages to print separated by commas (1,2-5,8).</p>"));
QGroupBox *m_copybox = new TQGroupBox(0, Qt::Vertical, i18n("Output Settings"), this); TQGroupBox *m_copybox = new TQGroupBox(0, Qt::Vertical, i18n("Output Settings"), this);
TQWhatsThis::add(m_copybox, whatsThisCopiesLabel); TQWhatsThis::add(m_copybox, whatsThisCopiesLabel);
m_collate = new TQCheckBox(i18n("Co&llate"), m_copybox); m_collate = new TQCheckBox(i18n("Co&llate"), m_copybox);
TQWhatsThis::add(m_collate, whatsThisCollateLabel); TQWhatsThis::add(m_collate, whatsThisCollateLabel);
@ -188,7 +188,7 @@ KPCopiesPage::KPCopiesPage(KPrinter *prt, TQWidget *parent, const char *name)
m_collatepix = new TQLabel(m_copybox); m_collatepix = new TQLabel(m_copybox);
m_collatepix->tqsetAlignment(Qt::AlignCenter); m_collatepix->tqsetAlignment(Qt::AlignCenter);
m_collatepix->setMinimumHeight(70); m_collatepix->setMinimumHeight(70);
QLabel *m_copieslabel = new TQLabel(i18n("Cop&ies:"), m_copybox); TQLabel *m_copieslabel = new TQLabel(i18n("Cop&ies:"), m_copybox);
m_copies = new TQSpinBox(m_copybox); m_copies = new TQSpinBox(m_copybox);
m_copies->setRange(1,999); m_copies->setRange(1,999);
TQWhatsThis::add(m_copies, whatsThisNumberOfCopiesLabel); TQWhatsThis::add(m_copies, whatsThisNumberOfCopiesLabel);
@ -199,10 +199,10 @@ KPCopiesPage::KPCopiesPage(KPrinter *prt, TQWidget *parent, const char *name)
m_pageset->insertItem(i18n("Odd Pages")); m_pageset->insertItem(i18n("Odd Pages"));
m_pageset->insertItem(i18n("Even Pages")); m_pageset->insertItem(i18n("Even Pages"));
TQWhatsThis::add(m_pageset, whatsThisPageSetLabel); TQWhatsThis::add(m_pageset, whatsThisPageSetLabel);
QLabel *m_pagesetlabel = new TQLabel(i18n("Page &set:"), m_pagebox); TQLabel *m_pagesetlabel = new TQLabel(i18n("Page &set:"), m_pagebox);
m_pagesetlabel->setBuddy(m_pageset); m_pagesetlabel->setBuddy(m_pageset);
TQWhatsThis::add(m_pagesetlabel, whatsThisPageSetLabel); TQWhatsThis::add(m_pagesetlabel, whatsThisPageSetLabel);
KSeparator *sepline = new KSeparator(Horizontal, m_pagebox); KSeparator *sepline = new KSeparator(Qt::Horizontal, m_pagebox);
sepline->setMinimumHeight(10); sepline->setMinimumHeight(10);
TQWidget::setTabOrder( m_all, m_current ); TQWidget::setTabOrder( m_all, m_current );
@ -214,26 +214,26 @@ KPCopiesPage::KPCopiesPage(KPrinter *prt, TQWidget *parent, const char *name)
TQWidget::setTabOrder( m_collate, m_order ); TQWidget::setTabOrder( m_collate, m_order );
// layout creation // layout creation
QGridLayout *l1 = new TQGridLayout(this, 2, 2, 0, 5); TQGridLayout *l1 = new TQGridLayout(this, 2, 2, 0, 5);
l1->setRowStretch(1,1); l1->setRowStretch(1,1);
l1->setColStretch(0,1); l1->setColStretch(0,1);
l1->setColStretch(1,1); l1->setColStretch(1,1);
l1->addWidget(m_pagebox,0,0); l1->addWidget(m_pagebox,0,0);
l1->addWidget(m_copybox,0,1); l1->addWidget(m_copybox,0,1);
QVBoxLayout *l3 = new TQVBoxLayout(m_pagebox->layout(), 5); TQVBoxLayout *l3 = new TQVBoxLayout(TQT_TQLAYOUT(m_pagebox->layout()), 5);
l3->addWidget(m_all); l3->addWidget(m_all);
l3->addWidget(m_current); l3->addWidget(m_current);
QHBoxLayout *l4 = new TQHBoxLayout(0, 0, 5); TQHBoxLayout *l4 = new TQHBoxLayout(0, 0, 5);
l3->addLayout(l4); l3->addLayout(l4);
l4->addWidget(m_range,0); l4->addWidget(m_range,0);
l4->addWidget(m_rangeedit,1); l4->addWidget(m_rangeedit,1);
//l3->addWidget(m_rangeexpl); //l3->addWidget(m_rangeexpl);
l3->addWidget(sepline); l3->addWidget(sepline);
QHBoxLayout *l2 = new TQHBoxLayout(0, 0, 5); TQHBoxLayout *l2 = new TQHBoxLayout(0, 0, 5);
l3->addLayout(l2); l3->addLayout(l2);
l2->addWidget(m_pagesetlabel,0); l2->addWidget(m_pagesetlabel,0);
l2->addWidget(m_pageset,1); l2->addWidget(m_pageset,1);
QGridLayout *l5 = new TQGridLayout(m_copybox->layout(), 4, 2, 10); TQGridLayout *l5 = new TQGridLayout(m_copybox->layout(), 4, 2, 10);
l5->setRowStretch(4,1); l5->setRowStretch(4,1);
l5->addWidget(m_copieslabel,0,0); l5->addWidget(m_copieslabel,0,0);
l5->addWidget(m_copies,0,1); l5->addWidget(m_copies,0,1);
@ -270,7 +270,7 @@ void KPCopiesPage::slotRangeEntered()
void KPCopiesPage::slotCollateClicked() void KPCopiesPage::slotCollateClicked()
{ {
QString s("kdeprint_"); TQString s("kdeprint_");
s.append((m_collate->isChecked() ? "collate" : "uncollate")); s.append((m_collate->isChecked() ? "collate" : "uncollate"));
if (m_order->isChecked()) s.append("_reverse"); if (m_order->isChecked()) s.append("_reverse");
m_collatepix->setPixmap(UserIcon(s)); m_collatepix->setPixmap(UserIcon(s));
@ -295,7 +295,7 @@ void KPCopiesPage::initialize(bool usePlugin)
void KPCopiesPage::setOptions(const TQMap<TQString,TQString>& options) void KPCopiesPage::setOptions(const TQMap<TQString,TQString>& options)
{ {
QString value; TQString value;
// copies // copies
value = options["kde-copies"]; value = options["kde-copies"];
if (!value.isEmpty()) m_copies->setValue(value.toInt()); if (!value.isEmpty()) m_copies->setValue(value.toInt());

@ -50,12 +50,12 @@ protected:
void reload(); void reload();
protected: protected:
QRadioButton *m_all, *m_current, *m_range; TQRadioButton *m_all, *m_current, *m_range;
QLineEdit *m_rangeedit; TQLineEdit *m_rangeedit;
QComboBox *m_pageset; TQComboBox *m_pageset;
QCheckBox *m_collate, *m_order; TQCheckBox *m_collate, *m_order;
QSpinBox *m_copies; TQSpinBox *m_copies;
QLabel *m_collatepix; TQLabel *m_collatepix;
bool m_useplugin; bool m_useplugin;
KPrinter *m_printer; KPrinter *m_printer;

@ -33,7 +33,7 @@ KPDriverPage::KPDriverPage(KMPrinter *p, DrMain *d, TQWidget *parent, const char
m_view->setAllowFixed(false); m_view->setAllowFixed(false);
if (driver()) m_view->setDriver(driver()); if (driver()) m_view->setDriver(driver());
QVBoxLayout *lay1 = new TQVBoxLayout(this, 0, 0); TQVBoxLayout *lay1 = new TQVBoxLayout(this, 0, 0);
lay1->addWidget(m_view); lay1->addWidget(m_view);
} }

@ -35,7 +35,7 @@ KPFileSelectPage::KPFileSelectPage(TQWidget *parent, const char *name)
m_files = new KFileList(this); m_files = new KFileList(this);
QHBoxLayout *l0 = new TQHBoxLayout(this, 0, 10); TQHBoxLayout *l0 = new TQHBoxLayout(this, 0, 10);
l0->addWidget(m_files); l0->addWidget(m_files);
resize(100, 100); resize(100, 100);
@ -47,7 +47,7 @@ void KPFileSelectPage::getOptions(TQMap<TQString,TQString>& opts, bool incldef)
// and we want to do it only once // and we want to do it only once
if (!incldef) if (!incldef)
{ {
QStringList l = m_files->fileList(); TQStringList l = m_files->fileList();
opts["kde-filelist"] = l.join("@@"); opts["kde-filelist"] = l.join("@@");
} }
} }
@ -57,7 +57,7 @@ void KPFileSelectPage::setOptions(const TQMap<TQString,TQString>& opts)
// do it only once as files will only be selected there // do it only once as files will only be selected there
if (m_first) if (m_first)
{ {
QStringList l = TQStringList::split("@@", opts["kde-filelist"], false); TQStringList l = TQStringList::split("@@", opts["kde-filelist"], false);
m_files->setFileList(l); m_files->setFileList(l);
m_first = false; m_first = false;

@ -174,9 +174,9 @@ KPFilterPage::KPFilterPage(TQWidget *parent, const char *name)
m_info->setFrameStyle( TQFrame::Panel|TQFrame::Sunken ); m_info->setFrameStyle( TQFrame::Panel|TQFrame::Sunken );
m_info->setMinimumSize( TQSize( 240, 100 ) ); m_info->setMinimumSize( TQSize( 240, 100 ) );
QGridLayout *l1 = new TQGridLayout(this, 2, 2, 0, KDialog::spacingHint()); TQGridLayout *l1 = new TQGridLayout(this, 2, 2, 0, KDialog::spacingHint());
l1->setColStretch(0, 1); l1->setColStretch(0, 1);
QVBoxLayout *l2 = new TQVBoxLayout(0, 0, 1); TQVBoxLayout *l2 = new TQVBoxLayout(0, 0, 1);
l1->addWidget(m_view, 0, 0); l1->addWidget(m_view, 0, 0);
l1->addLayout(l2, 0, 1); l1->addLayout(l2, 0, 1);
l2->addWidget(m_add); l2->addWidget(m_add);
@ -199,7 +199,7 @@ KPFilterPage::~KPFilterPage()
void KPFilterPage::updateButton() void KPFilterPage::updateButton()
{ {
/* QListViewItem *item = m_view->currentItem(); /* TQListViewItem *item = m_view->currentItem();
bool state=(item!=0); bool state=(item!=0);
m_remove->setEnabled(state); m_remove->setEnabled(state);
m_up->setEnabled((state && item->itemAbove() != 0)); m_up->setEnabled((state && item->itemAbove() != 0));
@ -216,9 +216,9 @@ void KPFilterPage::slotAddClicked()
{ {
KXmlCommand *cmd = KXmlCommandManager::self()->loadCommand(choice); KXmlCommand *cmd = KXmlCommandManager::self()->loadCommand(choice);
if (!cmd) return; // Error if (!cmd) return; // Error
QStringList filters = activeList(); TQStringList filters = activeList();
int pos = KXmlCommandManager::self()->insertCommand(filters, cmd->name()); int pos = KXmlCommandManager::self()->insertCommand(filters, cmd->name());
QListViewItem *prev(0); TQListViewItem *prev(0);
if (pos > 0) if (pos > 0)
{ {
prev = m_view->firstChild(); prev = m_view->firstChild();
@ -226,7 +226,7 @@ void KPFilterPage::slotAddClicked()
prev = prev->nextSibling(); prev = prev->nextSibling();
} }
m_activefilters.insert(cmd->name(), cmd); m_activefilters.insert(cmd->name(), cmd);
QListViewItem *item = new TQListViewItem(m_view, prev, cmd->description(), cmd->name()); TQListViewItem *item = new TQListViewItem(m_view, prev, cmd->description(), cmd->name());
item->setPixmap(0, SmallIcon("filter")); item->setPixmap(0, SmallIcon("filter"));
checkFilterChain(); checkFilterChain();
} }
@ -236,7 +236,7 @@ void KPFilterPage::slotRemoveClicked()
{ {
if (m_view->selectedItem()) if (m_view->selectedItem())
{ {
QString idname = m_view->selectedItem()->text(1); TQString idname = m_view->selectedItem()->text(1);
delete m_view->selectedItem(); delete m_view->selectedItem();
m_activefilters.remove(idname); m_activefilters.remove(idname);
checkFilterChain(); checkFilterChain();
@ -248,10 +248,10 @@ void KPFilterPage::slotRemoveClicked()
void KPFilterPage::slotUpClicked() void KPFilterPage::slotUpClicked()
{ {
QListViewItem *item = m_view->selectedItem(); TQListViewItem *item = m_view->selectedItem();
if (item && item->itemAbove()) if (item && item->itemAbove())
{ {
QListViewItem *clone = new TQListViewItem(m_view,item->itemAbove()->itemAbove(),item->text(0),item->text(1)); TQListViewItem *clone = new TQListViewItem(m_view,item->itemAbove()->itemAbove(),item->text(0),item->text(1));
clone->setPixmap(0, SmallIcon("filter")); clone->setPixmap(0, SmallIcon("filter"));
delete item; delete item;
m_view->setSelected(clone, true); m_view->setSelected(clone, true);
@ -261,10 +261,10 @@ void KPFilterPage::slotUpClicked()
void KPFilterPage::slotDownClicked() void KPFilterPage::slotDownClicked()
{ {
QListViewItem *item = m_view->selectedItem(); TQListViewItem *item = m_view->selectedItem();
if (item && item->itemBelow()) if (item && item->itemBelow())
{ {
QListViewItem *clone = new TQListViewItem(m_view,item->itemBelow(),item->text(0),item->text(1)); TQListViewItem *clone = new TQListViewItem(m_view,item->itemBelow(),item->text(0),item->text(1));
clone->setPixmap(0, SmallIcon("filter")); clone->setPixmap(0, SmallIcon("filter"));
delete item; delete item;
m_view->setSelected(clone, true); m_view->setSelected(clone, true);
@ -290,7 +290,7 @@ void KPFilterPage::slotItemSelected(TQListViewItem *item)
void KPFilterPage::setOptions(const TQMap<TQString,TQString>& opts) void KPFilterPage::setOptions(const TQMap<TQString,TQString>& opts)
{ {
QStringList filters = TQStringList::split(',',opts["_kde-filters"],false); TQStringList filters = TQStringList::split(',',opts["_kde-filters"],false);
// remove unneeded filters // remove unneeded filters
TQDictIterator<KXmlCommand> dit(m_activefilters); TQDictIterator<KXmlCommand> dit(m_activefilters);
for (;dit.current();) for (;dit.current();)
@ -305,7 +305,7 @@ void KPFilterPage::setOptions(const TQMap<TQString,TQString>& opts)
} }
// add needed filters // add needed filters
m_view->clear(); m_view->clear();
QListViewItem *item(0); TQListViewItem *item(0);
for (TQStringList::ConstIterator sit=filters.begin(); sit!=filters.end(); ++sit) for (TQStringList::ConstIterator sit=filters.begin(); sit!=filters.end(); ++sit)
{ {
KXmlCommand *f(0); KXmlCommand *f(0);
@ -326,7 +326,7 @@ void KPFilterPage::setOptions(const TQMap<TQString,TQString>& opts)
void KPFilterPage::getOptions(TQMap<TQString,TQString>& opts, bool incldef) void KPFilterPage::getOptions(TQMap<TQString,TQString>& opts, bool incldef)
{ {
QStringList filters = activeList(); TQStringList filters = activeList();
for (TQStringList::ConstIterator it=filters.begin(); it!=filters.end(); ++it) for (TQStringList::ConstIterator it=filters.begin(); it!=filters.end(); ++it)
{ {
KXmlCommand *f = m_activefilters.tqfind(*it); KXmlCommand *f = m_activefilters.tqfind(*it);
@ -341,8 +341,8 @@ void KPFilterPage::getOptions(TQMap<TQString,TQString>& opts, bool incldef)
TQStringList KPFilterPage::activeList() TQStringList KPFilterPage::activeList()
{ {
QStringList list; TQStringList list;
QListViewItem *item = m_view->firstChild(); TQListViewItem *item = m_view->firstChild();
while (item) while (item)
{ {
list.append(item->text(1)); list.append(item->text(1));
@ -361,7 +361,7 @@ KXmlCommand* KPFilterPage::currentFilter()
void KPFilterPage::checkFilterChain() void KPFilterPage::checkFilterChain()
{ {
QListViewItem *item = m_view->firstChild(); TQListViewItem *item = m_view->firstChild();
bool ok(true); bool ok(true);
m_valid = true; m_valid = true;
while (item) while (item)
@ -398,11 +398,11 @@ bool KPFilterPage::isValid(TQString& msg)
void KPFilterPage::updateInfo() void KPFilterPage::updateInfo()
{ {
QString txt; TQString txt;
KXmlCommand *f = currentFilter(); KXmlCommand *f = currentFilter();
if (f) if (f)
{ {
QString templ("<b>%1:</b> %2<br>"); TQString templ("<b>%1:</b> %2<br>");
txt.append(templ.arg(i18n("Name")).arg(f->name())); txt.append(templ.arg(i18n("Name")).arg(f->name()));
txt.append(templ.arg(i18n("Requirements")).arg(f->requirements().join(", "))); txt.append(templ.arg(i18n("Requirements")).arg(f->requirements().join(", ")));
txt.append(templ.arg(i18n("Input")).arg(f->inputMimeTypes().join(", "))); txt.append(templ.arg(i18n("Input")).arg(f->inputMimeTypes().join(", ")));

@ -58,11 +58,11 @@ protected:
void updateButton(); void updateButton();
private: private:
KListView *m_view; KListView *m_view;
QStringList m_filters; // <idname,description> pairs TQStringList m_filters; // <idname,description> pairs
TQDict<KXmlCommand> m_activefilters; TQDict<KXmlCommand> m_activefilters;
QToolButton *m_add, *m_remove, *m_up, *m_down, *m_configure; TQToolButton *m_add, *m_remove, *m_up, *m_down, *m_configure;
bool m_valid; bool m_valid;
QTextBrowser *m_info; TQTextBrowser *m_info;
}; };
#endif #endif

@ -24,6 +24,7 @@
#include <tqcombobox.h> #include <tqcombobox.h>
#include <tqlabel.h> #include <tqlabel.h>
#include <tqbutton.h>
#include <tqbuttongroup.h> #include <tqbuttongroup.h>
#include <tqlayout.h> #include <tqlayout.h>
#include <tqradiobutton.h> #include <tqradiobutton.h>
@ -260,15 +261,15 @@ KPGeneralPage::KPGeneralPage(KMPrinter *pr, DrMain *dr, TQWidget *parent, const
setTitle(i18n("General")); setTitle(i18n("General"));
// widget creation // widget creation
QLabel *m_pagesizelabel = new TQLabel(i18n("Page s&ize:"), this); TQLabel *m_pagesizelabel = new TQLabel(i18n("Page s&ize:"), this);
m_pagesizelabel->tqsetAlignment(Qt::AlignVCenter|Qt::AlignRight); m_pagesizelabel->tqsetAlignment(Qt::AlignVCenter|Qt::AlignRight);
TQWhatsThis::add(m_pagesizelabel, whatsThisGeneralPageSizeLabel); TQWhatsThis::add(m_pagesizelabel, whatsThisGeneralPageSizeLabel);
QLabel *m_papertypelabel = new TQLabel(i18n("Paper t&ype:"), this); TQLabel *m_papertypelabel = new TQLabel(i18n("Paper t&ype:"), this);
m_papertypelabel->tqsetAlignment(Qt::AlignVCenter|Qt::AlignRight); m_papertypelabel->tqsetAlignment(Qt::AlignVCenter|Qt::AlignRight);
TQWhatsThis::add(m_papertypelabel, whatsThisGeneralPaperTypeLabel); TQWhatsThis::add(m_papertypelabel, whatsThisGeneralPaperTypeLabel);
QLabel *m_inputslotlabel = new TQLabel(i18n("Paper so&urce:"), this); TQLabel *m_inputslotlabel = new TQLabel(i18n("Paper so&urce:"), this);
m_inputslotlabel->tqsetAlignment(Qt::AlignVCenter|Qt::AlignRight); m_inputslotlabel->tqsetAlignment(Qt::AlignVCenter|Qt::AlignRight);
TQWhatsThis::add(m_inputslotlabel, whatsThisGeneralPaperSourceLabel); TQWhatsThis::add(m_inputslotlabel, whatsThisGeneralPaperSourceLabel);
@ -297,42 +298,42 @@ KPGeneralPage::KPGeneralPage(KMPrinter *pr, DrMain *dr, TQWidget *parent, const
m_bannerbox = new TQGroupBox(0, Qt::Vertical, i18n("Banners"), this); m_bannerbox = new TQGroupBox(0, Qt::Vertical, i18n("Banners"), this);
TQWhatsThis::add(m_bannerbox, whatsThisGeneralBannersLabel); TQWhatsThis::add(m_bannerbox, whatsThisGeneralBannersLabel);
QRadioButton *m_portrait = new TQRadioButton(i18n("&Portrait"), m_orientbox); TQRadioButton *m_portrait = new TQRadioButton(i18n("&Portrait"), m_orientbox);
QRadioButton *m_landscape = new TQRadioButton(i18n("&Landscape"), m_orientbox); TQRadioButton *m_landscape = new TQRadioButton(i18n("&Landscape"), m_orientbox);
QRadioButton *m_revland = new TQRadioButton(i18n("&Reverse landscape"), m_orientbox); TQRadioButton *m_revland = new TQRadioButton(i18n("&Reverse landscape"), m_orientbox);
QRadioButton *m_revport = new TQRadioButton(i18n("R&everse portrait"), m_orientbox); TQRadioButton *m_revport = new TQRadioButton(i18n("R&everse portrait"), m_orientbox);
m_portrait->setChecked(true); m_portrait->setChecked(true);
m_orientpix = new TQLabel(m_orientbox); m_orientpix = new TQLabel(m_orientbox);
m_orientpix->tqsetAlignment(Qt::AlignCenter); m_orientpix->tqsetAlignment(Qt::AlignCenter);
QRadioButton *m_dupnone = new TQRadioButton(i18n("duplex orientation", "&None"), m_duplexbox); TQRadioButton *m_dupnone = new TQRadioButton(i18n("duplex orientation", "&None"), m_duplexbox);
QRadioButton *m_duplong = new TQRadioButton(i18n("duplex orientation", "Lon&g side"), m_duplexbox); TQRadioButton *m_duplong = new TQRadioButton(i18n("duplex orientation", "Lon&g side"), m_duplexbox);
QRadioButton *m_dupshort = new TQRadioButton(i18n("duplex orientation", "S&hort side"), m_duplexbox); TQRadioButton *m_dupshort = new TQRadioButton(i18n("duplex orientation", "S&hort side"), m_duplexbox);
m_dupnone->setChecked(true); m_dupnone->setChecked(true);
m_duplexpix = new TQLabel(m_duplexbox); m_duplexpix = new TQLabel(m_duplexbox);
m_duplexpix->tqsetAlignment(Qt::AlignCenter); m_duplexpix->tqsetAlignment(Qt::AlignCenter);
QRadioButton *m_nup1 = new TQRadioButton("&1", m_nupbox); TQRadioButton *m_nup1 = new TQRadioButton("&1", m_nupbox);
QRadioButton *m_nup2 = new TQRadioButton("&2", m_nupbox); TQRadioButton *m_nup2 = new TQRadioButton("&2", m_nupbox);
QRadioButton *m_nup4 = new TQRadioButton("&4", m_nupbox); TQRadioButton *m_nup4 = new TQRadioButton("&4", m_nupbox);
m_nup1->setChecked(true); m_nup1->setChecked(true);
m_nuppix = new TQLabel(m_nupbox); m_nuppix = new TQLabel(m_nupbox);
m_nuppix->tqsetAlignment(Qt::AlignCenter); m_nuppix->tqsetAlignment(Qt::AlignCenter);
m_startbanner = new TQComboBox(m_bannerbox); m_startbanner = new TQComboBox(m_bannerbox);
m_endbanner = new TQComboBox(m_bannerbox); m_endbanner = new TQComboBox(m_bannerbox);
QLabel *m_startbannerlabel = new TQLabel(i18n("S&tart:"), m_bannerbox); TQLabel *m_startbannerlabel = new TQLabel(i18n("S&tart:"), m_bannerbox);
QLabel *m_endbannerlabel = new TQLabel(i18n("En&d:"), m_bannerbox); TQLabel *m_endbannerlabel = new TQLabel(i18n("En&d:"), m_bannerbox);
m_startbannerlabel->setBuddy(m_startbanner); m_startbannerlabel->setBuddy(m_startbanner);
m_endbannerlabel->setBuddy(m_endbanner); m_endbannerlabel->setBuddy(m_endbanner);
// layout creation // layout creation
QVBoxLayout *lay0 = new TQVBoxLayout(this, 0, KDialog::spacingHint()); TQVBoxLayout *lay0 = new TQVBoxLayout(this, 0, KDialog::spacingHint());
TQWhatsThis::add(this, whatsThisPrintPropertiesGeneralPage); TQWhatsThis::add(this, whatsThisPrintPropertiesGeneralPage);
QGridLayout *lay1 = new TQGridLayout(0, 3, 2, 0, KDialog::spacingHint()); TQGridLayout *lay1 = new TQGridLayout(0, 3, 2, 0, KDialog::spacingHint());
QGridLayout *lay2 = new TQGridLayout(0, 2, 2, 0, KDialog::spacingHint()); TQGridLayout *lay2 = new TQGridLayout(0, 2, 2, 0, KDialog::spacingHint());
lay0->addStretch(1); lay0->addStretch(1);
lay0->addLayout(lay1); lay0->addLayout(TQT_TQLAYOUT(lay1));
lay0->addStretch(1); lay0->addStretch(1);
lay0->addLayout(lay2); lay0->addLayout(TQT_TQLAYOUT(lay2));
lay0->addStretch(2); lay0->addStretch(2);
lay1->addWidget(m_pagesizelabel, 0, 0); lay1->addWidget(m_pagesizelabel, 0, 0);
lay1->addWidget(m_papertypelabel, 1, 0); lay1->addWidget(m_papertypelabel, 1, 0);
@ -346,27 +347,27 @@ KPGeneralPage::KPGeneralPage(KMPrinter *pr, DrMain *dr, TQWidget *parent, const
lay2->addWidget(m_nupbox, 1, 1); lay2->addWidget(m_nupbox, 1, 1);
lay2->setColStretch(0, 1); lay2->setColStretch(0, 1);
lay2->setColStretch(1, 1); lay2->setColStretch(1, 1);
QGridLayout *lay3 = new TQGridLayout(m_orientbox->layout(), 4, 2, TQGridLayout *lay3 = new TQGridLayout(m_orientbox->layout(), 4, 2,
KDialog::spacingHint()); KDialog::spacingHint());
lay3->addWidget(m_portrait, 0, 0); lay3->addWidget(m_portrait, 0, 0);
lay3->addWidget(m_landscape, 1, 0); lay3->addWidget(m_landscape, 1, 0);
lay3->addWidget(m_revland, 2, 0); lay3->addWidget(m_revland, 2, 0);
lay3->addWidget(m_revport, 3, 0); lay3->addWidget(m_revport, 3, 0);
lay3->addMultiCellWidget(m_orientpix, 0, 3, 1, 1); lay3->addMultiCellWidget(m_orientpix, 0, 3, 1, 1);
QGridLayout *lay4 = new TQGridLayout(m_duplexbox->layout(), 3, 2, TQGridLayout *lay4 = new TQGridLayout(m_duplexbox->layout(), 3, 2,
KDialog::spacingHint()); KDialog::spacingHint());
lay4->addWidget(m_dupnone, 0, 0); lay4->addWidget(m_dupnone, 0, 0);
lay4->addWidget(m_duplong, 1, 0); lay4->addWidget(m_duplong, 1, 0);
lay4->addWidget(m_dupshort, 2, 0); lay4->addWidget(m_dupshort, 2, 0);
lay4->addMultiCellWidget(m_duplexpix, 0, 2, 1, 1); lay4->addMultiCellWidget(m_duplexpix, 0, 2, 1, 1);
lay4->setRowStretch( 0, 1 ); lay4->setRowStretch( 0, 1 );
QGridLayout *lay5 = new TQGridLayout(m_nupbox->layout(), 3, 2, TQGridLayout *lay5 = new TQGridLayout(m_nupbox->layout(), 3, 2,
KDialog::spacingHint()); KDialog::spacingHint());
lay5->addWidget(m_nup1, 0, 0); lay5->addWidget(m_nup1, 0, 0);
lay5->addWidget(m_nup2, 1, 0); lay5->addWidget(m_nup2, 1, 0);
lay5->addWidget(m_nup4, 2, 0); lay5->addWidget(m_nup4, 2, 0);
lay5->addMultiCellWidget(m_nuppix, 0, 2, 1, 1); lay5->addMultiCellWidget(m_nuppix, 0, 2, 1, 1);
QGridLayout *lay6 = new TQGridLayout(m_bannerbox->layout(), 2, 2, TQGridLayout *lay6 = new TQGridLayout(m_bannerbox->layout(), 2, 2,
KDialog::spacingHint()); KDialog::spacingHint());
lay6->addWidget(m_startbannerlabel, 0, 0); lay6->addWidget(m_startbannerlabel, 0, 0);
lay6->addWidget(m_endbannerlabel, 1, 0); lay6->addWidget(m_endbannerlabel, 1, 0);
@ -408,12 +409,12 @@ void KPGeneralPage::initialize()
if ( opt->choices()->count() == 2 ) if ( opt->choices()->count() == 2 )
{ {
// probably a On/Off option instead of the standard PS one // probably a On/Off option instead of the standard PS one
TQButton *btn = m_duplexbox->find( DUPLEX_SHORT_ID ); TQButton *btn = static_cast<TQButton*>(m_duplexbox->find( DUPLEX_SHORT_ID ));
m_duplexbox->remove( btn ); m_duplexbox->remove( btn );
btn->hide(); btn->hide();
//delete btn; //delete btn;
m_duplexbox->find( DUPLEX_NONE_ID )->setText( i18n( "Disabled" ) ); static_cast<TQButton*>(m_duplexbox->find( DUPLEX_NONE_ID ))->setText( i18n( "Disabled" ) );
m_duplexbox->find( DUPLEX_LONG_ID )->setText( i18n( "Enabled" ) ); static_cast<TQButton*>(m_duplexbox->find( DUPLEX_LONG_ID ))->setText( i18n( "Enabled" ) );
m_duplexpix->hide(); m_duplexpix->hide();
} }
if (opt->currentChoice()) if (opt->currentChoice())
@ -439,7 +440,7 @@ void KPGeneralPage::initialize()
for ( int i=HIGHSIZE_BEGIN+1; i<DEFAULT_SIZE; i+=2 ) for ( int i=HIGHSIZE_BEGIN+1; i<DEFAULT_SIZE; i+=2 )
m_pagesize->insertItem(i18n(default_size[i])); m_pagesize->insertItem(i18n(default_size[i]));
// set default page size using locale settings // set default page size using locale settings
QString psname = pageSizeToPageName((KPrinter::PageSize)(KGlobal::locale()->pageSize())); TQString psname = pageSizeToPageName((KPrinter::PageSize)(KGlobal::locale()->pageSize()));
int index = findOption(default_size, DEFAULT_SIZE, psname); int index = findOption(default_size, DEFAULT_SIZE, psname);
if (index >= 0) if (index >= 0)
m_pagesize->setCurrentItem(index); m_pagesize->setCurrentItem(index);
@ -455,7 +456,7 @@ void KPGeneralPage::initialize()
} }
// Banners // Banners
QStringList values = TQStringList::split(',',printer()->option("kde-banners-supported"),false); TQStringList values = TQStringList::split(',',printer()->option("kde-banners-supported"),false);
if (values.count() > 0) if (values.count() > 0)
{ {
for (TQStringList::ConstIterator it = values.begin(); it != values.end(); ++it) for (TQStringList::ConstIterator it = values.begin(); it != values.end(); ++it)
@ -477,12 +478,12 @@ void KPGeneralPage::initialize()
void KPGeneralPage::setOptions(const TQMap<TQString,TQString>& opts) void KPGeneralPage::setOptions(const TQMap<TQString,TQString>& opts)
{ {
QString value; TQString value;
if (driver()) if (driver())
{ {
value = opts["media"]; value = opts["media"];
QStringList l = TQStringList::split(',',value,false); TQStringList l = TQStringList::split(',',value,false);
for(TQStringList::ConstIterator it = l.begin(); it != l.end(); ++it) for(TQStringList::ConstIterator it = l.begin(); it != l.end(); ++it)
{ {
value = *it; value = *it;
@ -546,7 +547,7 @@ void KPGeneralPage::setOptions(const TQMap<TQString,TQString>& opts)
if (!value.isEmpty()) if (!value.isEmpty())
{ {
int index(-1); int index(-1);
QStringList l = TQStringList::split(',',value,false); TQStringList l = TQStringList::split(',',value,false);
for(TQStringList::ConstIterator it = l.begin(); it != l.end(); ++it) for(TQStringList::ConstIterator it = l.begin(); it != l.end(); ++it)
{ {
value = *it; value = *it;
@ -575,7 +576,7 @@ void KPGeneralPage::setOptions(const TQMap<TQString,TQString>& opts)
value = opts["job-sheets"]; value = opts["job-sheets"];
if (!value.isEmpty()) if (!value.isEmpty())
{ {
QStringList l = TQStringList::split(',',value,false); TQStringList l = TQStringList::split(',',value,false);
if (l.count() > 0) setComboItem(m_startbanner,l[0]); if (l.count() > 0) setComboItem(m_startbanner,l[0]);
if (l.count() > 1) setComboItem(m_endbanner,l[1]); if (l.count() > 1) setComboItem(m_endbanner,l[1]);
} }
@ -598,7 +599,7 @@ void KPGeneralPage::setOptions(const TQMap<TQString,TQString>& opts)
if (!value.isEmpty()) if (!value.isEmpty())
{ {
bool ok; bool ok;
int ID = QMIN(value.toInt(&ok)-1,2); int ID = TQMIN(value.toInt(&ok)-1,2);
if (ok) if (ok)
{ {
m_nupbox->setButton(ID); m_nupbox->setButton(ID);
@ -614,7 +615,7 @@ void KPGeneralPage::setOptions(const TQMap<TQString,TQString>& opts)
void KPGeneralPage::getOptions(TQMap<TQString,TQString>& opts, bool incldef) void KPGeneralPage::getOptions(TQMap<TQString,TQString>& opts, bool incldef)
{ {
QString value; TQString value;
if (driver()) if (driver())
{ {
@ -680,7 +681,7 @@ void KPGeneralPage::getOptions(TQMap<TQString,TQString>& opts, bool incldef)
if (m_bannerbox->isEnabled()) if (m_bannerbox->isEnabled())
{ {
QStringList l = TQStringList::split(',',printer()->option("kde-banners"),false); TQStringList l = TQStringList::split(',',printer()->option("kde-banners"),false);
if (incldef || (l.count() == 2 && (l[0] != m_startbanner->currentText() || l[1] != m_endbanner->currentText())) if (incldef || (l.count() == 2 && (l[0] != m_startbanner->currentText() || l[1] != m_endbanner->currentText()))
|| (l.count() == 0 && (m_startbanner->currentText() != "none" || m_endbanner->currentText() != "none"))) || (l.count() == 0 && (m_startbanner->currentText() != "none" || m_endbanner->currentText() != "none")))
{ {
@ -692,7 +693,7 @@ void KPGeneralPage::getOptions(TQMap<TQString,TQString>& opts, bool incldef)
void KPGeneralPage::slotOrientationChanged(int ID) void KPGeneralPage::slotOrientationChanged(int ID)
{ {
QString iconstr; TQString iconstr;
switch (ID) switch (ID)
{ {
case ORIENT_PORTRAIT_ID: iconstr = "kdeprint_portrait"; break; case ORIENT_PORTRAIT_ID: iconstr = "kdeprint_portrait"; break;
@ -706,7 +707,7 @@ void KPGeneralPage::slotOrientationChanged(int ID)
void KPGeneralPage::slotNupChanged(int ID) void KPGeneralPage::slotNupChanged(int ID)
{ {
QString iconstr; TQString iconstr;
switch (ID) switch (ID)
{ {
case NUP_1_ID: iconstr = "kdeprint_nup1"; break; case NUP_1_ID: iconstr = "kdeprint_nup1"; break;
@ -721,7 +722,7 @@ void KPGeneralPage::slotDuplexChanged(int ID)
{ {
if (m_duplexbox->isEnabled()) if (m_duplexbox->isEnabled())
{ {
QString iconstr; TQString iconstr;
switch (ID) switch (ID)
{ {
case DUPLEX_NONE_ID: iconstr = "kdeprint_duplex_none"; break; case DUPLEX_NONE_ID: iconstr = "kdeprint_duplex_none"; break;

@ -47,11 +47,11 @@ protected slots:
void slotNupChanged(int); void slotNupChanged(int);
protected: protected:
QComboBox *m_pagesize, *m_papertype, *m_inputslot; TQComboBox *m_pagesize, *m_papertype, *m_inputslot;
QComboBox *m_startbanner, *m_endbanner; TQComboBox *m_startbanner, *m_endbanner;
QButtonGroup *m_orientbox, *m_duplexbox, *m_nupbox; TQButtonGroup *m_orientbox, *m_duplexbox, *m_nupbox;
QGroupBox *m_bannerbox; TQGroupBox *m_bannerbox;
QLabel *m_orientpix, *m_duplexpix, *m_nuppix; TQLabel *m_orientpix, *m_duplexpix, *m_nuppix;
}; };
#endif #endif

@ -42,13 +42,13 @@ KPMarginPage::KPMarginPage(KPrinter *prt, DrMain *driver, TQWidget *parent, cons
setTitle(i18n("Margins")); setTitle(i18n("Margins"));
m_usedriver = true; m_usedriver = true;
QGroupBox *box = new TQGroupBox(1, Qt::Vertical, i18n("Margins"), this); TQGroupBox *box = new TQGroupBox(1, Qt::Vertical, i18n("Margins"), this);
m_margin = new MarginWidget(box, "MarginWidget", (m_printer != 0)); m_margin = new MarginWidget(box, "MarginWidget", (m_printer != 0));
//m_margin->setSymetricMargins(true); //m_margin->setSymetricMargins(true);
//if (m_printer) //if (m_printer)
// m_margin->setResolution(m_printer->resolution()); // m_margin->setResolution(m_printer->resolution());
QVBoxLayout *l0 = new TQVBoxLayout(this, 0, 10); TQVBoxLayout *l0 = new TQVBoxLayout(this, 0, 10);
l0->addWidget(box); l0->addWidget(box);
l0->addStretch(1); l0->addStretch(1);
} }
@ -60,10 +60,10 @@ KPMarginPage::~KPMarginPage()
void KPMarginPage::initPageSize(const TQString& ps, bool landscape) void KPMarginPage::initPageSize(const TQString& ps, bool landscape)
{ {
// first retrieve the Qt values for page size and margins // first retrieve the Qt values for page size and margins
QPrinter prt(TQPrinter::PrinterResolution); TQPrinter prt(TQPrinter::PrinterResolution);
prt.setFullPage(true); prt.setFullPage(true);
prt.setPageSize((TQPrinter::PageSize)(ps.isEmpty() ? KGlobal::locale()->pageSize() : ps.toInt())); prt.setPageSize((TQPrinter::PageSize)(ps.isEmpty() ? KGlobal::locale()->pageSize() : ps.toInt()));
QPaintDeviceMetrics metrics(&prt); TQPaintDeviceMetrics metrics(&prt);
float w = metrics.width(); float w = metrics.width();
float h = metrics.height(); float h = metrics.height();
unsigned int it, il, ib, ir; unsigned int it, il, ib, ir;

@ -302,7 +302,7 @@ void KPPosterPage::getOptions( TQMap<TQString,TQString>& opts, bool )
} }
else else
{ {
if ( !o.contains( "poster" ) ) if ( !o.tqcontains( "poster" ) )
o.append( "poster" ); o.append( "poster" );
opts[ "_kde-filters" ] = o.join( "," ); opts[ "_kde-filters" ] = o.join( "," );
opts[ "_kde-poster-media" ] = m_mediasize->text(); opts[ "_kde-poster-media" ] = m_mediasize->text();

@ -115,40 +115,40 @@ void KPQtPage::init()
// widget creation // widget creation
m_pagesize = new TQComboBox(this); m_pagesize = new TQComboBox(this);
TQWhatsThis::add(m_pagesize, whatsThisPageSizeOtPageLabel); TQWhatsThis::add(m_pagesize, whatsThisPageSizeOtPageLabel);
QLabel *m_pagesizelabel = new TQLabel(i18n("Page s&ize:"), this); TQLabel *m_pagesizelabel = new TQLabel(i18n("Page s&ize:"), this);
m_pagesizelabel->tqsetAlignment(Qt::AlignVCenter|Qt::AlignRight); m_pagesizelabel->tqsetAlignment(Qt::AlignVCenter|Qt::AlignRight);
m_pagesizelabel->setBuddy(m_pagesize); m_pagesizelabel->setBuddy(m_pagesize);
m_orientbox = new TQButtonGroup(0, Qt::Vertical, i18n("Orientation"), this); m_orientbox = new TQButtonGroup(0, Qt::Vertical, i18n("Orientation"), this);
TQWhatsThis::add(m_orientbox, whatsThisOrientationOtPageLabel); TQWhatsThis::add(m_orientbox, whatsThisOrientationOtPageLabel);
m_colorbox = new TQButtonGroup(0, Qt::Vertical, i18n("Color Mode"), this); m_colorbox = new TQButtonGroup(0, Qt::Vertical, i18n("Color Mode"), this);
TQWhatsThis::add(m_colorbox, whatsThisColorModeOtPageLabel); TQWhatsThis::add(m_colorbox, whatsThisColorModeOtPageLabel);
QRadioButton *m_portrait = new TQRadioButton(i18n("&Portrait"), m_orientbox); TQRadioButton *m_portrait = new TQRadioButton(i18n("&Portrait"), m_orientbox);
TQWhatsThis::add(m_portrait, whatsThisOrientationOtPageLabel); TQWhatsThis::add(m_portrait, whatsThisOrientationOtPageLabel);
QRadioButton *m_landscape = new TQRadioButton(i18n("&Landscape"), m_orientbox); TQRadioButton *m_landscape = new TQRadioButton(i18n("&Landscape"), m_orientbox);
TQWhatsThis::add(m_landscape, whatsThisOrientationOtPageLabel); TQWhatsThis::add(m_landscape, whatsThisOrientationOtPageLabel);
m_orientpix = new TQLabel(m_orientbox); m_orientpix = new TQLabel(m_orientbox);
m_orientpix->tqsetAlignment(Qt::AlignCenter); m_orientpix->tqsetAlignment(Qt::AlignCenter);
TQWhatsThis::add(m_orientpix, whatsThisOrientationOtPageLabel); TQWhatsThis::add(m_orientpix, whatsThisOrientationOtPageLabel);
QRadioButton *m_color = new TQRadioButton(i18n("Colo&r"), m_colorbox); TQRadioButton *m_color = new TQRadioButton(i18n("Colo&r"), m_colorbox);
TQWhatsThis::add(m_color, whatsThisColorModeOtPageLabel); TQWhatsThis::add(m_color, whatsThisColorModeOtPageLabel);
QRadioButton *m_grayscale = new TQRadioButton(i18n("&Grayscale"), m_colorbox); TQRadioButton *m_grayscale = new TQRadioButton(i18n("&Grayscale"), m_colorbox);
m_colorpix = new TQLabel(m_colorbox); m_colorpix = new TQLabel(m_colorbox);
m_colorpix->tqsetAlignment(Qt::AlignCenter); m_colorpix->tqsetAlignment(Qt::AlignCenter);
TQWhatsThis::add(m_colorpix, whatsThisColorModeOtPageLabel); TQWhatsThis::add(m_colorpix, whatsThisColorModeOtPageLabel);
m_nupbox = new TQButtonGroup(0, Qt::Vertical, i18n("Pages per Sheet"), this); m_nupbox = new TQButtonGroup(0, Qt::Vertical, i18n("Pages per Sheet"), this);
// TQWhatsThis::add(m_nupbox, whatsThisPagesPerSheetOtPageLabel); // TQWhatsThis::add(m_nupbox, whatsThisPagesPerSheetOtPageLabel);
QRadioButton *m_nup1 = new TQRadioButton("&1", m_nupbox); TQRadioButton *m_nup1 = new TQRadioButton("&1", m_nupbox);
TQWhatsThis::add(m_nup1, whatsThisPagesPerSheetOtPageLabel); TQWhatsThis::add(m_nup1, whatsThisPagesPerSheetOtPageLabel);
QRadioButton *m_nup2 = new TQRadioButton("&2", m_nupbox); TQRadioButton *m_nup2 = new TQRadioButton("&2", m_nupbox);
TQWhatsThis::add(m_nup2, whatsThisPagesPerSheetOtPageLabel); TQWhatsThis::add(m_nup2, whatsThisPagesPerSheetOtPageLabel);
QRadioButton *m_nup4 = new TQRadioButton("&4", m_nupbox); TQRadioButton *m_nup4 = new TQRadioButton("&4", m_nupbox);
TQWhatsThis::add(m_nup4, whatsThisPagesPerSheetOtPageLabel); TQWhatsThis::add(m_nup4, whatsThisPagesPerSheetOtPageLabel);
QRadioButton *m_nupother = new TQRadioButton(i18n("Ot&her"), m_nupbox); TQRadioButton *m_nupother = new TQRadioButton(i18n("Ot&her"), m_nupbox);
TQWhatsThis::add(m_nupother, whatsThisPagesPerSheetOtPageLabel); TQWhatsThis::add(m_nupother, whatsThisPagesPerSheetOtPageLabel);
m_nuppix = new TQLabel(m_nupbox); m_nuppix = new TQLabel(m_nupbox);
@ -156,7 +156,7 @@ void KPQtPage::init()
TQWhatsThis::add(m_nuppix, whatsThisPagesPerSheetOtPageLabel); TQWhatsThis::add(m_nuppix, whatsThisPagesPerSheetOtPageLabel);
// layout creation // layout creation
QGridLayout *lay0 = new TQGridLayout(this, 3, 2, 0, 10); TQGridLayout *lay0 = new TQGridLayout(this, 3, 2, 0, 10);
lay0->setRowStretch(1,1); lay0->setRowStretch(1,1);
lay0->setRowStretch(2,1); lay0->setRowStretch(2,1);
lay0->addWidget(m_pagesizelabel,0,0); lay0->addWidget(m_pagesizelabel,0,0);
@ -164,15 +164,15 @@ void KPQtPage::init()
lay0->addWidget(m_orientbox,1,0); lay0->addWidget(m_orientbox,1,0);
lay0->addWidget(m_colorbox,1,1); lay0->addWidget(m_colorbox,1,1);
lay0->addWidget(m_nupbox,2,0); lay0->addWidget(m_nupbox,2,0);
QGridLayout *lay1 = new TQGridLayout(m_orientbox->layout(), 2, 2, 10); TQGridLayout *lay1 = new TQGridLayout(m_orientbox->layout(), 2, 2, 10);
lay1->addWidget(m_portrait,0,0); lay1->addWidget(m_portrait,0,0);
lay1->addWidget(m_landscape,1,0); lay1->addWidget(m_landscape,1,0);
lay1->addMultiCellWidget(m_orientpix,0,1,1,1); lay1->addMultiCellWidget(m_orientpix,0,1,1,1);
QGridLayout *lay2 = new TQGridLayout(m_colorbox->layout(), 2, 2, 10); TQGridLayout *lay2 = new TQGridLayout(m_colorbox->layout(), 2, 2, 10);
lay2->addWidget(m_color,0,0); lay2->addWidget(m_color,0,0);
lay2->addWidget(m_grayscale,1,0); lay2->addWidget(m_grayscale,1,0);
lay2->addMultiCellWidget(m_colorpix,0,1,1,1); lay2->addMultiCellWidget(m_colorpix,0,1,1,1);
QGridLayout *lay3 = new TQGridLayout(m_nupbox->layout(), 4, 2, 5); TQGridLayout *lay3 = new TQGridLayout(m_nupbox->layout(), 4, 2, 5);
lay3->addWidget(m_nup1,0,0); lay3->addWidget(m_nup1,0,0);
lay3->addWidget(m_nup2,1,0); lay3->addWidget(m_nup2,1,0);
lay3->addWidget(m_nup4,2,0); lay3->addWidget(m_nup4,2,0);
@ -262,7 +262,7 @@ void KPQtPage::setOptions(const TQMap<TQString,TQString>& opts)
DrListOption *opt = static_cast<DrListOption*>(driver()->findOption("PageSize")); DrListOption *opt = static_cast<DrListOption*>(driver()->findOption("PageSize"));
DrBase *ch = opt->findChoice(val); DrBase *ch = opt->findChoice(val);
if (ch) if (ch)
m_pagesize->setCurrentItem(opt->choices()->findRef(ch)); m_pagesize->setCurrentItem(opt->choices()->tqfindRef(ch));
} }
} }
else if (!opts["kde-pagesize"].isEmpty()) else if (!opts["kde-pagesize"].isEmpty())
@ -270,7 +270,7 @@ void KPQtPage::setOptions(const TQMap<TQString,TQString>& opts)
ID = NUP_1; ID = NUP_1;
if (opts["_kde-filters"].tqfind("psnup") != -1) if (opts["_kde-filters"].tqfind("psnup") != -1)
{ {
if (opts.contains("_kde-psnup-nup")) { if (opts.tqcontains("_kde-psnup-nup")) {
ID = opts["_kde-psnup-nup"].toInt(); ID = opts["_kde-psnup-nup"].toInt();
if (ID == 1 || ID == 2 || ID == 4) if (ID == 1 || ID == 2 || ID == 4)
{ {
@ -315,7 +315,7 @@ void KPQtPage::getOptions(TQMap<TQString,TQString>& opts, bool incldef)
else else
opts["kde-pagesize"] = TQString::number(page_sizes[m_pagesize->currentItem()].ID); opts["kde-pagesize"] = TQString::number(page_sizes[m_pagesize->currentItem()].ID);
int ID = m_nupbox->id(m_nupbox->selected()); int ID = m_nupbox->id(m_nupbox->selected());
QString s = opts["_kde-filters"]; TQString s = opts["_kde-filters"];
if (ID == NUP_1) if (ID == NUP_1)
{ {
opts.remove("_kde-psnup-nup"); opts.remove("_kde-psnup-nup");
@ -325,7 +325,7 @@ void KPQtPage::getOptions(TQMap<TQString,TQString>& opts, bool incldef)
int nup(ID == NUP_2 ? 2 : 4); int nup(ID == NUP_2 ? 2 : 4);
if (s.tqfind("psnup") == -1) if (s.tqfind("psnup") == -1)
{ {
QStringList fl = TQStringList::split(',', s, false); TQStringList fl = TQStringList::split(',', s, false);
KXmlCommandManager::self()->insertCommand(fl, "psnup"); KXmlCommandManager::self()->insertCommand(fl, "psnup");
s = fl.join(","); s = fl.join(",");
} }

@ -49,9 +49,9 @@ protected:
void init(); void init();
protected: protected:
QButtonGroup *m_orientbox, *m_colorbox, *m_nupbox; TQButtonGroup *m_orientbox, *m_colorbox, *m_nupbox;
QComboBox *m_pagesize; TQComboBox *m_pagesize;
QLabel *m_orientpix, *m_colorpix, *m_nuppix; TQLabel *m_orientpix, *m_colorpix, *m_nuppix;
}; };
#endif #endif

@ -71,16 +71,16 @@
class KPrintDialog::KPrintDialogPrivate class KPrintDialog::KPrintDialogPrivate
{ {
public: public:
QLabel *m_type, *m_state, *m_comment, *m_location, *m_cmdlabel, *m_filelabel; TQLabel *m_type, *m_state, *m_comment, *m_location, *m_cmdlabel, *m_filelabel;
KPushButton *m_properties, *m_default, *m_options, *m_ok, *m_extbtn; KPushButton *m_properties, *m_default, *m_options, *m_ok, *m_extbtn;
QPushButton *m_wizard, *m_filter; TQPushButton *m_wizard, *m_filter;
QCheckBox *m_preview; TQCheckBox *m_preview;
QLineEdit *m_cmd; TQLineEdit *m_cmd;
TreeComboBox *m_printers; TreeComboBox *m_printers;
QVBox *m_dummy; TQVBox *m_dummy;
PluginComboBox *m_plugin; PluginComboBox *m_plugin;
KURLRequester *m_file; KURLRequester *m_file;
QCheckBox *m_persistent; TQCheckBox *m_persistent;
bool m_reduced; bool m_reduced;
TQPtrList<KPrintDialogPage> m_pages; TQPtrList<KPrintDialogPage> m_pages;
@ -262,7 +262,7 @@ KPrintDialog::KPrintDialog(TQWidget *parent, const char *name)
setCaption(i18n("Print")); setCaption(i18n("Print"));
// widget creation // widget creation
QGroupBox *m_pbox = new TQGroupBox(0,Qt::Vertical,i18n("Printer"), this); TQGroupBox *m_pbox = new TQGroupBox(0,Qt::Vertical,i18n("Printer"), this);
d->m_type = new TQLabel(m_pbox); d->m_type = new TQLabel(m_pbox);
TQWhatsThis::add(d->m_type, whatsThisPrinterType); TQWhatsThis::add(d->m_type, whatsThisPrinterType);
d->m_state = new TQLabel(m_pbox); d->m_state = new TQLabel(m_pbox);
@ -275,15 +275,15 @@ KPrintDialog::KPrintDialog(TQWidget *parent, const char *name)
d->m_printers = new TreeComboBox(m_pbox); d->m_printers = new TreeComboBox(m_pbox);
TQWhatsThis::add(d->m_printers, whatsThisPrinterSelect); TQWhatsThis::add(d->m_printers, whatsThisPrinterSelect);
d->m_printers->setMinimumHeight(25); d->m_printers->setMinimumHeight(25);
QLabel *m_printerlabel = new TQLabel(i18n("&Name:"), m_pbox); TQLabel *m_printerlabel = new TQLabel(i18n("&Name:"), m_pbox);
TQWhatsThis::add(m_printerlabel, whatsThisPrinterSelect); TQWhatsThis::add(m_printerlabel, whatsThisPrinterSelect);
QLabel *m_statelabel = new TQLabel(i18n("Status", "State:"), m_pbox); TQLabel *m_statelabel = new TQLabel(i18n("Status", "State:"), m_pbox);
TQWhatsThis::add(m_statelabel, whatsThisPrinterState); TQWhatsThis::add(m_statelabel, whatsThisPrinterState);
QLabel *m_typelabel = new TQLabel(i18n("Type:"), m_pbox); TQLabel *m_typelabel = new TQLabel(i18n("Type:"), m_pbox);
TQWhatsThis::add(m_typelabel, whatsThisPrinterType); TQWhatsThis::add(m_typelabel, whatsThisPrinterType);
QLabel *m_locationlabel = new TQLabel(i18n("Location:"), m_pbox); TQLabel *m_locationlabel = new TQLabel(i18n("Location:"), m_pbox);
TQWhatsThis::add(m_locationlabel, whatsThisLocationLabel); TQWhatsThis::add(m_locationlabel, whatsThisLocationLabel);
QLabel *m_commentlabel = new TQLabel(i18n("Comment:"), m_pbox); TQLabel *m_commentlabel = new TQLabel(i18n("Comment:"), m_pbox);
TQWhatsThis::add(m_commentlabel, whatsThisPrinterComment); TQWhatsThis::add(m_commentlabel, whatsThisPrinterComment);
m_printerlabel->setBuddy(d->m_printers); m_printerlabel->setBuddy(d->m_printers);
d->m_properties = new KPushButton(KGuiItem(i18n("P&roperties"), "edit"), m_pbox); d->m_properties = new KPushButton(KGuiItem(i18n("P&roperties"), "edit"), m_pbox);
@ -308,7 +308,7 @@ KPrintDialog::KPrintDialog(TQWidget *parent, const char *name)
TQWhatsThis::add( d->m_ok, whatsThisPrintButton); TQWhatsThis::add( d->m_ok, whatsThisPrintButton);
d->m_ok->setDefault(true); d->m_ok->setDefault(true);
d->m_ok->setEnabled( false ); d->m_ok->setEnabled( false );
QPushButton *m_cancel = new KPushButton(KStdGuiItem::cancel(), this); TQPushButton *m_cancel = new KPushButton(KStdGuiItem::cancel(), this);
TQWhatsThis::add(m_cancel, whatsThisCancelButton); TQWhatsThis::add(m_cancel, whatsThisCancelButton);
d->m_preview = new TQCheckBox(i18n("Previe&w"), m_pbox); d->m_preview = new TQCheckBox(i18n("Previe&w"), m_pbox);
TQWhatsThis::add(d->m_preview, whatsThisPreviewCheckBox); TQWhatsThis::add(d->m_preview, whatsThisPreviewCheckBox);
@ -331,7 +331,7 @@ KPrintDialog::KPrintDialog(TQWidget *parent, const char *name)
TQWhatsThis::add(d->m_extbtn, whatsThisOptions); TQWhatsThis::add(d->m_extbtn, whatsThisOptions);
d->m_persistent = new TQCheckBox(i18n("&Keep this dialog open after printing"), this); d->m_persistent = new TQCheckBox(i18n("&Keep this dialog open after printing"), this);
TQWhatsThis::add( d->m_persistent, whatsThisKeepDialogOpenCheckbox); TQWhatsThis::add( d->m_persistent, whatsThisKeepDialogOpenCheckbox);
QPushButton *m_help = new KPushButton(KStdGuiItem::help(), this); TQPushButton *m_help = new KPushButton(KStdGuiItem::help(), this);
TQWhatsThis::add( m_help, whatsThisHelpButton); TQWhatsThis::add( m_help, whatsThisHelpButton);
TQWidget::setTabOrder( d->m_printers, d->m_filter ); TQWidget::setTabOrder( d->m_printers, d->m_filter );
@ -348,12 +348,12 @@ KPrintDialog::KPrintDialog(TQWidget *parent, const char *name)
TQWidget::setTabOrder( d->m_ok, m_cancel ); TQWidget::setTabOrder( d->m_ok, m_cancel );
// layout creation // layout creation
QVBoxLayout *l1 = new TQVBoxLayout(this, 10, 10); TQVBoxLayout *l1 = new TQVBoxLayout(this, 10, 10);
l1->addWidget(m_pbox,0); l1->addWidget(m_pbox,0);
l1->addWidget(d->m_dummy,1); l1->addWidget(d->m_dummy,1);
l1->addWidget(d->m_plugin,0); l1->addWidget(d->m_plugin,0);
l1->addWidget(d->m_persistent); l1->addWidget(d->m_persistent);
QHBoxLayout *l2 = new TQHBoxLayout(0, 0, 10); TQHBoxLayout *l2 = new TQHBoxLayout(0, 0, 10);
l1->addLayout(l2); l1->addLayout(l2);
l2->addWidget(d->m_extbtn,0); l2->addWidget(d->m_extbtn,0);
l2->addWidget(d->m_options,0); l2->addWidget(d->m_options,0);
@ -361,17 +361,17 @@ KPrintDialog::KPrintDialog(TQWidget *parent, const char *name)
l2->addStretch(1); l2->addStretch(1);
l2->addWidget(d->m_ok,0); l2->addWidget(d->m_ok,0);
l2->addWidget(m_cancel,0); l2->addWidget(m_cancel,0);
QGridLayout *l3 = new TQGridLayout(m_pbox->layout(),3,3,7); TQGridLayout *l3 = new TQGridLayout(m_pbox->layout(),3,3,7);
l3->setColStretch(1,1); l3->setColStretch(1,1);
l3->setRowStretch(0,1); l3->setRowStretch(0,1);
QGridLayout *l4 = new TQGridLayout(0, 5, 2, 0, 5); TQGridLayout *l4 = new TQGridLayout(0, 5, 2, 0, 5);
l3->addMultiCellLayout(l4,0,0,0,1); l3->addMultiCellLayout(l4,0,0,0,1);
l4->addWidget(m_printerlabel,0,0); l4->addWidget(m_printerlabel,0,0);
l4->addWidget(m_statelabel,1,0); l4->addWidget(m_statelabel,1,0);
l4->addWidget(m_typelabel,2,0); l4->addWidget(m_typelabel,2,0);
l4->addWidget(m_locationlabel,3,0); l4->addWidget(m_locationlabel,3,0);
l4->addWidget(m_commentlabel,4,0); l4->addWidget(m_commentlabel,4,0);
QHBoxLayout *ll4 = new TQHBoxLayout(0, 0, 3); TQHBoxLayout *ll4 = new TQHBoxLayout(0, 0, 3);
l4->addLayout(ll4,0,1); l4->addLayout(ll4,0,1);
ll4->addWidget(d->m_printers,1); ll4->addWidget(d->m_printers,1);
ll4->addWidget(d->m_filter,0); ll4->addWidget(d->m_filter,0);
@ -382,7 +382,7 @@ KPrintDialog::KPrintDialog(TQWidget *parent, const char *name)
l4->addWidget(d->m_location,3,1); l4->addWidget(d->m_location,3,1);
l4->addWidget(d->m_comment,4,1); l4->addWidget(d->m_comment,4,1);
l4->setColStretch(1,1); l4->setColStretch(1,1);
QVBoxLayout *l5 = new TQVBoxLayout(0, 0, 10); TQVBoxLayout *l5 = new TQVBoxLayout(0, 0, 10);
l3->addLayout(l5,0,2); l3->addLayout(l5,0,2);
l5->addWidget(d->m_properties,0); l5->addWidget(d->m_properties,0);
l5->addWidget(d->m_default,0); l5->addWidget(d->m_default,0);
@ -489,7 +489,7 @@ void KPrintDialog::setDialogPages(TQPtrList<KPrintDialogPage> *pages)
else else
{ {
// more than one page. // more than one page.
QTabWidget *tabs = static_cast<TQTabWidget*>(d->m_dummy->child("TabWidget", "TQTabWidget")); TQTabWidget *tabs = static_cast<TQTabWidget*>(TQT_TQWIDGET(d->m_dummy->child("TabWidget", "TQTabWidget")));
if (!tabs) if (!tabs)
{ {
// TQTabWidget doesn't exist. Create it and reparent all // TQTabWidget doesn't exist. Create it and reparent all
@ -658,7 +658,7 @@ void KPrintDialog::done(int result)
KMPrinter *prt(0); KMPrinter *prt(0);
// get options from global pages // get options from global pages
QString msg; TQString msg;
TQPtrListIterator<KPrintDialogPage> it(d->m_pages); TQPtrListIterator<KPrintDialogPage> it(d->m_pages);
for (;it.current();++it) for (;it.current();++it)
if (it.current()->isEnabled()) if (it.current()->isEnabled())
@ -723,7 +723,7 @@ bool KPrintDialog::checkOutputFile()
do do
{ {
anotherCheck = false; anotherCheck = false;
QFileInfo f(url.path()); TQFileInfo f(url.path());
if (f.exists()) if (f.exists())
{ {
if (f.isWritable()) if (f.isWritable())
@ -800,7 +800,7 @@ void KPrintDialog::setOutputFileExtension(const TQString& ext)
{ {
KURL url( d->m_file->url() ); KURL url( d->m_file->url() );
TQString f( url.fileName() ); TQString f( url.fileName() );
int p = f.findRev( '.' ); int p = f.tqfindRev( '.' );
// change "file.ext"; don't change "file", "file." or ".file" but do change ".file.ext" // change "file.ext"; don't change "file", "file." or ".file" but do change ".file.ext"
if ( p > 0 && p != int (f.length () - 1) ) if ( p > 0 && p != int (f.length () - 1) )
{ {
@ -822,7 +822,7 @@ void KPrintDialog::slotWizard()
void KPrintDialog::reload() void KPrintDialog::reload()
{ {
// remove printer dependent pages (usually from plugin) // remove printer dependent pages (usually from plugin)
QTabWidget *tabs = static_cast<TQTabWidget*>(d->m_dummy->child("TabWidget", "TQTabWidget")); TQTabWidget *tabs = static_cast<TQTabWidget*>(TQT_TQWIDGET(d->m_dummy->child("TabWidget", "TQTabWidget")));
for (uint i=0; i<d->m_pages.count(); i++) for (uint i=0; i<d->m_pages.count(); i++)
if (d->m_pages.at(i)->onlyRealPrinters()) if (d->m_pages.at(i)->onlyRealPrinters())
{ {
@ -951,7 +951,7 @@ void KPrintDialog::enableDialogPage( int index, bool flag )
if ( d->m_pages.count() > 1 ) if ( d->m_pages.count() > 1 )
{ {
QTabWidget *tabs = static_cast<TQTabWidget*>(d->m_dummy->child("TabWidget", "TQTabWidget")); TQTabWidget *tabs = static_cast<TQTabWidget*>(TQT_TQWIDGET(d->m_dummy->child("TabWidget", "TQTabWidget")));
tabs->setTabEnabled( d->m_pages.at( index ), flag ); tabs->setTabEnabled( d->m_pages.at( index ), flag );
} }
else else

@ -52,14 +52,14 @@ static void reportError(KPrinter*);
// KPrinterWrapper class // KPrinterWrapper class
//************************************************************************************** //**************************************************************************************
class KPrinterWrapper : public QPrinter class KPrinterWrapper : public TQPrinter
{ {
friend class KPrinter; friend class KPrinter;
public: public:
KPrinterWrapper(KPrinter*, PrinterMode m = ScreenResolution); KPrinterWrapper(KPrinter*, PrinterMode m = ScreenResolution);
~KPrinterWrapper(); ~KPrinterWrapper();
protected: protected:
virtual bool cmd(int, TQPainter*, QPDevCmdParam*); virtual bool cmd(int, TQPainter*, TQPDevCmdParam*);
virtual int metric(int) const; virtual int metric(int) const;
int qprinterMetric(int) const; int qprinterMetric(int) const;
private: private:
@ -75,7 +75,7 @@ KPrinterWrapper::~KPrinterWrapper()
{ {
} }
bool KPrinterWrapper::cmd(int c, TQPainter *painter, QPDevCmdParam *p) bool KPrinterWrapper::cmd(int c, TQPainter *painter, TQPDevCmdParam *p)
{ {
return TQPrinter::cmd(c,painter,p); return TQPrinter::cmd(c,painter,p);
} }
@ -272,7 +272,7 @@ KPrinter::ApplicationType KPrinter::applicationType()
return (ApplicationType)KMFactory::self()->settings()->application; return (ApplicationType)KMFactory::self()->settings()->application;
} }
bool KPrinter::cmd(int c, TQPainter *painter, QPDevCmdParam *p) bool KPrinter::cmd(int c, TQPainter *painter, TQPDevCmdParam *p)
{ {
bool value(true); bool value(true);
if (c == TQPaintDevice::PdcBegin) if (c == TQPaintDevice::PdcBegin)
@ -357,7 +357,7 @@ void KPrinter::translateQtOptions()
bool KPrinter::printFiles(const TQStringList& l, bool flag, bool startviewer) bool KPrinter::printFiles(const TQStringList& l, bool flag, bool startviewer)
{ {
QStringList files(l); TQStringList files(l);
bool status(true); bool status(true);
// First apply possible filters, and update "remove" flag if filters has // First apply possible filters, and update "remove" flag if filters has
@ -483,7 +483,7 @@ TQValueList<int> KPrinter::pageList() const
// process range specification // process range specification
if (!option("kde-range").isEmpty()) if (!option("kde-range").isEmpty())
{ {
QStringList ranges = TQStringList::split(',',option("kde-range"),false); TQStringList ranges = TQStringList::split(',',option("kde-range"),false);
for (TQStringList::ConstIterator it=ranges.begin();it!=ranges.end();++it) for (TQStringList::ConstIterator it=ranges.begin();it!=ranges.end();++it)
{ {
int p = (*it).tqfind('-'); int p = (*it).tqfind('-');
@ -638,7 +638,7 @@ void KPrinter::setOptions(const TQMap<TQString,TQString>& opts)
tmpset.remove( "kde-resolution" ); tmpset.remove( "kde-resolution" );
tmpset.remove( "kde-fonts" ); tmpset.remove( "kde-fonts" );
for (TQMap<TQString,TQString>::ConstIterator it=tmpset.begin();it!=tmpset.end();++it) for (TQMap<TQString,TQString>::ConstIterator it=tmpset.begin();it!=tmpset.end();++it)
if (it.key().left(4) == "kde-" && !(d->m_options.contains(it.key()))) if (it.key().left(4) == "kde-" && !(d->m_options.tqcontains(it.key())))
d->m_options[it.key()] = it.data(); d->m_options[it.key()] = it.data();
} }
@ -879,7 +879,7 @@ void KPrinter::setPrintProgram(const TQString& prg)
} }
else else
{ {
QString s(prg); TQString s(prg);
if (s.tqfind("%in") == -1) if (s.tqfind("%in") == -1)
s.append(" %in"); s.append(" %in");
setOutputToFile( s.tqfind( "%out" ) != -1 ); setOutputToFile( s.tqfind( "%out" ) != -1 );

@ -748,7 +748,7 @@ public:
TQString docDirectory() const; TQString docDirectory() const;
protected: protected:
virtual bool cmd(int, TQPainter*, QPDevCmdParam*); virtual bool cmd(int, TQPainter*, TQPDevCmdParam*);
virtual int metric(int) const; virtual int metric(int) const;
void translateQtOptions(); void translateQtOptions();
void loadSettings(); void loadSettings();

@ -139,7 +139,7 @@ bool KPrinterImpl::setupCommand(TQString&, KPrinter*)
bool KPrinterImpl::printFiles(KPrinter *p, const TQStringList& f, bool flag) bool KPrinterImpl::printFiles(KPrinter *p, const TQStringList& f, bool flag)
{ {
QString cmd; TQString cmd;
if (p->option("kde-isspecial") == "1") if (p->option("kde-isspecial") == "1")
{ {
if (p->option("kde-special-command").isEmpty() && p->outputToFile()) if (p->option("kde-special-command").isEmpty() && p->outputToFile())
@ -228,7 +228,7 @@ void KPrinterImpl::statusMessage(const TQString& msg, KPrinter *printer)
if (!conf->readBoolEntry("ShowStatusMsg", true)) if (!conf->readBoolEntry("ShowStatusMsg", true))
return; return;
QString message(msg); TQString message(msg);
if (printer && !msg.isEmpty()) if (printer && !msg.isEmpty())
message.prepend(i18n("Printing document: %1").arg(printer->docName())+"\n"); message.prepend(i18n("Printing document: %1").arg(printer->docName())+"\n");
@ -250,8 +250,8 @@ bool KPrinterImpl::startPrinting(const TQString& cmd, KPrinter *printer, const T
{ {
statusMessage(i18n("Sending print data to printer: %1").arg(printer->printerName()), printer); statusMessage(i18n("Sending print data to printer: %1").arg(printer->printerName()), printer);
QString command(cmd), filestr; TQString command(cmd), filestr;
QStringList printfiles; TQStringList printfiles;
if (command.tqfind("%in") == -1) command.append(" %in"); if (command.tqfind("%in") == -1) command.append(" %in");
for (TQStringList::ConstIterator it=files.begin(); it!=files.end(); ++it) for (TQStringList::ConstIterator it=files.begin(); it!=files.end(); ++it)
@ -276,7 +276,7 @@ bool KPrinterImpl::startPrinting(const TQString& cmd, KPrinter *printer, const T
} }
else else
{ {
QString msg = i18n("Unable to start child print process. "); TQString msg = i18n("Unable to start child print process. ");
if (pid == 0) if (pid == 0)
msg += i18n("The KDE print server (<b>kdeprintd</b>) could not be contacted. Check that this server is running."); msg += i18n("The KDE print server (<b>kdeprintd</b>) could not be contacted. Check that this server is running.");
else else
@ -294,7 +294,7 @@ bool KPrinterImpl::startPrinting(const TQString& cmd, KPrinter *printer, const T
TQString KPrinterImpl::tempFile() TQString KPrinterImpl::tempFile()
{ {
QString f; TQString f;
// be sure the file doesn't exist // be sure the file doesn't exist
do f = locateLocal("tmp","kdeprint_") + KApplication::randomString(8); while (TQFile::exists(f)); do f = locateLocal("tmp","kdeprint_") + KApplication::randomString(8); while (TQFile::exists(f));
return f; return f;
@ -302,7 +302,7 @@ TQString KPrinterImpl::tempFile()
int KPrinterImpl::filterFiles(KPrinter *printer, TQStringList& files, bool flag) int KPrinterImpl::filterFiles(KPrinter *printer, TQStringList& files, bool flag)
{ {
QStringList flist = TQStringList::split(',',printer->option("_kde-filters"),false); TQStringList flist = TQStringList::split(',',printer->option("_kde-filters"),false);
TQMap<TQString,TQString> opts = printer->options(); TQMap<TQString,TQString> opts = printer->options();
// generic page selection mechanism (using psselect filter) // generic page selection mechanism (using psselect filter)
@ -317,7 +317,7 @@ int KPrinterImpl::filterFiles(KPrinter *printer, TQStringList& files, bool flag)
!printer->option("kde-range").isEmpty() || !printer->option("kde-range").isEmpty() ||
printer->pageSet() != KPrinter::AllPages)) printer->pageSet() != KPrinter::AllPages))
{ {
if (flist.findIndex("psselect") == -1) if (flist.tqfindIndex("psselect") == -1)
{ {
int index = KXmlCommandManager::self()->insertCommand(flist, "psselect", false); int index = KXmlCommandManager::self()->insertCommand(flist, "psselect", false);
if (index == -1 || !KXmlCommandManager::self()->checkCommand("psselect")) if (index == -1 || !KXmlCommandManager::self()->checkCommand("psselect"))
@ -345,8 +345,8 @@ int KPrinterImpl::doFilterFiles(KPrinter *printer, TQStringList& files, const TQ
if (flist.count() == 0) if (flist.count() == 0)
return 0; return 0;
QString filtercmd; TQString filtercmd;
QStringList inputMimeTypes; TQStringList inputMimeTypes;
for (uint i=0;i<flist.count();i++) for (uint i=0;i<flist.count();i++)
{ {
KXmlCommand *filter = KXmlCommandManager::self()->loadCommand(flist[i]); KXmlCommand *filter = KXmlCommandManager::self()->loadCommand(flist[i]);
@ -358,7 +358,7 @@ int KPrinterImpl::doFilterFiles(KPrinter *printer, TQStringList& files, const TQ
if (i == 0) if (i == 0)
inputMimeTypes = filter->inputMimeTypes(); inputMimeTypes = filter->inputMimeTypes();
QString subcmd = filter->buildCommand(opts,(i>0),(i<(flist.count()-1))); TQString subcmd = filter->buildCommand(opts,(i>0),(i<(flist.count()-1)));
delete filter; delete filter;
if (!subcmd.isEmpty()) if (!subcmd.isEmpty())
{ {
@ -374,11 +374,11 @@ int KPrinterImpl::doFilterFiles(KPrinter *printer, TQStringList& files, const TQ
} }
kdDebug(500) << "kdeprint: filter command: " << filtercmd << endl; kdDebug(500) << "kdeprint: filter command: " << filtercmd << endl;
QString rin("%in"), rout("%out"), rpsl("%psl"), rpsu("%psu"); TQString rin("%in"), rout("%out"), rpsl("%psl"), rpsu("%psu");
QString ps = pageSizeToPageName( printer->option( "kde-printsize" ).isEmpty() ? printer->pageSize() : ( KPrinter::PageSize )printer->option( "kde-printsize" ).toInt() ); TQString ps = pageSizeToPageName( printer->option( "kde-printsize" ).isEmpty() ? printer->pageSize() : ( KPrinter::PageSize )printer->option( "kde-printsize" ).toInt() );
for (TQStringList::Iterator it=files.begin(); it!=files.end(); ++it) for (TQStringList::Iterator it=files.begin(); it!=files.end(); ++it)
{ {
QString mime = KMimeMagic::self()->findFileType(*it)->mimeType(); TQString mime = KMimeMagic::self()->findFileType(*it)->mimeType();
if (inputMimeTypes.tqfind(mime) == inputMimeTypes.end()) if (inputMimeTypes.tqfind(mime) == inputMimeTypes.end())
{ {
if (KMessageBox::warningContinueCancel(0, if (KMessageBox::warningContinueCancel(0,
@ -388,14 +388,14 @@ int KPrinterImpl::doFilterFiles(KPrinter *printer, TQStringList& files, const TQ
"format?</p>").arg(mime), "format?</p>").arg(mime),
TQString::null, i18n("Convert")) == KMessageBox::Continue) TQString::null, i18n("Convert")) == KMessageBox::Continue)
{ {
QStringList ff; TQStringList ff;
int done(0); int done(0);
ff << *it; ff << *it;
while (done == 0) while (done == 0)
{ {
bool ok(false); bool ok(false);
QString targetMime = KInputDialog::getItem( TQString targetMime = KInputDialog::getItem(
i18n("Select MIME Type"), i18n("Select MIME Type"),
i18n("Select the target format for the conversion:"), i18n("Select the target format for the conversion:"),
inputMimeTypes, 0, false, &ok); inputMimeTypes, 0, false, &ok);
@ -404,7 +404,7 @@ int KPrinterImpl::doFilterFiles(KPrinter *printer, TQStringList& files, const TQ
printer->setErrorMessage(i18n("Operation aborted.")); printer->setErrorMessage(i18n("Operation aborted."));
return -1; return -1;
} }
QStringList filters = KXmlCommandManager::self()->autoConvert(mime, targetMime); TQStringList filters = KXmlCommandManager::self()->autoConvert(mime, targetMime);
if (filters.count() == 0) if (filters.count() == 0)
{ {
KMessageBox::error(0, i18n("No appropriate filter found. Select another target format.")); KMessageBox::error(0, i18n("No appropriate filter found. Select another target format."));
@ -432,8 +432,8 @@ int KPrinterImpl::doFilterFiles(KPrinter *printer, TQStringList& files, const TQ
} }
} }
QString tmpfile = tempFile(); TQString tmpfile = tempFile();
QString cmd(filtercmd); TQString cmd(filtercmd);
cmd.replace(rout,quote(tmpfile)); cmd.replace(rout,quote(tmpfile));
cmd.replace(rpsl,ps.lower()); cmd.replace(rpsl,ps.lower());
cmd.replace(rpsu,ps); cmd.replace(rpsu,ps);
@ -479,7 +479,7 @@ int KPrinterImpl::autoConvertFiles(KPrinter *printer, TQStringList& files, bool
int status(0), result; int status(0), result;
for (TQStringList::Iterator it=files.begin(); it!=files.end(); ) for (TQStringList::Iterator it=files.begin(); it!=files.end(); )
{ {
QString mime = KMimeMagic::self()->findFileType(*it)->mimeType(); TQString mime = KMimeMagic::self()->findFileType(*it)->mimeType();
if ( mime == "application/x-zerosize" ) if ( mime == "application/x-zerosize" )
{ {
// special case of empty file // special case of empty file
@ -491,7 +491,7 @@ int KPrinterImpl::autoConvertFiles(KPrinter *printer, TQStringList& files, bool
it = files.remove( it ); it = files.remove( it );
continue; continue;
} }
else if (mimeTypes.findIndex(mime) == -1) else if (mimeTypes.tqfindIndex(mime) == -1)
{ {
if ((result=KMessageBox::warningYesNoCancel(NULL, if ((result=KMessageBox::warningYesNoCancel(NULL,
i18n("<qt>The file format <em> %1 </em> is not directly supported by the current print system. You " i18n("<qt>The file format <em> %1 </em> is not directly supported by the current print system. You "
@ -511,7 +511,7 @@ int KPrinterImpl::autoConvertFiles(KPrinter *printer, TQStringList& files, bool
TQString::tqfromLatin1("kdeprintAutoConvert"))) == KMessageBox::Yes) TQString::tqfromLatin1("kdeprintAutoConvert"))) == KMessageBox::Yes)
{ {
// find the filter chain // find the filter chain
QStringList flist = KXmlCommandManager::self()->autoConvert(mime, primaryMimeType); TQStringList flist = KXmlCommandManager::self()->autoConvert(mime, primaryMimeType);
if (flist.count() == 0) if (flist.count() == 0)
{ {
KMessageBox::error(NULL, KMessageBox::error(NULL,
@ -529,7 +529,7 @@ int KPrinterImpl::autoConvertFiles(KPrinter *printer, TQStringList& files, bool
it = files.remove(it); it = files.remove(it);
continue; continue;
} }
QStringList l(*it); TQStringList l(*it);
switch (doFilterFiles(printer, l, flist, TQMap<TQString,TQString>(), flag)) switch (doFilterFiles(printer, l, flist, TQMap<TQString,TQString>(), flag))
{ {
case -1: case -1:
@ -555,7 +555,7 @@ int KPrinterImpl::autoConvertFiles(KPrinter *printer, TQStringList& files, bool
bool KPrinterImpl::setupSpecialCommand(TQString& cmd, KPrinter *p, const TQStringList&) bool KPrinterImpl::setupSpecialCommand(TQString& cmd, KPrinter *p, const TQStringList&)
{ {
QString s(p->option("kde-special-command")); TQString s(p->option("kde-special-command"));
if (s.isEmpty()) if (s.isEmpty())
{ {
p->setErrorMessage("Empty command."); p->setErrorMessage("Empty command.");
@ -564,7 +564,7 @@ bool KPrinterImpl::setupSpecialCommand(TQString& cmd, KPrinter *p, const TQStrin
s = KMFactory::self()->specialManager()->setupCommand(s, p->options()); s = KMFactory::self()->specialManager()->setupCommand(s, p->options());
QString ps = pageSizeToPageName( p->option( "kde-printsize" ).isEmpty() ? p->pageSize() : ( KPrinter::PageSize )p->option( "kde-printsize" ).toInt() ); TQString ps = pageSizeToPageName( p->option( "kde-printsize" ).isEmpty() ? p->pageSize() : ( KPrinter::PageSize )p->option( "kde-printsize" ).toInt() );
s.replace("%psl", ps.lower()); s.replace("%psl", ps.lower());
s.replace("%psu", ps); s.replace("%psu", ps);
s.replace("%out", "$out{" + p->outputFileName() + "}"); // Replace as last s.replace("%out", "$out{" + p->outputFileName() + "}"); // Replace as last
@ -585,7 +585,7 @@ void KPrinterImpl::loadAppOptions()
{ {
KConfig *conf = KGlobal::config(); KConfig *conf = KGlobal::config();
conf->setGroup("KPrinter Settings"); conf->setGroup("KPrinter Settings");
QStringList opts = conf->readListEntry("ApplicationOptions"); TQStringList opts = conf->readListEntry("ApplicationOptions");
for (uint i=0; i<opts.count(); i+=2) for (uint i=0; i<opts.count(); i+=2)
if (opts[i].startsWith("app-")) if (opts[i].startsWith("app-"))
m_options[opts[i]] = opts[i+1]; m_options[opts[i]] = opts[i+1];
@ -593,7 +593,7 @@ void KPrinterImpl::loadAppOptions()
void KPrinterImpl::saveAppOptions() void KPrinterImpl::saveAppOptions()
{ {
QStringList optlist; TQStringList optlist;
for (TQMap<TQString,TQString>::ConstIterator it=m_options.begin(); it!=m_options.end(); ++it) for (TQMap<TQString,TQString>::ConstIterator it=m_options.begin(); it!=m_options.end(); ++it)
if (it.key().startsWith("app-")) if (it.key().startsWith("app-"))
optlist << it.key() << it.data(); optlist << it.key() << it.data();

@ -68,7 +68,7 @@ void KPrinterPropertyDialog::addPage(KPrintDialogPage *page)
bool KPrinterPropertyDialog::synchronize() bool KPrinterPropertyDialog::synchronize()
{ {
if (m_current) m_current->getOptions(m_options,true); if (m_current) m_current->getOptions(m_options,true);
QString msg; TQString msg;
TQPtrListIterator<KPrintDialogPage> it(m_pages); TQPtrListIterator<KPrintDialogPage> it(m_pages);
for (;it.current();++it) for (;it.current();++it)
{ {

@ -62,8 +62,8 @@ protected:
TQPtrList<KPrintDialogPage> m_pages; TQPtrList<KPrintDialogPage> m_pages;
KPrintDialogPage *m_current; KPrintDialogPage *m_current;
TQMap<TQString,TQString> m_options; TQMap<TQString,TQString> m_options;
QTabWidget *m_tw; TQTabWidget *m_tw;
QPushButton *m_save; TQPushButton *m_save;
}; };
#endif #endif

@ -99,7 +99,7 @@ public:
KParts::ReadOnlyPart *gvpart_; KParts::ReadOnlyPart *gvpart_;
KToolBar *toolbar_; KToolBar *toolbar_;
KActionCollection *actions_; KActionCollection *actions_;
QWidget *mainwidget_; TQWidget *mainwidget_;
KAccel *accel_; KAccel *accel_;
bool previewonly_; bool previewonly_;
}; };
@ -154,11 +154,11 @@ KPrintPreview::KPrintPreview(TQWidget *parent, bool previewOnly)
// create main view and actions // create main view and actions
setMainWidget(d->mainwidget_); setMainWidget(d->mainwidget_);
if (previewOnly) if (previewOnly)
KStdAction::close(this, TQT_SLOT(reject()), d->actions_, "close_print"); KStdAction::close(TQT_TQOBJECT(this), TQT_SLOT(reject()), d->actions_, "close_print");
else else
{ {
new KAction(i18n("Print"), "fileprint", Qt::Key_Return, this, TQT_SLOT(accept()), d->actions_, "continue_print"); new KAction(i18n("Print"), "fileprint", Qt::Key_Return, TQT_TQOBJECT(this), TQT_SLOT(accept()), d->actions_, "continue_print");
new KAction(i18n("Cancel"), "stop", Qt::Key_Escape, this, TQT_SLOT(reject()), d->actions_, "stop_print"); new KAction(i18n("Cancel"), "stop", Qt::Key_Escape, TQT_TQOBJECT(this), TQT_SLOT(reject()), d->actions_, "stop_print");
} }
} }
@ -171,7 +171,7 @@ KPrintPreview::~KPrintPreview()
void KPrintPreview::initView(KLibFactory *factory) void KPrintPreview::initView(KLibFactory *factory)
{ {
// load the component // load the component
d->gvpart_ = (KParts::ReadOnlyPart*)factory->create(d->mainwidget_, "gvpart", "KParts::ReadOnlyPart"); d->gvpart_ = (KParts::ReadOnlyPart*)factory->create(TQT_TQOBJECT(d->mainwidget_), "gvpart", "KParts::ReadOnlyPart");
// populate the toolbar // populate the toolbar
if (d->previewonly_) if (d->previewonly_)
@ -218,7 +218,7 @@ void KPrintPreview::initView(KLibFactory *factory)
//d->adjustSize(); //d->adjustSize();
// construct the layout // construct the layout
QVBoxLayout *l0 = new TQVBoxLayout(d->mainwidget_, 0, 0); TQVBoxLayout *l0 = new TQVBoxLayout(d->mainwidget_, 0, 0);
l0->addWidget(d->toolbar_, AlignTop); l0->addWidget(d->toolbar_, AlignTop);
if (d->gvpart_) if (d->gvpart_)
l0->addWidget(d->gvpart_->widget()); l0->addWidget(d->gvpart_->widget());
@ -248,8 +248,8 @@ bool KPrintPreview::preview(const TQString& file, bool previewOnly, WId parentId
conf->setGroup("General"); conf->setGroup("General");
KLibFactory *factory(0); KLibFactory *factory(0);
bool externalPreview = conf->readBoolEntry("ExternalPreview", false); bool externalPreview = conf->readBoolEntry("ExternalPreview", false);
QWidget *parentW = TQWidget::find(parentId); TQWidget *parentW = TQT_TQWIDGET(TQWidget::find(parentId));
QString exe; TQString exe;
if (!externalPreview && isPS && (factory = componentFactory()) != 0) if (!externalPreview && isPS && (factory = componentFactory()) != 0)
{ {
KPrintPreview dlg(parentW, previewOnly); KPrintPreview dlg(parentW, previewOnly);

@ -48,7 +48,7 @@ TQString KPrintProcess::errorMessage() const
bool KPrintProcess::print() bool KPrintProcess::print()
{ {
m_buffer = TQString::null; m_buffer = TQString();
m_state = Printing; m_state = Printing;
return start(NotifyOnExit,All); return start(NotifyOnExit,All);
} }
@ -57,7 +57,7 @@ void KPrintProcess::slotReceivedStderr(KProcess *proc, char *buf, int len)
{ {
if (proc == this) if (proc == this)
{ {
QCString str = TQCString(buf,len).stripWhiteSpace(); TQCString str = TQCString(buf,len).stripWhiteSpace();
m_buffer.append(str.append("\n")); m_buffer.append(str.append("\n"));
} }
} }

@ -49,17 +49,17 @@ static void setOptionText(DrBase *opt, const TQString& s)
class KXmlCommand::KXmlCommandPrivate class KXmlCommand::KXmlCommandPrivate
{ {
public: public:
QString m_name; TQString m_name;
QString m_command; TQString m_command;
DrMain *m_driver; DrMain *m_driver;
struct struct
{ {
QString m_format[2]; // 0 -> file, 1 -> pipe TQString m_format[2]; // 0 -> file, 1 -> pipe
} m_io[2]; // 0 -> input, 1 -> output } m_io[2]; // 0 -> input, 1 -> output
QString m_description; TQString m_description;
QString m_outputMime; TQString m_outputMime;
QStringList m_inputMime; TQStringList m_inputMime;
QStringList m_requirements; TQStringList m_requirements;
bool m_loaded[2]; // 0 -> Desktop, 1 -> XML bool m_loaded[2]; // 0 -> Desktop, 1 -> XML
TQString m_comment; TQString m_comment;
}; };
@ -240,11 +240,11 @@ void KXmlCommand::saveDesktop()
void KXmlCommand::loadXml() void KXmlCommand::loadXml()
{ {
QFile f(locate("data", "kdeprint/filters/"+name()+".xml")); TQFile f(locate("data", "kdeprint/filters/"+name()+".xml"));
QDomDocument doc; TQDomDocument doc;
if (f.open(IO_ReadOnly) && doc.setContent(&f) && doc.documentElement().tagName() == "kprintfilter") if (f.open(IO_ReadOnly) && doc.setContent(&f) && doc.documentElement().tagName() == "kprintfilter")
{ {
QDomElement e, docElem = doc.documentElement(); TQDomElement e, docElem = doc.documentElement();
d->m_name = docElem.attribute("name"); d->m_name = docElem.attribute("name");
// command // command
@ -274,7 +274,7 @@ void KXmlCommand::loadXml()
void KXmlCommand::parseIO(const TQDomElement& e, int n) void KXmlCommand::parseIO(const TQDomElement& e, int n)
{ {
QDomElement elem = e.firstChild().toElement(); TQDomElement elem = e.firstChild().toElement();
while (!elem.isNull()) while (!elem.isNull())
{ {
if (elem.tagName() == "filterarg") if (elem.tagName() == "filterarg")
@ -293,7 +293,7 @@ DrGroup* KXmlCommand::parseGroup(const TQDomElement& e, DrGroup *grp)
grp->setName(e.attribute("name")); grp->setName(e.attribute("name"));
setOptionText(grp, e.attribute("description")); setOptionText(grp, e.attribute("description"));
QDomElement elem = e.firstChild().toElement(); TQDomElement elem = e.firstChild().toElement();
while (!elem.isNull()) while (!elem.isNull())
{ {
if (elem.tagName() == "filterarg") if (elem.tagName() == "filterarg")
@ -317,7 +317,7 @@ DrGroup* KXmlCommand::parseGroup(const TQDomElement& e, DrGroup *grp)
DrBase* KXmlCommand::parseArgument(const TQDomElement& e) DrBase* KXmlCommand::parseArgument(const TQDomElement& e)
{ {
DrBase *opt(0); DrBase *opt(0);
QString type = e.attribute("type"); TQString type = e.attribute("type");
if (type == "int" || type == "float") if (type == "int" || type == "float")
{ {
@ -337,7 +337,7 @@ DrBase* KXmlCommand::parseArgument(const TQDomElement& e)
else else
opt = new DrBooleanOption; opt = new DrBooleanOption;
DrListOption *lopt = static_cast<DrListOption*>(opt); DrListOption *lopt = static_cast<DrListOption*>(opt);
QDomElement elem = e.firstChild().toElement(); TQDomElement elem = e.firstChild().toElement();
while (!elem.isNull()) while (!elem.isNull())
{ {
if (elem.tagName() == "value") if (elem.tagName() == "value")
@ -367,7 +367,7 @@ TQString KXmlCommand::buildCommand(const TQMap<TQString,TQString>& opts, bool pi
{ {
check(true); check(true);
QString str, cmd = d->m_command; TQString str, cmd = d->m_command;
TQString re( "%value" ), quotedRe( "'%value'" ); TQString re( "%value" ), quotedRe( "'%value'" );
if (d->m_driver) if (d->m_driver)
@ -381,7 +381,7 @@ TQString KXmlCommand::buildCommand(const TQMap<TQString,TQString>& opts, bool pi
DrBase *dopt = d->m_driver->findOption(it.key()); DrBase *dopt = d->m_driver->findOption(it.key());
if (dopt) if (dopt)
{ {
QString format = dopt->get("format"); TQString format = dopt->get("format");
TQString value = dopt->valueText(); TQString value = dopt->valueText();
if ( format.tqfind( quotedRe ) != -1 ) if ( format.tqfind( quotedRe ) != -1 )
{ {
@ -425,12 +425,12 @@ void KXmlCommand::getOptions(TQMap<TQString,TQString>& opts, bool incldef)
void KXmlCommand::saveXml() void KXmlCommand::saveXml()
{ {
QFile f(locateLocal("data", "kdeprint/filters/"+name()+".xml")); TQFile f(locateLocal("data", "kdeprint/filters/"+name()+".xml"));
if (!f.open(IO_WriteOnly)) if (!f.open(IO_WriteOnly))
return; return;
QDomDocument doc("kprintfilter"); TQDomDocument doc("kprintfilter");
QDomElement root = doc.createElement("kprintfilter"), elem; TQDomElement root = doc.createElement("kprintfilter"), elem;
root.setAttribute("name", d->m_name); root.setAttribute("name", d->m_name);
doc.appendChild(root); doc.appendChild(root);
@ -455,19 +455,19 @@ void KXmlCommand::saveXml()
root.appendChild(elem); root.appendChild(elem);
// save to file (and close it) // save to file (and close it)
QTextStream t(&f); TQTextStream t(&f);
t << doc.toString(); t << doc.toString();
f.close(); f.close();
} }
TQDomElement KXmlCommand::createIO(TQDomDocument& doc, int n, const TQString& tag) TQDomElement KXmlCommand::createIO(TQDomDocument& doc, int n, const TQString& tag)
{ {
QDomElement elem = doc.createElement(tag); TQDomElement elem = doc.createElement(tag);
if (d->m_command.tqfind("%"+tag) != -1) if (d->m_command.tqfind("%"+tag) != -1)
{ {
for (int i=0; i<2; i++) for (int i=0; i<2; i++)
{ {
QDomElement io = doc.createElement("filterarg"); TQDomElement io = doc.createElement("filterarg");
io.setAttribute("name", (i ? "pipe" : "file")); io.setAttribute("name", (i ? "pipe" : "file"));
io.setAttribute("format", d->m_io[n].m_format[i]); io.setAttribute("format", d->m_io[n].m_format[i]);
elem.appendChild(io); elem.appendChild(io);
@ -479,7 +479,7 @@ TQDomElement KXmlCommand::createIO(TQDomDocument& doc, int n, const TQString& ta
TQDomElement KXmlCommand::createGroup(TQDomDocument& doc, DrGroup *group) TQDomElement KXmlCommand::createGroup(TQDomDocument& doc, DrGroup *group)
{ {
QDomElement elem = doc.createElement("filtergroup"); TQDomElement elem = doc.createElement("filtergroup");
elem.setAttribute("name", group->name()); elem.setAttribute("name", group->name());
elem.setAttribute("description", group->get("text")); elem.setAttribute("description", group->get("text"));
@ -496,8 +496,8 @@ TQDomElement KXmlCommand::createGroup(TQDomDocument& doc, DrGroup *group)
TQDomElement KXmlCommand::createElement(TQDomDocument& doc, DrBase *opt) TQDomElement KXmlCommand::createElement(TQDomDocument& doc, DrBase *opt)
{ {
QDomElement elem = doc.createElement("filterarg"); TQDomElement elem = doc.createElement("filterarg");
QString elemName = opt->name(); TQString elemName = opt->name();
if (elemName.startsWith("_kde-")) if (elemName.startsWith("_kde-"))
elemName.replace(0, name().length()+6, ""); elemName.replace(0, name().length()+6, "");
elem.setAttribute("name", elemName); elem.setAttribute("name", elemName);
@ -524,7 +524,7 @@ TQDomElement KXmlCommand::createElement(TQDomDocument& doc, DrBase *opt)
TQPtrListIterator<DrBase> it(*(static_cast<DrListOption*>(opt)->choices())); TQPtrListIterator<DrBase> it(*(static_cast<DrListOption*>(opt)->choices()));
for (; it.current(); ++it) for (; it.current(); ++it)
{ {
QDomElement chElem = doc.createElement("value"); TQDomElement chElem = doc.createElement("value");
chElem.setAttribute("name", it.current()->name()); chElem.setAttribute("name", it.current()->name());
chElem.setAttribute("description", it.current()->get("text")); chElem.setAttribute("description", it.current()->get("text"));
elem.appendChild(chElem); elem.appendChild(chElem);
@ -543,7 +543,7 @@ TQDomElement KXmlCommand::createElement(TQDomDocument& doc, DrBase *opt)
class KXmlCommandManager::KXmlCommandManagerPrivate class KXmlCommandManager::KXmlCommandManagerPrivate
{ {
public: public:
QStringList m_cmdlist; TQStringList m_cmdlist;
TQMap<TQString, TQValueList<KXmlCommand*> > m_mimemap; TQMap<TQString, TQValueList<KXmlCommand*> > m_mimemap;
TQMap<TQString, KXmlCommand*> m_cmdmap; TQMap<TQString, KXmlCommand*> m_cmdmap;
}; };
@ -576,7 +576,7 @@ KXmlCommand* KXmlCommandManager::loadCommand(const TQString& xmlId, bool check)
{ {
if (check) if (check)
{ {
QString desktopFile = locate("data", "kdeprint/filters/"+xmlId+".desktop"); TQString desktopFile = locate("data", "kdeprint/filters/"+xmlId+".desktop");
if (desktopFile.isEmpty()) if (desktopFile.isEmpty())
return 0; return 0;
} }
@ -610,7 +610,7 @@ void KXmlCommandManager::preload()
KXmlCommand *xmlCmd = loadCommand(*it); KXmlCommand *xmlCmd = loadCommand(*it);
if (!xmlCmd) continue; // Error! if (!xmlCmd) continue; // Error!
QStringList inputMime = xmlCmd->inputMimeTypes(); TQStringList inputMime = xmlCmd->inputMimeTypes();
for (TQStringList::ConstIterator mime=inputMime.begin(); mime!=inputMime.end(); ++mime) for (TQStringList::ConstIterator mime=inputMime.begin(); mime!=inputMime.end(); ++mime)
{ {
d->m_mimemap[*mime].append(xmlCmd); d->m_mimemap[*mime].append(xmlCmd);
@ -624,14 +624,14 @@ TQStringList KXmlCommandManager::commandList()
{ {
if (d->m_cmdlist.isEmpty()) if (d->m_cmdlist.isEmpty())
{ {
QStringList dirs = KGlobal::dirs()->findDirs("data", "kdeprint/filters/"); TQStringList dirs = KGlobal::dirs()->findDirs("data", "kdeprint/filters/");
for (TQStringList::ConstIterator it=dirs.begin(); it!=dirs.end(); ++it) for (TQStringList::ConstIterator it=dirs.begin(); it!=dirs.end(); ++it)
{ {
QStringList list = TQDir(*it).entryList("*.desktop", TQDir::Files, TQDir::Unsorted); TQStringList list = TQDir(*it).entryList("*.desktop", TQDir::Files, TQDir::Unsorted);
for (TQStringList::ConstIterator it2=list.begin(); it2!=list.end(); ++it2) for (TQStringList::ConstIterator it2=list.begin(); it2!=list.end(); ++it2)
{ {
QString cmdName = (*it2).left((*it2).length()-8); TQString cmdName = (*it2).left((*it2).length()-8);
if (d->m_cmdlist.tqfind(cmdName) == d->m_cmdlist.end()) if (d->m_cmdlist.tqfind(cmdName) == d->m_cmdlist.end())
d->m_cmdlist.append(cmdName); d->m_cmdlist.append(cmdName);
} }
@ -646,7 +646,7 @@ TQStringList KXmlCommandManager::commandList()
TQStringList KXmlCommandManager::commandListWithDescription() TQStringList KXmlCommandManager::commandListWithDescription()
{ {
preload(); preload();
QStringList l; TQStringList l;
for (TQMap<TQString,KXmlCommand*>::ConstIterator it=d->m_cmdmap.begin(); it!=d->m_cmdmap.end(); ++it) for (TQMap<TQString,KXmlCommand*>::ConstIterator it=d->m_cmdmap.begin(); it!=d->m_cmdmap.end(); ++it)
l << (*it)->name() << (*it)->description(); l << (*it)->name() << (*it)->description();
@ -676,7 +676,7 @@ TQString KXmlCommandManager::selectCommand(TQWidget *parent)
KXmlCommand* KXmlCommandManager::command(const TQString& xmlId) const KXmlCommand* KXmlCommandManager::command(const TQString& xmlId) const
{ {
return (d->m_cmdmap.contains(xmlId) ? d->m_cmdmap[xmlId] : 0); return (d->m_cmdmap.tqcontains(xmlId) ? d->m_cmdmap[xmlId] : 0);
} }
int KXmlCommandManager::insertCommand(TQStringList& list, const TQString& filtername, bool defaultToStart) int KXmlCommandManager::insertCommand(TQStringList& list, const TQString& filtername, bool defaultToStart)
@ -687,7 +687,7 @@ int KXmlCommandManager::insertCommand(TQStringList& list, const TQString& filter
KXmlCommand *f1 = command(filtername), *f2 = 0; KXmlCommand *f1 = command(filtername), *f2 = 0;
if (f1 && f1->inputMimeTypes().count() > 0) if (f1 && f1->inputMimeTypes().count() > 0)
{ {
QString mimetype = f1->inputMimeTypes()[0]; TQString mimetype = f1->inputMimeTypes()[0];
for (TQStringList::Iterator it=list.begin(); it!=list.end(); ++it, pos++) for (TQStringList::Iterator it=list.begin(); it!=list.end(); ++it, pos++)
{ {
f2 = command(*it); f2 = command(*it);
@ -723,12 +723,12 @@ int KXmlCommandManager::insertCommand(TQStringList& list, const TQString& filter
TQStringList KXmlCommandManager::autoConvert(const TQString& mimesrc, const TQString& mimedest) TQStringList KXmlCommandManager::autoConvert(const TQString& mimesrc, const TQString& mimedest)
{ {
QStringList chain; TQStringList chain;
uint score(0); uint score(0);
preload(); preload();
if (d->m_mimemap.contains(mimesrc)) if (d->m_mimemap.tqcontains(mimesrc))
{ {
const TQValueList<KXmlCommand*> l = d->m_mimemap[mimesrc]; const TQValueList<KXmlCommand*> l = d->m_mimemap[mimesrc];
for (TQValueList<KXmlCommand*>::ConstIterator it=l.begin(); it!=l.end(); ++it) for (TQValueList<KXmlCommand*>::ConstIterator it=l.begin(); it!=l.end(); ++it)
@ -747,12 +747,12 @@ TQStringList KXmlCommandManager::autoConvert(const TQString& mimesrc, const TQSt
// its output and mimedest (do not consider cyling filters) // its output and mimedest (do not consider cyling filters)
else if ((*it)->mimeType() != mimesrc) else if ((*it)->mimeType() != mimesrc)
{ {
QStringList subchain = autoConvert((*it)->mimeType(), mimedest); TQStringList subchain = autoConvert((*it)->mimeType(), mimedest);
// If chain length is 0, then there's no possible filter between those 2 // If chain length is 0, then there's no possible filter between those 2
// mime types. Just discard it. If the subchain contains also the current // mime types. Just discard it. If the subchain contains also the current
// considered filter, then discard it: it denotes of a cycle in filter // considered filter, then discard it: it denotes of a cycle in filter
// chain. // chain.
if (subchain.count() > 0 && subchain.findIndex((*it)->name()) == -1) if (subchain.count() > 0 && subchain.tqfindIndex((*it)->name()) == -1)
{ {
subchain.prepend((*it)->name()); subchain.prepend((*it)->name());
if (subchain.count() < score || score == 0) if (subchain.count() < score || score == 0)
@ -772,7 +772,7 @@ TQStringList KXmlCommandManager::autoConvert(const TQString& mimesrc, const TQSt
bool KXmlCommandManager::checkCommand(const TQString& xmlId, int inputCheck, int outputCheck, TQString *msg) bool KXmlCommandManager::checkCommand(const TQString& xmlId, int inputCheck, int outputCheck, TQString *msg)
{ {
KXmlCommand *xmlCmd = command(xmlId); KXmlCommand *xmlCmd = command(xmlId);
QString errmsg; TQString errmsg;
bool needDestroy(false); bool needDestroy(false);
//kdDebug(500) << "checking command: " << xmlId << " (" << (xmlCmd != NULL) << ")" << endl; //kdDebug(500) << "checking command: " << xmlId << " (" << (xmlCmd != NULL) << ")" << endl;
if (!xmlCmd) if (!xmlCmd)
@ -788,7 +788,7 @@ bool KXmlCommandManager::checkCommand(const TQString& xmlId, int inputCheck, int
if (!status) if (!status)
errmsg = i18n("One of the command object's requirements is not met."); errmsg = i18n("One of the command object's requirements is not met.");
} }
QString cmd = (xmlCmd ? xmlCmd->command() : xmlId); TQString cmd = (xmlCmd ? xmlCmd->command() : xmlId);
if (status && !cmd.isEmpty() && (inputCheck > None || outputCheck > None)) if (status && !cmd.isEmpty() && (inputCheck > None || outputCheck > None))
{ {
if (inputCheck > None && (cmd.tqfind("%in") == -1 || inputCheck == Advanced) && cmd.tqfind("%filterinput") == -1) if (inputCheck > None && (cmd.tqfind("%in") == -1 || inputCheck == Advanced) && cmd.tqfind("%filterinput") == -1)

@ -43,13 +43,13 @@ public:
TQString readLine(); TQString readLine();
void unreadLine(const TQString& l) { m_linebuf = l; } void unreadLine(const TQString& l) { m_linebuf = l; }
private: private:
QTextStream m_stream; TQTextStream m_stream;
QString m_linebuf; TQString m_linebuf;
}; };
TQString KTextBuffer::readLine() TQString KTextBuffer::readLine()
{ {
QString line; TQString line;
if (!m_linebuf.isEmpty()) if (!m_linebuf.isEmpty())
{ {
line = m_linebuf; line = m_linebuf;
@ -73,7 +73,7 @@ TQString KTextBuffer::readLine()
// '#', '|', ':'. The line is then put back in the IODevice. // '#', '|', ':'. The line is then put back in the IODevice.
TQString readLine(KTextBuffer& t) TQString readLine(KTextBuffer& t)
{ {
QString line, buffer; TQString line, buffer;
bool lineContinue(false); bool lineContinue(false);
while (!t.eof()) while (!t.eof())
@ -105,12 +105,12 @@ TQString readLine(KTextBuffer& t)
// extact an entry (printcap-like) // extact an entry (printcap-like)
TQMap<TQString,TQString> readEntry(KTextBuffer& t) TQMap<TQString,TQString> readEntry(KTextBuffer& t)
{ {
QString line = readLine(t); TQString line = readLine(t);
TQMap<TQString,TQString> entry; TQMap<TQString,TQString> entry;
if (!line.isEmpty()) if (!line.isEmpty())
{ {
QStringList l = TQStringList::split(':',line,false); TQStringList l = TQStringList::split(':',line,false);
if (l.count() > 0) if (l.count() > 0)
{ {
int p(-1); int p(-1);
@ -150,25 +150,25 @@ KMPrinter* createPrinter(const TQString& prname)
TQString getPrintcapFileName() TQString getPrintcapFileName()
{ {
// check if LPRng system // check if LPRng system
QString printcap("/etc/printcap"); TQString printcap("/etc/printcap");
QFile f("/etc/lpd.conf"); TQFile f("/etc/lpd.conf");
if (f.exists() && f.open(IO_ReadOnly)) if (f.exists() && f.open(IO_ReadOnly))
{ {
kdDebug() << "/etc/lpd.conf found: probably LPRng system" << endl; kdDebug() << "/etc/lpd.conf found: probably LPRng system" << endl;
QTextStream t(&f); TQTextStream t(&f);
QString line; TQString line;
while (!t.eof()) while (!t.eof())
{ {
line = t.readLine().stripWhiteSpace(); line = t.readLine().stripWhiteSpace();
if (line.startsWith("printcap_path=")) if (line.startsWith("printcap_path="))
{ {
kdDebug() << "printcap_path entry found: " << line << endl; kdDebug() << "printcap_path entry found: " << line << endl;
QString pcentry = line.mid(14).stripWhiteSpace(); TQString pcentry = line.mid(14).stripWhiteSpace();
kdDebug() << "printcap_path value: " << pcentry << endl; kdDebug() << "printcap_path value: " << pcentry << endl;
if (pcentry[0] == '|') if (pcentry[0] == '|')
{ // printcap through pipe { // printcap through pipe
printcap = locateLocal("tmp","printcap"); printcap = locateLocal("tmp","printcap");
QString cmd = TQString::tqfromLatin1("echo \"all\" | %1 > %2").arg(pcentry.mid(1)).arg(printcap); TQString cmd = TQString::tqfromLatin1("echo \"all\" | %1 > %2").arg(pcentry.mid(1)).arg(printcap);
kdDebug() << "printcap obtained through pipe" << endl << "executing: " << cmd << endl; kdDebug() << "printcap obtained through pipe" << endl << "executing: " << cmd << endl;
::system(cmd.local8Bit()); ::system(cmd.local8Bit());
} }
@ -183,27 +183,27 @@ TQString getPrintcapFileName()
// "/etc/printcap" file parsing (Linux/LPR) // "/etc/printcap" file parsing (Linux/LPR)
void KMLpdUnixManager::parseEtcPrintcap() void KMLpdUnixManager::parseEtcPrintcap()
{ {
QFile f(getPrintcapFileName()); TQFile f(getPrintcapFileName());
if (f.exists() && f.open(IO_ReadOnly)) if (f.exists() && f.open(IO_ReadOnly))
{ {
KTextBuffer t(&f); KTextBuffer t(TQT_TQIODEVICE(&f));
TQMap<TQString,TQString> entry; TQMap<TQString,TQString> entry;
while (!t.eof()) while (!t.eof())
{ {
entry = readEntry(t); entry = readEntry(t);
if (entry.isEmpty() || !entry.contains("printer-name") || entry.contains("server")) if (entry.isEmpty() || !entry.tqcontains("printer-name") || entry.tqcontains("server"))
continue; continue;
if (entry["printer-name"] == "all") if (entry["printer-name"] == "all")
{ {
if (entry.contains("all")) if (entry.tqcontains("all"))
{ {
// find separator // find separator
int p = entry["all"].tqfind(TQRegExp("[^a-zA-Z0-9_\\s-]")); int p = entry["all"].tqfind(TQRegExp("[^a-zA-Z0-9_\\s-]"));
if (p != -1) if (p != -1)
{ {
QChar c = entry["all"][p]; TQChar c = entry["all"][p];
QStringList prs = TQStringList::split(c,entry["all"],false); TQStringList prs = TQStringList::split(c,entry["all"],false);
for (TQStringList::ConstIterator it=prs.begin(); it!=prs.end(); ++it) for (TQStringList::ConstIterator it=prs.begin(); it!=prs.end(); ++it)
{ {
KMPrinter *printer = ::createPrinter(*it); KMPrinter *printer = ::createPrinter(*it);
@ -216,7 +216,7 @@ void KMLpdUnixManager::parseEtcPrintcap()
else else
{ {
KMPrinter *printer = ::createPrinter(entry); KMPrinter *printer = ::createPrinter(entry);
if (entry.contains("rm")) if (entry.tqcontains("rm"))
printer->setDescription(i18n("Remote printer queue on %1").arg(entry["rm"])); printer->setDescription(i18n("Remote printer queue on %1").arg(entry["rm"]));
else else
printer->setDescription(i18n("Local printer")); printer->setDescription(i18n("Local printer"));
@ -229,12 +229,12 @@ void KMLpdUnixManager::parseEtcPrintcap()
// helper function for NIS support in Solaris-2.6 (use "ypcat printers.conf.byname") // helper function for NIS support in Solaris-2.6 (use "ypcat printers.conf.byname")
TQString getEtcPrintersConfName() TQString getEtcPrintersConfName()
{ {
QString printersconf("/etc/printers.conf"); TQString printersconf("/etc/printers.conf");
if (!TQFile::exists(printersconf) && !KStandardDirs::findExe( "ypcat" ).isEmpty()) if (!TQFile::exists(printersconf) && !KStandardDirs::findExe( "ypcat" ).isEmpty())
{ {
// standard file not found, try NIS // standard file not found, try NIS
printersconf = locateLocal("tmp","printers.conf"); printersconf = locateLocal("tmp","printers.conf");
QString cmd = TQString::tqfromLatin1("ypcat printers.conf.byname > %1").arg(printersconf); TQString cmd = TQString::tqfromLatin1("ypcat printers.conf.byname > %1").arg(printersconf);
kdDebug() << "printers.conf obtained from NIS server: " << cmd << endl; kdDebug() << "printers.conf obtained from NIS server: " << cmd << endl;
::system(TQFile::encodeName(cmd)); ::system(TQFile::encodeName(cmd));
} }
@ -244,30 +244,30 @@ TQString getEtcPrintersConfName()
// "/etc/printers.conf" file parsing (Solaris 2.6) // "/etc/printers.conf" file parsing (Solaris 2.6)
void KMLpdUnixManager::parseEtcPrintersConf() void KMLpdUnixManager::parseEtcPrintersConf()
{ {
QFile f(getEtcPrintersConfName()); TQFile f(getEtcPrintersConfName());
if (f.exists() && f.open(IO_ReadOnly)) if (f.exists() && f.open(IO_ReadOnly))
{ {
KTextBuffer t(&f); KTextBuffer t(TQT_TQIODEVICE(&f));
TQMap<TQString,TQString> entry; TQMap<TQString,TQString> entry;
QString default_printer; TQString default_printer;
while (!t.eof()) while (!t.eof())
{ {
entry = readEntry(t); entry = readEntry(t);
if (entry.isEmpty() || !entry.contains("printer-name")) if (entry.isEmpty() || !entry.tqcontains("printer-name"))
continue; continue;
QString prname = entry["printer-name"]; TQString prname = entry["printer-name"];
if (prname == "_default") if (prname == "_default")
{ {
if (entry.contains("use")) if (entry.tqcontains("use"))
default_printer = entry["use"]; default_printer = entry["use"];
} }
else if (prname != "_all") else if (prname != "_all")
{ {
KMPrinter *printer = ::createPrinter(entry); KMPrinter *printer = ::createPrinter(entry);
if (entry.contains("bsdaddr")) if (entry.tqcontains("bsdaddr"))
{ {
QStringList l = TQStringList::split(',',entry["bsdaddr"],false); TQStringList l = TQStringList::split(',',entry["bsdaddr"],false);
printer->setDescription(i18n("Remote printer queue on %1").arg(l[0])); printer->setDescription(i18n("Remote printer queue on %1").arg(l[0]));
} }
else else
@ -284,28 +284,28 @@ void KMLpdUnixManager::parseEtcPrintersConf()
// "/etc/lp/printers/" directory parsing (Solaris non-2.6) // "/etc/lp/printers/" directory parsing (Solaris non-2.6)
void KMLpdUnixManager::parseEtcLpPrinters() void KMLpdUnixManager::parseEtcLpPrinters()
{ {
QDir d("/etc/lp/printers"); TQDir d("/etc/lp/printers");
const QFileInfoList *prlist = d.entryInfoList(TQDir::Dirs); const TQFileInfoList *prlist = d.entryInfoList(TQDir::Dirs);
if (!prlist) if (!prlist)
return; return;
QFileInfoListIterator it(*prlist); TQFileInfoListIterator it(*prlist);
for (;it.current();++it) for (;it.current();++it)
{ {
if (it.current()->fileName() == "." || it.current()->fileName() == "..") if (it.current()->fileName() == "." || it.current()->fileName() == "..")
continue; continue;
QFile f(it.current()->absFilePath() + "/configuration"); TQFile f(it.current()->absFilePath() + "/configuration");
if (f.exists() && f.open(IO_ReadOnly)) if (f.exists() && f.open(IO_ReadOnly))
{ {
KTextBuffer t(&f); KTextBuffer t(TQT_TQIODEVICE(&f));
QString line, remote; TQString line, remote;
while (!t.eof()) while (!t.eof())
{ {
line = readLine(t); line = readLine(t);
if (line.isEmpty()) continue; if (line.isEmpty()) continue;
if (line.startsWith("Remote:")) if (line.startsWith("Remote:"))
{ {
QStringList l = TQStringList::split(':',line,false); TQStringList l = TQStringList::split(':',line,false);
if (l.count() > 1) remote = l[1]; if (l.count() > 1) remote = l[1];
} }
} }
@ -326,12 +326,12 @@ void KMLpdUnixManager::parseEtcLpPrinters()
// "/etc/lp/member/" directory parsing (HP-UX) // "/etc/lp/member/" directory parsing (HP-UX)
void KMLpdUnixManager::parseEtcLpMember() void KMLpdUnixManager::parseEtcLpMember()
{ {
QDir d("/etc/lp/member"); TQDir d("/etc/lp/member");
const QFileInfoList *prlist = d.entryInfoList(TQDir::Files); const TQFileInfoList *prlist = d.entryInfoList(TQDir::Files);
if (!prlist) if (!prlist)
return; return;
QFileInfoListIterator it(*prlist); TQFileInfoListIterator it(*prlist);
for (;it.current();++it) for (;it.current();++it)
{ {
KMPrinter *printer = new KMPrinter; KMPrinter *printer = new KMPrinter;
@ -347,26 +347,26 @@ void KMLpdUnixManager::parseEtcLpMember()
// "/usr/spool/lp/interfaces/" directory parsing (IRIX 6.x) // "/usr/spool/lp/interfaces/" directory parsing (IRIX 6.x)
void KMLpdUnixManager::parseSpoolInterface() void KMLpdUnixManager::parseSpoolInterface()
{ {
QDir d("/usr/spool/interfaces/lp"); TQDir d("/usr/spool/interfaces/lp");
const QFileInfoList *prlist = d.entryInfoList(TQDir::Files); const TQFileInfoList *prlist = d.entryInfoList(TQDir::Files);
if (!prlist) if (!prlist)
return; return;
QFileInfoListIterator it(*prlist); TQFileInfoListIterator it(*prlist);
for (;it.current();++it) for (;it.current();++it)
{ {
QFile f(it.current()->absFilePath()); TQFile f(it.current()->absFilePath());
if (f.exists() && f.open(IO_ReadOnly)) if (f.exists() && f.open(IO_ReadOnly))
{ {
KTextBuffer t(&f); KTextBuffer t(TQT_TQIODEVICE(&f));
QString line, remote; TQString line, remote;
while (!t.eof()) while (!t.eof())
{ {
line = t.readLine().stripWhiteSpace(); line = t.readLine().stripWhiteSpace();
if (line.startsWith("HOSTNAME")) if (line.startsWith("HOSTNAME"))
{ {
QStringList l = TQStringList::split('=',line,false); TQStringList l = TQStringList::split('=',line,false);
if (l.count() > 1) remote = l[1]; if (l.count() > 1) remote = l[1];
} }
} }

@ -63,7 +63,7 @@ bool ApsHandler::completePrinter(KMPrinter *prt, PrintcapEntry *entry, bool shor
if (!shortmode) if (!shortmode)
{ {
TQMap<TQString,TQString> opts = loadResources(entry); TQMap<TQString,TQString> opts = loadResources(entry);
if (opts.contains("PRINTER")) if (opts.tqcontains("PRINTER"))
{ {
prt->setDescription(i18n("APS Driver (%1)").arg(opts["PRINTER"])); prt->setDescription(i18n("APS Driver (%1)").arg(opts["PRINTER"]));
prt->setDriverInfo(prt->description()); prt->setDriverInfo(prt->description());
@ -72,8 +72,8 @@ bool ApsHandler::completePrinter(KMPrinter *prt, PrintcapEntry *entry, bool shor
if (prt->device().isEmpty()) if (prt->device().isEmpty())
{ {
TQString prot; TQString prot;
QString smbname(sysconfDir() + "/" + prt->printerName() + "/smbclient.conf"); TQString smbname(sysconfDir() + "/" + prt->printerName() + "/smbclient.conf");
QString ncpname(sysconfDir() + "/" + prt->printerName() + "/netware.conf"); TQString ncpname(sysconfDir() + "/" + prt->printerName() + "/netware.conf");
if (TQFile::exists(smbname)) if (TQFile::exists(smbname))
{ {
TQMap<TQString,TQString> opts = loadVarFile(smbname); TQMap<TQString,TQString> opts = loadVarFile(smbname);
@ -139,19 +139,19 @@ TQMap<TQString,TQString> ApsHandler::loadResources(PrintcapEntry *entry)
TQMap<TQString,TQString> ApsHandler::loadVarFile(const TQString& filename) TQMap<TQString,TQString> ApsHandler::loadVarFile(const TQString& filename)
{ {
TQMap<TQString,TQString> opts; TQMap<TQString,TQString> opts;
QFile f(filename); TQFile f(filename);
if (f.open(IO_ReadOnly)) if (f.open(IO_ReadOnly))
{ {
QTextStream t(&f); TQTextStream t(&f);
QString line; TQString line;
int p(-1); int p(-1);
while (!t.atEnd()) while (!t.atEnd())
{ {
line = t.readLine().stripWhiteSpace(); line = t.readLine().stripWhiteSpace();
if (line.isEmpty() || line[0] == '#' || (p = line.tqfind('=')) == -1) if (line.isEmpty() || line[0] == '#' || (p = line.tqfind('=')) == -1)
continue; continue;
QString variable = line.left(p).stripWhiteSpace(); TQString variable = line.left(p).stripWhiteSpace();
QString value = line.mid(p+1).stripWhiteSpace(); TQString value = line.mid(p+1).stripWhiteSpace();
if (!value.isEmpty() && value[0] == '\'') if (!value.isEmpty() && value[0] == '\'')
value = value.mid(1, value.length()-2); value = value.mid(1, value.length()-2);
opts[variable] = value; opts[variable] = value;
@ -166,7 +166,7 @@ DrMain* ApsHandler::loadDriver(KMPrinter *prt, PrintcapEntry *entry, bool config
if (driver /* && config */ ) // Load resources in all case, to get the correct page size if (driver /* && config */ ) // Load resources in all case, to get the correct page size
{ {
TQMap<TQString,TQString> opts = loadResources(entry); TQMap<TQString,TQString> opts = loadResources(entry);
if ( !config && opts.contains( "PAPERSIZE" ) ) if ( !config && opts.tqcontains( "PAPERSIZE" ) )
{ {
// this is needed to keep applications informed // this is needed to keep applications informed
// about the current selected page size // about the current selected page size
@ -209,13 +209,13 @@ void ApsHandler::reset()
PrintcapEntry* ApsHandler::createEntry(KMPrinter *prt) PrintcapEntry* ApsHandler::createEntry(KMPrinter *prt)
{ {
QString prot = prt->deviceProtocol(); TQString prot = prt->deviceProtocol();
if (prot != "parallel" && prot != "lpd" && prot != "smb" && prot != "ncp") if (prot != "parallel" && prot != "lpd" && prot != "smb" && prot != "ncp")
{ {
manager()->setErrorMsg(i18n("Unsupported backend: %1.").arg(prot)); manager()->setErrorMsg(i18n("Unsupported backend: %1.").arg(prot));
return NULL; return NULL;
} }
QString path = sysconfDir() + "/" + prt->printerName(); TQString path = sysconfDir() + "/" + prt->printerName();
if (!KStandardDirs::makeDir(path, 0755)) if (!KStandardDirs::makeDir(path, 0755))
{ {
manager()->setErrorMsg(i18n("Unable to create directory %1.").arg(path)); manager()->setErrorMsg(i18n("Unable to create directory %1.").arg(path));
@ -226,13 +226,13 @@ PrintcapEntry* ApsHandler::createEntry(KMPrinter *prt)
// either "smb" or "ncp" // either "smb" or "ncp"
TQFile::remove(path + "/smbclient.conf"); TQFile::remove(path + "/smbclient.conf");
TQFile::remove(path + "/netware.conf"); TQFile::remove(path + "/netware.conf");
QFile f; TQFile f;
if (prot == "smb") if (prot == "smb")
{ {
f.setName(path + "/smbclient.conf"); f.setName(path + "/smbclient.conf");
if (f.open(IO_WriteOnly)) if (f.open(IO_WriteOnly))
{ {
QTextStream t(&f); TQTextStream t(&f);
TQString work, server, printer, user, passwd; TQString work, server, printer, user, passwd;
if ( splitSmbURI( prt->device(), work, server, printer, user, passwd ) ) if ( splitSmbURI( prt->device(), work, server, printer, user, passwd ) )
{ {
@ -275,7 +275,7 @@ PrintcapEntry* ApsHandler::createEntry(KMPrinter *prt)
uri.replace( 0, 3, "smb" ); uri.replace( 0, 3, "smb" );
if ( splitSmbURI( uri, work, server, printer, user, passwd ) ) if ( splitSmbURI( uri, work, server, printer, user, passwd ) )
{ {
QTextStream t(&f); TQTextStream t(&f);
t << "NCP_SERVER='" << server << "'" << endl; t << "NCP_SERVER='" << server << "'" << endl;
t << "NCP_PRINTER='" << printer << "'" << endl; t << "NCP_PRINTER='" << printer << "'" << endl;
if (!user.isEmpty()) if (!user.isEmpty())
@ -305,7 +305,7 @@ PrintcapEntry* ApsHandler::createEntry(KMPrinter *prt)
entry = new PrintcapEntry; entry = new PrintcapEntry;
entry->addField("lp", Field::String, "/dev/null"); entry->addField("lp", Field::String, "/dev/null");
} }
QString sd = LprSettings::self()->baseSpoolDir() + "/" + prt->printerName(); TQString sd = LprSettings::self()->baseSpoolDir() + "/" + prt->printerName();
entry->addField("af", Field::String, sd + "/acct"); entry->addField("af", Field::String, sd + "/acct");
entry->addField("lf", Field::String, sd + "/log"); entry->addField("lf", Field::String, sd + "/log");
entry->addField("if", Field::String, sysconfDir() + "/basedir/bin/apsfilter"); entry->addField("if", Field::String, sysconfDir() + "/basedir/bin/apsfilter");
@ -322,10 +322,10 @@ bool ApsHandler::savePrinterDriver(KMPrinter *prt, PrintcapEntry *entry, DrMain
manager()->setErrorMsg(i18n("The APS driver is not defined.")); manager()->setErrorMsg(i18n("The APS driver is not defined."));
return false; return false;
} }
QFile f(sysconfDir() + "/" + prt->printerName() + "/apsfilterrc"); TQFile f(sysconfDir() + "/" + prt->printerName() + "/apsfilterrc");
if (f.open(IO_WriteOnly)) if (f.open(IO_WriteOnly))
{ {
QTextStream t(&f); TQTextStream t(&f);
t << "# File generated by KDEPrint" << endl; t << "# File generated by KDEPrint" << endl;
t << "PRINTER='" << driver->get("gsdriver") << "'" << endl; t << "PRINTER='" << driver->get("gsdriver") << "'" << endl;
TQValueStack<DrGroup*> stack; TQValueStack<DrGroup*> stack;
@ -337,7 +337,7 @@ bool ApsHandler::savePrinterDriver(KMPrinter *prt, PrintcapEntry *entry, DrMain
for (; git.current(); ++git) for (; git.current(); ++git)
stack.push(git.current()); stack.push(git.current());
TQPtrListIterator<DrBase> oit(grp->options()); TQPtrListIterator<DrBase> oit(grp->options());
QString value; TQString value;
for (; oit.current(); ++oit) for (; oit.current(); ++oit)
{ {
value = oit.current()->valueText(); value = oit.current()->valueText();
@ -371,7 +371,7 @@ bool ApsHandler::savePrinterDriver(KMPrinter *prt, PrintcapEntry *entry, DrMain
bool ApsHandler::removePrinter(KMPrinter*, PrintcapEntry *entry) bool ApsHandler::removePrinter(KMPrinter*, PrintcapEntry *entry)
{ {
QString path(sysconfDir() + "/" + entry->name); TQString path(sysconfDir() + "/" + entry->name);
TQFile::remove(path + "/smbclient.conf"); TQFile::remove(path + "/smbclient.conf");
TQFile::remove(path + "/netware.conf"); TQFile::remove(path + "/netware.conf");
TQFile::remove(path + "/apsfilterrc"); TQFile::remove(path + "/apsfilterrc");
@ -385,7 +385,7 @@ bool ApsHandler::removePrinter(KMPrinter*, PrintcapEntry *entry)
TQString ApsHandler::printOptions(KPrinter *printer) TQString ApsHandler::printOptions(KPrinter *printer)
{ {
QString optstr; TQString optstr;
TQMap<TQString,TQString> opts = printer->options(); TQMap<TQString,TQString> opts = printer->options();
for (TQMap<TQString,TQString>::ConstIterator it=opts.begin(); it!=opts.end(); ++it) for (TQMap<TQString,TQString>::ConstIterator it=opts.begin(); it!=opts.end(); ++it)
{ {

@ -34,10 +34,10 @@
EditEntryDialog::EditEntryDialog(PrintcapEntry *entry, TQWidget *parent, const char *name) EditEntryDialog::EditEntryDialog(PrintcapEntry *entry, TQWidget *parent, const char *name)
: KDialogBase(parent, name, true, TQString::null, Ok|Cancel) : KDialogBase(parent, name, true, TQString::null, Ok|Cancel)
{ {
QWidget *w = new TQWidget(this); TQWidget *w = new TQWidget(this);
setMainWidget(w); setMainWidget(w);
QLabel *lab0 = new TQLabel(i18n("Aliases:"), w); TQLabel *lab0 = new TQLabel(i18n("Aliases:"), w);
m_aliases = new TQLineEdit(w); m_aliases = new TQLineEdit(w);
m_view = new KListView(w); m_view = new KListView(w);
m_view->addColumn(""); m_view->addColumn("");
@ -55,9 +55,9 @@ EditEntryDialog::EditEntryDialog(PrintcapEntry *entry, TQWidget *parent, const c
m_stack->addWidget(m_number, 1); m_stack->addWidget(m_number, 1);
m_name = new TQLineEdit(w); m_name = new TQLineEdit(w);
QVBoxLayout *l0 = new TQVBoxLayout(w, 0, 10); TQVBoxLayout *l0 = new TQVBoxLayout(w, 0, 10);
QHBoxLayout *l1 = new TQHBoxLayout(0, 0, 10); TQHBoxLayout *l1 = new TQHBoxLayout(0, 0, 10);
QHBoxLayout *l2 = new TQHBoxLayout(0, 0, 5); TQHBoxLayout *l2 = new TQHBoxLayout(0, 0, 5);
l0->addLayout(l1); l0->addLayout(l1);
l1->addWidget(lab0); l1->addWidget(lab0);
l1->addWidget(m_aliases); l1->addWidget(m_aliases);
@ -72,7 +72,7 @@ EditEntryDialog::EditEntryDialog(PrintcapEntry *entry, TQWidget *parent, const c
setCaption(i18n("Printcap Entry: %1").arg(entry->name)); setCaption(i18n("Printcap Entry: %1").arg(entry->name));
m_fields = entry->fields; m_fields = entry->fields;
m_aliases->setText(entry->aliases.join("|")); m_aliases->setText(entry->aliases.join("|"));
QListViewItem *root = new TQListViewItem(m_view, entry->name), *item = 0; TQListViewItem *root = new TQListViewItem(m_view, entry->name), *item = 0;
root->setSelectable(false); root->setSelectable(false);
root->setOpen(true); root->setOpen(true);
root->setPixmap(0, SmallIcon("fileprint")); root->setPixmap(0, SmallIcon("fileprint"));

@ -28,7 +28,7 @@ class TQCheckBox;
class TQSpinBox; class TQSpinBox;
class TQComboBox; class TQComboBox;
class TQListView; class TQListView;
class QListviewItem; class TQListviewItem;
class TQWidgetStack; class TQWidgetStack;
class EditEntryDialog : public KDialogBase class EditEntryDialog : public KDialogBase
@ -49,13 +49,13 @@ protected:
private: private:
TQMap<TQString,Field> m_fields; TQMap<TQString,Field> m_fields;
QLineEdit *m_name, *m_string, *m_aliases; TQLineEdit *m_name, *m_string, *m_aliases;
QCheckBox *m_boolean; TQCheckBox *m_boolean;
QComboBox *m_type; TQComboBox *m_type;
QSpinBox *m_number; TQSpinBox *m_number;
QListView *m_view; TQListView *m_view;
QWidgetStack *m_stack; TQWidgetStack *m_stack;
QString m_current; TQString m_current;
bool m_block; bool m_block;
}; };

@ -34,13 +34,13 @@ KMConfigLpr::KMConfigLpr(TQWidget *parent, const char *name)
setPageHeader(i18n("Spooler Settings")); setPageHeader(i18n("Spooler Settings"));
setPagePixmap("gear"); setPagePixmap("gear");
QGroupBox *m_modebox = new TQGroupBox(1, Qt::Vertical, i18n("Spooler"), this); TQGroupBox *m_modebox = new TQGroupBox(1, Qt::Vertical, i18n("Spooler"), this);
m_mode = new TQComboBox(m_modebox); m_mode = new TQComboBox(m_modebox);
m_mode->insertItem("LPR (BSD compatible)"); m_mode->insertItem("LPR (BSD compatible)");
m_mode->insertItem("LPRng"); m_mode->insertItem("LPRng");
QVBoxLayout *l0 = new TQVBoxLayout(this, 5, 10); TQVBoxLayout *l0 = new TQVBoxLayout(this, 5, 10);
l0->addWidget(m_modebox); l0->addWidget(m_modebox);
l0->addStretch(1); l0->addStretch(1);
} }
@ -54,7 +54,7 @@ void KMConfigLpr::saveConfig(KConfig *conf)
{ {
LprSettings::self()->setMode((LprSettings::Mode)(m_mode->currentItem())); LprSettings::self()->setMode((LprSettings::Mode)(m_mode->currentItem()));
QString modestr; TQString modestr;
switch (m_mode->currentItem()) switch (m_mode->currentItem())
{ {
default: default:

@ -33,7 +33,7 @@ public:
void saveConfig(KConfig*); void saveConfig(KConfig*);
private: private:
QComboBox *m_mode; TQComboBox *m_mode;
}; };
#endif #endif

@ -60,7 +60,7 @@ int KMLprJobManager::actions()
bool KMLprJobManager::sendCommandSystemJob(const TQPtrList<KMJob>& jobs, int action, const TQString& arg) bool KMLprJobManager::sendCommandSystemJob(const TQPtrList<KMJob>& jobs, int action, const TQString& arg)
{ {
QString msg; TQString msg;
TQPtrListIterator<KMJob> it(jobs); TQPtrListIterator<KMJob> it(jobs);
bool status(true); bool status(true);
LpcHelper *helper = lpcHelper(); LpcHelper *helper = lpcHelper();

@ -67,7 +67,7 @@ KMLprManager::KMLprManager(TQObject *parent, const char *name, const TQStringLis
void KMLprManager::listPrinters() void KMLprManager::listPrinters()
{ {
QFileInfo fi(LprSettings::self()->printcapFile()); TQFileInfo fi(LprSettings::self()->printcapFile());
if (m_lpchelper) if (m_lpchelper)
m_lpchelper->updateStates(); m_lpchelper->updateStates();
@ -84,7 +84,7 @@ void KMLprManager::listPrinters()
// try to open the printcap file and parse it // try to open the printcap file and parse it
PrintcapReader reader; PrintcapReader reader;
QFile f(fi.absFilePath()); TQFile f(fi.absFilePath());
PrintcapEntry *entry; PrintcapEntry *entry;
if (f.exists() && f.open(IO_ReadOnly)) if (f.exists() && f.open(IO_ReadOnly))
{ {
@ -137,7 +137,7 @@ void KMLprManager::initHandlers()
insertHandler(new LPRngToolHandler(this)); insertHandler(new LPRngToolHandler(this));
// now load external handlers // now load external handlers
QStringList l = KGlobal::dirs()->findAllResources("data", "kdeprint/lpr/*.la"); TQStringList l = KGlobal::dirs()->findAllResources("data", "kdeprint/lpr/*.la");
for (TQStringList::ConstIterator it=l.begin(); it!=l.end(); ++it) for (TQStringList::ConstIterator it=l.begin(); it!=l.end(); ++it)
{ {
KLibrary *library = KLibLoader::self()->library(TQFile::encodeName(*it)); KLibrary *library = KLibLoader::self()->library(TQFile::encodeName(*it));
@ -158,7 +158,7 @@ void KMLprManager::initHandlers()
LprHandler* KMLprManager::findHandler(KMPrinter *prt) LprHandler* KMLprManager::findHandler(KMPrinter *prt)
{ {
QString handlerstr(prt->option("kde-lpr-handler")); TQString handlerstr(prt->option("kde-lpr-handler"));
LprHandler *handler(0); LprHandler *handler(0);
if (handlerstr.isEmpty() || (handler = m_handlers.tqfind(handlerstr)) == NULL) if (handlerstr.isEmpty() || (handler = m_handlers.tqfind(handlerstr)) == NULL)
{ {
@ -231,7 +231,7 @@ DrMain* KMLprManager::loadPrinterDriver(KMPrinter *prt, bool config)
DrMain* KMLprManager::loadFileDriver(const TQString& filename) DrMain* KMLprManager::loadFileDriver(const TQString& filename)
{ {
int p = filename.tqfind('/'); int p = filename.tqfind('/');
QString handler_str = (p != -1 ? filename.left(p) : TQString::tqfromLatin1("default")); TQString handler_str = (p != -1 ? filename.left(p) : TQString::tqfromLatin1("default"));
LprHandler *handler = m_handlers.tqfind(handler_str); LprHandler *handler = m_handlers.tqfind(handler_str);
if (handler) if (handler)
{ {
@ -245,7 +245,7 @@ DrMain* KMLprManager::loadFileDriver(const TQString& filename)
bool KMLprManager::enablePrinter(KMPrinter *prt, bool state) bool KMLprManager::enablePrinter(KMPrinter *prt, bool state)
{ {
QString msg; TQString msg;
if (!m_lpchelper->enable(prt, state, msg)) if (!m_lpchelper->enable(prt, state, msg))
{ {
setErrorMsg(msg); setErrorMsg(msg);
@ -256,7 +256,7 @@ bool KMLprManager::enablePrinter(KMPrinter *prt, bool state)
bool KMLprManager::startPrinter(KMPrinter *prt, bool state) bool KMLprManager::startPrinter(KMPrinter *prt, bool state)
{ {
QString msg; TQString msg;
if (!m_lpchelper->start(prt, state, msg)) if (!m_lpchelper->start(prt, state, msg))
{ {
setErrorMsg(msg); setErrorMsg(msg);
@ -289,10 +289,10 @@ bool KMLprManager::savePrintcapFile()
setErrorMsg(i18n("The printcap file is a remote file (NIS). It cannot be written.")); setErrorMsg(i18n("The printcap file is a remote file (NIS). It cannot be written."));
return false; return false;
} }
QFile f(LprSettings::self()->printcapFile()); TQFile f(LprSettings::self()->printcapFile());
if (f.open(IO_WriteOnly)) if (f.open(IO_WriteOnly))
{ {
QTextStream t(&f); TQTextStream t(&f);
TQDictIterator<PrintcapEntry> it(m_entries); TQDictIterator<PrintcapEntry> it(m_entries);
for (; it.current(); ++it) for (; it.current(); ++it)
{ {
@ -338,7 +338,7 @@ bool KMLprManager::createPrinter(KMPrinter *prt)
if (!prt->driver() && oldEntry) if (!prt->driver() && oldEntry)
prt->setDriver(handler->loadDriver(prt, oldEntry, true)); prt->setDriver(handler->loadDriver(prt, oldEntry, true));
QString sd = LprSettings::self()->baseSpoolDir(); TQString sd = LprSettings::self()->baseSpoolDir();
if (sd.isEmpty()) if (sd.isEmpty())
{ {
setErrorMsg(i18n("Couldn't determine spool directory. See options dialog.")); setErrorMsg(i18n("Couldn't determine spool directory. See options dialog."));
@ -376,7 +376,7 @@ bool KMLprManager::createPrinter(KMPrinter *prt)
// in case of LPRng, we need to tell the daemon about new printer // in case of LPRng, we need to tell the daemon about new printer
if (LprSettings::self()->mode() == LprSettings::LPRng) if (LprSettings::self()->mode() == LprSettings::LPRng)
{ {
QString msg; TQString msg;
if (!m_lpchelper->restart(msg)) if (!m_lpchelper->restart(msg))
{ {
setErrorMsg(i18n("The printer has been created but the print daemon " setErrorMsg(i18n("The printer has been created but the print daemon "
@ -396,7 +396,7 @@ bool KMLprManager::removePrinter(KMPrinter *prt)
{ {
if (handler->removePrinter(prt, entry)) if (handler->removePrinter(prt, entry))
{ {
QString sd = entry->field("sd"); TQString sd = entry->field("sd");
// first try to save the printcap file, and if // first try to save the printcap file, and if
// successful, remove the spool directory // successful, remove the spool directory
m_entries.take(prt->printerName()); m_entries.take(prt->printerName());
@ -428,10 +428,10 @@ TQString KMLprManager::driverDbCreationProgram()
TQString KMLprManager::driverDirectory() TQString KMLprManager::driverDirectory()
{ {
TQPtrListIterator<LprHandler> it(m_handlerlist); TQPtrListIterator<LprHandler> it(m_handlerlist);
QString dbDirs; TQString dbDirs;
for (; it.current(); ++it) for (; it.current(); ++it)
{ {
QString dir = it.current()->driverDirectory(); TQString dir = it.current()->driverDirectory();
if (!dir.isEmpty()) if (!dir.isEmpty())
dbDirs.append(dir).append(":"); dbDirs.append(dir).append(":");
} }
@ -443,7 +443,7 @@ TQString KMLprManager::driverDirectory()
TQString KMLprManager::printOptions(KPrinter *prt) TQString KMLprManager::printOptions(KPrinter *prt)
{ {
KMPrinter *mprt = findPrinter(prt->printerName()); KMPrinter *mprt = findPrinter(prt->printerName());
QString opts; TQString opts;
if (mprt) if (mprt)
{ {
LprHandler *handler = findHandler(mprt); LprHandler *handler = findHandler(mprt);

@ -74,7 +74,7 @@ private:
TQDict<LprHandler> m_handlers; TQDict<LprHandler> m_handlers;
TQPtrList<LprHandler> m_handlerlist; TQPtrList<LprHandler> m_handlerlist;
TQDict<PrintcapEntry> m_entries; TQDict<PrintcapEntry> m_entries;
QDateTime m_updtime; TQDateTime m_updtime;
LpcHelper *m_lpchelper; LpcHelper *m_lpchelper;
KMPrinter *m_currentprinter; KMPrinter *m_currentprinter;
}; };

@ -33,10 +33,10 @@
static TQString execute(const TQString& cmd) static TQString execute(const TQString& cmd)
{ {
KPipeProcess proc; KPipeProcess proc;
QString output; TQString output;
if (proc.open(cmd)) if (proc.open(cmd))
{ {
QTextStream t(&proc); TQTextStream t(&proc);
while (!t.atEnd()) while (!t.atEnd())
output.append(t.readLine()).append("\n"); output.append(t.readLine()).append("\n");
proc.close(); proc.close();
@ -49,7 +49,7 @@ LpcHelper::LpcHelper(TQObject *parent, const char *name)
{ {
// look for the "lpc" executable. Use the PATH variable and // look for the "lpc" executable. Use the PATH variable and
// add some specific dirs. // add some specific dirs.
QString PATH = getenv("PATH"); TQString PATH = getenv("PATH");
PATH.append(":/usr/sbin:/usr/local/sbin:/sbin:/opt/sbin:/opt/local/sbin"); PATH.append(":/usr/sbin:/usr/local/sbin:/sbin:/opt/sbin:/opt/local/sbin");
m_exepath = KStandardDirs::findExe("lpc", PATH); m_exepath = KStandardDirs::findExe("lpc", PATH);
m_checkpcpath = KStandardDirs::findExe("checkpc", PATH); m_checkpcpath = KStandardDirs::findExe("checkpc", PATH);
@ -62,7 +62,7 @@ LpcHelper::~LpcHelper()
KMPrinter::PrinterState LpcHelper::state(const TQString& prname) const KMPrinter::PrinterState LpcHelper::state(const TQString& prname) const
{ {
if (m_state.contains(prname)) if (m_state.tqcontains(prname))
return m_state[prname]; return m_state[prname];
return KMPrinter::Unknown; return KMPrinter::Unknown;
} }
@ -74,7 +74,7 @@ KMPrinter::PrinterState LpcHelper::state(KMPrinter *prt) const
void LpcHelper::parseStatusLPR(TQTextStream &t) void LpcHelper::parseStatusLPR(TQTextStream &t)
{ {
QString printer, line; TQString printer, line;
int p(-1); int p(-1);
while (!t.atEnd()) while (!t.atEnd())
@ -109,9 +109,9 @@ void LpcHelper::parseStatusLPR(TQTextStream &t)
void LpcHelper::parseStatusLPRng(TQTextStream& t) void LpcHelper::parseStatusLPRng(TQTextStream& t)
{ {
QStringList l; TQStringList l;
int p(-1); int p(-1);
QString printer; TQString printer;
while (!t.atEnd()) while (!t.atEnd())
if (t.readLine().stripWhiteSpace().startsWith("Printer")) if (t.readLine().stripWhiteSpace().startsWith("Printer"))
@ -146,7 +146,7 @@ void LpcHelper::updateStates()
m_state.clear(); m_state.clear();
if (!m_exepath.isEmpty() && proc.open(m_exepath + " status all")) if (!m_exepath.isEmpty() && proc.open(m_exepath + " status all"))
{ {
QTextStream t(&proc); TQTextStream t(&proc);
switch (LprSettings::self()->mode()) switch (LprSettings::self()->mode())
{ {
@ -211,7 +211,7 @@ static TQString lprngAnswer(const TQString& result, const TQString& printer)
{ {
q = result.tqfind(':', p)+2; q = result.tqfind(':', p)+2;
p = result.tqfind('\n', q); p = result.tqfind('\n', q);
QString answer = result.mid(q, p-q).stripWhiteSpace(); TQString answer = result.mid(q, p-q).stripWhiteSpace();
return answer; return answer;
} }
return TQString::null; return TQString::null;
@ -219,7 +219,7 @@ static TQString lprngAnswer(const TQString& result, const TQString& printer)
int LpcHelper::parseStateChangeLPRng(const TQString& result, const TQString& printer) int LpcHelper::parseStateChangeLPRng(const TQString& result, const TQString& printer)
{ {
QString answer = lprngAnswer(result, printer); TQString answer = lprngAnswer(result, printer);
if (answer == "no") if (answer == "no")
return -1; return -1;
else if (answer == "disabled" || answer == "enabled" || answer == "started" || answer == "stopped") else if (answer == "disabled" || answer == "enabled" || answer == "started" || answer == "stopped")
@ -235,7 +235,7 @@ bool LpcHelper::changeState(const TQString& printer, const TQString& op, TQStrin
msg = i18n("The executable %1 couldn't be found in your PATH.").arg("lpc"); msg = i18n("The executable %1 couldn't be found in your PATH.").arg("lpc");
return false; return false;
} }
QString result = execute(m_exepath + " " + op + " " + KProcess::quote(printer)); TQString result = execute(m_exepath + " " + op + " " + KProcess::quote(printer));
int status; int status;
switch (LprSettings::self()->mode()) switch (LprSettings::self()->mode())
@ -273,7 +273,7 @@ bool LpcHelper::removeJob(KMJob *job, TQString& msg)
msg = i18n("The executable %1 couldn't be found in your PATH.").arg("lprm"); msg = i18n("The executable %1 couldn't be found in your PATH.").arg("lprm");
return false; return false;
} }
QString result = execute(m_lprmpath + " -P " + KProcess::quote(job->printer()) + " " + TQString::number(job->id())); TQString result = execute(m_lprmpath + " -P " + KProcess::quote(job->printer()) + " " + TQString::number(job->id()));
if (result.tqfind("dequeued") != -1) if (result.tqfind("dequeued") != -1)
return true; return true;
else if (result.tqfind("Permission denied") != -1 || result.tqfind("no permissions") != -1) else if (result.tqfind("Permission denied") != -1 || result.tqfind("no permissions") != -1)
@ -291,8 +291,8 @@ bool LpcHelper::changeJobState(KMJob *job, int state, TQString& msg)
msg = i18n("The executable %1 couldn't be found in your PATH.").arg("lpc"); msg = i18n("The executable %1 couldn't be found in your PATH.").arg("lpc");
return false; return false;
} }
QString result = execute(m_exepath + (state == KMJob::Held ? " hold " : " release ") + KProcess::quote(job->printer()) + " " + TQString::number(job->id())); TQString result = execute(m_exepath + (state == KMJob::Held ? " hold " : " release ") + KProcess::quote(job->printer()) + " " + TQString::number(job->id()));
QString answer = lprngAnswer(result, job->printer()); TQString answer = lprngAnswer(result, job->printer());
if (answer == "no") if (answer == "no")
{ {
msg = i18n("Permission denied."); msg = i18n("Permission denied.");
@ -304,7 +304,7 @@ bool LpcHelper::changeJobState(KMJob *job, int state, TQString& msg)
bool LpcHelper::restart(TQString& msg) bool LpcHelper::restart(TQString& msg)
{ {
QString s; TQString s;
if (m_exepath.isEmpty()) if (m_exepath.isEmpty())
s = "lpc"; s = "lpc";
else if (m_checkpcpath.isEmpty()) else if (m_checkpcpath.isEmpty())

@ -53,7 +53,7 @@ protected:
private: private:
TQMap<TQString, KMPrinter::PrinterState> m_state; TQMap<TQString, KMPrinter::PrinterState> m_state;
QString m_exepath, m_lprmpath, m_checkpcpath; TQString m_exepath, m_lprmpath, m_checkpcpath;
}; };
#endif #endif

@ -38,7 +38,7 @@ LpqHelper::~LpqHelper()
KMJob* LpqHelper::parseLineLpr(const TQString& line) KMJob* LpqHelper::parseLineLpr(const TQString& line)
{ {
QString rank = line.left(7); TQString rank = line.left(7);
if (!rank[0].isDigit() && rank != "active") if (!rank[0].isDigit() && rank != "active")
return NULL; return NULL;
KMJob *job = new KMJob; KMJob *job = new KMJob;
@ -56,13 +56,13 @@ KMJob* LpqHelper::parseLineLpr(const TQString& line)
KMJob* LpqHelper::parseLineLPRng(const TQString& line) KMJob* LpqHelper::parseLineLPRng(const TQString& line)
{ {
QString rank = line.left(7).stripWhiteSpace(); TQString rank = line.left(7).stripWhiteSpace();
if (!rank[0].isDigit() && rank != "active" && rank != "hold") if (!rank[0].isDigit() && rank != "active" && rank != "hold")
return NULL; return NULL;
KMJob *job = new KMJob; KMJob *job = new KMJob;
job->setState((rank[0].isDigit() ? KMJob::Queued : (rank == "hold" ? KMJob::Held : KMJob::Printing))); job->setState((rank[0].isDigit() ? KMJob::Queued : (rank == "hold" ? KMJob::Held : KMJob::Printing)));
int p = line.tqfind('@', 7), q = line.tqfind(' ', 7); int p = line.tqfind('@', 7), q = line.tqfind(' ', 7);
job->setOwner(line.mid(7, QMIN(p,q)-7)); job->setOwner(line.mid(7, TQMIN(p,q)-7));
while (line[q].isSpace()) while (line[q].isSpace())
q++; q++;
q++; q++;
@ -85,8 +85,8 @@ void LpqHelper::listJobs(TQPtrList<KMJob>& jobs, const TQString& prname, int lim
KPipeProcess proc; KPipeProcess proc;
if (!m_exepath.isEmpty() && proc.open(m_exepath + " -P " + KProcess::quote(prname))) if (!m_exepath.isEmpty() && proc.open(m_exepath + " -P " + KProcess::quote(prname)))
{ {
QTextStream t(&proc); TQTextStream t(&proc);
QString line; TQString line;
bool lprng = (LprSettings::self()->mode() == LprSettings::LPRng); bool lprng = (LprSettings::self()->mode() == LprSettings::LPRng);
int count = 0; int count = 0;

@ -38,7 +38,7 @@ protected:
KMJob* parseLineLPRng(const TQString&); KMJob* parseLineLPRng(const TQString&);
private: private:
QString m_exepath; TQString m_exepath;
}; };
#endif #endif

@ -121,7 +121,7 @@ PrintcapEntry* LprHandler::createEntry(KMPrinter *prt)
{ {
// this default handler only supports local parallel and remote lpd URIs // this default handler only supports local parallel and remote lpd URIs
KURL uri ( prt->device() ); KURL uri ( prt->device() );
QString prot = uri.protocol(); TQString prot = uri.protocol();
if (!prot.isEmpty() && prot != "parallel" && prot != "file" && prot != "lpd" && prot != "socket") if (!prot.isEmpty() && prot != "parallel" && prot != "file" && prot != "lpd" && prot != "socket")
{ {
manager()->setErrorMsg(i18n("Unsupported backend: %1.").arg(prot)); manager()->setErrorMsg(i18n("Unsupported backend: %1.").arg(prot));
@ -132,7 +132,7 @@ PrintcapEntry* LprHandler::createEntry(KMPrinter *prt)
if (prot == "lpd") if (prot == "lpd")
{ {
entry->addField("rm", Field::String, uri.host()); entry->addField("rm", Field::String, uri.host());
QString rp = uri.path(); TQString rp = uri.path();
if (rp[0] == '/') if (rp[0] == '/')
rp = rp.mid(1); rp = rp.mid(1);
entry->addField("rp", Field::String, rp); entry->addField("rp", Field::String, rp);
@ -172,13 +172,13 @@ void LprHandler::reset()
DrMain* LprHandler::loadToolDriver(const TQString& filename) DrMain* LprHandler::loadToolDriver(const TQString& filename)
{ {
QFile f(filename); TQFile f(filename);
if (f.open(IO_ReadOnly)) if (f.open(IO_ReadOnly))
{ {
DrMain *driver = new DrMain; DrMain *driver = new DrMain;
TQValueStack<DrGroup*> groups; TQValueStack<DrGroup*> groups;
QTextStream t(&f); TQTextStream t(&f);
QStringList l; TQStringList l;
DrListOption *lopt(0); DrListOption *lopt(0);
DrBase *opt(0); DrBase *opt(0);
@ -259,10 +259,10 @@ TQString LprHandler::driverDirInternal()
TQString LprHandler::locateDir(const TQString& dirname, const TQString& paths) TQString LprHandler::locateDir(const TQString& dirname, const TQString& paths)
{ {
QStringList pathlist = TQStringList::split(':', paths, false); TQStringList pathlist = TQStringList::split(':', paths, false);
for (TQStringList::ConstIterator it=pathlist.begin(); it!=pathlist.end(); ++it) for (TQStringList::ConstIterator it=pathlist.begin(); it!=pathlist.end(); ++it)
{ {
QString testpath = *it + "/" + dirname; TQString testpath = *it + "/" + dirname;
if (::access(TQFile::encodeName(testpath), F_OK) == 0) if (::access(TQFile::encodeName(testpath), F_OK) == 0)
return testpath; return testpath;
} }

@ -68,9 +68,9 @@ protected:
virtual TQString driverDirInternal(); virtual TQString driverDirInternal();
protected: protected:
QString m_name; TQString m_name;
KMManager *m_manager; KMManager *m_manager;
QString m_cacheddriverdir; TQString m_cacheddriverdir;
}; };
inline TQString LprHandler::name() const inline TQString LprHandler::name() const

@ -47,10 +47,10 @@ bool LPRngToolHandler::validate(PrintcapEntry *entry)
bool LPRngToolHandler::completePrinter(KMPrinter *prt, PrintcapEntry *entry, bool shortmode) bool LPRngToolHandler::completePrinter(KMPrinter *prt, PrintcapEntry *entry, bool shortmode)
{ {
QString str, lp; TQString str, lp;
// look for type in comment // look for type in comment
QStringList l = TQStringList::split(' ', entry->comment, false); TQStringList l = TQStringList::split(' ', entry->comment, false);
lp = entry->field("lp"); lp = entry->field("lp");
if (l.count() < 1) if (l.count() < 1)
return false; return false;
@ -60,7 +60,7 @@ bool LPRngToolHandler::completePrinter(KMPrinter *prt, PrintcapEntry *entry, boo
else if (l[1] == "SMB") else if (l[1] == "SMB")
{ {
TQMap<TQString,TQString> opts = parseXferOptions(entry->field("xfer_options")); TQMap<TQString,TQString> opts = parseXferOptions(entry->field("xfer_options"));
QString user, pass; TQString user, pass;
loadAuthFile(LprSettings::self()->baseSpoolDir() + "/" + entry->name + "/" + opts["authfile"], user, pass); loadAuthFile(LprSettings::self()->baseSpoolDir() + "/" + entry->name + "/" + opts["authfile"], user, pass);
TQString uri = buildSmbURI( TQString uri = buildSmbURI(
opts[ "workgroup" ], opts[ "workgroup" ],
@ -81,7 +81,7 @@ bool LPRngToolHandler::completePrinter(KMPrinter *prt, PrintcapEntry *entry, boo
//{ //{
if (!(str=entry->field("ifhp")).isEmpty()) if (!(str=entry->field("ifhp")).isEmpty())
{ {
QString model; TQString model;
int p = str.tqfind("model"); int p = str.tqfind("model");
if (p != -1) if (p != -1)
{ {
@ -107,7 +107,7 @@ TQMap<TQString,TQString> LPRngToolHandler::parseXferOptions(const TQString& str)
{ {
uint p(0), q; uint p(0), q;
TQMap<TQString,TQString> opts; TQMap<TQString,TQString> opts;
QString key, val; TQString key, val;
while (p < str.length()) while (p < str.length())
{ {
@ -132,11 +132,11 @@ TQMap<TQString,TQString> LPRngToolHandler::parseXferOptions(const TQString& str)
void LPRngToolHandler::loadAuthFile(const TQString& filename, TQString& user, TQString& pass) void LPRngToolHandler::loadAuthFile(const TQString& filename, TQString& user, TQString& pass)
{ {
QFile f(filename); TQFile f(filename);
if (f.open(IO_ReadOnly)) if (f.open(IO_ReadOnly))
{ {
QTextStream t(&f); TQTextStream t(&f);
QString line; TQString line;
while (!t.atEnd()) while (!t.atEnd())
{ {
line = t.readLine().stripWhiteSpace(); line = t.readLine().stripWhiteSpace();
@ -145,7 +145,7 @@ void LPRngToolHandler::loadAuthFile(const TQString& filename, TQString& user, TQ
int p = line.tqfind('='); int p = line.tqfind('=');
if (p != -1) if (p != -1)
{ {
QString key = line.left(p); TQString key = line.left(p);
if (key == "username") if (key == "username")
user = line.mid(p+1); user = line.mid(p+1);
else if (key == "password") else if (key == "password")
@ -166,7 +166,7 @@ DrMain* LPRngToolHandler::loadDriver(KMPrinter *prt, PrintcapEntry *entry, bool
DrMain* driver = loadToolDriver(locate("data", "kdeprint/lprngtooldriver1")); DrMain* driver = loadToolDriver(locate("data", "kdeprint/lprngtooldriver1"));
if (driver) if (driver)
{ {
QString model = prt->option("driverID"); TQString model = prt->option("driverID");
driver->set("text", i18n("LPRngTool Common Driver (%1)").arg((model.isEmpty() ? i18n("unknown") : model))); driver->set("text", i18n("LPRngTool Common Driver (%1)").arg((model.isEmpty() ? i18n("unknown") : model)));
if (!model.isEmpty()) if (!model.isEmpty())
driver->set("driverID", model); driver->set("driverID", model);
@ -189,22 +189,22 @@ DrMain* LPRngToolHandler::loadDbDriver(const TQString& s)
return driver; return driver;
} }
TQValueList< QPair<TQString,TQStringList> > LPRngToolHandler::loadChoiceDict(const TQString& filename) TQValueList< TQPair<TQString,TQStringList> > LPRngToolHandler::loadChoiceDict(const TQString& filename)
{ {
QFile f(filename); TQFile f(filename);
TQValueList< QPair<TQString,TQStringList> > dict; TQValueList< TQPair<TQString,TQStringList> > dict;
if (f.open(IO_ReadOnly)) if (f.open(IO_ReadOnly))
{ {
QTextStream t(&f); TQTextStream t(&f);
QString line, key; TQString line, key;
QStringList l; TQStringList l;
while (!t.atEnd()) while (!t.atEnd())
{ {
line = t.readLine().stripWhiteSpace(); line = t.readLine().stripWhiteSpace();
if (line.startsWith("OPTION")) if (line.startsWith("OPTION"))
{ {
if (l.count() > 0 && !key.isEmpty()) if (l.count() > 0 && !key.isEmpty())
dict << QPair<TQString,TQStringList>(key, l); dict << TQPair<TQString,TQStringList>(key, l);
l.clear(); l.clear();
key = TQString::null; key = TQString::null;
if (line.contains('|') == 2 || line.right(7) == "BOOLEAN") if (line.contains('|') == 2 || line.right(7) == "BOOLEAN")
@ -226,18 +226,18 @@ TQValueList< QPair<TQString,TQStringList> > LPRngToolHandler::loadChoiceDict(con
TQMap<TQString,TQString> LPRngToolHandler::parseZOptions(const TQString& optstr) TQMap<TQString,TQString> LPRngToolHandler::parseZOptions(const TQString& optstr)
{ {
TQMap<TQString,TQString> opts; TQMap<TQString,TQString> opts;
QStringList l = TQStringList::split(',', optstr, false); TQStringList l = TQStringList::split(',', optstr, false);
if (l.count() == 0) if (l.count() == 0)
return opts; return opts;
if (m_dict.count() == 0) if (m_dict.count() == 0)
m_dict = loadChoiceDict(locate("data", "kdeprint/lprngtooldriver1")); m_dict = loadChoiceDict(locate("data", "kdeprint/lprngtooldriver1"));
QString unknown; TQString unknown;
for (TQStringList::ConstIterator it=l.begin(); it!=l.end(); ++it) for (TQStringList::ConstIterator it=l.begin(); it!=l.end(); ++it)
{ {
bool found(false); bool found(false);
for (TQValueList< QPair<TQString,TQStringList> >::ConstIterator p=m_dict.begin(); p!=m_dict.end() && !found; ++p) for (TQValueList< TQPair<TQString,TQStringList> >::ConstIterator p=m_dict.begin(); p!=m_dict.end() && !found; ++p)
{ {
if ((*p).second.tqfind(*it) != (*p).second.end()) if ((*p).second.tqfind(*it) != (*p).second.end())
{ {
@ -270,7 +270,7 @@ TQString LPRngToolHandler::driverDirInternal()
PrintcapEntry* LPRngToolHandler::createEntry(KMPrinter *prt) PrintcapEntry* LPRngToolHandler::createEntry(KMPrinter *prt)
{ {
QString prot = prt->deviceProtocol(); TQString prot = prt->deviceProtocol();
if (prot != "parallel" && prot != "lpd" && prot != "smb" && prot != "socket") if (prot != "parallel" && prot != "lpd" && prot != "smb" && prot != "socket")
{ {
manager()->setErrorMsg(i18n("Unsupported backend: %1.").arg(prot)); manager()->setErrorMsg(i18n("Unsupported backend: %1.").arg(prot));
@ -278,7 +278,7 @@ PrintcapEntry* LPRngToolHandler::createEntry(KMPrinter *prt)
} }
PrintcapEntry *entry = new PrintcapEntry; PrintcapEntry *entry = new PrintcapEntry;
entry->addField("cm", Field::String, prt->description()); entry->addField("cm", Field::String, prt->description());
QString lp, comment("##LPRNGTOOL## "); TQString lp, comment("##LPRNGTOOL## ");
if (prot == "parallel") if (prot == "parallel")
{ {
comment.append("DEVICE "); comment.append("DEVICE ");
@ -305,14 +305,14 @@ PrintcapEntry* LPRngToolHandler::createEntry(KMPrinter *prt)
{ {
comment.append("SMB "); comment.append("SMB ");
lp = "| " + filterDir() + "/smbprint"; lp = "| " + filterDir() + "/smbprint";
QString work, server, printer, user, passwd; TQString work, server, printer, user, passwd;
if ( splitSmbURI( prt->device(), work, server, printer, user, passwd ) ) if ( splitSmbURI( prt->device(), work, server, printer, user, passwd ) )
{ {
entry->addField("xfer_options", Field::String, TQString::tqfromLatin1("authfile=\"auth\" crlf=\"0\" hostip=\"\" host=\"%1\" printer=\"%2\" remote_mode=\"SMB\" share=\"//%3/%4\" workgroup=\"%5\"").arg(server).arg(printer).arg(server).arg(printer).arg(work)); entry->addField("xfer_options", Field::String, TQString::tqfromLatin1("authfile=\"auth\" crlf=\"0\" hostip=\"\" host=\"%1\" printer=\"%2\" remote_mode=\"SMB\" share=\"//%3/%4\" workgroup=\"%5\"").arg(server).arg(printer).arg(server).arg(printer).arg(work));
QFile authfile(LprSettings::self()->baseSpoolDir() + "/" + prt->printerName() + "/auth"); TQFile authfile(LprSettings::self()->baseSpoolDir() + "/" + prt->printerName() + "/auth");
if (authfile.open(IO_WriteOnly)) if (authfile.open(IO_WriteOnly))
{ {
QTextStream t(&authfile); TQTextStream t(&authfile);
t << "username=" << user << endl; t << "username=" << user << endl;
t << "password=" << passwd << endl; t << "password=" << passwd << endl;
authfile.close(); authfile.close();
@ -334,7 +334,7 @@ PrintcapEntry* LPRngToolHandler::createEntry(KMPrinter *prt)
entry->addField("ifhp", Field::String, TQString::tqfromLatin1("model=%1,status@,sync@,pagecount@,waitend@").arg(driver->get("driverID"))); entry->addField("ifhp", Field::String, TQString::tqfromLatin1("model=%1,status@,sync@,pagecount@,waitend@").arg(driver->get("driverID")));
entry->addField("lprngtooloptions", Field::String, TQString::tqfromLatin1("FILTERTYPE=\"IFHP\" IFHP_OPTIONS=\"status@,sync@,pagecount@,waitend@\" PRINTERDB_ENTRY=\"%1\"").arg(driver->get("driverID"))); entry->addField("lprngtooloptions", Field::String, TQString::tqfromLatin1("FILTERTYPE=\"IFHP\" IFHP_OPTIONS=\"status@,sync@,pagecount@,waitend@\" PRINTERDB_ENTRY=\"%1\"").arg(driver->get("driverID")));
TQMap<TQString,TQString> opts; TQMap<TQString,TQString> opts;
QString optstr; TQString optstr;
driver->getOptions(opts, false); driver->getOptions(opts, false);
for (TQMap<TQString,TQString>::ConstIterator it=opts.begin(); it!=opts.end(); ++it) for (TQMap<TQString,TQString>::ConstIterator it=opts.begin(); it!=opts.end(); ++it)
if (it.key() != "lpr") if (it.key() != "lpr")
@ -358,7 +358,7 @@ bool LPRngToolHandler::savePrinterDriver(KMPrinter*, PrintcapEntry *entry, DrMai
{ {
// save options in the "prefix_z" field and tell the manager to save the printcap file // save options in the "prefix_z" field and tell the manager to save the printcap file
TQMap<TQString,TQString> opts; TQMap<TQString,TQString> opts;
QString optstr; TQString optstr;
driver->getOptions(opts, false); driver->getOptions(opts, false);
for (TQMap<TQString,TQString>::ConstIterator it=opts.begin(); it!=opts.end(); ++it) for (TQMap<TQString,TQString>::ConstIterator it=opts.begin(); it!=opts.end(); ++it)
if (it.key() != "lpr") if (it.key() != "lpr")
@ -376,7 +376,7 @@ bool LPRngToolHandler::savePrinterDriver(KMPrinter*, PrintcapEntry *entry, DrMai
TQString LPRngToolHandler::printOptions(KPrinter *printer) TQString LPRngToolHandler::printOptions(KPrinter *printer)
{ {
QString optstr; TQString optstr;
TQMap<TQString,TQString> opts = printer->options(); TQMap<TQString,TQString> opts = printer->options();
for (TQMap<TQString,TQString>::ConstIterator it=opts.begin(); it!=opts.end(); ++it) for (TQMap<TQString,TQString>::ConstIterator it=opts.begin(); it!=opts.end(); ++it)
{ {

@ -41,14 +41,14 @@ public:
protected: protected:
TQMap<TQString,TQString> parseXferOptions(const TQString&); TQMap<TQString,TQString> parseXferOptions(const TQString&);
void loadAuthFile(const TQString&, TQString&, TQString&); void loadAuthFile(const TQString&, TQString&, TQString&);
TQValueList< QPair<TQString,TQStringList> > loadChoiceDict(const TQString&); TQValueList< TQPair<TQString,TQStringList> > loadChoiceDict(const TQString&);
TQMap<TQString,TQString> parseZOptions(const TQString&); TQMap<TQString,TQString> parseZOptions(const TQString&);
TQString filterDir(); TQString filterDir();
TQString driverDirInternal(); TQString driverDirInternal();
private: private:
TQValueList< QPair<TQString,TQStringList> > m_dict; TQValueList< TQPair<TQString,TQStringList> > m_dict;
}; };
#endif #endif

@ -55,7 +55,7 @@ void LprSettings::init()
// LPR/LPRng mode // LPR/LPRng mode
KConfig *conf = KMFactory::self()->printConfig(); KConfig *conf = KMFactory::self()->printConfig();
conf->setGroup("LPR"); conf->setGroup("LPR");
QString modestr = conf->readEntry("Mode"); TQString modestr = conf->readEntry("Mode");
if (modestr == "LPRng") if (modestr == "LPRng")
m_mode = LPRng; m_mode = LPRng;
else if (modestr == "LPR") else if (modestr == "LPR")
@ -70,7 +70,7 @@ void LprSettings::init()
} }
// Printcap file // Printcap file
m_printcapfile = TQString::null; m_printcapfile = TQString();
m_local = true; m_local = true;
// Spool directory // Spool directory
@ -89,14 +89,14 @@ TQString LprSettings::printcapFile()
TQFile cf(LPDCONF); TQFile cf(LPDCONF);
if (cf.open(IO_ReadOnly)) if (cf.open(IO_ReadOnly))
{ {
QTextStream t(&cf); TQTextStream t(&cf);
QString line; TQString line;
while (!t.atEnd()) while (!t.atEnd())
{ {
line = t.readLine().stripWhiteSpace(); line = t.readLine().stripWhiteSpace();
if (line.startsWith("printcap_path")) if (line.startsWith("printcap_path"))
{ {
QString filename = line.mid(14).stripWhiteSpace(); TQString filename = line.mid(14).stripWhiteSpace();
if (filename[0] != '|') if (filename[0] != '|')
m_printcapfile = filename; m_printcapfile = filename;
else else
@ -120,14 +120,14 @@ TQString LprSettings::defaultRemoteHost()
TQFile cf(LPDCONF); TQFile cf(LPDCONF);
if (cf.open(IO_ReadOnly)) if (cf.open(IO_ReadOnly))
{ {
QTextStream t(&cf); TQTextStream t(&cf);
QString line; TQString line;
while (!t.atEnd()) while (!t.atEnd())
{ {
line = t.readLine().stripWhiteSpace(); line = t.readLine().stripWhiteSpace();
if (line.startsWith("default_remote_host")) if (line.startsWith("default_remote_host"))
{ {
QString hostname = line.mid(20).stripWhiteSpace(); TQString hostname = line.mid(20).stripWhiteSpace();
m_defaultremotehost = hostname; m_defaultremotehost = hostname;
} }
} }

@ -44,7 +44,7 @@
MaticHandler::MaticHandler(KMManager *mgr) MaticHandler::MaticHandler(KMManager *mgr)
: LprHandler("foomatic", mgr) : LprHandler("foomatic", mgr)
{ {
QString PATH = getenv("PATH"); TQString PATH = getenv("PATH");
PATH.append(":/usr/sbin:/usr/local/sbin:/opt/sbin:/opt/local/sbin"); PATH.append(":/usr/sbin:/usr/local/sbin:/opt/sbin:/opt/local/sbin");
m_exematicpath = KStandardDirs::findExe("lpdomatic", PATH); m_exematicpath = KStandardDirs::findExe("lpdomatic", PATH);
m_ncpath = KStandardDirs::findExe("nc"); m_ncpath = KStandardDirs::findExe("nc");
@ -76,7 +76,7 @@ KMPrinter* MaticHandler::createPrinter(PrintcapEntry *entry)
bool MaticHandler::completePrinter(KMPrinter *prt, PrintcapEntry *entry, bool shortmode) bool MaticHandler::completePrinter(KMPrinter *prt, PrintcapEntry *entry, bool shortmode)
{ {
QString val = entry->field("lp"); TQString val = entry->field("lp");
if (val == "/dev/null" || val.isEmpty()) if (val == "/dev/null" || val.isEmpty())
{ {
prt->setLocation(i18n("Network printer")); prt->setLocation(i18n("Network printer"));
@ -98,13 +98,13 @@ bool MaticHandler::completePrinter(KMPrinter *prt, PrintcapEntry *entry, bool sh
Foomatic2Loader loader; Foomatic2Loader loader;
if ( loader.readFromFile( maticFile( entry ) ) ) if ( loader.readFromFile( maticFile( entry ) ) )
{ {
QString postpipe = loader.data()[ "POSTPIPE" ].toString(); TQString postpipe = loader.data()[ "POSTPIPE" ].toString();
if (!postpipe.isEmpty()) if (!postpipe.isEmpty())
{ {
KURL url ( parsePostpipe(postpipe) ); KURL url ( parsePostpipe(postpipe) );
if (!url.isEmpty()) if (!url.isEmpty())
{ {
QString ds = TQString::tqfromLatin1("%1 (%2)").arg(prt->location()).arg(url.protocol()); TQString ds = TQString::tqfromLatin1("%1 (%2)").arg(prt->location()).arg(url.protocol());
prt->setDevice(url.url()); prt->setDevice(url.url());
prt->setLocation(ds); prt->setLocation(ds);
} }
@ -125,9 +125,9 @@ bool MaticHandler::completePrinter(KMPrinter *prt, PrintcapEntry *entry, bool sh
TQString MaticHandler::parsePostpipe(const TQString& s) TQString MaticHandler::parsePostpipe(const TQString& s)
{ {
QString url; TQString url;
int p = s.findRev('|'); int p = s.tqfindRev('|');
QStringList args = TQStringList::split(" ", s.right(s.length()-p-1)); TQStringList args = TQStringList::split(" ", s.right(s.length()-p-1));
if (args.count() != 0) if (args.count() != 0)
{ {
@ -143,8 +143,8 @@ TQString MaticHandler::parsePostpipe(const TQString& s)
// smb printer // smb printer
else if (args[0].right(10) == "/smbclient") else if (args[0].right(10) == "/smbclient")
{ {
QStringList host_components = TQStringList::split(TQRegExp("/|\\\\\""), args[1], false); TQStringList host_components = TQStringList::split(TQRegExp("/|\\\\\""), args[1], false);
QString workgrp, user, pass; TQString workgrp, user, pass;
for (uint i=2; i<args.count(); i++) for (uint i=2; i<args.count(); i++)
{ {
if (args[i] == "-U") if (args[i] == "-U")
@ -166,7 +166,7 @@ TQString MaticHandler::parsePostpipe(const TQString& s)
i++; i++;
else else
{ {
QString host = (args[i].length() == 2 ? args[i+1] : args[i].right(args[i].length()-2)); TQString host = (args[i].length() == 2 ? args[i+1] : args[i].right(args[i].length()-2));
int p = host.tqfind("\\@"); int p = host.tqfind("\\@");
if (p != -1) if (p != -1)
{ {
@ -184,8 +184,8 @@ TQString MaticHandler::parsePostpipe(const TQString& s)
TQString MaticHandler::createPostpipe(const TQString& _url) TQString MaticHandler::createPostpipe(const TQString& _url)
{ {
KURL url( _url ); KURL url( _url );
QString prot = url.protocol(); TQString prot = url.protocol();
QString str; TQString str;
if (prot == "socket") if (prot == "socket")
{ {
str += ("| " + m_ncpath); str += ("| " + m_ncpath);
@ -196,7 +196,7 @@ TQString MaticHandler::createPostpipe(const TQString& _url)
else if (prot == "lpd") else if (prot == "lpd")
{ {
str += ("| " + m_rlprpath + " -q -h"); str += ("| " + m_rlprpath + " -q -h");
QString h = url.host(), p = url.path().mid(1); TQString h = url.host(), p = url.path().mid(1);
str += (" -P " + p + "\\@" + h); str += (" -P " + p + "\\@" + h);
} }
else if (prot == "smb") else if (prot == "smb")
@ -223,8 +223,8 @@ DrMain* MaticHandler::loadDriver(KMPrinter*, PrintcapEntry *entry, bool)
// we need to use a copy of the driver, as the driver // we need to use a copy of the driver, as the driver
// is not self-contained. If the printer is removed (when // is not self-contained. If the printer is removed (when
// changing printer name), the template would be also removed // changing printer name), the template would be also removed
QString origfilename = maticFile(entry); TQString origfilename = maticFile(entry);
QString filename = locateLocal("tmp", "foomatic_" + kapp->randomString(8)); TQString filename = locateLocal("tmp", "foomatic_" + kapp->randomString(8));
::system(TQFile::encodeName("cp " + KProcess::quote(origfilename) + " " + KProcess::quote(filename))); ::system(TQFile::encodeName("cp " + KProcess::quote(origfilename) + " " + KProcess::quote(filename)));
DrMain *driver = Foomatic2Loader::loadDriver(filename); DrMain *driver = Foomatic2Loader::loadDriver(filename);
if (driver) if (driver)
@ -239,16 +239,16 @@ DrMain* MaticHandler::loadDriver(KMPrinter*, PrintcapEntry *entry, bool)
DrMain* MaticHandler::loadDbDriver(const TQString& path) DrMain* MaticHandler::loadDbDriver(const TQString& path)
{ {
QStringList comps = TQStringList::split('/', path, false); TQStringList comps = TQStringList::split('/', path, false);
if (comps.count() < 3 || comps[0] != "foomatic") if (comps.count() < 3 || comps[0] != "foomatic")
{ {
manager()->setErrorMsg(i18n("Internal error.")); manager()->setErrorMsg(i18n("Internal error."));
return NULL; return NULL;
} }
QString tmpFile = locateLocal("tmp", "foomatic_" + kapp->randomString(8)); TQString tmpFile = locateLocal("tmp", "foomatic_" + kapp->randomString(8));
QString PATH = getenv("PATH") + TQString::tqfromLatin1(":/usr/sbin:/usr/local/sbin:/opt/sbin:/opt/local/sbin"); TQString PATH = getenv("PATH") + TQString::tqfromLatin1(":/usr/sbin:/usr/local/sbin:/opt/sbin:/opt/local/sbin");
QString exe = KStandardDirs::findExe("foomatic-datafile", PATH); TQString exe = KStandardDirs::findExe("foomatic-datafile", PATH);
if (exe.isEmpty()) if (exe.isEmpty())
{ {
manager()->setErrorMsg(i18n("Unable to find the executable foomatic-datafile " manager()->setErrorMsg(i18n("Unable to find the executable foomatic-datafile "
@ -257,7 +257,7 @@ DrMain* MaticHandler::loadDbDriver(const TQString& path)
} }
KPipeProcess in; KPipeProcess in;
QFile out(tmpFile); TQFile out(tmpFile);
TQString cmd = KProcess::quote(exe); TQString cmd = KProcess::quote(exe);
cmd += " -t lpd -d "; cmd += " -t lpd -d ";
cmd += KProcess::quote(comps[2]); cmd += KProcess::quote(comps[2]);
@ -265,8 +265,8 @@ DrMain* MaticHandler::loadDbDriver(const TQString& path)
cmd += KProcess::quote(comps[1]); cmd += KProcess::quote(comps[1]);
if (in.open(cmd) && out.open(IO_WriteOnly)) if (in.open(cmd) && out.open(IO_WriteOnly))
{ {
QTextStream tin(&in), tout(&out); TQTextStream tin(&in), tout(&out);
QString line; TQString line;
while (!tin.atEnd()) while (!tin.atEnd())
{ {
line = tin.readLine(); line = tin.readLine();
@ -291,16 +291,16 @@ DrMain* MaticHandler::loadDbDriver(const TQString& path)
bool MaticHandler::savePrinterDriver(KMPrinter *prt, PrintcapEntry *entry, DrMain *driver, bool*) bool MaticHandler::savePrinterDriver(KMPrinter *prt, PrintcapEntry *entry, DrMain *driver, bool*)
{ {
QFile tmpFile(locateLocal("tmp", "foomatic_" + kapp->randomString(8))); TQFile tmpFile(locateLocal("tmp", "foomatic_" + kapp->randomString(8)));
QFile inFile(driver->get("template")); TQFile inFile(driver->get("template"));
QString outFile = maticFile(entry); TQString outFile = maticFile(entry);
bool result(false); bool result(false);
QString postpipe = createPostpipe(prt->device()); TQString postpipe = createPostpipe(prt->device());
if (inFile.open(IO_ReadOnly) && tmpFile.open(IO_WriteOnly)) if (inFile.open(IO_ReadOnly) && tmpFile.open(IO_WriteOnly))
{ {
QTextStream tin(&inFile), tout(&tmpFile); TQTextStream tin(&inFile), tout(&tmpFile);
QString line, optname; TQString line, optname;
int p(-1), q(-1); int p(-1), q(-1);
if (!postpipe.isEmpty()) if (!postpipe.isEmpty())
tout << "$postpipe = \"" << postpipe << "\";" << endl; tout << "$postpipe = \"" << postpipe << "\";" << endl;
@ -329,7 +329,7 @@ bool MaticHandler::savePrinterDriver(KMPrinter *prt, PrintcapEntry *entry, DrMai
inFile.close(); inFile.close();
tmpFile.close(); tmpFile.close();
QString cmd = "mv " + KProcess::quote(tmpFile.name()) + " " + KProcess::quote(outFile); TQString cmd = "mv " + KProcess::quote(tmpFile.name()) + " " + KProcess::quote(outFile);
int status = ::system(TQFile::encodeName(cmd).data()); int status = ::system(TQFile::encodeName(cmd).data());
TQFile::remove(tmpFile.name()); TQFile::remove(tmpFile.name());
result = (status != -1 && WEXITSTATUS(status) == 0); result = (status != -1 && WEXITSTATUS(status) == 0);
@ -347,12 +347,12 @@ bool MaticHandler::savePrinterDriver(KMPrinter *prt, PrintcapEntry *entry, DrMai
bool MaticHandler::savePpdFile(DrMain *driver, const TQString& filename) bool MaticHandler::savePpdFile(DrMain *driver, const TQString& filename)
{ {
QString mdriver(driver->get("matic_driver")), mprinter(driver->get("matic_printer")); TQString mdriver(driver->get("matic_driver")), mprinter(driver->get("matic_printer"));
if (mdriver.isEmpty() || mprinter.isEmpty()) if (mdriver.isEmpty() || mprinter.isEmpty())
return true; return true;
QString PATH = getenv("PATH") + TQString::tqfromLatin1(":/usr/sbin:/usr/local/sbin:/opt/sbin:/opt/local/sbin"); TQString PATH = getenv("PATH") + TQString::tqfromLatin1(":/usr/sbin:/usr/local/sbin:/opt/sbin:/opt/local/sbin");
QString exe = KStandardDirs::findExe("foomatic-datafile", PATH); TQString exe = KStandardDirs::findExe("foomatic-datafile", PATH);
if (exe.isEmpty()) if (exe.isEmpty())
{ {
manager()->setErrorMsg(i18n("Unable to find the executable foomatic-datafile " manager()->setErrorMsg(i18n("Unable to find the executable foomatic-datafile "
@ -361,12 +361,12 @@ bool MaticHandler::savePpdFile(DrMain *driver, const TQString& filename)
} }
KPipeProcess in; KPipeProcess in;
QFile out(filename); TQFile out(filename);
if (in.open(exe + " -t cups -d " + mdriver + " -p " + mprinter) && out.open(IO_WriteOnly)) if (in.open(exe + " -t cups -d " + mdriver + " -p " + mprinter) && out.open(IO_WriteOnly))
{ {
QTextStream tin(&in), tout(&out); TQTextStream tin(&in), tout(&out);
QString line, optname; TQString line, optname;
QRegExp re("^\\*Default(\\w+):"), foo("'name'\\s+=>\\s+'(\\w+)'"), foo2("'\\w+'\\s*,\\s*$"); TQRegExp re("^\\*Default(\\w+):"), foo("'name'\\s+=>\\s+'(\\w+)'"), foo2("'\\w+'\\s*,\\s*$");
while (!tin.atEnd()) while (!tin.atEnd())
{ {
line = tin.readLine(); line = tin.readLine();
@ -388,7 +388,7 @@ bool MaticHandler::savePpdFile(DrMain *driver, const TQString& filename)
DrBase *opt = driver->findOption(re.cap(1)); DrBase *opt = driver->findOption(re.cap(1));
if (opt) if (opt)
{ {
QString val = opt->valueText(); TQString val = opt->valueText();
if (opt->type() == DrBase::Boolean) if (opt->type() == DrBase::Boolean)
val = (val == "1" ? "True" : "False"); val = (val == "1" ? "True" : "False");
tout << "*Default" << opt->name() << ": " << val << endl; tout << "*Default" << opt->name() << ": " << val << endl;
@ -412,7 +412,7 @@ bool MaticHandler::savePpdFile(DrMain *driver, const TQString& filename)
PrintcapEntry* MaticHandler::createEntry(KMPrinter *prt) PrintcapEntry* MaticHandler::createEntry(KMPrinter *prt)
{ {
KURL url( prt->device() ); KURL url( prt->device() );
QString prot = url.protocol(); TQString prot = url.protocol();
if ((prot != "lpd" || m_rlprpath.isEmpty()) && if ((prot != "lpd" || m_rlprpath.isEmpty()) &&
(prot != "socket" || m_ncpath.isEmpty()) && (prot != "socket" || m_ncpath.isEmpty()) &&
(prot != "smb" || m_smbpath.isEmpty()) && (prot != "smb" || m_smbpath.isEmpty()) &&
@ -449,7 +449,7 @@ PrintcapEntry* MaticHandler::createEntry(KMPrinter *prt)
bool MaticHandler::removePrinter(KMPrinter *prt, PrintcapEntry *entry) bool MaticHandler::removePrinter(KMPrinter *prt, PrintcapEntry *entry)
{ {
// remove Foomatic driver // remove Foomatic driver
QString af = entry->field("af"); TQString af = entry->field("af");
if (af.isEmpty()) if (af.isEmpty())
return true; return true;
if (!TQFile::remove(af)) if (!TQFile::remove(af))
@ -463,7 +463,7 @@ bool MaticHandler::removePrinter(KMPrinter *prt, PrintcapEntry *entry)
TQString MaticHandler::printOptions(KPrinter *printer) TQString MaticHandler::printOptions(KPrinter *printer)
{ {
TQMap<TQString,TQString> opts = printer->options(); TQMap<TQString,TQString> opts = printer->options();
QString str; TQString str;
for (TQMap<TQString,TQString>::Iterator it=opts.begin(); it!=opts.end(); ++it) for (TQMap<TQString,TQString>::Iterator it=opts.begin(); it!=opts.end(); ++it)
{ {
if (it.key().startsWith("kde-") || it.key().startsWith("_kde-") || it.key().startsWith( "app-" )) if (it.key().startsWith("kde-") || it.key().startsWith("_kde-") || it.key().startsWith( "app-" ))

@ -50,8 +50,8 @@ private:
bool savePpdFile(DrMain*, const TQString&); bool savePpdFile(DrMain*, const TQString&);
private: private:
QString m_exematicpath; TQString m_exematicpath;
QString m_ncpath, m_smbpath, m_rlprpath; TQString m_ncpath, m_smbpath, m_rlprpath;
}; };
#endif #endif

@ -23,13 +23,13 @@
TQString maticFile(PrintcapEntry *entry) TQString maticFile(PrintcapEntry *entry)
{ {
QString s(entry->field("af")); TQString s(entry->field("af"));
if (s.isEmpty()) if (s.isEmpty())
{ {
s = entry->field("filter_options"); s = entry->field("filter_options");
if (!s.isEmpty()) if (!s.isEmpty())
{ {
int p = s.findRev(' '); int p = s.tqfindRev(' ');
if (p != -1) if (p != -1)
s = s.mid(p+1); s = s.mid(p+1);
} }

@ -21,7 +21,7 @@
TQString Field::toString() const TQString Field::toString() const
{ {
QString s = name; TQString s = name;
switch (type) switch (type)
{ {
case String: case String:

@ -52,8 +52,8 @@ public:
TQString toString() const; TQString toString() const;
Type type; Type type;
QString name; TQString name;
QString value; TQString value;
}; };
/** /**
@ -66,13 +66,13 @@ public:
class PrintcapEntry class PrintcapEntry
{ {
public: public:
QString name; TQString name;
QStringList aliases; TQStringList aliases;
QString comment; TQString comment;
TQMap<TQString,Field> fields; TQMap<TQString,Field> fields;
QString postcomment; TQString postcomment;
bool has(const TQString& f) const { return fields.contains(f); } bool has(const TQString& f) const { return fields.tqcontains(f); }
TQString field(const TQString& f) const { return fields[f].value; } TQString field(const TQString& f) const { return fields[f].value; }
bool writeEntry(TQTextStream&); bool writeEntry(TQTextStream&);
void addField(const TQString& name, Field::Type type = Field::Boolean, const TQString& value = TQString::null); void addField(const TQString& name, Field::Type type = Field::Boolean, const TQString& value = TQString::null);

@ -27,7 +27,7 @@ void PrintcapReader::setPrintcapFile(TQFile *f)
{ {
if (f->isOpen()) if (f->isOpen())
{ {
m_stream.setDevice(f); m_stream.setDevice(TQT_TQIODEVICE(f));
m_buffer = TQString::null; m_buffer = TQString::null;
} }
} }
@ -56,7 +56,7 @@ void PrintcapReader::unputLine(const TQString& s)
PrintcapEntry* PrintcapReader::nextEntry() PrintcapEntry* PrintcapReader::nextEntry()
{ {
if (!m_stream.device()) if (!m_stream.tqdevice())
return NULL; return NULL;
TQString line, comment, name, fields, buf; TQString line, comment, name, fields, buf;

@ -29,16 +29,16 @@
class CJanusWidget::CPage class CJanusWidget::CPage
{ {
public: public:
QWidget *m_widget; TQWidget *m_widget;
QString m_text; TQString m_text;
QString m_header; TQString m_header;
QPixmap m_pixmap; TQPixmap m_pixmap;
CListBoxItem *m_item; CListBoxItem *m_item;
}; };
//*********************************************************************************** //***********************************************************************************
class CJanusWidget::CListBoxItem : public QListBoxItem class CJanusWidget::CListBoxItem : public TQListBoxItem
{ {
public: public:
CListBoxItem(TQListBox *lb, TQListBoxItem *after, const TQPixmap& pix, const TQString& text); CListBoxItem(TQListBox *lb, TQListBoxItem *after, const TQPixmap& pix, const TQString& text);
@ -49,7 +49,7 @@ protected:
void paint(TQPainter*); void paint(TQPainter*);
private: private:
QPixmap m_pix; TQPixmap m_pix;
}; };
CJanusWidget::CListBoxItem::CListBoxItem(TQListBox *lb, TQListBoxItem *after, const TQPixmap& pix, const TQString& text) CJanusWidget::CListBoxItem::CListBoxItem(TQListBox *lb, TQListBoxItem *after, const TQPixmap& pix, const TQString& text)
@ -65,7 +65,7 @@ int CJanusWidget::CListBoxItem::height(const TQListBox *lb) const
int CJanusWidget::CListBoxItem::width(const TQListBox *lb) const int CJanusWidget::CListBoxItem::width(const TQListBox *lb) const
{ {
int w = QMAX(lb->fontMetrics().width(text()),m_pix.width()); int w = TQMAX(lb->fontMetrics().width(text()),m_pix.width());
return (w + 10); return (w + 10);
} }
@ -110,11 +110,11 @@ bool CJanusWidget::CListBox::eventFilter(TQObject *o, TQEvent *e)
void CJanusWidget::CListBox::computeWidth() void CJanusWidget::CListBox::computeWidth()
{ {
QListBoxItem *item = firstItem(); TQListBoxItem *item = firstItem();
int w(40); int w(40);
while (item) while (item)
{ {
w = QMAX(w,item->width(this)); w = TQMAX(w,item->width(this));
item = item->next(); item = item->next();
} }
if (verticalScrollBar()->isVisible()) if (verticalScrollBar()->isVisible())
@ -132,7 +132,7 @@ CJanusWidget::CJanusWidget(TQWidget *parent, const char *name)
m_stack = new TQWidgetStack(this); m_stack = new TQWidgetStack(this);
m_header = new TQLabel(this); m_header = new TQLabel(this);
QFont f(m_header->font()); TQFont f(m_header->font());
f.setBold(true); f.setBold(true);
m_header->setFont(f); m_header->setFont(f);
@ -148,8 +148,8 @@ CJanusWidget::CJanusWidget(TQWidget *parent, const char *name)
m_empty = new TQWidget(this, "Empty"); m_empty = new TQWidget(this, "Empty");
m_stack->addWidget(m_empty,0); m_stack->addWidget(m_empty,0);
QHBoxLayout *main_ = new TQHBoxLayout(this, 0, 10); TQHBoxLayout *main_ = new TQHBoxLayout(this, 0, 10);
QVBoxLayout *sub_ = new TQVBoxLayout(0, 0, 5); TQVBoxLayout *sub_ = new TQVBoxLayout(0, 0, 5);
main_->addWidget(m_iconlist,0); main_->addWidget(m_iconlist,0);
main_->addLayout(sub_,1); main_->addLayout(sub_,1);
sub_->addWidget(m_header,0); sub_->addWidget(m_header,0);
@ -241,7 +241,7 @@ CJanusWidget::CPage* CJanusWidget::findPage(TQListBoxItem *i)
TQListBoxItem* CJanusWidget::findPrevItem(CPage *p) TQListBoxItem* CJanusWidget::findPrevItem(CPage *p)
{ {
if (m_pages.findRef(p) == -1) if (m_pages.tqfindRef(p) == -1)
m_pages.last(); m_pages.last();
else else
m_pages.prev(); m_pages.prev();

@ -54,11 +54,11 @@ private:
TQListBoxItem* findPrevItem(CPage*); TQListBoxItem* findPrevItem(CPage*);
private: private:
TQPtrList<CPage> m_pages; TQPtrList<CPage> m_pages;
CListBox *m_iconlist; CListBox *m_iconlist;
QLabel *m_header; TQLabel *m_header;
QWidgetStack *m_stack; TQWidgetStack *m_stack;
QWidget *m_empty; TQWidget *m_empty;
}; };
#endif #endif

@ -32,7 +32,7 @@ public:
{ {
m_menu = 0; m_menu = 0;
} }
QStringList m_iconlst; TQStringList m_iconlst;
TQPopupMenu* m_menu; TQPopupMenu* m_menu;
}; };
@ -51,7 +51,7 @@ void KIconSelectAction::updateIcons()
{ {
if (d->m_menu) if (d->m_menu)
{ {
QStringList lst = items(); TQStringList lst = items();
for (uint id=0; id<lst.count(); ++id) for (uint id=0; id<lst.count(); ++id)
d->m_menu->changeItem(id, SmallIconSet(d->m_iconlst[id]), lst[id]); d->m_menu->changeItem(id, SmallIconSet(d->m_iconlst[id]), lst[id]);
} }
@ -87,7 +87,7 @@ int KIconSelectAction::plug(TQWidget* widget, int index)
int id = KAction::getToolButtonID(); int id = KAction::getToolButtonID();
// To have a correct layout in the toolbar, a non // To have a correct layout in the toolbar, a non
// empty icon has to be used. Use "unknown" by default. // empty icon has to be used. Use "unknown" by default.
QString iconName = (currentItem() != -1 ? d->m_iconlst[currentItem()] : "unknown"); TQString iconName = (currentItem() != -1 ? d->m_iconlst[currentItem()] : "unknown");
createPopupMenu(); createPopupMenu();
bar->insertButton(iconName, id, true, plainText(), index); bar->insertButton(iconName, id, true, plainText(), index);

@ -34,8 +34,8 @@ KMConfigCommand::KMConfigCommand(TQWidget *parent, const char *name)
setPageHeader(i18n("Command Settings")); setPageHeader(i18n("Command Settings"));
setPagePixmap("exec"); setPagePixmap("exec");
QGroupBox *gb = new TQGroupBox(0, Qt::Horizontal, i18n("Edit/Create Commands"), this); TQGroupBox *gb = new TQGroupBox(0, Qt::Horizontal, i18n("Edit/Create Commands"), this);
QLabel *lab = new TQLabel(i18n( TQLabel *lab = new TQLabel(i18n(
"<p>Command objects perform a conversion from input to output.<br>" "<p>Command objects perform a conversion from input to output.<br>"
"They are used as the basis to build both print filters " "They are used as the basis to build both print filters "
"and special printers. They are described by a command string, a " "and special printers. They are described by a command string, a "
@ -44,10 +44,10 @@ KMConfigCommand::KMConfigCommand(TQWidget *parent, const char *name)
"changes will only be effective for you."), gb); "changes will only be effective for you."), gb);
KXmlCommandSelector *sel = new KXmlCommandSelector(false, gb); KXmlCommandSelector *sel = new KXmlCommandSelector(false, gb);
QVBoxLayout *l0 = new TQVBoxLayout(this, 0, KDialog::spacingHint()); TQVBoxLayout *l0 = new TQVBoxLayout(this, 0, KDialog::spacingHint());
l0->addWidget(gb); l0->addWidget(gb);
l0->addStretch(1); l0->addStretch(1);
QVBoxLayout *l2 = new TQVBoxLayout(gb->layout(), KDialog::spacingHint()); TQVBoxLayout *l2 = new TQVBoxLayout(TQT_TQLAYOUT(gb->layout()), KDialog::spacingHint());
l2->addWidget(lab); l2->addWidget(lab);
l2->addWidget(sel); l2->addWidget(sel);
} }

@ -66,9 +66,9 @@ void KMConfigDialog::addConfigPage(KMConfigPage *page)
KIcon::SizeMedium KIcon::SizeMedium
); );
QFrame *frame = addPage(page->pageName(),page->pageHeader(),icon); TQFrame *frame = addPage(page->pageName(),page->pageHeader(),icon);
page->reparent(frame,TQPoint(0,0)); page->reparent(frame,TQPoint(0,0));
QVBoxLayout *lay = new TQVBoxLayout(frame, 0, 0); TQVBoxLayout *lay = new TQVBoxLayout(frame, 0, 0);
lay->addWidget(page); lay->addWidget(page);
m_pages.append(page); m_pages.append(page);
} }

@ -41,7 +41,7 @@ KMConfigFilter::KMConfigFilter(TQWidget *parent, const char *name)
setPageHeader(i18n("Printer Filtering Settings")); setPageHeader(i18n("Printer Filtering Settings"));
setPagePixmap("filter"); setPagePixmap("filter");
QGroupBox *box = new TQGroupBox(0, Qt::Vertical, i18n("Printer Filter"), this); TQGroupBox *box = new TQGroupBox(0, Qt::Vertical, i18n("Printer Filter"), this);
m_list1 = new KListBox(box); m_list1 = new KListBox(box);
m_list1->setSelectionMode(KListBox::Extended); m_list1->setSelectionMode(KListBox::Extended);
@ -52,21 +52,21 @@ KMConfigFilter::KMConfigFilter(TQWidget *parent, const char *name)
m_remove = new TQToolButton( box ); m_remove = new TQToolButton( box );
m_remove->setIconSet(TQApplication::reverseLayout() ? SmallIconSet( "forward" ) : SmallIconSet( "back" )); m_remove->setIconSet(TQApplication::reverseLayout() ? SmallIconSet( "forward" ) : SmallIconSet( "back" ));
m_locationre = new TQLineEdit(box); m_locationre = new TQLineEdit(box);
QLabel *lab = new TQLabel(box); TQLabel *lab = new TQLabel(box);
lab->setText(i18n("The printer filtering allows you to view only a specific set of " lab->setText(i18n("The printer filtering allows you to view only a specific set of "
"printers instead of all of them. This may be useful when there are a " "printers instead of all of them. This may be useful when there are a "
"lot of printers available but you only use a few ones. Select the " "lot of printers available but you only use a few ones. Select the "
"printers you want to see from the list on the left or enter a <b>Location</b> " "printers you want to see from the list on the left or enter a <b>Location</b> "
"filter (ex: Group_1*). Both are cumulative and ignored if empty.")); "filter (ex: Group_1*). Both are cumulative and ignored if empty."));
lab->setTextFormat(Qt::RichText); lab->setTextFormat(TQt::RichText);
QLabel *lab1 = new TQLabel(i18n("Location filter:"), box); TQLabel *lab1 = new TQLabel(i18n("Location filter:"), box);
QVBoxLayout *l0 = new TQVBoxLayout(this, 0, KDialog::spacingHint()); TQVBoxLayout *l0 = new TQVBoxLayout(this, 0, KDialog::spacingHint());
l0->addWidget(box, 1); l0->addWidget(box, 1);
QVBoxLayout *l1 = new TQVBoxLayout(box->layout(), KDialog::spacingHint()); TQVBoxLayout *l1 = new TQVBoxLayout(TQT_TQLAYOUT(box->layout()), KDialog::spacingHint());
l1->addWidget(lab); l1->addWidget(lab);
QGridLayout *l2 = new TQGridLayout(0, 4, 3, 0, KDialog::spacingHint()); TQGridLayout *l2 = new TQGridLayout(0, 4, 3, 0, KDialog::spacingHint());
l1->addLayout(l2); l1->addLayout(TQT_TQLAYOUT(l2));
l2->setRowStretch(0, 1); l2->setRowStretch(0, 1);
l2->setRowStretch(3, 1); l2->setRowStretch(3, 1);
l2->setColStretch(0, 1); l2->setColStretch(0, 1);
@ -75,7 +75,7 @@ KMConfigFilter::KMConfigFilter(TQWidget *parent, const char *name)
l2->addMultiCellWidget(m_list2, 0, 3, 2, 2); l2->addMultiCellWidget(m_list2, 0, 3, 2, 2);
l2->addWidget(m_add, 1, 1); l2->addWidget(m_add, 1, 1);
l2->addWidget(m_remove, 2, 1); l2->addWidget(m_remove, 2, 1);
QHBoxLayout *l3 = new TQHBoxLayout(0, 0, KDialog::spacingHint()); TQHBoxLayout *l3 = new TQHBoxLayout(0, 0, KDialog::spacingHint());
l1->addLayout(l3, 0); l1->addLayout(l3, 0);
l3->addWidget(lab1, 0); l3->addWidget(lab1, 0);
l3->addWidget(m_locationre, 1); l3->addWidget(m_locationre, 1);
@ -91,7 +91,7 @@ KMConfigFilter::KMConfigFilter(TQWidget *parent, const char *name)
void KMConfigFilter::loadConfig(KConfig *conf) void KMConfigFilter::loadConfig(KConfig *conf)
{ {
conf->setGroup("Filter"); conf->setGroup("Filter");
QStringList m_plist = conf->readListEntry("Printers"); TQStringList m_plist = conf->readListEntry("Printers");
TQPtrListIterator<KMPrinter> it(*(KMManager::self()->printerListComplete(false))); TQPtrListIterator<KMPrinter> it(*(KMManager::self()->printerListComplete(false)));
for (; it.current(); ++it) for (; it.current(); ++it)
{ {
@ -109,7 +109,7 @@ void KMConfigFilter::loadConfig(KConfig *conf)
void KMConfigFilter::saveConfig(KConfig *conf) void KMConfigFilter::saveConfig(KConfig *conf)
{ {
conf->setGroup("Filter"); conf->setGroup("Filter");
QStringList plist; TQStringList plist;
for (uint i=0; i<m_list2->count(); i++) for (uint i=0; i<m_list2->count(); i++)
plist << m_list2->text(i); plist << m_list2->text(i);
conf->writeEntry("Printers", plist); conf->writeEntry("Printers", plist);
@ -146,7 +146,7 @@ void KMConfigFilter::slotSelectionChanged()
const KListBox *lb = static_cast<const KListBox*>(sender()); const KListBox *lb = static_cast<const KListBox*>(sender());
if (!lb) if (!lb)
return; return;
QToolButton *pb = (lb == m_list1 ? m_add : m_remove); TQToolButton *pb = (lb == m_list1 ? m_add : m_remove);
for (uint i=0; i<lb->count(); i++) for (uint i=0; i<lb->count(); i++)
if (lb->isSelected(i)) if (lb->isSelected(i))
{ {

@ -45,8 +45,8 @@ protected:
private: private:
KListBox *m_list1, *m_list2; KListBox *m_list1, *m_list2;
QToolButton *m_add, *m_remove; TQToolButton *m_add, *m_remove;
QLineEdit *m_locationre; TQLineEdit *m_locationre;
}; };
#endif #endif

@ -43,8 +43,8 @@ KMConfigFonts::KMConfigFonts(TQWidget *parent, const char *name)
setPageHeader(i18n("Font Settings")); setPageHeader(i18n("Font Settings"));
setPagePixmap("fonts"); setPagePixmap("fonts");
QGroupBox *box = new TQGroupBox(0, Qt::Vertical, i18n("Fonts Embedding"), this); TQGroupBox *box = new TQGroupBox(0, Qt::Vertical, i18n("Fonts Embedding"), this);
QGroupBox *box2 = new TQGroupBox(0, Qt::Vertical, i18n("Fonts Path"), this); TQGroupBox *box2 = new TQGroupBox(0, Qt::Vertical, i18n("Fonts Path"), this);
m_embedfonts = new TQCheckBox(i18n("&Embed fonts in PostScript data when printing"), box); m_embedfonts = new TQCheckBox(i18n("&Embed fonts in PostScript data when printing"), box);
m_fontpath = new KListView(box2); m_fontpath = new KListView(box2);
@ -58,14 +58,14 @@ KMConfigFonts::KMConfigFonts(TQWidget *parent, const char *name)
m_down = new KPushButton(KGuiItem(i18n("&Down"), "down"), box2); m_down = new KPushButton(KGuiItem(i18n("&Down"), "down"), box2);
m_add = new KPushButton(KGuiItem(i18n("&Add"), "add"), box2); m_add = new KPushButton(KGuiItem(i18n("&Add"), "add"), box2);
m_remove = new KPushButton(KGuiItem(i18n("&Remove"), "editdelete"), box2); m_remove = new KPushButton(KGuiItem(i18n("&Remove"), "editdelete"), box2);
QLabel *lab0 = new TQLabel(i18n("Additional director&y:"), box2); TQLabel *lab0 = new TQLabel(i18n("Additional director&y:"), box2);
lab0->setBuddy(m_addpath); lab0->setBuddy(m_addpath);
QVBoxLayout *l0 = new TQVBoxLayout(box->layout(), KDialog::spacingHint()); TQVBoxLayout *l0 = new TQVBoxLayout(TQT_TQLAYOUT(box->layout()), KDialog::spacingHint());
l0->addWidget(m_embedfonts); l0->addWidget(m_embedfonts);
QVBoxLayout *l1 = new TQVBoxLayout(box2->layout(), KDialog::spacingHint()); TQVBoxLayout *l1 = new TQVBoxLayout(TQT_TQLAYOUT(box2->layout()), KDialog::spacingHint());
l1->addWidget(m_fontpath); l1->addWidget(m_fontpath);
QHBoxLayout *l2 = new TQHBoxLayout(0, 0, KDialog::spacingHint()); TQHBoxLayout *l2 = new TQHBoxLayout(0, 0, KDialog::spacingHint());
l1->addLayout(l2); l1->addLayout(l2);
l2->addWidget(m_up); l2->addWidget(m_up);
l2->addWidget(m_down); l2->addWidget(m_down);
@ -73,11 +73,11 @@ KMConfigFonts::KMConfigFonts(TQWidget *parent, const char *name)
l1->addSpacing(10); l1->addSpacing(10);
l1->addWidget(lab0); l1->addWidget(lab0);
l1->addWidget(m_addpath); l1->addWidget(m_addpath);
QHBoxLayout *l3 = new TQHBoxLayout(0, 0, KDialog::spacingHint()); TQHBoxLayout *l3 = new TQHBoxLayout(0, 0, KDialog::spacingHint());
l1->addLayout(l3); l1->addLayout(l3);
l3->addStretch(1); l3->addStretch(1);
l3->addWidget(m_add); l3->addWidget(m_add);
QVBoxLayout *l4 = new TQVBoxLayout(this, 0, KDialog::spacingHint()); TQVBoxLayout *l4 = new TQVBoxLayout(this, 0, KDialog::spacingHint());
l4->addWidget(box); l4->addWidget(box);
l4->addWidget(box2); l4->addWidget(box2);
@ -105,20 +105,20 @@ KMConfigFonts::KMConfigFonts(TQWidget *parent, const char *name)
void KMConfigFonts::loadConfig(KConfig *) void KMConfigFonts::loadConfig(KConfig *)
{ {
QSettings settings; TQSettings settings;
m_embedfonts->setChecked(settings.readBoolEntry("/qt/embedFonts", true)); m_embedfonts->setChecked(settings.readBoolEntry("/qt/embedFonts", true));
QStringList paths = settings.readListEntry("/qt/fontPath", ':'); TQStringList paths = settings.readListEntry("/qt/fontPath", ':');
QListViewItem *item(0); TQListViewItem *item(0);
for (TQStringList::ConstIterator it=paths.begin(); it!=paths.end(); ++it) for (TQStringList::ConstIterator it=paths.begin(); it!=paths.end(); ++it)
item = new TQListViewItem(m_fontpath, item, *it); item = new TQListViewItem(m_fontpath, item, *it);
} }
void KMConfigFonts::saveConfig(KConfig *) void KMConfigFonts::saveConfig(KConfig *)
{ {
QSettings settings; TQSettings settings;
settings.writeEntry("/qt/embedFonts", m_embedfonts->isChecked()); settings.writeEntry("/qt/embedFonts", m_embedfonts->isChecked());
QStringList l; TQStringList l;
QListViewItem *item = m_fontpath->firstChild(); TQListViewItem *item = m_fontpath->firstChild();
while (item) while (item)
{ {
l << item->text(0); l << item->text(0);
@ -129,7 +129,7 @@ void KMConfigFonts::saveConfig(KConfig *)
void KMConfigFonts::slotSelected() void KMConfigFonts::slotSelected()
{ {
QListViewItem *item = m_fontpath->selectedItem(); TQListViewItem *item = m_fontpath->selectedItem();
m_remove->setEnabled(item); m_remove->setEnabled(item);
m_up->setEnabled(item && item->itemAbove()); m_up->setEnabled(item && item->itemAbove());
m_down->setEnabled(item && item->itemBelow()); m_down->setEnabled(item && item->itemBelow());
@ -139,10 +139,10 @@ void KMConfigFonts::slotAdd()
{ {
if (m_addpath->url().isEmpty()) if (m_addpath->url().isEmpty())
return; return;
QListViewItem *lastItem(m_fontpath->firstChild()); TQListViewItem *lastItem(m_fontpath->firstChild());
while (lastItem && lastItem->nextSibling()) while (lastItem && lastItem->nextSibling())
lastItem = lastItem->nextSibling(); lastItem = lastItem->nextSibling();
QListViewItem *item = new TQListViewItem(m_fontpath, lastItem, m_addpath->url()); TQListViewItem *item = new TQListViewItem(m_fontpath, lastItem, m_addpath->url());
m_fontpath->setSelected(item, true); m_fontpath->setSelected(item, true);
} }
@ -156,7 +156,7 @@ void KMConfigFonts::slotRemove()
void KMConfigFonts::slotUp() void KMConfigFonts::slotUp()
{ {
QListViewItem *citem = m_fontpath->selectedItem(), *nitem = 0; TQListViewItem *citem = m_fontpath->selectedItem(), *nitem = 0;
if (!citem || !citem->itemAbove()) if (!citem || !citem->itemAbove())
return; return;
nitem = new TQListViewItem(m_fontpath, citem->itemAbove()->itemAbove(), citem->text(0)); nitem = new TQListViewItem(m_fontpath, citem->itemAbove()->itemAbove(), citem->text(0));
@ -166,7 +166,7 @@ void KMConfigFonts::slotUp()
void KMConfigFonts::slotDown() void KMConfigFonts::slotDown()
{ {
QListViewItem *citem = m_fontpath->selectedItem(), *nitem = 0; TQListViewItem *citem = m_fontpath->selectedItem(), *nitem = 0;
if (!citem || !citem->itemBelow()) if (!citem || !citem->itemBelow())
return; return;
nitem = new TQListViewItem(m_fontpath, citem->itemBelow(), citem->text(0)); nitem = new TQListViewItem(m_fontpath, citem->itemBelow(), citem->text(0));

@ -45,10 +45,10 @@ protected slots:
void slotTextChanged(const TQString&); void slotTextChanged(const TQString&);
private: private:
QCheckBox *m_embedfonts; TQCheckBox *m_embedfonts;
KListView *m_fontpath; KListView *m_fontpath;
KURLRequester *m_addpath; KURLRequester *m_addpath;
QPushButton *m_up, *m_down, *m_add, *m_remove; TQPushButton *m_up, *m_down, *m_add, *m_remove;
}; };
#endif #endif

@ -45,7 +45,7 @@ KMConfigGeneral::KMConfigGeneral(TQWidget *parent)
setPageHeader(i18n("General Settings")); setPageHeader(i18n("General Settings"));
setPagePixmap("fileprint"); setPagePixmap("fileprint");
QGroupBox *m_timerbox = new TQGroupBox(0, Qt::Vertical, i18n("Refresh Interval"), this); TQGroupBox *m_timerbox = new TQGroupBox(0, Qt::Vertical, i18n("Refresh Interval"), this);
m_timer = new KIntNumInput(m_timerbox,"Timer"); m_timer = new KIntNumInput(m_timerbox,"Timer");
m_timer->setRange(0,30); m_timer->setRange(0,30);
m_timer->setSuffix( i18n( " sec" ) ); m_timer->setSuffix( i18n( " sec" ) );
@ -54,7 +54,7 @@ KMConfigGeneral::KMConfigGeneral(TQWidget *parent)
"<b>KDE Print</b> components like the print manager " "<b>KDE Print</b> components like the print manager "
"and the job viewer.")); "and the job viewer."));
QGroupBox *m_testpagebox = new TQGroupBox(0, Qt::Vertical, i18n("Test Page"), this); TQGroupBox *m_testpagebox = new TQGroupBox(0, Qt::Vertical, i18n("Test Page"), this);
m_defaulttestpage = new TQCheckBox(i18n("&Specify personal test page"), m_testpagebox, "TestPageCheck"); m_defaulttestpage = new TQCheckBox(i18n("&Specify personal test page"), m_testpagebox, "TestPageCheck");
m_testpage = new KURLRequester(m_testpagebox,"TestPage"); m_testpage = new KURLRequester(m_testpagebox,"TestPage");
m_preview = new KPushButton(KGuiItem(i18n("Preview..."), "filefind"), m_testpagebox); m_preview = new KPushButton(KGuiItem(i18n("Preview..."), "filefind"), m_testpagebox);
@ -66,28 +66,28 @@ KMConfigGeneral::KMConfigGeneral(TQWidget *parent)
m_preview->setDisabled(true); m_preview->setDisabled(true);
m_defaulttestpage->setCursor(KCursor::handCursor()); m_defaulttestpage->setCursor(KCursor::handCursor());
QGroupBox *m_statusbox = new TQGroupBox(0, Qt::Vertical, i18n("Miscellaneous"), this); TQGroupBox *m_statusbox = new TQGroupBox(0, Qt::Vertical, i18n("Miscellaneous"), this);
m_statusmsg = new TQCheckBox(i18n("Sho&w printing status message box"), m_statusbox); m_statusmsg = new TQCheckBox(i18n("Sho&w printing status message box"), m_statusbox);
m_uselast = new TQCheckBox(i18n("De&faults to the last printer used in the application"), m_statusbox); m_uselast = new TQCheckBox(i18n("De&faults to the last printer used in the application"), m_statusbox);
//layout //layout
QVBoxLayout *lay0 = new TQVBoxLayout(this, 0, KDialog::spacingHint()); TQVBoxLayout *lay0 = new TQVBoxLayout(this, 0, KDialog::spacingHint());
lay0->addWidget(m_timerbox); lay0->addWidget(m_timerbox);
lay0->addWidget(m_testpagebox); lay0->addWidget(m_testpagebox);
lay0->addWidget(m_statusbox); lay0->addWidget(m_statusbox);
lay0->addStretch(1); lay0->addStretch(1);
QVBoxLayout *lay1 = new TQVBoxLayout(m_timerbox->layout(), TQVBoxLayout *lay1 = new TQVBoxLayout(TQT_TQLAYOUT(m_timerbox->layout()),
KDialog::spacingHint()); KDialog::spacingHint());
lay1->addWidget(m_timer); lay1->addWidget(m_timer);
QVBoxLayout *lay2 = new TQVBoxLayout(m_testpagebox->layout(), TQVBoxLayout *lay2 = new TQVBoxLayout(TQT_TQLAYOUT(m_testpagebox->layout()),
KDialog::spacingHint()); KDialog::spacingHint());
QHBoxLayout *lay3 = new TQHBoxLayout(0, 0, 0); TQHBoxLayout *lay3 = new TQHBoxLayout(0, 0, 0);
lay2->addWidget(m_defaulttestpage); lay2->addWidget(m_defaulttestpage);
lay2->addWidget(m_testpage); lay2->addWidget(m_testpage);
lay2->addLayout(lay3); lay2->addLayout(lay3);
lay3->addStretch(1); lay3->addStretch(1);
lay3->addWidget(m_preview); lay3->addWidget(m_preview);
QVBoxLayout *lay4 = new TQVBoxLayout(m_statusbox->layout(), TQVBoxLayout *lay4 = new TQVBoxLayout(TQT_TQLAYOUT(m_statusbox->layout()),
KDialog::spacingHint()); KDialog::spacingHint());
lay4->addWidget(m_statusmsg); lay4->addWidget(m_statusmsg);
lay4->addWidget(m_uselast); lay4->addWidget(m_uselast);
@ -108,7 +108,7 @@ void KMConfigGeneral::loadConfig(KConfig *conf)
{ {
conf->setGroup("General"); conf->setGroup("General");
m_timer->setValue(conf->readNumEntry("TimerDelay",5)); m_timer->setValue(conf->readNumEntry("TimerDelay",5));
QString tpage = conf->readPathEntry("TestPage"); TQString tpage = conf->readPathEntry("TestPage");
if (!tpage.isEmpty()) if (!tpage.isEmpty())
{ {
m_defaulttestpage->setChecked(true); m_defaulttestpage->setChecked(true);
@ -132,7 +132,7 @@ void KMConfigGeneral::saveConfig(KConfig *conf)
void KMConfigGeneral::slotTestPagePreview() void KMConfigGeneral::slotTestPagePreview()
{ {
QString tpage = m_testpage->url(); TQString tpage = m_testpage->url();
if (tpage.isEmpty()) if (tpage.isEmpty())
KMessageBox::error(this, i18n("Empty file name.")); KMessageBox::error(this, i18n("Empty file name."));
else else

@ -42,9 +42,9 @@ protected slots:
private: private:
KIntNumInput *m_timer; KIntNumInput *m_timer;
KURLRequester *m_testpage; KURLRequester *m_testpage;
QCheckBox *m_defaulttestpage; TQCheckBox *m_defaulttestpage;
QPushButton *m_preview; TQPushButton *m_preview;
QCheckBox *m_statusmsg, *m_uselast; TQCheckBox *m_statusmsg, *m_uselast;
}; };
#endif #endif

@ -34,17 +34,17 @@ KMConfigJobs::KMConfigJobs(TQWidget *parent, const char *name)
setPageHeader(i18n("Print Job Settings")); setPageHeader(i18n("Print Job Settings"));
setPagePixmap("exec"); setPagePixmap("exec");
QGroupBox *box = new TQGroupBox(0, Qt::Vertical, i18n("Jobs Shown"), this); TQGroupBox *box = new TQGroupBox(0, Qt::Vertical, i18n("Jobs Shown"), this);
m_limit = new KIntNumInput(box); m_limit = new KIntNumInput(box);
m_limit->setRange(0, 9999, 1, true); m_limit->setRange(0, 9999, 1, true);
m_limit->setSpecialValueText(i18n("Unlimited")); m_limit->setSpecialValueText(i18n("Unlimited"));
m_limit->setLabel(i18n("Maximum number of jobs shown:")); m_limit->setLabel(i18n("Maximum number of jobs shown:"));
QVBoxLayout *l0 = new TQVBoxLayout(this, 0, KDialog::spacingHint()); TQVBoxLayout *l0 = new TQVBoxLayout(this, 0, KDialog::spacingHint());
l0->addWidget(box, 0); l0->addWidget(box, 0);
l0->addStretch(1); l0->addStretch(1);
QVBoxLayout *l1 = new TQVBoxLayout(box->layout(), KDialog::spacingHint()); TQVBoxLayout *l1 = new TQVBoxLayout(TQT_TQLAYOUT(box->layout()), KDialog::spacingHint());
l1->addWidget(m_limit); l1->addWidget(m_limit);
} }

@ -40,17 +40,17 @@ KMConfigPreview::KMConfigPreview(TQWidget *parent, const char *name)
m_useext = new TQCheckBox(i18n("&Use external preview program"), box); m_useext = new TQCheckBox(i18n("&Use external preview program"), box);
m_program = new KURLRequester(box); m_program = new KURLRequester(box);
QLabel *lab = new TQLabel(box); TQLabel *lab = new TQLabel(box);
lab->setText(i18n("You can use an external preview program (PS viewer) instead of the " lab->setText(i18n("You can use an external preview program (PS viewer) instead of the "
"KDE built-in preview system. Note that if the KDE default PS viewer " "KDE built-in preview system. Note that if the KDE default PS viewer "
"(KGhostView) cannot be found, KDE tries automatically to find another " "(KGhostView) cannot be found, KDE tries automatically to find another "
"external PostScript viewer")); "external PostScript viewer"));
lab->setTextFormat(Qt::RichText); lab->setTextFormat(TQt::RichText);
QVBoxLayout *l0 = new TQVBoxLayout(this, 0, KDialog::spacingHint()); TQVBoxLayout *l0 = new TQVBoxLayout(this, 0, KDialog::spacingHint());
l0->addWidget(box); l0->addWidget(box);
l0->addStretch(1); l0->addStretch(1);
QVBoxLayout *l1 = new TQVBoxLayout(box->layout(), KDialog::spacingHint()); TQVBoxLayout *l1 = new TQVBoxLayout(TQT_TQLAYOUT(box->layout()), KDialog::spacingHint());
l1->addWidget(lab); l1->addWidget(lab);
l1->addWidget(m_useext); l1->addWidget(m_useext);
l1->addWidget(m_program); l1->addWidget(m_program);

@ -34,7 +34,7 @@ public:
void saveConfig(KConfig*); void saveConfig(KConfig*);
private: private:
QCheckBox *m_useext; TQCheckBox *m_useext;
KURLRequester *m_program; KURLRequester *m_program;
}; };

@ -54,18 +54,18 @@ bool KMDBCreator::checkDriverDB(const TQString& dirname, const TQDateTime& d)
kapp->processEvents(); kapp->processEvents();
// first check current directory // first check current directory
QFileInfo dfi(dirname); TQFileInfo dfi(dirname);
if (dfi.lastModified() > d) if (dfi.lastModified() > d)
return false; return false;
// then check most recent file in current directory // then check most recent file in current directory
QDir dir(dirname); TQDir dir(dirname);
const QFileInfoList *list = dir.entryInfoList(TQDir::Files,TQDir::Time); const TQFileInfoList *list = dir.entryInfoList(TQDir::Files,TQDir::Time);
if (list && list->count() > 0 && list->getFirst()->lastModified() > d) if (list && list->count() > 0 && list->getFirst()->lastModified() > d)
return false; return false;
// then loop into subdirs // then loop into subdirs
QStringList slist = dir.entryList(TQDir::Dirs,TQDir::Time); TQStringList slist = dir.entryList(TQDir::Dirs,TQDir::Time);
for (TQStringList::ConstIterator it=slist.begin(); it!=slist.end(); ++it) for (TQStringList::ConstIterator it=slist.begin(); it!=slist.end(); ++it)
if ((*it) != "." && (*it) != ".." && !checkDriverDB(dir.absFilePath(*it),d)) if ((*it) != "." && (*it) != ".." && !checkDriverDB(dir.absFilePath(*it),d))
return false; return false;
@ -84,10 +84,10 @@ bool KMDBCreator::createDriverDB(const TQString& dirname, const TQString& filena
// start the child process // start the child process
m_proc.clearArguments(); m_proc.clearArguments();
QString exestr = KMFactory::self()->manager()->driverDbCreationProgram(); TQString exestr = KMFactory::self()->manager()->driverDbCreationProgram();
m_proc << exestr << dirname << filename; m_proc << exestr << dirname << filename;
kdDebug() << "executing : " << exestr << " " << dirname << " " << filename << endl; kdDebug() << "executing : " << exestr << " " << dirname << " " << filename << endl;
QString msg; TQString msg;
if (exestr.isEmpty()) if (exestr.isEmpty())
msg = i18n("No executable defined for the creation of the " msg = i18n("No executable defined for the creation of the "
"driver database. This operation is not implemented."); "driver database. This operation is not implemented.");
@ -127,7 +127,7 @@ bool KMDBCreator::createDriverDB(const TQString& dirname, const TQString& filena
void KMDBCreator::slotReceivedStdout(KProcess*, char *buf, int len) void KMDBCreator::slotReceivedStdout(KProcess*, char *buf, int len)
{ {
// save buffer // save buffer
QString str( TQCString(buf, len) ); TQString str( TQCString(buf, len) );
// get the number, cut the string at the first '\n' otherwise // get the number, cut the string at the first '\n' otherwise
// the toInt() will return 0. If that occurs for the first number, // the toInt() will return 0. If that occurs for the first number,

@ -50,7 +50,7 @@ signals:
private: private:
KProcess m_proc; KProcess m_proc;
QProgressDialog *m_dlg; TQProgressDialog *m_dlg;
bool m_status; bool m_status;
bool m_firstflag; bool m_firstflag;
}; };

@ -60,15 +60,15 @@ KMDriverDB::~KMDriverDB()
TQString KMDriverDB::dbFile() TQString KMDriverDB::dbFile()
{ {
// this calls insure missing directories creation // this calls insure missing directories creation
QString filename = locateLocal("data",TQString::tqfromLatin1("kdeprint/printerdb_%1.txt").arg(KMFactory::self()->printSystem())); TQString filename = locateLocal("data",TQString::tqfromLatin1("kdeprint/printerdb_%1.txt").arg(KMFactory::self()->printSystem()));
return filename; return filename;
} }
void KMDriverDB::init(TQWidget *parent) void KMDriverDB::init(TQWidget *parent)
{ {
QFileInfo dbfi(dbFile()); TQFileInfo dbfi(dbFile());
QString dirname = KMFactory::self()->manager()->driverDirectory(); TQString dirname = KMFactory::self()->manager()->driverDirectory();
QStringList dbDirs = TQStringList::split(':', dirname, false); TQStringList dbDirs = TQStringList::split(':', dirname, false);
bool createflag(false); bool createflag(false);
for (TQStringList::ConstIterator it=dbDirs.begin(); it!=dbDirs.end() && !createflag; ++it) for (TQStringList::ConstIterator it=dbDirs.begin(); it!=dbDirs.end() && !createflag; ++it)
@ -112,7 +112,7 @@ KMDBEntryList* KMDriverDB::findEntry(const TQString& manu, const TQString& model
{ {
TQDict<KMDBEntryList> *models = m_entries.tqfind(manu); TQDict<KMDBEntryList> *models = m_entries.tqfind(manu);
if (models) if (models)
return models->find(model); return models->tqfind(model);
return 0; return 0;
} }
@ -120,7 +120,7 @@ KMDBEntryList* KMDriverDB::findPnpEntry(const TQString& manu, const TQString& mo
{ {
TQDict<KMDBEntryList> *models = m_pnpentries.tqfind(manu); TQDict<KMDBEntryList> *models = m_pnpentries.tqfind(manu);
if (models) if (models)
return models->find(model); return models->tqfind(model);
return 0; return 0;
} }
@ -147,7 +147,7 @@ void KMDriverDB::insertEntry(KMDBEntry *entry)
models->setAutoDelete(true); models->setAutoDelete(true);
m_entries.insert(entry->manufacturer,models); m_entries.insert(entry->manufacturer,models);
} }
KMDBEntryList *list = models->find(entry->model); KMDBEntryList *list = models->tqfind(entry->model);
if (!list) if (!list)
{ {
list = new KMDBEntryList; list = new KMDBEntryList;
@ -166,7 +166,7 @@ void KMDriverDB::insertEntry(KMDBEntry *entry)
models->setAutoDelete(true); models->setAutoDelete(true);
m_pnpentries.insert(entry->manufacturer,models); m_pnpentries.insert(entry->manufacturer,models);
} }
list = models->find(entry->model); list = models->tqfind(entry->model);
if (!list) if (!list)
{ {
list = new KMDBEntryList; list = new KMDBEntryList;
@ -196,12 +196,12 @@ void KMDriverDB::loadDbFile()
m_entries.clear(); m_entries.clear();
m_pnpentries.clear(); m_pnpentries.clear();
QFile f(dbFile()); TQFile f(dbFile());
if (f.exists() && f.open(IO_ReadOnly)) if (f.exists() && f.open(IO_ReadOnly))
{ {
QTextStream t(&f); TQTextStream t(&f);
QString line; TQString line;
QStringList words; TQStringList words;
KMDBEntry *entry(0); KMDBEntry *entry(0);
while (!t.eof()) while (!t.eof())

@ -53,16 +53,16 @@ KMDriverDbWidget::KMDriverDbWidget(TQWidget *parent, const char *name)
m_postscript->setCursor(KCursor::handCursor()); m_postscript->setCursor(KCursor::handCursor());
m_raw->setCursor(KCursor::handCursor()); m_raw->setCursor(KCursor::handCursor());
m_other = new KPushButton(KGuiItem(i18n("&Other..."), "fileopen"), this); m_other = new KPushButton(KGuiItem(i18n("&Other..."), "fileopen"), this);
QLabel *l1 = new TQLabel(i18n("&Manufacturer:"), this); TQLabel *l1 = new TQLabel(i18n("&Manufacturer:"), this);
QLabel *l2 = new TQLabel(i18n("Mo&del:"), this); TQLabel *l2 = new TQLabel(i18n("Mo&del:"), this);
l1->setBuddy(m_manu); l1->setBuddy(m_manu);
l2->setBuddy(m_model); l2->setBuddy(m_model);
// build layout // build layout
QVBoxLayout *main_ = new TQVBoxLayout(this, 0, 10); TQVBoxLayout *main_ = new TQVBoxLayout(this, 0, 10);
QGridLayout *sub1_ = new TQGridLayout(0, 2, 3, 0, 0); TQGridLayout *sub1_ = new TQGridLayout(0, 2, 3, 0, 0);
QHBoxLayout *sub2_ = new TQHBoxLayout(0, 0, 10); TQHBoxLayout *sub2_ = new TQHBoxLayout(0, 0, 10);
main_->addLayout(sub1_); main_->addLayout(TQT_TQLAYOUT(sub1_));
main_->addLayout(sub2_); main_->addLayout(sub2_);
main_->addWidget(m_raw); main_->addWidget(m_raw);
sub1_->addWidget(l1,0,0); sub1_->addWidget(l1,0,0);
@ -95,17 +95,17 @@ KMDriverDbWidget::~KMDriverDbWidget()
void KMDriverDbWidget::setDriver(const TQString& manu, const TQString& model) void KMDriverDbWidget::setDriver(const TQString& manu, const TQString& model)
{ {
QListBoxItem *item = m_manu->findItem(manu); TQListBoxItem *item = m_manu->tqfindItem(manu);
QString model_(model); TQString model_(model);
if (item) if (item)
{ {
m_manu->setCurrentItem(item); m_manu->setCurrentItem(item);
item = m_model->findItem(model_); item = m_model->tqfindItem(model_);
if (!item) if (!item)
// try by stripping the manufacturer name from // try by stripping the manufacturer name from
// the beginning of the model string. This is // the beginning of the model string. This is
// often the case with PPD files // often the case with PPD files
item = m_model->findItem(model_.replace(0,manu.length()+1,TQString::tqfromLatin1(""))); item = m_model->tqfindItem(model_.replace(0,manu.length()+1,TQString::tqfromLatin1("")));
if (item) if (item)
m_model->setCurrentItem(item); m_model->setCurrentItem(item);
} }
@ -189,7 +189,7 @@ void KMDriverDbWidget::slotManufacturerSelected(const TQString& name)
TQDict<KMDBEntryList> *models = KMDriverDB::self()->findModels(name); TQDict<KMDBEntryList> *models = KMDriverDB::self()->findModels(name);
if (models) if (models)
{ {
QStrIList ilist(true); TQStrIList ilist(true);
TQDictIterator<KMDBEntryList> it(*models); TQDictIterator<KMDBEntryList> it(*models);
for (;it.current();++it) for (;it.current();++it)
ilist.append(it.currentKey().latin1()); ilist.append(it.currentKey().latin1());
@ -203,11 +203,11 @@ void KMDriverDbWidget::slotPostscriptToggled(bool on)
{ {
if (on) if (on)
{ {
QListBoxItem *item = m_manu->findItem("GENERIC"); TQListBoxItem *item = m_manu->tqfindItem("GENERIC");
if (item) if (item)
{ {
m_manu->setCurrentItem(item); m_manu->setCurrentItem(item);
item = m_model->findItem( "POSTSCRIPT PRINTER" ); item = m_model->tqfindItem( "POSTSCRIPT PRINTER" );
if ( item ) if ( item )
{ {
m_model->setCurrentItem( item ); m_model->setCurrentItem( item );
@ -243,7 +243,7 @@ void KMDriverDbWidget::slotOtherClicked()
disconnect(m_manu,TQT_SIGNAL(highlighted(const TQString&)),this,TQT_SLOT(slotManufacturerSelected(const TQString&))); disconnect(m_manu,TQT_SIGNAL(highlighted(const TQString&)),this,TQT_SLOT(slotManufacturerSelected(const TQString&)));
m_manu->clear(); m_manu->clear();
m_model->clear(); m_model->clear();
QString s = driver->get("manufacturer"); TQString s = driver->get("manufacturer");
m_manu->insertItem((s.isEmpty() ? i18n("<Unknown>") : s)); m_manu->insertItem((s.isEmpty() ? i18n("<Unknown>") : s));
s = driver->get("model"); s = driver->get("model");
m_model->insertItem((s.isEmpty() ? i18n("<Unknown>") : s)); m_model->insertItem((s.isEmpty() ? i18n("<Unknown>") : s));

@ -55,13 +55,13 @@ protected slots:
void slotError(const TQString&); void slotError(const TQString&);
private: private:
QListBox *m_manu; TQListBox *m_manu;
QListBox *m_model; TQListBox *m_model;
QCheckBox *m_postscript; TQCheckBox *m_postscript;
QCheckBox *m_raw; TQCheckBox *m_raw;
QPushButton *m_other; TQPushButton *m_other;
QString m_external; TQString m_external;
QString m_desc; TQString m_desc;
bool m_valid; bool m_valid;
}; };

@ -29,7 +29,7 @@ KMIconViewItem::KMIconViewItem(TQIconView *parent, KMPrinter *p)
{ {
m_state = 0; m_state = 0;
m_mode = parent->itemTextPos(); m_mode = parent->itemTextPos();
m_pixmap = TQString::null; m_pixmap = TQString();
m_isclass = false; m_isclass = false;
updatePrinter(p, m_mode); updatePrinter(p, m_mode);
} }

@ -41,23 +41,23 @@ KMInfoPage::KMInfoPage(TQWidget *parent, const char *name)
m_model = new TQLabel(this); m_model = new TQLabel(this);
m_uri = new TQLabel(this); m_uri = new TQLabel(this);
m_device = new TQLabel(this); m_device = new TQLabel(this);
QLabel *m_loclabel = new TQLabel(i18n("Physical Location", "Location:"), this); TQLabel *m_loclabel = new TQLabel(i18n("Physical Location", "Location:"), this);
m_loclabel->tqsetAlignment(Qt::AlignRight|Qt::AlignVCenter); m_loclabel->tqsetAlignment(Qt::AlignRight|Qt::AlignVCenter);
QLabel *m_desclabel = new TQLabel(i18n("Description:"), this); TQLabel *m_desclabel = new TQLabel(i18n("Description:"), this);
m_desclabel->tqsetAlignment(Qt::AlignRight|Qt::AlignVCenter); m_desclabel->tqsetAlignment(Qt::AlignRight|Qt::AlignVCenter);
QLabel *m_typelabel = new TQLabel(i18n("Type:"), this); TQLabel *m_typelabel = new TQLabel(i18n("Type:"), this);
m_typelabel->tqsetAlignment(Qt::AlignRight|Qt::AlignVCenter); m_typelabel->tqsetAlignment(Qt::AlignRight|Qt::AlignVCenter);
QLabel *m_statelabel = new TQLabel(i18n("Status", "State:"), this); TQLabel *m_statelabel = new TQLabel(i18n("Status", "State:"), this);
m_statelabel->tqsetAlignment(Qt::AlignRight|Qt::AlignVCenter); m_statelabel->tqsetAlignment(Qt::AlignRight|Qt::AlignVCenter);
QLabel *m_urilabel = new TQLabel(i18n("URI:"), this); TQLabel *m_urilabel = new TQLabel(i18n("URI:"), this);
m_urilabel->tqsetAlignment(Qt::AlignRight|Qt::AlignVCenter); m_urilabel->tqsetAlignment(Qt::AlignRight|Qt::AlignVCenter);
m_devlabel = new TQLabel(i18n("Device:"), this); m_devlabel = new TQLabel(i18n("Device:"), this);
m_devlabel->tqsetAlignment(Qt::AlignRight|Qt::AlignVCenter); m_devlabel->tqsetAlignment(Qt::AlignRight|Qt::AlignVCenter);
QLabel *m_modellabel = new TQLabel(i18n("Model:"), this); TQLabel *m_modellabel = new TQLabel(i18n("Model:"), this);
m_modellabel->tqsetAlignment(Qt::AlignRight|Qt::AlignVCenter); m_modellabel->tqsetAlignment(Qt::AlignRight|Qt::AlignVCenter);
QGridLayout *lay0 = new TQGridLayout(this, 11, 2, 0, 5); TQGridLayout *lay0 = new TQGridLayout(this, 11, 2, 0, 5);
QHBoxLayout *lay1 = new TQHBoxLayout(0, 0, 10); TQHBoxLayout *lay1 = new TQHBoxLayout(0, 0, 10);
lay0->addRowSpacing(7,20); lay0->addRowSpacing(7,20);
lay0->setRowStretch(7,0); lay0->setRowStretch(7,0);
lay0->setRowStretch(10,1); lay0->setRowStretch(10,1);

@ -34,9 +34,9 @@ public:
void setPrinter(KMPrinter *p); void setPrinter(KMPrinter *p);
protected: protected:
QLabel *m_title, *m_titlepixmap; TQLabel *m_title, *m_titlepixmap;
QLabel *m_location, *m_description, *m_uri, *m_model, *m_type, *m_state, *m_device; TQLabel *m_location, *m_description, *m_uri, *m_model, *m_type, *m_state, *m_device;
QLabel *m_devlabel; TQLabel *m_devlabel;
}; };
#endif #endif

@ -46,9 +46,9 @@ KMInstancePage::KMInstancePage(TQWidget *parent, const char *name)
initActions(); initActions();
QHBoxLayout *main_ = new TQHBoxLayout(this, 0, 0); TQHBoxLayout *main_ = new TQHBoxLayout(this, 0, 0);
main_->addWidget(m_view); main_->addWidget(m_view);
QVBoxLayout *sub_ = new TQVBoxLayout(0, 0, 0); TQVBoxLayout *sub_ = new TQVBoxLayout(0, 0, 0);
main_->addLayout(sub_); main_->addLayout(sub_);
for (TQValueList<TQButton*>::Iterator it=m_buttons.begin(); it!=m_buttons.end(); ++it) for (TQValueList<TQButton*>::Iterator it=m_buttons.begin(); it!=m_buttons.end(); ++it)
if (*it) if (*it)
@ -74,7 +74,7 @@ KMInstancePage::~KMInstancePage()
void KMInstancePage::addButton(const TQString& txt, const TQString& pixmap, const char *receiver) void KMInstancePage::addButton(const TQString& txt, const TQString& pixmap, const char *receiver)
{ {
QPushButton *btn = new TQPushButton(this, 0L); TQPushButton *btn = new TQPushButton(this, 0L);
btn->setText(txt); btn->setText(txt);
btn->setIconSet(BarIconSet(pixmap)); btn->setIconSet(BarIconSet(pixmap));
btn->setFlat(true); btn->setFlat(true);
@ -96,7 +96,7 @@ void KMInstancePage::initActions()
void KMInstancePage::setPrinter(KMPrinter *p) void KMInstancePage::setPrinter(KMPrinter *p)
{ {
QString oldText = m_view->currentText(); TQString oldText = m_view->currentText();
m_view->clear(); m_view->clear();
m_printer = p; m_printer = p;
@ -109,7 +109,7 @@ void KMInstancePage::setPrinter(KMPrinter *p)
TQPtrListIterator<KMPrinter> it(list); TQPtrListIterator<KMPrinter> it(list);
for (;it.current();++it) for (;it.current();++it)
{ {
QStringList pair = TQStringList::split('/',it.current()->name(),false); TQStringList pair = TQStringList::split('/',it.current()->name(),false);
m_view->insertItem(SmallIcon((it.current()->isSoftDefault() ? "exec" : "fileprint")),(pair.count() > 1 ? pair[1] : i18n("(Default)"))); m_view->insertItem(SmallIcon((it.current()->isSoftDefault() ? "exec" : "fileprint")),(pair.count() > 1 ? pair[1] : i18n("(Default)")));
} }
m_view->sort(); m_view->sort();
@ -121,9 +121,9 @@ void KMInstancePage::setPrinter(KMPrinter *p)
//iif (!oldText.isEmpty()) //iif (!oldText.isEmpty())
//{ //{
QListBoxItem *item = m_view->findItem(oldText); TQListBoxItem *item = m_view->tqfindItem(oldText);
if (!item) if (!item)
item = m_view->findItem(i18n("(Default)")); item = m_view->tqfindItem(i18n("(Default)"));
if (item) if (item)
m_view->setSelected(item,true); m_view->setSelected(item,true);
//} //}
@ -134,7 +134,7 @@ void KMInstancePage::slotNew()
KMTimer::self()->hold(); KMTimer::self()->hold();
bool ok(false); bool ok(false);
QString name = KInputDialog::getText(i18n("Instance Name"),i18n("Enter name for new instance (leave untouched for default):"), TQString name = KInputDialog::getText(i18n("Instance Name"),i18n("Enter name for new instance (leave untouched for default):"),
i18n("(Default)"),&ok,this); i18n("(Default)"),&ok,this);
if (ok) if (ok)
{ {
@ -143,7 +143,7 @@ void KMInstancePage::slotNew()
else else
{ {
if (name == i18n("(Default)")) if (name == i18n("(Default)"))
name = TQString::null; name = TQString();
KMFactory::self()->virtualManager()->create(m_printer,name); KMFactory::self()->virtualManager()->create(m_printer,name);
setPrinter(m_printer); setPrinter(m_printer);
} }
@ -157,12 +157,12 @@ void KMInstancePage::slotRemove()
KMTimer::self()->hold(); KMTimer::self()->hold();
bool reload(false); bool reload(false);
QString src = m_view->currentText(); TQString src = m_view->currentText();
TQString msg = (src != i18n("(Default)") ? i18n("Do you really want to remove instance %1?") : i18n("You can't remove the default instance. However all settings of %1 will be discarded. Continue?")); TQString msg = (src != i18n("(Default)") ? i18n("Do you really want to remove instance %1?") : i18n("You can't remove the default instance. However all settings of %1 will be discarded. Continue?"));
if (!src.isEmpty() && KMessageBox::warningContinueCancel(this,msg.arg(src),TQString::null,KStdGuiItem::del()) == KMessageBox::Continue) if (!src.isEmpty() && KMessageBox::warningContinueCancel(this,msg.arg(src),TQString(),KStdGuiItem::del()) == KMessageBox::Continue)
{ {
if (src == i18n("(Default)")) if (src == i18n("(Default)"))
src = TQString::null; src = TQString();
reload = KMFactory::self()->virtualManager()->isDefault(m_printer,src); reload = KMFactory::self()->virtualManager()->isDefault(m_printer,src);
KMFactory::self()->virtualManager()->remove(m_printer,src); KMFactory::self()->virtualManager()->remove(m_printer,src);
setPrinter(m_printer); setPrinter(m_printer);
@ -175,11 +175,11 @@ void KMInstancePage::slotCopy()
{ {
KMTimer::self()->hold(); KMTimer::self()->hold();
QString src = m_view->currentText(); TQString src = m_view->currentText();
if (!src.isEmpty()) if (!src.isEmpty())
{ {
bool ok(false); bool ok(false);
QString name = KInputDialog::getText(i18n("Instance Name"),i18n("Enter name for new instance (leave untouched for default):"), TQString name = KInputDialog::getText(i18n("Instance Name"),i18n("Enter name for new instance (leave untouched for default):"),
i18n("(Default)"),&ok,this); i18n("(Default)"),&ok,this);
if (ok) if (ok)
{ {
@ -188,9 +188,9 @@ void KMInstancePage::slotCopy()
else else
{ {
if (src == i18n("(Default)")) if (src == i18n("(Default)"))
src = TQString::null; src = TQString();
if (name == i18n("(Default)")) if (name == i18n("(Default)"))
name = TQString::null; name = TQString();
KMFactory::self()->virtualManager()->copy(m_printer,src,name); KMFactory::self()->virtualManager()->copy(m_printer,src,name);
setPrinter(m_printer); setPrinter(m_printer);
} }
@ -204,10 +204,10 @@ void KMInstancePage::slotSettings()
{ {
KMTimer::self()->hold(); KMTimer::self()->hold();
QString src = m_view->currentText(); TQString src = m_view->currentText();
if (!src.isEmpty()) if (!src.isEmpty())
{ {
if (src == i18n("(Default)")) src = TQString::null; if (src == i18n("(Default)")) src = TQString();
KMPrinter *pr = KMFactory::self()->virtualManager()->findInstance(m_printer,src); KMPrinter *pr = KMFactory::self()->virtualManager()->findInstance(m_printer,src);
if ( !pr ) if ( !pr )
KMessageBox::error( this, i18n( "Unable to find instance %1." ).arg( m_view->currentText() ) ); KMessageBox::error( this, i18n( "Unable to find instance %1." ).arg( m_view->currentText() ) );
@ -238,11 +238,11 @@ void KMInstancePage::slotDefault()
{ {
KMTimer::self()->hold(); KMTimer::self()->hold();
QString src = m_view->currentText(); TQString src = m_view->currentText();
if (!src.isEmpty()) if (!src.isEmpty())
{ {
if (src == i18n("(Default)")) if (src == i18n("(Default)"))
src = TQString::null; src = TQString();
KMFactory::self()->virtualManager()->setAsDefault(m_printer,src); KMFactory::self()->virtualManager()->setAsDefault(m_printer,src);
setPrinter(m_printer); setPrinter(m_printer);
} }
@ -254,15 +254,15 @@ void KMInstancePage::slotTest()
{ {
KMTimer::self()->hold(); KMTimer::self()->hold();
QString src = m_view->currentText(); TQString src = m_view->currentText();
if (!src.isEmpty()) if (!src.isEmpty())
{ {
if (src == i18n("(Default)")) if (src == i18n("(Default)"))
src = TQString::null; src = TQString();
KMPrinter *mpr = KMFactory::self()->virtualManager()->findInstance(m_printer,src); KMPrinter *mpr = KMFactory::self()->virtualManager()->findInstance(m_printer,src);
if (!mpr) if (!mpr)
KMessageBox::error(this,i18n("Internal error: printer not found.")); KMessageBox::error(this,i18n("Internal error: printer not found."));
else if (KMessageBox::warningContinueCancel(this, i18n("You are about to print a test page on %1. Do you want to continue?").arg(mpr->printerName()), TQString::null, i18n("Print Test Page"), "printTestPage") == KMessageBox::Continue) else if (KMessageBox::warningContinueCancel(this, i18n("You are about to print a test page on %1. Do you want to continue?").arg(mpr->printerName()), TQString(), i18n("Print Test Page"), "printTestPage") == KMessageBox::Continue)
{ {
if (!KMFactory::self()->virtualManager()->testInstance(mpr)) if (!KMFactory::self()->virtualManager()->testInstance(mpr))
KMessageBox::error(this, i18n("Unable to send test page to %1.").arg(mpr->printerName())); KMessageBox::error(this, i18n("Unable to send test page to %1.").arg(mpr->printerName()));

@ -145,7 +145,7 @@ void KMJobViewer::updateCaption()
if (!m_standalone) if (!m_standalone)
return; return;
QString pixname("fileprint"); TQString pixname("fileprint");
if (!m_prname.isEmpty()) if (!m_prname.isEmpty())
{ {
setCaption(i18n("Print Jobs for %1").arg(m_prname)); setCaption(i18n("Print Jobs for %1").arg(m_prname));
@ -259,10 +259,10 @@ void KMJobViewer::init()
void KMJobViewer::initActions() void KMJobViewer::initActions()
{ {
// job actions // job actions
KAction *hact = new KAction(i18n("&Hold"),"stop",0,this,TQT_SLOT(slotHold()),actionCollection(),"job_hold"); KAction *hact = new KAction(i18n("&Hold"),"stop",0,TQT_TQOBJECT(this),TQT_SLOT(slotHold()),actionCollection(),"job_hold");
KAction *ract = new KAction(i18n("&Resume"),"run",0,this,TQT_SLOT(slotResume()),actionCollection(),"job_resume"); KAction *ract = new KAction(i18n("&Resume"),"run",0,TQT_TQOBJECT(this),TQT_SLOT(slotResume()),actionCollection(),"job_resume");
KAction *dact = new KAction(i18n("Remo&ve"),"edittrash",Qt::Key_Delete,this,TQT_SLOT(slotRemove()),actionCollection(),"job_remove"); KAction *dact = new KAction(i18n("Remo&ve"),"edittrash",Qt::Key_Delete,TQT_TQOBJECT(this),TQT_SLOT(slotRemove()),actionCollection(),"job_remove");
KAction *sact = new KAction(i18n("Res&tart"),"redo",0,this,TQT_SLOT(slotRestart()),actionCollection(),"job_restart"); KAction *sact = new KAction(i18n("Res&tart"),"redo",0,TQT_TQOBJECT(this),TQT_SLOT(slotRestart()),actionCollection(),"job_restart");
KActionMenu *mact = new KActionMenu(i18n("&Move to Printer"),"fileprint",actionCollection(),"job_move"); KActionMenu *mact = new KActionMenu(i18n("&Move to Printer"),"fileprint",actionCollection(),"job_move");
mact->setDelayed(false); mact->setDelayed(false);
connect(mact->popupMenu(),TQT_SIGNAL(activated(int)),TQT_SLOT(slotMove(int))); connect(mact->popupMenu(),TQT_SIGNAL(activated(int)),TQT_SLOT(slotMove(int)));
@ -322,12 +322,12 @@ void KMJobViewer::initActions()
} }
else else
{// stand-alone application {// stand-alone application
KStdAction::quit(kapp,TQT_SLOT(quit()),actionCollection()); KStdAction::quit(TQT_TQOBJECT(kapp),TQT_SLOT(quit()),actionCollection());
KStdAction::close(this,TQT_SLOT(slotClose()),actionCollection()); KStdAction::close(TQT_TQOBJECT(this),TQT_SLOT(slotClose()),actionCollection());
KStdAction::preferences(this, TQT_SLOT(slotConfigure()), actionCollection()); KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(slotConfigure()), actionCollection());
// refresh action // refresh action
new KAction(i18n("Refresh"),"reload",0,this,TQT_SLOT(slotRefresh()),actionCollection(),"refresh"); new KAction(i18n("Refresh"),"reload",0,TQT_TQOBJECT(this),TQT_SLOT(slotRefresh()),actionCollection(),"refresh");
// create status bar // create status bar
KStatusBar *statusbar = statusBar(); KStatusBar *statusbar = statusBar();
@ -367,13 +367,13 @@ void KMJobViewer::buildPrinterMenu(TQPopupMenu *menu, bool use_all, bool use_spe
void KMJobViewer::slotShowMoveMenu() void KMJobViewer::slotShowMoveMenu()
{ {
QPopupMenu *menu = static_cast<KActionMenu*>(actionCollection()->action("job_move"))->popupMenu(); TQPopupMenu *menu = static_cast<KActionMenu*>(actionCollection()->action("job_move"))->popupMenu();
buildPrinterMenu(menu, false, false); buildPrinterMenu(menu, false, false);
} }
void KMJobViewer::slotShowPrinterMenu() void KMJobViewer::slotShowPrinterMenu()
{ {
QPopupMenu *menu = static_cast<KActionMenu*>(actionCollection()->action("filter_modify"))->popupMenu(); TQPopupMenu *menu = static_cast<KActionMenu*>(actionCollection()->action("filter_modify"))->popupMenu();
buildPrinterMenu(menu, true, true); buildPrinterMenu(menu, true, true);
} }
@ -540,7 +540,7 @@ void KMJobViewer::slotPrinterSelected(int prID)
{ {
if (prID >= 0 && prID < (int)(m_printers.count()+1)) if (prID >= 0 && prID < (int)(m_printers.count()+1))
{ {
QString prname = (prID == 0 ? i18n("All Printers") : m_printers.at(prID-1)->printerName()); TQString prname = (prID == 0 ? i18n("All Printers") : m_printers.at(prID-1)->printerName());
emit printerChanged(this, prname); emit printerChanged(this, prname);
} }
} }
@ -578,7 +578,7 @@ void KMJobViewer::slotClose()
void KMJobViewer::loadPluginActions() void KMJobViewer::loadPluginActions()
{ {
int mpopindex(7), toolbarindex(!m_standalone?7:8), menuindex(7); int mpopindex(7), toolbarindex(!m_standalone?7:8), menuindex(7);
QMenuData *menu(0); TQMenuData *menu(0);
if (m_standalone) if (m_standalone)
{ {
@ -586,7 +586,7 @@ void KMJobViewer::loadPluginActions()
KAction *act = actionCollection()->action("job_restart"); KAction *act = actionCollection()->action("job_restart");
for (int i=0;i<act->containerCount();i++) for (int i=0;i<act->containerCount();i++)
{ {
if (menuBar()->findItem(act->itemId(i), &menu)) if (menuBar()->tqfindItem(act->itemId(i), &menu))
{ {
menuindex = mpopindex = menu->indexOf(act->itemId(i))+1; menuindex = mpopindex = menu->indexOf(act->itemId(i))+1;
break; break;

@ -111,13 +111,13 @@ private:
KListView *m_view; KListView *m_view;
TQPtrList<KMJob> m_jobs; TQPtrList<KMJob> m_jobs;
TQPtrList<JobItem> m_items; TQPtrList<JobItem> m_items;
QPopupMenu *m_pop; TQPopupMenu *m_pop;
TQPtrList<KMPrinter> m_printers; TQPtrList<KMPrinter> m_printers;
QString m_prname; TQString m_prname;
int m_type; int m_type;
QString m_username; TQString m_username;
QLineEdit *m_userfield; TQLineEdit *m_userfield;
QCheckBox *m_stickybox; TQCheckBox *m_stickybox;
bool m_standalone; bool m_standalone;
}; };

@ -157,7 +157,7 @@ KMListViewItem* KMListView::findItem(KMPrinter *p)
if (isVirtual) if (isVirtual)
{ {
if (it.current()->depth() == 3 && it.current()->text(0) == p->instanceName() if (it.current()->depth() == 3 && it.current()->text(0) == p->instanceName()
&& it.current()->parent()->text(0) == p->printerName()) && it.current()->tqparent()->text(0) == p->printerName())
return it.current(); return it.current();
} }
else else

@ -100,7 +100,7 @@ KMMainView::KMMainView(TQWidget *parent, const char *name, KActionCollection *co
m_menubar->setMovingEnabled( false ); m_menubar->setMovingEnabled( false );
// layout // layout
QVBoxLayout *m_layout = new TQVBoxLayout(this, 0, 0); TQVBoxLayout *m_layout = new TQVBoxLayout(this, 0, 0);
m_layout->addWidget(m_toolbar); m_layout->addWidget(m_toolbar);
m_layout->addWidget( m_menubar ); m_layout->addWidget( m_menubar );
m_boxlayout = new TQBoxLayout(TQBoxLayout::TopToBottom, 0, 0); m_boxlayout = new TQBoxLayout(TQBoxLayout::TopToBottom, 0, 0);
@ -175,7 +175,7 @@ void KMMainView::saveSettings()
void KMMainView::initActions() void KMMainView::initActions()
{ {
KIconSelectAction *vact = new KIconSelectAction(i18n("&View"),0,m_actions,"view_change"); KIconSelectAction *vact = new KIconSelectAction(i18n("&View"),0,m_actions,"view_change");
QStringList iconlst; TQStringList iconlst;
iconlst << "view_icon" << "view_detailed" << "view_tree"; iconlst << "view_icon" << "view_detailed" << "view_tree";
vact->setItems(TQStringList::split(',',i18n("&Icons,&List,&Tree"),false), iconlst); vact->setItems(TQStringList::split(',',i18n("&Icons,&List,&Tree"),false), iconlst);
vact->setCurrentItem(0); vact->setCurrentItem(0);
@ -183,23 +183,23 @@ void KMMainView::initActions()
KActionMenu *stateAct = new KActionMenu(i18n("Start/Stop Printer"), "kdeprint_printstate", m_actions, "printer_state_change"); KActionMenu *stateAct = new KActionMenu(i18n("Start/Stop Printer"), "kdeprint_printstate", m_actions, "printer_state_change");
stateAct->setDelayed(false); stateAct->setDelayed(false);
stateAct->insert(new KAction(i18n("&Start Printer"),"kdeprint_enableprinter",0,this,TQT_SLOT(slotChangePrinterState()),m_actions,"printer_start")); stateAct->insert(new KAction(i18n("&Start Printer"),"kdeprint_enableprinter",0,TQT_TQOBJECT(this),TQT_SLOT(slotChangePrinterState()),m_actions,"printer_start"));
stateAct->insert(new KAction(i18n("Sto&p Printer"),"kdeprint_stopprinter",0,this,TQT_SLOT(slotChangePrinterState()),m_actions,"printer_stop")); stateAct->insert(new KAction(i18n("Sto&p Printer"),"kdeprint_stopprinter",0,TQT_TQOBJECT(this),TQT_SLOT(slotChangePrinterState()),m_actions,"printer_stop"));
stateAct = new KActionMenu(i18n("Enable/Disable Job Spooling"), "kdeprint_queuestate", m_actions, "printer_spool_change"); stateAct = new KActionMenu(i18n("Enable/Disable Job Spooling"), "kdeprint_queuestate", m_actions, "printer_spool_change");
stateAct->setDelayed(false); stateAct->setDelayed(false);
stateAct->insert(new KAction(i18n("&Enable Job Spooling"),"kdeprint_enableprinter",0,this,TQT_SLOT(slotChangePrinterState()),m_actions,"printer_enable")); stateAct->insert(new KAction(i18n("&Enable Job Spooling"),"kdeprint_enableprinter",0,TQT_TQOBJECT(this),TQT_SLOT(slotChangePrinterState()),m_actions,"printer_enable"));
stateAct->insert(new KAction(i18n("&Disable Job Spooling"),"kdeprint_stopprinter",0,this,TQT_SLOT(slotChangePrinterState()),m_actions,"printer_disable")); stateAct->insert(new KAction(i18n("&Disable Job Spooling"),"kdeprint_stopprinter",0,TQT_TQOBJECT(this),TQT_SLOT(slotChangePrinterState()),m_actions,"printer_disable"));
new KAction(i18n("&Remove"),"edittrash",0,this,TQT_SLOT(slotRemove()),m_actions,"printer_remove"); new KAction(i18n("&Remove"),"edittrash",0,TQT_TQOBJECT(this),TQT_SLOT(slotRemove()),m_actions,"printer_remove");
new KAction(i18n("&Configure..."),"configure",0,this,TQT_SLOT(slotConfigure()),m_actions,"printer_configure"); new KAction(i18n("&Configure..."),"configure",0,TQT_TQOBJECT(this),TQT_SLOT(slotConfigure()),m_actions,"printer_configure");
new KAction(i18n("Add &Printer/Class..."),"kdeprint_addprinter",0,this,TQT_SLOT(slotAdd()),m_actions,"printer_add"); new KAction(i18n("Add &Printer/Class..."),"kdeprint_addprinter",0,TQT_TQOBJECT(this),TQT_SLOT(slotAdd()),m_actions,"printer_add");
new KAction(i18n("Add &Special (pseudo) Printer..."),"kdeprint_addpseudo",0,this,TQT_SLOT(slotAddSpecial()),m_actions,"printer_add_special"); new KAction(i18n("Add &Special (pseudo) Printer..."),"kdeprint_addpseudo",0,TQT_TQOBJECT(this),TQT_SLOT(slotAddSpecial()),m_actions,"printer_add_special");
new KAction(i18n("Set as &Local Default"),"kdeprint_defaulthard",0,this,TQT_SLOT(slotHardDefault()),m_actions,"printer_hard_default"); new KAction(i18n("Set as &Local Default"),"kdeprint_defaulthard",0,TQT_TQOBJECT(this),TQT_SLOT(slotHardDefault()),m_actions,"printer_hard_default");
new KAction(i18n("Set as &User Default"),"kdeprint_defaultsoft",0,this,TQT_SLOT(slotSoftDefault()),m_actions,"printer_soft_default"); new KAction(i18n("Set as &User Default"),"kdeprint_defaultsoft",0,TQT_TQOBJECT(this),TQT_SLOT(slotSoftDefault()),m_actions,"printer_soft_default");
new KAction(i18n("&Test Printer..."),"kdeprint_testprinter",0,this,TQT_SLOT(slotTest()),m_actions,"printer_test"); new KAction(i18n("&Test Printer..."),"kdeprint_testprinter",0,TQT_TQOBJECT(this),TQT_SLOT(slotTest()),m_actions,"printer_test");
new KAction(i18n("Configure &Manager..."),"kdeprint_configmgr",0,this,TQT_SLOT(slotManagerConfigure()),m_actions,"manager_configure"); new KAction(i18n("Configure &Manager..."),"kdeprint_configmgr",0,TQT_TQOBJECT(this),TQT_SLOT(slotManagerConfigure()),m_actions,"manager_configure");
new KAction(i18n("Initialize Manager/&View"),"reload",0,this,TQT_SLOT(slotInit()),m_actions,"view_refresh"); new KAction(i18n("Initialize Manager/&View"),"reload",0,TQT_TQOBJECT(this),TQT_SLOT(slotInit()),m_actions,"view_refresh");
KIconSelectAction *dact = new KIconSelectAction(i18n("&Orientation"),0,m_actions,"orientation_change"); KIconSelectAction *dact = new KIconSelectAction(i18n("&Orientation"),0,m_actions,"orientation_change");
iconlst.clear(); iconlst.clear();
@ -208,9 +208,9 @@ void KMMainView::initActions()
dact->setCurrentItem(0); dact->setCurrentItem(0);
connect(dact,TQT_SIGNAL(activated(int)),TQT_SLOT(slotChangeDirection(int))); connect(dact,TQT_SIGNAL(activated(int)),TQT_SLOT(slotChangeDirection(int)));
new KAction(i18n("R&estart Server"),"kdeprint_restartsrv",0,this,TQT_SLOT(slotServerRestart()),m_actions,"server_restart"); new KAction(i18n("R&estart Server"),"kdeprint_restartsrv",0,TQT_TQOBJECT(this),TQT_SLOT(slotServerRestart()),m_actions,"server_restart");
new KAction(i18n("Configure &Server..."),"kdeprint_configsrv",0,this,TQT_SLOT(slotServerConfigure()),m_actions,"server_configure"); new KAction(i18n("Configure &Server..."),"kdeprint_configsrv",0,TQT_TQOBJECT(this),TQT_SLOT(slotServerConfigure()),m_actions,"server_configure");
new KAction(i18n("Configure Server Access..."),"kdeprint_configsrv",0,this,TQT_SLOT(slotServerAccessConfigure()),m_actions,"server_access_configure"); new KAction(i18n("Configure Server Access..."),"kdeprint_configsrv",0,TQT_TQOBJECT(this),TQT_SLOT(slotServerAccessConfigure()),m_actions,"server_access_configure");
KToggleAction *tact = new KToggleAction(i18n("Show &Toolbar"),0,m_actions,"view_toolbar"); KToggleAction *tact = new KToggleAction(i18n("Show &Toolbar"),0,m_actions,"view_toolbar");
tact->setCheckedState(i18n("Hide &Toolbar")); tact->setCheckedState(i18n("Hide &Toolbar"));
@ -227,13 +227,13 @@ void KMMainView::initActions()
tact->setChecked(KMManager::self()->isFilterEnabled()); tact->setChecked(KMManager::self()->isFilterEnabled());
connect(tact, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotToggleFilter(bool))); connect(tact, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotToggleFilter(bool)));
new KAction( i18n( "%1 &Handbook" ).arg( "KDEPrint" ), "contents", 0, this, TQT_SLOT( slotHelp() ), m_actions, "invoke_help" ); new KAction( i18n( "%1 &Handbook" ).arg( "KDEPrint" ), "contents", 0, TQT_TQOBJECT(this), TQT_SLOT( slotHelp() ), m_actions, "invoke_help" );
new KAction( i18n( "%1 &Web Site" ).arg( "KDEPrint" ), "network", 0, this, TQT_SLOT( slotHelp() ), m_actions, "invoke_web" ); new KAction( i18n( "%1 &Web Site" ).arg( "KDEPrint" ), "network", 0, TQT_TQOBJECT(this), TQT_SLOT( slotHelp() ), m_actions, "invoke_web" );
KActionMenu *mact = new KActionMenu(i18n("Pri&nter Tools"), "package_utilities", m_actions, "printer_tool"); KActionMenu *mact = new KActionMenu(i18n("Pri&nter Tools"), "package_utilities", m_actions, "printer_tool");
mact->setDelayed(false); mact->setDelayed(false);
connect(mact->popupMenu(), TQT_SIGNAL(activated(int)), TQT_SLOT(slotToolSelected(int))); connect(mact->popupMenu(), TQT_SIGNAL(activated(int)), TQT_SLOT(slotToolSelected(int)));
QStringList files = KGlobal::dirs()->findAllResources("data", "kdeprint/tools/*.desktop"); TQStringList files = KGlobal::dirs()->findAllResources("data", "kdeprint/tools/*.desktop");
for (TQStringList::ConstIterator it=files.begin(); it!=files.end(); ++it) for (TQStringList::ConstIterator it=files.begin(); it!=files.end(); ++it)
{ {
KSimpleConfig conf(*it); KSimpleConfig conf(*it);
@ -501,7 +501,7 @@ void KMMainView::slotRightButtonClicked(const TQString& prname, const TQPoint& p
void KMMainView::slotChangePrinterState() void KMMainView::slotChangePrinterState()
{ {
QString opname = sender()->name(); TQString opname = TQT_TQOBJECT_CONST(sender())->name();
if (m_current && opname.startsWith("printer_")) if (m_current && opname.startsWith("printer_"))
{ {
opname = opname.mid(8); opname = opname.mid(8);
@ -647,7 +647,7 @@ void KMMainView::slotTest()
void KMMainView::showErrorMsg(const TQString& msg, bool usemgr) void KMMainView::showErrorMsg(const TQString& msg, bool usemgr)
{ {
QString s(msg); TQString s(msg);
if (usemgr) if (usemgr)
{ {
s.prepend("<p>"); s.prepend("<p>");
@ -830,16 +830,16 @@ void KMMainView::slotToolSelected(int ID)
{ {
KMTimer::self()->hold(); KMTimer::self()->hold();
QString libname = m_toollist[ID]; TQString libname = m_toollist[ID];
libname.prepend("kdeprint_tool_"); libname.prepend("kdeprint_tool_");
if (m_current && !m_current->device().isEmpty() && !libname.isEmpty()) if (m_current && !m_current->device().isEmpty() && !libname.isEmpty())
{ {
KLibFactory *factory = KLibLoader::self()->factory(libname.local8Bit()); KLibFactory *factory = KLibLoader::self()->factory(libname.local8Bit());
if (factory) if (factory)
{ {
QStringList args; TQStringList args;
args << m_current->device() << m_current->printerName(); args << m_current->device() << m_current->printerName();
KDialogBase *dlg = static_cast<KDialogBase*>(factory->create(this, "Tool", 0, args)); KDialogBase *dlg = static_cast<KDialogBase*>(TQT_TQWIDGET(factory->create(TQT_TQOBJECT(this), "Tool", 0, args)));
if (dlg) if (dlg)
dlg->exec(); dlg->exec();
delete dlg; delete dlg;
@ -904,7 +904,7 @@ void KMMainView::reset( const TQString& msg, bool useDelay, bool holdTimer )
void KMMainView::slotHelp() void KMMainView::slotHelp()
{ {
TQString s = sender()->name(); TQString s = TQT_TQOBJECT_CONST(sender())->name();
if ( s == "invoke_help" ) if ( s == "invoke_help" )
kapp->invokeHelp( TQString::null, "kdeprint" ); kapp->invokeHelp( TQString::null, "kdeprint" );
else if ( s == "invoke_web" ) else if ( s == "invoke_web" )

@ -114,15 +114,15 @@ protected:
private: private:
KMPrinterView *m_printerview; KMPrinterView *m_printerview;
KMPages *m_printerpages; KMPages *m_printerpages;
QPopupMenu *m_pop; TQPopupMenu *m_pop;
KActionCollection *m_actions; KActionCollection *m_actions;
KMPrinter *m_current; KMPrinter *m_current;
KToolBar *m_toolbar; KToolBar *m_toolbar;
PluginComboBox *m_plugin; PluginComboBox *m_plugin;
int m_pactionsindex; int m_pactionsindex;
QStringList m_toollist; TQStringList m_toollist;
bool m_first; bool m_first;
QBoxLayout *m_boxlayout; TQBoxLayout *m_boxlayout;
class KMainWindowPrivate; class KMainWindowPrivate;
KMainWindowPrivate *d; KMainWindowPrivate *d;
KToolBar *m_menubar; KToolBar *m_menubar;

@ -36,7 +36,7 @@ KMPrinterView::KMPrinterView(TQWidget *parent, const char *name)
addWidget(m_iconview,0); addWidget(m_iconview,0);
m_listview = new KMListView(this); m_listview = new KMListView(this);
addWidget(m_listview,1); addWidget(m_listview,1);
m_current = TQString::null; m_current = TQString();
m_listset = false; m_listset = false;
connect(m_iconview,TQT_SIGNAL(rightButtonClicked(const TQString&,const TQPoint&)),TQT_SIGNAL(rightButtonClicked(const TQString&,const TQPoint&))); connect(m_iconview,TQT_SIGNAL(rightButtonClicked(const TQString&,const TQPoint&)),TQT_SIGNAL(rightButtonClicked(const TQString&,const TQPoint&)));

@ -31,11 +31,11 @@ KMPropBackend::KMPropBackend(TQWidget *parent, const char *name)
m_uri = new TQLabel("",this); m_uri = new TQLabel("",this);
m_type = new TQLabel("",this); m_type = new TQLabel("",this);
QLabel *l1 = new TQLabel(i18n("Printer type:"), this); TQLabel *l1 = new TQLabel(i18n("Printer type:"), this);
QLabel *l2 = new TQLabel(i18n("URI:"), this); TQLabel *l2 = new TQLabel(i18n("URI:"), this);
// layout // layout
QGridLayout *main_ = new TQGridLayout(this, 3, 2, 10, 7); TQGridLayout *main_ = new TQGridLayout(this, 3, 2, 10, 7);
main_->setColStretch(0,0); main_->setColStretch(0,0);
main_->setColStretch(1,1); main_->setColStretch(1,1);
main_->setRowStretch(2,1); main_->setRowStretch(2,1);
@ -58,7 +58,7 @@ void KMPropBackend::setPrinter(KMPrinter *p)
if (p && p->isPrinter()) if (p && p->isPrinter())
{ {
m_uri->setText(KURL(p->device()).prettyURL()); m_uri->setText(KURL(p->device()).prettyURL());
QString prot = p->deviceProtocol(); TQString prot = p->deviceProtocol();
if (prot == "ipp" || prot == "http") m_type->setText(i18n("IPP Printer")); if (prot == "ipp" || prot == "http") m_type->setText(i18n("IPP Printer"));
else if (prot == "usb") m_type->setText(i18n("Local USB Printer")); else if (prot == "usb") m_type->setText(i18n("Local USB Printer"));
else if (prot == "parallel") m_type->setText(i18n("Local Parallel Printer")); else if (prot == "parallel") m_type->setText(i18n("Local Parallel Printer"));

@ -38,8 +38,8 @@ protected:
void configureWizard(KMWizard*); void configureWizard(KMWizard*);
private: private:
QLabel *m_type; TQLabel *m_type;
QLabel *m_uri; TQLabel *m_uri;
}; };
#endif #endif

@ -35,8 +35,8 @@ KMPropContainer::KMPropContainer(TQWidget *parent, const char *name)
m_button = new KPushButton(KGuiItem(i18n("Change..."), "edit"), this); m_button = new KPushButton(KGuiItem(i18n("Change..."), "edit"), this);
m_widget = 0; m_widget = 0;
QVBoxLayout *main_ = new TQVBoxLayout(this, 0, 10); TQVBoxLayout *main_ = new TQVBoxLayout(this, 0, 10);
QHBoxLayout *btn_ = new TQHBoxLayout(0, 0, 0); TQHBoxLayout *btn_ = new TQHBoxLayout(0, 0, 0);
main_->addWidget(sep,0); main_->addWidget(sep,0);
main_->addLayout(btn_,0); main_->addLayout(btn_,0);
btn_->addStretch(1); btn_->addStretch(1);
@ -56,7 +56,7 @@ void KMPropContainer::setWidget(KMPropWidget *w)
connect(m_button,TQT_SIGNAL(clicked()),m_widget,TQT_SLOT(slotChange())); connect(m_button,TQT_SIGNAL(clicked()),m_widget,TQT_SLOT(slotChange()));
connect(m_widget,TQT_SIGNAL(enable(bool)),TQT_SIGNAL(enable(bool))); connect(m_widget,TQT_SIGNAL(enable(bool)),TQT_SIGNAL(enable(bool)));
connect(m_widget,TQT_SIGNAL(enableChange(bool)),TQT_SLOT(slotEnableChange(bool))); connect(m_widget,TQT_SIGNAL(enableChange(bool)),TQT_SLOT(slotEnableChange(bool)));
QVBoxLayout *lay = dynamic_cast<TQVBoxLayout*>(layout()); TQVBoxLayout *lay = dynamic_cast<TQVBoxLayout*>(layout());
if (lay) if (lay)
{ {
lay->insertWidget(0,m_widget,1); lay->insertWidget(0,m_widget,1);

@ -44,7 +44,7 @@ protected slots:
private: private:
KMPropWidget *m_widget; KMPropWidget *m_widget;
QPushButton *m_button; TQPushButton *m_button;
}; };
#endif #endif

@ -31,14 +31,14 @@ KMPropDriver::KMPropDriver(TQWidget *parent, const char *name)
m_manufacturer = new TQLabel("",this); m_manufacturer = new TQLabel("",this);
m_model = new TQLabel("",this); m_model = new TQLabel("",this);
m_driverinfo = new TQLabel("",this); m_driverinfo = new TQLabel("",this);
m_driverinfo->setTextFormat(Qt::RichText); m_driverinfo->setTextFormat(TQt::RichText);
QLabel *l1 = new TQLabel(i18n("Manufacturer:"), this); TQLabel *l1 = new TQLabel(i18n("Manufacturer:"), this);
QLabel *l2 = new TQLabel(i18n("Printer model:"), this); TQLabel *l2 = new TQLabel(i18n("Printer model:"), this);
QLabel *l3 = new TQLabel(i18n("Driver info:"), this); TQLabel *l3 = new TQLabel(i18n("Driver info:"), this);
// layout // layout
QGridLayout *main_ = new TQGridLayout(this, 4, 2, 10, 7); TQGridLayout *main_ = new TQGridLayout(this, 4, 2, 10, 7);
main_->setColStretch(0,0); main_->setColStretch(0,0);
main_->setColStretch(1,1); main_->setColStretch(1,1);
main_->setRowStretch(3,1); main_->setRowStretch(3,1);

@ -38,9 +38,9 @@ protected:
void configureWizard(KMWizard*); void configureWizard(KMWizard*);
private: private:
QLabel *m_manufacturer; TQLabel *m_manufacturer;
QLabel *m_model; TQLabel *m_model;
QLabel *m_driverinfo; TQLabel *m_driverinfo;
}; };
#endif #endif

@ -68,7 +68,7 @@ void KMPropertyPage::addPropPage(KMPropWidget *w)
void KMPropertyPage::slotEnable(bool on) void KMPropertyPage::slotEnable(bool on)
{ {
QWidget *w = (TQWidget*)(sender()); TQWidget *w = (TQWidget*)(sender());
if (on) if (on)
enablePage(w); enablePage(w);
else else

@ -34,12 +34,12 @@ KMPropGeneral::KMPropGeneral(TQWidget *parent, const char *name)
m_location = new TQLabel("",this); m_location = new TQLabel("",this);
m_description = new TQLabel("",this); m_description = new TQLabel("",this);
QLabel *l1 = new TQLabel(i18n("Printer name:"), this); TQLabel *l1 = new TQLabel(i18n("Printer name:"), this);
QLabel *l2 = new TQLabel(i18n("Physical Location", "Location:"), this); TQLabel *l2 = new TQLabel(i18n("Physical Location", "Location:"), this);
QLabel *l3 = new TQLabel(i18n("Description:"), this); TQLabel *l3 = new TQLabel(i18n("Description:"), this);
// layout // layout
QGridLayout *main_ = new TQGridLayout(this, 4, 2, 10, 7); TQGridLayout *main_ = new TQGridLayout(this, 4, 2, 10, 7);
main_->setColStretch(0,0); main_->setColStretch(0,0);
main_->setColStretch(1,1); main_->setColStretch(1,1);
main_->setRowStretch(3,1); main_->setRowStretch(3,1);

@ -36,9 +36,9 @@ protected:
void configureWizard(KMWizard*); void configureWizard(KMWizard*);
private: private:
QLabel *m_name; TQLabel *m_name;
QLabel *m_location; TQLabel *m_location;
QLabel *m_description; TQLabel *m_description;
}; };
#endif #endif

@ -32,7 +32,7 @@ KMPropMembers::KMPropMembers(TQWidget *parent, const char *name)
m_members->setPaper(tqcolorGroup().background()); m_members->setPaper(tqcolorGroup().background());
m_members->setFrameStyle(TQFrame::NoFrame); m_members->setFrameStyle(TQFrame::NoFrame);
QVBoxLayout *main_ = new TQVBoxLayout(this, 10, 0); TQVBoxLayout *main_ = new TQVBoxLayout(this, 10, 0);
main_->addWidget(m_members); main_->addWidget(m_members);
m_pixmap = "kdeprint_printer_class"; m_pixmap = "kdeprint_printer_class";
@ -48,8 +48,8 @@ void KMPropMembers::setPrinter(KMPrinter *p)
{ {
if (p && ((p->isClass(false) && p->isLocal()) || p->isImplicit())) if (p && ((p->isClass(false) && p->isLocal()) || p->isImplicit()))
{ {
QStringList l = p->members(); TQStringList l = p->members();
QString txt("<ul>"); TQString txt("<ul>");
for (TQStringList::ConstIterator it=l.begin(); it!=l.end(); ++it) for (TQStringList::ConstIterator it=l.begin(); it!=l.end(); ++it)
txt.append("<li>" + (*it) + "</li>"); txt.append("<li>" + (*it) + "</li>");
txt.append("</ul>"); txt.append("</ul>");

@ -36,7 +36,7 @@ protected:
void configureWizard(KMWizard*); void configureWizard(KMWizard*);
private: private:
QTextView *m_members; TQTextView *m_members;
}; };
#endif #endif

@ -45,7 +45,7 @@ KMSpecialPrinterDlg::KMSpecialPrinterDlg(TQWidget *parent, const char *name)
{ {
setCaption(i18n("Add Special Printer")); setCaption(i18n("Add Special Printer"));
QWidget *dummy = new TQWidget(this); TQWidget *dummy = new TQWidget(this);
setMainWidget(dummy); setMainWidget(dummy);
// widget creation // widget creation
@ -53,9 +53,9 @@ KMSpecialPrinterDlg::KMSpecialPrinterDlg(TQWidget *parent, const char *name)
connect(m_name, TQT_SIGNAL(textChanged ( const TQString & )),this,TQT_SLOT(slotTextChanged(const TQString & ))); connect(m_name, TQT_SIGNAL(textChanged ( const TQString & )),this,TQT_SLOT(slotTextChanged(const TQString & )));
m_description = new TQLineEdit(dummy); m_description = new TQLineEdit(dummy);
m_location = new TQLineEdit(dummy); m_location = new TQLineEdit(dummy);
QLabel *m_namelabel = new TQLabel(i18n("&Name:"), dummy); TQLabel *m_namelabel = new TQLabel(i18n("&Name:"), dummy);
QLabel *m_desclabel = new TQLabel(i18n("&Description:"), dummy); TQLabel *m_desclabel = new TQLabel(i18n("&Description:"), dummy);
QLabel *m_loclabel = new TQLabel(i18n("&Location:"), dummy); TQLabel *m_loclabel = new TQLabel(i18n("&Location:"), dummy);
m_namelabel->setBuddy(m_name); m_namelabel->setBuddy(m_name);
m_desclabel->setBuddy(m_description); m_desclabel->setBuddy(m_description);
m_loclabel->setBuddy(m_location); m_loclabel->setBuddy(m_location);
@ -63,7 +63,7 @@ KMSpecialPrinterDlg::KMSpecialPrinterDlg(TQWidget *parent, const char *name)
KSeparator* sep = new KSeparator( KSeparator::HLine, dummy); KSeparator* sep = new KSeparator( KSeparator::HLine, dummy);
sep->setFixedHeight(10); sep->setFixedHeight(10);
QGroupBox *m_gb = new TQGroupBox(1, Qt::Horizontal, i18n("Command &Settings"), dummy); TQGroupBox *m_gb = new TQGroupBox(1, Qt::Horizontal, i18n("Command &Settings"), dummy);
m_command = new KXmlCommandSelector(true, m_gb, "CommandSelector", this); m_command = new KXmlCommandSelector(true, m_gb, "CommandSelector", this);
TQGroupBox *m_outfile_gb = new TQGroupBox( 0, Qt::Horizontal, i18n( "Outp&ut File" ), dummy ); TQGroupBox *m_outfile_gb = new TQGroupBox( 0, Qt::Horizontal, i18n( "Outp&ut File" ), dummy );
@ -74,18 +74,18 @@ KMSpecialPrinterDlg::KMSpecialPrinterDlg(TQWidget *parent, const char *name)
KMimeType::List list = KMimeType::allMimeTypes(); KMimeType::List list = KMimeType::allMimeTypes();
for (TQValueList<KMimeType::Ptr>::ConstIterator it=list.begin(); it!=list.end(); ++it) for (TQValueList<KMimeType::Ptr>::ConstIterator it=list.begin(); it!=list.end(); ++it)
{ {
QString mimetype = (*it)->name(); TQString mimetype = (*it)->name();
m_mimelist << mimetype; m_mimelist << mimetype;
} }
m_mimelist.sort(); m_mimelist.sort();
m_mimetype->insertStringList(m_mimelist); m_mimetype->insertStringList(m_mimelist);
QLabel *m_mimetypelabel = new TQLabel(i18n("&Format:"), m_outfile_gb); TQLabel *m_mimetypelabel = new TQLabel(i18n("&Format:"), m_outfile_gb);
m_mimetypelabel->setBuddy (m_mimetype); m_mimetypelabel->setBuddy (m_mimetype);
m_extension = new TQLineEdit(m_outfile_gb); m_extension = new TQLineEdit(m_outfile_gb);
QLabel *m_extensionlabel = new TQLabel(i18n("Filename e&xtension:"), m_outfile_gb); TQLabel *m_extensionlabel = new TQLabel(i18n("Filename e&xtension:"), m_outfile_gb);
m_extensionlabel->setBuddy(m_extension); m_extensionlabel->setBuddy(m_extension);
m_icon = new KIconButton(dummy); m_icon = new KIconButton(dummy);
@ -123,9 +123,9 @@ KMSpecialPrinterDlg::KMSpecialPrinterDlg(TQWidget *parent, const char *name)
TQWhatsThis::add(m_extension, extensionWhatsThis); TQWhatsThis::add(m_extension, extensionWhatsThis);
// layout creation // layout creation
QVBoxLayout *l0 = new TQVBoxLayout(dummy, 0, 10); TQVBoxLayout *l0 = new TQVBoxLayout(dummy, 0, 10);
QGridLayout *l1 = new TQGridLayout(0, 3, 3, 0, 5); TQGridLayout *l1 = new TQGridLayout(0, 3, 3, 0, 5);
l0->addLayout(l1); l0->addLayout(TQT_TQLAYOUT(l1));
l1->setColStretch(2,1); l1->setColStretch(2,1);
l1->addColSpacing(0,60); l1->addColSpacing(0,60);
l1->addMultiCellWidget(m_icon, 0, 2, 0, 0, Qt::AlignCenter); l1->addMultiCellWidget(m_icon, 0, 2, 0, 0, Qt::AlignCenter);
@ -138,7 +138,7 @@ KMSpecialPrinterDlg::KMSpecialPrinterDlg(TQWidget *parent, const char *name)
l0->addWidget(sep); l0->addWidget(sep);
l0->addWidget(m_gb); l0->addWidget(m_gb);
l0->addWidget(m_outfile_gb); l0->addWidget(m_outfile_gb);
QGridLayout *l6 = new TQGridLayout(m_outfile_gb->layout(), 3, 2, 10); TQGridLayout *l6 = new TQGridLayout(m_outfile_gb->layout(), 3, 2, 10);
l6->addMultiCellWidget( m_usefile, 0, 0, 0, 1 ); l6->addMultiCellWidget( m_usefile, 0, 0, 0, 1 );
l6->addWidget(m_mimetypelabel, 1, 0); l6->addWidget(m_mimetypelabel, 1, 0);
l6->addWidget(m_mimetype, 1, 1); l6->addWidget(m_mimetype, 1, 1);
@ -165,7 +165,7 @@ void KMSpecialPrinterDlg::slotOk()
bool KMSpecialPrinterDlg::checkSettings() bool KMSpecialPrinterDlg::checkSettings()
{ {
QString msg; TQString msg;
if (m_name->text().isEmpty()) if (m_name->text().isEmpty())
msg = i18n("You must provide a non-empty name."); msg = i18n("You must provide a non-empty name.");
else else
@ -186,7 +186,7 @@ void KMSpecialPrinterDlg::setPrinter(KMPrinter *printer)
{ {
m_command->setCommand(printer->option("kde-special-command")); m_command->setCommand(printer->option("kde-special-command"));
m_usefile->setChecked(printer->option("kde-special-file") == "1"); m_usefile->setChecked(printer->option("kde-special-file") == "1");
int index = m_mimelist.findIndex(printer->option("kde-special-mimetype")); int index = m_mimelist.tqfindIndex(printer->option("kde-special-mimetype"));
m_mimetype->setCurrentItem(index == -1 ? 0 : index); m_mimetype->setCurrentItem(index == -1 ? 0 : index);
m_extension->setText(printer->option("kde-special-extension")); m_extension->setText(printer->option("kde-special-extension"));
m_name->setText(printer->name()); m_name->setText(printer->name());

@ -46,10 +46,10 @@ protected slots:
void slotTextChanged(const TQString &); void slotTextChanged(const TQString &);
private: private:
QLineEdit *m_name, *m_description, *m_location, *m_extension; TQLineEdit *m_name, *m_description, *m_location, *m_extension;
QComboBox *m_mimetype; TQComboBox *m_mimetype;
QCheckBox *m_usefile; TQCheckBox *m_usefile;
QStringList m_mimelist; TQStringList m_mimelist;
KIconButton *m_icon; KIconButton *m_icon;
KXmlCommandSelector *m_command; KXmlCommandSelector *m_command;
}; };

@ -33,7 +33,7 @@
#include <kdialog.h> #include <kdialog.h>
#include <kdebug.h> #include <kdebug.h>
class KRadioButton : public QRadioButton class KRadioButton : public TQRadioButton
{ {
public: public:
KRadioButton(const TQString& txt, TQWidget *parent = 0, const char *name = 0); KRadioButton(const TQString& txt, TQWidget *parent = 0, const char *name = 0);
@ -73,7 +73,7 @@ bool KMWBackend::isValid(TQString& msg)
void KMWBackend::initPrinter(KMPrinter *p) void KMWBackend::initPrinter(KMPrinter *p)
{ {
QString s = p->option("kde-backend"); TQString s = p->option("kde-backend");
int ID(-1); int ID(-1);
if (!s.isEmpty()) if (!s.isEmpty())
@ -101,10 +101,10 @@ void KMWBackend::updatePrinter(KMPrinter *p)
if (ID == KMWizard::Class) p->setType(KMPrinter::Class); if (ID == KMWizard::Class) p->setType(KMPrinter::Class);
else p->setType(KMPrinter::Printer); else p->setType(KMPrinter::Printer);
p->setOption("kde-backend",TQString::number(ID)); p->setOption("kde-backend",TQString::number(ID));
QString s = m_buttons->selected()->text(); TQString s = m_buttons->selected()->text();
s.replace(TQRegExp("&(?=\\w)"), TQString::tqfromLatin1("")); s.replace(TQRegExp("&(?=\\w)"), TQString::tqfromLatin1(""));
p->setOption("kde-backend-description",s); p->setOption("kde-backend-description",s);
setNextPage((m_map.contains(ID) ? m_map[ID] : KMWizard::Error)); setNextPage((m_map.tqcontains(ID) ? m_map[ID] : KMWizard::Error));
} }
void KMWBackend::addBackend( int ID, bool on, int nextpage ) void KMWBackend::addBackend( int ID, bool on, int nextpage )
@ -171,7 +171,7 @@ void KMWBackend::addBackend(int ID, const TQString& txt, bool on, const TQString
void KMWBackend::enableBackend(int ID, bool on) void KMWBackend::enableBackend(int ID, bool on)
{ {
QButton *btn = m_buttons->find(ID); TQButton *btn = static_cast<TQButton*>(m_buttons->find(ID));
if (btn) if (btn)
btn->setEnabled(on); btn->setEnabled(on);
} }

@ -41,8 +41,8 @@ public:
void enableBackend(int ID, bool on = true); void enableBackend(int ID, bool on = true);
private: private:
QButtonGroup *m_buttons; TQButtonGroup *m_buttons;
QVBoxLayout *m_layout; TQVBoxLayout *m_layout;
// keep a map between button ID and the real next page to switch to. This enables // keep a map between button ID and the real next page to switch to. This enables
// to have different backends switching to the same page (like backends requiring // to have different backends switching to the same page (like backends requiring
// a password). If the next page is not given when adding the backend, the ID is // a password). If the next page is not given when adding the backend, the ID is

@ -42,19 +42,19 @@ KMWClass::KMWClass(TQWidget *parent, const char *name)
m_list2 = new KListBox(this); m_list2 = new KListBox(this);
m_list2->setSelectionMode(TQListBox::Extended); m_list2->setSelectionMode(TQListBox::Extended);
QToolButton *add = new TQToolButton(this); TQToolButton *add = new TQToolButton(this);
QToolButton *remove = new TQToolButton(this); TQToolButton *remove = new TQToolButton(this);
add->setIconSet(BarIcon("forward")); add->setIconSet(BarIcon("forward"));
remove->setIconSet(BarIcon("back")); remove->setIconSet(BarIcon("back"));
connect(add,TQT_SIGNAL(clicked()),TQT_SLOT(slotAdd())); connect(add,TQT_SIGNAL(clicked()),TQT_SLOT(slotAdd()));
connect(remove,TQT_SIGNAL(clicked()),TQT_SLOT(slotRemove())); connect(remove,TQT_SIGNAL(clicked()),TQT_SLOT(slotRemove()));
QLabel *l1 = new TQLabel(i18n("Available printers:"), this); TQLabel *l1 = new TQLabel(i18n("Available printers:"), this);
QLabel *l2 = new TQLabel(i18n("Class printers:"), this); TQLabel *l2 = new TQLabel(i18n("Class printers:"), this);
QHBoxLayout *lay1 = new TQHBoxLayout(this, 0, 15); TQHBoxLayout *lay1 = new TQHBoxLayout(this, 0, 15);
QVBoxLayout *lay2 = new TQVBoxLayout(0, 0, 20); TQVBoxLayout *lay2 = new TQVBoxLayout(0, 0, 20);
QVBoxLayout *lay3 = new TQVBoxLayout(0, 0, 0), *lay4 = new TQVBoxLayout(0, 0, 0); TQVBoxLayout *lay3 = new TQVBoxLayout(0, 0, 0), *lay4 = new TQVBoxLayout(0, 0, 0);
lay1->addLayout(lay3, 1); lay1->addLayout(lay3, 1);
lay1->addLayout(lay2, 0); lay1->addLayout(lay2, 0);
lay1->addLayout(lay4, 1); lay1->addLayout(lay4, 1);
@ -84,7 +84,7 @@ bool KMWClass::isValid(TQString& msg)
void KMWClass::initPrinter(KMPrinter *p) void KMWClass::initPrinter(KMPrinter *p)
{ {
QStringList members = p->members(); TQStringList members = p->members();
KMManager *mgr = KMFactory::self()->manager(); KMManager *mgr = KMFactory::self()->manager();
// first load available printers // first load available printers
@ -94,7 +94,7 @@ void KMWClass::initPrinter(KMPrinter *p)
{ {
TQPtrListIterator<KMPrinter> it(*list); TQPtrListIterator<KMPrinter> it(*list);
for (;it.current();++it) for (;it.current();++it)
if (it.current()->instanceName().isEmpty() && !it.current()->isClass(true) && !it.current()->isSpecial() && !members.contains(it.current()->name())) if (it.current()->instanceName().isEmpty() && !it.current()->isClass(true) && !it.current()->isSpecial() && !members.tqcontains(it.current()->name()))
m_list1->insertItem(SmallIcon(it.current()->pixmap()), it.current()->name()); m_list1->insertItem(SmallIcon(it.current()->pixmap()), it.current()->name());
m_list1->sort(); m_list1->sort();
} }
@ -111,7 +111,7 @@ void KMWClass::initPrinter(KMPrinter *p)
void KMWClass::updatePrinter(KMPrinter *p) void KMWClass::updatePrinter(KMPrinter *p)
{ {
QStringList members; TQStringList members;
for (uint i=0; i<m_list2->count(); i++) for (uint i=0; i<m_list2->count(); i++)
members.append(m_list2->item(i)->text()); members.append(m_list2->item(i)->text());
p->setMembers(members); p->setMembers(members);

@ -35,7 +35,7 @@ KMWDriver::KMWDriver(TQWidget *parent, const char *name)
m_widget = new KMDriverDbWidget(this); m_widget = new KMDriverDbWidget(this);
QVBoxLayout *lay1 = new TQVBoxLayout(this, 0, 0); TQVBoxLayout *lay1 = new TQVBoxLayout(this, 0, 0);
lay1->addWidget(m_widget); lay1->addWidget(m_widget);
} }

@ -39,17 +39,17 @@ KMWDriverSelect::KMWDriverSelect(TQWidget *parent, const char *name)
m_entries = NULL; m_entries = NULL;
m_list = new KListBox(this); m_list = new KListBox(this);
QLabel *l1 = new TQLabel(this); TQLabel *l1 = new TQLabel(this);
l1->setText(i18n("<p>Several drivers have been detected for this model. Select the driver " l1->setText(i18n("<p>Several drivers have been detected for this model. Select the driver "
"you want to use. You will have the opportunity to test it as well as to " "you want to use. You will have the opportunity to test it as well as to "
"change it if necessary.</p>")); "change it if necessary.</p>"));
m_drivercomment = new KPushButton(i18n("Driver Information"), this); m_drivercomment = new KPushButton(i18n("Driver Information"), this);
connect(m_drivercomment, TQT_SIGNAL(clicked()), TQT_SLOT(slotDriverComment())); connect(m_drivercomment, TQT_SIGNAL(clicked()), TQT_SLOT(slotDriverComment()));
QVBoxLayout *main_ = new TQVBoxLayout(this, 0, 10); TQVBoxLayout *main_ = new TQVBoxLayout(this, 0, 10);
main_->addWidget(l1,0); main_->addWidget(l1,0);
main_->addWidget(m_list,1); main_->addWidget(m_list,1);
QHBoxLayout *lay0 = new TQHBoxLayout(0, 0, 0); TQHBoxLayout *lay0 = new TQHBoxLayout(0, 0, 0);
main_->addLayout(lay0,0); main_->addLayout(lay0,0);
lay0->addStretch(1); lay0->addStretch(1);
lay0->addWidget(m_drivercomment); lay0->addWidget(m_drivercomment);
@ -75,7 +75,7 @@ void KMWDriverSelect::initPrinter(KMPrinter *p)
int recomm(0); int recomm(0);
for (;it.current();++it) for (;it.current();++it)
{ {
QString s(it.current()->description); TQString s(it.current()->description);
if (it.current()->recommended) if (it.current()->recommended)
{ {
recomm = m_list->count(); recomm = m_list->count();

@ -42,7 +42,7 @@ protected slots:
private: private:
KListBox *m_list; KListBox *m_list;
KMDBEntryList *m_entries; KMDBEntryList *m_entries;
QPushButton *m_drivercomment; TQPushButton *m_drivercomment;
}; };
#endif #endif

@ -47,25 +47,25 @@ KMWDriverTest::KMWDriverTest(TQWidget *parent, const char *name)
m_manufacturer = new TQLabel(this); m_manufacturer = new TQLabel(this);
m_model = new TQLabel(this); m_model = new TQLabel(this);
m_driverinfo = new TQLabel(this); m_driverinfo = new TQLabel(this);
m_driverinfo->setTextFormat(Qt::RichText); m_driverinfo->setTextFormat(TQt::RichText);
QLabel *l1 = new TQLabel(i18n("<b>Manufacturer:</b>"), this); TQLabel *l1 = new TQLabel(i18n("<b>Manufacturer:</b>"), this);
QLabel *l2 = new TQLabel(i18n("<b>Model:</b>"), this); TQLabel *l2 = new TQLabel(i18n("<b>Model:</b>"), this);
QLabel *l3 = new TQLabel(i18n("<b>Description:</b>"), this); TQLabel *l3 = new TQLabel(i18n("<b>Description:</b>"), this);
m_test = new KPushButton(KGuiItem(i18n("&Test"), "kdeprint_testprinter"), this); m_test = new KPushButton(KGuiItem(i18n("&Test"), "kdeprint_testprinter"), this);
m_settings = new KPushButton(KGuiItem(i18n("&Settings"), "configure"), this); m_settings = new KPushButton(KGuiItem(i18n("&Settings"), "configure"), this);
QLabel *l0 = new TQLabel(this); TQLabel *l0 = new TQLabel(this);
l0->setText(i18n("<p>Now you can test the printer before finishing installation. " l0->setText(i18n("<p>Now you can test the printer before finishing installation. "
"Use the <b>Settings</b> button to configure the printer driver and " "Use the <b>Settings</b> button to configure the printer driver and "
"the <b>Test</b> button to test your configuration. Use the <b>Back</b> " "the <b>Test</b> button to test your configuration. Use the <b>Back</b> "
"button to change the driver (your current configuration will be discarded).</p>")); "button to change the driver (your current configuration will be discarded).</p>"));
QVBoxLayout *lay1 = new TQVBoxLayout(this, 0, 15); TQVBoxLayout *lay1 = new TQVBoxLayout(this, 0, 15);
QGridLayout *lay2 = new TQGridLayout(0, 3, 3, 0, 0); TQGridLayout *lay2 = new TQGridLayout(0, 3, 3, 0, 0);
QHBoxLayout *lay3 = new TQHBoxLayout(0, 0, 10); TQHBoxLayout *lay3 = new TQHBoxLayout(0, 0, 10);
lay1->addWidget(l0,0); lay1->addWidget(l0,0);
lay1->addLayout(lay2,0); lay1->addLayout(TQT_TQLAYOUT(lay2),0);
lay1->addLayout(lay3,0); lay1->addLayout(lay3,0);
lay1->addStretch(1); lay1->addStretch(1);
lay2->setColStretch(2,1); lay2->setColStretch(2,1);
@ -99,7 +99,7 @@ void KMWDriverTest::initPrinter(KMPrinter *p)
delete m_driver; delete m_driver;
m_driver = 0; m_driver = 0;
QString drfile = p->option("kde-driver"); TQString drfile = p->option("kde-driver");
bool checkDriver(true); bool checkDriver(true);
if (!drfile.isEmpty() && drfile != "raw") if (!drfile.isEmpty() && drfile != "raw")
{ {
@ -133,9 +133,9 @@ void KMWDriverTest::slotTest()
{ {
if (!m_printer) return; if (!m_printer) return;
QString name = "tmpprinter_"+KApplication::randomString(8); TQString name = "tmpprinter_"+KApplication::randomString(8);
// save printer name (can be non empty when modifying a printer) // save printer name (can be non empty when modifying a printer)
QString oldname = m_printer->name(); TQString oldname = m_printer->name();
m_printer->setName(name); m_printer->setName(name);
m_printer->setPrinterName(name); m_printer->setPrinterName(name);

@ -41,11 +41,11 @@ protected slots:
void slotSettings(); void slotSettings();
private: private:
QLabel *m_manufacturer; TQLabel *m_manufacturer;
QLabel *m_model; TQLabel *m_model;
QLabel *m_driverinfo; TQLabel *m_driverinfo;
QPushButton *m_test; TQPushButton *m_test;
QPushButton *m_settings; TQPushButton *m_settings;
DrMain *m_driver; DrMain *m_driver;
KMPrinter *m_printer; KMPrinter *m_printer;
}; };

@ -35,14 +35,14 @@ KMWEnd::KMWEnd(TQWidget *parent, const char *name)
m_view = new TQTextView(this); m_view = new TQTextView(this);
QVBoxLayout *lay = new TQVBoxLayout(this, 0, 0); TQVBoxLayout *lay = new TQVBoxLayout(this, 0, 0);
lay->addWidget(m_view,1); lay->addWidget(m_view,1);
} }
void KMWEnd::initPrinter(KMPrinter *p) void KMWEnd::initPrinter(KMPrinter *p)
{ {
QString txt; TQString txt;
QString s(TQString::tqfromLatin1("<li><u>%1</u>: %2</li>")); TQString s(TQString::tqfromLatin1("<li><u>%1</u>: %2</li>"));
int ID = p->option("kde-backend").toInt(); int ID = p->option("kde-backend").toInt();
// general information // general information
@ -57,8 +57,8 @@ void KMWEnd::initPrinter(KMPrinter *p)
{ {
// class members // class members
txt.append(TQString::tqfromLatin1("<b>%1</b><ul type=circle>").arg(i18n("Members"))); txt.append(TQString::tqfromLatin1("<b>%1</b><ul type=circle>").arg(i18n("Members")));
QStringList m(p->members()); TQStringList m(p->members());
QString s1(TQString::tqfromLatin1("<li>%1</li>")); TQString s1(TQString::tqfromLatin1("<li>%1</li>"));
for (TQStringList::ConstIterator it=m.begin(); it!=m.end(); ++it) for (TQStringList::ConstIterator it=m.begin(); it!=m.end(); ++it)
txt.append(s1.arg(*it)); txt.append(s1.arg(*it));
txt.append("</ul><br>"); txt.append("</ul><br>");

@ -32,7 +32,7 @@ public:
void initPrinter(KMPrinter*); void initPrinter(KMPrinter*);
private: private:
QTextView *m_view; TQTextView *m_view;
}; };
#endif #endif

@ -37,14 +37,14 @@ KMWFile::KMWFile(TQWidget *parent, const char *name)
m_url = new KURLRequester(this); m_url = new KURLRequester(this);
m_url->setMode((KFile::Mode)(KFile::File|KFile::LocalOnly)); m_url->setMode((KFile::Mode)(KFile::File|KFile::LocalOnly));
QLabel *l1 = new TQLabel(this); TQLabel *l1 = new TQLabel(this);
l1->setText(i18n("<p>The printing will be redirected to a file. Enter here the path " l1->setText(i18n("<p>The printing will be redirected to a file. Enter here the path "
"of the file you want to use for redirection. Use an absolute path or " "of the file you want to use for redirection. Use an absolute path or "
"the browse button for graphical selection.</p>")); "the browse button for graphical selection.</p>"));
QLabel *l2 = new TQLabel(i18n("Print to file:"), this); TQLabel *l2 = new TQLabel(i18n("Print to file:"), this);
QVBoxLayout *lay1 = new TQVBoxLayout(this, 0, 30); TQVBoxLayout *lay1 = new TQVBoxLayout(this, 0, 30);
QVBoxLayout *lay2 = new TQVBoxLayout(0, 0, 5); TQVBoxLayout *lay2 = new TQVBoxLayout(0, 0, 5);
lay1->addWidget(l1); lay1->addWidget(l1);
lay1->addLayout(lay2); lay1->addLayout(lay2);
lay1->addStretch(1); lay1->addStretch(1);
@ -54,7 +54,7 @@ KMWFile::KMWFile(TQWidget *parent, const char *name)
bool KMWFile::isValid(TQString& msg) bool KMWFile::isValid(TQString& msg)
{ {
QFileInfo fi(m_url->url()); TQFileInfo fi(m_url->url());
if (fi.fileName().isEmpty()) if (fi.fileName().isEmpty())
{ {
msg = i18n("Empty file name."); msg = i18n("Empty file name.");
@ -72,6 +72,6 @@ bool KMWFile::isValid(TQString& msg)
void KMWFile::updatePrinter(KMPrinter *p) void KMWFile::updatePrinter(KMPrinter *p)
{ {
QString dev = TQString::tqfromLatin1("file:%1").arg(m_url->url()); TQString dev = TQString::tqfromLatin1("file:%1").arg(m_url->url());
p->setDevice(dev); p->setDevice(dev);
} }

@ -30,13 +30,13 @@ KMWInfoBase::KMWInfoBase(int n, TQWidget *parent, const char *name)
m_edits.setAutoDelete(false); m_edits.setAutoDelete(false);
m_nlines = n; m_nlines = n;
QGridLayout *lay1 = new TQGridLayout(this, m_nlines+3, 2, 0, 10); TQGridLayout *lay1 = new TQGridLayout(this, m_nlines+3, 2, 0, 10);
lay1->addRowSpacing(1,10); lay1->addRowSpacing(1,10);
lay1->setRowStretch(m_nlines+2,1); lay1->setRowStretch(m_nlines+2,1);
lay1->setColStretch(1,1); lay1->setColStretch(1,1);
m_info = new TQLabel(this); m_info = new TQLabel(this);
m_info->setTextFormat(Qt::RichText); m_info->setTextFormat(TQt::RichText);
lay1->addMultiCellWidget(m_info,0,0,0,1); lay1->addMultiCellWidget(m_info,0,0,0,1);
for (int i=0;i<m_nlines;i++) for (int i=0;i<m_nlines;i++)

@ -44,7 +44,7 @@ protected:
private: private:
TQPtrList<TQLabel> m_labels; TQPtrList<TQLabel> m_labels;
TQPtrList<TQLineEdit> m_edits; TQPtrList<TQLineEdit> m_edits;
QLabel *m_info; TQLabel *m_info;
int m_nlines; int m_nlines;
}; };

@ -32,7 +32,7 @@ KMWInfoPage::KMWInfoPage(TQWidget *parent, const char *name)
m_title = i18n("Introduction"); m_title = i18n("Introduction");
m_nextpage = KMWizard::Backend; m_nextpage = KMWizard::Backend;
//QLabel *m_label = new TQLabel(this); //TQLabel *m_label = new TQLabel(this);
KActiveLabel *m_label = new KActiveLabel(this); KActiveLabel *m_label = new KActiveLabel(this);
m_label->setText(i18n("<p>Welcome,</p><br>" m_label->setText(i18n("<p>Welcome,</p><br>"
"<p>This wizard will help to install a new printer on your computer. " "<p>This wizard will help to install a new printer on your computer. "
@ -43,6 +43,6 @@ KMWInfoPage::KMWInfoPage(TQWidget *parent, const char *name)
"<p align=right><a href=\"http://printing.kde.org\"><i>" "<p align=right><a href=\"http://printing.kde.org\"><i>"
"The KDE printing team</i></a>.</p>")); "The KDE printing team</i></a>.</p>"));
QVBoxLayout *main_ = new TQVBoxLayout(this, 0, 0); TQVBoxLayout *main_ = new TQVBoxLayout(this, 0, 0);
main_->addWidget(m_label); main_->addWidget(m_label);
} }

@ -64,15 +64,15 @@ KMWizard::KMWizard(TQWidget *parent, const char *name)
m_next = new KPushButton(i18n("&Next >"), this); m_next = new KPushButton(i18n("&Next >"), this);
m_next->setDefault(true); m_next->setDefault(true);
m_prev = new KPushButton(i18n("< &Back"), this); m_prev = new KPushButton(i18n("< &Back"), this);
QPushButton *m_cancel = new KPushButton(KStdGuiItem::cancel(), this); TQPushButton *m_cancel = new KPushButton(KStdGuiItem::cancel(), this);
m_title = new TQLabel(this); m_title = new TQLabel(this);
QFont f(m_title->font()); TQFont f(m_title->font());
f.setBold(true); f.setBold(true);
m_title->setFont(f); m_title->setFont(f);
KSeparator* sep = new KSeparator( KSeparator::HLine, this); KSeparator* sep = new KSeparator( KSeparator::HLine, this);
sep->setFixedHeight(5); sep->setFixedHeight(5);
KSeparator* sep2 = new KSeparator( KSeparator::HLine, this); KSeparator* sep2 = new KSeparator( KSeparator::HLine, this);
QPushButton *m_help = new KPushButton(KStdGuiItem::help(), this); TQPushButton *m_help = new KPushButton(KStdGuiItem::help(), this);
connect(m_cancel,TQT_SIGNAL(clicked()),TQT_SLOT(reject())); connect(m_cancel,TQT_SIGNAL(clicked()),TQT_SLOT(reject()));
connect(m_next,TQT_SIGNAL(clicked()),TQT_SLOT(slotNext())); connect(m_next,TQT_SIGNAL(clicked()),TQT_SLOT(slotNext()));
@ -88,9 +88,9 @@ KMWizard::KMWizard(TQWidget *parent, const char *name)
// layout // layout
TQVBoxLayout *main0_ = new TQVBoxLayout(this, 10, 10); TQVBoxLayout *main0_ = new TQVBoxLayout(this, 10, 10);
QVBoxLayout *main_ = new TQVBoxLayout(0, 0, 0); TQVBoxLayout *main_ = new TQVBoxLayout(0, 0, 0);
TQHBoxLayout *main1_ = new TQHBoxLayout(0, 0, 10); TQHBoxLayout *main1_ = new TQHBoxLayout(0, 0, 10);
QHBoxLayout *btn_ = new TQHBoxLayout(0, 0, 10); TQHBoxLayout *btn_ = new TQHBoxLayout(0, 0, 10);
main0_->addLayout(main1_); main0_->addLayout(main1_);
if (m_side) if (m_side)
main1_->addWidget(m_side); main1_->addWidget(m_side);
@ -222,7 +222,7 @@ void KMWizard::slotNext()
KMWizardPage *page = (KMWizardPage*)m_stack->visibleWidget(); KMWizardPage *page = (KMWizardPage*)m_stack->visibleWidget();
if (page) if (page)
{ {
QString msg; TQString msg;
if (!page->isValid(msg)) if (!page->isValid(msg))
{ {
if (!msg.isEmpty()) if (!msg.isEmpty())

@ -84,9 +84,9 @@ private:
TQIntDict<KMWizardPage> m_pagepool; TQIntDict<KMWizardPage> m_pagepool;
TQValueStack<int> m_pagestack; TQValueStack<int> m_pagestack;
QWidgetStack *m_stack; TQWidgetStack *m_stack;
QLabel *m_title; TQLabel *m_title;
QPushButton *m_next, *m_prev; TQPushButton *m_next, *m_prev;
int m_start, m_end; int m_start, m_end;
bool m_inclusive; bool m_inclusive;
KMPrinter *m_printer; KMPrinter *m_printer;

@ -47,11 +47,11 @@ KMWLocal::KMWLocal(TQWidget *parent, const char *name)
m_ports->header()->hide(); m_ports->header()->hide();
m_ports->addColumn(""); m_ports->addColumn("");
m_ports->setSorting(-1); m_ports->setSorting(-1);
QListViewItem *root = new TQListViewItem(m_ports, i18n("Local System")); TQListViewItem *root = new TQListViewItem(m_ports, i18n("Local System"));
root->setPixmap(0, SmallIcon("kdeprint_computer")); root->setPixmap(0, SmallIcon("kdeprint_computer"));
root->setOpen(true); root->setOpen(true);
connect(m_ports, TQT_SIGNAL(selectionChanged(TQListViewItem*)), TQT_SLOT(slotPortSelected(TQListViewItem*))); connect(m_ports, TQT_SIGNAL(selectionChanged(TQListViewItem*)), TQT_SLOT(slotPortSelected(TQListViewItem*)));
QLabel *l1 = new TQLabel(i18n("URI:"), this); TQLabel *l1 = new TQLabel(i18n("URI:"), this);
m_localuri = new TQLineEdit(this); m_localuri = new TQLineEdit(this);
connect( m_localuri, TQT_SIGNAL( textChanged( const TQString& ) ), TQT_SLOT( slotTextChanged( const TQString& ) ) ); connect( m_localuri, TQT_SIGNAL( textChanged( const TQString& ) ), TQT_SLOT( slotTextChanged( const TQString& ) ) );
m_parents[0] = new TQListViewItem(root, i18n("Parallel")); m_parents[0] = new TQListViewItem(root, i18n("Parallel"));
@ -60,10 +60,10 @@ KMWLocal::KMWLocal(TQWidget *parent, const char *name)
m_parents[3] = new TQListViewItem(root, m_parents[2], i18n("Others")); m_parents[3] = new TQListViewItem(root, m_parents[2], i18n("Others"));
for (int i=0;i<4;i++) for (int i=0;i<4;i++)
m_parents[i]->setPixmap(0, SmallIcon("input_devices_settings")); m_parents[i]->setPixmap(0, SmallIcon("input_devices_settings"));
QLabel *l2 = new TQLabel(i18n("<p>Select a valid detected port, or enter directly the corresponding URI in the bottom edit field.</p>"), this); TQLabel *l2 = new TQLabel(i18n("<p>Select a valid detected port, or enter directly the corresponding URI in the bottom edit field.</p>"), this);
QVBoxLayout *lay0 = new TQVBoxLayout(this, 0, 10); TQVBoxLayout *lay0 = new TQVBoxLayout(this, 0, 10);
QHBoxLayout *lay1 = new TQHBoxLayout(0, 0, 10); TQHBoxLayout *lay1 = new TQHBoxLayout(0, 0, 10);
lay0->addWidget(l2, 0); lay0->addWidget(l2, 0);
lay0->addWidget(m_ports, 1); lay0->addWidget(m_ports, 1);
lay0->addLayout(lay1, 0); lay0->addLayout(lay1, 0);
@ -78,7 +78,7 @@ bool KMWLocal::isValid(TQString& msg)
msg = i18n("The URI is empty","Empty URI."); msg = i18n("The URI is empty","Empty URI.");
return false; return false;
} }
else if (m_uris.findIndex(m_localuri->text()) == -1) else if (m_uris.tqfindIndex(m_localuri->text()) == -1)
{ {
if (KMessageBox::warningContinueCancel(this, i18n("The local URI doesn't correspond to a detected port. Continue?")) == KMessageBox::Cancel) if (KMessageBox::warningContinueCancel(this, i18n("The local URI doesn't correspond to a detected port. Continue?")) == KMessageBox::Cancel)
{ {
@ -98,7 +98,7 @@ void KMWLocal::slotPortSelected(TQListViewItem *item)
if (!item || item->depth() <= 1 || item->depth() > 3) if (!item || item->depth() <= 1 || item->depth() > 3)
uri = TQString::null; uri = TQString::null;
else if (item->depth() == 3) else if (item->depth() == 3)
uri = item->parent()->text( 1 ); uri = item->tqparent()->text( 1 );
else else
uri = item->text( 1 ); uri = item->text( 1 );
m_block = true; m_block = true;
@ -160,22 +160,22 @@ void KMWLocal::slotTextChanged( const TQString& txt )
void KMWLocal::initialize() void KMWLocal::initialize()
{ {
QStringList list = KMFactory::self()->manager()->detectLocalPrinters(); TQStringList list = KMFactory::self()->manager()->detectLocalPrinters();
if (list.isEmpty() || (list.count() % 4) != 0) if (list.isEmpty() || (list.count() % 4) != 0)
{ {
KMessageBox::error(this, i18n("Unable to detect local ports.")); KMessageBox::error(this, i18n("Unable to detect local ports."));
return; return;
} }
QListViewItem *last[4] = {0, 0, 0, 0}; TQListViewItem *last[4] = {0, 0, 0, 0};
for (TQStringList::Iterator it=list.begin(); it!=list.end(); ++it) for (TQStringList::Iterator it=list.begin(); it!=list.end(); ++it)
{ {
TQString cl = *it; TQString cl = *it;
++it; ++it;
QString uri = *it; TQString uri = *it;
int p = uri.tqfind( ':' ); int p = uri.tqfind( ':' );
QString desc = *(++it), prot = ( p != -1 ? uri.left( p ) : TQString::null ); TQString desc = *(++it), prot = ( p != -1 ? uri.left( p ) : TQString::null );
QString printer = *(++it); TQString printer = *(++it);
int index(-1); int index(-1);
if (desc.isEmpty()) if (desc.isEmpty())
desc = uri; desc = uri;
@ -195,7 +195,7 @@ void KMWLocal::initialize()
m_uris << uri; m_uris << uri;
if (!printer.isEmpty()) if (!printer.isEmpty())
{ {
QListViewItem *pItem = new TQListViewItem(last[index], printer); TQListViewItem *pItem = new TQListViewItem(last[index], printer);
last[index]->setOpen(true); last[index]->setOpen(true);
pItem->setPixmap(0, SmallIcon("kdeprint_printer")); pItem->setPixmap(0, SmallIcon("kdeprint_printer"));
} }

@ -48,9 +48,9 @@ protected:
protected: protected:
KListView *m_ports; KListView *m_ports;
QLineEdit *m_localuri; TQLineEdit *m_localuri;
QStringList m_uris; TQStringList m_uris;
QListViewItem *m_parents[4]; TQListViewItem *m_parents[4];
bool m_initialized; bool m_initialized;
bool m_block; bool m_block;
}; };

@ -39,15 +39,15 @@ KMWPassword::KMWPassword(TQWidget *parent, const char *name)
m_nextpage = KMWizard::SMB; m_nextpage = KMWizard::SMB;
// create widgets // create widgets
QLabel *infotext_ = new TQLabel(this); TQLabel *infotext_ = new TQLabel(this);
infotext_->setText(i18n("<p>This backend may require a login/password to work properly. " infotext_->setText(i18n("<p>This backend may require a login/password to work properly. "
"Select the type of access to use and fill in the login and password entries if needed.</p>")); "Select the type of access to use and fill in the login and password entries if needed.</p>"));
m_login = new TQLineEdit(this); m_login = new TQLineEdit(this);
m_login->setText(TQString::fromLocal8Bit(getenv("USER"))); m_login->setText(TQString::fromLocal8Bit(getenv("USER")));
m_password = new TQLineEdit(this); m_password = new TQLineEdit(this);
m_password->setEchoMode(TQLineEdit::Password); m_password->setEchoMode(TQLineEdit::Password);
QLabel *loginlabel_ = new TQLabel(i18n("&Login:"),this); TQLabel *loginlabel_ = new TQLabel(i18n("&Login:"),this);
QLabel *passwdlabel_ = new TQLabel(i18n("&Password:"),this); TQLabel *passwdlabel_ = new TQLabel(i18n("&Password:"),this);
m_btngroup = new TQVButtonGroup( this ); m_btngroup = new TQVButtonGroup( this );
m_btngroup->setFrameStyle( TQFrame::NoFrame ); m_btngroup->setFrameStyle( TQFrame::NoFrame );
TQRadioButton *btn1 = new TQRadioButton( i18n( "&Anonymous (no login/password)" ), m_btngroup ); TQRadioButton *btn1 = new TQRadioButton( i18n( "&Anonymous (no login/password)" ), m_btngroup );
@ -72,7 +72,7 @@ KMWPassword::KMWPassword(TQWidget *parent, const char *name)
main_->addSpacing( 10 ); main_->addSpacing( 10 );
main_->addWidget( m_btngroup ); main_->addWidget( m_btngroup );
TQGridLayout *l1 = new TQGridLayout( 0, 2, 3 ); TQGridLayout *l1 = new TQGridLayout( 0, 2, 3 );
main_->addLayout( l1 ); main_->addLayout( TQT_TQLAYOUT(l1) );
main_->addStretch( 1 ); main_->addStretch( 1 );
l1->setColSpacing( 0, 35 ); l1->setColSpacing( 0, 35 );
l1->setColStretch( 2, 1 ); l1->setColStretch( 2, 1 );
@ -109,7 +109,7 @@ void KMWPassword::initPrinter( KMPrinter* p )
void KMWPassword::updatePrinter(KMPrinter *p) void KMWPassword::updatePrinter(KMPrinter *p)
{ {
QString s = p->option("kde-backend"); TQString s = p->option("kde-backend");
if (!s.isEmpty()) if (!s.isEmpty())
setNextPage(s.toInt()); setNextPage(s.toInt());
else else

@ -38,20 +38,20 @@ KMWSmb::KMWSmb(TQWidget *parent, const char *name)
m_view = new SmbView(this,"SmbView"); m_view = new SmbView(this,"SmbView");
m_loginlabel = new TQLabel( this ); m_loginlabel = new TQLabel( this );
QPushButton *m_scan = new KPushButton(KGuiItem(i18n("Scan"), "viewmag"), this); TQPushButton *m_scan = new KPushButton(KGuiItem(i18n("Scan"), "viewmag"), this);
QPushButton *m_abort = new KPushButton(KGuiItem(i18n("Abort"), "stop"), this); TQPushButton *m_abort = new KPushButton(KGuiItem(i18n("Abort"), "stop"), this);
m_abort->setEnabled(false); m_abort->setEnabled(false);
QLabel *m_worklabel = new TQLabel(i18n("Workgroup:"), this); TQLabel *m_worklabel = new TQLabel(i18n("Workgroup:"), this);
QLabel *m_serverlabel = new TQLabel(i18n("Server:"), this); TQLabel *m_serverlabel = new TQLabel(i18n("Server:"), this);
QLabel *m_printerlabel = new TQLabel(i18n("Printer:"), this); TQLabel *m_printerlabel = new TQLabel(i18n("Printer:"), this);
m_work = new TQLineEdit(this); m_work = new TQLineEdit(this);
m_server = new TQLineEdit(this); m_server = new TQLineEdit(this);
m_printer = new TQLineEdit(this); m_printer = new TQLineEdit(this);
QVBoxLayout *lay0 = new TQVBoxLayout(this, 0, 10); TQVBoxLayout *lay0 = new TQVBoxLayout(this, 0, 10);
QGridLayout *lay1 = new TQGridLayout(0, 3, 2, 0, 10); TQGridLayout *lay1 = new TQGridLayout(0, 3, 2, 0, 10);
QHBoxLayout *lay3 = new TQHBoxLayout(0, 0, 10); TQHBoxLayout *lay3 = new TQHBoxLayout(0, 0, 10);
lay0->addLayout(lay1,0); lay0->addLayout(TQT_TQLAYOUT(lay1),0);
lay0->addWidget(m_view,1); lay0->addWidget(m_view,1);
lay0->addLayout(lay3,0); lay0->addLayout(lay3,0);
lay0->addSpacing(10); lay0->addSpacing(10);

@ -43,7 +43,7 @@ protected slots:
protected: protected:
SmbView *m_view; SmbView *m_view;
QLineEdit *m_work, *m_server, *m_printer; TQLineEdit *m_work, *m_server, *m_printer;
TQLabel *m_loginlabel; TQLabel *m_loginlabel;
}; };

@ -45,8 +45,8 @@ KMWSocket::KMWSocket(TQWidget *parent, const char *name)
m_list->setFrameStyle(TQFrame::WinPanel|TQFrame::Sunken); m_list->setFrameStyle(TQFrame::WinPanel|TQFrame::Sunken);
m_list->setLineWidth(1); m_list->setLineWidth(1);
QLabel *l1 = new TQLabel(i18n("&Printer address:"),this); TQLabel *l1 = new TQLabel(i18n("&Printer address:"),this);
QLabel *l2 = new TQLabel(i18n("P&ort:"),this); TQLabel *l2 = new TQLabel(i18n("P&ort:"),this);
m_printer = new TQLineEdit(this); m_printer = new TQLineEdit(this);
m_port = new TQLineEdit(this); m_port = new TQLineEdit(this);
@ -67,8 +67,8 @@ KMWSocket::KMWSocket(TQWidget *parent, const char *name)
connect( m_scanner, TQT_SIGNAL( scanFinished() ), parent, TQT_SLOT( enableWizard() ) ); connect( m_scanner, TQT_SIGNAL( scanFinished() ), parent, TQT_SLOT( enableWizard() ) );
// layout // layout
QHBoxLayout *lay3 = new TQHBoxLayout(this, 0, 10); TQHBoxLayout *lay3 = new TQHBoxLayout(this, 0, 10);
QVBoxLayout *lay2 = new TQVBoxLayout(0, 0, 0); TQVBoxLayout *lay2 = new TQVBoxLayout(0, 0, 0);
lay3->addWidget(m_list,1); lay3->addWidget(m_list,1);
lay3->addLayout(lay2,1); lay3->addLayout(lay2,1);
@ -88,7 +88,7 @@ KMWSocket::~KMWSocket()
void KMWSocket::updatePrinter(KMPrinter *p) void KMWSocket::updatePrinter(KMPrinter *p)
{ {
QString dev = TQString::tqfromLatin1("socket://%1:%2").arg(m_printer->text()).arg(m_port->text()); TQString dev = TQString::tqfromLatin1("socket://%1:%2").arg(m_printer->text()).arg(m_port->text());
p->setDevice(dev); p->setDevice(dev);
} }
@ -99,7 +99,7 @@ bool KMWSocket::isValid(TQString& msg)
msg = i18n("You must enter a printer address."); msg = i18n("You must enter a printer address.");
return false; return false;
} }
QString port(m_port->text()); TQString port(m_port->text());
int p(9100); int p(9100);
if (!port.isEmpty()) if (!port.isEmpty())
{ {
@ -131,12 +131,12 @@ void KMWSocket::slotScanFinished()
TQPtrListIterator<NetworkScanner::SocketInfo> it(*list); TQPtrListIterator<NetworkScanner::SocketInfo> it(*list);
for (;it.current();++it) for (;it.current();++it)
{ {
QString name; TQString name;
if (it.current()->Name.isEmpty()) if (it.current()->Name.isEmpty())
name = i18n("Unknown host - 1 is the IP", "<Unknown> (%1)").arg(it.current()->IP); name = i18n("Unknown host - 1 is the IP", "<Unknown> (%1)").arg(it.current()->IP);
else else
name = it.current()->Name; name = it.current()->Name;
QListViewItem *item = new TQListViewItem(m_list,name,it.current()->IP,TQString::number(it.current()->Port)); TQListViewItem *item = new TQListViewItem(m_list,name,it.current()->IP,TQString::number(it.current()->Port));
item->setPixmap(0,SmallIcon("kdeprint_printer")); item->setPixmap(0,SmallIcon("kdeprint_printer"));
} }
} }

@ -45,7 +45,7 @@ protected slots:
private: private:
KListView *m_list; KListView *m_list;
NetworkScanner *m_scanner; NetworkScanner *m_scanner;
QLineEdit *m_printer, *m_port; TQLineEdit *m_printer, *m_port;
}; };
#endif #endif

@ -46,13 +46,13 @@ TQString localRootIP();
SocketConfig::SocketConfig(KMWSocketUtil *util, TQWidget *parent, const char *name) SocketConfig::SocketConfig(KMWSocketUtil *util, TQWidget *parent, const char *name)
: KDialogBase(parent, name, true, TQString::null, Ok|Cancel, Ok, true) : KDialogBase(parent, name, true, TQString::null, Ok|Cancel, Ok, true)
{ {
QWidget *dummy = new TQWidget(this); TQWidget *dummy = new TQWidget(this);
setMainWidget(dummy); setMainWidget(dummy);
KIntValidator *val = new KIntValidator( this ); KIntValidator *val = new KIntValidator( this );
QLabel *masklabel = new TQLabel(i18n("&Subnetwork:"),dummy); TQLabel *masklabel = new TQLabel(i18n("&Subnetwork:"),dummy);
QLabel *portlabel = new TQLabel(i18n("&Port:"),dummy); TQLabel *portlabel = new TQLabel(i18n("&Port:"),dummy);
QLabel *toutlabel = new TQLabel(i18n("&Timeout (ms):"),dummy); TQLabel *toutlabel = new TQLabel(i18n("&Timeout (ms):"),dummy);
QLineEdit *mm = new TQLineEdit(dummy); TQLineEdit *mm = new TQLineEdit(dummy);
mm->setText(TQString::tqfromLatin1(".[0-255]")); mm->setText(TQString::tqfromLatin1(".[0-255]"));
mm->setReadOnly(true); mm->setReadOnly(true);
mm->setFixedWidth(fontMetrics().width(mm->text())+10); mm->setFixedWidth(fontMetrics().width(mm->text())+10);
@ -77,8 +77,8 @@ SocketConfig::SocketConfig(KMWSocketUtil *util, TQWidget *parent, const char *na
port_->setEditText(TQString::number(util->port_)); port_->setEditText(TQString::number(util->port_));
tout_->setText(TQString::number(util->timeout_)); tout_->setText(TQString::number(util->timeout_));
QGridLayout *main_ = new TQGridLayout(dummy, 3, 2, 0, 10); TQGridLayout *main_ = new TQGridLayout(dummy, 3, 2, 0, 10);
QHBoxLayout *lay1 = new TQHBoxLayout(0, 0, 5); TQHBoxLayout *lay1 = new TQHBoxLayout(0, 0, 5);
main_->addWidget(masklabel, 0, 0); main_->addWidget(masklabel, 0, 0);
main_->addWidget(portlabel, 1, 0); main_->addWidget(portlabel, 1, 0);
main_->addWidget(toutlabel, 2, 0); main_->addWidget(toutlabel, 2, 0);
@ -98,8 +98,8 @@ SocketConfig::~SocketConfig()
void SocketConfig::slotOk() void SocketConfig::slotOk()
{ {
QString msg; TQString msg;
QRegExp re("(\\d{1,3})\\.(\\d{1,3})\\.(\\d{1,3})"); TQRegExp re("(\\d{1,3})\\.(\\d{1,3})\\.(\\d{1,3})");
if (!re.exactMatch(mask_->text())) if (!re.exactMatch(mask_->text()))
msg = i18n("Wrong subnetwork specification."); msg = i18n("Wrong subnetwork specification.");
else else
@ -147,7 +147,7 @@ bool KMWSocketUtil::checkPrinter(const TQString& IPstr, int port, TQString* host
{ {
if (hostname) if (hostname)
{ {
QString portname; TQString portname;
KExtendedSocket::resolve((KSocketAddress*)(sock.peerAddress()), *hostname, portname); KExtendedSocket::resolve((KSocketAddress*)(sock.peerAddress()), *hostname, portname);
} }
result = true; result = true;
@ -165,8 +165,8 @@ bool KMWSocketUtil::scanNetwork(TQProgressBar *bar)
bar->setTotalSteps(n); bar->setTotalSteps(n);
for (int i=0; i<n; i++) for (int i=0; i<n; i++)
{ {
QString IPstr = root_ + "." + TQString::number(i); TQString IPstr = root_ + "." + TQString::number(i);
QString hostname; TQString hostname;
if (checkPrinter(IPstr, port_, &hostname)) if (checkPrinter(IPstr, port_, &hostname))
{ // we found a printer at this address, create SocketInfo entry in printer list { // we found a printer at this address, create SocketInfo entry in printer list
SocketInfo *info = new SocketInfo; SocketInfo *info = new SocketInfo;
@ -208,8 +208,8 @@ TQString localRootIP()
infos.setAutoDelete(true); infos.setAutoDelete(true);
if (infos.count() > 0) if (infos.count() > 0)
{ {
QString IPstr = infos.first()->address()->nodeName(); TQString IPstr = infos.first()->address()->nodeName();
int p = IPstr.findRev('.'); int p = IPstr.tqfindRev('.');
IPstr.truncate(p); IPstr.truncate(p);
return IPstr; return IPstr;
} }

@ -48,8 +48,8 @@ protected slots:
void slotOk(); void slotOk();
private: private:
QLineEdit *mask_, *tout_; TQLineEdit *mask_, *tout_;
QComboBox *port_; TQComboBox *port_;
}; };
class KMWSocketUtil class KMWSocketUtil
@ -68,7 +68,7 @@ public:
private: private:
TQPtrList<SocketInfo> printerlist_; TQPtrList<SocketInfo> printerlist_;
QString root_; TQString root_;
int port_; int port_;
int timeout_; // in milliseconds int timeout_; // in milliseconds
}; };

@ -52,13 +52,13 @@
TQString generateId(const TQMap<TQString, DrBase*>& map) TQString generateId(const TQMap<TQString, DrBase*>& map)
{ {
int index(-1); int index(-1);
while (map.contains(TQString::tqfromLatin1("item%1").arg(++index))) ; while (map.tqcontains(TQString::tqfromLatin1("item%1").arg(++index))) ;
return TQString::tqfromLatin1("item%1").arg(index); return TQString::tqfromLatin1("item%1").arg(index);
} }
TQListViewItem* findPrev(TQListViewItem *item) TQListViewItem* findPrev(TQListViewItem *item)
{ {
QListViewItem *prev = item->itemAbove(); TQListViewItem *prev = item->itemAbove();
while (prev && prev->depth() > item->depth()) while (prev && prev->depth() > item->depth())
prev = prev->itemAbove(); prev = prev->itemAbove();
if (prev && prev->depth() == item->depth()) if (prev && prev->depth() == item->depth())
@ -69,7 +69,7 @@ TQListViewItem* findPrev(TQListViewItem *item)
TQListViewItem* findNext(TQListViewItem *item) TQListViewItem* findNext(TQListViewItem *item)
{ {
QListViewItem *next = item->itemBelow(); TQListViewItem *next = item->itemBelow();
while (next && next->depth() > item->depth()) while (next && next->depth() > item->depth())
next = next->itemBelow(); next = next->itemBelow();
if (next && next->depth() == item->depth()) if (next && next->depth() == item->depth())
@ -111,12 +111,12 @@ KXmlCommandAdvancedDlg::KXmlCommandAdvancedDlg(TQWidget *parent, const char *nam
m_type->insertItem(i18n("Boolean")); m_type->insertItem(i18n("Boolean"));
m_format = new TQLineEdit(m_dummy); m_format = new TQLineEdit(m_dummy);
m_default = new TQLineEdit(m_dummy); m_default = new TQLineEdit(m_dummy);
QLabel *m_namelab = new TQLabel(i18n("&Name:"), m_dummy); TQLabel *m_namelab = new TQLabel(i18n("&Name:"), m_dummy);
QLabel *m_desclab = new TQLabel(i18n("&Description:"), m_dummy); TQLabel *m_desclab = new TQLabel(i18n("&Description:"), m_dummy);
QLabel *m_formatlab = new TQLabel(i18n("&Format:"), m_dummy); TQLabel *m_formatlab = new TQLabel(i18n("&Format:"), m_dummy);
QLabel *m_typelab = new TQLabel(i18n("&Type:"), m_dummy); TQLabel *m_typelab = new TQLabel(i18n("&Type:"), m_dummy);
QLabel *m_defaultlab = new TQLabel(i18n("Default &value:"), m_dummy); TQLabel *m_defaultlab = new TQLabel(i18n("Default &value:"), m_dummy);
QLabel *m_commandlab = new TQLabel(i18n("Co&mmand:"), this); TQLabel *m_commandlab = new TQLabel(i18n("Co&mmand:"), this);
m_namelab->setBuddy(m_name); m_namelab->setBuddy(m_name);
m_desclab->setBuddy(m_desc); m_desclab->setBuddy(m_desc);
m_formatlab->setBuddy(m_format); m_formatlab->setBuddy(m_format);
@ -125,16 +125,16 @@ KXmlCommandAdvancedDlg::KXmlCommandAdvancedDlg(TQWidget *parent, const char *nam
m_commandlab->setBuddy(m_command); m_commandlab->setBuddy(m_command);
m_persistent = new TQCheckBox( i18n( "&Persistent option" ), m_dummy ); m_persistent = new TQCheckBox( i18n( "&Persistent option" ), m_dummy );
QGroupBox *gb = new TQGroupBox(0, Qt::Horizontal, i18n("Va&lues"), m_dummy); TQGroupBox *gb = new TQGroupBox(0, Qt::Horizontal, i18n("Va&lues"), m_dummy);
m_stack = new TQWidgetStack(gb); m_stack = new TQWidgetStack(gb);
QWidget *w1 = new TQWidget(m_stack), *w2 = new TQWidget(m_stack), *w3 = new TQWidget(m_stack); TQWidget *w1 = new TQWidget(m_stack), *w2 = new TQWidget(m_stack), *w3 = new TQWidget(m_stack);
m_stack->addWidget(w1, 1); m_stack->addWidget(w1, 1);
m_stack->addWidget(w2, 2); m_stack->addWidget(w2, 2);
m_stack->addWidget(w3, 3); m_stack->addWidget(w3, 3);
m_edit1 = new TQLineEdit(w1); m_edit1 = new TQLineEdit(w1);
m_edit2 = new TQLineEdit(w1); m_edit2 = new TQLineEdit(w1);
QLabel *m_editlab1 = new TQLabel(i18n("Minimum v&alue:"), w1); TQLabel *m_editlab1 = new TQLabel(i18n("Minimum v&alue:"), w1);
QLabel *m_editlab2 = new TQLabel(i18n("Ma&ximum value:"), w1); TQLabel *m_editlab2 = new TQLabel(i18n("Ma&ximum value:"), w1);
m_editlab1->setBuddy(m_edit1); m_editlab1->setBuddy(m_edit1);
m_editlab2->setBuddy(m_edit2); m_editlab2->setBuddy(m_edit2);
m_values = new KListView(w2); m_values = new KListView(w2);
@ -159,32 +159,32 @@ KXmlCommandAdvancedDlg::KXmlCommandAdvancedDlg(TQWidget *parent, const char *nam
KSeparator *sep1 = new KSeparator(KSeparator::HLine, m_dummy); KSeparator *sep1 = new KSeparator(KSeparator::HLine, m_dummy);
QGroupBox *gb_input = new TQGroupBox(0, Qt::Horizontal, i18n("&Input From"), this); TQGroupBox *gb_input = new TQGroupBox(0, Qt::Horizontal, i18n("&Input From"), this);
QGroupBox *gb_output = new TQGroupBox(0, Qt::Horizontal, i18n("O&utput To"), this); TQGroupBox *gb_output = new TQGroupBox(0, Qt::Horizontal, i18n("O&utput To"), this);
QLabel *m_inputfilelab = new TQLabel(i18n("File:"), gb_input); TQLabel *m_inputfilelab = new TQLabel(i18n("File:"), gb_input);
QLabel *m_inputpipelab = new TQLabel(i18n("Pipe:"), gb_input); TQLabel *m_inputpipelab = new TQLabel(i18n("Pipe:"), gb_input);
QLabel *m_outputfilelab = new TQLabel(i18n("File:"), gb_output); TQLabel *m_outputfilelab = new TQLabel(i18n("File:"), gb_output);
QLabel *m_outputpipelab = new TQLabel(i18n("Pipe:"), gb_output); TQLabel *m_outputpipelab = new TQLabel(i18n("Pipe:"), gb_output);
m_inputfile = new TQLineEdit(gb_input); m_inputfile = new TQLineEdit(gb_input);
m_inputpipe = new TQLineEdit(gb_input); m_inputpipe = new TQLineEdit(gb_input);
m_outputfile = new TQLineEdit(gb_output); m_outputfile = new TQLineEdit(gb_output);
m_outputpipe = new TQLineEdit(gb_output); m_outputpipe = new TQLineEdit(gb_output);
m_comment = new KTextEdit( this ); m_comment = new KTextEdit( this );
m_comment->setTextFormat(Qt::RichText ); m_comment->setTextFormat(TQt::RichText );
m_comment->setReadOnly(true); m_comment->setReadOnly(true);
TQLabel *m_commentlab = new TQLabel( i18n( "Comment:" ), this ); TQLabel *m_commentlab = new TQLabel( i18n( "Comment:" ), this );
QVBoxLayout *l2 = new TQVBoxLayout(this, 0, KDialog::spacingHint()); TQVBoxLayout *l2 = new TQVBoxLayout(this, 0, KDialog::spacingHint());
QHBoxLayout *l3 = new TQHBoxLayout(0, 0, KDialog::spacingHint()); TQHBoxLayout *l3 = new TQHBoxLayout(0, 0, KDialog::spacingHint());
QVBoxLayout *l7 = new TQVBoxLayout(0, 0, 0); TQVBoxLayout *l7 = new TQVBoxLayout(0, 0, 0);
l2->addLayout(l3, 0); l2->addLayout(l3, 0);
l3->addWidget(m_commandlab); l3->addWidget(m_commandlab);
l3->addWidget(m_command); l3->addWidget(m_command);
QHBoxLayout *l0 = new TQHBoxLayout(0, 0, KDialog::spacingHint()); TQHBoxLayout *l0 = new TQHBoxLayout(0, 0, KDialog::spacingHint());
QGridLayout *l10 = new TQGridLayout(0, 2, 2, 0, KDialog::spacingHint()); TQGridLayout *l10 = new TQGridLayout(0, 2, 2, 0, KDialog::spacingHint());
l2->addLayout(l0, 1); l2->addLayout(l0, 1);
l0->addLayout(l10); l0->addLayout(TQT_TQLAYOUT(l10));
l10->addMultiCellWidget(m_view, 0, 0, 0, 1); l10->addMultiCellWidget(m_view, 0, 0, 0, 1);
l10->addWidget(gb_input, 1, 0); l10->addWidget(gb_input, 1, 0);
l10->addWidget(gb_output, 1, 1); l10->addWidget(gb_output, 1, 1);
@ -200,7 +200,7 @@ KXmlCommandAdvancedDlg::KXmlCommandAdvancedDlg(TQWidget *parent, const char *nam
l7->addWidget(m_down); l7->addWidget(m_down);
l7->addStretch(1); l7->addStretch(1);
l0->addWidget(m_dummy, 1); l0->addWidget(m_dummy, 1);
QGridLayout *l1 = new TQGridLayout(m_dummy, 9, 2, 0, KDialog::spacingHint()); TQGridLayout *l1 = new TQGridLayout(m_dummy, 9, 2, 0, KDialog::spacingHint());
l1->addWidget(m_desclab, 0, 0, Qt::AlignRight|Qt::AlignVCenter); l1->addWidget(m_desclab, 0, 0, Qt::AlignRight|Qt::AlignVCenter);
l1->addWidget(m_desc, 0, 1); l1->addWidget(m_desc, 0, 1);
l1->addMultiCellWidget(sep1, 1, 1, 0, 1); l1->addMultiCellWidget(sep1, 1, 1, 0, 1);
@ -216,23 +216,23 @@ KXmlCommandAdvancedDlg::KXmlCommandAdvancedDlg(TQWidget *parent, const char *nam
l1->addMultiCellWidget(gb, 7, 7, 0, 1); l1->addMultiCellWidget(gb, 7, 7, 0, 1);
l1->setRowStretch(8, 1); l1->setRowStretch(8, 1);
QHBoxLayout *l4 = new TQHBoxLayout(w2, 0, KDialog::spacingHint()); TQHBoxLayout *l4 = new TQHBoxLayout(w2, 0, KDialog::spacingHint());
l4->addWidget(m_values); l4->addWidget(m_values);
QVBoxLayout *l6 = new TQVBoxLayout(0, 0, 0); TQVBoxLayout *l6 = new TQVBoxLayout(0, 0, 0);
l4->addLayout(l6); l4->addLayout(l6);
l6->addWidget(m_addval); l6->addWidget(m_addval);
l6->addWidget(m_delval); l6->addWidget(m_delval);
l6->addStretch(1); l6->addStretch(1);
QGridLayout *l5 = new TQGridLayout(w1, 3, 2, 0, KDialog::spacingHint()); TQGridLayout *l5 = new TQGridLayout(w1, 3, 2, 0, KDialog::spacingHint());
l5->setRowStretch(2, 1); l5->setRowStretch(2, 1);
l5->addWidget(m_editlab1, 0, 0, Qt::AlignRight|Qt::AlignVCenter); l5->addWidget(m_editlab1, 0, 0, Qt::AlignRight|Qt::AlignVCenter);
l5->addWidget(m_editlab2, 1, 0, Qt::AlignRight|Qt::AlignVCenter); l5->addWidget(m_editlab2, 1, 0, Qt::AlignRight|Qt::AlignVCenter);
l5->addWidget(m_edit1, 0, 1); l5->addWidget(m_edit1, 0, 1);
l5->addWidget(m_edit2, 1, 1); l5->addWidget(m_edit2, 1, 1);
QGridLayout *l8 = new TQGridLayout(gb_input->layout(), 2, 2, TQGridLayout *l8 = new TQGridLayout(gb_input->layout(), 2, 2,
KDialog::spacingHint()); KDialog::spacingHint());
QGridLayout *l9 = new TQGridLayout(gb_output->layout(), 2, 2, TQGridLayout *l9 = new TQGridLayout(gb_output->layout(), 2, 2,
KDialog::spacingHint()); KDialog::spacingHint());
l8->addWidget(m_inputfilelab, 0, 0); l8->addWidget(m_inputfilelab, 0, 0);
l8->addWidget(m_inputpipelab, 1, 0); l8->addWidget(m_inputpipelab, 1, 0);
@ -243,7 +243,7 @@ KXmlCommandAdvancedDlg::KXmlCommandAdvancedDlg(TQWidget *parent, const char *nam
l9->addWidget(m_outputfile, 0, 1); l9->addWidget(m_outputfile, 0, 1);
l9->addWidget(m_outputpipe, 1, 1); l9->addWidget(m_outputpipe, 1, 1);
QVBoxLayout *l11 = new TQVBoxLayout(gb->layout()); TQVBoxLayout *l11 = new TQVBoxLayout(TQT_TQLAYOUT(gb->layout()));
l11->addWidget(m_stack); l11->addWidget(m_stack);
TQVBoxLayout *l12 = new TQVBoxLayout( 0, 0, 0 ); TQVBoxLayout *l12 = new TQVBoxLayout( 0, 0, 0 );
@ -367,7 +367,7 @@ void KXmlCommandAdvancedDlg::setCommand(KXmlCommand *xmlcmd)
void KXmlCommandAdvancedDlg::parseXmlCommand(KXmlCommand *xmlcmd) void KXmlCommandAdvancedDlg::parseXmlCommand(KXmlCommand *xmlcmd)
{ {
m_view->clear(); m_view->clear();
QListViewItem *root = new TQListViewItem(m_view, xmlcmd->name(), xmlcmd->name()); TQListViewItem *root = new TQListViewItem(m_view, xmlcmd->name(), xmlcmd->name());
DrMain *driver = xmlcmd->driver(); DrMain *driver = xmlcmd->driver();
root->setPixmap(0, SmallIcon("fileprint")); root->setPixmap(0, SmallIcon("fileprint"));
@ -395,12 +395,12 @@ void KXmlCommandAdvancedDlg::parseXmlCommand(KXmlCommand *xmlcmd)
void KXmlCommandAdvancedDlg::parseGroupItem(DrGroup *grp, TQListViewItem *parent) void KXmlCommandAdvancedDlg::parseGroupItem(DrGroup *grp, TQListViewItem *parent)
{ {
QListViewItem *item(0); TQListViewItem *item(0);
TQPtrListIterator<DrGroup> git(grp->groups()); TQPtrListIterator<DrGroup> git(grp->groups());
for (; git.current(); ++git) for (; git.current(); ++git)
{ {
QString namestr = git.current()->name(); TQString namestr = git.current()->name();
if (namestr.isEmpty()) if (namestr.isEmpty())
{ {
namestr = "group_"+kapp->randomString(4); namestr = "group_"+kapp->randomString(4);
@ -417,7 +417,7 @@ void KXmlCommandAdvancedDlg::parseGroupItem(DrGroup *grp, TQListViewItem *parent
TQPtrListIterator<DrBase> oit(grp->options()); TQPtrListIterator<DrBase> oit(grp->options());
for (; oit.current(); ++oit) for (; oit.current(); ++oit)
{ {
QString namestr = oit.current()->name().mid(m_xmlcmd->name().length()+6); TQString namestr = oit.current()->name().mid(m_xmlcmd->name().length()+6);
if (namestr.isEmpty()) if (namestr.isEmpty())
{ {
namestr = "option_"+kapp->randomString(4); namestr = "option_"+kapp->randomString(4);
@ -454,7 +454,7 @@ void KXmlCommandAdvancedDlg::viewItem(TQListViewItem *item)
m_name->setText(item->text(1)); m_name->setText(item->text(1));
m_desc->setText(item->text(0)); m_desc->setText(item->text(0));
DrBase *opt = (m_opts.contains(item->text(1)) ? m_opts[item->text(1)] : 0); DrBase *opt = (m_opts.tqcontains(item->text(1)) ? m_opts[item->text(1)] : 0);
if (opt) if (opt)
{ {
bool isgroup = (opt->type() < DrBase::String); bool isgroup = (opt->type() < DrBase::String);
@ -481,7 +481,7 @@ void KXmlCommandAdvancedDlg::viewItem(TQListViewItem *item)
case DrBase::List: case DrBase::List:
{ {
TQPtrListIterator<DrBase> it(*(static_cast<DrListOption*>(opt)->choices())); TQPtrListIterator<DrBase> it(*(static_cast<DrListOption*>(opt)->choices()));
QListViewItem *item(0); TQListViewItem *item(0);
for (; it.current(); ++it) for (; it.current(); ++it)
{ {
item = new TQListViewItem(m_values, item, it.current()->name(), it.current()->get("text")); item = new TQListViewItem(m_values, item, it.current()->name(), it.current()->get("text"));
@ -497,9 +497,9 @@ void KXmlCommandAdvancedDlg::viewItem(TQListViewItem *item)
m_addgrp->setEnabled(isgroup); m_addgrp->setEnabled(isgroup);
m_addopt->setEnabled(isgroup); m_addopt->setEnabled(isgroup);
QListViewItem *prevItem = findPrev(item), *nextItem = findNext(item); TQListViewItem *prevItem = findPrev(item), *nextItem = findNext(item);
DrBase *prevOpt = (prevItem && m_opts.contains(prevItem->text(1)) ? m_opts[prevItem->text(1)] : 0); DrBase *prevOpt = (prevItem && m_opts.tqcontains(prevItem->text(1)) ? m_opts[prevItem->text(1)] : 0);
DrBase *nextOpt = (nextItem && m_opts.contains(nextItem->text(1)) ? m_opts[nextItem->text(1)] : 0); DrBase *nextOpt = (nextItem && m_opts.tqcontains(nextItem->text(1)) ? m_opts[nextItem->text(1)] : 0);
m_up->setEnabled(prevOpt && !(prevOpt->type() < DrBase::String && opt->type() >= DrBase::String)); m_up->setEnabled(prevOpt && !(prevOpt->type() < DrBase::String && opt->type() >= DrBase::String));
m_down->setEnabled(nextOpt && !(isgroup && nextOpt->type() >= DrBase::String)); m_down->setEnabled(nextOpt && !(isgroup && nextOpt->type() >= DrBase::String));
@ -542,7 +542,7 @@ void KXmlCommandAdvancedDlg::slotTypeChanged(int ID)
void KXmlCommandAdvancedDlg::slotAddValue() void KXmlCommandAdvancedDlg::slotAddValue()
{ {
QListViewItem *item = new TQListViewItem(m_values, m_values->lastItem(), i18n("Name"), i18n("Description")); TQListViewItem *item = new TQListViewItem(m_values, m_values->lastItem(), i18n("Name"), i18n("Description"));
item->setRenameEnabled(0, true); item->setRenameEnabled(0, true);
item->setRenameEnabled(1, true); item->setRenameEnabled(1, true);
m_values->ensureItemVisible(item); m_values->ensureItemVisible(item);
@ -552,7 +552,7 @@ void KXmlCommandAdvancedDlg::slotAddValue()
void KXmlCommandAdvancedDlg::slotRemoveValue() void KXmlCommandAdvancedDlg::slotRemoveValue()
{ {
QListViewItem *item = m_values->currentItem(); TQListViewItem *item = m_values->currentItem();
if (item) if (item)
delete item; delete item;
slotValueSelected(m_values->currentItem()); slotValueSelected(m_values->currentItem());
@ -560,7 +560,7 @@ void KXmlCommandAdvancedDlg::slotRemoveValue()
void KXmlCommandAdvancedDlg::slotApplyChanges() void KXmlCommandAdvancedDlg::slotApplyChanges()
{ {
QListViewItem *item = m_view->currentItem(); TQListViewItem *item = m_view->currentItem();
if (item) if (item)
{ {
if (m_name->text().isEmpty() || m_name->text() == "__root__") if (m_name->text().isEmpty() || m_name->text() == "__root__")
@ -571,7 +571,7 @@ void KXmlCommandAdvancedDlg::slotApplyChanges()
m_apply->setEnabled(false); m_apply->setEnabled(false);
DrBase *opt = (m_opts.contains(item->text(1)) ? m_opts[item->text(1)] : 0); DrBase *opt = (m_opts.tqcontains(item->text(1)) ? m_opts[item->text(1)] : 0);
m_opts.remove(item->text(1)); m_opts.remove(item->text(1));
delete opt; delete opt;
@ -602,7 +602,7 @@ void KXmlCommandAdvancedDlg::slotApplyChanges()
else else
opt = new DrBooleanOption; opt = new DrBooleanOption;
DrListOption *lopt = static_cast<DrListOption*>(opt); DrListOption *lopt = static_cast<DrListOption*>(opt);
QListViewItem *item = m_values->firstChild(); TQListViewItem *item = m_values->firstChild();
while (item) while (item)
{ {
DrBase *choice = new DrBase; DrBase *choice = new DrBase;
@ -642,14 +642,14 @@ void KXmlCommandAdvancedDlg::slotAddGroup()
{ {
if (m_view->currentItem()) if (m_view->currentItem())
{ {
QString ID = generateId(m_opts); TQString ID = generateId(m_opts);
DrGroup *grp = new DrGroup; DrGroup *grp = new DrGroup;
grp->setName(ID); grp->setName(ID);
grp->set("text", i18n("New Group")); grp->set("text", i18n("New Group"));
m_opts[ID] = grp; m_opts[ID] = grp;
QListViewItem *item = new TQListViewItem(m_view->currentItem(), i18n("New Group"), ID); TQListViewItem *item = new TQListViewItem(m_view->currentItem(), i18n("New Group"), ID);
item->setRenameEnabled(0, true); item->setRenameEnabled(0, true);
item->setPixmap(0, SmallIcon("folder")); item->setPixmap(0, SmallIcon("folder"));
m_view->ensureItemVisible(item); m_view->ensureItemVisible(item);
@ -661,14 +661,14 @@ void KXmlCommandAdvancedDlg::slotAddOption()
{ {
if (m_view->currentItem()) if (m_view->currentItem())
{ {
QString ID = generateId(m_opts); TQString ID = generateId(m_opts);
DrBase *opt = new DrStringOption; DrBase *opt = new DrStringOption;
opt->setName(ID); opt->setName(ID);
opt->set("text", i18n("New Option")); opt->set("text", i18n("New Option"));
m_opts[ID] = opt; m_opts[ID] = opt;
QListViewItem *item = new TQListViewItem(m_view->currentItem(), i18n("New Option"), ID); TQListViewItem *item = new TQListViewItem(m_view->currentItem(), i18n("New Option"), ID);
item->setRenameEnabled(0, true); item->setRenameEnabled(0, true);
item->setPixmap(0, SmallIcon("document")); item->setPixmap(0, SmallIcon("document"));
m_view->ensureItemVisible(item); m_view->ensureItemVisible(item);
@ -678,12 +678,12 @@ void KXmlCommandAdvancedDlg::slotAddOption()
void KXmlCommandAdvancedDlg::slotRemoveItem() void KXmlCommandAdvancedDlg::slotRemoveItem()
{ {
QListViewItem *item = m_view->currentItem(); TQListViewItem *item = m_view->currentItem();
if (item) if (item)
{ {
QListViewItem *newCurrent(item->nextSibling()); TQListViewItem *newCurrent(item->nextSibling());
if (!newCurrent) if (!newCurrent)
newCurrent = item->parent(); newCurrent = item->tqparent();
removeItem(item); removeItem(item);
delete item; delete item;
m_view->setSelected(newCurrent, true); m_view->setSelected(newCurrent, true);
@ -694,7 +694,7 @@ void KXmlCommandAdvancedDlg::removeItem(TQListViewItem *item)
{ {
delete m_opts[item->text(1)]; delete m_opts[item->text(1)];
m_opts.remove(item->text(1)); m_opts.remove(item->text(1));
QListViewItem *child = item->firstChild(); TQListViewItem *child = item->firstChild();
while (child && item) while (child && item)
{ {
removeItem(child); removeItem(child);
@ -705,15 +705,15 @@ void KXmlCommandAdvancedDlg::removeItem(TQListViewItem *item)
void KXmlCommandAdvancedDlg::slotMoveUp() void KXmlCommandAdvancedDlg::slotMoveUp()
{ {
QListViewItem *item = m_view->currentItem(), *prev = 0; TQListViewItem *item = m_view->currentItem(), *prev = 0;
if (item && (prev=findPrev(item))) if (item && (prev=findPrev(item)))
{ {
QListViewItem *after(0); TQListViewItem *after(0);
if ((after=findPrev(prev)) != 0) if ((after=findPrev(prev)) != 0)
item->moveItem(after); item->moveItem(after);
else else
{ {
QListViewItem *parent = item->parent(); TQListViewItem *parent = item->tqparent();
parent->takeItem(item); parent->takeItem(item);
parent->insertItem(item); parent->insertItem(item);
} }
@ -724,7 +724,7 @@ void KXmlCommandAdvancedDlg::slotMoveUp()
void KXmlCommandAdvancedDlg::slotMoveDown() void KXmlCommandAdvancedDlg::slotMoveDown()
{ {
QListViewItem *item = m_view->currentItem(), *next = 0; TQListViewItem *item = m_view->currentItem(), *next = 0;
if (item && (next=findNext(item))) if (item && (next=findNext(item)))
{ {
item->moveItem(next); item->moveItem(next);
@ -751,7 +751,7 @@ void KXmlCommandAdvancedDlg::slotValueSelected(TQListViewItem *item)
void KXmlCommandAdvancedDlg::slotOptionRenamed(TQListViewItem *item, int) void KXmlCommandAdvancedDlg::slotOptionRenamed(TQListViewItem *item, int)
{ {
if (item && m_opts.contains(item->text(1))) if (item && m_opts.tqcontains(item->text(1)))
{ {
DrBase *opt = m_opts[item->text(1)]; DrBase *opt = m_opts[item->text(1)];
opt->set("text", item->text(0)); opt->set("text", item->text(0));
@ -764,10 +764,10 @@ void KXmlCommandAdvancedDlg::recreateGroup(TQListViewItem *item, DrGroup *grp)
if (!item) if (!item)
return; return;
QListViewItem *child = item->firstChild(); TQListViewItem *child = item->firstChild();
while (child) while (child)
{ {
DrBase *opt = (m_opts.contains(child->text(1)) ? m_opts[child->text(1)] : 0); DrBase *opt = (m_opts.tqcontains(child->text(1)) ? m_opts[child->text(1)] : 0);
if (opt) if (opt)
{ {
if (opt->type() == DrBase::Group) if (opt->type() == DrBase::Group)
@ -807,7 +807,7 @@ bool KXmlCommandAdvancedDlg::editCommand(KXmlCommand *xmlcmd, TQWidget *parent)
xmlcmd->setComment( xmldlg->m_comment->text().replace( TQRegExp( "\n" ), " " ) ); xmlcmd->setComment( xmldlg->m_comment->text().replace( TQRegExp( "\n" ), " " ) );
// need to recreate the driver tree structure // need to recreate the driver tree structure
DrMain *driver = (xmldlg->m_opts.contains("__root__") ? static_cast<DrMain*>(xmldlg->m_opts["__root__"]) : 0); DrMain *driver = (xmldlg->m_opts.tqcontains("__root__") ? static_cast<DrMain*>(xmldlg->m_opts["__root__"]) : 0);
if (!driver && xmldlg->m_opts.count() > 0) if (!driver && xmldlg->m_opts.count() > 0)
{ {
kdDebug() << "KXmlCommandAdvancedDlg: driver structure not found, creating one" << endl; kdDebug() << "KXmlCommandAdvancedDlg: driver structure not found, creating one" << endl;
@ -833,11 +833,11 @@ KXmlCommandDlg::KXmlCommandDlg(TQWidget *parent, const char *name)
setButtonText(Details, i18n("&Mime Type Settings")); setButtonText(Details, i18n("&Mime Type Settings"));
m_cmd = 0; m_cmd = 0;
QWidget *dummy = new TQWidget(this, "TopDetail"); TQWidget *dummy = new TQWidget(this, "TopDetail");
QWidget *topmain = new TQWidget(this, "TopMain"); TQWidget *topmain = new TQWidget(this, "TopMain");
QGroupBox *m_gb1 = new TQGroupBox(0, Qt::Horizontal, i18n("Supported &Input Formats"), dummy); TQGroupBox *m_gb1 = new TQGroupBox(0, Qt::Horizontal, i18n("Supported &Input Formats"), dummy);
QGroupBox *m_gb2 = new TQGroupBox(0, Qt::Horizontal, i18n("Requirements"), topmain); TQGroupBox *m_gb2 = new TQGroupBox(0, Qt::Horizontal, i18n("Requirements"), topmain);
m_description = new TQLineEdit(topmain); m_description = new TQLineEdit(topmain);
m_idname = new TQLabel(topmain); m_idname = new TQLabel(topmain);
@ -848,7 +848,7 @@ KXmlCommandDlg::KXmlCommandDlg(TQWidget *parent, const char *name)
m_addreq->setIconSet(SmallIconSet("filenew")); m_addreq->setIconSet(SmallIconSet("filenew"));
m_removereq = new TQToolButton(m_gb2); m_removereq = new TQToolButton(m_gb2);
m_removereq->setIconSet(SmallIconSet("editdelete")); m_removereq->setIconSet(SmallIconSet("editdelete"));
QPushButton *m_edit = new KPushButton(KGuiItem(i18n("&Edit Command..."), "edit"), topmain); TQPushButton *m_edit = new KPushButton(KGuiItem(i18n("&Edit Command..."), "edit"), topmain);
m_mimetype = new TQComboBox(dummy); m_mimetype = new TQComboBox(dummy);
m_availablemime = new KListBox(m_gb1); m_availablemime = new KListBox(m_gb1);
m_selectedmime = new KListBox(m_gb1); m_selectedmime = new KListBox(m_gb1);
@ -863,48 +863,48 @@ KXmlCommandDlg::KXmlCommandDlg(TQWidget *parent, const char *name)
m_addmime->setEnabled(false); m_addmime->setEnabled(false);
m_removemime->setEnabled(false); m_removemime->setEnabled(false);
QLabel *m_desclab = new TQLabel(i18n("&Description:"), topmain); TQLabel *m_desclab = new TQLabel(i18n("&Description:"), topmain);
m_desclab->setBuddy(m_description); m_desclab->setBuddy(m_description);
QLabel *m_mimetypelab = new TQLabel(i18n("Output &format:"), dummy); TQLabel *m_mimetypelab = new TQLabel(i18n("Output &format:"), dummy);
m_mimetypelab->setBuddy(m_mimetype); m_mimetypelab->setBuddy(m_mimetype);
QLabel *m_idnamelab = new TQLabel(i18n("ID name:"), topmain); TQLabel *m_idnamelab = new TQLabel(i18n("ID name:"), topmain);
QFont f(m_idname->font()); TQFont f(m_idname->font());
f.setBold(true); f.setBold(true);
m_idname->setFont(f); m_idname->setFont(f);
KSeparator *sep1 = new KSeparator(TQFrame::HLine, dummy); KSeparator *sep1 = new KSeparator(TQFrame::HLine, dummy);
QVBoxLayout *l0 = new TQVBoxLayout(topmain, 0, 10); TQVBoxLayout *l0 = new TQVBoxLayout(topmain, 0, 10);
QGridLayout *l5 = new TQGridLayout(0, 2, 2, 0, 5); TQGridLayout *l5 = new TQGridLayout(0, 2, 2, 0, 5);
l0->addLayout(l5); l0->addLayout(TQT_TQLAYOUT(l5));
l5->addWidget(m_idnamelab, 0, 0); l5->addWidget(m_idnamelab, 0, 0);
l5->addWidget(m_idname, 0, 1); l5->addWidget(m_idname, 0, 1);
l5->addWidget(m_desclab, 1, 0); l5->addWidget(m_desclab, 1, 0);
l5->addWidget(m_description, 1, 1); l5->addWidget(m_description, 1, 1);
l0->addWidget(m_gb2); l0->addWidget(m_gb2);
QHBoxLayout *l3 = new TQHBoxLayout(0, 0, 0); TQHBoxLayout *l3 = new TQHBoxLayout(0, 0, 0);
l0->addLayout(l3); l0->addLayout(l3);
l3->addWidget(m_edit); l3->addWidget(m_edit);
l3->addStretch(1); l3->addStretch(1);
QVBoxLayout *l7 = new TQVBoxLayout(dummy, 0, 10); TQVBoxLayout *l7 = new TQVBoxLayout(dummy, 0, 10);
QHBoxLayout *l6 = new TQHBoxLayout(0, 0, 5); TQHBoxLayout *l6 = new TQHBoxLayout(0, 0, 5);
l7->addWidget(sep1); l7->addWidget(sep1);
l7->addLayout(l6); l7->addLayout(l6);
l6->addWidget(m_mimetypelab, 0); l6->addWidget(m_mimetypelab, 0);
l6->addWidget(m_mimetype, 1); l6->addWidget(m_mimetype, 1);
l7->addWidget(m_gb1); l7->addWidget(m_gb1);
QGridLayout *l2 = new TQGridLayout(m_gb1->layout(), 4, 3, 10); TQGridLayout *l2 = new TQGridLayout(TQT_TQLAYOUT(m_gb1->layout()), 4, 3, 10);
l2->addMultiCellWidget(m_availablemime, 0, 3, 2, 2); l2->addMultiCellWidget(m_availablemime, 0, 3, 2, 2);
l2->addMultiCellWidget(m_selectedmime, 0, 3, 0, 0); l2->addMultiCellWidget(m_selectedmime, 0, 3, 0, 0);
l2->addWidget(m_addmime, 1, 1); l2->addWidget(m_addmime, 1, 1);
l2->addWidget(m_removemime, 2, 1); l2->addWidget(m_removemime, 2, 1);
l2->setRowStretch(0, 1); l2->setRowStretch(0, 1);
l2->setRowStretch(3, 1); l2->setRowStretch(3, 1);
QHBoxLayout *l4 = new TQHBoxLayout(m_gb2->layout(), 10); TQHBoxLayout *l4 = new TQHBoxLayout(TQT_TQLAYOUT(m_gb2->layout()), 10);
l4->addWidget(m_requirements); l4->addWidget(m_requirements);
QVBoxLayout *l8 = new TQVBoxLayout(0, 0, 0); TQVBoxLayout *l8 = new TQVBoxLayout(0, 0, 0);
l4->addLayout(l8); l4->addLayout(l8);
l8->addWidget(m_addreq); l8->addWidget(m_addreq);
l8->addWidget(m_removereq); l8->addWidget(m_removereq);
@ -922,7 +922,7 @@ KXmlCommandDlg::KXmlCommandDlg(TQWidget *parent, const char *name)
KMimeType::List list = KMimeType::allMimeTypes(); KMimeType::List list = KMimeType::allMimeTypes();
for (TQValueList<KMimeType::Ptr>::ConstIterator it=list.begin(); it!=list.end(); ++it) for (TQValueList<KMimeType::Ptr>::ConstIterator it=list.begin(); it!=list.end(); ++it)
{ {
QString mimetype = (*it)->name(); TQString mimetype = (*it)->name();
m_mimelist << mimetype; m_mimelist << mimetype;
} }
@ -943,15 +943,15 @@ void KXmlCommandDlg::setCommand(KXmlCommand *xmlCmd)
m_idname->setText(xmlCmd->name()); m_idname->setText(xmlCmd->name());
m_requirements->clear(); m_requirements->clear();
QStringList list = xmlCmd->requirements(); TQStringList list = xmlCmd->requirements();
QListViewItem *item(0); TQListViewItem *item(0);
for (TQStringList::ConstIterator it=list.begin(); it!=list.end(); ++it) for (TQStringList::ConstIterator it=list.begin(); it!=list.end(); ++it)
{ {
item = new TQListViewItem(m_requirements, item, *it); item = new TQListViewItem(m_requirements, item, *it);
item->setRenameEnabled(0, true); item->setRenameEnabled(0, true);
} }
int index = m_mimelist.findIndex(xmlCmd->mimeType()); int index = m_mimelist.tqfindIndex(xmlCmd->mimeType());
if (index != -1) if (index != -1)
m_mimetype->setCurrentItem(index); m_mimetype->setCurrentItem(index);
else else
@ -964,7 +964,7 @@ void KXmlCommandDlg::setCommand(KXmlCommand *xmlCmd)
for (TQStringList::ConstIterator it=list.begin(); it!=list.end(); ++it) for (TQStringList::ConstIterator it=list.begin(); it!=list.end(); ++it)
{ {
m_selectedmime->insertItem(*it); m_selectedmime->insertItem(*it);
delete m_availablemime->findItem(*it, Qt::ExactMatch); delete m_availablemime->tqfindItem(*it, TQt::ExactMatch);
} }
} }
@ -974,8 +974,8 @@ void KXmlCommandDlg::slotOk()
{ {
m_cmd->setMimeType((m_mimetype->currentText() == "all/all" ? TQString::null : m_mimetype->currentText())); m_cmd->setMimeType((m_mimetype->currentText() == "all/all" ? TQString::null : m_mimetype->currentText()));
m_cmd->setDescription(m_description->text()); m_cmd->setDescription(m_description->text());
QStringList l; TQStringList l;
QListViewItem *item = m_requirements->firstChild(); TQListViewItem *item = m_requirements->firstChild();
while (item) while (item)
{ {
l << item->text(0); l << item->text(0);
@ -1030,7 +1030,7 @@ void KXmlCommandDlg::slotEditCommand()
void KXmlCommandDlg::slotAddReq() void KXmlCommandDlg::slotAddReq()
{ {
QListViewItem *item = new TQListViewItem(m_requirements, m_requirements->lastItem(), i18n("exec:/")); TQListViewItem *item = new TQListViewItem(m_requirements, m_requirements->lastItem(), i18n("exec:/"));
item->setRenameEnabled(0, true); item->setRenameEnabled(0, true);
m_requirements->ensureItemVisible(item); m_requirements->ensureItemVisible(item);
item->startRename(0); item->startRename(0);

@ -75,15 +75,15 @@ protected slots:
private: private:
KListView *m_view; KListView *m_view;
QLineEdit *m_name, *m_desc, *m_format, *m_default, *m_command; TQLineEdit *m_name, *m_desc, *m_format, *m_default, *m_command;
QComboBox *m_type; TQComboBox *m_type;
QWidget *m_dummy; TQWidget *m_dummy;
KListView *m_values; KListView *m_values;
QLineEdit *m_edit1, *m_edit2; TQLineEdit *m_edit1, *m_edit2;
QWidgetStack *m_stack; TQWidgetStack *m_stack;
QToolButton *m_apply, *m_addgrp, *m_addopt, *m_delopt, *m_up, *m_down; TQToolButton *m_apply, *m_addgrp, *m_addopt, *m_delopt, *m_up, *m_down;
QLineEdit *m_inputfile, *m_inputpipe, *m_outputfile, *m_outputpipe; TQLineEdit *m_inputfile, *m_inputpipe, *m_outputfile, *m_outputpipe;
QToolButton *m_addval, *m_delval; TQToolButton *m_addval, *m_delval;
TQTextEdit *m_comment; TQTextEdit *m_comment;
TQCheckBox *m_persistent; TQCheckBox *m_persistent;
@ -112,15 +112,15 @@ protected slots:
void slotOk(); void slotOk();
private: private:
QLineEdit *m_description; TQLineEdit *m_description;
QLabel *m_idname; TQLabel *m_idname;
QComboBox *m_mimetype; TQComboBox *m_mimetype;
KListBox *m_availablemime, *m_selectedmime; KListBox *m_availablemime, *m_selectedmime;
QToolButton *m_addmime, *m_removemime; TQToolButton *m_addmime, *m_removemime;
KListView *m_requirements; KListView *m_requirements;
QToolButton *m_removereq, *m_addreq; TQToolButton *m_removereq, *m_addreq;
QStringList m_mimelist; TQStringList m_mimelist;
KXmlCommand *m_cmd; KXmlCommand *m_cmd;
}; };

@ -45,8 +45,8 @@ KXmlCommandSelector::KXmlCommandSelector(bool canBeNull, TQWidget *parent, const
{ {
m_cmd = new TQComboBox(this); m_cmd = new TQComboBox(this);
connect(m_cmd, TQT_SIGNAL(activated(int)), TQT_SLOT(slotCommandSelected(int))); connect(m_cmd, TQT_SIGNAL(activated(int)), TQT_SLOT(slotCommandSelected(int)));
QPushButton *m_add = new KPushButton(this); TQPushButton *m_add = new KPushButton(this);
QPushButton *m_edit = new KPushButton(this); TQPushButton *m_edit = new KPushButton(this);
m_add->setPixmap(SmallIcon("filenew")); m_add->setPixmap(SmallIcon("filenew"));
m_edit->setPixmap(SmallIcon("configure")); m_edit->setPixmap(SmallIcon("configure"));
connect(m_add, TQT_SIGNAL(clicked()), TQT_SLOT(slotAddCommand())); connect(m_add, TQT_SIGNAL(clicked()), TQT_SLOT(slotAddCommand()));
@ -62,9 +62,9 @@ KXmlCommandSelector::KXmlCommandSelector(bool canBeNull, TQWidget *parent, const
m_line = 0; m_line = 0;
m_usefilter = 0; m_usefilter = 0;
QPushButton *m_browse = 0; TQPushButton *m_browse = 0;
QVBoxLayout *l0 = new TQVBoxLayout(this, 0, 10); TQVBoxLayout *l0 = new TQVBoxLayout(this, 0, 10);
if (canBeNull) if (canBeNull)
{ {
@ -86,7 +86,7 @@ KXmlCommandSelector::KXmlCommandSelector(bool canBeNull, TQWidget *parent, const
setTabOrder(m_cmd, m_add); setTabOrder(m_cmd, m_add);
setTabOrder(m_add, m_edit); setTabOrder(m_add, m_edit);
QHBoxLayout *l1 = new TQHBoxLayout(0, 0, 10); TQHBoxLayout *l1 = new TQHBoxLayout(0, 0, 10);
l0->addLayout(l1); l0->addLayout(l1);
l1->addWidget(m_line); l1->addWidget(m_line);
l1->addWidget(m_browse); l1->addWidget(m_browse);
@ -97,9 +97,9 @@ KXmlCommandSelector::KXmlCommandSelector(bool canBeNull, TQWidget *parent, const
else else
setFocusProxy(m_cmd); setFocusProxy(m_cmd);
QGridLayout *l2 = new TQGridLayout(0, 2, (m_usefilter?3:2), 0, 5); TQGridLayout *l2 = new TQGridLayout(0, 2, (m_usefilter?3:2), 0, 5);
int c(0); int c(0);
l0->addLayout(l2); l0->addLayout(TQT_TQLAYOUT(l2));
if (m_usefilter) if (m_usefilter)
{ {
l2->addWidget(m_usefilter, 0, c++); l2->addWidget(m_usefilter, 0, c++);
@ -109,7 +109,7 @@ KXmlCommandSelector::KXmlCommandSelector(bool canBeNull, TQWidget *parent, const
l2->addLayout( l4, 1, c ); l2->addLayout( l4, 1, c );
l4->addWidget( m_helpbtn, 0 ); l4->addWidget( m_helpbtn, 0 );
l4->addWidget( m_shortinfo, 1 ); l4->addWidget( m_shortinfo, 1 );
QHBoxLayout *l3 = new TQHBoxLayout(0, 0, 0); TQHBoxLayout *l3 = new TQHBoxLayout(0, 0, 0);
l2->addLayout(l3, 0, c+1); l2->addLayout(l3, 0, c+1);
l3->addWidget(m_add); l3->addWidget(m_add);
l3->addWidget(m_edit); l3->addWidget(m_edit);
@ -122,13 +122,13 @@ KXmlCommandSelector::KXmlCommandSelector(bool canBeNull, TQWidget *parent, const
void KXmlCommandSelector::loadCommands() void KXmlCommandSelector::loadCommands()
{ {
QString thisCmd = (m_cmd->currentItem() != -1 ? m_cmdlist[m_cmd->currentItem()] : TQString::null); TQString thisCmd = (m_cmd->currentItem() != -1 ? m_cmdlist[m_cmd->currentItem()] : TQString::null);
m_cmd->clear(); m_cmd->clear();
m_cmdlist.clear(); m_cmdlist.clear();
QStringList list = KXmlCommandManager::self()->commandListWithDescription(); TQStringList list = KXmlCommandManager::self()->commandListWithDescription();
QStringList desclist; TQStringList desclist;
for (TQStringList::Iterator it=list.begin(); it!=list.end(); ++it) for (TQStringList::Iterator it=list.begin(); it!=list.end(); ++it)
{ {
m_cmdlist << (*it); m_cmdlist << (*it);
@ -137,7 +137,7 @@ void KXmlCommandSelector::loadCommands()
} }
m_cmd->insertStringList(desclist); m_cmd->insertStringList(desclist);
int index = m_cmdlist.findIndex(thisCmd); int index = m_cmdlist.tqfindIndex(thisCmd);
if (index != -1) if (index != -1)
m_cmd->setCurrentItem(index); m_cmd->setCurrentItem(index);
if (m_cmd->currentItem() != -1 && m_cmd->isEnabled()) if (m_cmd->currentItem() != -1 && m_cmd->isEnabled())
@ -146,7 +146,7 @@ void KXmlCommandSelector::loadCommands()
TQString KXmlCommandSelector::command() const TQString KXmlCommandSelector::command() const
{ {
QString cmd; TQString cmd;
if (m_line && !m_usefilter->isChecked()) if (m_line && !m_usefilter->isChecked())
cmd = m_line->text(); cmd = m_line->text();
else else
@ -156,7 +156,7 @@ TQString KXmlCommandSelector::command() const
void KXmlCommandSelector::setCommand(const TQString& cmd) void KXmlCommandSelector::setCommand(const TQString& cmd)
{ {
int index = m_cmdlist.findIndex(cmd); int index = m_cmdlist.tqfindIndex(cmd);
if (m_usefilter) if (m_usefilter)
m_usefilter->setChecked(index != -1); m_usefilter->setChecked(index != -1);
@ -171,12 +171,12 @@ void KXmlCommandSelector::setCommand(const TQString& cmd)
void KXmlCommandSelector::slotAddCommand() void KXmlCommandSelector::slotAddCommand()
{ {
bool ok(false); bool ok(false);
QString cmdId = KInputDialog::getText(i18n("Command Name"), i18n("Enter an identification name for the new command:"), TQString::null, &ok, this); TQString cmdId = KInputDialog::getText(i18n("Command Name"), i18n("Enter an identification name for the new command:"), TQString::null, &ok, this);
if (ok) if (ok)
{ {
bool added(true); bool added(true);
if (m_cmdlist.findIndex(cmdId) != -1) if (m_cmdlist.tqfindIndex(cmdId) != -1)
{ {
if (KMessageBox::warningContinueCancel( if (KMessageBox::warningContinueCancel(
this, this,
@ -202,7 +202,7 @@ void KXmlCommandSelector::slotAddCommand()
void KXmlCommandSelector::slotEditCommand() void KXmlCommandSelector::slotEditCommand()
{ {
QString xmlId = m_cmdlist[m_cmd->currentItem()]; TQString xmlId = m_cmdlist[m_cmd->currentItem()];
KXmlCommand *xmlCmd = KXmlCommandManager::self()->loadCommand(xmlId); KXmlCommand *xmlCmd = KXmlCommandManager::self()->loadCommand(xmlId);
if (xmlCmd) if (xmlCmd)
{ {
@ -222,7 +222,7 @@ void KXmlCommandSelector::slotEditCommand()
void KXmlCommandSelector::slotBrowse() void KXmlCommandSelector::slotBrowse()
{ {
QString filename = KFileDialog::getOpenFileName(TQString::null, TQString::null, this); TQString filename = KFileDialog::getOpenFileName(TQString::null, TQString::null, this);
if (!filename.isEmpty() && m_line) if (!filename.isEmpty() && m_line)
m_line->setText(filename); m_line->setText(filename);
} }

@ -56,11 +56,11 @@ signals:
void commandValid( bool ); void commandValid( bool );
private: private:
QComboBox *m_cmd; TQComboBox *m_cmd;
QLineEdit *m_line; TQLineEdit *m_line;
QCheckBox *m_usefilter; TQCheckBox *m_usefilter;
QStringList m_cmdlist; TQStringList m_cmdlist;
QLabel *m_shortinfo; TQLabel *m_shortinfo;
TQPushButton *m_helpbtn; TQPushButton *m_helpbtn;
TQString m_help; TQString m_help;
}; };

@ -79,8 +79,8 @@ TQString NetworkScanner::NetworkScannerPrivate::localPrefix()
infos.setAutoDelete(true); infos.setAutoDelete(true);
if (infos.count() > 0) if (infos.count() > 0)
{ {
QString IPstr = infos.first()->address()->nodeName(); TQString IPstr = infos.first()->address()->nodeName();
int p = IPstr.findRev('.'); int p = IPstr.tqfindRev('.');
IPstr.truncate(p); IPstr.truncate(p);
return IPstr; return IPstr;
} }
@ -104,7 +104,7 @@ NetworkScanner::NetworkScanner( int port, TQWidget *parent, const char *name )
d->scan = new KPushButton( KGuiItem( i18n( "Sc&an" ), "viewmag" ), this ); d->scan = new KPushButton( KGuiItem( i18n( "Sc&an" ), "viewmag" ), this );
d->timer = new TQTimer( this ); d->timer = new TQTimer( this );
#ifdef USE_QSOCKET #ifdef USE_QSOCKET
d->socket = new TQSocket( this ); d->socket = new TQSocket( TQT_TQOBJECT(this) );
#else #else
d->socket = new KExtendedSocket(); d->socket = new KExtendedSocket();
#endif #endif
@ -332,13 +332,13 @@ NetworkScannerConfig::NetworkScannerConfig(NetworkScanner *scanner, const char *
: KDialogBase(scanner, name, true, TQString::null, Ok|Cancel, Ok, true) : KDialogBase(scanner, name, true, TQString::null, Ok|Cancel, Ok, true)
{ {
scanner_ = scanner; scanner_ = scanner;
QWidget *dummy = new TQWidget(this); TQWidget *dummy = new TQWidget(this);
setMainWidget(dummy); setMainWidget(dummy);
KIntValidator *val = new KIntValidator( this ); KIntValidator *val = new KIntValidator( this );
QLabel *masklabel = new TQLabel(i18n("&Subnetwork:"),dummy); TQLabel *masklabel = new TQLabel(i18n("&Subnetwork:"),dummy);
QLabel *portlabel = new TQLabel(i18n("&Port:"),dummy); TQLabel *portlabel = new TQLabel(i18n("&Port:"),dummy);
QLabel *toutlabel = new TQLabel(i18n("&Timeout (ms):"),dummy); TQLabel *toutlabel = new TQLabel(i18n("&Timeout (ms):"),dummy);
QLineEdit *mm = new TQLineEdit(dummy); TQLineEdit *mm = new TQLineEdit(dummy);
mm->setText(TQString::tqfromLatin1(".[0-255]")); mm->setText(TQString::tqfromLatin1(".[0-255]"));
mm->setReadOnly(true); mm->setReadOnly(true);
mm->setFixedWidth(fontMetrics().width(mm->text())+10); mm->setFixedWidth(fontMetrics().width(mm->text())+10);
@ -363,8 +363,8 @@ NetworkScannerConfig::NetworkScannerConfig(NetworkScanner *scanner, const char *
port_->setEditText(TQString::number(scanner_->port())); port_->setEditText(TQString::number(scanner_->port()));
tout_->setText(TQString::number(scanner_->timeout())); tout_->setText(TQString::number(scanner_->timeout()));
QGridLayout *main_ = new TQGridLayout(dummy, 3, 2, 0, 10); TQGridLayout *main_ = new TQGridLayout(dummy, 3, 2, 0, 10);
QHBoxLayout *lay1 = new TQHBoxLayout(0, 0, 5); TQHBoxLayout *lay1 = new TQHBoxLayout(0, 0, 5);
main_->addWidget(masklabel, 0, 0); main_->addWidget(masklabel, 0, 0);
main_->addWidget(portlabel, 1, 0); main_->addWidget(portlabel, 1, 0);
main_->addWidget(toutlabel, 2, 0); main_->addWidget(toutlabel, 2, 0);
@ -384,8 +384,8 @@ NetworkScannerConfig::~NetworkScannerConfig()
void NetworkScannerConfig::slotOk() void NetworkScannerConfig::slotOk()
{ {
QString msg; TQString msg;
QRegExp re("(\\d{1,3})\\.(\\d{1,3})\\.(\\d{1,3})"); TQRegExp re("(\\d{1,3})\\.(\\d{1,3})\\.(\\d{1,3})");
if (!re.exactMatch(mask_->text())) if (!re.exactMatch(mask_->text()))
msg = i18n("Wrong subnetwork specification."); msg = i18n("Wrong subnetwork specification.");
else else

@ -87,8 +87,8 @@ protected slots:
void slotOk(); void slotOk();
private: private:
QLineEdit *mask_, *tout_; TQLineEdit *mask_, *tout_;
QComboBox *port_; TQComboBox *port_;
NetworkScanner *scanner_; NetworkScanner *scanner_;
}; };

@ -140,7 +140,7 @@ void SmbView::init()
while (!smb_stream.atEnd ()) while (!smb_stream.atEnd ())
{ {
TQString smb_line = smb_stream.readLine (); TQString smb_line = smb_stream.readLine ();
if (smb_line.contains (wins_keyword, FALSE) > 0) if (smb_line.tqcontains (wins_keyword, FALSE) > 0)
{ {
TQString key = smb_line.section ('=', 0, 0); TQString key = smb_line.section ('=', 0, 0);
key = key.stripWhiteSpace(); key = key.stripWhiteSpace();
@ -196,7 +196,7 @@ void SmbView::setOpen(TQListViewItem *item, bool on)
} }
*m_proc << KProcess::quote (item->text (0)); *m_proc << KProcess::quote (item->text (0));
*m_proc << " -W "; *m_proc << " -W ";
*m_proc << KProcess::quote (item->parent ()-> *m_proc << KProcess::quote (item->tqparent ()->
text (0)); text (0));
if (!krb5ccname) if (!krb5ccname)
{ {
@ -212,14 +212,14 @@ void SmbView::setOpen(TQListViewItem *item, bool on)
void SmbView::processGroups() void SmbView::processGroups()
{ {
QStringList grps = TQStringList::split('\n',m_buffer,false); TQStringList grps = TQStringList::split('\n',m_buffer,false);
clear(); clear();
for (TQStringList::ConstIterator it=grps.begin(); it!=grps.end(); ++it) for (TQStringList::ConstIterator it=grps.begin(); it!=grps.end(); ++it)
{ {
int p = (*it).tqfind("<1d>"); int p = (*it).tqfind("<1d>");
if (p == -1) if (p == -1)
continue; continue;
QListViewItem *item = new TQListViewItem(this,(*it).left(p).stripWhiteSpace()); TQListViewItem *item = new TQListViewItem(this,(*it).left(p).stripWhiteSpace());
item->setExpandable(true); item->setExpandable(true);
item->setPixmap(0,SmallIcon("network")); item->setPixmap(0,SmallIcon("network"));
} }
@ -227,18 +227,18 @@ void SmbView::processGroups()
void SmbView::processServers() void SmbView::processServers()
{ {
QStringList lines = TQStringList::split('\n',m_buffer,true); TQStringList lines = TQStringList::split('\n',m_buffer,true);
QString line; TQString line;
uint index(0); uint index(0);
while (index < lines.count()) while (index < lines.count())
{ {
line = lines[index++].stripWhiteSpace(); line = lines[index++].stripWhiteSpace();
if (line.isEmpty()) if (line.isEmpty())
break; break;
QStringList words = TQStringList::split(' ',line,false); TQStringList words = TQStringList::split(' ',line,false);
if (words[1] != "<00>" || words[3] == "<GROUP>") if (words[1] != "<00>" || words[3] == "<GROUP>")
continue; continue;
QListViewItem *item = new TQListViewItem(m_current,words[0]); TQListViewItem *item = new TQListViewItem(m_current,words[0]);
item->setExpandable(true); item->setExpandable(true);
item->setPixmap(0,SmallIcon("kdeprint_computer")); item->setPixmap(0,SmallIcon("kdeprint_computer"));
} }
@ -246,8 +246,8 @@ void SmbView::processServers()
void SmbView::processShares() void SmbView::processShares()
{ {
QStringList lines = TQStringList::split('\n',m_buffer,true); TQStringList lines = TQStringList::split('\n',m_buffer,true);
QString line; TQString line;
uint index(0); uint index(0);
for (;index < lines.count();index++) for (;index < lines.count();index++)
if (lines[index].stripWhiteSpace().startsWith("Sharename")) if (lines[index].stripWhiteSpace().startsWith("Sharename"))
@ -263,16 +263,16 @@ void SmbView::processShares()
KMessageBox::error( this, line ); KMessageBox::error( this, line );
break; break;
} }
QString typestr(line.mid(15, 10).stripWhiteSpace()); TQString typestr(line.mid(15, 10).stripWhiteSpace());
//QStringList words = TQStringList::split(' ',line,false); //TQStringList words = TQStringList::split(' ',line,false);
//if (words[1] == "Printer") //if (words[1] == "Printer")
if (typestr == "Printer") if (typestr == "Printer")
{ {
QString comm(line.mid(25).stripWhiteSpace()), sharen(line.mid(0, 15).stripWhiteSpace()); TQString comm(line.mid(25).stripWhiteSpace()), sharen(line.mid(0, 15).stripWhiteSpace());
//for (uint i=2; i<words.count(); i++) //for (uint i=2; i<words.count(); i++)
// comm += (words[i]+" "); // comm += (words[i]+" ");
//QListViewItem *item = new TQListViewItem(m_current,words[0],comm); //TQListViewItem *item = new TQListViewItem(m_current,words[0],comm);
QListViewItem *item = new TQListViewItem(m_current,sharen,comm); TQListViewItem *item = new TQListViewItem(m_current,sharen,comm);
item->setPixmap(0,SmallIcon("kdeprint_printer")); item->setPixmap(0,SmallIcon("kdeprint_printer"));
} }
} }
@ -281,7 +281,7 @@ void SmbView::processShares()
void SmbView::slotSelectionChanged(TQListViewItem *item) void SmbView::slotSelectionChanged(TQListViewItem *item)
{ {
if (item && item->depth() == 2) if (item && item->depth() == 2)
emit printerSelected(item->parent()->parent()->text(0),item->parent()->text(0),item->text(0)); emit printerSelected(item->tqparent()->tqparent()->text(0),item->tqparent()->text(0),item->text(0));
} }
void SmbView::abort() void SmbView::abort()

@ -56,12 +56,12 @@ protected slots:
private: private:
enum State { GroupListing, ServerListing, ShareListing, Idle }; enum State { GroupListing, ServerListing, ShareListing, Idle };
int m_state; int m_state;
QListViewItem *m_current; TQListViewItem *m_current;
KProcess *m_proc; KProcess *m_proc;
QString m_buffer; TQString m_buffer;
QString m_login, m_password; TQString m_login, m_password;
KTempFile *m_passwdFile; KTempFile *m_passwdFile;
QString m_wins_server; TQString m_wins_server;
}; };
#endif #endif

@ -126,9 +126,9 @@ void MarginPreview::resizeEvent(TQResizeEvent *)
void MarginPreview::paintEvent(TQPaintEvent *) void MarginPreview::paintEvent(TQPaintEvent *)
{ {
QPainter p(this); TQPainter p(this);
QRect pagebox(TQPoint(box_.left()-1,box_.top()-1),TQPoint(box_.right()+2,box_.bottom()+2)); TQRect pagebox(TQPoint(box_.left()-1,box_.top()-1),TQPoint(box_.right()+2,box_.bottom()+2));
if (nopreview_) if (nopreview_)
{ {
@ -212,22 +212,22 @@ void MarginPreview::mouseMoveEvent(TQMouseEvent *e)
switch (state_) switch (state_)
{ {
case TMoving: case TMoving:
newpos = QMIN(QMAX(e->pos().y(), box_.top()), (symetric_ ? (box_.top()+box_.bottom())/2 : margbox_.bottom()+1)); newpos = TQMIN(TQMAX(e->pos().y(), box_.top()), (symetric_ ? (box_.top()+box_.bottom())/2 : margbox_.bottom()+1));
break; break;
case BMoving: case BMoving:
newpos = QMIN(QMAX(e->pos().y(), (symetric_? (box_.top()+box_.bottom()+1)/2 : margbox_.top()-1)), box_.bottom()); newpos = TQMIN(TQMAX(e->pos().y(), (symetric_? (box_.top()+box_.bottom()+1)/2 : margbox_.top()-1)), box_.bottom());
break; break;
case LMoving: case LMoving:
newpos = QMIN(QMAX(e->pos().x(), box_.left()), (symetric_ ? (box_.left()+box_.right())/2 : margbox_.right()+1)); newpos = TQMIN(TQMAX(e->pos().x(), box_.left()), (symetric_ ? (box_.left()+box_.right())/2 : margbox_.right()+1));
break; break;
case RMoving: case RMoving:
newpos = QMIN(QMAX(e->pos().x(), (symetric_ ? (box_.left()+box_.right()+1)/2 : margbox_.left()-1)), box_.right()); newpos = TQMIN(TQMAX(e->pos().x(), (symetric_ ? (box_.left()+box_.right()+1)/2 : margbox_.left()-1)), box_.right());
break; break;
} }
if (newpos != oldpos_) if (newpos != oldpos_)
{ {
QPainter p(this); TQPainter p(this);
p.setRasterOp(Qt::XorROP); p.setRasterOp(TQt::XorROP);
p.setPen(gray); p.setPen(gray);
for (int i=0; i<2; i++, oldpos_ = newpos) for (int i=0; i<2; i++, oldpos_ = newpos)
{ {
@ -275,8 +275,8 @@ void MarginPreview::mouseReleaseEvent(TQMouseEvent *e)
{ {
if (state_ > None) if (state_ > None)
{ {
QPainter p(this); TQPainter p(this);
p.setRasterOp(Qt::XorROP); p.setRasterOp(TQt::XorROP);
p.setPen(gray); p.setPen(gray);
if (oldpos_ >= 0) if (oldpos_ >= 0)
{ {

@ -54,7 +54,7 @@ protected:
private: private:
float width_, height_; float width_, height_;
float top_, bottom_, left_, right_; float top_, bottom_, left_, right_;
QRect box_, margbox_; TQRect box_, margbox_;
float zoom_; float zoom_;
bool nopreview_; bool nopreview_;
int state_; int state_;

@ -194,7 +194,7 @@ MarginWidget::MarginWidget(TQWidget *parent, const char* name, bool allowMetricU
m_right->setEnabled(false); m_right->setEnabled(false);
//m_units->setEnabled(false); //m_units->setEnabled(false);
QGridLayout *l3 = new TQGridLayout(this, 7, 2, 0, 10); TQGridLayout *l3 = new TQGridLayout(this, 7, 2, 0, 10);
l3->addWidget(m_custom, 0, 0); l3->addWidget(m_custom, 0, 0);
l3->addWidget(m_top, 1, 0); l3->addWidget(m_top, 1, 0);
l3->addWidget(m_bottom, 2, 0); l3->addWidget(m_bottom, 2, 0);

@ -64,8 +64,8 @@ protected:
private: private:
MarginValueWidget *m_top, *m_bottom, *m_left, *m_right; MarginValueWidget *m_top, *m_bottom, *m_left, *m_right;
MarginPreview *m_preview; MarginPreview *m_preview;
QComboBox *m_units; TQComboBox *m_units;
QCheckBox *m_custom; TQCheckBox *m_custom;
bool m_symetric, m_block; bool m_symetric, m_block;
TQValueVector<float> m_default; TQValueVector<float> m_default;
TQValueVector<float> m_pagesize; TQValueVector<float> m_pagesize;

@ -31,7 +31,7 @@
TQPtrDict<MessageWindow> MessageWindow::m_windows; TQPtrDict<MessageWindow> MessageWindow::m_windows;
MessageWindow::MessageWindow( const TQString& txt, int delay, TQWidget *parent, const char *name ) MessageWindow::MessageWindow( const TQString& txt, int delay, TQWidget *parent, const char *name )
: TQWidget( parent, name, WStyle_Customize|WStyle_NoBorder|WShowModal|WType_Dialog|WDestructiveClose ) : TQWidget( parent, name, (WFlags)(WStyle_Customize|WStyle_NoBorder|WShowModal|WType_Dialog|WDestructiveClose) )
{ {
TQHBox *box = new TQHBox( this ); TQHBox *box = new TQHBox( this );
box->setFrameStyle( TQFrame::Panel|TQFrame::Raised ); box->setFrameStyle( TQFrame::Panel|TQFrame::Raised );

@ -42,19 +42,19 @@ PluginComboBox::PluginComboBox(TQWidget *parent, const char *name)
m_combo = new TQComboBox(this, "PluginCombo"); m_combo = new TQComboBox(this, "PluginCombo");
TQWhatsThis::add(m_combo, whatsThisCurrentPrintsystem); TQWhatsThis::add(m_combo, whatsThisCurrentPrintsystem);
QLabel *m_label = new TQLabel(i18n("Print s&ystem currently used:"), this); TQLabel *m_label = new TQLabel(i18n("Print s&ystem currently used:"), this);
TQWhatsThis::add(m_label, whatsThisCurrentPrintsystem); TQWhatsThis::add(m_label, whatsThisCurrentPrintsystem);
m_label->tqsetAlignment(AlignVCenter|AlignRight); m_label->tqsetAlignment(AlignVCenter|AlignRight);
m_label->setBuddy(m_combo); m_label->setBuddy(m_combo);
m_plugininfo = new TQLabel("Plugin information", this); m_plugininfo = new TQLabel("Plugin information", this);
QGridLayout *l0 = new TQGridLayout(this, 2, 2, 0, 5); TQGridLayout *l0 = new TQGridLayout(this, 2, 2, 0, 5);
l0->setColStretch(0, 1); l0->setColStretch(0, 1);
l0->addWidget(m_label, 0, 0); l0->addWidget(m_label, 0, 0);
l0->addWidget(m_combo, 0, 1); l0->addWidget(m_combo, 0, 1);
l0->addWidget(m_plugininfo, 1, 1); l0->addWidget(m_plugininfo, 1, 1);
TQValueList<KMFactory::PluginInfo> list = KMFactory::self()->pluginList(); TQValueList<KMFactory::PluginInfo> list = KMFactory::self()->pluginList();
QString currentPlugin = KMFactory::self()->printSystem(); TQString currentPlugin = KMFactory::self()->printSystem();
for (TQValueList<KMFactory::PluginInfo>::ConstIterator it=list.begin(); it!=list.end(); ++it) for (TQValueList<KMFactory::PluginInfo>::ConstIterator it=list.begin(); it!=list.end(); ++it)
{ {
m_combo->insertItem((*it).comment); m_combo->insertItem((*it).comment);
@ -69,7 +69,7 @@ PluginComboBox::PluginComboBox(TQWidget *parent, const char *name)
void PluginComboBox::slotActivated(int index) void PluginComboBox::slotActivated(int index)
{ {
QString plugin = m_pluginlist[index]; TQString plugin = m_pluginlist[index];
if (!plugin.isEmpty()) if (!plugin.isEmpty())
{ {
// the factory will notify all registered objects of the change // the factory will notify all registered objects of the change
@ -79,9 +79,9 @@ void PluginComboBox::slotActivated(int index)
void PluginComboBox::reload() void PluginComboBox::reload()
{ {
QString syst = KMFactory::self()->printSystem(); TQString syst = KMFactory::self()->printSystem();
int index(-1); int index(-1);
if ((index=m_pluginlist.findIndex(syst)) != -1) if ((index=m_pluginlist.tqfindIndex(syst)) != -1)
m_combo->setCurrentItem(index); m_combo->setCurrentItem(index);
configChanged(); configChanged();
} }

@ -42,9 +42,9 @@ protected:
void configChanged(); void configChanged();
private: private:
QComboBox *m_combo; TQComboBox *m_combo;
QLabel *m_plugininfo; TQLabel *m_plugininfo;
QStringList m_pluginlist; TQStringList m_pluginlist;
}; };
#endif #endif

@ -61,7 +61,7 @@ void PosterPreview::init()
m_dirty = false; m_dirty = false;
setDirty(); setDirty();
setMouseTracking( true ); setMouseTracking( true );
setBackgroundMode( Qt::NoBackground ); setBackgroundMode( TQt::NoBackground );
} }
void PosterPreview::parseBuffer() void PosterPreview::parseBuffer()
@ -144,7 +144,7 @@ void PosterPreview::drawContents( TQPainter *painter )
p->drawRect( x, y, m_pw, m_ph ); p->drawRect( x, y, m_pw, m_ph );
if ( pw > 0 && ph > 0 ) if ( pw > 0 && ph > 0 )
p->fillRect( x+m_mw+px, y+m_mh+py, QMIN( pw, m_pw-2*m_mw-px ), QMIN( ph, m_ph-2*m_mh-py ), p->fillRect( x+m_mw+px, y+m_mh+py, QMIN( pw, m_pw-2*m_mw-px ), QMIN( ph, m_ph-2*m_mh-py ),
( selected ? KGlobalSettings::highlightColor().dark( 160 ) : lightGray ) ); ( selected ? TQColor(KGlobalSettings::highlightColor().dark( 160 )) : lightGray ) );
p->setPen( Qt::DotLine ); p->setPen( Qt::DotLine );
p->drawRect( x+m_mw, y+m_mh, m_pw-2*m_mw, m_ph-2*m_mh ); p->drawRect( x+m_mw, y+m_mh, m_pw-2*m_mw, m_ph-2*m_mh );
p->setPen( Qt::SolidLine ); p->setPen( Qt::SolidLine );
@ -188,9 +188,9 @@ void PosterPreview::mousePressEvent( TQMouseEvent *e )
int pagenum = ( r-1 )*m_cols+c; int pagenum = ( r-1 )*m_cols+c;
if ( m_selectedpages.tqfind( pagenum ) == m_selectedpages.end() || if ( m_selectedpages.tqfind( pagenum ) == m_selectedpages.end() ||
!( e->state() & Qt::ShiftButton ) ) !( e->state() & TQt::ShiftButton ) )
{ {
if ( !( e->state() & Qt::ShiftButton ) ) if ( !( e->state() & TQt::ShiftButton ) )
m_selectedpages.clear(); m_selectedpages.clear();
m_selectedpages.append( pagenum ); m_selectedpages.append( pagenum );
update(); update();

@ -220,7 +220,7 @@ bool PPDLoader::endUi( const TQString& name )
else else
grp = m_groups.top(); grp = m_groups.top();
grp->addOption( m_option ); grp->addOption( m_option );
if ( grp->get( "text" ).contains( "install", false ) ) if ( grp->get( "text" ).tqcontains( "install", false ) )
m_option->set( "fixed", "1" ); m_option->set( "fixed", "1" );
} }
m_option = 0; m_option = 0;

@ -120,7 +120,7 @@
* Boston, MA 02110-1301, USA. * Boston, MA 02110-1301, USA.
**/ **/
#define YYSTYPE QStringList #define YYSTYPE TQStringList
#define YYPARSE_PARAM ppdloader #define YYPARSE_PARAM ppdloader
#define YYDEBUG 1 #define YYDEBUG 1
#define YYERROR_VERBOSE 1 #define YYERROR_VERBOSE 1

@ -18,7 +18,7 @@
* Boston, MA 02110-1301, USA. * Boston, MA 02110-1301, USA.
**/ **/
#define YYSTYPE QStringList #define YYSTYPE TQStringList
#define YYPARSE_PARAM ppdloader #define YYPARSE_PARAM ppdloader
#define YYDEBUG 1 #define YYDEBUG 1
#define YYERROR_VERBOSE 1 #define YYERROR_VERBOSE 1

@ -540,7 +540,7 @@ char *yytext;
#include <tqstringlist.h> #include <tqstringlist.h>
#include <tqiodevice.h> #include <tqiodevice.h>
#define YYSTYPE QStringList #define YYSTYPE TQStringList
#include "ppdparser.cpp.h" #include "ppdparser.cpp.h"
#define yylval kdeprint_ppdlval #define yylval kdeprint_ppdlval
@ -933,7 +933,7 @@ YY_RULE_SETUP
case 24: case 24:
YY_RULE_SETUP YY_RULE_SETUP
#line 100 "./ppdscanner.l" #line 100 "./ppdscanner.l"
{ yylval = yytext; kdeprint_ppdscanner_lno += yylval[0].contains('\n'); QDEBUG1("Quoted value: %s",yytext); return QUOTED; } { yylval = yytext; kdeprint_ppdscanner_lno += yylval[0].tqcontains('\n'); QDEBUG1("Quoted value: %s",yytext); return QUOTED; }
YY_BREAK YY_BREAK
case 25: case 25:
YY_RULE_SETUP YY_RULE_SETUP

@ -20,7 +20,7 @@
#include <qstringlist.h> #include <qstringlist.h>
#include <qiodevice.h> #include <qiodevice.h>
#define YYSTYPE QStringList #define YYSTYPE TQStringList
#include "ppdparser.cpp.h" #include "ppdparser.cpp.h"
#define yylval kdeprint_ppdlval #define yylval kdeprint_ppdlval
@ -97,7 +97,7 @@ L [[:alnum:]]
/** /**
* Value state * Value state
*/ */
<value>\"[^\"]*\" { yylval = yytext; kdeprint_ppdscanner_lno += yylval[0].contains('\n'); QDEBUG1("Quoted value: %s",yytext); return QUOTED; } <value>\"[^\"]*\" { yylval = yytext; kdeprint_ppdscanner_lno += yylval[0].tqcontains('\n'); QDEBUG1("Quoted value: %s",yytext); return QUOTED; }
<value>{WORD} { yylval = yytext; QDEBUG1("String part: %s",yytext); return STRINGPART; } <value>{WORD} { yylval = yytext; QDEBUG1("String part: %s",yytext); return STRINGPART; }
<value>"/" { BEGIN(translation_2); return '/'; } <value>"/" { BEGIN(translation_2); return '/'; }
<value>"\n" { kdeprint_ppdscanner_lno++; BEGIN(INITIAL); } <value>"\n" { kdeprint_ppdscanner_lno++; BEGIN(INITIAL); }

@ -26,7 +26,7 @@
class KMPrinter; class KMPrinter;
class PrinterFilter : QObject class PrinterFilter : TQObject
{ {
public: public:
PrinterFilter(TQObject *parent = 0, const char *name = 0); PrinterFilter(TQObject *parent = 0, const char *name = 0);
@ -38,8 +38,8 @@ public:
bool isEnabled() const; bool isEnabled() const;
private: private:
QRegExp m_locationRe; TQRegExp m_locationRe;
QStringList m_printers; TQStringList m_printers;
bool m_enabled; bool m_enabled;
}; };

@ -31,7 +31,7 @@ KMConfigProxy::KMConfigProxy(TQWidget *parent)
setPagePixmap("proxy"); setPagePixmap("proxy");
m_widget = new KMProxyWidget(this); m_widget = new KMProxyWidget(this);
QVBoxLayout *lay0 = new TQVBoxLayout(this, 5, 0); TQVBoxLayout *lay0 = new TQVBoxLayout(this, 5, 0);
lay0->addWidget(m_widget); lay0->addWidget(m_widget);
lay0->addStretch(1); lay0->addStretch(1);
} }

@ -31,11 +31,11 @@ KMPropRlpr::KMPropRlpr(TQWidget *parent, const char *name)
m_host = new TQLabel("",this); m_host = new TQLabel("",this);
m_queue = new TQLabel("",this); m_queue = new TQLabel("",this);
QLabel *l1 = new TQLabel(i18n("Host:"), this); TQLabel *l1 = new TQLabel(i18n("Host:"), this);
QLabel *l2 = new TQLabel(i18n("Queue:"), this); TQLabel *l2 = new TQLabel(i18n("Queue:"), this);
// layout // layout
QGridLayout *main_ = new TQGridLayout(this, 3, 2, 10, 7); TQGridLayout *main_ = new TQGridLayout(this, 3, 2, 10, 7);
main_->setColStretch(0,0); main_->setColStretch(0,0);
main_->setColStretch(1,1); main_->setColStretch(1,1);
main_->setRowStretch(2,1); main_->setRowStretch(2,1);

@ -36,8 +36,8 @@ protected:
void configureWizard(KMWizard*); void configureWizard(KMWizard*);
private: private:
QLabel *m_host; TQLabel *m_host;
QLabel *m_queue; TQLabel *m_queue;
}; };
#endif #endif

@ -31,13 +31,13 @@
KMProxyWidget::KMProxyWidget(TQWidget *parent, const char *name) KMProxyWidget::KMProxyWidget(TQWidget *parent, const char *name)
: TQGroupBox(0, Qt::Vertical, i18n("Proxy Settings"), parent, name) : TQGroupBox(0, Qt::Vertical, i18n("Proxy Settings"), parent, name)
{ {
QLabel *m_hostlabel = new TQLabel(i18n("&Host:"), this); TQLabel *m_hostlabel = new TQLabel(i18n("&Host:"), this);
QLabel *m_portlabel = new TQLabel(i18n("&Port:"), this); TQLabel *m_portlabel = new TQLabel(i18n("&Port:"), this);
m_useproxy = new TQCheckBox(i18n("&Use proxy server"), this); m_useproxy = new TQCheckBox(i18n("&Use proxy server"), this);
m_useproxy->setCursor(KCursor::handCursor()); m_useproxy->setCursor(KCursor::handCursor());
m_proxyhost = new TQLineEdit(this); m_proxyhost = new TQLineEdit(this);
m_proxyport = new TQLineEdit(this); m_proxyport = new TQLineEdit(this);
m_proxyport->setValidator(new TQIntValidator(m_proxyport)); m_proxyport->setValidator(new TQIntValidator(TQT_TQOBJECT(m_proxyport)));
m_hostlabel->setBuddy(m_proxyhost); m_hostlabel->setBuddy(m_proxyhost);
m_portlabel->setBuddy(m_proxyport); m_portlabel->setBuddy(m_proxyport);
@ -46,7 +46,7 @@ KMProxyWidget::KMProxyWidget(TQWidget *parent, const char *name)
m_proxyhost->setEnabled(false); m_proxyhost->setEnabled(false);
m_proxyport->setEnabled(false); m_proxyport->setEnabled(false);
QGridLayout *lay0 = new TQGridLayout(layout(), 3, 2, 10); TQGridLayout *lay0 = new TQGridLayout(layout(), 3, 2, 10);
lay0->setColStretch(1,1); lay0->setColStretch(1,1);
lay0->addMultiCellWidget(m_useproxy,0,0,0,1); lay0->addMultiCellWidget(m_useproxy,0,0,0,1);
lay0->addWidget(m_hostlabel,1,0); lay0->addWidget(m_hostlabel,1,0);

@ -35,9 +35,9 @@ public:
void saveConfig(KConfig*); void saveConfig(KConfig*);
private: private:
QLineEdit *m_proxyhost; TQLineEdit *m_proxyhost;
QLineEdit *m_proxyport; TQLineEdit *m_proxyport;
QCheckBox *m_useproxy; TQCheckBox *m_useproxy;
}; };
#endif #endif

@ -59,7 +59,7 @@ bool KMRlprManager::createPrinter(KMPrinter *p)
bool KMRlprManager::removePrinter(KMPrinter *p) bool KMRlprManager::removePrinter(KMPrinter *p)
{ {
if (m_printers.findRef(p) == -1) if (m_printers.tqfindRef(p) == -1)
setErrorMsg(i18n("Printer not found.")); setErrorMsg(i18n("Printer not found."));
else else
{ {
@ -78,7 +78,7 @@ bool KMRlprManager::testPrinter(KMPrinter *)
void KMRlprManager::listPrinters() void KMRlprManager::listPrinters()
{ {
QFileInfo pfi(printerFile()); TQFileInfo pfi(printerFile());
if (pfi.exists() && (!m_checktime.isValid() || m_checktime < pfi.lastModified())) if (pfi.exists() && (!m_checktime.isValid() || m_checktime < pfi.lastModified()))
{ {
loadPrintersConf(pfi.absFilePath()); loadPrintersConf(pfi.absFilePath());
@ -90,17 +90,17 @@ void KMRlprManager::listPrinters()
void KMRlprManager::loadPrintersConf(const TQString& filename) void KMRlprManager::loadPrintersConf(const TQString& filename)
{ {
QFile f(filename); TQFile f(filename);
if (f.exists() && f.open(IO_ReadOnly)) if (f.exists() && f.open(IO_ReadOnly))
{ {
QTextStream t(&f); TQTextStream t(&f);
QString line; TQString line;
while (!t.eof()) while (!t.eof())
{ {
line = t.readLine().stripWhiteSpace(); line = t.readLine().stripWhiteSpace();
if (line.isEmpty() || line[0] == '#') if (line.isEmpty() || line[0] == '#')
continue; continue;
QStringList w = TQStringList::split('\t',line,true); TQStringList w = TQStringList::split('\t',line,true);
if (w.count() < 3) if (w.count() < 3)
continue; continue;
@ -130,18 +130,18 @@ void KMRlprManager::savePrinters()
void KMRlprManager::savePrintersConf(const TQString& filename) void KMRlprManager::savePrintersConf(const TQString& filename)
{ {
QFile f(filename); TQFile f(filename);
if (f.open(IO_WriteOnly)) if (f.open(IO_WriteOnly))
{ {
QTextStream t(&f); TQTextStream t(&f);
t << "# File generated by KDE print system. Don't edit by hand." << endl; t << "# File generated by KDE print system. Don't edit by hand." << endl;
TQPtrListIterator<KMPrinter> it(m_printers); TQPtrListIterator<KMPrinter> it(m_printers);
for (;it.current();++it) for (;it.current();++it)
{ {
if (!it.current()->name().isEmpty() && it.current()->instanceName().isEmpty()) if (!it.current()->name().isEmpty() && it.current()->instanceName().isEmpty())
{ {
QString host = it.current()->option("host"); TQString host = it.current()->option("host");
QString queue = it.current()->option("queue"); TQString queue = it.current()->option("queue");
if (!host.isEmpty() && !queue.isEmpty()) if (!host.isEmpty() && !queue.isEmpty())
{ {
t << it.current()->name() << '\t' << host << '\t' << queue; t << it.current()->name() << '\t' << host << '\t' << queue;

@ -42,7 +42,7 @@ protected:
TQString printerFile(); TQString printerFile();
private: private:
QDateTime m_checktime; TQDateTime m_checktime;
}; };
#endif #endif

@ -32,9 +32,9 @@
#include <klocale.h> #include <klocale.h>
#include <kiconloader.h> #include <kiconloader.h>
static TQListViewItem* findChild(TQListViewItem *c, const TQString& txt) static TQListViewItem* rlpr_findChild(TQListViewItem *c, const TQString& txt)
{ {
QListViewItem *item(c); TQListViewItem *item(c);
while (item) while (item)
if (item->text(0) == txt) return item; if (item->text(0) == txt) return item;
else item = item->nextSibling(); else item = item->nextSibling();
@ -59,14 +59,14 @@ KMWRlpr::KMWRlpr(TQWidget *parent, const char *name)
m_view->setSorting(0); m_view->setSorting(0);
m_host = new TQLineEdit(this); m_host = new TQLineEdit(this);
m_queue = new TQLineEdit(this); m_queue = new TQLineEdit(this);
QLabel *m_hostlabel = new TQLabel(i18n("Host:"), this); TQLabel *m_hostlabel = new TQLabel(i18n("Host:"), this);
QLabel *m_queuelabel = new TQLabel(i18n("Queue:"), this); TQLabel *m_queuelabel = new TQLabel(i18n("Queue:"), this);
m_hostlabel->setBuddy(m_host); m_hostlabel->setBuddy(m_host);
m_queuelabel->setBuddy(m_queue); m_queuelabel->setBuddy(m_queue);
connect(m_view,TQT_SIGNAL(selectionChanged(TQListViewItem*)),TQT_SLOT(slotPrinterSelected(TQListViewItem*))); connect(m_view,TQT_SIGNAL(selectionChanged(TQListViewItem*)),TQT_SLOT(slotPrinterSelected(TQListViewItem*)));
QHBoxLayout *lay0 = new TQHBoxLayout(this, 0, 10); TQHBoxLayout *lay0 = new TQHBoxLayout(this, 0, 10);
QVBoxLayout *lay1 = new TQVBoxLayout(0, 0, 5); TQVBoxLayout *lay1 = new TQVBoxLayout(0, 0, 5);
lay0->addWidget(m_view,1); lay0->addWidget(m_view,1);
lay0->addLayout(lay1,1); lay0->addLayout(lay1,1);
lay1->addWidget(m_hostlabel); lay1->addWidget(m_hostlabel);
@ -94,13 +94,13 @@ void KMWRlpr::initPrinter(KMPrinter *p)
{ {
m_host->setText(p->option("host")); m_host->setText(p->option("host"));
m_queue->setText(p->option("queue")); m_queue->setText(p->option("queue"));
QListViewItem *item = findChild(m_view->firstChild(),m_host->text()); TQListViewItem *item = rlpr_findChild(m_view->firstChild(),m_host->text());
if (item) if (item)
{ {
item = findChild(item->firstChild(),m_queue->text()); item = rlpr_findChild(item->firstChild(),m_queue->text());
if (item) if (item)
{ {
item->parent()->setOpen(true); item->tqparent()->setOpen(true);
m_view->setCurrentItem(item); m_view->setCurrentItem(item);
m_view->ensureItemVisible(item); m_view->ensureItemVisible(item);
} }
@ -109,7 +109,7 @@ void KMWRlpr::initPrinter(KMPrinter *p)
void KMWRlpr::updatePrinter(KMPrinter *p) void KMWRlpr::updatePrinter(KMPrinter *p)
{ {
QString uri = TQString::tqfromLatin1("lpd://%1/%2").arg(m_host->text()).arg(m_queue->text()); TQString uri = TQString::tqfromLatin1("lpd://%1/%2").arg(m_host->text()).arg(m_queue->text());
p->setDevice(uri); p->setDevice(uri);
p->setOption("host",m_host->text()); p->setOption("host",m_host->text());
p->setOption("queue",m_queue->text()); p->setOption("queue",m_queue->text());
@ -128,12 +128,12 @@ void KMWRlpr::updatePrinter(KMPrinter *p)
void KMWRlpr::initialize() void KMWRlpr::initialize()
{ {
m_view->clear(); m_view->clear();
QFile f(TQDir::homeDirPath()+"/.rlprrc"); TQFile f(TQDir::homeDirPath()+"/.rlprrc");
if (!f.exists()) f.setName("/etc/rlprrc"); if (!f.exists()) f.setName("/etc/rlprrc");
if (f.exists() && f.open(IO_ReadOnly)) if (f.exists() && f.open(IO_ReadOnly))
{ {
QTextStream t(&f); TQTextStream t(&f);
QString line, host; TQString line, host;
int p(-1); int p(-1);
while (!t.eof()) while (!t.eof())
{ {
@ -143,12 +143,12 @@ void KMWRlpr::initialize()
if ((p=line.tqfind(':')) != -1) if ((p=line.tqfind(':')) != -1)
{ {
host = line.left(p).stripWhiteSpace(); host = line.left(p).stripWhiteSpace();
QListViewItem *hitem = new TQListViewItem(m_view,host); TQListViewItem *hitem = new TQListViewItem(m_view,host);
hitem->setPixmap(0,SmallIcon("kdeprint_computer")); hitem->setPixmap(0,SmallIcon("kdeprint_computer"));
QStringList prs = TQStringList::split(' ',line.right(line.length()-p-1),false); TQStringList prs = TQStringList::split(' ',line.right(line.length()-p-1),false);
for (TQStringList::ConstIterator it=prs.begin(); it!=prs.end(); ++it) for (TQStringList::ConstIterator it=prs.begin(); it!=prs.end(); ++it)
{ {
QListViewItem *pitem = new TQListViewItem(hitem,*it); TQListViewItem *pitem = new TQListViewItem(hitem,*it);
pitem->setPixmap(0,SmallIcon("kdeprint_printer")); pitem->setPixmap(0,SmallIcon("kdeprint_printer"));
} }
} }
@ -160,9 +160,9 @@ void KMWRlpr::initialize()
f.setName("/etc/printcap"); f.setName("/etc/printcap");
if (f.exists() && f.open(IO_ReadOnly)) if (f.exists() && f.open(IO_ReadOnly))
{ {
QTextStream t(&f); TQTextStream t(&f);
QString line, buffer; TQString line, buffer;
QListViewItem *hitem(m_view->firstChild()); TQListViewItem *hitem(m_view->firstChild());
while (hitem) if (hitem->text(0) == "localhost") break; else hitem = hitem->nextSibling(); while (hitem) if (hitem->text(0) == "localhost") break; else hitem = hitem->nextSibling();
while (!t.eof()) while (!t.eof())
{ {
@ -183,13 +183,13 @@ void KMWRlpr::initialize()
int p = buffer.tqfind(':'); int p = buffer.tqfind(':');
if (p != -1) if (p != -1)
{ {
QString name = buffer.left(p); TQString name = buffer.left(p);
if (!hitem) if (!hitem)
{ {
hitem = new TQListViewItem(m_view,"localhost"); hitem = new TQListViewItem(m_view,"localhost");
hitem->setPixmap(0,SmallIcon("kdeprint_computer")); hitem->setPixmap(0,SmallIcon("kdeprint_computer"));
} }
QListViewItem *pitem = new TQListViewItem(hitem,name); TQListViewItem *pitem = new TQListViewItem(hitem,name);
pitem->setPixmap(0,SmallIcon("kdeprint_printer")); pitem->setPixmap(0,SmallIcon("kdeprint_printer"));
} }
} }
@ -203,7 +203,7 @@ void KMWRlpr::slotPrinterSelected(TQListViewItem *item)
{ {
if (item && item->depth() == 1) if (item && item->depth() == 1)
{ {
m_host->setText(item->parent()->text(0)); m_host->setText(item->tqparent()->text(0));
m_queue->setText(item->text(0)); m_queue->setText(item->text(0));
} }
} }

@ -44,7 +44,7 @@ protected:
private: private:
KListView *m_view; KListView *m_view;
QLineEdit *m_host, *m_queue; TQLineEdit *m_host, *m_queue;
}; };
#endif #endif

@ -42,14 +42,14 @@ protected:
TQObject* createObject(TQObject *parent = 0, const char *name = 0, const char * className = "TQObject", const TQStringList& args = TQStringList()) TQObject* createObject(TQObject *parent = 0, const char *name = 0, const char * className = "TQObject", const TQStringList& args = TQStringList())
{ {
Q_UNUSED(className); Q_UNUSED(className);
KDialogBase *dlg = new KDialogBase(static_cast<TQWidget*>(parent), name, true, i18n("EPSON InkJet Printer Utilities"), KDialogBase::Close); KDialogBase *dlg = new KDialogBase(TQT_TQWIDGET(parent), name, true, i18n("EPSON InkJet Printer Utilities"), KDialogBase::Close);
EscpWidget *w = new EscpWidget(dlg); EscpWidget *w = new EscpWidget(dlg);
if (args.count() > 0) if (args.count() > 0)
w->setDevice(args[0]); w->setDevice(args[0]);
if (args.count() > 1) if (args.count() > 1)
w->setPrinterName(args[1]); w->setPrinterName(args[1]);
dlg->setMainWidget(w); dlg->setMainWidget(w);
return dlg; return TQT_TQOBJECT(dlg);
} }
}; };
@ -71,18 +71,18 @@ EscpWidget::EscpWidget(TQWidget *parent, const char *name)
connect(&m_proc, TQT_SIGNAL(receivedStdout(KProcess*,char*,int)), TQT_SLOT(slotReceivedStdout(KProcess*,char*,int))); connect(&m_proc, TQT_SIGNAL(receivedStdout(KProcess*,char*,int)), TQT_SLOT(slotReceivedStdout(KProcess*,char*,int)));
connect(&m_proc, TQT_SIGNAL(receivedStderr(KProcess*,char*,int)), TQT_SLOT(slotReceivedStderr(KProcess*,char*,int))); connect(&m_proc, TQT_SIGNAL(receivedStderr(KProcess*,char*,int)), TQT_SLOT(slotReceivedStderr(KProcess*,char*,int)));
QPushButton *cleanbtn = new TQPushButton(this, "-c"); TQPushButton *cleanbtn = new TQPushButton(this, "-c");
cleanbtn->setPixmap(DesktopIcon("exec")); cleanbtn->setPixmap(DesktopIcon("exec"));
QPushButton *nozzlebtn = new TQPushButton(this, "-n"); TQPushButton *nozzlebtn = new TQPushButton(this, "-n");
nozzlebtn->setPixmap(DesktopIcon("exec")); nozzlebtn->setPixmap(DesktopIcon("exec"));
QPushButton *alignbtn = new TQPushButton(this, "-a"); TQPushButton *alignbtn = new TQPushButton(this, "-a");
alignbtn->setPixmap(DesktopIcon("exec")); alignbtn->setPixmap(DesktopIcon("exec"));
QPushButton *inkbtn = new TQPushButton(this, "-i"); TQPushButton *inkbtn = new TQPushButton(this, "-i");
inkbtn->setPixmap(DesktopIcon("kdeprint_inklevel")); inkbtn->setPixmap(DesktopIcon("kdeprint_inklevel"));
QPushButton *identbtn = new TQPushButton(this, "-d"); TQPushButton *identbtn = new TQPushButton(this, "-d");
identbtn->setPixmap(DesktopIcon("exec")); identbtn->setPixmap(DesktopIcon("exec"));
QFont f(font()); TQFont f(font());
f.setBold(true); f.setBold(true);
m_printer = new TQLabel(this); m_printer = new TQLabel(this);
m_printer->setFont(f); m_printer->setFont(f);
@ -96,15 +96,15 @@ EscpWidget::EscpWidget(TQWidget *parent, const char *name)
connect(inkbtn, TQT_SIGNAL(clicked()), TQT_SLOT(slotButtonClicked())); connect(inkbtn, TQT_SIGNAL(clicked()), TQT_SLOT(slotButtonClicked()));
connect(identbtn, TQT_SIGNAL(clicked()), TQT_SLOT(slotButtonClicked())); connect(identbtn, TQT_SIGNAL(clicked()), TQT_SLOT(slotButtonClicked()));
QLabel *printerlab = new TQLabel(i18n("Printer:"), this); TQLabel *printerlab = new TQLabel(i18n("Printer:"), this);
printerlab->tqsetAlignment(AlignRight|AlignVCenter); printerlab->tqsetAlignment(AlignRight|AlignVCenter);
QLabel *devicelab = new TQLabel(i18n("Device:"), this); TQLabel *devicelab = new TQLabel(i18n("Device:"), this);
devicelab->tqsetAlignment(AlignRight|AlignVCenter); devicelab->tqsetAlignment(AlignRight|AlignVCenter);
QLabel *cleanlab = new TQLabel(i18n("Clea&n print head"), this); TQLabel *cleanlab = new TQLabel(i18n("Clea&n print head"), this);
QLabel *nozzlelab = new TQLabel(i18n("&Print a nozzle test pattern"), this); TQLabel *nozzlelab = new TQLabel(i18n("&Print a nozzle test pattern"), this);
QLabel *alignlab = new TQLabel(i18n("&Align print head"), this); TQLabel *alignlab = new TQLabel(i18n("&Align print head"), this);
QLabel *inklab = new TQLabel(i18n("&Ink level"), this); TQLabel *inklab = new TQLabel(i18n("&Ink level"), this);
QLabel *identlab = new TQLabel(i18n("P&rinter identification"), this); TQLabel *identlab = new TQLabel(i18n("P&rinter identification"), this);
cleanlab->tqsetAlignment(AlignLeft|AlignVCenter|ShowPrefix); cleanlab->tqsetAlignment(AlignLeft|AlignVCenter|ShowPrefix);
nozzlelab->tqsetAlignment(AlignLeft|AlignVCenter|ShowPrefix); nozzlelab->tqsetAlignment(AlignLeft|AlignVCenter|ShowPrefix);
@ -121,8 +121,8 @@ EscpWidget::EscpWidget(TQWidget *parent, const char *name)
KSeparator *sep = new KSeparator(this); KSeparator *sep = new KSeparator(this);
sep->setFixedHeight(10); sep->setFixedHeight(10);
QGridLayout *l0 = new TQGridLayout(this, 8, 2, 10, 10); TQGridLayout *l0 = new TQGridLayout(this, 8, 2, 10, 10);
QGridLayout *l1 = new TQGridLayout(0, 2, 2, 0, 5); TQGridLayout *l1 = new TQGridLayout(0, 2, 2, 0, 5);
l0->addMultiCellLayout(l1, 0, 0, 0, 1); l0->addMultiCellLayout(l1, 0, 0, 0, 1);
l1->addWidget(printerlab, 0, 0); l1->addWidget(printerlab, 0, 0);
l1->addWidget(devicelab, 1, 0); l1->addWidget(devicelab, 1, 0);
@ -155,7 +155,7 @@ void EscpWidget::startCommand(const TQString& arg)
} }
else else
{ {
QString protocol = m_deviceURL.protocol(); TQString protocol = m_deviceURL.protocol();
if (protocol == "usb") if (protocol == "usb")
useUSB = true; useUSB = true;
else if (protocol != "file" && protocol != "parallel" && protocol != "serial" && !protocol.isEmpty()) else if (protocol != "file" && protocol != "parallel" && protocol != "serial" && !protocol.isEmpty())
@ -173,7 +173,7 @@ void EscpWidget::startCommand(const TQString& arg)
return; return;
} }
QString exestr = KStandardDirs::findExe("escputil"); TQString exestr = KStandardDirs::findExe("escputil");
if (exestr.isEmpty()) if (exestr.isEmpty())
{ {
KMessageBox::error(this, i18n("The executable escputil cannot be found in your " KMessageBox::error(this, i18n("The executable escputil cannot be found in your "
@ -211,8 +211,8 @@ void EscpWidget::slotProcessExited(KProcess*)
setEnabled(true); setEnabled(true);
if (!m_proc.normalExit() || m_proc.exitStatus() != 0) if (!m_proc.normalExit() || m_proc.exitStatus() != 0)
{ {
QString msg1 = "<qt>"+i18n("Operation terminated with errors.")+"</qt>"; TQString msg1 = "<qt>"+i18n("Operation terminated with errors.")+"</qt>";
QString msg2; TQString msg2;
if (!m_outbuffer.isEmpty()) if (!m_outbuffer.isEmpty())
msg2 += "<p><b><u>"+i18n("Output")+"</u></b></p><p>"+m_outbuffer+"</p>"; msg2 += "<p><b><u>"+i18n("Output")+"</u></b></p><p>"+m_outbuffer+"</p>";
if (!m_errorbuffer.isEmpty()) if (!m_errorbuffer.isEmpty())
@ -231,19 +231,19 @@ void EscpWidget::slotProcessExited(KProcess*)
void EscpWidget::slotReceivedStdout(KProcess*, char *buf, int len) void EscpWidget::slotReceivedStdout(KProcess*, char *buf, int len)
{ {
QString bufstr = TQCString(buf, len); TQString bufstr = TQCString(buf, len);
m_outbuffer.append(bufstr); m_outbuffer.append(bufstr);
} }
void EscpWidget::slotReceivedStderr(KProcess*, char *buf, int len) void EscpWidget::slotReceivedStderr(KProcess*, char *buf, int len)
{ {
QString bufstr = TQCString(buf, len); TQString bufstr = TQCString(buf, len);
m_errorbuffer.append(bufstr); m_errorbuffer.append(bufstr);
} }
void EscpWidget::slotButtonClicked() void EscpWidget::slotButtonClicked()
{ {
QString arg = sender()->name(); TQString arg = TQT_TQOBJECT_CONST(sender())->name();
startCommand(arg); startCommand(arg);
} }

@ -48,9 +48,9 @@ protected:
private: private:
KProcess m_proc; KProcess m_proc;
KURL m_deviceURL; KURL m_deviceURL;
QString m_errorbuffer, m_outbuffer; TQString m_errorbuffer, m_outbuffer;
QLabel *m_printer, *m_device; TQLabel *m_printer, *m_device;
QCheckBox *m_useraw; TQCheckBox *m_useraw;
bool m_hasoutput; bool m_hasoutput;
}; };

@ -43,8 +43,8 @@ TreeListBoxItem::TreeListBoxItem(TQListBox *lb, const TQPixmap& pix, const TQStr
} }
else else
{ {
QString parentStr = txt.left(txt.length()-m_path[m_depth].length()-1); TQString parentStr = txt.left(txt.length()-m_path[m_depth].length()-1);
TreeListBoxItem *parentItem = static_cast<TreeListBoxItem*>(lb->findItem(parentStr, Qt::ExactMatch)); TreeListBoxItem *parentItem = static_cast<TreeListBoxItem*>(lb->tqfindItem(parentStr, TQt::ExactMatch));
if (!parentItem) if (!parentItem)
{ {
// parent not found, add parent first into QListBox // parent not found, add parent first into QListBox

@ -39,7 +39,7 @@ protected:
int stepSize() const { return 16; } int stepSize() const { return 16; }
private: private:
QStringList m_path; TQStringList m_path;
int m_depth; int m_depth;
TreeListBoxItem *m_child, *m_next, *m_parent; TreeListBoxItem *m_child, *m_next, *m_parent;
}; };
@ -70,7 +70,7 @@ public:
void insertItem(const TQPixmap& pix, const TQString& txt, bool oneBlock = false); void insertItem(const TQPixmap& pix, const TQString& txt, bool oneBlock = false);
private: private:
QListBox *m_listbox; TQListBox *m_listbox;
}; };
#endif #endif

@ -54,7 +54,7 @@ KURL smbToUrl(const TQString& s)
else else
{ {
// assumes URL starts with "smb://" // assumes URL starts with "smb://"
QString username = s.mid(6, p-6); TQString username = s.mid(6, p-6);
url = KURL("smb://" + KURL::encode_string(s.mid(p+1))); url = KURL("smb://" + KURL::encode_string(s.mid(p+1)));
int q = username.tqfind(':'); int q = username.tqfind(':');
if (q == -1) if (q == -1)

@ -38,7 +38,7 @@ Group=Input (KDE)
[KDatePicker] [KDatePicker]
ToolTip=A date selection widget (KDE) ToolTip=A date selection widget (KDE)
WhatsThis=Provides a widget for calendar date input WhatsThis=Provides a widget for calendar date input
ConstructorArgs=(parent, QDate::currentDate(), name) ConstructorArgs=(parent, TQDate::currentDate(), name)
Group=Input (KDE) Group=Input (KDE)
[KDialog] [KDialog]
@ -57,7 +57,7 @@ Group=Views (KDE)
[KFontCombo] [KFontCombo]
ToolTip=Font Combo Box (KDE) ToolTip=Font Combo Box (KDE)
WhatsThis=A QCombo Box showing the installed system fonts (with preview) WhatsThis=A TQCombo Box showing the installed system fonts (with preview)
Group=Input (KDE) Group=Input (KDE)
[KFontChooser] [KFontChooser]
@ -96,12 +96,12 @@ Group=Display (KDE)
[KListBox] [KListBox]
ToolTip=Extended List Box (KDE) ToolTip=Extended List Box (KDE)
WhatsThis=An improved version of the QListBox that follows KDE settings WhatsThis=An improved version of the TQListBox that follows KDE settings
Group=Views (KDE) Group=Views (KDE)
[KListView] [KListView]
ToolTip=Extended List View (KDE) ToolTip=Extended List View (KDE)
WhatsThis=An improved version of the QListView that allows certain KDE extensions WhatsThis=An improved version of the TQListView that allows certain KDE extensions
Group=Views (KDE) Group=Views (KDE)
[KLineEdit] [KLineEdit]
@ -127,12 +127,12 @@ Group=Input (KDE)
[KProgress] [KProgress]
ToolTip=Progress Bar (KDE) ToolTip=Progress Bar (KDE)
WhatsThis=An improved progress bar for KDE that uses QFrame and QRangeControl WhatsThis=An improved progress bar for KDE that uses TQFrame and TQRangeControl
Group=Display (KDE) Group=Display (KDE)
[KPushButton] [KPushButton]
ToolTip=Improved QPushButton (KDE) ToolTip=Improved TQPushButton (KDE)
WhatsThis=An improved QPushButton to follow KDE settings WhatsThis=An improved TQPushButton to follow KDE settings
Group=Buttons (KDE) Group=Buttons (KDE)
[KKeyButton] [KKeyButton]
@ -153,7 +153,7 @@ Group=Buttons (KDE)
[KIconView] [KIconView]
IncludeFile=kiconview.h IncludeFile=kiconview.h
ToolTip=Extended Icon View (KDE) ToolTip=Extended Icon View (KDE)
WhatsThis=An improved version of the QIconView that allows certain KDE extensions WhatsThis=An improved version of the TQIconView that allows certain KDE extensions
Group=Views (KDE) Group=Views (KDE)
[KIntSpinBox] [KIntSpinBox]
@ -167,24 +167,24 @@ WhatsThis=A measuring ruler widget as seen in KWord for page widths and heights
Group=Display (KDE) Group=Display (KDE)
[KSqueezedTextLabel] [KSqueezedTextLabel]
ToolTip=A QLabel that squeezes its text (KDE) ToolTip=A TQLabel that squeezes its text (KDE)
WhatsThis=If the text is too long to fit into the label it is divided into remaining left and right parts which are separated by three dots WhatsThis=If the text is too long to fit into the label it is divided into remaining left and right parts which are separated by three dots
ConstructorArgs=("KSqueezedTextLabel", parent, name) ConstructorArgs=("KSqueezedTextLabel", parent, name)
Group=Display (KDE) Group=Display (KDE)
[KTextBrowser] [KTextBrowser]
ToolTip=Improved QTextBrowser (KDE) ToolTip=Improved TQTextBrowser (KDE)
WhatsThis=An improved version of the QTextBrowser with mail or system browser invocation support WhatsThis=An improved version of the TQTextBrowser with mail or system browser invocation support
Group=Display (KDE) Group=Display (KDE)
[KTextEdit] [KTextEdit]
ToolTip=Improved QTextEdit (KDE) ToolTip=Improved TQTextEdit (KDE)
WhatsThis=An improved version of the QTextEdit with mail or system browser invocation support WhatsThis=An improved version of the TQTextEdit with mail or system browser invocation support
Group=Input (KDE) Group=Input (KDE)
[KURLLabel] [KURLLabel]
ToolTip=URL Label (KDE) ToolTip=URL Label (KDE)
ConstructorArgs=("KURLLabel", QString::null, parent, name) ConstructorArgs=("KURLLabel", TQString(), parent, name)
Group=Display (KDE) Group=Display (KDE)
[KURLComboRequester] [KURLComboRequester]
@ -229,7 +229,7 @@ Group=Input (KDE)
[KDateTable] [KDateTable]
IncludeFile=kdatetbl.h IncludeFile=kdatetbl.h
Group=Input (KDE) Group=Input (KDE)
ConstructorArgs=(parent, QDate::currentDate(), name) ConstructorArgs=(parent, TQDate::currentDate(), name)
[KLanguageButton] [KLanguageButton]
IncludeFile=klanguagebutton.h IncludeFile=klanguagebutton.h

@ -24,7 +24,7 @@ static const char classDef[] = "#ifndef EMBED_IMAGES\n"
"#include <kstandarddirs.h>\n" "#include <kstandarddirs.h>\n"
"#endif\n" "#endif\n"
"\n" "\n"
"class %PluginName : public QWidgetPlugin\n" "class %PluginName : public TQWidgetPlugin\n"
"{\n" "{\n"
"public:\n" "public:\n"
" %PluginName();\n" " %PluginName();\n"

@ -324,7 +324,7 @@ StyleSheetListImpl::~StyleSheetListImpl()
void StyleSheetListImpl::add( StyleSheetImpl* s ) void StyleSheetListImpl::add( StyleSheetImpl* s )
{ {
if ( !styleSheets.containsRef( s ) ) { if ( !styleSheets.tqcontainsRef( s ) ) {
s->ref(); s->ref();
styleSheets.append( s ); styleSheets.append( s );
} }
@ -379,8 +379,8 @@ MediaListImpl::MediaListImpl( CSSRuleImpl *parentRule, const DOMString &media )
bool MediaListImpl::contains( const DOMString &medium ) const bool MediaListImpl::contains( const DOMString &medium ) const
{ {
return m_lstMedia.empty() || m_lstMedia.contains( medium ) || return m_lstMedia.empty() || m_lstMedia.tqcontains( medium ) ||
m_lstMedia.contains( "all" ); m_lstMedia.tqcontains( "all" );
} }
CSSStyleSheetImpl *MediaListImpl::parentStyleSheet() const CSSStyleSheetImpl *MediaListImpl::parentStyleSheet() const

@ -766,7 +766,7 @@ DOM::DOMString CSSPrimitiveValueImpl::cssText() const
+ TQString::number(tqGreen(m_value.rgbcolor)) + "," + TQString::number(tqGreen(m_value.rgbcolor)) + ","
+ TQString::number(tqAlpha(m_value.rgbcolor)/255.0) + ")"; + TQString::number(tqAlpha(m_value.rgbcolor)/255.0) + ")";
} else { } else {
text = TQColor(m_value.rgbcolor).name(); text = TQString(TQColor(m_value.rgbcolor).name());
} }
break; break;
case CSSPrimitiveValue::CSS_PAIR: case CSSPrimitiveValue::CSS_PAIR:
@ -886,9 +886,9 @@ FontFamilyValueImpl::FontFamilyValueImpl( const TQString &string)
parsedFontName = string; parsedFontName = string;
// a language tag is often added in braces at the end. Remove it. // a language tag is often added in braces at the end. Remove it.
parsedFontName.replace(parenReg, TQString::null); parsedFontName.replace(parenReg, TQString());
// remove [Xft] qualifiers // remove [Xft] qualifiers
parsedFontName.replace(braceReg, TQString::null); parsedFontName.replace(braceReg, TQString());
#ifndef APPLE_CHANGES #ifndef APPLE_CHANGES
const TQString &available = KHTMLSettings::availableFamilies(); const TQString &available = KHTMLSettings::availableFamilies();

@ -49,8 +49,8 @@ DOMString khtml::parseURL(const DOMString &url)
int o = 0; int o = 0;
int l = i->l; int l = i->l;
while(o < l && (i->s[o] <= ' ')) { o++; l--; } while(o < l && (i->s[o] <= TQChar(' '))) { o++; l--; }
while(l > 0 && (i->s[o+l-1] <= ' ')) l--; while(l > 0 && (i->s[o+l-1] <= TQChar(' '))) l--;
if(l >= 5 && if(l >= 5 &&
(i->s[o].lower() == 'u') && (i->s[o].lower() == 'u') &&
@ -62,8 +62,8 @@ DOMString khtml::parseURL(const DOMString &url)
l -= 5; l -= 5;
} }
while(o < l && (i->s[o] <= ' ')) { o++; l--; } while(o < l && (i->s[o] <= TQChar(' '))) { o++; l--; }
while(l > 0 && (i->s[o+l-1] <= ' ')) l--; while(l > 0 && (i->s[o+l-1] <= TQChar(' '))) l--;
if(l >= 2 && i->s[o] == i->s[o+l-1] && if(l >= 2 && i->s[o] == i->s[o+l-1] &&
(i->s[o].latin1() == '\'' || i->s[o].latin1() == '\"')) { (i->s[o].latin1() == '\'' || i->s[o].latin1() == '\"')) {
@ -71,8 +71,8 @@ DOMString khtml::parseURL(const DOMString &url)
l -= 2; l -= 2;
} }
while(o < l && (i->s[o] <= ' ')) { o++; l--; } while(o < l && (i->s[o] <= TQChar(' '))) { o++; l--; }
while(l > 0 && (i->s[o+l-1] <= ' ')) l--; while(l > 0 && (i->s[o+l-1] <= TQChar(' '))) l--;
DOMStringImpl* j = new DOMStringImpl(i->s+o,l); DOMStringImpl* j = new DOMStringImpl(i->s+o,l);

@ -257,7 +257,7 @@ CSSStyleSelector::CSSStyleSelector( DocumentImpl* doc, TQString userStyleSheet,
u.setQuery( TQString::null ); u.setQuery( TQString::null );
u.setRef( TQString::null ); u.setRef( TQString::null );
encodedurl.file = u.url(); encodedurl.file = u.url();
int pos = encodedurl.file.findRev('/'); int pos = encodedurl.file.tqfindRev('/');
encodedurl.path = encodedurl.file; encodedurl.path = encodedurl.file;
if ( pos > 0 ) { if ( pos > 0 ) {
encodedurl.path.truncate( pos ); encodedurl.path.truncate( pos );
@ -831,9 +831,9 @@ static void cleanpath(TQString &path)
while ( (pos = path.tqfind( "/../" )) != -1 ) { while ( (pos = path.tqfind( "/../" )) != -1 ) {
int prev = 0; int prev = 0;
if ( pos > 0 ) if ( pos > 0 )
prev = path.findRev( "/", pos -1 ); prev = path.tqfindRev( "/", pos -1 );
// don't remove the host, i.e. http://foo.org/../foo.html // don't remove the host, i.e. http://foo.org/../foo.html
if (prev < 0 || (prev > 3 && path.findRev("://", prev-1) == prev-2)) if (prev < 0 || (prev > 3 && path.tqfindRev("://", prev-1) == prev-2))
path.remove( pos, 3); path.remove( pos, 3);
else else
// matching directory found ? // matching directory found ?
@ -1158,7 +1158,7 @@ bool CSSStyleSelector::checkSimpleSelector(DOM::CSSSelector *sel, DOM::ElementIm
// Be smart compare on length first // Be smart compare on length first
if (sel_len > val_len) return false; if (sel_len > val_len) return false;
// Selector string may not contain spaces // Selector string may not contain spaces
if ((sel->attr != ATTR_CLASS || e->hasClassList()) && sel->value.tqfind(' ') != -1) return false; if ((sel->attr != ATTR_CLASS || e->hasClassList()) && sel->value.find(' ') != -1) return false;
if (sel_len == val_len) if (sel_len == val_len)
return (caseSensitive && !strcmp(sel->value, value)) || return (caseSensitive && !strcmp(sel->value, value)) ||
(!caseSensitive && !strcasecmp(sel->value, value)); (!caseSensitive && !strcasecmp(sel->value, value));
@ -1189,21 +1189,21 @@ bool CSSStyleSelector::checkSimpleSelector(DOM::CSSSelector *sel, DOM::ElementIm
//kdDebug( 6080 ) << "checking for contains match" << endl; //kdDebug( 6080 ) << "checking for contains match" << endl;
TQConstString val_str(value->tqunicode(), value->length()); TQConstString val_str(value->tqunicode(), value->length());
TQConstString sel_str(sel->value.tqunicode(), sel->value.length()); TQConstString sel_str(sel->value.tqunicode(), sel->value.length());
return val_str.string().contains(sel_str.string(), caseSensitive); return val_str.string().tqcontains(sel_str.string(), caseSensitive);
} }
case CSSSelector::Begin: case CSSSelector::Begin:
{ {
//kdDebug( 6080 ) << "checking for beginswith match" << endl; //kdDebug( 6080 ) << "checking for beginswith match" << endl;
TQConstString val_str(value->tqunicode(), value->length()); TQConstString val_str(value->tqunicode(), value->length());
TQConstString sel_str(sel->value.tqunicode(), sel->value.length()); TQConstString sel_str(sel->value.tqunicode(), sel->value.length());
return val_str.string().startsWith(sel_str.string(), caseSensitive); return val_str.string().tqstartsWith(sel_str.string(), caseSensitive);
} }
case CSSSelector::End: case CSSSelector::End:
{ {
//kdDebug( 6080 ) << "checking for endswith match" << endl; //kdDebug( 6080 ) << "checking for endswith match" << endl;
TQConstString val_str(value->tqunicode(), value->length()); TQConstString val_str(value->tqunicode(), value->length());
TQConstString sel_str(sel->value.tqunicode(), sel->value.length()); TQConstString sel_str(sel->value.tqunicode(), sel->value.length());
return val_str.string().endsWith(sel_str.string(), caseSensitive); return val_str.string().tqendsWith(sel_str.string(), caseSensitive);
} }
case CSSSelector::Hyphen: case CSSSelector::Hyphen:
{ {
@ -2079,7 +2079,7 @@ static TQColor colorForCSSValue( int css_value )
KConfig bckgrConfig("kdesktoprc", true, false); // No multi-screen support KConfig bckgrConfig("kdesktoprc", true, false); // No multi-screen support
bckgrConfig.setGroup("Desktop0"); bckgrConfig.setGroup("Desktop0");
// Desktop background. // Desktop background.
return bckgrConfig.readColorEntry("Color1", &tqApp->palette().disabled().background()); return bckgrConfig.readColorEntry("Color1", &tqApp->tqpalette().disabled().background());
} }
return TQColor(); return TQColor();
} }

@ -53,7 +53,7 @@ Value DOMObject::get(ExecState *exec, const Identifier &p) const
// ### translate code into readable string ? // ### translate code into readable string ?
// ### oh, and s/QString/i18n or I18N_NOOP (the code in kjs uses I18N_NOOP... but where is it translated ?) // ### oh, and s/QString/i18n or I18N_NOOP (the code in kjs uses I18N_NOOP... but where is it translated ?)
// and where does it appear to the user ? // and where does it appear to the user ?
Object err = Error::create(exec, GeneralError, TQString("DOM exception %1").arg(e.code).local8Bit()); Object err = Error::create(exec, GeneralError, TQString(TQString("DOM exception %1").arg(e.code)).local8Bit());
exec->setException( err ); exec->setException( err );
result = Undefined(); result = Undefined();
} }
@ -72,7 +72,7 @@ void DOMObject::put(ExecState *exec, const Identifier &propertyName,
tryPut(exec, propertyName, value, attr); tryPut(exec, propertyName, value, attr);
} }
catch (DOM::DOMException e) { catch (DOM::DOMException e) {
Object err = Error::create(exec, GeneralError, TQString("DOM exception %1").arg(e.code).local8Bit()); Object err = Error::create(exec, GeneralError, TQString(TQString("DOM exception %1").arg(e.code)).local8Bit());
exec->setException(err); exec->setException(err);
} }
catch (...) { catch (...) {
@ -120,7 +120,7 @@ Value DOMFunction::get(ExecState *exec, const Identifier &propertyName) const
return tryGet(exec, propertyName); return tryGet(exec, propertyName);
} }
catch (DOM::DOMException e) { catch (DOM::DOMException e) {
Object err = Error::create(exec, GeneralError, TQString("DOM exception %1").arg(e.code).local8Bit()); Object err = Error::create(exec, GeneralError, TQString(TQString("DOM exception %1").arg(e.code)).local8Bit());
exec->setException(err); exec->setException(err);
return Undefined(); return Undefined();
} }
@ -139,25 +139,25 @@ Value DOMFunction::call(ExecState *exec, Object &thisObj, const List &args)
// ### Look into setting prototypes of these & the use of instanceof so the exception // ### Look into setting prototypes of these & the use of instanceof so the exception
// type can be determined. See what other browsers do. // type can be determined. See what other browsers do.
catch (DOM::DOMException e) { catch (DOM::DOMException e) {
Object err = Error::create(exec, GeneralError, TQString("DOM Exception %1").arg(e.code).local8Bit()); Object err = Error::create(exec, GeneralError, TQString(TQString("DOM Exception %1").arg(e.code)).local8Bit());
err.put(exec, "code", Number(e.code)); err.put(exec, "code", Number(e.code));
exec->setException(err); exec->setException(err);
return Undefined(); return Undefined();
} }
catch (DOM::RangeException e) { catch (DOM::RangeException e) {
Object err = Error::create(exec, GeneralError, TQString("DOM Range Exception %1").arg(e.code).local8Bit()); Object err = Error::create(exec, GeneralError, TQString(TQString("DOM Range Exception %1").arg(e.code)).local8Bit());
err.put(exec, "code", Number(e.code)); err.put(exec, "code", Number(e.code));
exec->setException(err); exec->setException(err);
return Undefined(); return Undefined();
} }
catch (DOM::CSSException e) { catch (DOM::CSSException e) {
Object err = Error::create(exec, GeneralError, TQString("CSS Exception %1").arg(e.code).local8Bit()); Object err = Error::create(exec, GeneralError, TQString(TQString("CSS Exception %1").arg(e.code)).local8Bit());
err.put(exec, "code", Number(e.code)); err.put(exec, "code", Number(e.code));
exec->setException(err); exec->setException(err);
return Undefined(); return Undefined();
} }
catch (DOM::EventException e) { catch (DOM::EventException e) {
Object err = Error::create(exec, GeneralError, TQString("DOM Event Exception %1").arg(e.code).local8Bit()); Object err = Error::create(exec, GeneralError, TQString(TQString("DOM Event Exception %1").arg(e.code)).local8Bit());
err.put(exec, "code", Number(e.code)); err.put(exec, "code", Number(e.code));
exec->setException(err); exec->setException(err);
return Undefined(); return Undefined();

@ -103,7 +103,7 @@ namespace KJS {
m_domObjects.insert( objectHandle, obj ); m_domObjects.insert( objectHandle, obj );
} }
void customizedDOMObject( DOMObject* obj ) { void customizedDOMObject( DOMObject* obj ) {
m_customizedDomObjects.replace( obj, this ); m_customizedDomObjects.tqreplace( obj, this );
} }
bool deleteDOMObject( void* objectHandle ) { bool deleteDOMObject( void* objectHandle ) {
DOMObject* obj = m_domObjects.take( objectHandle ); DOMObject* obj = m_domObjects.take( objectHandle );

@ -80,7 +80,7 @@ SourceDisplay::SourceDisplay(KJSDebugWin *debugWin, TQWidget *parent, const char
m_font(KGlobalSettings::fixedFont()) m_font(KGlobalSettings::fixedFont())
{ {
verticalScrollBar()->setLineStep(TQFontMetrics(m_font).height()); verticalScrollBar()->setLineStep(TQFontMetrics(m_font).height());
viewport()->setBackgroundMode(Qt::NoBackground); viewport()->setBackgroundMode(TQt::NoBackground);
m_breakpointIcon = KGlobal::iconLoader()->loadIcon("stop",KIcon::Small); m_breakpointIcon = KGlobal::iconLoader()->loadIcon("stop",KIcon::Small);
} }
@ -182,7 +182,7 @@ void SourceDisplay::showEvent(TQShowEvent *)
void SourceDisplay::drawContents(TQPainter *p, int clipx, int clipy, int clipw, int cliph) void SourceDisplay::drawContents(TQPainter *p, int clipx, int clipy, int clipw, int cliph)
{ {
if (!m_sourceFile) { if (!m_sourceFile) {
p->fillRect(clipx,clipy,clipw,cliph,palette().active().base()); p->fillRect(clipx,clipy,clipw,cliph,tqpalette().active().base());
return; return;
} }
@ -207,26 +207,26 @@ void SourceDisplay::drawContents(TQPainter *p, int clipx, int clipy, int clipw,
TQString linenoStr = TQString().sprintf("%d",lineno+1); TQString linenoStr = TQString().sprintf("%d",lineno+1);
p->fillRect(0,height*lineno,linenoWidth,height,palette().active().mid()); p->fillRect(0,height*lineno,linenoWidth,height,tqpalette().active().mid());
p->setPen(palette().active().text()); p->setPen(tqpalette().active().text());
p->drawText(0,height*lineno,linenoWidth,height,Qt::AlignRight,linenoStr); p->drawText(0,height*lineno,linenoWidth,height,Qt::AlignRight,linenoStr);
TQColor bgColor; TQColor bgColor;
TQColor textColor; TQColor textColor;
if (lineno == m_currentLine) { if (lineno == m_currentLine) {
bgColor = palette().active().highlight(); bgColor = tqpalette().active().highlight();
textColor = palette().active().highlightedText(); textColor = tqpalette().active().highlightedText();
} }
else if (m_debugWin->haveBreakpoint(m_sourceFile,lineno+1,lineno+1)) { else if (m_debugWin->haveBreakpoint(m_sourceFile,lineno+1,lineno+1)) {
bgColor = palette().active().text(); bgColor = tqpalette().active().text();
textColor = palette().active().base(); textColor = tqpalette().active().base();
p->drawPixmap(2,height*lineno+height/2-m_breakpointIcon.height()/2,m_breakpointIcon); p->drawPixmap(2,height*lineno+height/2-m_breakpointIcon.height()/2,m_breakpointIcon);
} }
else { else {
bgColor = palette().active().base(); bgColor = tqpalette().active().base();
textColor = palette().active().text(); textColor = tqpalette().active().text();
} }
p->fillRect(linenoWidth,height*lineno,right-linenoWidth,height,bgColor); p->fillRect(linenoWidth,height*lineno,right-linenoWidth,height,bgColor);
@ -236,10 +236,10 @@ void SourceDisplay::drawContents(TQPainter *p, int clipx, int clipy, int clipw,
} }
int remainingTop = height*(lastLine+1); int remainingTop = height*(lastLine+1);
p->fillRect(0,remainingTop,linenoWidth,bottom-remainingTop,palette().active().mid()); p->fillRect(0,remainingTop,linenoWidth,bottom-remainingTop,tqpalette().active().mid());
p->fillRect(linenoWidth,remainingTop, p->fillRect(linenoWidth,remainingTop,
right-linenoWidth,bottom-remainingTop,palette().active().base()); right-linenoWidth,bottom-remainingTop,tqpalette().active().base());
} }
//------------------------------------------------------------------------- //-------------------------------------------------------------------------
@ -347,7 +347,7 @@ void EvalMultiLineEdit::keyPressEvent(TQKeyEvent * e)
} }
//------------------------------------------------------------------------- //-------------------------------------------------------------------------
KJSDebugWin::KJSDebugWin(TQWidget *parent, const char *name) KJSDebugWin::KJSDebugWin(TQWidget *parent, const char *name)
: KMainWindow(parent, name, WType_TopLevel), KInstance("kjs_debugger") : KMainWindow(parent, name, (WFlags)WType_TopLevel), KInstance("kjs_debugger")
{ {
m_breakpoints = 0; m_breakpoints = 0;
m_breakpointCount = 0; m_breakpointCount = 0;
@ -445,18 +445,18 @@ KJSDebugWin::KJSDebugWin(TQWidget *parent, const char *name)
// Venkman use F12, KDevelop F10 // Venkman use F12, KDevelop F10
KShortcut scNext = KShortcut(KKeySequence(KKey(Qt::Key_F12))); KShortcut scNext = KShortcut(KKeySequence(KKey(Qt::Key_F12)));
scNext.append(KKeySequence(KKey(Qt::Key_F10))); scNext.append(KKeySequence(KKey(Qt::Key_F10)));
m_nextAction = new KAction(i18n("Next breakpoint","&Next"),"dbgnext",scNext,this,TQT_SLOT(slotNext()), m_nextAction = new KAction(i18n("Next breakpoint","&Next"),"dbgnext",scNext,TQT_TQOBJECT(this),TQT_SLOT(slotNext()),
m_actionCollection,"next"); m_actionCollection,"next");
m_stepAction = new KAction(i18n("&Step"),"dbgstep",KShortcut(Qt::Key_F11),this,TQT_SLOT(slotStep()), m_stepAction = new KAction(i18n("&Step"),"dbgstep",KShortcut(Qt::Key_F11),TQT_TQOBJECT(this),TQT_SLOT(slotStep()),
m_actionCollection,"step"); m_actionCollection,"step");
// Venkman use F5, Kdevelop F9 // Venkman use F5, Kdevelop F9
KShortcut scCont = KShortcut(KKeySequence(KKey(Qt::Key_F5))); KShortcut scCont = KShortcut(KKeySequence(KKey(Qt::Key_F5)));
scCont.append(KKeySequence(KKey(Qt::Key_F9))); scCont.append(KKeySequence(KKey(Qt::Key_F9)));
m_continueAction = new KAction(i18n("&Continue"),"dbgrun",scCont,this,TQT_SLOT(slotContinue()), m_continueAction = new KAction(i18n("&Continue"),"dbgrun",scCont,TQT_TQOBJECT(this),TQT_SLOT(slotContinue()),
m_actionCollection,"cont"); m_actionCollection,"cont");
m_stopAction = new KAction(i18n("St&op"),"stop",KShortcut(Qt::Key_F4),this,TQT_SLOT(slotStop()), m_stopAction = new KAction(i18n("St&op"),"stop",KShortcut(Qt::Key_F4),TQT_TQOBJECT(this),TQT_SLOT(slotStop()),
m_actionCollection,"stop"); m_actionCollection,"stop");
m_breakAction = new KAction(i18n("&Break at Next Statement"),"dbgrunto",KShortcut(Qt::Key_F8),this,TQT_SLOT(slotBreakNext()), m_breakAction = new KAction(i18n("&Break at Next Statement"),"dbgrunto",KShortcut(Qt::Key_F8),TQT_TQOBJECT(this),TQT_SLOT(slotBreakNext()),
m_actionCollection,"breaknext"); m_actionCollection,"breaknext");
@ -677,8 +677,8 @@ bool KJSDebugWin::eventFilter(TQObject *o, TQEvent *e)
case TQEvent::Close: case TQEvent::Close:
case TQEvent::Quit: case TQEvent::Quit:
while (o->parent()) while (o->parent())
o = o->parent(); o = TQT_TQOBJECT(o->parent());
if (o == this) if (TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(this))
return TQWidget::eventFilter(o,e); return TQWidget::eventFilter(o,e);
else else
return true; return true;
@ -690,7 +690,7 @@ bool KJSDebugWin::eventFilter(TQObject *o, TQEvent *e)
void KJSDebugWin::disableOtherWindows() void KJSDebugWin::disableOtherWindows()
{ {
TQWidgetList *widgets = TQApplication::allWidgets(); TQWidgetList *widgets = TQApplication::tqallWidgets();
TQWidgetListIt it(*widgets); TQWidgetListIt it(*widgets);
for (; it.current(); ++it) for (; it.current(); ++it)
it.current()->installEventFilter(this); it.current()->installEventFilter(this);
@ -698,7 +698,7 @@ void KJSDebugWin::disableOtherWindows()
void KJSDebugWin::enableOtherWindows() void KJSDebugWin::enableOtherWindows()
{ {
TQWidgetList *widgets = TQApplication::allWidgets(); TQWidgetList *widgets = TQApplication::tqallWidgets();
TQWidgetListIt it(*widgets); TQWidgetListIt it(*widgets);
for (; it.current(); ++it) for (; it.current(); ++it)
it.current()->removeEventFilter(this); it.current()->removeEventFilter(this);
@ -1123,7 +1123,7 @@ bool KJSDebugWin::haveBreakpoint(SourceFile *sourceFile, int line0, int line1)
for (int i = 0; i < m_breakpointCount; i++) { for (int i = 0; i < m_breakpointCount; i++) {
int sourceId = m_breakpoints[i].sourceId; int sourceId = m_breakpoints[i].sourceId;
int lineno = m_breakpoints[i].lineno; int lineno = m_breakpoints[i].lineno;
if (m_sourceFragments.contains(sourceId) && if (m_sourceFragments.tqcontains(sourceId) &&
m_sourceFragments[sourceId]->sourceFile == sourceFile) { m_sourceFragments[sourceId]->sourceFile == sourceFile) {
int absLineno = m_sourceFragments[sourceId]->baseLine+lineno-1; int absLineno = m_sourceFragments[sourceId]->baseLine+lineno-1;
if (absLineno >= line0 && absLineno <= line1) if (absLineno >= line0 && absLineno <= line1)

@ -524,7 +524,7 @@ UString DOMNode::toString(ExecState *) const
DOM::Element e = node; DOM::Element e = node;
if ( !e.isNull() ) { if ( !e.isNull() ) {
s = e.nodeName().string(); s = static_cast<UString>(e.nodeName().string());
} else } else
s = className(); // fallback s = className(); // fallback

@ -191,7 +191,7 @@ void JSLazyEventListener::parseCode() const
listener = Object();// Error creating function listener = Object();// Error creating function
} else { } else {
DeclaredFunctionImp *declFunc = static_cast<DeclaredFunctionImp*>(listener.imp()); DeclaredFunctionImp *declFunc = static_cast<DeclaredFunctionImp*>(listener.imp());
declFunc->setName(Identifier(name)); declFunc->setName(Identifier(static_cast<UString>(name)));
if (originalNode) if (originalNode)
{ {

@ -255,9 +255,9 @@ Value Navigator::getValueProperty(ExecState *exec, int token) const
struct utsname name; struct utsname name;
int ret = uname(&name); int ret = uname(&name);
if ( ret >= 0 ) if ( ret >= 0 )
return String(TQString::tqfromLatin1("%1 %1 X11").arg(name.sysname).arg(name.machine)); return String(TQString(TQString::tqfromLatin1("%1 %1 X11").arg(name.sysname).arg(name.machine)));
else // can't happen else // can't happen
return String(TQString::tqfromLatin1("Unix X11")); return String(TQString(TQString::tqfromLatin1("Unix X11")));
} }
case CpuClass: case CpuClass:
{ {

@ -1633,13 +1633,13 @@ Value Window::executeOpenWindow(ExecState *exec, const KURL& url, const TQString
if (winargs.y < screen.y() || winargs.y > screen.bottom()) if (winargs.y < screen.y() || winargs.y > screen.bottom())
winargs.y = screen.y(); // only safe choice until size is determined winargs.y = screen.y(); // only safe choice until size is determined
} else if (key == "height") { } else if (key == "height") {
winargs.height = (int)val.toFloat() + 2*tqApp->style().tqpixelMetric( TQStyle::PM_DefaultFrameWidth ) + 2; winargs.height = (int)val.toFloat() + 2*tqApp->tqstyle().tqpixelMetric( TQStyle::PM_DefaultFrameWidth ) + 2;
if (winargs.height > screen.height()) // should actually check workspace if (winargs.height > screen.height()) // should actually check workspace
winargs.height = screen.height(); winargs.height = screen.height();
if (winargs.height < 100) if (winargs.height < 100)
winargs.height = 100; winargs.height = 100;
} else if (key == "width") { } else if (key == "width") {
winargs.width = (int)val.toFloat() + 2*tqApp->style().tqpixelMetric( TQStyle::PM_DefaultFrameWidth ) + 2; winargs.width = (int)val.toFloat() + 2*tqApp->tqstyle().tqpixelMetric( TQStyle::PM_DefaultFrameWidth ) + 2;
if (winargs.width > screen.width()) // should actually check workspace if (winargs.width > screen.width()) // should actually check workspace
winargs.width = screen.width(); winargs.width = screen.width();
if (winargs.width < 100) if (winargs.width < 100)
@ -2271,7 +2271,7 @@ void WindowQObject::timerEvent(TQTimerEvent *)
it = TQPtrListIterator<ScheduledAction>(toExecute); it = TQPtrListIterator<ScheduledAction>(toExecute);
for (; it.current(); ++it) { for (; it.current(); ++it) {
ScheduledAction *action = it.current(); ScheduledAction *action = it.current();
if (!scheduledActions.containsRef(action)) // removed by clearTimeout() if (!scheduledActions.tqcontainsRef(action)) // removed by clearTimeout()
continue; continue;
action->executing = true; // prevent deletion in clearTimeout() action->executing = true; // prevent deletion in clearTimeout()
@ -2288,7 +2288,7 @@ void WindowQObject::timerEvent(TQTimerEvent *)
action->executing = false; action->executing = false;
if (!scheduledActions.containsRef(action)) if (!scheduledActions.tqcontainsRef(action))
delete action; delete action;
else else
action->nextTime = action->nextTime.addMSecs(action->interval); action->nextTime = action->nextTime.addMSecs(action->interval);
@ -2305,16 +2305,16 @@ void WindowQObject::timerEvent(TQTimerEvent *)
DateTimeMS DateTimeMS::addMSecs(int s) const DateTimeMS DateTimeMS::addMSecs(int s) const
{ {
DateTimeMS c = *this; DateTimeMS c = *this;
c.mTime = mTime.addMSecs(s); c.mTime = TQT_TQTIME_OBJECT(mTime.addMSecs(s));
if (s > 0) if (s > 0)
{ {
if (c.mTime < mTime) if (c.mTime < mTime)
c.mDate = mDate.addDays(1); c.mDate = TQT_TQDATE_OBJECT(mDate.addDays(1));
} }
else else
{ {
if (c.mTime > mTime) if (c.mTime > mTime)
c.mDate = mDate.addDays(-1); c.mDate = TQT_TQDATE_OBJECT(mDate.addDays(-1));
} }
return c; return c;
} }
@ -2353,10 +2353,10 @@ DateTimeMS DateTimeMS::now()
{ {
DateTimeMS t; DateTimeMS t;
TQTime before = TQTime::currentTime(); TQTime before = TQTime::currentTime();
t.mDate = TQDate::tqcurrentDate(); t.mDate = TQDate::currentDate();
t.mTime = TQTime::currentTime(); t.mTime = TQTime::currentTime();
if (t.mTime < before) if (t.mTime < before)
t.mDate = TQDate::tqcurrentDate(); // prevent race condition in hacky way :) t.mDate = TQDate::currentDate(); // prevent race condition in hacky way :)
return t; return t;
} }

@ -489,7 +489,7 @@ void XMLHttpRequest::setRequestHeader(const TQString& _name, const TQString &val
TQStringList bannedHeaders = TQStringList::split(',', TQStringList bannedHeaders = TQStringList::split(',',
TQString::tqfromLatin1(BANNED_HTTP_HEADERS)); TQString::tqfromLatin1(BANNED_HTTP_HEADERS));
if (bannedHeaders.contains(name)) if (bannedHeaders.tqcontains(name))
return; // Denied return; // Denied
requestHeaders[name] = value.stripWhiteSpace(); requestHeaders[name] = value.stripWhiteSpace();
@ -665,9 +665,9 @@ void XMLHttpRequest::slotData(KIO::Job*, const TQByteArray &_data)
pos += 13; pos += 13;
int index = responseHeaders.tqfind('\n', pos); int index = responseHeaders.tqfind('\n', pos);
TQString type = responseHeaders.mid(pos, (index-pos)); TQString type = responseHeaders.mid(pos, (index-pos));
index = type.find (';'); index = type.tqfind (';');
if (index > -1) if (index > -1)
encoding = type.mid( index+1 ).remove(TQRegExp("charset[ ]*=[ ]*", false)).stripWhiteSpace(); encoding = TQString(type.mid( index+1 ).remove(TQRegExp("charset[ ]*=[ ]*", false))).stripWhiteSpace();
} }
decoder = new Decoder; decoder = new Decoder;

@ -1,685 +0,0 @@
// -*- c-basic-offset: 4; -*-
/**
* This file is part of the DOM implementation for KDE.
*
* Copyright (C) 1999 Lars Knoll (knoll@kde.org)
* (C) 1999 Antti Koivisto (koivisto@kde.org)
* (C) 2003 Dirk Mueller (mueller@kde.org)
* Copyright (C) 2002 Apple Computer, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Library General Public License for more details.
*
* You should have received a copy of the GNU Library General Public License
* along with this library; see the file COPYING.LIB. If not, write to
* the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
* Boston, MA 02110-1301, USA.
*
*/
// -------------------------------------------------------------------------
//#define DEBUG
//#define DEBUG_LAYOUT
//#define PAR_DEBUG
//#define EVENT_DEBUG
//#define UNSUPPORTED_ATTR
#include "html/dtd.h"
#include "html/html_elementimpl.h"
#include "html/html_documentimpl.h"
#include "html/htmltokenizer.h"
#include "misc/htmlhashes.h"
#include "khtmlview.h"
#include "khtml_part.h"
#include "rendering/render_object.h"
#include "rendering/render_replaced.h"
#include "css/css_valueimpl.h"
#include "css/css_stylesheetimpl.h"
#include "css/cssproperties.h"
#include "css/cssvalues.h"
#include "xml/dom_textimpl.h"
#include "xml/dom2_eventsimpl.h"
#include <kdebug.h>
#include <kglobal.h>
#include "html_elementimpl.h"
using namespace DOM;
using namespace khtml;
HTMLElementImpl::HTMLElementImpl(DocumentImpl *doc)
: ElementImpl( doc )
{
m_htmlCompat = doc && doc->htmlMode() != DocumentImpl::XHtml;
}
HTMLElementImpl::~HTMLElementImpl()
{
}
bool HTMLElementImpl::isInline() const
{
if (renderer())
return ElementImpl::isInline();
switch(id()) {
case ID_A:
case ID_FONT:
case ID_TT:
case ID_U:
case ID_B:
case ID_I:
case ID_S:
case ID_STRIKE:
case ID_BIG:
case ID_SMALL:
// %phrase
case ID_EM:
case ID_STRONG:
case ID_DFN:
case ID_CODE:
case ID_SAMP:
case ID_KBD:
case ID_VAR:
case ID_CITE:
case ID_ABBR:
case ID_ACRONYM:
// %special
case ID_SUB:
case ID_SUP:
case ID_SPAN:
case ID_NOBR:
case ID_WBR:
return true;
default:
return ElementImpl::isInline();
}
}
DOMString HTMLElementImpl::namespaceURI() const
{
return (!m_htmlCompat) ?
DOMString(XHTML_NAMESPACE) : DOMString();
}
DOMString HTMLElementImpl::localName() const
{
// We only have a localName if we were created by createElementNS(), in which
// case we are an XHTML element. This also means we have a lowercase name.
if (!m_htmlCompat) // XHTML == not HTMLCompat
{
NodeImpl::Id _id = id();
DOMString tn;
if ( _id >= ID_LAST_TAG )
tn = getDocument()->getName(ElementId, _id);
else // HTML tag
tn = getTagName( _id );
return tn; // lowercase already
}
// createElement() always returns elements with a null localName.
else
return DOMString();
}
DOMString HTMLElementImpl::tagName() const
{
DOMString tn;
NodeImpl::Id _id = id();
if ( _id >= ID_LAST_TAG )
tn = getDocument()->getName(ElementId, _id);
else // HTML tag
tn = getTagName( _id );
if ( m_htmlCompat )
tn = tn.upper();
if (m_prefix)
return DOMString(m_prefix) + ":" + tn;
return tn;
}
void HTMLElementImpl::parseAttribute(AttributeImpl *attr)
{
DOMString indexstring;
switch( attr->id() )
{
case ATTR_ALIGN:
if (attr->val()) {
if ( strcasecmp(attr->value(), "middle" ) == 0 )
addCSSProperty( CSS_PROP_TEXT_ALIGN, CSS_VAL_CENTER );
else
addCSSProperty(CSS_PROP_TEXT_ALIGN, attr->value().lower());
}
else
removeCSSProperty(CSS_PROP_TEXT_ALIGN);
break;
// the core attributes...
case ATTR_ID:
// unique id
setHasID();
getDocument()->incDOMTreeVersion();
break;
case ATTR_CLASS:
if (attr->val()) {
DOMString v = attr->value();
const TQChar* s = v.tqunicode();
int l = v.length();
while( l && !s->isSpace() )
l--,s++;
setHasClassList(l);
setHasClass(true);
} else {
setHasClassList(false);
setHasClass(false);
}
break;
case ATTR_NAME:
getDocument()->incDOMTreeVersion();
break;
case ATTR_STYLE:
if (m_styleDecls)
m_styleDecls->removeCSSHints();
else
createDecl();
m_styleDecls->setProperty(attr->value());
setChanged();
break;
case ATTR_TABINDEX:
indexstring=getAttribute(ATTR_TABINDEX);
if (indexstring.length())
setTabIndex(indexstring.toInt());
break;
// i18n attributes
case ATTR_LANG:
break;
case ATTR_DIR:
addCSSProperty(CSS_PROP_DIRECTION, attr->value().lower());
addCSSProperty(CSS_PROP_UNICODE_BIDI, CSS_VAL_EMBED);
break;
// standard events
case ATTR_ONCLICK:
setHTMLEventListener(EventImpl::KHTML_ECMA_CLICK_EVENT,
getDocument()->createHTMLEventListener(attr->value().string(), "onclick", this));
break;
case ATTR_ONDBLCLICK:
setHTMLEventListener(EventImpl::KHTML_ECMA_DBLCLICK_EVENT,
getDocument()->createHTMLEventListener(attr->value().string(), "ondblclick", this));
break;
case ATTR_ONMOUSEDOWN:
setHTMLEventListener(EventImpl::MOUSEDOWN_EVENT,
getDocument()->createHTMLEventListener(attr->value().string(), "onmousedown", this));
break;
case ATTR_ONMOUSEMOVE:
setHTMLEventListener(EventImpl::MOUSEMOVE_EVENT,
getDocument()->createHTMLEventListener(attr->value().string(), "onmousemove", this));
break;
case ATTR_ONMOUSEOUT:
setHTMLEventListener(EventImpl::MOUSEOUT_EVENT,
getDocument()->createHTMLEventListener(attr->value().string(), "onmouseout", this));
break;
case ATTR_ONMOUSEOVER:
setHTMLEventListener(EventImpl::MOUSEOVER_EVENT,
getDocument()->createHTMLEventListener(attr->value().string(), "onmouseover", this));
break;
case ATTR_ONMOUSEUP:
setHTMLEventListener(EventImpl::MOUSEUP_EVENT,
getDocument()->createHTMLEventListener(attr->value().string(), "onmouseup", this));
break;
case ATTR_ONKEYDOWN:
setHTMLEventListener(EventImpl::KEYDOWN_EVENT,
getDocument()->createHTMLEventListener(attr->value().string(), "onkeydown", this));
break;
case ATTR_ONKEYPRESS:
setHTMLEventListener(EventImpl::KEYPRESS_EVENT,
getDocument()->createHTMLEventListener(attr->value().string(), "onkeypress", this));
break;
case ATTR_ONKEYUP:
setHTMLEventListener(EventImpl::KEYUP_EVENT,
getDocument()->createHTMLEventListener(attr->value().string(), "onkeyup", this));
break;
case ATTR_ONFOCUS:
setHTMLEventListener(EventImpl::FOCUS_EVENT,
getDocument()->createHTMLEventListener(attr->value().string(), "onfocus", this));
break;
case ATTR_ONBLUR:
setHTMLEventListener(EventImpl::BLUR_EVENT,
getDocument()->createHTMLEventListener(attr->value().string(), "onblur", this));
break;
case ATTR_ONSCROLL:
setHTMLEventListener(EventImpl::SCROLL_EVENT,
getDocument()->createHTMLEventListener(attr->value().string(), "onscroll", this));
break;
// other misc attributes
default:
#ifdef UNSUPPORTED_ATTR
kdDebug(6030) << "UATTR: <" << this->nodeName().string() << "> ["
<< attr->name().string() << "]=[" << attr->value().string() << "]" << endl;
#endif
break;
}
}
void HTMLElementImpl::recalcStyle( StyleChange ch )
{
ElementImpl::recalcStyle( ch );
if (m_render /*&& changed*/)
m_render->updateFromElement();
}
void HTMLElementImpl::addCSSProperty(int id, const DOMString &value)
{
if(!m_styleDecls) createDecl();
m_styleDecls->setProperty(id, value, false, true);
setChanged();
}
void HTMLElementImpl::addCSSProperty(int id, int value)
{
if(!m_styleDecls) createDecl();
m_styleDecls->setProperty(id, value, false, true);
setChanged();
}
void HTMLElementImpl::addCSSLength(int id, const DOMString &value, bool numOnly, bool multiLength)
{
if(!m_styleDecls) createDecl();
// strip attribute garbage to avoid CSS parsing errors
// ### create specialized hook that avoids parsing every
// value twice!
if ( value.implementation() ) {
// match \s*[+-]?\d*(\.\d*)?[%\*]?
unsigned i = 0, j = 0;
TQChar* s = value.implementation()->s;
unsigned l = value.implementation()->l;
while (i < l && s[i].isSpace())
++i;
if (i < l && (s[i] == '+' || s[i] == '-'))
++i;
while (i < l && s[i].isDigit())
++i,++j;
// no digits!
if (j == 0) return;
int v = kClamp( TQConstString(s, i).string().toInt(), -8192, 8191 ) ;
const char* suffix = "px";
if (!numOnly || multiLength) {
// look if we find a % or *
while (i < l) {
if (multiLength && s[i] == '*') {
suffix = "";
break;
}
if (s[i] == '%') {
suffix = "%";
break;
}
++i;
}
}
if (numOnly) suffix = "";
TQString ns = TQString::number(v) + suffix;
m_styleDecls->setLengthProperty( id, DOMString( ns ), false, true, multiLength );
setChanged();
return;
}
m_styleDecls->setLengthProperty(id, value, false, true, multiLength);
setChanged();
}
static inline bool isHexDigit( const TQChar &c ) {
return ( c >= '0' && c <= '9' ) ||
( c >= 'a' && c <= 'f' ) ||
( c >= 'A' && c <= 'F' );
}
static inline int toHex( const TQChar &c ) {
return ( (c >= '0' && c <= '9')
? (c.tqunicode() - '0')
: ( ( c >= 'a' && c <= 'f' )
? (c.tqunicode() - 'a' + 10)
: ( ( c >= 'A' && c <= 'F' )
? (c.tqunicode() - 'A' + 10)
: -1 ) ) );
}
/* color parsing that tries to match as close as possible IE 6. */
void HTMLElementImpl::addHTMLColor( int id, const DOMString &c )
{
if(!m_styleDecls) createDecl();
// this is the only case no color gets applied in IE.
if ( !c.length() ) {
removeCSSProperty(id);
return;
}
if ( m_styleDecls->setProperty(id, c, false, true) )
return;
TQString color = c.string();
// not something that fits the specs.
// we're emulating IEs color parser here. It maps transparent to black, otherwise it tries to build a rgb value
// out of everyhting you put in. The algorithm is experimentally determined, but seems to work for all test cases I have.
// the length of the color value is rounded up to the next
// multiple of 3. each part of the rgb triple then gets one third
// of the length.
//
// Each triplet is parsed byte by byte, mapping
// each number to a hex value (0-9a-fA-F to their values
// everything else to 0).
//
// The highest non zero digit in all triplets is remembered, and
// used as a normalization point to normalize to values between 0
// and 255.
if ( color.lower() != "transparent" ) {
if ( color[0] == '#' )
color.remove( 0, 1 );
int basicLength = (color.length() + 2) / 3;
if ( basicLength > 1 ) {
// IE ignores colors with three digits or less
// qDebug("trying to fix up color '%s'. basicLength=%d, length=%d",
// color.latin1(), basicLength, color.length() );
int colors[3] = { 0, 0, 0 };
int component = 0;
int pos = 0;
int maxDigit = basicLength-1;
while ( component < 3 ) {
// search forward for digits in the string
int numDigits = 0;
while ( pos < (int)color.length() && numDigits < basicLength ) {
int hex = toHex( color[pos] );
colors[component] = (colors[component] << 4);
if ( hex > 0 ) {
colors[component] += hex;
maxDigit = kMin( maxDigit, numDigits );
}
numDigits++;
pos++;
}
while ( numDigits++ < basicLength )
colors[component] <<= 4;
component++;
}
maxDigit = basicLength - maxDigit;
// qDebug("color is %x %x %x, maxDigit=%d", colors[0], colors[1], colors[2], maxDigit );
// normalize to 00-ff. The highest filled digit counts, minimum is 2 digits
maxDigit -= 2;
colors[0] >>= 4*maxDigit;
colors[1] >>= 4*maxDigit;
colors[2] >>= 4*maxDigit;
// qDebug("normalized color is %x %x %x", colors[0], colors[1], colors[2] );
// assert( colors[0] < 0x100 && colors[1] < 0x100 && colors[2] < 0x100 );
color.sprintf("#%02x%02x%02x", colors[0], colors[1], colors[2] );
// qDebug( "trying to add fixed color string '%s'", color.latin1() );
if ( m_styleDecls->setProperty(id, DOMString(color), false, true) )
return;
}
}
m_styleDecls->setProperty(id, CSS_VAL_BLACK, false, true);
}
void HTMLElementImpl::removeCSSProperty(int id)
{
if(!m_styleDecls)
return;
m_styleDecls->setParent(getDocument()->elementSheet());
m_styleDecls->removeProperty(id, true /*nonCSSHint */);
setChanged();
}
DOMString HTMLElementImpl::innerHTML() const
{
TQString result; //Use TQString to accumulate since DOMString is poor for appends
for (NodeImpl *child = firstChild(); child != NULL; child = child->nextSibling()) {
DOMString kid = child->toString();
result += TQConstString(kid.tqunicode(), kid.length()).string();
}
return result;
}
DOMString HTMLElementImpl::innerText() const
{
TQString text = "";
if(!firstChild())
return text;
const NodeImpl *n = this;
// find the next text/image after the anchor, to get a position
while(n) {
if(n->firstChild())
n = n->firstChild();
else if(n->nextSibling())
n = n->nextSibling();
else {
NodeImpl *next = 0;
while(!next) {
n = n->parentNode();
if(!n || n == (NodeImpl *)this ) goto end;
next = n->nextSibling();
}
n = next;
}
if(n->isTextNode() ) {
DOMStringImpl* data = static_cast<const TextImpl *>(n)->string();
text += TQConstString(data->s, data->l).string();
}
}
end:
return text;
}
DocumentFragment HTMLElementImpl::createContextualFragment( const DOMString &html )
{
// the following is in accordance with the definition as used by IE
if( endTag[id()] == FORBIDDEN )
return DocumentFragment();
// IE disallows innerHTML on inline elements.
// I don't see why we should have this restriction, as our
// dhtml engine can cope with it. Lars
//if ( isInline() ) return false;
switch( id() ) {
case ID_COL:
case ID_COLGROUP:
case ID_FRAMESET:
case ID_HEAD:
case ID_TABLE:
case ID_TBODY:
case ID_TFOOT:
case ID_THEAD:
case ID_TITLE:
return DocumentFragment();
default:
break;
}
if ( !getDocument()->isHTMLDocument() )
return DocumentFragment();
DocumentFragmentImpl* fragment = new DocumentFragmentImpl( docPtr() );
DocumentFragment f( fragment );
{
HTMLTokenizer tok( docPtr(), fragment );
tok.begin();
tok.write( html.string(), true );
tok.end();
}
// Exceptions are ignored because none ought to happen here.
int ignoredExceptionCode;
// we need to pop <html> and <body> elements and remove <head> to
// accomadate folks passing complete HTML documents to make the
// child of an element.
for ( NodeImpl* node = fragment->firstChild(); node; ) {
if (node->id() == ID_HTML || node->id() == ID_BODY) {
NodeImpl* firstChild = node->firstChild();
NodeImpl* child = firstChild;
while ( child ) {
NodeImpl *nextChild = child->nextSibling();
fragment->insertBefore(child, node, ignoredExceptionCode);
child = nextChild;
}
if ( !firstChild ) {
NodeImpl *nextNode = node->nextSibling();
fragment->removeChild(node, ignoredExceptionCode);
node = nextNode;
} else {
fragment->removeChild(node, ignoredExceptionCode);
node = firstChild;
}
} else if (node->id() == ID_HEAD) {
NodeImpl *nextNode = node->nextSibling();
fragment->removeChild(node, ignoredExceptionCode);
node = nextNode;
} else {
node = node->nextSibling();
}
}
return f;
}
void HTMLElementImpl::setInnerHTML( const DOMString &html, int &exceptioncode )
{
// Works line innerText in Gecko
// ### test if needed for ID_SCRIPT as well.
if ( id() == ID_STYLE ) {
setInnerText(html, exceptioncode);
return;
}
DocumentFragment fragment = createContextualFragment( html );
if ( fragment.isNull() ) {
exceptioncode = DOMException::NO_MODIFICATION_ALLOWED_ERR;
return;
}
// Make sure adding the new child is ok, before removing all children (#96187)
checkAddChild( fragment.handle(), exceptioncode );
if ( exceptioncode )
return;
removeChildren();
appendChild( fragment.handle(), exceptioncode );
}
void HTMLElementImpl::setInnerText( const DOMString &text, int& exceptioncode )
{
// following the IE specs.
if( endTag[id()] == FORBIDDEN ) {
exceptioncode = DOMException::NO_MODIFICATION_ALLOWED_ERR;
return;
}
// IE disallows innerHTML on inline elements. I don't see why we should have this restriction, as our
// dhtml engine can cope with it. Lars
//if ( isInline() ) return false;
switch( id() ) {
case ID_COL:
case ID_COLGROUP:
case ID_FRAMESET:
case ID_HEAD:
case ID_HTML:
case ID_TABLE:
case ID_TBODY:
case ID_TFOOT:
case ID_THEAD:
case ID_TR:
exceptioncode = DOMException::NO_MODIFICATION_ALLOWED_ERR;
return;
default:
break;
}
removeChildren();
TextImpl *t = new TextImpl( docPtr(), text.implementation() );
appendChild( t, exceptioncode );
}
void HTMLElementImpl::addHTMLAlignment( DOMString tqalignment )
{
//qDebug("tqalignment is %s", tqalignment.string().latin1() );
// vertical tqalignment with respect to the current baseline of the text
// right or left means floating images
int propfloat = -1;
int propvalign = -1;
if ( strcasecmp( tqalignment, "absmiddle" ) == 0 ) {
propvalign = CSS_VAL_MIDDLE;
} else if ( strcasecmp( tqalignment, "absbottom" ) == 0 ) {
propvalign = CSS_VAL_BOTTOM;
} else if ( strcasecmp( tqalignment, "left" ) == 0 ) {
propfloat = CSS_VAL_LEFT;
propvalign = CSS_VAL_TOP;
} else if ( strcasecmp( tqalignment, "right" ) == 0 ) {
propfloat = CSS_VAL_RIGHT;
propvalign = CSS_VAL_TOP;
} else if ( strcasecmp( tqalignment, "top" ) == 0 ) {
propvalign = CSS_VAL_TOP;
} else if ( strcasecmp( tqalignment, "middle" ) == 0 ) {
propvalign = CSS_VAL__KHTML_BASELINE_MIDDLE;
} else if ( strcasecmp( tqalignment, "center" ) == 0 ) {
propvalign = CSS_VAL_MIDDLE;
} else if ( strcasecmp( tqalignment, "bottom" ) == 0 ) {
propvalign = CSS_VAL_BASELINE;
} else if ( strcasecmp ( tqalignment, "texttop") == 0 ) {
propvalign = CSS_VAL_TEXT_TOP;
}
if ( propfloat != -1 )
addCSSProperty( CSS_PROP_FLOAT, propfloat );
if ( propvalign != -1 )
addCSSProperty( CSS_PROP_VERTICAL_ALIGN, propvalign );
}
DOMString HTMLElementImpl::toString() const
{
if (!hasChildNodes()) {
DOMString result = openTagStartToString();
result += ">";
if (endTag[id()] == REQUIRED) {
result += "</";
result += tagName();
result += ">";
}
return result;
}
return ElementImpl::toString();
}
// -------------------------------------------------------------------------
HTMLGenericElementImpl::HTMLGenericElementImpl(DocumentImpl *doc, ushort i)
: HTMLElementImpl(doc)
{
_id = i;
}
HTMLGenericElementImpl::~HTMLGenericElementImpl()
{
}

@ -122,8 +122,8 @@ static TQCString encodeCString(const TQCString& e)
// http://www.w3.org/TR/html4/interact/forms.html#h-17.13.4.1 // http://www.w3.org/TR/html4/interact/forms.html#h-17.13.4.1
// safe characters like NS handles them for compatibility // safe characters like NS handles them for compatibility
static const char *safe = "-._*"; static const char *safe = "-._*";
TQCString encoded(( e.length()+e.contains( '\n' ) )*3 TQCString encoded(( e.length()+e.tqcontains( '\n' ) )*3
+e.contains('\r') * 3 + 1); +e.tqcontains('\r') * 3 + 1);
int enclen = 0; int enclen = 0;
bool crmissing = false; bool crmissing = false;
unsigned char oldc; unsigned char oldc;
@ -457,7 +457,7 @@ void HTMLFormElementImpl::walletOpened(KWallet::Wallet *w) {
if ((current->inputType() == HTMLInputElementImpl::PASSWORD || if ((current->inputType() == HTMLInputElementImpl::PASSWORD ||
current->inputType() == HTMLInputElementImpl::TEXT) && current->inputType() == HTMLInputElementImpl::TEXT) &&
!current->readOnly() && !current->readOnly() &&
map.contains(current->name().string())) { map.tqcontains(current->name().string())) {
getDocument()->setFocusNode(current); getDocument()->setFocusNode(current);
current->setValue(map[current->name().string()]); current->setValue(map[current->name().string()]);
} }
@ -957,10 +957,10 @@ bool HTMLGenericFormElementImpl::isFocusable() const
return false; return false;
TQWidget* widget = static_cast<RenderWidget*>(m_render)->widget(); TQWidget* widget = static_cast<RenderWidget*>(m_render)->widget();
return widget && widget->focusPolicy() >= TQWidget::TabFocus; return widget && widget->focusPolicy() >= TQ_TabFocus;
} }
class FocusHandleWidget : public QWidget class FocusHandleWidget : public TQWidget
{ {
public: public:
void focusNextPrev(bool n) { void focusNextPrev(bool n) {
@ -1018,13 +1018,19 @@ void HTMLGenericFormElementImpl::defaultEventHandler(EventImpl *evt)
// handle tabbing out, either from a single or repeated key event. // handle tabbing out, either from a single or repeated key event.
if ( evt->id() == EventImpl::KEYPRESS_EVENT && evt->isKeyRelatedEvent() ) { if ( evt->id() == EventImpl::KEYPRESS_EVENT && evt->isKeyRelatedEvent() ) {
TQKeyEvent* const k = static_cast<KeyEventBaseImpl *>(evt)->qKeyEvent(); TQKeyEvent* const k = static_cast<KeyEventBaseImpl *>(evt)->qKeyEvent();
if ( k && (k->key() == Qt::Key_Tab || k->key() == Qt::Key_BackTab) ) { if ( k && (k->key() == Qt::Key_Tab || k->key() == TQt::Key_BackTab) ) {
TQWidget* const widget = static_cast<RenderWidget*>(m_render)->widget(); TQWidget* const widget = static_cast<RenderWidget*>(m_render)->widget();
#ifdef USE_QT4
if (widget)
static_cast<FocusHandleWidget *>(widget)
->focusNextPrev(k->key() == Qt::Key_Tab);
#else // USE_QT4
TQFocusEvent::setReason( k->key() == Qt::Key_Tab ? TQFocusEvent::Tab : TQFocusEvent::Backtab ); TQFocusEvent::setReason( k->key() == Qt::Key_Tab ? TQFocusEvent::Tab : TQFocusEvent::Backtab );
if (widget) if (widget)
static_cast<FocusHandleWidget *>(widget) static_cast<FocusHandleWidget *>(widget)
->focusNextPrev(k->key() == Qt::Key_Tab); ->focusNextPrev(k->key() == Qt::Key_Tab);
TQFocusEvent::resetReason(); TQFocusEvent::resetReason();
#endif // USE_QT4
evt->setDefaultHandled(); evt->setDefaultHandled();
} }
} }
@ -1452,7 +1458,7 @@ void HTMLInputElementImpl::attach()
TQString nvalue; TQString nvalue;
unsigned int valueLength = value.length(); unsigned int valueLength = value.length();
for (unsigned int i = 0; i < valueLength; ++i) for (unsigned int i = 0; i < valueLength; ++i)
if (value[i] >= ' ') if (value[i] >= TQChar(' '))
nvalue += value[i]; nvalue += value[i];
m_value = nvalue; m_value = nvalue;
} }
@ -2745,7 +2751,7 @@ void HTMLTextAreaElementImpl::attach()
static TQString expandLF(const TQString& s) static TQString expandLF(const TQString& s)
{ {
// LF -> CRLF // LF -> CRLF
unsigned crs = s.contains( '\n' ); unsigned crs = s.tqcontains( '\n' );
if (crs == 0) if (crs == 0)
return s; return s;
unsigned len = s.length(); unsigned len = s.length();

@ -123,13 +123,13 @@ void HTMLAnchorElementImpl::defaultEventHandler(EventImpl *evt)
if ( e ) { if ( e ) {
if ( e->ctrlKey() ) if ( e->ctrlKey() )
state |= Qt::ControlButton; state |= TQt::ControlButton;
if ( e->shiftKey() ) if ( e->shiftKey() )
state |= Qt::ShiftButton; state |= TQt::ShiftButton;
if ( e->altKey() ) if ( e->altKey() )
state |= Qt::AltButton; state |= TQt::AltButton;
if ( e->metaKey() ) if ( e->metaKey() )
state |= Qt::MetaButton; state |= TQt::MetaButton;
if ( e->button() == 0 ) if ( e->button() == 0 )
button = Qt::LeftButton; button = Qt::LeftButton;
@ -140,12 +140,12 @@ void HTMLAnchorElementImpl::defaultEventHandler(EventImpl *evt)
} }
else if ( k ) else if ( k )
{ {
if ( k->checkModifier(Qt::ShiftButton) ) if ( k->checkModifier(TQt::ShiftButton) )
state |= Qt::ShiftButton; state |= TQt::ShiftButton;
if ( k->checkModifier(Qt::AltButton) ) if ( k->checkModifier(TQt::AltButton) )
state |= Qt::AltButton; state |= TQt::AltButton;
if ( k->checkModifier(Qt::ControlButton) ) if ( k->checkModifier(TQt::ControlButton) )
state |= Qt::ControlButton; state |= TQt::ControlButton;
} }
// ### also check if focused node is editable if not in designmode, // ### also check if focused node is editable if not in designmode,

@ -2,7 +2,7 @@
<class>KHTMLInfoDlg</class> <class>KHTMLInfoDlg</class>
<comment>A dialog to display the HTTP headers for a given page.</comment> <comment>A dialog to display the HTTP headers for a given page.</comment>
<author>George Staikos &lt;staikos@kde.org&gt;</author> <author>George Staikos &lt;staikos@kde.org&gt;</author>
<widget class="QDialog"> <widget class="TQDialog">
<property name="name"> <property name="name">
<cstring>HTMLPageInfo</cstring> <cstring>HTMLPageInfo</cstring>
</property> </property>
@ -29,7 +29,7 @@
<property name="name"> <property name="name">
<cstring>unnamed</cstring> <cstring>unnamed</cstring>
</property> </property>
<widget class="QGroupBox" row="0" column="0" rowspan="1" colspan="2"> <widget class="TQGroupBox" row="0" column="0" rowspan="1" colspan="2">
<property name="name"> <property name="name">
<cstring>groupBox2</cstring> <cstring>groupBox2</cstring>
</property> </property>
@ -48,7 +48,7 @@
<property name="name"> <property name="name">
<cstring>unnamed</cstring> <cstring>unnamed</cstring>
</property> </property>
<widget class="QLabel" row="1" column="0"> <widget class="TQLabel" row="1" column="0">
<property name="name"> <property name="name">
<cstring>urlLabel</cstring> <cstring>urlLabel</cstring>
</property> </property>
@ -93,7 +93,7 @@
</sizepolicy> </sizepolicy>
</property> </property>
</widget> </widget>
<widget class="QLabel" row="2" column="1"> <widget class="TQLabel" row="2" column="1">
<property name="name"> <property name="name">
<cstring>_lastModified</cstring> <cstring>_lastModified</cstring>
</property> </property>
@ -106,7 +106,7 @@
</sizepolicy> </sizepolicy>
</property> </property>
</widget> </widget>
<widget class="QLabel" row="0" column="0"> <widget class="TQLabel" row="0" column="0">
<property name="name"> <property name="name">
<cstring>titleLabel</cstring> <cstring>titleLabel</cstring>
</property> </property>
@ -125,7 +125,7 @@
<cstring>_title</cstring> <cstring>_title</cstring>
</property> </property>
</widget> </widget>
<widget class="QLabel" row="2" column="0"> <widget class="TQLabel" row="2" column="0">
<property name="name"> <property name="name">
<cstring>_lmLabel</cstring> <cstring>_lmLabel</cstring>
</property> </property>
@ -144,7 +144,7 @@
<cstring>_lastModified</cstring> <cstring>_lastModified</cstring>
</property> </property>
</widget> </widget>
<widget class="QLabel" row="3" column="0"> <widget class="TQLabel" row="3" column="0">
<property name="name"> <property name="name">
<cstring>_eLabel</cstring> <cstring>_eLabel</cstring>
</property> </property>
@ -180,7 +180,7 @@
</widget> </widget>
</hbox> </hbox>
</widget> </widget>
<widget class="QGroupBox" row="1" column="0" rowspan="1" colspan="2"> <widget class="TQGroupBox" row="1" column="0" rowspan="1" colspan="2">
<property name="name"> <property name="name">
<cstring>groupBox1</cstring> <cstring>groupBox1</cstring>
</property> </property>
@ -191,7 +191,7 @@
<property name="name"> <property name="name">
<cstring>unnamed</cstring> <cstring>unnamed</cstring>
</property> </property>
<widget class="QListView"> <widget class="TQListView">
<column> <column>
<property name="text"> <property name="text">
<string>Property</string> <string>Property</string>
@ -287,9 +287,9 @@
</tabstops> </tabstops>
<includes> <includes>
<include location="global" impldecl="in declaration">kpushbutton.h</include> <include location="global" impldecl="in declaration">kpushbutton.h</include>
<include location="global" impldecl="in declaration">qlabel.h</include> <include location="global" impldecl="in declaration">tqlabel.h</include>
<include location="global" impldecl="in declaration">kactivelabel.h</include> <include location="global" impldecl="in declaration">kactivelabel.h</include>
<include location="global" impldecl="in declaration">qlistview.h</include> <include location="global" impldecl="in declaration">tqlistview.h</include>
<include location="global" impldecl="in implementation">kdialog.h</include> <include location="global" impldecl="in implementation">kdialog.h</include>
</includes> </includes>
<layoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>

@ -680,7 +680,7 @@ void KJavaAppletServer::slotJavaRequest( const TQByteArray& qb )
KSSLCertChain chain; KSSLCertChain chain;
chain.setChain( certs ); chain.setChain( certs );
if ( chain.isValid() ) if ( chain.isValid() )
answer = PermissionDialog( tqApp->activeWindow() ).exec( text, args[0] ); answer = PermissionDialog( TQT_TQWIDGET(tqApp->activeWindow()) ).exec( text, args[0] );
} }
} }
sl.push_front( TQString(answer) ); sl.push_front( TQString(answer) );
@ -826,7 +826,7 @@ PermissionDialog::~PermissionDialog()
void PermissionDialog::clicked() void PermissionDialog::clicked()
{ {
m_button = sender()->name(); m_button = TQT_TQOBJECT_CONST(sender())->name();
static_cast<const TQWidget*>(sender())->tqparentWidget()->close(); static_cast<const TQWidget*>(sender())->tqparentWidget()->close();
} }

@ -369,7 +369,7 @@ bool KJavaAppletViewer::eventFilter (TQObject *o, TQEvent *e) {
KJavaAppletViewer::~KJavaAppletViewer () { KJavaAppletViewer::~KJavaAppletViewer () {
m_view = 0L; m_view = 0L;
serverMaintainer->releaseContext (parent(), baseurl); serverMaintainer->releaseContext (TQT_TQOBJECT(parent()), baseurl);
if (m_statusbar_icon) { if (m_statusbar_icon) {
m_statusbar->removeStatusBarItem (m_statusbar_icon); m_statusbar->removeStatusBarItem (m_statusbar_icon);
delete m_statusbar_icon; delete m_statusbar_icon;

@ -46,11 +46,11 @@ KJavaAppletWidget::KJavaAppletWidget( TQWidget* parent, const char* name )
m_applet = new KJavaApplet( this ); m_applet = new KJavaApplet( this );
d = new KJavaAppletWidgetPrivate; d = new KJavaAppletWidgetPrivate;
m_kwm = new KWinModule( this ); m_kwm = new KWinModule( TQT_TQOBJECT(this) );
d->tmplabel = new TQLabel( this ); d->tmplabel = new TQLabel( this );
d->tmplabel->setText( KJavaAppletServer::getAppletLabel() ); d->tmplabel->setText( KJavaAppletServer::getAppletLabel() );
d->tmplabel->tqsetAlignment( Qt::AlignCenter | Qt::WordBreak ); d->tmplabel->tqsetAlignment( Qt::AlignCenter | TQt::WordBreak );
d->tmplabel->setFrameStyle( TQFrame::StyledPanel | TQFrame::Sunken ); d->tmplabel->setFrameStyle( TQFrame::StyledPanel | TQFrame::Sunken );
d->tmplabel->show(); d->tmplabel->show();

@ -75,7 +75,7 @@
class KJavaAppletWidgetPrivate; class KJavaAppletWidgetPrivate;
class KJavaAppletWidget : public TQXEmbed class KJavaAppletWidget : public QXEmbed
{ {
Q_OBJECT Q_OBJECT
public: public:

@ -168,7 +168,7 @@ void KJavaProcess::storeSize( TQByteArray* buff )
const char* size_ptr = size_str.latin1(); const char* size_ptr = size_str.latin1();
for( int i = 0; i < 8; ++i ) for( int i = 0; i < 8; ++i )
buff->at(i) = size_ptr[i]; buff->tqat(i) = size_ptr[i];
} }
void KJavaProcess::sendBuffer( TQByteArray* buff ) void KJavaProcess::sendBuffer( TQByteArray* buff )

@ -40,7 +40,7 @@
#include <tqpopupmenu.h> #include <tqpopupmenu.h>
#include <tqurl.h> #include <tqurl.h>
#include <tqmetaobject.h> #include <tqmetaobject.h>
#include <private/qucomextra_p.h> #include <tqucomextra_p.h>
#include <tqdragobject.h> #include <tqdragobject.h>
#include <kdebug.h> #include <kdebug.h>
@ -223,7 +223,7 @@ void KHTMLPartBrowserExtension::copy()
text.replace( TQChar( 0xa0 ), ' ' ); text.replace( TQChar( 0xa0 ), ' ' );
QClipboard *cb = TQApplication::clipboard(); TQClipboard *cb = TQApplication::tqclipboard();
disconnect( cb, TQT_SIGNAL( selectionChanged() ), m_part, TQT_SLOT( slotClearSelection() ) ); disconnect( cb, TQT_SIGNAL( selectionChanged() ), m_part, TQT_SLOT( slotClearSelection() ) );
#ifndef QT_NO_MIMECLIPBOARD #ifndef QT_NO_MIMECLIPBOARD
TQString htmltext; TQString htmltext;
@ -264,7 +264,7 @@ void KHTMLPartBrowserExtension::copy()
void KHTMLPartBrowserExtension::searchProvider() void KHTMLPartBrowserExtension::searchProvider()
{ {
// action name is of form "previewProvider[<searchproviderprefix>:]" // action name is of form "previewProvider[<searchproviderprefix>:]"
const TQString searchProviderPrefix = TQString( sender()->name() ).mid( 14 ); const TQString searchProviderPrefix = TQString( TQT_TQOBJECT_CONST(sender())->name() ).mid( 14 );
KURIFilterData data; KURIFilterData data;
TQStringList list; TQStringList list;
@ -315,11 +315,11 @@ void KHTMLPartBrowserExtension::callExtensionProxyMethod( const char *method )
if ( !m_extensionProxy ) if ( !m_extensionProxy )
return; return;
int slot = m_extensionProxy->tqmetaObject()->findSlot( method ); int slot = m_extensionProxy->tqmetaObject()->tqfindSlot( method );
if ( slot == -1 ) if ( slot == -1 )
return; return;
QUObject o[ 1 ]; TQUObject o[ 1 ];
m_extensionProxy->qt_invoke( slot, o ); m_extensionProxy->qt_invoke( slot, o );
} }
@ -335,7 +335,7 @@ void KHTMLPartBrowserExtension::updateEditActions()
// ### duplicated from KonqMainWindow::slotClipboardDataChanged // ### duplicated from KonqMainWindow::slotClipboardDataChanged
#ifndef QT_NO_MIMECLIPBOARD // Handle minimalized versions of Qt Embedded #ifndef QT_NO_MIMECLIPBOARD // Handle minimalized versions of Qt Embedded
TQMimeSource *data = TQApplication::clipboard()->data(); TQMimeSource *data = TQApplication::tqclipboard()->data();
enableAction( "paste", data->provides( "text/plain" ) ); enableAction( "paste", data->provides( "text/plain" ) );
#else #else
TQString data=TQApplication::clipboard()->text(); TQString data=TQApplication::clipboard()->text();
@ -715,10 +715,10 @@ void KHTMLPopupGUIClient::slotCopyLinkLocation()
// Set it in both the mouse selection and in the clipboard // Set it in both the mouse selection and in the clipboard
KURL::List lst; KURL::List lst;
lst.append( safeURL ); lst.append( safeURL );
TQApplication::clipboard()->setData( new KURLDrag( lst ), QClipboard::Clipboard ); TQApplication::tqclipboard()->setData( new KURLDrag( lst ), TQClipboard::Clipboard );
TQApplication::clipboard()->setData( new KURLDrag( lst ), QClipboard::Selection ); TQApplication::tqclipboard()->setData( new KURLDrag( lst ), TQClipboard::Selection );
#else #else
TQApplication::clipboard()->setText( safeURL.url() ); //FIXME(E): Handle multiple entries TQApplication::tqclipboard()->setText( safeURL.url() ); //FIXME(E): Handle multiple entries
#endif #endif
} }
@ -741,8 +741,8 @@ void KHTMLPopupGUIClient::slotCopyImage()
drag->addDragObject( new KURLDrag(lst, d->m_khtml->view(), "Image URL") ); drag->addDragObject( new KURLDrag(lst, d->m_khtml->view(), "Image URL") );
// Set it in both the mouse selection and in the clipboard // Set it in both the mouse selection and in the clipboard
TQApplication::clipboard()->setData( drag, QClipboard::Clipboard ); TQApplication::tqclipboard()->setData( drag, TQClipboard::Clipboard );
TQApplication::clipboard()->setData( new KURLDrag(lst), QClipboard::Selection ); TQApplication::tqclipboard()->setData( new KURLDrag(lst), TQClipboard::Selection );
#else #else
kdDebug() << "slotCopyImage called when the clipboard does not support this. This should not be possible." << endl; kdDebug() << "slotCopyImage called when the clipboard does not support this. This should not be possible." << endl;
#endif #endif
@ -756,8 +756,8 @@ void KHTMLPopupGUIClient::slotCopyImageLocation()
// Set it in both the mouse selection and in the clipboard // Set it in both the mouse selection and in the clipboard
KURL::List lst; KURL::List lst;
lst.append( safeURL ); lst.append( safeURL );
TQApplication::clipboard()->setData( new KURLDrag( lst ), QClipboard::Clipboard ); TQApplication::tqclipboard()->setData( new KURLDrag( lst ), TQClipboard::Clipboard );
TQApplication::clipboard()->setData( new KURLDrag( lst ), QClipboard::Selection ); TQApplication::tqclipboard()->setData( new KURLDrag( lst ), TQClipboard::Selection );
#else #else
TQApplication::clipboard()->setText( safeURL.url() ); //FIXME(E): Handle multiple entries TQApplication::clipboard()->setText( safeURL.url() ); //FIXME(E): Handle multiple entries
#endif #endif

@ -146,7 +146,7 @@ void KHTMLFactory::registerPart( KHTMLPart *part )
if ( !s_parts ) if ( !s_parts )
s_parts = new TQPtrList<KHTMLPart>; s_parts = new TQPtrList<KHTMLPart>;
if ( !s_parts->containsRef( part ) ) if ( !s_parts->tqcontainsRef( part ) )
{ {
s_parts->append( part ); s_parts->append( part );
ref(); ref();

@ -95,8 +95,8 @@ KHTMLPageCacheEntry::endData()
{ {
m_complete = true; m_complete = true;
if ( m_file->status() == 0) { if ( m_file->status() == 0) {
m_file->dataStream()->device()->flush(); m_file->dataStream()->tqdevice()->flush();
m_file->dataStream()->device()->at(0); m_file->dataStream()->tqdevice()->at(0);
} }
} }

@ -111,7 +111,7 @@ using namespace DOM;
#include <tqfile.h> #include <tqfile.h>
#include <tqtooltip.h> #include <tqtooltip.h>
#include <tqmetaobject.h> #include <tqmetaobject.h>
#include <private/qucomextra_p.h> #include <tqucomextra_p.h>
#include "khtmlpart_p.h" #include "khtmlpart_p.h"
#include "kpassivepopup.h" #include "kpassivepopup.h"
@ -128,7 +128,7 @@ namespace khtml {
PartStyleSheetLoader(KHTMLPart *part, DOM::DOMString url, DocLoader* dl) PartStyleSheetLoader(KHTMLPart *part, DOM::DOMString url, DocLoader* dl)
{ {
m_part = part; m_part = part;
m_cachedSheet = dl->requestStyleSheet(url, TQString::null, "text/css", m_cachedSheet = dl->requestStyleSheet(url, TQString(), "text/css",
true /* "user sheet" */); true /* "user sheet" */);
if (m_cachedSheet) if (m_cachedSheet)
m_cachedSheet->ref( this ); m_cachedSheet->ref( this );
@ -186,7 +186,7 @@ void khtml::ChildFrame::liveConnectEvent(const unsigned long, const TQString & e
if (m_jscript) { if (m_jscript) {
// we have a jscript => a part in an iframe // we have a jscript => a part in an iframe
KJS::Completion cmp; KJS::Completion cmp;
m_jscript->evaluate(TQString::null, 1, script, 0L, &cmp); m_jscript->evaluate(TQString(), 1, script, 0L, &cmp);
} else } else
part->executeScript(m_frame->element(), script); part->executeScript(m_frame->element(), script);
} }
@ -233,7 +233,7 @@ void KHTMLPart::init( KHTMLView *view, GUIProfile prof )
else if ( prof == BrowserViewGUI ) else if ( prof == BrowserViewGUI )
setXMLFile( "khtml_browser.rc" ); setXMLFile( "khtml_browser.rc" );
d = new KHTMLPartPrivate(parent()); d = new KHTMLPartPrivate(tqparent());
d->m_view = view; d->m_view = view;
setWidget( d->m_view ); setWidget( d->m_view );
@ -576,7 +576,7 @@ bool KHTMLPart::openURL( const KURL &url )
closeURL(); closeURL();
if( d->m_bJScriptEnabled ) if( d->m_bJScriptEnabled )
d->m_statusBarText[BarOverrideText] = d->m_statusBarText[BarDefaultText] = TQString::null; d->m_statusBarText[BarOverrideText] = d->m_statusBarText[BarDefaultText] = TQString();
/** /**
* The format of the error url is that two variables are passed in the query: * The format of the error url is that two variables are passed in the query:
@ -604,7 +604,7 @@ bool KHTMLPart::openURL( const KURL &url )
if (!parentPart()) { // only do it for toplevel part if (!parentPart()) { // only do it for toplevel part
TQString host = url.isLocalFile() ? "localhost" : url.host(); TQString host = url.isLocalFile() ? "localhost" : url.host();
TQString userAgent = KProtocolManager::userAgentForHost(host); TQString userAgent = KProtocolManager::userAgentForHost(host);
if (userAgent != KProtocolManager::userAgentForHost(TQString::null)) { if (userAgent != KProtocolManager::userAgentForHost(TQString())) {
if (!d->m_statusBarUALabel) { if (!d->m_statusBarUALabel) {
d->m_statusBarUALabel = new KURLLabel(d->m_statusBarExtension->statusBar()); d->m_statusBarUALabel = new KURLLabel(d->m_statusBarExtension->statusBar());
d->m_statusBarUALabel->setFixedHeight(instance()->iconLoader()->currentSize(KIcon::Small)); d->m_statusBarUALabel->setFixedHeight(instance()->iconLoader()->currentSize(KIcon::Small));
@ -734,7 +734,7 @@ bool KHTMLPart::openURL( const KURL &url )
// delete old status bar msg's from kjs (if it _was_ activated on last URL) // delete old status bar msg's from kjs (if it _was_ activated on last URL)
if( d->m_bJScriptEnabled ) if( d->m_bJScriptEnabled )
d->m_statusBarText[BarOverrideText] = d->m_statusBarText[BarDefaultText] = TQString::null; d->m_statusBarText[BarOverrideText] = d->m_statusBarText[BarDefaultText] = TQString();
// set the javascript flags according to the current url // set the javascript flags according to the current url
d->m_bJScriptEnabled = KHTMLFactory::defaultHTMLSettings()->isJavaScriptEnabled(url.host()); d->m_bJScriptEnabled = KHTMLFactory::defaultHTMLSettings()->isJavaScriptEnabled(url.host());
@ -1195,7 +1195,7 @@ TQVariant KHTMLPart::executeScript( const DOM::Node &n, const TQString &script )
return TQVariant(); return TQVariant();
++(d->m_runningScripts); ++(d->m_runningScripts);
KJS::Completion comp; KJS::Completion comp;
const TQVariant ret = proxy->evaluate( TQString::null, 1, script, n, &comp ); const TQVariant ret = proxy->evaluate( TQString(), 1, script, n, &comp );
--(d->m_runningScripts); --(d->m_runningScripts);
/* /*
@ -1466,7 +1466,7 @@ void KHTMLPart::clear()
this, TQT_SLOT( slotActiveFrameChanged( KParts::Part * ) ) ); this, TQT_SLOT( slotActiveFrameChanged( KParts::Part * ) ) );
d->m_delayRedirect = 0; d->m_delayRedirect = 0;
d->m_redirectURL = TQString::null; d->m_redirectURL = TQString();
d->m_redirectionTimer.stop(); d->m_redirectionTimer.stop();
d->m_redirectLockHistory = true; d->m_redirectLockHistory = true;
d->m_bClearing = false; d->m_bClearing = false;
@ -1486,7 +1486,7 @@ void KHTMLPart::clear()
d->m_jobPercent = 0; d->m_jobPercent = 0;
if ( !d->m_haveEncoding ) if ( !d->m_haveEncoding )
d->m_encoding = TQString::null; d->m_encoding = TQString();
#ifdef SPEED_DEBUG #ifdef SPEED_DEBUG
d->m_parsetime.restart(); d->m_parsetime.restart();
#endif #endif
@ -1660,7 +1660,7 @@ void KHTMLPart::slotData( KIO::Job* kio_job, const TQByteArray &data )
// Support for http last-modified // Support for http last-modified
d->m_lastModified = d->m_job->queryMetaData("modified"); d->m_lastModified = d->m_job->queryMetaData("modified");
} else } else
d->m_lastModified = TQString::null; // done on-demand by lastModified() d->m_lastModified = TQString(); // done on-demand by lastModified()
} }
KHTMLPageCache::self()->addData(d->m_cacheId, data); KHTMLPageCache::self()->addData(d->m_cacheId, data);
@ -1911,7 +1911,7 @@ void KHTMLPart::begin( const KURL &url, int xOffset, int yOffset )
args.yOffset = yOffset; args.yOffset = yOffset;
d->m_extension->setURLArgs( args ); d->m_extension->setURLArgs( args );
d->m_pageReferrer = TQString::null; d->m_pageReferrer = TQString();
KURL ref(url); KURL ref(url);
d->m_referrer = ref.protocol().startsWith("http") ? ref.url() : ""; d->m_referrer = ref.protocol().startsWith("http") ? ref.url() : "";
@ -2301,11 +2301,11 @@ void KHTMLPart::checkCompleted()
d->m_paUseStylesheet->setEnabled( sheets.count() > 2); d->m_paUseStylesheet->setEnabled( sheets.count() > 2);
if (sheets.count() > 2) if (sheets.count() > 2)
{ {
d->m_paUseStylesheet->setCurrentItem(kMax(sheets.findIndex(d->m_sheetUsed), 0)); d->m_paUseStylesheet->setCurrentItem(kMax(sheets.tqfindIndex(d->m_sheetUsed), 0));
slotUseStylesheet(); slotUseStylesheet();
} }
setJSDefaultStatusBarText(TQString::null); setJSDefaultStatusBarText(TQString());
#ifdef SPEED_DEBUG #ifdef SPEED_DEBUG
kdDebug(6050) << "DONE: " <<d->m_parsetime.elapsed() << endl; kdDebug(6050) << "DONE: " <<d->m_parsetime.elapsed() << endl;
@ -2359,7 +2359,7 @@ KURL KHTMLPart::baseURL() const
TQString KHTMLPart::baseTarget() const TQString KHTMLPart::baseTarget() const
{ {
if ( !d->m_doc ) return TQString::null; if ( !d->m_doc ) return TQString();
return d->m_doc->baseTarget(); return d->m_doc->baseTarget();
} }
@ -2399,7 +2399,7 @@ void KHTMLPart::slotRedirect()
kdDebug(6050) << this << " slotRedirect()" << endl; kdDebug(6050) << this << " slotRedirect()" << endl;
TQString u = d->m_redirectURL; TQString u = d->m_redirectURL;
d->m_delayRedirect = 0; d->m_delayRedirect = 0;
d->m_redirectURL = TQString::null; d->m_redirectURL = TQString();
// SYNC check with ecma/kjs_window.cpp::goURL ! // SYNC check with ecma/kjs_window.cpp::goURL !
if ( u.tqfind( TQString::tqfromLatin1( "javascript:" ), 0, false ) == 0 ) if ( u.tqfind( TQString::tqfromLatin1( "javascript:" ), 0, false ) == 0 )
@ -3435,15 +3435,15 @@ TQString KHTMLPart::selectedTextAsHTML() const
{ {
if(!hasSelection()) { if(!hasSelection()) {
kdDebug() << "selectedTextAsHTML(): selection is not valid. Returning empty selection" << endl; kdDebug() << "selectedTextAsHTML(): selection is not valid. Returning empty selection" << endl;
return TQString::null; return TQString();
} }
if(d->m_startOffset < 0 || d->m_endOffset <0) { if(d->m_startOffset < 0 || d->m_endOffset <0) {
kdDebug() << "invalid values for end/startOffset " << d->m_startOffset << " " << d->m_endOffset << endl; kdDebug() << "invalid values for end/startOffset " << d->m_startOffset << " " << d->m_endOffset << endl;
return TQString::null; return TQString();
} }
DOM::Range r = selection(); DOM::Range r = selection();
if(r.isNull() || r.isDetached()) if(r.isNull() || r.isDetached())
return TQString::null; return TQString();
int exceptioncode = 0; //ignore the result int exceptioncode = 0; //ignore the result
return r.handle()->toHTML(exceptioncode).string(); return r.handle()->toHTML(exceptioncode).string();
} }
@ -3574,7 +3574,7 @@ TQString KHTMLPart::selectedText() const
} }
if(text.isEmpty()) if(text.isEmpty())
return TQString::null; return TQString();
int start = 0; int start = 0;
int end = text.length(); int end = text.length();
@ -3708,10 +3708,10 @@ void KHTMLPart::resetHoverText()
{ {
if( !d->m_overURL.isEmpty() ) // Only if we were showing a link if( !d->m_overURL.isEmpty() ) // Only if we were showing a link
{ {
d->m_overURL = d->m_overURLTarget = TQString::null; d->m_overURL = d->m_overURLTarget = TQString();
emit onURL( TQString::null ); emit onURL( TQString() );
// revert to default statusbar text // revert to default statusbar text
setStatusBarText(TQString::null, BarHoverText); setStatusBarText(TQString(), BarHoverText);
emit d->m_extension->mouseOverInfo(0); emit d->m_extension->mouseOverInfo(0);
} }
} }
@ -3740,7 +3740,7 @@ void KHTMLPart::overURL( const TQString &url, const TQString &target, bool /*shi
return; return;
} }
KFileItem item(u, TQString::null, KFileItem::Unknown); KFileItem item(u, TQString(), KFileItem::Unknown);
emit d->m_extension->mouseOverInfo(&item); emit d->m_extension->mouseOverInfo(&item);
TQString com; TQString com;
@ -3852,7 +3852,7 @@ void KHTMLPart::overURL( const TQString &url, const TQString &target, bool /*shi
else if ((*it).startsWith(TQString::tqfromLatin1("bcc="))) else if ((*it).startsWith(TQString::tqfromLatin1("bcc=")))
mailtoMsg += i18n(" - BCC: ") + KURL::decode_string((*it).mid(4)); mailtoMsg += i18n(" - BCC: ") + KURL::decode_string((*it).mid(4));
mailtoMsg = TQStyleSheet::escape(mailtoMsg); mailtoMsg = TQStyleSheet::escape(mailtoMsg);
mailtoMsg.replace(TQRegExp("([\n\r\t]|[ ]{10})"), TQString::null); mailtoMsg.replace(TQRegExp("([\n\r\t]|[ ]{10})"), TQString());
setStatusBarText("<qt>"+mailtoMsg, BarHoverText); setStatusBarText("<qt>"+mailtoMsg, BarHoverText);
return; return;
} }
@ -3930,7 +3930,7 @@ bool KHTMLPart::urlSelectedIntern( const TQString &url, int button, int state, c
return true; return true;
} }
if ( button == LeftButton && ( state & ShiftButton ) ) if ( button == Qt::LeftButton && ( state & ShiftButton ) )
{ {
KIO::MetaData metaData; KIO::MetaData metaData;
metaData["referrer"] = d->m_referrer; metaData["referrer"] = d->m_referrer;
@ -3965,11 +3965,11 @@ bool KHTMLPart::urlSelectedIntern( const TQString &url, int button, int state, c
} }
} }
if (!d->m_referrer.isEmpty() && !args.metaData().contains("referrer")) if (!d->m_referrer.isEmpty() && !args.metaData().tqcontains("referrer"))
args.metaData()["referrer"] = d->m_referrer; args.metaData()["referrer"] = d->m_referrer;
if ( button == NoButton && (state & ShiftButton) && (state & ControlButton) ) if ( button == Qt::NoButton && (state & ShiftButton) && (state & ControlButton) )
{ {
emit d->m_extension->createNewWindow( cURL, args ); emit d->m_extension->createNewWindow( cURL, args );
return true; return true;
@ -4017,7 +4017,7 @@ void KHTMLPart::slotViewDocumentSource()
bool isTempFile = false; bool isTempFile = false;
if (!(url.isLocalFile()) && KHTMLPageCache::self()->isComplete(d->m_cacheId)) if (!(url.isLocalFile()) && KHTMLPageCache::self()->isComplete(d->m_cacheId))
{ {
KTempFile sourceFile(TQString::null, defaultExtension()); KTempFile sourceFile(TQString(), defaultExtension());
if (sourceFile.status() == 0) if (sourceFile.status() == 0)
{ {
KHTMLPageCache::self()->saveData(d->m_cacheId, sourceFile.dataStream()); KHTMLPageCache::self()->saveData(d->m_cacheId, sourceFile.dataStream());
@ -4032,7 +4032,7 @@ void KHTMLPart::slotViewDocumentSource()
void KHTMLPart::slotViewPageInfo() void KHTMLPart::slotViewPageInfo()
{ {
KHTMLInfoDlg *dlg = new KHTMLInfoDlg(NULL, "KHTML Page Info Dialog", false, WDestructiveClose); KHTMLInfoDlg *dlg = new KHTMLInfoDlg(NULL, "KHTML Page Info Dialog", false, (WFlags)WDestructiveClose);
dlg->_close->setGuiItem(KStdGuiItem::close()); dlg->_close->setGuiItem(KStdGuiItem::close());
if (d->m_doc) if (d->m_doc)
@ -4043,7 +4043,7 @@ void KHTMLPart::slotViewPageInfo()
dlg->setCaption(i18n("Frame Information")); dlg->setCaption(i18n("Frame Information"));
} }
TQString editStr = TQString::null; TQString editStr = TQString();
if (!d->m_pageServices.isEmpty()) if (!d->m_pageServices.isEmpty())
editStr = i18n(" <a href=\"%1\">[Properties]</a>").arg(d->m_pageServices); editStr = i18n(" <a href=\"%1\">[Properties]</a>").arg(d->m_pageServices);
@ -4097,7 +4097,7 @@ void KHTMLPart::slotViewFrameSource()
if (KHTMLPageCache::self()->isComplete(cacheId)) if (KHTMLPageCache::self()->isComplete(cacheId))
{ {
KTempFile sourceFile(TQString::null, defaultExtension()); KTempFile sourceFile(TQString(), defaultExtension());
if (sourceFile.status() == 0) if (sourceFile.status() == 0)
{ {
KHTMLPageCache::self()->saveData(cacheId, sourceFile.dataStream()); KHTMLPageCache::self()->saveData(cacheId, sourceFile.dataStream());
@ -4276,7 +4276,7 @@ void KHTMLPart::updateActions()
{ {
TQObject *ext = KParts::BrowserExtension::childObject( frame ); TQObject *ext = KParts::BrowserExtension::childObject( frame );
if ( ext ) if ( ext )
enablePrintFrame = ext->tqmetaObject()->slotNames().contains( "print()" ); enablePrintFrame = ext->tqmetaObject()->slotNames().tqcontains( "print()" );
} }
d->m_paPrintFrame->setEnabled( enablePrintFrame ); d->m_paPrintFrame->setEnabled( enablePrintFrame );
@ -4305,7 +4305,7 @@ bool KHTMLPart::requestFrame( khtml::RenderPart *frame, const TQString &url, con
const TQStringList &params, bool isIFrame ) const TQStringList &params, bool isIFrame )
{ {
//kdDebug( 6050 ) << this << " requestFrame( ..., " << url << ", " << frameName << " )" << endl; //kdDebug( 6050 ) << this << " requestFrame( ..., " << url << ", " << frameName << " )" << endl;
FrameIt it = d->m_frames.tqfind( frameName ); FrameIt it = d->m_frames.find( frameName );
if ( it == d->m_frames.end() ) if ( it == d->m_frames.end() )
{ {
khtml::ChildFrame * child = new khtml::ChildFrame; khtml::ChildFrame * child = new khtml::ChildFrame;
@ -4392,8 +4392,8 @@ bool KHTMLPart::requestObject( khtml::ChildFrame *child, const KURL &url, const
child->m_args = args; child->m_args = args;
child->m_args.reload = (d->m_cachePolicy == KIO::CC_Reload); child->m_args.reload = (d->m_cachePolicy == KIO::CC_Reload);
child->m_serviceName = TQString::null; child->m_serviceName = TQString();
if (!d->m_referrer.isEmpty() && !child->m_args.metaData().contains( "referrer" )) if (!d->m_referrer.isEmpty() && !child->m_args.metaData().tqcontains( "referrer" ))
child->m_args.metaData()["referrer"] = d->m_referrer; child->m_args.metaData()["referrer"] = d->m_referrer;
child->m_args.metaData().insert("PropagateHttpHeader", "true"); child->m_args.metaData().insert("PropagateHttpHeader", "true");
@ -4459,7 +4459,7 @@ bool KHTMLPart::processObjectRequest( khtml::ChildFrame *child, const KURL &_url
url, mimetype, suggestedFilename ); url, mimetype, suggestedFilename );
switch( res ) { switch( res ) {
case KParts::BrowserRun::Save: case KParts::BrowserRun::Save:
KHTMLPopupGUIClient::saveURL( widget(), i18n( "Save As" ), url, child->m_args.metaData(), TQString::null, 0, suggestedFilename); KHTMLPopupGUIClient::saveURL( widget(), i18n( "Save As" ), url, child->m_args.metaData(), TQString(), 0, suggestedFilename);
// fall-through // fall-through
case KParts::BrowserRun::Cancel: case KParts::BrowserRun::Cancel:
child->m_bCompleted = true; child->m_bCompleted = true;
@ -4652,14 +4652,14 @@ KParts::ReadOnlyPart *KHTMLPart::createPart( TQWidget *tqparentWidget, const cha
if ( !serviceName.isEmpty() ) if ( !serviceName.isEmpty() )
constr.append( TQString::tqfromLatin1( "Name == '%1'" ).arg( serviceName ) ); constr.append( TQString::tqfromLatin1( "Name == '%1'" ).arg( serviceName ) );
KTrader::OfferList offers = KTrader::self()->query( mimetype, "KParts/ReadOnlyPart", constr, TQString::null ); KTrader::OfferList offers = KTrader::self()->query( mimetype, "KParts/ReadOnlyPart", constr, TQString() );
if ( offers.isEmpty() ) { if ( offers.isEmpty() ) {
int pos = mimetype.tqfind( "-plugin" ); int pos = mimetype.tqfind( "-plugin" );
if (pos < 0) if (pos < 0)
return 0L; return 0L;
TQString stripped_mime = mimetype.left( pos ); TQString stripped_mime = mimetype.left( pos );
offers = KTrader::self()->query( stripped_mime, "KParts/ReadOnlyPart", constr, TQString::null ); offers = KTrader::self()->query( stripped_mime, "KParts/ReadOnlyPart", constr, TQString() );
if ( offers.isEmpty() ) if ( offers.isEmpty() )
return 0L; return 0L;
} }
@ -4675,13 +4675,13 @@ KParts::ReadOnlyPart *KHTMLPart::createPart( TQWidget *tqparentWidget, const cha
KParts::ReadOnlyPart *res = 0L; KParts::ReadOnlyPart *res = 0L;
const char *className = "KParts::ReadOnlyPart"; const char *className = "KParts::ReadOnlyPart";
if ( service->serviceTypes().contains( "Browser/View" ) ) if ( service->serviceTypes().tqcontains( "Browser/View" ) )
className = "Browser/View"; className = "Browser/View";
if ( factory->inherits( "KParts::Factory" ) ) if ( factory->inherits( "KParts::Factory" ) )
res = static_cast<KParts::ReadOnlyPart *>(static_cast<KParts::Factory *>( factory )->createPart( tqparentWidget, widgetName, parent, name, className, params )); res = static_cast<KParts::ReadOnlyPart *>(static_cast<KParts::Factory *>( factory )->createPart( tqparentWidget, widgetName, parent, name, className, params ));
else else
res = static_cast<KParts::ReadOnlyPart *>(factory->create( tqparentWidget, widgetName, className )); res = static_cast<KParts::ReadOnlyPart *>(factory->create( TQT_TQOBJECT(tqparentWidget), widgetName, className ));
if ( res ) { if ( res ) {
serviceTypes = service->serviceTypes(); serviceTypes = service->serviceTypes();
@ -4690,8 +4690,8 @@ KParts::ReadOnlyPart *KHTMLPart::createPart( TQWidget *tqparentWidget, const cha
} }
} else { } else {
// TODO KMessageBox::error and i18n, like in KonqFactory::createView? // TODO KMessageBox::error and i18n, like in KonqFactory::createView?
kdWarning() << TQString("There was an error loading the module %1.\nThe diagnostics is:\n%2") kdWarning() << TQString(TQString("There was an error loading the module %1.\nThe diagnostics is:\n%2")
.arg(service->name()).arg(KLibLoader::self()->lastErrorMessage()) << endl; .arg(service->name()).arg(KLibLoader::self()->lastErrorMessage())) << endl;
} }
} }
return 0; return 0;
@ -5014,7 +5014,7 @@ void KHTMLPart::popupMenu( const TQString &linkUrl )
if ( !guard.isNull() ) { if ( !guard.isNull() ) {
delete client; delete client;
emit popupMenu(linkUrl, TQCursor::pos()); emit popupMenu(linkUrl, TQCursor::pos());
d->m_strSelectedURL = d->m_strSelectedURLTarget = TQString::null; d->m_strSelectedURL = d->m_strSelectedURLTarget = TQString();
} }
} }
@ -5030,7 +5030,7 @@ void KHTMLPart::slotParentCompleted()
void KHTMLPart::slotChildStarted( KIO::Job *job ) void KHTMLPart::slotChildStarted( KIO::Job *job )
{ {
khtml::ChildFrame *child = frame( sender() ); khtml::ChildFrame *child = frame( TQT_TQOBJECT_CONST(sender()) );
assert( child ); assert( child );
@ -5057,7 +5057,7 @@ void KHTMLPart::slotChildCompleted()
void KHTMLPart::slotChildCompleted( bool pendingAction ) void KHTMLPart::slotChildCompleted( bool pendingAction )
{ {
khtml::ChildFrame *child = frame( sender() ); khtml::ChildFrame *child = frame( TQT_TQOBJECT_CONST(sender()) );
if ( child ) { if ( child ) {
kdDebug(6050) << this << " slotChildCompleted child=" << child << " m_frame=" << child->m_frame << endl; kdDebug(6050) << this << " slotChildCompleted child=" << child << " m_frame=" << child->m_frame << endl;
@ -5090,7 +5090,7 @@ void KHTMLPart::slotChildDocCreated()
void KHTMLPart::slotChildURLRequest( const KURL &url, const KParts::URLArgs &args ) void KHTMLPart::slotChildURLRequest( const KURL &url, const KParts::URLArgs &args )
{ {
khtml::ChildFrame *child = frame( sender()->parent() ); khtml::ChildFrame *child = frame( TQT_TQOBJECT_CONST(sender())->tqparent() );
KHTMLPart *callingHtmlPart = const_cast<KHTMLPart *>(dynamic_cast<const KHTMLPart *>(sender()->parent())); KHTMLPart *callingHtmlPart = const_cast<KHTMLPart *>(dynamic_cast<const KHTMLPart *>(sender()->parent()));
// TODO: handle child target correctly! currently the script are always executed fur the parent // TODO: handle child target correctly! currently the script are always executed fur the parent
@ -5116,7 +5116,7 @@ void KHTMLPart::slotChildURLRequest( const KURL &url, const KParts::URLArgs &arg
else if ( frameName == TQString::tqfromLatin1( "_parent" ) ) else if ( frameName == TQString::tqfromLatin1( "_parent" ) )
{ {
KParts::URLArgs newArgs( args ); KParts::URLArgs newArgs( args );
newArgs.frameName = TQString::null; newArgs.frameName = TQString();
emit d->m_extension->openURLRequest( url, newArgs ); emit d->m_extension->openURLRequest( url, newArgs );
return; return;
@ -5142,7 +5142,7 @@ void KHTMLPart::slotChildURLRequest( const KURL &url, const KParts::URLArgs &arg
} else if ( frameName== "_self" ) // this is for embedded objects (via <object>) which want to replace the current document } else if ( frameName== "_self" ) // this is for embedded objects (via <object>) which want to replace the current document
{ {
KParts::URLArgs newArgs( args ); KParts::URLArgs newArgs( args );
newArgs.frameName = TQString::null; newArgs.frameName = TQString();
emit d->m_extension->openURLRequest( url, newArgs ); emit d->m_extension->openURLRequest( url, newArgs );
} }
} }
@ -5224,7 +5224,7 @@ KHTMLPart::findFrameParent( KParts::ReadOnlyPart *callingPart, const TQString &f
if (!childFrame && !parentPart() && (TQString::fromLocal8Bit(name()) == f)) if (!childFrame && !parentPart() && (TQString::fromLocal8Bit(name()) == f))
return this; return this;
FrameIt it = d->m_frames.tqfind( f ); FrameIt it = d->m_frames.find( f );
const FrameIt end = d->m_frames.end(); const FrameIt end = d->m_frames.end();
if ( it != end ) if ( it != end )
{ {
@ -5287,7 +5287,7 @@ KParts::ReadOnlyPart *KHTMLPart::currentFrame() const
bool KHTMLPart::frameExists( const TQString &frameName ) bool KHTMLPart::frameExists( const TQString &frameName )
{ {
ConstFrameIt it = d->m_frames.tqfind( frameName ); ConstFrameIt it = d->m_frames.find( frameName );
if ( it == d->m_frames.end() ) if ( it == d->m_frames.end() )
return false; return false;
@ -5728,7 +5728,7 @@ void KHTMLPart::setZoomFactor (int percent)
d->m_zoomFactor = percent; d->m_zoomFactor = percent;
if(d->m_doc) { if(d->m_doc) {
TQApplication::setOverrideCursor( waitCursor ); TQApplication::setOverrideCursor( tqwaitCursor );
if (d->m_doc->styleSelector()) if (d->m_doc->styleSelector())
d->m_doc->styleSelector()->computeFontSizes(d->m_doc->paintDeviceMetrics(), d->m_zoomFactor); d->m_doc->styleSelector()->computeFontSizes(d->m_doc->paintDeviceMetrics(), d->m_zoomFactor);
d->m_doc->recalcStyle( NodeImpl::Force ); d->m_doc->recalcStyle( NodeImpl::Force );
@ -5816,14 +5816,14 @@ TQString KHTMLPart::pageReferrer() const
if ((protocol == "http") || if ((protocol == "http") ||
((protocol == "https") && (m_url.protocol() == "https"))) ((protocol == "https") && (m_url.protocol() == "https")))
{ {
referrerURL.setRef(TQString::null); referrerURL.setRef(TQString());
referrerURL.setUser(TQString::null); referrerURL.setUser(TQString());
referrerURL.setPass(TQString::null); referrerURL.setPass(TQString());
return referrerURL.url(); return referrerURL.url();
} }
} }
return TQString::null; return TQString();
} }
@ -5874,7 +5874,7 @@ void KHTMLPart::reparseConfiguration()
delete d->m_settings; delete d->m_settings;
d->m_settings = new KHTMLSettings(*KHTMLFactory::defaultHTMLSettings()); d->m_settings = new KHTMLSettings(*KHTMLFactory::defaultHTMLSettings());
TQApplication::setOverrideCursor( waitCursor ); TQApplication::setOverrideCursor( tqwaitCursor );
khtml::CSSStyleSelector::reparseConfiguration(); khtml::CSSStyleSelector::reparseConfiguration();
if(d->m_doc) d->m_doc->updateStyleSelector(); if(d->m_doc) d->m_doc->updateStyleSelector();
TQApplication::restoreOverrideCursor(); TQApplication::restoreOverrideCursor();
@ -5912,7 +5912,7 @@ TQPtrList<KParts::ReadOnlyPart> KHTMLPart::frames() const
bool KHTMLPart::openURLInFrame( const KURL &url, const KParts::URLArgs &urlArgs ) bool KHTMLPart::openURLInFrame( const KURL &url, const KParts::URLArgs &urlArgs )
{ {
kdDebug( 6050 ) << this << "KHTMLPart::openURLInFrame " << url << endl; kdDebug( 6050 ) << this << "KHTMLPart::openURLInFrame " << url << endl;
FrameIt it = d->m_frames.tqfind( urlArgs.frameName ); FrameIt it = d->m_frames.find( urlArgs.frameName );
if ( it == d->m_frames.end() ) if ( it == d->m_frames.end() )
return false; return false;
@ -6055,15 +6055,15 @@ void KHTMLPart::khtmlMousePressEvent( khtml::MousePressEvent *event )
d->m_strSelectedURLTarget = event->target().string(); d->m_strSelectedURLTarget = event->target().string();
} }
else else
d->m_strSelectedURL = d->m_strSelectedURLTarget = TQString::null; d->m_strSelectedURL = d->m_strSelectedURLTarget = TQString();
if ( _mouse->button() == LeftButton || if ( _mouse->button() == Qt::LeftButton ||
_mouse->button() == MidButton ) _mouse->button() == Qt::MidButton )
{ {
d->m_bMousePressed = true; d->m_bMousePressed = true;
#ifndef KHTML_NO_SELECTION #ifndef KHTML_NO_SELECTION
if ( _mouse->button() == LeftButton ) if ( _mouse->button() == Qt::LeftButton )
{ {
if ( (!d->m_strSelectedURL.isNull() && !isEditable()) if ( (!d->m_strSelectedURL.isNull() && !isEditable())
|| (!d->m_mousePressNode.isNull() && d->m_mousePressNode.elementId() == ID_IMG) ) || (!d->m_mousePressNode.isNull() && d->m_mousePressNode.elementId() == ID_IMG) )
@ -6111,10 +6111,10 @@ void KHTMLPart::khtmlMousePressEvent( khtml::MousePressEvent *event )
#endif #endif
} }
if ( _mouse->button() == RightButton && parentPart() != 0 && d->m_bBackRightClick ) if ( _mouse->button() == Qt::RightButton && parentPart() != 0 && d->m_bBackRightClick )
{ {
d->m_bRightMousePressed = true; d->m_bRightMousePressed = true;
} else if ( _mouse->button() == RightButton ) } else if ( _mouse->button() == Qt::RightButton )
{ {
popupMenu( d->m_strSelectedURL ); popupMenu( d->m_strSelectedURL );
// might be deleted, don't touch "this" // might be deleted, don't touch "this"
@ -6124,7 +6124,7 @@ void KHTMLPart::khtmlMousePressEvent( khtml::MousePressEvent *event )
void KHTMLPart::khtmlMouseDoubleClickEvent( khtml::MouseDoubleClickEvent *event ) void KHTMLPart::khtmlMouseDoubleClickEvent( khtml::MouseDoubleClickEvent *event )
{ {
TQMouseEvent *_mouse = event->qmouseEvent(); TQMouseEvent *_mouse = event->qmouseEvent();
if ( _mouse->button() == LeftButton ) if ( _mouse->button() == Qt::LeftButton )
{ {
d->m_bMousePressed = true; d->m_bMousePressed = true;
DOM::Node innerNode = event->innerNode(); DOM::Node innerNode = event->innerNode();
@ -6248,7 +6248,7 @@ void KHTMLPart::extendSelection( DOM::NodeImpl* node, long offset, DOM::Node& se
//kdDebug() << "obj=" << obj << endl; //kdDebug() << "obj=" << obj << endl;
if ( obj ) { if ( obj ) {
//kdDebug() << "isText=" << obj->isText() << endl; //kdDebug() << "isText=" << obj->isText() << endl;
str = TQString::null; str = TQString();
if ( obj->isText() ) if ( obj->isText() )
str = static_cast<khtml::RenderText *>(obj)->data().string(); str = static_cast<khtml::RenderText *>(obj)->data().string();
else if ( obj->isBR() ) else if ( obj->isBR() )
@ -6378,7 +6378,7 @@ void KHTMLPart::khtmlMouseMoveEvent( khtml::MouseMoveEvent *event )
if( d->m_bRightMousePressed && parentPart() != 0 && d->m_bBackRightClick ) if( d->m_bRightMousePressed && parentPart() != 0 && d->m_bBackRightClick )
{ {
popupMenu( d->m_strSelectedURL ); popupMenu( d->m_strSelectedURL );
d->m_strSelectedURL = d->m_strSelectedURLTarget = TQString::null; d->m_strSelectedURL = d->m_strSelectedURLTarget = TQString();
d->m_bRightMousePressed = false; d->m_bRightMousePressed = false;
} }
@ -6415,7 +6415,7 @@ void KHTMLPart::khtmlMouseMoveEvent( khtml::MouseMoveEvent *event )
pix = KMimeType::pixmapForURL(u, 0, KIcon::Desktop, KIcon::SizeMedium); pix = KMimeType::pixmapForURL(u, 0, KIcon::Desktop, KIcon::SizeMedium);
} }
u.setPass(TQString::null); u.setPass(TQString());
KURLDrag* urlDrag = new KURLDrag( u, img ? 0 : d->m_view->viewport() ); KURLDrag* urlDrag = new KURLDrag( u, img ? 0 : d->m_view->viewport() );
if ( !d->m_referrer.isEmpty() ) if ( !d->m_referrer.isEmpty() )
@ -6439,7 +6439,7 @@ void KHTMLPart::khtmlMouseMoveEvent( khtml::MouseMoveEvent *event )
// when we finish our drag, we need to undo our mouse press // when we finish our drag, we need to undo our mouse press
d->m_bMousePressed = false; d->m_bMousePressed = false;
d->m_strSelectedURL = d->m_strSelectedURLTarget = TQString::null; d->m_strSelectedURL = d->m_strSelectedURLTarget = TQString();
return; return;
} }
#endif #endif
@ -6493,7 +6493,7 @@ void KHTMLPart::khtmlMouseMoveEvent( khtml::MouseMoveEvent *event )
#ifndef KHTML_NO_SELECTION #ifndef KHTML_NO_SELECTION
// selection stuff // selection stuff
if( d->m_bMousePressed && innerNode.handle() && innerNode.handle()->renderer() && if( d->m_bMousePressed && innerNode.handle() && innerNode.handle()->renderer() &&
( (_mouse->state() & LeftButton) != 0 )) { ( (_mouse->state() & Qt::LeftButton) != 0 )) {
extendSelectionTo(event->x(), event->y(), extendSelectionTo(event->x(), event->y(),
event->absX(), event->absY(), innerNode); event->absX(), event->absY(), innerNode);
#else #else
@ -6516,7 +6516,7 @@ void KHTMLPart::khtmlMouseReleaseEvent( khtml::MouseReleaseEvent *event )
d->m_mousePressNode = DOM::Node(); d->m_mousePressNode = DOM::Node();
if ( d->m_bMousePressed ) { if ( d->m_bMousePressed ) {
setStatusBarText(TQString::null, BarHoverText); setStatusBarText(TQString(), BarHoverText);
stopAutoScroll(); stopAutoScroll();
} }
@ -6525,7 +6525,7 @@ void KHTMLPart::khtmlMouseReleaseEvent( khtml::MouseReleaseEvent *event )
d->m_bMousePressed = false; d->m_bMousePressed = false;
TQMouseEvent *_mouse = event->qmouseEvent(); TQMouseEvent *_mouse = event->qmouseEvent();
if ( _mouse->button() == RightButton && parentPart() != 0 && d->m_bBackRightClick ) if ( _mouse->button() == Qt::RightButton && parentPart() != 0 && d->m_bBackRightClick )
{ {
d->m_bRightMousePressed = false; d->m_bRightMousePressed = false;
KParts::BrowserInterface *tmp_iface = d->m_extension->browserInterface(); KParts::BrowserInterface *tmp_iface = d->m_extension->browserInterface();
@ -6534,7 +6534,7 @@ void KHTMLPart::khtmlMouseReleaseEvent( khtml::MouseReleaseEvent *event )
} }
} }
#ifndef QT_NO_CLIPBOARD #ifndef QT_NO_CLIPBOARD
if ((d->m_guiProfile == BrowserViewGUI) && (_mouse->button() == MidButton) && (event->url().isNull())) { if ((d->m_guiProfile == BrowserViewGUI) && (_mouse->button() == Qt::MidButton) && (event->url().isNull())) {
kdDebug( 6050 ) << "KHTMLPart::khtmlMouseReleaseEvent() MMB shouldOpen=" kdDebug( 6050 ) << "KHTMLPart::khtmlMouseReleaseEvent() MMB shouldOpen="
<< d->m_bOpenMiddleClick << endl; << d->m_bOpenMiddleClick << endl;
@ -6660,9 +6660,9 @@ void KHTMLPart::slotPrintFrame()
TQMetaObject *mo = ext->tqmetaObject(); TQMetaObject *mo = ext->tqmetaObject();
int idx = mo->findSlot( "print()", true ); int idx = mo->tqfindSlot( "print()", true );
if ( idx >= 0 ) { if ( idx >= 0 ) {
QUObject o[ 1 ]; TQUObject o[ 1 ];
ext->qt_invoke( idx, o ); ext->qt_invoke( idx, o );
} }
} }
@ -6854,7 +6854,7 @@ void KHTMLPart::slotPartRemoved( KParts::Part *part )
if (factory()) { if (factory()) {
factory()->removeClient( part ); factory()->removeClient( part );
} }
if (childClients()->containsRef(part)) { if (childClients()->tqcontainsRef(part)) {
removeChildClient( part ); removeChildClient( part );
} }
} }
@ -6999,7 +6999,7 @@ bool KHTMLPart::pluginPageQuestionAsked(const TQString& mimetype) const
if ( parent ) if ( parent )
return parent->pluginPageQuestionAsked(mimetype); return parent->pluginPageQuestionAsked(mimetype);
return d->m_pluginPageQuestionAsked.contains(mimetype); return d->m_pluginPageQuestionAsked.tqcontains(mimetype);
} }
void KHTMLPart::setPluginPageQuestionAsked(const TQString& mimetype) void KHTMLPart::setPluginPageQuestionAsked(const TQString& mimetype)
@ -7072,7 +7072,7 @@ void KHTMLPart::slotAutomaticDetectionLanguage( int _id )
d->m_paSetEncoding->popupMenu()->setItemChecked( 0, true ); d->m_paSetEncoding->popupMenu()->setItemChecked( 0, true );
setEncoding( TQString::null, false ); setEncoding( TQString(), false );
if( d->m_manualDetection ) if( d->m_manualDetection )
d->m_manualDetection->setCurrentItem( -1 ); d->m_manualDetection->setCurrentItem( -1 );
@ -7379,7 +7379,7 @@ void KHTMLPart::setSuppressedPopupIndicator( bool enable, KHTMLPart *originPart
if ( enable && originPart ) { if ( enable && originPart ) {
d->m_openableSuppressedPopups++; d->m_openableSuppressedPopups++;
if ( d->m_suppressedPopupOriginParts.findIndex( originPart ) == -1 ) if ( d->m_suppressedPopupOriginParts.tqfindIndex( originPart ) == -1 )
d->m_suppressedPopupOriginParts.append( originPart ); d->m_suppressedPopupOriginParts.append( originPart );
} }

@ -80,7 +80,7 @@ KHTMLPrintSettings::KHTMLPrintSettings(TQWidget *parent, const char *name)
TQWhatsThis::add(m_printheader, whatsThisPrintHeader); TQWhatsThis::add(m_printheader, whatsThisPrintHeader);
m_printheader->setChecked(true); m_printheader->setChecked(true);
QVBoxLayout *l0 = new TQVBoxLayout(this, 0, 10); TQVBoxLayout *l0 = new TQVBoxLayout(this, 0, 10);
l0->addWidget(m_printfriendly); l0->addWidget(m_printfriendly);
l0->addWidget(m_printimages); l0->addWidget(m_printimages);
l0->addWidget(m_printheader); l0->addWidget(m_printheader);

@ -35,9 +35,9 @@ public:
void setOptions(const TQMap<TQString,TQString>& opts); void setOptions(const TQMap<TQString,TQString>& opts);
private: private:
QCheckBox *m_printfriendly; TQCheckBox *m_printfriendly;
QCheckBox *m_printimages; TQCheckBox *m_printimages;
QCheckBox *m_printheader; TQCheckBox *m_printheader;
}; };
#endif #endif

@ -878,7 +878,7 @@ const TQString &KHTMLSettings::availableFamilies()
if ( !avFamilies ) { if ( !avFamilies ) {
avFamilies = new TQString; avFamilies = new TQString;
TQFontDatabase db; TQFontDatabase db;
TQStringList families = db.families(); TQStringList families = db.tqfamilies();
TQStringList s; TQStringList s;
TQRegExp foundryExp(" \\[.+\\]"); TQRegExp foundryExp(" \\[.+\\]");
@ -888,7 +888,7 @@ const TQString &KHTMLSettings::availableFamilies()
for ( ; f != fEnd; ++f ) { for ( ; f != fEnd; ++f ) {
(*f).replace( foundryExp, ""); (*f).replace( foundryExp, "");
if (!s.contains(*f)) if (!s.tqcontains(*f))
s << *f; s << *f;
} }
s.sort(); s.sort();

@ -214,7 +214,7 @@ public:
// Meta refresh/redirect (http-equiv) // Meta refresh/redirect (http-equiv)
bool isAutoDelayedActionsEnabled () const; bool isAutoDelayedActionsEnabled () const;
TQValueList< QPair< TQString, TQChar > > fallbackAccessKeysAssignments() const; TQValueList< TQPair< TQString, TQChar > > fallbackAccessKeysAssignments() const;
// Whether to show passive popup when windows are blocked // Whether to show passive popup when windows are blocked
// @since 3.5 // @since 3.5

@ -19,10 +19,10 @@
*/ */
// browser window color defaults -- Bernd // browser window color defaults -- Bernd
#define HTML_DEFAULT_LNK_COLOR Qt::blue #define HTML_DEFAULT_LNK_COLOR TQt::blue
#define HTML_DEFAULT_TXT_COLOR Qt::black #define HTML_DEFAULT_TXT_COLOR TQt::black
#define HTML_DEFAULT_VLNK_COLOR Qt::magenta #define HTML_DEFAULT_VLNK_COLOR TQt::magenta
#define HTML_DEFAULT_BASE_COLOR Qt::white #define HTML_DEFAULT_BASE_COLOR TQt::white
#define HTML_DEFAULT_VIEW_FONT "Sans Serif" #define HTML_DEFAULT_VIEW_FONT "Sans Serif"
#define HTML_DEFAULT_VIEW_FIXED_FONT "Monospace" #define HTML_DEFAULT_VIEW_FIXED_FONT "Monospace"

@ -114,7 +114,7 @@ class KHTMLToolTip;
#ifndef QT_NO_TOOLTIP #ifndef QT_NO_TOOLTIP
class KHTMLToolTip : public QToolTip class KHTMLToolTip : public TQToolTip
{ {
public: public:
KHTMLToolTip(KHTMLView *view, KHTMLViewPrivate* vp) : TQToolTip(view->viewport()) KHTMLToolTip(KHTMLView *view, KHTMLViewPrivate* vp) : TQToolTip(view->viewport())
@ -485,7 +485,7 @@ void KHTMLToolTip::maybeTip(const TQPoint& p)
#endif #endif
KHTMLView::KHTMLView( KHTMLPart *part, TQWidget *parent, const char *name) KHTMLView::KHTMLView( KHTMLPart *part, TQWidget *parent, const char *name)
: TQScrollView( parent, name, WResizeNoErase | WRepaintNoErase ) : TQScrollView( parent, name, (WFlags)(WResizeNoErase | WRepaintNoErase) )
{ {
m_medium = "screen"; m_medium = "screen";
@ -499,7 +499,7 @@ KHTMLView::KHTMLView( KHTMLPart *part, TQWidget *parent, const char *name)
// initialize QScrollView // initialize QScrollView
enableClipper(true); enableClipper(true);
// hack to get unclipped painting on the viewport. // hack to get unclipped painting on the viewport.
static_cast<KHTMLView *>(static_cast<TQWidget *>(viewport()))->setWFlags(WPaintUnclipped); static_cast<KHTMLView *>(TQT_TQWIDGET(viewport()))->setWFlags(WPaintUnclipped);
setResizePolicy(Manual); setResizePolicy(Manual);
viewport()->setMouseTracking(true); viewport()->setMouseTracking(true);
@ -546,7 +546,7 @@ void KHTMLView::init()
d->vertPaintBuffer = new TQPixmap(10, PAINT_BUFFER_HEIGHT); d->vertPaintBuffer = new TQPixmap(10, PAINT_BUFFER_HEIGHT);
if(!d->tp) d->tp = new TQPainter(); if(!d->tp) d->tp = new TQPainter();
setFocusPolicy(TQWidget::StrongFocus); setFocusPolicy(TQ_StrongFocus);
viewport()->setFocusProxy(this); viewport()->setFocusProxy(this);
_marginWidth = -1; // undefined _marginWidth = -1; // undefined
@ -579,7 +579,7 @@ void KHTMLView::clear()
if ( d->cursor_icon_widget ) if ( d->cursor_icon_widget )
d->cursor_icon_widget->hide(); d->cursor_icon_widget->hide();
d->reset(); d->reset();
killTimers(); TQT_TQOBJECT(this)->killTimers();
emit cleared(); emit cleared();
TQScrollView::setHScrollBarMode(d->hmode); TQScrollView::setHScrollBarMode(d->hmode);
@ -662,7 +662,7 @@ void KHTMLView::drawContents( TQPainter *p, int ex, int ey, int ew, int eh )
//kdDebug( 6000 ) << "drawContents this="<< this <<" x=" << ex << ",y=" << ey << ",w=" << ew << ",h=" << eh << endl; //kdDebug( 6000 ) << "drawContents this="<< this <<" x=" << ex << ",y=" << ey << ",w=" << ew << ",h=" << eh << endl;
if(!m_part || !m_part->xmlDocImpl() || !m_part->xmlDocImpl()->renderer()) { if(!m_part || !m_part->xmlDocImpl() || !m_part->xmlDocImpl()->renderer()) {
p->fillRect(ex, ey, ew, eh, palette().active().brush(TQColorGroup::Base)); p->fillRect(ex, ey, ew, eh, tqpalette().active().brush(TQColorGroup::Base));
return; return;
} else if ( d->complete && static_cast<RenderCanvas*>(m_part->xmlDocImpl()->renderer())->needsLayout() ) { } else if ( d->complete && static_cast<RenderCanvas*>(m_part->xmlDocImpl()->renderer())->needsLayout() ) {
// an external update request happens while we have a layout scheduled // an external update request happens while we have a layout scheduled
@ -726,7 +726,7 @@ void KHTMLView::drawContents( TQPainter *p, int ex, int ey, int ew, int eh )
d->vertPaintBuffer->resize(10, visibleHeight()); d->vertPaintBuffer->resize(10, visibleHeight());
d->tp->begin(d->vertPaintBuffer); d->tp->begin(d->vertPaintBuffer);
d->tp->translate(-ex, -ey); d->tp->translate(-ex, -ey);
d->tp->fillRect(ex, ey, ew, eh, palette().active().brush(TQColorGroup::Base)); d->tp->fillRect(ex, ey, ew, eh, tqpalette().active().brush(TQColorGroup::Base));
m_part->xmlDocImpl()->renderer()->layer()->paint(d->tp, TQRect(ex, ey, ew, eh)); m_part->xmlDocImpl()->renderer()->layer()->paint(d->tp, TQRect(ex, ey, ew, eh));
d->tp->end(); d->tp->end();
p->drawPixmap(ex, ey, *d->vertPaintBuffer, 0, 0, ew, eh); p->drawPixmap(ex, ey, *d->vertPaintBuffer, 0, 0, ew, eh);
@ -740,7 +740,7 @@ void KHTMLView::drawContents( TQPainter *p, int ex, int ey, int ew, int eh )
int ph = eh-py < PAINT_BUFFER_HEIGHT ? eh-py : PAINT_BUFFER_HEIGHT; int ph = eh-py < PAINT_BUFFER_HEIGHT ? eh-py : PAINT_BUFFER_HEIGHT;
d->tp->begin(d->paintBuffer); d->tp->begin(d->paintBuffer);
d->tp->translate(-ex, -ey-py); d->tp->translate(-ex, -ey-py);
d->tp->fillRect(ex, ey+py, ew, ph, palette().active().brush(TQColorGroup::Base)); d->tp->fillRect(ex, ey+py, ew, ph, tqpalette().active().brush(TQColorGroup::Base));
m_part->xmlDocImpl()->renderer()->layer()->paint(d->tp, TQRect(ex, ey+py, ew, ph)); m_part->xmlDocImpl()->renderer()->layer()->paint(d->tp, TQRect(ex, ey+py, ew, ph));
d->tp->end(); d->tp->end();
@ -756,7 +756,7 @@ static int cnt=0;
kdDebug() << "[" << ++cnt << "]" << " clip region: " << pr << endl; kdDebug() << "[" << ++cnt << "]" << " clip region: " << pr << endl;
// p->setClipRegion(TQRect(0,0,ew,eh)); // p->setClipRegion(TQRect(0,0,ew,eh));
// p->translate(-ex, -ey); // p->translate(-ex, -ey);
p->fillRect(ex, ey, ew, eh, palette().active().brush(TQColorGroup::Base)); p->fillRect(ex, ey, ew, eh, tqpalette().active().brush(TQColorGroup::Base));
m_part->xmlDocImpl()->renderer()->layer()->paint(p, pr); m_part->xmlDocImpl()->renderer()->layer()->paint(p, pr);
#endif // DEBUG_NO_PAINT_BUFFER #endif // DEBUG_NO_PAINT_BUFFER
@ -911,8 +911,8 @@ void KHTMLView::closeChildDialogs()
} }
else else
{ {
kdWarning() << "closeChildDialogs: not a KDialogBase! Don't use QDialogs in KDE! " << static_cast<TQWidget*>(dlg) << endl; kdWarning() << "closeChildDialogs: not a KDialogBase! Don't use QDialogs in KDE! " << TQT_TQWIDGET(dlg) << endl;
static_cast<TQWidget*>(dlg)->hide(); TQT_TQWIDGET(dlg)->hide();
} }
} }
delete dlgs; delete dlgs;
@ -941,7 +941,7 @@ void KHTMLView::closeEvent( TQCloseEvent* ev )
void KHTMLView::viewportMousePressEvent( TQMouseEvent *_mouse ) void KHTMLView::viewportMousePressEvent( TQMouseEvent *_mouse )
{ {
if (!m_part->xmlDocImpl()) return; if (!m_part->xmlDocImpl()) return;
if (d->possibleTripleClick && ( _mouse->button() & MouseButtonMask ) == LeftButton) if (d->possibleTripleClick && ( _mouse->button() & Qt::MouseButtonMask ) == Qt::LeftButton)
{ {
viewportMouseDoubleClickEvent( _mouse ); // it handles triple clicks too viewportMouseDoubleClickEvent( _mouse ); // it handles triple clicks too
return; return;
@ -958,7 +958,7 @@ void KHTMLView::viewportMousePressEvent( TQMouseEvent *_mouse )
//kdDebug(6000) << "innerNode="<<mev.innerNode.nodeName().string()<<endl; //kdDebug(6000) << "innerNode="<<mev.innerNode.nodeName().string()<<endl;
if ( (_mouse->button() == MidButton) && if ( (_mouse->button() == Qt::MidButton) &&
!m_part->d->m_bOpenMiddleClick && !d->m_mouseScrollTimer && !m_part->d->m_bOpenMiddleClick && !d->m_mouseScrollTimer &&
mev.url.isNull() && (mev.innerNode.elementId() != ID_INPUT) ) { mev.url.isNull() && (mev.innerNode.elementId() != ID_INPUT) ) {
TQPoint point = mapFromGlobal( _mouse->globalPos() ); TQPoint point = mapFromGlobal( _mouse->globalPos() );
@ -1114,9 +1114,9 @@ static inline void forwardPeripheralEvent(khtml::RenderWidget* r, TQMouseEvent*
TQWidget* w = r->widget(); TQWidget* w = r->widget();
TQScrollView* sc = ::tqqt_cast<TQScrollView*>(w); TQScrollView* sc = ::tqqt_cast<TQScrollView*>(w);
if (sc && !::tqqt_cast<TQListBox*>(w)) if (sc && !::tqqt_cast<TQListBox*>(w))
static_cast<khtml::RenderWidget::ScrollViewEventPropagator*>(sc)->sendEvent(&fw); static_cast<khtml::RenderWidget::ScrollViewEventPropagator*>(sc)->sendEvent(TQT_TQEVENT(&fw));
else if(w) else if(w)
static_cast<khtml::RenderWidget::EventPropagator*>(w)->sendEvent(&fw); static_cast<khtml::RenderWidget::EventPropagator*>(w)->sendEvent(TQT_TQEVENT(&fw));
} }
@ -1147,8 +1147,8 @@ void KHTMLView::viewportMouseMoveEvent( TQMouseEvent * _mouse )
(deltaX > 0) ? d->m_mouseScroll_byX = 1 : d->m_mouseScroll_byX = -1; (deltaX > 0) ? d->m_mouseScroll_byX = 1 : d->m_mouseScroll_byX = -1;
(deltaY > 0) ? d->m_mouseScroll_byY = 1 : d->m_mouseScroll_byY = -1; (deltaY > 0) ? d->m_mouseScroll_byY = 1 : d->m_mouseScroll_byY = -1;
double adX = QABS(deltaX)/30.0; double adX = TQABS(deltaX)/30.0;
double adY = QABS(deltaY)/30.0; double adY = TQABS(deltaY)/30.0;
d->m_mouseScroll_byX = kMax(kMin(d->m_mouseScroll_byX * int(adX*adX), SHRT_MAX), SHRT_MIN); d->m_mouseScroll_byX = kMax(kMin(d->m_mouseScroll_byX * int(adX*adX), SHRT_MAX), SHRT_MIN);
d->m_mouseScroll_byY = kMax(kMin(d->m_mouseScroll_byY * int(adY*adY), SHRT_MAX), SHRT_MIN); d->m_mouseScroll_byY = kMax(kMin(d->m_mouseScroll_byY * int(adY*adY), SHRT_MAX), SHRT_MIN);
@ -1285,8 +1285,8 @@ void KHTMLView::viewportMouseMoveEvent( TQMouseEvent * _mouse )
attr.save_under = True; attr.save_under = True;
XChangeWindowAttributes( qt_xdisplay(), d->cursor_icon_widget->winId(), CWSaveUnder, &attr ); XChangeWindowAttributes( qt_xdisplay(), d->cursor_icon_widget->winId(), CWSaveUnder, &attr );
d->cursor_icon_widget->resize( icon_pixmap.width(), icon_pixmap.height()); d->cursor_icon_widget->resize( icon_pixmap.width(), icon_pixmap.height());
if( icon_pixmap.mask() ) if( icon_pixmap.tqmask() )
d->cursor_icon_widget->setMask( *icon_pixmap.mask()); d->cursor_icon_widget->setMask( *icon_pixmap.tqmask());
else else
d->cursor_icon_widget->clearMask(); d->cursor_icon_widget->clearMask();
d->cursor_icon_widget->setBackgroundPixmap( icon_pixmap ); d->cursor_icon_widget->setBackgroundPixmap( icon_pixmap );
@ -1341,7 +1341,7 @@ void KHTMLView::viewportMouseReleaseEvent( TQMouseEvent * _mouse )
DOM::NodeImpl* fn = m_part->xmlDocImpl()->focusNode(); DOM::NodeImpl* fn = m_part->xmlDocImpl()->focusNode();
if (fn && fn != mev.innerNode.handle() && if (fn && fn != mev.innerNode.handle() &&
fn->renderer() && fn->renderer()->isWidget() && fn->renderer() && fn->renderer()->isWidget() &&
_mouse->button() != MidButton) { _mouse->button() != Qt::MidButton) {
forwardPeripheralEvent(static_cast<khtml::RenderWidget*>(fn->renderer()), _mouse, xm, ym); forwardPeripheralEvent(static_cast<khtml::RenderWidget*>(fn->renderer()), _mouse, xm, ym);
} }
@ -1472,7 +1472,7 @@ void KHTMLView::keyPressEvent( TQKeyEvent *_ke )
_ke->accept(); _ke->accept();
return; return;
} }
else if(_ke->key() == Key_Space || !_ke->text().stripWhiteSpace().isEmpty()) else if(_ke->key() == Key_Space || !TQString(_ke->text()).stripWhiteSpace().isEmpty())
{ {
d->findString += _ke->text(); d->findString += _ke->text();
@ -1528,7 +1528,7 @@ void KHTMLView::keyPressEvent( TQKeyEvent *_ke )
} }
int offs = (clipper()->height() < 30) ? clipper()->height() : 30; int offs = (clipper()->height() < 30) ? clipper()->height() : 30;
if (_ke->state() & Qt::ShiftButton) if (_ke->state() & TQt::ShiftButton)
switch(_ke->key()) switch(_ke->key())
{ {
case Key_Space: case Key_Space:
@ -1729,8 +1729,8 @@ void KHTMLView::keyReleaseEvent(TQKeyEvent *_ke)
if( d->scrollSuspendPreActivate && _ke->key() != Key_Shift ) if( d->scrollSuspendPreActivate && _ke->key() != Key_Shift )
d->scrollSuspendPreActivate = false; d->scrollSuspendPreActivate = false;
if( _ke->key() == Key_Shift && d->scrollSuspendPreActivate && _ke->state() == Qt::ShiftButton if( _ke->key() == Key_Shift && d->scrollSuspendPreActivate && _ke->state() == TQt::ShiftButton
&& !(KApplication::keyboardMouseState() & Qt::ShiftButton)) && !(KApplication::keyboardMouseState() & TQt::ShiftButton))
{ {
if (d->scrollTimerId) if (d->scrollTimerId)
{ {
@ -1746,7 +1746,7 @@ void KHTMLView::keyReleaseEvent(TQKeyEvent *_ke)
{ {
if (d->accessKeysPreActivate && _ke->key() != Key_Control) if (d->accessKeysPreActivate && _ke->key() != Key_Control)
d->accessKeysPreActivate=false; d->accessKeysPreActivate=false;
if (d->accessKeysPreActivate && _ke->state() == Qt::ControlButton && !(KApplication::keyboardMouseState() & Qt::ControlButton)) if (d->accessKeysPreActivate && _ke->state() == TQt::ControlButton && !(KApplication::keyboardMouseState() & TQt::ControlButton))
{ {
displayAccessKeys(); displayAccessKeys();
m_part->setStatusBarText(i18n("Access Keys activated"),KHTMLPart::BarOverrideText); m_part->setStatusBarText(i18n("Access Keys activated"),KHTMLPart::BarOverrideText);
@ -1854,7 +1854,7 @@ void KHTMLView::doAutoScroll()
} }
class HackWidget : public QWidget class HackWidget : public TQWidget
{ {
public: public:
inline void setNoErase() { setWFlags(getWFlags()|WRepaintNoErase); } inline void setNoErase() { setWFlags(getWFlags()|WRepaintNoErase); }
@ -1895,13 +1895,13 @@ bool KHTMLView::eventFilter(TQObject *o, TQEvent *e)
TQWidget *view = viewport(); TQWidget *view = viewport();
if (o == view) { if (TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(view)) {
// we need to install an event filter on all children of the viewport to // we need to install an event filter on all children of the viewport to
// be able to get correct stacking of children within the document. // be able to get correct stacking of children within the document.
if(e->type() == TQEvent::ChildInserted) { if(e->type() == TQEvent::ChildInserted) {
TQObject *c = static_cast<TQChildEvent *>(e)->child(); TQObject *c = TQT_TQOBJECT(TQT_TQCHILDEVENT(e)->child());
if (c->isWidgetType()) { if (c->isWidgetType()) {
TQWidget *w = static_cast<TQWidget *>(c); TQWidget *w = TQT_TQWIDGET(c);
// don't install the event filter on toplevels // don't install the event filter on toplevels
if (w->tqparentWidget(true) == view) { if (w->tqparentWidget(true) == view) {
if (!strcmp(w->name(), "__khtml")) { if (!strcmp(w->name(), "__khtml")) {
@ -1910,8 +1910,8 @@ bool KHTMLView::eventFilter(TQObject *o, TQEvent *e)
if (!::tqqt_cast<TQFrame*>(w)) if (!::tqqt_cast<TQFrame*>(w))
w->setBackgroundMode( TQWidget::NoBackground ); w->setBackgroundMode( TQWidget::NoBackground );
static_cast<HackWidget *>(w)->setNoErase(); static_cast<HackWidget *>(w)->setNoErase();
if (w->children()) { if (!w->childrenListObject().isEmpty()) {
TQObjectListIterator it(*w->children()); TQObjectListIterator it(w->childrenListObject());
for (; it.current(); ++it) { for (; it.current(); ++it) {
TQWidget *widget = ::tqqt_cast<TQWidget *>(it.current()); TQWidget *widget = ::tqqt_cast<TQWidget *>(it.current());
if (widget && !widget->isTopLevel()) { if (widget && !widget->isTopLevel()) {
@ -1927,7 +1927,7 @@ bool KHTMLView::eventFilter(TQObject *o, TQEvent *e)
} }
} }
} else if (o->isWidgetType()) { } else if (o->isWidgetType()) {
TQWidget *v = static_cast<TQWidget *>(o); TQWidget *v = TQT_TQWIDGET(o);
TQWidget *c = v; TQWidget *c = v;
while (v && v != view) { while (v && v != view) {
c = v; c = v;
@ -1936,7 +1936,7 @@ bool KHTMLView::eventFilter(TQObject *o, TQEvent *e)
if (v && !strcmp(c->name(), "__khtml")) { if (v && !strcmp(c->name(), "__khtml")) {
bool block = false; bool block = false;
TQWidget *w = static_cast<TQWidget *>(o); TQWidget *w = TQT_TQWIDGET(o);
switch(e->type()) { switch(e->type()) {
case TQEvent::Paint: case TQEvent::Paint:
if (!allowWidgetPaintEvents) { if (!allowWidgetPaintEvents) {
@ -1951,7 +1951,7 @@ bool KHTMLView::eventFilter(TQObject *o, TQEvent *e)
v = v->tqparentWidget(); v = v->tqparentWidget();
} }
viewportToContents( x, y, x, y ); viewportToContents( x, y, x, y );
TQPaintEvent *pe = static_cast<TQPaintEvent *>(e); TQPaintEvent *pe = TQT_TQPAINTEVENT(e);
bool asap = !d->contentsMoving && ::tqqt_cast<TQScrollView *>(c); bool asap = !d->contentsMoving && ::tqqt_cast<TQScrollView *>(c);
// TQScrollView needs fast tqrepaints // TQScrollView needs fast tqrepaints
@ -1970,7 +1970,7 @@ bool KHTMLView::eventFilter(TQObject *o, TQEvent *e)
case TQEvent::MouseButtonRelease: case TQEvent::MouseButtonRelease:
case TQEvent::MouseButtonDblClick: { case TQEvent::MouseButtonDblClick: {
if ( (w->tqparentWidget() == view || ::tqqt_cast<TQScrollView*>(c)) && !::tqqt_cast<TQScrollBar *>(w)) { if ( (w->tqparentWidget() == view || ::tqqt_cast<TQScrollView*>(c)) && !::tqqt_cast<TQScrollBar *>(w)) {
TQMouseEvent *me = static_cast<TQMouseEvent *>(e); TQMouseEvent *me = TQT_TQMOUSEEVENT(e);
TQPoint pt = w->mapTo( view, me->pos()); TQPoint pt = w->mapTo( view, me->pos());
TQMouseEvent me2(me->type(), pt, me->button(), me->state()); TQMouseEvent me2(me->type(), pt, me->button(), me->state());
@ -1989,7 +1989,7 @@ bool KHTMLView::eventFilter(TQObject *o, TQEvent *e)
case TQEvent::KeyPress: case TQEvent::KeyPress:
case TQEvent::KeyRelease: case TQEvent::KeyRelease:
if (w->tqparentWidget() == view && !::tqqt_cast<TQScrollBar *>(w)) { if (w->tqparentWidget() == view && !::tqqt_cast<TQScrollBar *>(w)) {
TQKeyEvent *ke = static_cast<TQKeyEvent *>(e); TQKeyEvent *ke = TQT_TQKEYEVENT(e);
if (e->type() == TQEvent::KeyPress) if (e->type() == TQEvent::KeyPress)
keyPressEvent(ke); keyPressEvent(ke);
else else
@ -2275,14 +2275,14 @@ void KHTMLView::displayAccessKeys( KHTMLView* caller, KHTMLView* origview, TQVal
if( tqFind( taken.begin(), taken.end(), a ) == taken.end()) // !contains if( tqFind( taken.begin(), taken.end(), a ) == taken.end()) // !contains
accesskey = a; accesskey = a;
} }
if( accesskey.isNull() && fallbacks.contains( en )) { if( accesskey.isNull() && fallbacks.tqcontains( en )) {
TQChar a = fallbacks[ en ].upper(); TQChar a = fallbacks[ en ].upper();
if( tqFind( taken.begin(), taken.end(), a ) == taken.end()) // !contains if( tqFind( taken.begin(), taken.end(), a ) == taken.end()) // !contains
accesskey = TQString( "<qt><i>" ) + a + "</i></qt>"; accesskey = TQString( "<qt><i>" ) + a + "</i></qt>";
} }
if( !accesskey.isNull()) { if( !accesskey.isNull()) {
TQRect rec=en->getRect(); TQRect rec=en->getRect();
TQLabel *lab=new TQLabel(accesskey,viewport(),0,Qt::WDestructiveClose); TQLabel *lab=new TQLabel(accesskey,viewport(),0,(WFlags)WDestructiveClose);
connect( origview, TQT_SIGNAL(hideAccessKeys()), lab, TQT_SLOT(close()) ); connect( origview, TQT_SIGNAL(hideAccessKeys()), lab, TQT_SLOT(close()) );
connect( this, TQT_SIGNAL(tqrepaintAccessKeys()), lab, TQT_SLOT(tqrepaint())); connect( this, TQT_SIGNAL(tqrepaintAccessKeys()), lab, TQT_SLOT(tqrepaint()));
lab->setPalette(TQToolTip::palette()); lab->setPalette(TQToolTip::palette());
@ -2409,9 +2409,13 @@ bool KHTMLView::focusNodeWithAccessKey( TQChar c, KHTMLView* caller )
guard = node; guard = node;
} }
// Set focus node on the document // Set focus node on the document
#ifdef USE_QT4
m_part->xmlDocImpl()->setFocusNode(node);
#else // USE_QT4
TQFocusEvent::setReason( TQFocusEvent::Shortcut ); TQFocusEvent::setReason( TQFocusEvent::Shortcut );
m_part->xmlDocImpl()->setFocusNode(node); m_part->xmlDocImpl()->setFocusNode(node);
TQFocusEvent::resetReason(); TQFocusEvent::resetReason();
#endif // USE_QT4
if( node != NULL && node->hasOneRef()) // deleted, only held by guard if( node != NULL && node->hasOneRef()) // deleted, only held by guard
return true; return true;
emit m_part->nodeActivated(Node(node)); emit m_part->nodeActivated(Node(node));
@ -2621,7 +2625,7 @@ TQMap< ElementImpl*, TQChar > KHTMLView::buildFallbackAccessKeys() const
} }
if( ignore ) if( ignore )
continue; continue;
if( text.isNull() && labels.contains( element )) if( text.isNull() && labels.tqcontains( element ))
text = labels[ element ]; text = labels[ element ];
if( text.isNull() && text_before ) if( text.isNull() && text_before )
text = getElementText( element, false ); text = getElementText( element, false );
@ -2629,9 +2633,9 @@ TQMap< ElementImpl*, TQChar > KHTMLView::buildFallbackAccessKeys() const
text = getElementText( element, true ); text = getElementText( element, true );
text = text.stripWhiteSpace(); text = text.stripWhiteSpace();
// increase priority of items which have explicitly specified accesskeys in the config // increase priority of items which have explicitly specified accesskeys in the config
TQValueList< QPair< TQString, TQChar > > priorities TQValueList< TQPair< TQString, TQChar > > priorities
= m_part->settings()->fallbackAccessKeysAssignments(); = m_part->settings()->fallbackAccessKeysAssignments();
for( TQValueList< QPair< TQString, TQChar > >::ConstIterator it = priorities.begin(); for( TQValueList< TQPair< TQString, TQChar > >::ConstIterator it = priorities.begin();
it != priorities.end(); it != priorities.end();
++it ) { ++it ) {
if( text == (*it).first ) if( text == (*it).first )
@ -2676,12 +2680,12 @@ TQMap< ElementImpl*, TQChar > KHTMLView::buildFallbackAccessKeys() const
TQString text = (*it).text; TQString text = (*it).text;
TQChar key; TQChar key;
if( key.isNull() && !text.isEmpty()) { if( key.isNull() && !text.isEmpty()) {
TQValueList< QPair< TQString, TQChar > > priorities TQValueList< TQPair< TQString, TQChar > > priorities
= m_part->settings()->fallbackAccessKeysAssignments(); = m_part->settings()->fallbackAccessKeysAssignments();
for( TQValueList< QPair< TQString, TQChar > >::ConstIterator it = priorities.begin(); for( TQValueList< TQPair< TQString, TQChar > >::ConstIterator it = priorities.begin();
it != priorities.end(); it != priorities.end();
++it ) ++it )
if( text == (*it).first && keys.contains( (*it).second )) { if( text == (*it).first && keys.tqcontains( (*it).second )) {
key = (*it).second; key = (*it).second;
break; break;
} }
@ -2694,7 +2698,7 @@ TQMap< ElementImpl*, TQChar > KHTMLView::buildFallbackAccessKeys() const
for( TQStringList::ConstIterator it = words.begin(); for( TQStringList::ConstIterator it = words.begin();
it != words.end(); it != words.end();
++it ) { ++it ) {
if( keys.contains( (*it)[ 0 ].upper())) { if( keys.tqcontains( (*it)[ 0 ].upper())) {
key = (*it)[ 0 ].upper(); key = (*it)[ 0 ].upper();
break; break;
} }
@ -2704,7 +2708,7 @@ TQMap< ElementImpl*, TQChar > KHTMLView::buildFallbackAccessKeys() const
for( unsigned int i = 0; for( unsigned int i = 0;
i < text.length(); i < text.length();
++i ) { ++i ) {
if( keys.contains( text[ i ].upper())) { if( keys.tqcontains( text[ i ].upper())) {
key = text[ i ].upper(); key = text[ i ].upper();
break; break;
} }
@ -2717,7 +2721,7 @@ TQMap< ElementImpl*, TQChar > KHTMLView::buildFallbackAccessKeys() const
TQString url = (*it).url; TQString url = (*it).url;
it = data.remove( it ); it = data.remove( it );
// assign the same accesskey also to other elements pointing to the same url // assign the same accesskey also to other elements pointing to the same url
if( !url.isEmpty() && !url.startsWith( "javascript:", false )) { if( !url.isEmpty() && !url.tqstartsWith( "javascript:", false )) {
for( TQValueList< AccessKeyData >::Iterator it2 = data.begin(); for( TQValueList< AccessKeyData >::Iterator it2 = data.begin();
it2 != data.end(); it2 != data.end();
) { ) {
@ -2753,7 +2757,7 @@ bool KHTMLView::pagedMode() const
void KHTMLView::setWidgetVisible(RenderWidget* w, bool vis) void KHTMLView::setWidgetVisible(RenderWidget* w, bool vis)
{ {
if (vis) { if (vis) {
d->visibleWidgets.replace(w, w->widget()); d->visibleWidgets.tqreplace(w, w->widget());
} }
else else
d->visibleWidgets.remove(w); d->visibleWidgets.remove(w);
@ -2781,7 +2785,7 @@ void KHTMLView::print(bool quick)
if ( !docname.isEmpty() ) if ( !docname.isEmpty() )
docname = KStringHandler::csqueeze(docname, 80); docname = KStringHandler::csqueeze(docname, 80);
if(quick || printer->setup(this, i18n("Print %1").arg(docname))) { if(quick || printer->setup(this, i18n("Print %1").arg(docname))) {
viewport()->setCursor( waitCursor ); // only viewport(), no TQApplication::, otherwise we get the busy cursor in kdeprint's dialogs viewport()->setCursor( tqwaitCursor ); // only viewport(), no TQApplication::, otherwise we get the busy cursor in kdeprint's dialogs
// set up KPrinter // set up KPrinter
printer->setFullPage(false); printer->setFullPage(false);
printer->setCreator(TQString("KDE %1.%2.%3 HTML Library").arg(KDE_VERSION_MAJOR).arg(KDE_VERSION_MINOR).arg(KDE_VERSION_RELEASE)); printer->setCreator(TQString("KDE %1.%2.%3 HTML Library").arg(KDE_VERSION_MAJOR).arg(KDE_VERSION_MINOR).arg(KDE_VERSION_RELEASE));
@ -2835,7 +2839,7 @@ void KHTMLView::print(bool quick)
int headerHeight = 0; int headerHeight = 0;
TQFont headerFont("Sans Serif", 8); TQFont headerFont("Sans Serif", 8);
TQString headerLeft = KGlobal::locale()->formatDate(TQDate::tqcurrentDate(),true); TQString headerLeft = KGlobal::locale()->formatDate(TQDate::currentDate(),true);
TQString headerMid = docname; TQString headerMid = docname;
TQString headerRight; TQString headerRight;
@ -2951,7 +2955,7 @@ void KHTMLView::print(bool quick)
d->paged = false; d->paged = false;
khtml::setPrintPainter( 0 ); khtml::setPrintPainter( 0 );
setMediaType( oldMediaType ); setMediaType( oldMediaType );
m_part->xmlDocImpl()->setPaintDevice( this ); m_part->xmlDocImpl()->setPaintDevice( TQT_TQPAINTDEVICE(this) );
m_part->xmlDocImpl()->styleSelector()->computeFontSizes(m_part->xmlDocImpl()->paintDeviceMetrics(), m_part->zoomFactor()); m_part->xmlDocImpl()->styleSelector()->computeFontSizes(m_part->xmlDocImpl()->paintDeviceMetrics(), m_part->zoomFactor());
m_part->xmlDocImpl()->updateStyleSelector(); m_part->xmlDocImpl()->updateStyleSelector();
viewport()->unsetCursor(); viewport()->unsetCursor();
@ -2979,7 +2983,7 @@ void KHTMLView::paint(TQPainter *p, const TQRect &rc, int yOff, bool *more)
khtml::RenderCanvas *root = static_cast<khtml::RenderCanvas *>(m_part->xmlDocImpl()->renderer()); khtml::RenderCanvas *root = static_cast<khtml::RenderCanvas *>(m_part->xmlDocImpl()->renderer());
if(!root) return; if(!root) return;
m_part->xmlDocImpl()->setPaintDevice(p->device()); m_part->xmlDocImpl()->setPaintDevice(p->tqdevice());
root->setPagedMode(true); root->setPagedMode(true);
root->setStaticMode(true); root->setStaticMode(true);
root->setWidth(rc.width()); root->setWidth(rc.width());
@ -3002,7 +3006,7 @@ void KHTMLView::paint(TQPainter *p, const TQRect &rc, int yOff, bool *more)
root->setPagedMode(false); root->setPagedMode(false);
root->setStaticMode(false); root->setStaticMode(false);
m_part->xmlDocImpl()->setPaintDevice( this ); m_part->xmlDocImpl()->setPaintDevice( TQT_TQPAINTDEVICE(this) );
} }
@ -3081,7 +3085,7 @@ void KHTMLView::addFormCompletionItem(const TQString &name, const TQString &valu
if (cc_number) if (cc_number)
return; return;
TQStringList items = formCompletionItems(name); TQStringList items = formCompletionItems(name);
if (!items.contains(value)) if (!items.tqcontains(value))
items.prepend(value); items.prepend(value);
while ((int)items.count() > m_part->settings()->maxFormCompletionItems()) while ((int)items.count() > m_part->settings()->maxFormCompletionItems())
items.remove(items.fromLast()); items.remove(items.fromLast());
@ -3156,13 +3160,13 @@ bool KHTMLView::dispatchMouseEvent(int eventId, DOM::NodeImpl *targetNode,
int screenY = _mouse->globalY(); int screenY = _mouse->globalY();
int button = -1; int button = -1;
switch (_mouse->button()) { switch (_mouse->button()) {
case LeftButton: case Qt::LeftButton:
button = 0; button = 0;
break; break;
case MidButton: case Qt::MidButton:
button = 1; button = 1;
break; break;
case RightButton: case Qt::RightButton:
button = 2; button = 2;
break; break;
default: default:
@ -3278,12 +3282,12 @@ void KHTMLView::viewportWheelEvent(TQWheelEvent* e)
{ {
e->accept(); e->accept();
} }
else if( ( (e->orientation() == Vertical && else if( ( (e->orientation() == Qt::Vertical &&
((d->ignoreWheelEvents && !verticalScrollBar()->isVisible()) ((d->ignoreWheelEvents && !verticalScrollBar()->isVisible())
|| e->delta() > 0 && contentsY() <= 0 || e->delta() > 0 && contentsY() <= 0
|| e->delta() < 0 && contentsY() >= contentsHeight() - visibleHeight())) || e->delta() < 0 && contentsY() >= contentsHeight() - visibleHeight()))
|| ||
(e->orientation() == Horizontal && (e->orientation() == Qt::Horizontal &&
((d->ignoreWheelEvents && !horizontalScrollBar()->isVisible()) ((d->ignoreWheelEvents && !horizontalScrollBar()->isVisible())
|| e->delta() > 0 && contentsX() <=0 || e->delta() > 0 && contentsX() <=0
|| e->delta() < 0 && contentsX() >= contentsWidth() - visibleWidth()))) || e->delta() < 0 && contentsX() >= contentsWidth() - visibleWidth())))
@ -3511,7 +3515,7 @@ void KHTMLView::timerEvent ( TQTimerEvent *e )
d->tqrepaintTimerId = 0; d->tqrepaintTimerId = 0;
TQRect updateRegion; TQRect updateRegion;
TQMemArray<TQRect> rects = d->updateRegion.rects(); TQMemArray<TQRect> rects = d->updateRegion.tqrects();
d->updateRegion = TQRegion(); d->updateRegion = TQRegion();
@ -3609,7 +3613,7 @@ void KHTMLView::scheduleRepaint(int x, int y, int w, int h, bool asap)
int vx, vy; int vx, vy;
contentsToViewport( x, y, vx, vy ); contentsToViewport( x, y, vx, vy );
p.fillRect( vx, vy, w, h, Qt::red ); p.fillRect( vx, vy, w, h, TQt::red );
p.end(); p.end();
#endif #endif
@ -4600,13 +4604,13 @@ void KHTMLView::scrollViewWheelEvent( TQWheelEvent *e )
{ {
int pageStep = verticalScrollBar()->pageStep(); int pageStep = verticalScrollBar()->pageStep();
int lineStep = verticalScrollBar()->lineStep(); int lineStep = verticalScrollBar()->lineStep();
int step = QMIN( TQApplication::wheelScrollLines()*lineStep, pageStep ); int step = TQMIN( TQApplication::wheelScrollLines()*lineStep, pageStep );
if ( ( e->state() & ControlButton ) || ( e->state() & ShiftButton ) ) if ( ( e->state() & ControlButton ) || ( e->state() & ShiftButton ) )
step = pageStep; step = pageStep;
if(e->orientation() == Horizontal) if(e->orientation() == Qt::Horizontal)
scrollBy(-((e->delta()*step)/120), 0); scrollBy(-((e->delta()*step)/120), 0);
else if(e->orientation() == Vertical) else if(e->orientation() == Qt::Vertical)
scrollBy(0,-((e->delta()*step)/120)); scrollBy(0,-((e->delta()*step)/120));
e->accept(); e->accept();

@ -1,7 +1,7 @@
<!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <!DOCTYPE UI><UI version="3.2" stdsetdef="1">
<class>KJSErrorDlg</class> <class>KJSErrorDlg</class>
<author>George Staikos &lt;staikos@kde.org&gt;</author> <author>George Staikos &lt;staikos@kde.org&gt;</author>
<widget class="QDialog"> <widget class="TQDialog">
<property name="name"> <property name="name">
<cstring>KJSErrorDlg</cstring> <cstring>KJSErrorDlg</cstring>
</property> </property>
@ -23,7 +23,7 @@
<property name="name"> <property name="name">
<cstring>unnamed</cstring> <cstring>unnamed</cstring>
</property> </property>
<widget class="QPushButton" row="4" column="2"> <widget class="TQPushButton" row="4" column="2">
<property name="name"> <property name="name">
<cstring>_close</cstring> <cstring>_close</cstring>
</property> </property>
@ -31,7 +31,7 @@
<string>&amp;Close</string> <string>&amp;Close</string>
</property> </property>
</widget> </widget>
<widget class="QPushButton" row="4" column="1"> <widget class="TQPushButton" row="4" column="1">
<property name="name"> <property name="name">
<cstring>_clear</cstring> <cstring>_clear</cstring>
</property> </property>
@ -70,7 +70,7 @@
</size> </size>
</property> </property>
</spacer> </spacer>
<widget class="QTextBrowser" row="1" column="0" rowspan="1" colspan="3"> <widget class="TQTextBrowser" row="1" column="0" rowspan="1" colspan="3">
<property name="name"> <property name="name">
<cstring>_errorText</cstring> <cstring>_errorText</cstring>
</property> </property>
@ -119,12 +119,12 @@
<include location="global" impldecl="in declaration">kdialog.h</include> <include location="global" impldecl="in declaration">kdialog.h</include>
<include location="global" impldecl="in declaration">ksqueezedtextlabel.h</include> <include location="global" impldecl="in declaration">ksqueezedtextlabel.h</include>
</includes> </includes>
<slots> <Q_SLOTS>
<slot>init()</slot> <slot>init()</slot>
<slot>addError( const QString &amp; error )</slot> <slot>addError( const TQString &amp; error )</slot>
<slot>setURL( const QString &amp; url )</slot> <slot>setURL( const TQString &amp; url )</slot>
<slot>clear()</slot> <slot>clear()</slot>
</slots> </Q_SLOTS>
<layoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
<includehints> <includehints>

@ -51,7 +51,7 @@ public:
Q_ASSERT( !m_lineComplete ); Q_ASSERT( !m_lineComplete );
if ( storeNewline || c != '\n' ) { if ( storeNewline || c != '\n' ) {
int sz = m_currentLine.size(); int sz = m_currentLine.size();
m_currentLine.resize( sz+1, TQGArray::SpeedOptim ); m_currentLine.tqresize( sz+1, TQGArray::SpeedOptim );
m_currentLine[sz] = c; m_currentLine[sz] = c;
} }
if ( c == '\n' ) if ( c == '\n' )
@ -68,7 +68,7 @@ public:
reset(); reset();
} }
void reset() { void reset() {
m_currentLine.resize( 0, TQGArray::SpeedOptim ); m_currentLine.tqresize( 0, TQGArray::SpeedOptim );
m_lineComplete = false; m_lineComplete = false;
} }
private: private:

@ -49,7 +49,7 @@
/* /*
* Utility class to associate a list item with a pluginInfo object * Utility class to associate a list item with a pluginInfo object
*/ */
class PluginListItem : public QListViewItem class PluginListItem : public TQListViewItem
{ {
public: public:

@ -264,7 +264,7 @@ void CachedCSSStyleSheet::data( TQBuffer &buffer, bool eof )
m_charset = c->name(); m_charset = c->name();
} }
TQString data = c->toUnicode( buffer.buffer().data(), m_size ); TQString data = c->toUnicode( buffer.buffer().data(), m_size );
// workaround Qt bugs // workaround TQt bugs
m_sheet = static_cast<TQChar>(data[0]) == TQChar::byteOrderMark ? DOMString(data.mid( 1 ) ) : DOMString(data); m_sheet = static_cast<TQChar>(data[0]) == TQChar::byteOrderMark ? DOMString(data.mid( 1 ) ) : DOMString(data);
m_loading = false; m_loading = false;
@ -380,7 +380,7 @@ void CachedScript::error( int /*err*/, const char* /*text*/ )
namespace khtml namespace khtml
{ {
class ImageSource : public QDataSource class ImageSource : public TQDataSource
{ {
public: public:
ImageSource(TQByteArray buf) ImageSource(TQByteArray buf)
@ -397,7 +397,7 @@ public:
void sendTo(TQDataSink* sink, int n) void sendTo(TQDataSink* sink, int n)
{ {
sink->receive((const uchar*)&buffer.at(pos), n); sink->receive((const uchar*)&buffer.tqat(pos), n);
pos += n; pos += n;
@ -526,7 +526,7 @@ void CachedImage::deref( CachedObjectClient *c )
const TQPixmap &CachedImage::tiled_pixmap(const TQColor& newc, int xWidth, int xHeight) const TQPixmap &CachedImage::tiled_pixmap(const TQColor& newc, int xWidth, int xHeight)
{ {
static QRgb bgTransparent = tqRgba( 0, 0, 0, 0xFF ); static TQRgb bgTransparent = tqRgba( 0, 0, 0, 0xFF );
TQSize s(pixmap_size()); TQSize s(pixmap_size());
int w = xWidth; int w = xWidth;
@ -564,7 +564,7 @@ const TQPixmap &CachedImage::tiled_pixmap(const TQColor& newc, int xWidth, int x
bgSize = TQSize(xWidth, xHeight); bgSize = TQSize(xWidth, xHeight);
//See whether we can - and should - pre-blend //See whether we can - and should - pre-blend
if (isvalid && (r.hasAlphaChannel() || r.mask() )) { if (isvalid && (r.hasAlphaChannel() || r.tqmask() )) {
bg = new TQPixmap(xWidth, xHeight, r.depth()); bg = new TQPixmap(xWidth, xHeight, r.depth());
bg->fill(newc); bg->fill(newc);
bitBlt(bg, 0, 0, src); bitBlt(bg, 0, 0, src);
@ -618,7 +618,7 @@ const TQPixmap &CachedImage::scaled_pixmap( int xWidth, int xHeight )
// kdDebug() << "scaling " << r.width() << "," << r.height() << " to " << xWidth << "," << xHeight << endl; // kdDebug() << "scaling " << r.width() << "," << r.height() << " to " << xWidth << "," << xHeight << endl;
TQImage image = r.convertToImage().smoothScale(xWidth, xHeight); TQImage image = TQImage(r.convertToImage()).smoothScale(xWidth, xHeight);
scaled = new TQPixmap(xWidth, xHeight, r.depth()); scaled = new TQPixmap(xWidth, xHeight, r.depth());
scaled->convertFromImage(image); scaled->convertFromImage(image);
@ -671,7 +671,7 @@ TQSize CachedImage::pixmap_size() const
TQRect CachedImage::valid_rect() const TQRect CachedImage::valid_rect() const
{ {
if (m_wasBlocked) return Cache::blockedPixmap->rect(); if (m_wasBlocked) return Cache::blockedPixmap->rect();
return (m_hadError ? Cache::brokenPixmap->rect() : m ? m->getValidRect() : ( p ? p->rect() : TQRect()) ); return (m_hadError ? Cache::brokenPixmap->rect() : m ? TQRect(m->getValidRect()) : ( p ? TQRect(p->rect()) : TQRect()) );
} }
@ -702,7 +702,7 @@ void CachedImage::movieStatus(int status)
// netscape). We have a problem though where an image is present, and js code creates a new Image object, // netscape). We have a problem though where an image is present, and js code creates a new Image object,
// which uses the same CachedImage, the one in the document is not supposed to be notified // which uses the same CachedImage, the one in the document is not supposed to be notified
// just another Qt 2.2.0 bug. we cannot call // just another TQt 2.2.0 bug. we cannot call
// TQMovie::frameImage if we're after TQMovie::EndOfMovie // TQMovie::frameImage if we're after TQMovie::EndOfMovie
if(status == TQMovie::EndOfFrame) if(status == TQMovie::EndOfFrame)
{ {
@ -748,9 +748,9 @@ void CachedImage::movieStatus(int status)
if (p && monochrome && p->depth() > 1) if (p && monochrome && p->depth() > 1)
{ {
TQPixmap* pix = new TQPixmap; TQPixmap* pix = new TQPixmap;
pix->convertFromImage( p->convertToImage().convertDepth( 1 ), MonoOnly|AvoidDither ); pix->convertFromImage( TQImage(p->convertToImage()).convertDepth( 1 ), MonoOnly|AvoidDither );
if ( p->mask() ) if ( p->tqmask() )
pix->setMask( *p->mask() ); pix->setMask( *p->tqmask() );
delete p; delete p;
p = pix; p = pix;
monochrome = false; monochrome = false;
@ -787,7 +787,7 @@ void CachedImage::setShowAnimations( KHTMLSettings::KAnimationAdvice showAnimati
delete p; delete p;
p = new TQPixmap(m->framePixmap()); p = new TQPixmap(m->framePixmap());
m->disconnectUpdate( this, TQT_SLOT( movieUpdated( const TQRect &) )); m->disconnectUpdate( this, TQT_SLOT( movieUpdated( const TQRect &) ));
m->disconnectStatus( this, TQT_SLOT( movieStatus( int ) )); m->disconnectqStatus( this, TQT_SLOT( movieStatus( int ) ));
m->disconnectResize( this, TQT_SLOT( movieResize( const TQSize& ) ) ); m->disconnectResize( this, TQT_SLOT( movieResize( const TQSize& ) ) );
TQTimer::singleShot(0, this, TQT_SLOT( deleteMovie())); TQTimer::singleShot(0, this, TQT_SLOT( deleteMovie()));
imgSource = 0; imgSource = 0;
@ -850,7 +850,7 @@ void CachedImage::data ( TQBuffer &_buffer, bool eof )
imgSource = new ImageSource( _buffer.buffer()); imgSource = new ImageSource( _buffer.buffer());
m = new TQMovie( imgSource, 8192 ); m = new TQMovie( imgSource, 8192 );
m->connectUpdate( this, TQT_SLOT( movieUpdated( const TQRect &) )); m->connectUpdate( this, TQT_SLOT( movieUpdated( const TQRect &) ));
m->connectStatus( this, TQT_SLOT( movieStatus(int))); m->connectqStatus( this, TQT_SLOT( movieStatus(int)));
m->connectResize( this, TQT_SLOT( movieResize( const TQSize& ) ) ); m->connectResize( this, TQT_SLOT( movieResize( const TQSize& ) ) );
} }
} }
@ -993,7 +993,7 @@ bool DocLoader::needReload(CachedObject *existing, const TQString& fullURL)
bool reload = false; bool reload = false;
if (m_cachePolicy == KIO::CC_Verify) if (m_cachePolicy == KIO::CC_Verify)
{ {
if (!m_reloadedURLs.contains(fullURL)) if (!m_reloadedURLs.tqcontains(fullURL))
{ {
if (existing && existing->isExpired()) if (existing && existing->isExpired())
{ {
@ -1005,7 +1005,7 @@ bool DocLoader::needReload(CachedObject *existing, const TQString& fullURL)
} }
else if ((m_cachePolicy == KIO::CC_Reload) || (m_cachePolicy == KIO::CC_Refresh)) else if ((m_cachePolicy == KIO::CC_Reload) || (m_cachePolicy == KIO::CC_Refresh))
{ {
if (!m_reloadedURLs.contains(fullURL)) if (!m_reloadedURLs.tqcontains(fullURL))
{ {
if (existing) if (existing)
{ {
@ -1427,7 +1427,7 @@ CachedObjectType* Cache::requestObject( DocLoader* dl, const KURL& kurl, const c
KIO::CacheControl cachePolicy = dl ? dl->cachePolicy() : KIO::CC_Verify; KIO::CacheControl cachePolicy = dl ? dl->cachePolicy() : KIO::CC_Verify;
TQString url = kurl.url(); TQString url = kurl.url();
CachedObject* o = cache->find(url); CachedObject* o = cache->tqfind(url);
if ( o && o->type() != CachedType ) { if ( o && o->type() != CachedType ) {
removeCacheEntry( o ); removeCacheEntry( o );
@ -1464,7 +1464,7 @@ CachedObjectType* Cache::requestObject( DocLoader* dl, const KURL& kurl, const c
void Cache::preloadStyleSheet( const TQString &url, const TQString &stylesheet_data) void Cache::preloadStyleSheet( const TQString &url, const TQString &stylesheet_data)
{ {
CachedObject *o = cache->find(url); CachedObject *o = cache->tqfind(url);
if(o) if(o)
removeCacheEntry(o); removeCacheEntry(o);
@ -1474,7 +1474,7 @@ void Cache::preloadStyleSheet( const TQString &url, const TQString &stylesheet_d
void Cache::preloadScript( const TQString &url, const TQString &script_data) void Cache::preloadScript( const TQString &url, const TQString &script_data)
{ {
CachedObject *o = cache->find(url); CachedObject *o = cache->tqfind(url);
if(o) if(o)
removeCacheEntry(o); removeCacheEntry(o);

@ -186,7 +186,7 @@ khtml_jpeg_source_mgr::khtml_jpeg_source_mgr()
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
class KJPEGFormat : public QImageFormat class KJPEGFormat : public TQImageFormat
{ {
public: public:
KJPEGFormat(); KJPEGFormat();
@ -312,7 +312,7 @@ int KJPEGFormat::decode(TQImage& image, TQImageConsumer* consumer, const uchar*
{ {
if(jpeg_read_header(&cinfo, true) != JPEG_SUSPENDED) { if(jpeg_read_header(&cinfo, true) != JPEG_SUSPENDED) {
// do some simple memory requirements limitations // do some simple memory requirements limitations
// as long as we use that stupid Qt stuff // as long as we use that stupid TQt stuff
int s = cinfo.image_width * cinfo.image_height; int s = cinfo.image_width * cinfo.image_height;
if ( s > 16384 * 12388 ) if ( s > 16384 * 12388 )
cinfo.scale_denom = 8; cinfo.scale_denom = 8;
@ -427,7 +427,7 @@ again:
// Expand 24->32 bpp. // Expand 24->32 bpp.
for (int j=oldoutput_scanline; j<oldoutput_scanline+completed_scanlines; j++) { for (int j=oldoutput_scanline; j<oldoutput_scanline+completed_scanlines; j++) {
uchar *in = image.scanLine(j) + cinfo.output_width * 3; uchar *in = image.scanLine(j) + cinfo.output_width * 3;
QRgb *out = (QRgb*)image.scanLine(j); TQRgb *out = (TQRgb*)image.scanLine(j);
for (uint i=cinfo.output_width; i--; ) { for (uint i=cinfo.output_width; i--; ) {
in-=3; in-=3;
@ -519,7 +519,7 @@ again:
} }
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
// This is the factory that teaches Qt about progressive JPEG's // This is the factory that teaches TQt about progressive JPEG's
TQImageFormat* khtml::KJPEGFormatType::decoderFor(const unsigned char* buffer, int length) TQImageFormat* khtml::KJPEGFormatType::decoderFor(const unsigned char* buffer, int length)
{ {

@ -407,7 +407,7 @@ bool Font::isFontScalable(TQFontDatabase& db, const TQFont& font)
/* Cache size info */ /* Cache size info */
if (!scalSizesCache) if (!scalSizesCache)
scalSizesCache = new TQMap<ScalKey, TQValueList<int> >; scalSizesCache = new TQMap<ScalKey, TQValueList<int> >;
(*scalSizesCache)[key] = db.smoothSizes(font.family(), db.styleString(font)); (*scalSizesCache)[key] = db.tqsmoothSizes(font.family(), db.styleString(font));
} }
} }

@ -346,7 +346,7 @@ void RenderBox::paintRootBoxDecorations(PaintInfo& paintInfo, int _tx, int _ty)
} }
if( !bgColor.isValid() && canvas()->view()) if( !bgColor.isValid() && canvas()->view())
bgColor = canvas()->view()->palette().active().color(TQColorGroup::Base); bgColor = canvas()->view()->tqpalette().active().color(TQColorGroup::Base);
int w = width(); int w = width();
int h = height(); int h = height();

@ -329,7 +329,7 @@ void RenderCanvas::paintBoxDecorations(PaintInfo& paintInfo, int /*_tx*/, int /*
if ((firstChild() && firstChild()->style()->visibility() == VISIBLE) || !view()) if ((firstChild() && firstChild()->style()->visibility() == VISIBLE) || !view())
return; return;
paintInfo.p->fillRect(paintInfo.r, view()->palette().active().color(TQColorGroup::Base)); paintInfo.p->fillRect(paintInfo.r, view()->tqpalette().active().color(TQColorGroup::Base));
} }
void RenderCanvas::tqrepaintRectangle(int x, int y, int w, int h, Priority p, bool f) void RenderCanvas::tqrepaintRectangle(int x, int y, int w, int h, Priority p, bool f)
@ -492,7 +492,7 @@ void RenderCanvas::setSelection(RenderObject *s, int sp, RenderObject *e, int ep
no = no->nextSibling(); no = no->nextSibling();
} }
} }
if (os->selectionState() == SelectionInside && !oldSelectedInside.containsRef(os)) if (os->selectionState() == SelectionInside && !oldSelectedInside.tqcontainsRef(os))
oldSelectedInside.append(os); oldSelectedInside.append(os);
os = no; os = no;
@ -550,7 +550,7 @@ void RenderCanvas::setSelection(RenderObject *s, int sp, RenderObject *e, int ep
if (no) if (no)
no = no->nextSibling(); no = no->nextSibling();
} }
if (o->selectionState() == SelectionInside && !newSelectedInside.containsRef(o)) if (o->selectionState() == SelectionInside && !newSelectedInside.tqcontainsRef(o))
newSelectedInside.append(o); newSelectedInside.append(o);
o=no; o=no;
@ -581,7 +581,7 @@ void RenderCanvas::setSelection(RenderObject *s, int sp, RenderObject *e, int ep
TQPtrListIterator<RenderObject> oldIterator(oldSelectedInside); TQPtrListIterator<RenderObject> oldIterator(oldSelectedInside);
bool firstRect = true; bool firstRect = true;
for (; oldIterator.current(); ++oldIterator){ for (; oldIterator.current(); ++oldIterator){
if (!newSelectedInside.containsRef(oldIterator.current())){ if (!newSelectedInside.tqcontainsRef(oldIterator.current())){
if (firstRect){ if (firstRect){
updateRect = enclosingPositionedRect(oldIterator.current()); updateRect = enclosingPositionedRect(oldIterator.current());
firstRect = false; firstRect = false;
@ -601,7 +601,7 @@ void RenderCanvas::setSelection(RenderObject *s, int sp, RenderObject *e, int ep
TQPtrListIterator<RenderObject> newIterator(newSelectedInside); TQPtrListIterator<RenderObject> newIterator(newSelectedInside);
firstRect = true; firstRect = true;
for (; newIterator.current(); ++newIterator){ for (; newIterator.current(); ++newIterator){
if (!oldSelectedInside.containsRef(newIterator.current())){ if (!oldSelectedInside.tqcontainsRef(newIterator.current())){
if (firstRect){ if (firstRect){
updateRect = enclosingPositionedRect(newIterator.current()); updateRect = enclosingPositionedRect(newIterator.current());
firstRect = false; firstRect = false;

@ -104,20 +104,20 @@ TQ_Alignment RenderFormElement::textAlignment() const
switch (style()->textAlign()) { switch (style()->textAlign()) {
case LEFT: case LEFT:
case KHTML_LEFT: case KHTML_LEFT:
return AlignLeft; return Qt::AlignLeft;
case RIGHT: case RIGHT:
case KHTML_RIGHT: case KHTML_RIGHT:
return AlignRight; return Qt::AlignRight;
case CENTER: case CENTER:
case KHTML_CENTER: case KHTML_CENTER:
return AlignHCenter; return Qt::AlignHCenter;
case JUSTIFY: case JUSTIFY:
// Just fall into the auto code for justify. // Just fall into the auto code for justify.
case TAAUTO: case TAAUTO:
return style()->direction() == RTL ? AlignRight : AlignLeft; return style()->direction() == RTL ? Qt::AlignRight : Qt::AlignLeft;
} }
assert(false); // Should never be reached. assert(false); // Should never be reached.
return AlignLeft; return Qt::AlignLeft;
} }
// ------------------------------------------------------------------------- // -------------------------------------------------------------------------
@ -155,8 +155,8 @@ void RenderCheckBox::calcMinMaxWidth()
KHTMLAssert( !minMaxKnown() ); KHTMLAssert( !minMaxKnown() );
TQCheckBox *cb = static_cast<TQCheckBox *>( m_widget ); TQCheckBox *cb = static_cast<TQCheckBox *>( m_widget );
TQSize s( cb->style().tqpixelMetric( TQStyle::PM_IndicatorWidth ), TQSize s( cb->tqstyle().tqpixelMetric( TQStyle::PM_IndicatorWidth ),
cb->style().tqpixelMetric( TQStyle::PM_IndicatorHeight ) ); cb->tqstyle().tqpixelMetric( TQStyle::PM_IndicatorHeight ) );
setIntrinsicWidth( s.width() ); setIntrinsicWidth( s.width() );
setIntrinsicHeight( s.height() ); setIntrinsicHeight( s.height() );
@ -207,8 +207,8 @@ void RenderRadioButton::calcMinMaxWidth()
KHTMLAssert( !minMaxKnown() ); KHTMLAssert( !minMaxKnown() );
TQRadioButton *rb = static_cast<TQRadioButton *>( m_widget ); TQRadioButton *rb = static_cast<TQRadioButton *>( m_widget );
TQSize s( rb->style().tqpixelMetric( TQStyle::PM_ExclusiveIndicatorWidth ), TQSize s( rb->tqstyle().tqpixelMetric( TQStyle::PM_ExclusiveIndicatorWidth ),
rb->style().tqpixelMetric( TQStyle::PM_ExclusiveIndicatorHeight ) ); rb->tqstyle().tqpixelMetric( TQStyle::PM_ExclusiveIndicatorHeight ) );
setIntrinsicWidth( s.width() ); setIntrinsicWidth( s.width() );
setIntrinsicHeight( s.height() ); setIntrinsicHeight( s.height() );
@ -263,14 +263,14 @@ void RenderSubmitButton::calcMinMaxWidth()
raw = TQString::tqfromLatin1("X"); raw = TQString::tqfromLatin1("X");
TQFontMetrics fm = pb->fontMetrics(); TQFontMetrics fm = pb->fontMetrics();
TQSize ts = fm.size( ShowPrefix, raw); TQSize ts = fm.size( ShowPrefix, raw);
TQSize s(pb->style().sizeFromContents( TQStyle::CT_PushButton, pb, ts ) TQSize s(pb->tqstyle().tqsizeFromContents( TQStyle::CT_PushButton, pb, ts )
.expandedTo(TQApplication::globalStrut())); .expandedTo(TQApplication::globalStrut()));
int margin = pb->style().tqpixelMetric( TQStyle::PM_ButtonMargin, pb) + int margin = pb->tqstyle().tqpixelMetric( TQStyle::PM_ButtonMargin, pb) +
pb->style().tqpixelMetric( TQStyle::PM_DefaultFrameWidth, pb ) * 2; pb->tqstyle().tqpixelMetric( TQStyle::PM_DefaultFrameWidth, pb ) * 2;
int w = ts.width() + margin; int w = ts.width() + margin;
int h = s.height(); int h = s.height();
if (pb->isDefault() || pb->autoDefault()) { if (pb->isDefault() || pb->autoDefault()) {
int dbw = pb->style().tqpixelMetric( TQStyle::PM_ButtonDefaultIndicator, pb ) * 2; int dbw = pb->tqstyle().tqpixelMetric( TQStyle::PM_ButtonDefaultIndicator, pb ) * 2;
w += dbw; w += dbw;
} }
@ -312,7 +312,7 @@ LineEditWidget::LineEditWidget(DOM::HTMLInputElementImpl* input, KHTMLView* view
{ {
setMouseTracking(true); setMouseTracking(true);
KActionCollection *ac = new KActionCollection(this); KActionCollection *ac = new KActionCollection(this);
m_spellAction = KStdAction::spelling( this, TQT_SLOT( slotCheckSpelling() ), ac ); m_spellAction = KStdAction::spelling( TQT_TQOBJECT(this), TQT_SLOT( slotCheckSpelling() ), ac );
} }
LineEditWidget::~LineEditWidget() LineEditWidget::~LineEditWidget()
@ -328,7 +328,7 @@ void LineEditWidget::slotCheckSpelling()
} }
delete m_spell; delete m_spell;
m_spell = new KSpell( this, i18n( "Spell Checking" ), this, TQT_SLOT( slotSpellCheckReady( KSpell *) ), 0, true, true); m_spell = new KSpell( this, i18n( "Spell Checking" ), TQT_TQOBJECT(this), TQT_SLOT( slotSpellCheckReady( KSpell *) ), 0, true, true);
connect( m_spell, TQT_SIGNAL( death() ),this, TQT_SLOT( spellCheckerFinished() ) ); connect( m_spell, TQT_SIGNAL( death() ),this, TQT_SLOT( spellCheckerFinished() ) );
connect( m_spell, TQT_SIGNAL( misspelling( const TQString &, const TQStringList &, unsigned int ) ),this, TQT_SLOT( spellCheckerMisspelling( const TQString &, const TQStringList &, unsigned int ) ) ); connect( m_spell, TQT_SIGNAL( misspelling( const TQString &, const TQStringList &, unsigned int ) ),this, TQT_SLOT( spellCheckerMisspelling( const TQString &, const TQStringList &, unsigned int ) ) );
@ -805,7 +805,7 @@ void RenderFileButton::calcMinMaxWidth()
int h = fm.lineSpacing(); int h = fm.lineSpacing();
int w = fm.width( 'x' ) * (size > 0 ? size+1 : 17); // "some" int w = fm.width( 'x' ) * (size > 0 ? size+1 : 17); // "some"
KLineEdit* edit = static_cast<KURLRequester*>( m_widget )->lineEdit(); KLineEdit* edit = static_cast<KURLRequester*>( m_widget )->lineEdit();
TQSize s = edit->style().sizeFromContents(TQStyle::CT_LineEdit, TQSize s = edit->tqstyle().tqsizeFromContents(TQStyle::CT_LineEdit,
edit, edit,
TQSize(w + 2 + 2*edit->frameWidth(), kMax(h, 14) + 2 + 2*edit->frameWidth())) TQSize(w + 2 + 2*edit->frameWidth(), kMax(h, 14) + 2 + 2*edit->frameWidth()))
.expandedTo(TQApplication::globalStrut()); .expandedTo(TQApplication::globalStrut());
@ -890,7 +890,7 @@ bool ComboBoxWidget::event(TQEvent *e)
return true; return true;
if (e->type()==TQEvent::KeyPress) if (e->type()==TQEvent::KeyPress)
{ {
TQKeyEvent *ke = static_cast<TQKeyEvent *>(e); TQKeyEvent *ke = TQT_TQKEYEVENT(e);
switch(ke->key()) switch(ke->key())
{ {
case Key_Return: case Key_Return:
@ -907,9 +907,9 @@ bool ComboBoxWidget::event(TQEvent *e)
bool ComboBoxWidget::eventFilter(TQObject *dest, TQEvent *e) bool ComboBoxWidget::eventFilter(TQObject *dest, TQEvent *e)
{ {
if (dest==listBox() && e->type()==TQEvent::KeyPress) if (TQT_BASE_OBJECT(dest)==TQT_BASE_OBJECT(listBox()) && e->type()==TQEvent::KeyPress)
{ {
TQKeyEvent *ke = static_cast<TQKeyEvent *>(e); TQKeyEvent *ke = TQT_TQKEYEVENT(e);
bool forward = false; bool forward = false;
switch(ke->key()) switch(ke->key())
{ {
@ -1295,9 +1295,9 @@ TextAreaWidget::TextAreaWidget(int wrap, TQWidget* parent)
setMouseTracking(true); setMouseTracking(true);
KActionCollection *ac = new KActionCollection(this); KActionCollection *ac = new KActionCollection(this);
m_findAction = KStdAction::find( this, TQT_SLOT( slotFind() ), ac ); m_findAction = KStdAction::find( TQT_TQOBJECT(this), TQT_SLOT( slotFind() ), ac );
m_findNextAction = KStdAction::findNext( this, TQT_SLOT( slotFindNext() ), ac ); m_findNextAction = KStdAction::findNext( TQT_TQOBJECT(this), TQT_SLOT( slotFindNext() ), ac );
m_replaceAction = KStdAction::replace( this, TQT_SLOT( slotReplace() ), ac ); m_replaceAction = KStdAction::replace( TQT_TQOBJECT(this), TQT_SLOT( slotReplace() ), ac );
} }

@ -95,7 +95,7 @@ public:
protected: protected:
virtual bool isRenderButton() const { return false; } virtual bool isRenderButton() const { return false; }
virtual bool isEditable() const { return false; } virtual bool isEditable() const { return false; }
AlignmentFlags textAlignment() const; TQ_Alignment textAlignment() const;
TQPoint m_mousePos; TQPoint m_mousePos;
int m_state; int m_state;

@ -550,7 +550,7 @@ bool RenderFrameSet::userResize( MouseEventImpl *evt )
TQPainter paint( view ); TQPainter paint( view );
paint.setPen( Qt::gray ); paint.setPen( Qt::gray );
paint.setBrush( Qt::gray ); paint.setBrush( Qt::gray );
paint.setRasterOp( Qt::XorROP ); paint.setRasterOp( TQt::XorROP );
TQRect r(xPos(), yPos(), width(), height()); TQRect r(xPos(), yPos(), width(), height());
const int rBord = 3; const int rBord = 3;
int sw = element()->border(); int sw = element()->border();
@ -634,7 +634,7 @@ void RenderPart::setWidget( TQWidget *widget )
#endif #endif
setQWidget( widget ); setQWidget( widget );
widget->setFocusPolicy(TQWidget::WheelFocus); widget->setFocusPolicy(TQ_WheelFocus);
if(widget->inherits("KHTMLView")) if(widget->inherits("KHTMLView"))
connect( widget, TQT_SIGNAL( cleared() ), this, TQT_SLOT( slotViewCleared() ) ); connect( widget, TQT_SIGNAL( cleared() ), this, TQT_SLOT( slotViewCleared() ) );

@ -61,7 +61,7 @@ public:
bool canResize( int _x, int _y); bool canResize( int _x, int _y);
void setResizing(bool e); void setResizing(bool e);
Qt::tqCursorShape cursorShape() const { return m_cursor; } Qt::CursorShape cursorShape() const { return m_cursor; }
bool nodeAtPoint(NodeInfo& info, int x, int y, int tx, int ty, HitTestAction hitTestAction, bool inside); bool nodeAtPoint(NodeInfo& info, int x, int y, int tx, int ty, HitTestAction hitTestAction, bool inside);
@ -73,7 +73,7 @@ public:
#endif #endif
private: private:
Qt::tqCursorShape m_cursor; Qt::CursorShape m_cursor;
int m_oldpos; int m_oldpos;
int m_gridLen[2]; int m_gridLen[2];
int* m_gridDelta[2]; int* m_gridDelta[2];

@ -379,7 +379,7 @@ void RenderGlyph::paint(PaintInfo& paintInfo, int _tx, int _ty)
diamond[2] = TQPoint(x+s, y+2*s); diamond[2] = TQPoint(x+s, y+2*s);
diamond[3] = TQPoint(x, y+s); diamond[3] = TQPoint(x, y+s);
p->setBrush( color ); p->setBrush( color );
p->drawConvexPolygon( diamond, 0, 4 ); p->tqdrawConvexPolygon( diamond, 0, 4 );
return; return;
} }
case LNONE: case LNONE:

@ -115,7 +115,7 @@ void RenderImage::setPixmap( const TQPixmap &p, const TQRect& r, CachedImage *o)
// we have an alt and the user meant it (its not a text we invented) // we have an alt and the user meant it (its not a text we invented)
if ( element() && !alt.isEmpty() && !element()->getAttribute( ATTR_ALT ).isNull()) { if ( element() && !alt.isEmpty() && !element()->getAttribute( ATTR_ALT ).isNull()) {
const TQFontMetrics &fm = style()->fontMetrics(); const TQFontMetrics &fm = style()->fontMetrics();
TQRect br = fm.boundingRect ( 0, 0, 1024, 256, Qt::AlignAuto|Qt::WordBreak, alt.string() ); TQRect br = fm.boundingRect ( 0, 0, 1024, 256, TQt::AlignAuto|TQt::WordBreak, alt.string() );
if ( br.width() > iw ) if ( br.width() > iw )
iw = br.width(); iw = br.width();
if ( br.height() > ih ) if ( br.height() > ih )
@ -266,7 +266,7 @@ void RenderImage::paint(PaintInfo& paintInfo, int _tx, int _ty)
if ( !berrorPic ) { if ( !berrorPic ) {
//qDebug("qDrawShadePanel %d/%d/%d/%d", _tx + leftBorder, _ty + topBorder, cWidth, cHeight); //qDebug("qDrawShadePanel %d/%d/%d/%d", _tx + leftBorder, _ty + topBorder, cWidth, cHeight);
qDrawShadePanel( paintInfo.p, _tx + leftBorder + leftPad, _ty + topBorder + topPad, cWidth, cHeight, qDrawShadePanel( paintInfo.p, _tx + leftBorder + leftPad, _ty + topBorder + topPad, cWidth, cHeight,
KApplication::palette().inactive(), true, 1 ); KApplication::tqpalette().inactive(), true, 1 );
} }
TQPixmap const* pix = i ? &i->pixmap() : 0; TQPixmap const* pix = i ? &i->pixmap() : 0;
if(berrorPic && pix && (cWidth >= pix->width()+4) && (cHeight >= pix->height()+4) ) if(berrorPic && pix && (cWidth >= pix->width()+4) && (cHeight >= pix->height()+4) )
@ -283,7 +283,7 @@ void RenderImage::paint(PaintInfo& paintInfo, int _tx, int _ty)
int ay = _ty + topBorder + topPad + 2; int ay = _ty + topBorder + topPad + 2;
const TQFontMetrics &fm = style()->fontMetrics(); const TQFontMetrics &fm = style()->fontMetrics();
if (cWidth>5 && cHeight>=fm.height()) if (cWidth>5 && cHeight>=fm.height())
paintInfo.p->drawText(ax, ay+1, cWidth - 4, cHeight - 4, Qt::WordBreak, text ); paintInfo.p->drawText(ax, ay+1, cWidth - 4, cHeight - 4, TQt::WordBreak, text );
} }
} }
} }

@ -637,7 +637,7 @@ int RenderLayer::verticalScrollbarWidth()
#ifdef APPLE_CHANGES #ifdef APPLE_CHANGES
return m_vBar->width(); return m_vBar->width();
#else #else
return m_vBar->style().tqpixelMetric(TQStyle::PM_ScrollBarExtent); return m_vBar->tqstyle().tqpixelMetric(TQStyle::PM_ScrollBarExtent);
#endif #endif
} }
@ -650,7 +650,7 @@ int RenderLayer::horizontalScrollbarHeight()
#ifdef APPLE_CHANGES #ifdef APPLE_CHANGES
return m_hBar->height(); return m_hBar->height();
#else #else
return m_hBar->style().tqpixelMetric(TQStyle::PM_ScrollBarExtent); return m_hBar->tqstyle().tqpixelMetric(TQStyle::PM_ScrollBarExtent);
#endif #endif
} }
@ -691,7 +691,7 @@ void RenderLayer::positionScrollbars(const TQRect& absBounds)
TQScrollBar *b = m_hBar; TQScrollBar *b = m_hBar;
if (!m_hBar) if (!m_hBar)
b = m_vBar; b = m_vBar;
int sw = b->style().tqpixelMetric(TQStyle::PM_ScrollBarExtent); int sw = b->tqstyle().tqpixelMetric(TQStyle::PM_ScrollBarExtent);
if (m_vBar) { if (m_vBar) {
TQRect vBarRect = TQRect(tx + w - sw + 1, ty, sw, h - (m_hBar ? sw : 0) + 1); TQRect vBarRect = TQRect(tx + w - sw + 1, ty, sw, h - (m_hBar ? sw : 0) + 1);

@ -333,7 +333,7 @@ void RenderListMarker::paint(PaintInfo& paintInfo, int _tx, int _ty)
diamond[2] = TQPoint(x+s, y+2*s); diamond[2] = TQPoint(x+s, y+2*s);
diamond[3] = TQPoint(x, y+s); diamond[3] = TQPoint(x, y+s);
p->setBrush( color ); p->setBrush( color );
p->drawConvexPolygon( diamond, 0, 4 ); p->tqdrawConvexPolygon( diamond, 0, 4 );
return; return;
} }
case LNONE: case LNONE:
@ -342,25 +342,25 @@ void RenderListMarker::paint(PaintInfo& paintInfo, int _tx, int _ty)
if (!m_item.isEmpty()) { if (!m_item.isEmpty()) {
if(listPositionInside()) { if(listPositionInside()) {
if( style()->direction() == LTR) { if( style()->direction() == LTR) {
p->drawText(_tx, _ty, 0, 0, Qt::AlignLeft|Qt::DontClip, m_item); p->drawText(_tx, _ty, 0, 0, Qt::AlignLeft|TQt::DontClip, m_item);
p->drawText(_tx + fm.width(m_item), _ty, 0, 0, Qt::AlignLeft|Qt::DontClip, p->drawText(_tx + fm.width(m_item), _ty, 0, 0, Qt::AlignLeft|TQt::DontClip,
TQString::tqfromLatin1(". ")); TQString::tqfromLatin1(". "));
} }
else { else {
const TQString& punct(TQString::tqfromLatin1(" .")); const TQString& punct(TQString::tqfromLatin1(" ."));
p->drawText(_tx, _ty, 0, 0, Qt::AlignLeft|Qt::DontClip, punct); p->drawText(_tx, _ty, 0, 0, Qt::AlignLeft|TQt::DontClip, punct);
p->drawText(_tx + fm.width(punct), _ty, 0, 0, Qt::AlignLeft|Qt::DontClip, m_item); p->drawText(_tx + fm.width(punct), _ty, 0, 0, Qt::AlignLeft|TQt::DontClip, m_item);
} }
} else { } else {
if (style()->direction() == LTR) { if (style()->direction() == LTR) {
const TQString& punct(TQString::tqfromLatin1(". ")); const TQString& punct(TQString::tqfromLatin1(". "));
p->drawText(_tx-offset/2, _ty, 0, 0, Qt::AlignRight|Qt::DontClip, punct); p->drawText(_tx-offset/2, _ty, 0, 0, Qt::AlignRight|TQt::DontClip, punct);
p->drawText(_tx-offset/2-fm.width(punct), _ty, 0, 0, Qt::AlignRight|Qt::DontClip, m_item); p->drawText(_tx-offset/2-fm.width(punct), _ty, 0, 0, Qt::AlignRight|TQt::DontClip, m_item);
} }
else { else {
const TQString& punct(TQString::tqfromLatin1(" .")); const TQString& punct(TQString::tqfromLatin1(" ."));
p->drawText(_tx+offset/2, _ty, 0, 0, Qt::AlignLeft|Qt::DontClip, punct); p->drawText(_tx+offset/2, _ty, 0, 0, Qt::AlignLeft|TQt::DontClip, punct);
p->drawText(_tx+offset/2+fm.width(punct), _ty, 0, 0, Qt::AlignLeft|Qt::DontClip, m_item); p->drawText(_tx+offset/2+fm.width(punct), _ty, 0, 0, Qt::AlignLeft|TQt::DontClip, m_item);
} }
} }
} }

@ -748,7 +748,7 @@ void RenderObject::drawBorder(TQPainter *p, int x1, int y1, int x2, int y2,
if(!c.isValid()) { if(!c.isValid()) {
if(invalidisInvert) if(invalidisInvert)
{ {
p->setRasterOp(Qt::XorROP); p->setRasterOp(TQt::XorROP);
c = Qt::white; c = Qt::white;
} }
else { else {
@ -766,8 +766,8 @@ void RenderObject::drawBorder(TQPainter *p, int x1, int y1, int x2, int y2,
case BNONE: case BNONE:
case BHIDDEN: case BHIDDEN:
// should not happen // should not happen
if(invalidisInvert && p->rasterOp() == Qt::XorROP) if(invalidisInvert && p->rasterOp() == TQt::XorROP)
p->setRasterOp(Qt::CopyROP); p->setRasterOp(TQt::CopyROP);
return; return;
case DOTTED: case DOTTED:
@ -964,8 +964,8 @@ void RenderObject::drawBorder(TQPainter *p, int x1, int y1, int x2, int y2,
break; break;
} }
if(invalidisInvert && p->rasterOp() == Qt::XorROP) if(invalidisInvert && p->rasterOp() == TQt::XorROP)
p->setRasterOp(Qt::CopyROP); p->setRasterOp(TQt::CopyROP);
} }
void RenderObject::paintBorder(TQPainter *p, int _tx, int _ty, int w, int h, const RenderStyle* style, bool begin, bool end) void RenderObject::paintBorder(TQPainter *p, int _tx, int _ty, int w, int h, const RenderStyle* style, bool begin, bool end)
@ -2223,7 +2223,7 @@ CounterNode* RenderObject::lookupCounter(const TQString& counter) const
{ {
TQDict<khtml::CounterNode>* counters = document()->counters(this); TQDict<khtml::CounterNode>* counters = document()->counters(this);
if (counters) if (counters)
return counters->find(counter); return counters->tqfind(counter);
else else
return 0; return 0;
} }

@ -139,11 +139,11 @@ RenderWidget::~RenderWidget()
} }
} }
class QWidgetResizeEvent : public QEvent class TQWidgetResizeEvent : public TQEvent
{ {
public: public:
enum { Type = TQEvent::User + 0xbee }; enum { Type = TQEvent::User + 0xbee };
QWidgetResizeEvent( int _w, int _h ) : TQWidgetResizeEvent( int _w, int _h ) :
TQEvent( ( TQEvent::Type ) Type ), w( _w ), h( _h ) {} TQEvent( ( TQEvent::Type ) Type ), w( _w ), h( _h ) {}
int w; int w;
int h; int h;
@ -160,7 +160,7 @@ void RenderWidget::resizeWidget( int w, int h )
m_resizePending = isKHTMLWidget(); m_resizePending = isKHTMLWidget();
ref(); ref();
element()->ref(); element()->ref();
TQApplication::postEvent( this, new QWidgetResizeEvent( w, h ) ); TQApplication::postEvent( this, new TQWidgetResizeEvent( w, h ) );
element()->deref(); element()->deref();
deref(); deref();
} }
@ -171,17 +171,17 @@ void RenderWidget::cancelPendingResize()
if (!m_widget) if (!m_widget)
return; return;
m_discardResizes = true; m_discardResizes = true;
TQApplication::sendPostedEvents(this, QWidgetResizeEvent::Type); TQApplication::sendPostedEvents(this, TQWidgetResizeEvent::Type);
m_discardResizes = false; m_discardResizes = false;
} }
bool RenderWidget::event( TQEvent *e ) bool RenderWidget::event( TQEvent *e )
{ {
if ( m_widget && (e->type() == (TQEvent::Type)QWidgetResizeEvent::Type) ) { if ( m_widget && (e->type() == (TQEvent::Type)TQWidgetResizeEvent::Type) ) {
m_resizePending = false; m_resizePending = false;
if (m_discardResizes) if (m_discardResizes)
return true; return true;
QWidgetResizeEvent *re = static_cast<QWidgetResizeEvent *>(e); TQWidgetResizeEvent *re = static_cast<TQWidgetResizeEvent *>(e);
m_widget->resize( re->w, re->h ); m_widget->resize( re->w, re->h );
tqrepaint(); tqrepaint();
} }
@ -193,7 +193,7 @@ bool RenderWidget::event( TQEvent *e )
void RenderWidget::flushWidgetResizes() //static void RenderWidget::flushWidgetResizes() //static
{ {
TQApplication::sendPostedEvents( 0, QWidgetResizeEvent::Type ); TQApplication::sendPostedEvents( 0, TQWidgetResizeEvent::Type );
} }
void RenderWidget::setQWidget(TQWidget *widget) void RenderWidget::setQWidget(TQWidget *widget)
@ -215,8 +215,8 @@ void RenderWidget::setQWidget(TQWidget *widget)
if ( (m_isKHTMLWidget = !strcmp(m_widget->name(), "__khtml")) && !::tqqt_cast<TQFrame*>(m_widget)) if ( (m_isKHTMLWidget = !strcmp(m_widget->name(), "__khtml")) && !::tqqt_cast<TQFrame*>(m_widget))
m_widget->setBackgroundMode( TQWidget::NoBackground ); m_widget->setBackgroundMode( TQWidget::NoBackground );
if (m_widget->focusPolicy() > TQWidget::StrongFocus) if (m_widget->focusPolicy() > TQ_StrongFocus)
m_widget->setFocusPolicy(TQWidget::StrongFocus); m_widget->setFocusPolicy(TQ_StrongFocus);
// if we've already received a layout, apply the calculated space to the // if we've already received a layout, apply the calculated space to the
// widget immediately, but we have to have really been full constructed (with a non-null // widget immediately, but we have to have really been full constructed (with a non-null
// style pointer). // style pointer).
@ -439,7 +439,7 @@ void RenderWidget::paint(PaintInfo& paintInfo, int _tx, int _ty)
paintWidget(paintInfo, m_widget, xPos, yPos); paintWidget(paintInfo, m_widget, xPos, yPos);
} }
#include <private/qinternal_p.h> #include <tqinternal_p.h>
// The PaintBuffer class provides a shared buffer for widget painting. // The PaintBuffer class provides a shared buffer for widget painting.
// //
@ -449,7 +449,7 @@ void RenderWidget::paint(PaintInfo& paintInfo, int _tx, int _ty)
// is still needed. If not, it shrinks down to the biggest size < maxPixelBuffering // is still needed. If not, it shrinks down to the biggest size < maxPixelBuffering
// that was requested during the overflow lapse. // that was requested during the overflow lapse.
class PaintBuffer: public QObject class PaintBuffer: public TQObject
{ {
public: public:
static const int maxPixelBuffering = 320*200; static const int maxPixelBuffering = 320*200;
@ -527,9 +527,9 @@ static void copyWidget(const TQRect& r, TQPainter *p, TQWidget *widget, int tx,
TQValueVector<TQWidget*> cw; TQValueVector<TQWidget*> cw;
TQValueVector<TQRect> cr; TQValueVector<TQRect> cr;
if (widget->children()) { if (!widget->childrenListObject().isEmpty()) {
// build region // build region
TQObjectListIterator it = *widget->children(); TQObjectListIterator it = widget->childrenListObject();
for (; it.current(); ++it) { for (; it.current(); ++it) {
TQWidget* const w = ::tqqt_cast<TQWidget *>(it.current()); TQWidget* const w = ::tqqt_cast<TQWidget *>(it.current());
if ( w && !w->isTopLevel() && !w->isHidden()) { if ( w && !w->isTopLevel() && !w->isHidden()) {
@ -542,10 +542,10 @@ static void copyWidget(const TQRect& r, TQPainter *p, TQWidget *widget, int tx,
} }
} }
} }
TQMemArray<TQRect> br = blit.rects(); TQMemArray<TQRect> br = blit.tqrects();
const int cnt = br.size(); const int cnt = br.size();
const bool external = p->device()->isExtDev(); const bool external = p->tqdevice()->isExtDev();
TQPixmap* const pm = PaintBuffer::grab( widget->size() ); TQPixmap* const pm = PaintBuffer::grab( widget->size() );
if (!pm) if (!pm)
{ {
@ -598,13 +598,13 @@ void RenderWidget::paintWidget(PaintInfo& pI, TQWidget *widget, int tx, int ty)
TQPainter* const p = pI.p; TQPainter* const p = pI.p;
allowWidgetPaintEvents = true; allowWidgetPaintEvents = true;
const bool dsbld = QSharedDoubleBuffer::isDisabled(); const bool dsbld = TQSharedDoubleBuffer::isDisabled();
QSharedDoubleBuffer::setDisabled(true); TQSharedDoubleBuffer::setDisabled(true);
TQRect rr = pI.r; TQRect rr = pI.r;
rr.moveBy(-tx, -ty); rr.moveBy(-tx, -ty);
const TQRect r = widget->rect().intersect( rr ); const TQRect r = widget->rect().intersect( rr );
copyWidget(r, p, widget, tx, ty); copyWidget(r, p, widget, tx, ty);
QSharedDoubleBuffer::setDisabled(dsbld); TQSharedDoubleBuffer::setDisabled(dsbld);
allowWidgetPaintEvents = false; allowWidgetPaintEvents = false;
} }
@ -641,7 +641,7 @@ bool RenderWidget::eventFilter(TQObject* /*o*/, TQEvent* e)
// Don't count popup as a valid reason for losing the focus // Don't count popup as a valid reason for losing the focus
// (example: opening the options of a select combobox shouldn't emit onblur) // (example: opening the options of a select combobox shouldn't emit onblur)
if ( TQFocusEvent::reason() != TQFocusEvent::Popup ) if ( TQT_TQFOCUSEVENT(e)->reason() != TQFocusEvent::Popup )
handleFocusOut(); handleFocusOut();
break; break;
case TQEvent::FocusIn: case TQEvent::FocusIn:
@ -662,7 +662,7 @@ bool RenderWidget::eventFilter(TQObject* /*o*/, TQEvent* e)
case TQEvent::KeyRelease: case TQEvent::KeyRelease:
// TODO this seems wrong - Qt events are not correctly translated to DOM ones, // TODO this seems wrong - Qt events are not correctly translated to DOM ones,
// like in KHTMLView::dispatchKeyEvent() // like in KHTMLView::dispatchKeyEvent()
if (element()->dispatchKeyEvent(static_cast<TQKeyEvent*>(e),false)) if (element()->dispatchKeyEvent(TQT_TQKEYEVENT(e),false))
filtered = true; filtered = true;
break; break;
@ -672,8 +672,8 @@ bool RenderWidget::eventFilter(TQObject* /*o*/, TQEvent* e)
// currently focused. this avoids accidentally changing a select box // currently focused. this avoids accidentally changing a select box
// or something while wheeling a webpage. // or something while wheeling a webpage.
if (tqApp->tqfocusWidget() != widget() && if (tqApp->tqfocusWidget() != widget() &&
widget()->focusPolicy() <= TQWidget::StrongFocus) { widget()->focusPolicy() <= TQ_StrongFocus) {
static_cast<TQWheelEvent*>(e)->ignore(); TQT_TQWHEELEVENT(e)->ignore();
TQApplication::sendEvent(view(), e); TQApplication::sendEvent(view(), e);
filtered = true; filtered = true;
} }
@ -696,22 +696,22 @@ bool RenderWidget::eventFilter(TQObject* /*o*/, TQEvent* e)
void RenderWidget::EventPropagator::sendEvent(TQEvent *e) { void RenderWidget::EventPropagator::sendEvent(TQEvent *e) {
switch(e->type()) { switch(e->type()) {
case TQEvent::MouseButtonPress: case TQEvent::MouseButtonPress:
mousePressEvent(static_cast<TQMouseEvent *>(e)); mousePressEvent(TQT_TQMOUSEEVENT(e));
break; break;
case TQEvent::MouseButtonRelease: case TQEvent::MouseButtonRelease:
mouseReleaseEvent(static_cast<TQMouseEvent *>(e)); mouseReleaseEvent(TQT_TQMOUSEEVENT(e));
break; break;
case TQEvent::MouseButtonDblClick: case TQEvent::MouseButtonDblClick:
mouseDoubleClickEvent(static_cast<TQMouseEvent *>(e)); mouseDoubleClickEvent(TQT_TQMOUSEEVENT(e));
break; break;
case TQEvent::MouseMove: case TQEvent::MouseMove:
mouseMoveEvent(static_cast<TQMouseEvent *>(e)); mouseMoveEvent(TQT_TQMOUSEEVENT(e));
break; break;
case TQEvent::KeyPress: case TQEvent::KeyPress:
keyPressEvent(static_cast<TQKeyEvent *>(e)); keyPressEvent(TQT_TQKEYEVENT(e));
break; break;
case TQEvent::KeyRelease: case TQEvent::KeyRelease:
keyReleaseEvent(static_cast<TQKeyEvent *>(e)); keyReleaseEvent(TQT_TQKEYEVENT(e));
break; break;
default: default:
break; break;
@ -721,22 +721,22 @@ void RenderWidget::EventPropagator::sendEvent(TQEvent *e) {
void RenderWidget::ScrollViewEventPropagator::sendEvent(TQEvent *e) { void RenderWidget::ScrollViewEventPropagator::sendEvent(TQEvent *e) {
switch(e->type()) { switch(e->type()) {
case TQEvent::MouseButtonPress: case TQEvent::MouseButtonPress:
viewportMousePressEvent(static_cast<TQMouseEvent *>(e)); viewportMousePressEvent(TQT_TQMOUSEEVENT(e));
break; break;
case TQEvent::MouseButtonRelease: case TQEvent::MouseButtonRelease:
viewportMouseReleaseEvent(static_cast<TQMouseEvent *>(e)); viewportMouseReleaseEvent(TQT_TQMOUSEEVENT(e));
break; break;
case TQEvent::MouseButtonDblClick: case TQEvent::MouseButtonDblClick:
viewportMouseDoubleClickEvent(static_cast<TQMouseEvent *>(e)); viewportMouseDoubleClickEvent(TQT_TQMOUSEEVENT(e));
break; break;
case TQEvent::MouseMove: case TQEvent::MouseMove:
viewportMouseMoveEvent(static_cast<TQMouseEvent *>(e)); viewportMouseMoveEvent(TQT_TQMOUSEEVENT(e));
break; break;
case TQEvent::KeyPress: case TQEvent::KeyPress:
keyPressEvent(static_cast<TQKeyEvent *>(e)); keyPressEvent(TQT_TQKEYEVENT(e));
break; break;
case TQEvent::KeyRelease: case TQEvent::KeyRelease:
keyReleaseEvent(static_cast<TQKeyEvent *>(e)); keyReleaseEvent(TQT_TQKEYEVENT(e));
break; break;
default: default:
break; break;
@ -783,13 +783,13 @@ bool RenderWidget::handleEvent(const DOM::EventImpl& ev)
} }
switch (me.button()) { switch (me.button()) {
case 0: case 0:
button = LeftButton; button = Qt::LeftButton;
break; break;
case 1: case 1:
button = MidButton; button = Qt::MidButton;
break; break;
case 2: case 2:
button = RightButton; button = Qt::RightButton;
break; break;
default: default:
break; break;
@ -810,9 +810,9 @@ bool RenderWidget::handleEvent(const DOM::EventImpl& ev)
TQMouseEvent e(type, p, button, state); TQMouseEvent e(type, p, button, state);
TQScrollView * sc = ::tqqt_cast<TQScrollView*>(m_widget); TQScrollView * sc = ::tqqt_cast<TQScrollView*>(m_widget);
if (sc && !::tqqt_cast<TQListBox*>(m_widget)) if (sc && !::tqqt_cast<TQListBox*>(m_widget))
static_cast<ScrollViewEventPropagator *>(sc)->sendEvent(&e); static_cast<ScrollViewEventPropagator *>(sc)->sendEvent(TQT_TQEVENT(&e));
else else
static_cast<EventPropagator *>(m_widget)->sendEvent(&e); static_cast<EventPropagator *>(m_widget)->sendEvent(TQT_TQEVENT(&e));
ret = e.isAccepted(); ret = e.isAccepted();
break; break;
} }
@ -826,7 +826,7 @@ bool RenderWidget::handleEvent(const DOM::EventImpl& ev)
if (domKeyEv.isSynthetic() && !acceptsSyntheticEvents()) break; if (domKeyEv.isSynthetic() && !acceptsSyntheticEvents()) break;
TQKeyEvent* const ke = domKeyEv.qKeyEvent(); TQKeyEvent* const ke = domKeyEv.qKeyEvent();
static_cast<EventPropagator *>(m_widget)->sendEvent(ke); static_cast<EventPropagator *>(m_widget)->sendEvent(TQT_TQEVENT(ke));
ret = ke->isAccepted(); ret = ke->isAccepted();
break; break;
} }
@ -853,9 +853,9 @@ bool RenderWidget::handleEvent(const DOM::EventImpl& ev)
if (ke->isAutoRepeat()) { if (ke->isAutoRepeat()) {
TQKeyEvent releaseEv( TQEvent::KeyRelease, ke->key(), ke->ascii(), ke->state(), TQKeyEvent releaseEv( TQEvent::KeyRelease, ke->key(), ke->ascii(), ke->state(),
ke->text(), ke->isAutoRepeat(), ke->count() ); ke->text(), ke->isAutoRepeat(), ke->count() );
static_cast<EventPropagator *>(m_widget)->sendEvent(&releaseEv); static_cast<EventPropagator *>(m_widget)->sendEvent(TQT_TQEVENT(&releaseEv));
} }
static_cast<EventPropagator *>(m_widget)->sendEvent(ke); static_cast<EventPropagator *>(m_widget)->sendEvent(TQT_TQEVENT(ke));
ret = ke->isAccepted(); ret = ke->isAccepted();
break; break;
} }

@ -2800,7 +2800,7 @@ public:
static void addBorderStyle(TQValueList<CollapsedBorderValue>& borderStyles, CollapsedBorderValue borderValue) static void addBorderStyle(TQValueList<CollapsedBorderValue>& borderStyles, CollapsedBorderValue borderValue)
{ {
if (!borderValue.exists() || borderStyles.contains(borderValue)) if (!borderValue.exists() || borderStyles.tqcontains(borderValue))
return; return;
TQValueListIterator<CollapsedBorderValue> it = borderStyles.begin(); TQValueListIterator<CollapsedBorderValue> it = borderStyles.begin();

@ -318,10 +318,10 @@ void InlineTextBox::paintShadow(TQPainter *pt, const Font *f, int _tx, int _ty,
const int thickness = shadow->blur; const int thickness = shadow->blur;
const int w = m_width+2*thickness; const int w = m_width+2*thickness;
const int h = m_height+2*thickness; const int h = m_height+2*thickness;
const QRgb color = shadow->color.rgb(); const TQRgb color = shadow->color.rgb();
const int gray = tqGray(color); const int gray = tqGray(color);
const bool inverse = (gray < 100); const bool inverse = (gray < 100);
const QRgb bgColor = (inverse) ? tqRgb(255,255,255) : tqRgb(0,0,0); const TQRgb bgColor = (inverse) ? tqRgb(255,255,255) : tqRgb(0,0,0);
TQPixmap pixmap(w, h); TQPixmap pixmap(w, h);
pixmap.fill(bgColor); pixmap.fill(bgColor);
TQPainter p; TQPainter p;
@ -334,7 +334,7 @@ void InlineTextBox::paintShadow(TQPainter *pt, const Font *f, int _tx, int _ty,
m_reversed ? TQPainter::RTL : TQPainter::LTR); m_reversed ? TQPainter::RTL : TQPainter::LTR);
p.end(); p.end();
TQImage img = pixmap.convertToImage().convertDepth(32); TQImage img = TQT_TQIMAGE_OBJECT(pixmap.convertToImage()).convertDepth(32);
int md = thickness*thickness; // max-dist^2 int md = thickness*thickness; // max-dist^2
@ -363,7 +363,7 @@ void InlineTextBox::paintShadow(TQPainter *pt, const Font *f, int _tx, int _ty,
memset(amap, 0, h*w*(sizeof(float))); memset(amap, 0, h*w*(sizeof(float)));
for(int j=thickness; j<h-thickness; j++) { for(int j=thickness; j<h-thickness; j++) {
for(int i=thickness; i<w-thickness; i++) { for(int i=thickness; i<w-thickness; i++) {
QRgb col= img.pixel(i,j); TQRgb col= img.pixel(i,j);
if (col == bgColor) continue; if (col == bgColor) continue;
float g = tqGray(col); float g = tqGray(col);
if (inverse) if (inverse)
@ -642,7 +642,7 @@ int InlineTextBoxArray::compareItems( Item d1, Item d2 )
return static_cast<InlineTextBox*>(d1)->m_y - static_cast<InlineTextBox*>(d2)->m_y; return static_cast<InlineTextBox*>(d1)->m_y - static_cast<InlineTextBox*>(d2)->m_y;
} }
// remove this once QVector::bsearch is fixed // remove this once TQVector::bsearch is fixed
int InlineTextBoxArray::findFirstMatching(Item d) const int InlineTextBoxArray::findFirstMatching(Item d) const
{ {
int len = count(); int len = count();
@ -729,7 +729,7 @@ RenderText::~RenderText()
void RenderText::deleteInlineBoxes(RenderArena* arena) void RenderText::deleteInlineBoxes(RenderArena* arena)
{ {
// this is a slight variant of QArray::clear(). // this is a slight variant of TQArray::clear().
// We don't delete the array itself here because its // We don't delete the array itself here because its
// likely to be used in the same size later again, saves // likely to be used in the same size later again, saves
// us resize() calls // us resize() calls

@ -136,7 +136,7 @@ public:
bool m_reversed : 1; bool m_reversed : 1;
unsigned m_toAdd : 14; // for justified text unsigned m_toAdd : 14; // for justified text
private: private:
// this is just for QVector::bsearch. Don't use it otherwise // this is just for TQVector::bsearch. Don't use it otherwise
InlineTextBox(int _x, int _y) InlineTextBox(int _x, int _y)
:InlineBox(0) :InlineBox(0)
{ {

@ -546,8 +546,8 @@ IDTranslator<unsigned, unsigned, unsigned>::Info virtKeyToQtKeyTable[] =
{KeyEventBaseImpl::DOM_VK_RIGHT, Qt::Key_Right}, {KeyEventBaseImpl::DOM_VK_RIGHT, Qt::Key_Right},
{KeyEventBaseImpl::DOM_VK_UP, Qt::Key_Up}, {KeyEventBaseImpl::DOM_VK_UP, Qt::Key_Up},
{KeyEventBaseImpl::DOM_VK_DOWN, Qt::Key_Down}, {KeyEventBaseImpl::DOM_VK_DOWN, Qt::Key_Down},
{KeyEventBaseImpl::DOM_VK_PAGE_DOWN, Qt::Key_Next}, {KeyEventBaseImpl::DOM_VK_PAGE_DOWN, TQt::Key_Next},
{KeyEventBaseImpl::DOM_VK_PAGE_UP, Qt::Key_Prior}, {KeyEventBaseImpl::DOM_VK_PAGE_UP, TQt::Key_Prior},
{KeyEventBaseImpl::DOM_VK_F1, Qt::Key_F1}, {KeyEventBaseImpl::DOM_VK_F1, Qt::Key_F1},
{KeyEventBaseImpl::DOM_VK_F2, Qt::Key_F2}, {KeyEventBaseImpl::DOM_VK_F2, Qt::Key_F2},
{KeyEventBaseImpl::DOM_VK_F3, Qt::Key_F3}, {KeyEventBaseImpl::DOM_VK_F3, Qt::Key_F3},
@ -593,7 +593,7 @@ KeyEventBaseImpl::KeyEventBaseImpl(EventId id, bool canBubbleArg, bool cancelabl
// m_keyVal should contain the tqunicode value // m_keyVal should contain the tqunicode value
// of the pressed key if available. // of the pressed key if available.
if (m_virtKeyVal == DOM_VK_UNDEFINED && !key->text().isEmpty()) if (m_virtKeyVal == DOM_VK_UNDEFINED && !key->text().isEmpty())
m_keyVal = key->text().tqunicode()[0]; m_keyVal = TQString(key->text()).tqunicode()[0];
// key->state returns enum ButtonState, which is ShiftButton, ControlButton and AltButton or'ed together. // key->state returns enum ButtonState, which is ShiftButton, ControlButton and AltButton or'ed together.
m_modifier = key->state(); m_modifier = key->state();
@ -723,10 +723,10 @@ MAKE_TRANSLATOR(keyIdentifiersToVirtKeys, TQCString, unsigned, const char*, keyI
/** These are the modifiers we currently support */ /** These are the modifiers we currently support */
static const IDTranslator<TQCString, unsigned, const char*>::Info keyModifiersToCodeTable[] = { static const IDTranslator<TQCString, unsigned, const char*>::Info keyModifiersToCodeTable[] = {
{"Alt", Qt::AltButton}, {"Alt", TQt::AltButton},
{"Control", Qt::ControlButton}, {"Control", TQt::ControlButton},
{"Shift", Qt::ShiftButton}, {"Shift", TQt::ShiftButton},
{"Meta", Qt::MetaButton}, {"Meta", TQt::MetaButton},
{0, 0} {0, 0}
}; };
@ -842,7 +842,7 @@ bool TextEventImpl::isTextInputEvent() const
TextEventImpl::TextEventImpl(TQKeyEvent* key, DOM::AbstractViewImpl* view) : TextEventImpl::TextEventImpl(TQKeyEvent* key, DOM::AbstractViewImpl* view) :
KeyEventBaseImpl(KEYPRESS_EVENT, true, true, view, key) KeyEventBaseImpl(KEYPRESS_EVENT, true, true, view, key)
{ {
m_outputString = key->text(); m_outputString = TQString(key->text());
} }
void TextEventImpl::initTextEvent(const DOMString &typeArg, void TextEventImpl::initTextEvent(const DOMString &typeArg,

@ -317,10 +317,10 @@ public:
unsigned long virtKeyVal, unsigned long virtKeyVal,
unsigned long modifiers); unsigned long modifiers);
bool ctrlKey() const { return m_modifier & Qt::ControlButton; } bool ctrlKey() const { return m_modifier & TQt::ControlButton; }
bool shiftKey() const { return m_modifier & Qt::ShiftButton; } bool shiftKey() const { return m_modifier & TQt::ShiftButton; }
bool altKey() const { return m_modifier & Qt::AltButton; } bool altKey() const { return m_modifier & TQt::AltButton; }
bool metaKey() const { return m_modifier & Qt::MetaButton; } bool metaKey() const { return m_modifier & TQt::MetaButton; }
bool inputGenerated() const { return m_virtKeyVal == 0; } bool inputGenerated() const { return m_virtKeyVal == 0; }
unsigned long keyVal() const { return m_keyVal; } unsigned long keyVal() const { return m_keyVal; }

@ -308,7 +308,7 @@ DocumentImpl::DocumentImpl(DOMImplementationImpl *_implementation, KHTMLView *v)
if ( v ) { if ( v ) {
m_docLoader = new DocLoader(v->part(), this ); m_docLoader = new DocLoader(v->part(), this );
setPaintDevice( m_view ); setPaintDevice( TQT_TQPAINTDEVICE(m_view) );
} }
else else
m_docLoader = new DocLoader( 0, this ); m_docLoader = new DocLoader( 0, this );
@ -1231,7 +1231,7 @@ void DocumentImpl::attach()
assert(!attached()); assert(!attached());
if ( m_view ) if ( m_view )
setPaintDevice( m_view ); setPaintDevice( TQT_TQPAINTDEVICE(m_view) );
if (!m_renderArena) if (!m_renderArena)
m_renderArena.reset(new RenderArena()); m_renderArena.reset(new RenderArena());
@ -2143,7 +2143,7 @@ void DocumentImpl::recalcStyleSelector()
title = title.replace('&', "&&"); title = title.replace('&', "&&");
if ( !m_availableSheets.contains( title ) ) if ( !m_availableSheets.tqcontains( title ) )
m_availableSheets.append( title ); m_availableSheets.append( title );
} }
} }
@ -2170,7 +2170,7 @@ void DocumentImpl::recalcStyleSelector()
// or we found the sheet we selected // or we found the sheet we selected
if (sheetUsed.isEmpty() || if (sheetUsed.isEmpty() ||
(!canResetSheet && tokenizer()) || (!canResetSheet && tokenizer()) ||
m_availableSheets.contains(sheetUsed)) { m_availableSheets.tqcontains(sheetUsed)) {
break; break;
} }
@ -2710,7 +2710,7 @@ NodeListImpl::Cache* DOM::DocumentImpl::acquireCachedNodeListInfo(
if (type != NodeListImpl::UNCACHEABLE) { if (type != NodeListImpl::UNCACHEABLE) {
newInfo->ref(); //Add the cache's reference newInfo->ref(); //Add the cache's reference
m_nodeListCache.replace(key.hash(), newInfo); m_nodeListCache.tqreplace(key.hash(), newInfo);
} }
return newInfo; return newInfo;

@ -520,9 +520,9 @@ void NodeImpl::dispatchMouseEvent(TQMouseEvent *_mouse, int overrideId, int over
default: default:
break; break;
} }
bool ctrlKey = (_mouse->state() & Qt::ControlButton); bool ctrlKey = (_mouse->state() & TQt::ControlButton);
bool altKey = (_mouse->state() & Qt::AltButton); bool altKey = (_mouse->state() & TQt::AltButton);
bool shiftKey = (_mouse->state() & Qt::ShiftButton); bool shiftKey = (_mouse->state() & TQt::ShiftButton);
bool metaKey = false; // ### qt support? bool metaKey = false; // ### qt support?
EventImpl* const evt = new MouseEventImpl(evtId,true,cancelable,getDocument()->defaultView(), EventImpl* const evt = new MouseEventImpl(evtId,true,cancelable,getDocument()->defaultView(),
@ -2060,7 +2060,7 @@ bool RegisteredListenerList::stillContainsListener(const RegisteredEventListener
{ {
if (!listeners) if (!listeners)
return false; return false;
return listeners->find(listener) != listeners->end(); return listeners->tqfind(listener) != listeners->end();
} }
RegisteredListenerList::~RegisteredListenerList() { RegisteredListenerList::~RegisteredListenerList() {

@ -45,7 +45,7 @@ void DynamicDomRestyler::removeDependency(ElementImpl* subject, ElementImpl* dep
void DynamicDomRestyler::removeDependencies(ElementImpl* subject, StructuralDependencyType type) void DynamicDomRestyler::removeDependencies(ElementImpl* subject, StructuralDependencyType type)
{ {
KMultiMap<ElementImpl>::List* my_dependencies = reverse_map.tqfind(subject); KMultiMap<ElementImpl>::List* my_dependencies = reverse_map.find(subject);
if (!my_dependencies) return; if (!my_dependencies) return;
@ -60,7 +60,7 @@ void DynamicDomRestyler::removeDependencies(ElementImpl* subject, StructuralDepe
void DynamicDomRestyler::resetDependencies(ElementImpl* subject) void DynamicDomRestyler::resetDependencies(ElementImpl* subject)
{ {
KMultiMap<ElementImpl>::List* my_dependencies = reverse_map.tqfind(subject); KMultiMap<ElementImpl>::List* my_dependencies = reverse_map.find(subject);
if (!my_dependencies) return; if (!my_dependencies) return;
@ -78,7 +78,7 @@ void DynamicDomRestyler::resetDependencies(ElementImpl* subject)
void DynamicDomRestyler::restyleDepedent(ElementImpl* dependency, StructuralDependencyType type) void DynamicDomRestyler::restyleDepedent(ElementImpl* dependency, StructuralDependencyType type)
{ {
assert(type < LastStructuralDependency); assert(type < LastStructuralDependency);
KMultiMap<ElementImpl>::List* dep = dependency_map[type].tqfind(dependency); KMultiMap<ElementImpl>::List* dep = dependency_map[type].find(dependency);
if (!dep) return; if (!dep) return;

@ -281,12 +281,12 @@ khtml::Length* DOMStringImpl::toCoordsArray(int& len) const
TQString str(s, l); TQString str(s, l);
for(unsigned int i=0; i < l; i++) { for(unsigned int i=0; i < l; i++) {
TQChar cc = s[i]; TQChar cc = s[i];
if (cc > '9' || (cc < '0' && cc != '-' && cc != '*' && cc != '.')) if (cc > TQChar('9') || (cc < TQChar('0') && cc != '-' && cc != '*' && cc != '.'))
str[i] = ' '; str[i] = ' ';
} }
str = str.simplifyWhiteSpace(); str = str.simplifyWhiteSpace();
len = str.contains(' ') + 1; len = str.tqcontains(' ') + 1;
khtml::Length* r = new khtml::Length[len]; khtml::Length* r = new khtml::Length[len];
int i = 0; int i = 0;
@ -307,7 +307,7 @@ khtml::Length* DOMStringImpl::toLengthArray(int& len) const
TQString str(s, l); TQString str(s, l);
str = str.simplifyWhiteSpace(); str = str.simplifyWhiteSpace();
len = str.contains(',') + 1; len = str.tqcontains(',') + 1;
// If we have no commas, we have no array. // If we have no commas, we have no array.
if( len == 1 ) if( len == 1 )

@ -156,7 +156,7 @@ void XMLHandler::fixUpNSURI(TQString& uri, const TQString& qname)
TQXmlNamespaceSupport ns; TQXmlNamespaceSupport ns;
TQString localName, prefix; TQString localName, prefix;
ns.splitName(qname, prefix, localName); ns.splitName(qname, prefix, localName);
if (namespaceInfo.contains(prefix)) { if (namespaceInfo.tqcontains(prefix)) {
uri = namespaceInfo[prefix].top(); uri = namespaceInfo[prefix].top();
} }
} }

@ -82,10 +82,10 @@ void AutoStart::setPhaseDone()
static TQString extractName(TQString path) static TQString extractName(TQString path)
{ {
int i = path.findRev('/'); int i = path.tqfindRev('/');
if (i >= 0) if (i >= 0)
path = path.mid(i+1); path = path.mid(i+1);
i = path.findRev('.'); i = path.tqfindRev('.');
if (i >= 0) if (i >= 0)
path = path.left(i); path = path.left(i);
return path; return path;
@ -141,14 +141,14 @@ AutoStart::loadAutoStartList()
// Same local file name? // Same local file name?
TQString localOuter; TQString localOuter;
TQString localInner; TQString localInner;
int slashPos = (*it).findRev( '/', -1, TRUE ); int slashPos = (*it).tqfindRev( '/', -1, TRUE );
if (slashPos == -1) { if (slashPos == -1) {
localOuter = (*it); localOuter = (*it);
} }
else { else {
localOuter = (*it).mid(slashPos+1); localOuter = (*it).mid(slashPos+1);
} }
slashPos = (*localit).findRev( '/', -1, TRUE ); slashPos = (*localit).tqfindRev( '/', -1, TRUE );
if (slashPos == -1) { if (slashPos == -1) {
localInner = (*localit); localInner = (*localit);
} }
@ -172,23 +172,23 @@ AutoStart::loadAutoStartList()
if (config.hasKey("OnlyShowIn")) if (config.hasKey("OnlyShowIn"))
{ {
if (!config.readListEntry("OnlyShowIn", ';').contains("KDE")) if (!config.readListEntry("OnlyShowIn", ';').tqcontains("KDE"))
continue; continue;
} }
if (config.hasKey("NotShowIn")) if (config.hasKey("NotShowIn"))
{ {
if (config.readListEntry("NotShowIn", ';').contains("KDE")) if (config.readListEntry("NotShowIn", ';').tqcontains("KDE"))
continue; continue;
} }
if (config.hasKey("OnlyShowIn")) if (config.hasKey("OnlyShowIn"))
{ {
if (!config.readListEntry("OnlyShowIn", ';').contains("KDE")) if (!config.readListEntry("OnlyShowIn", ';').tqcontains("KDE"))
continue; continue;
} }
if (config.hasKey("NotShowIn")) if (config.hasKey("NotShowIn"))
{ {
if (config.readListEntry("NotShowIn", ';').contains("KDE")) if (config.readListEntry("NotShowIn", ';').tqcontains("KDE"))
continue; continue;
} }
@ -212,7 +212,7 @@ AutoStart::loadAutoStartList()
} }
} }
QString TQString
AutoStart::startService() AutoStart::startService()
{ {
if (m_startList->isEmpty()) if (m_startList->isEmpty())

@ -105,9 +105,9 @@ int main()
{ {
TQString key = it.key(); TQString key = it.key();
TQString value = *it; TQString value = *it;
startupconfig << file.replace( ' ', '_' ).lower() startupconfig << TQString(file.replace( ' ', '_' )).lower()
<< "_" << group.replace( ' ', '_' ).lower() << "_" << TQString(group.replace( ' ', '_' )).lower()
<< "_" << key.replace( ' ', '_' ).lower() << "_" << TQString(key.replace( ' ', '_' )).lower()
<< "=\"" << value.replace( "\"", "\\\"" ) << "\"\n"; << "=\"" << value.replace( "\"", "\\\"" ) << "\"\n";
} }
} }
@ -119,9 +119,9 @@ int main()
cfg.setGroup( group ); cfg.setGroup( group );
TQString value = cfg.readEntry( key, def ); TQString value = cfg.readEntry( key, def );
startupconfig << "# " << line << "\n"; startupconfig << "# " << line << "\n";
startupconfig << file.replace( ' ', '_' ).lower() startupconfig << TQString(file.replace( ' ', '_' )).lower()
<< "_" << group.replace( ' ', '_' ).lower() << "_" << TQString(group.replace( ' ', '_' )).lower()
<< "_" << key.replace( ' ', '_' ).lower() << "_" <<TQString( key.replace( ' ', '_' )).lower()
<< "=\"" << value.replace( "\"", "\\\"" ) << "\"\n"; << "=\"" << value.replace( "\"", "\\\"" ) << "\"\n";
} }
startupconfigfiles << line << endl; startupconfigfiles << line << endl;

@ -370,7 +370,7 @@ TQCString execpath_avoid_loops( const TQCString& exec, int envc, const char* env
s_instance->dirs()->findExe( exec, paths.join( TQString( ":" )))); s_instance->dirs()->findExe( exec, paths.join( TQString( ":" ))));
if( avoid_loops && !execpath.isEmpty()) if( avoid_loops && !execpath.isEmpty())
{ {
int pos = execpath.findRev( '/' ); int pos = execpath.tqfindRev( '/' );
TQString bin_path = execpath.left( pos ); TQString bin_path = execpath.left( pos );
for( TQStringList::Iterator it = paths.begin(); for( TQStringList::Iterator it = paths.begin();
it != paths.end(); it != paths.end();
@ -456,7 +456,7 @@ static pid_t launch(int argc, const char *_name, const char *args,
{ {
lib = _name; lib = _name;
name = _name; name = _name;
name = name.mid( name.findRev('/') + 1); name = name.mid( name.tqfindRev('/') + 1);
exec = _name; exec = _name;
if (lib.right(3) == ".la") if (lib.right(3) == ".la")
libpath = lib; libpath = lib;
@ -645,7 +645,7 @@ static pid_t launch(int argc, const char *_name, const char *args,
{ {
const char * ltdlError = lt_dlerror(); const char * ltdlError = lt_dlerror();
fprintf(stderr, "Could not find kdemain: %s\n", ltdlError != 0 ? ltdlError : "(null)" ); fprintf(stderr, "Could not find kdemain: %s\n", ltdlError != 0 ? ltdlError : "(null)" );
TQString errorMsg = i18n("Could not find 'kdemain' in '%1'.\n%2").arg(libpath) TQString errorMsg = i18n("Could not find 'kdemain' in '%1'.\n%2").arg(TQString(libpath))
.arg(ltdlError ? TQFile::decodeName(ltdlError) : i18n("Unknown error")); .arg(ltdlError ? TQFile::decodeName(ltdlError) : i18n("Unknown error"));
exitWithErrorMsg(errorMsg); exitWithErrorMsg(errorMsg);
} }
@ -1477,16 +1477,16 @@ static void kdeinit_library_path()
it++) it++)
{ {
TQString d = *it; TQString d = *it;
if (ltdl_library_path.contains(d)) if (ltdl_library_path.tqcontains(d))
continue; continue;
if (ld_library_path.contains(d)) if (ld_library_path.tqcontains(d))
continue; continue;
if (d[d.length()-1] == '/') if (d[d.length()-1] == '/')
{ {
d.truncate(d.length()-1); d.truncate(d.length()-1);
if (ltdl_library_path.contains(d)) if (ltdl_library_path.tqcontains(d))
continue; continue;
if (ld_library_path.contains(d)) if (ld_library_path.tqcontains(d))
continue; continue;
} }
if ((d == "/lib") || (d == "/usr/lib")) if ((d == "/lib") || (d == "/usr/lib"))
@ -1517,10 +1517,10 @@ static void kdeinit_library_path()
exit(255); exit(255);
} }
int i; int i;
if((i = display.findRev('.')) > display.findRev(':') && i >= 0) if((i = display.tqfindRev('.')) > display.tqfindRev(':') && i >= 0)
display.truncate(i); display.truncate(i);
TQCString socketName = TQFile::encodeName(locateLocal("socket", TQString("kdeinit-%1").arg(display), s_instance)); TQCString socketName = TQFile::encodeName(locateLocal("socket", TQString("kdeinit-%1").arg(TQString(display)), s_instance));
if (socketName.length() >= MAX_SOCK_FILE) if (socketName.length() >= MAX_SOCK_FILE)
{ {
fprintf(stderr, "kdeinit: Aborting. Socket name will be too long:\n"); fprintf(stderr, "kdeinit: Aborting. Socket name will be too long:\n");
@ -1530,7 +1530,7 @@ static void kdeinit_library_path()
strcpy(sock_file_old, socketName.data()); strcpy(sock_file_old, socketName.data());
display.replace(":","_"); display.replace(":","_");
socketName = TQFile::encodeName(locateLocal("socket", TQString("kdeinit_%1").arg(display), s_instance)); socketName = TQFile::encodeName(locateLocal("socket", TQString("kdeinit_%1").arg(TQString(display)), s_instance));
if (socketName.length() >= MAX_SOCK_FILE) if (socketName.length() >= MAX_SOCK_FILE)
{ {
fprintf(stderr, "kdeinit: Aborting. Socket name will be too long:\n"); fprintf(stderr, "kdeinit: Aborting. Socket name will be too long:\n");

@ -193,7 +193,7 @@ KLauncher::KLauncher(int _kdeinitSocket, bool new_startup)
domainname.close(); domainname.close();
domainname.unlink(); domainname.unlink();
#endif #endif
mPoolSocket = new KServerSocket(TQFile::encodeName(mPoolSocketName)); mPoolSocket = new KServerSocket(static_cast<const char*>(TQFile::encodeName(mPoolSocketName)));
connect(mPoolSocket, TQT_SIGNAL(accepted( KSocket *)), connect(mPoolSocket, TQT_SIGNAL(accepted( KSocket *)),
TQT_SLOT(acceptSlave(KSocket *))); TQT_SLOT(acceptSlave(KSocket *)));
@ -740,7 +740,7 @@ KLauncher::requestDone(KLaunchRequest *request)
{ {
DCOPresult.result = 1; DCOPresult.result = 1;
DCOPresult.dcopName = ""; DCOPresult.dcopName = "";
DCOPresult.error = i18n("KDEInit could not launch '%1'.").arg(request->name); DCOPresult.error = i18n("KDEInit could not launch '%1'.").arg(TQString(request->name));
if (!request->errorMsg.isEmpty()) if (!request->errorMsg.isEmpty())
DCOPresult.error += ":\n" + request->errorMsg; DCOPresult.error += ":\n" + request->errorMsg;
DCOPresult.pid = 0; DCOPresult.pid = 0;
@ -892,7 +892,7 @@ KLauncher::exec_blind( const TQCString &name, const TQValueList<TQCString> &arg_
request->transaction = 0; // No confirmation is send request->transaction = 0; // No confirmation is send
request->envs = envs; request->envs = envs;
// Find service, if any - strip path if needed // Find service, if any - strip path if needed
KService::Ptr service = KService::serviceByDesktopName( name.mid( name.findRev( '/' ) + 1 )); KService::Ptr service = KService::serviceByDesktopName( name.mid( name.tqfindRev( '/' ) + 1 ));
if (service != NULL) if (service != NULL)
send_service_startup_info( request, service, send_service_startup_info( request, service,
startup_id, TQValueList< TQCString >()); startup_id, TQValueList< TQCString >());
@ -1164,7 +1164,7 @@ KLauncher::kdeinit_exec(const TQString &app, const TQStringList &args,
if( app != "kbuildsycoca" ) // avoid stupid loop if( app != "kbuildsycoca" ) // avoid stupid loop
{ {
// Find service, if any - strip path if needed // Find service, if any - strip path if needed
KService::Ptr service = KService::serviceByDesktopName( app.mid( app.findRev( '/' ) + 1 )); KService::Ptr service = KService::serviceByDesktopName( app.mid( app.tqfindRev( '/' ) + 1 ));
if (service != NULL) if (service != NULL)
send_service_startup_info( request, service, send_service_startup_info( request, service,
startup_id, TQValueList< TQCString >()); startup_id, TQValueList< TQCString >());
@ -1331,7 +1331,7 @@ KLauncher::requestSlave(const TQString &protocol,
requestDone(request); requestDone(request);
if (!pid) if (!pid)
{ {
error = i18n("Error loading '%1'.\n").arg(name); error = i18n("Error loading '%1'.\n").arg(TQString(name));
} }
return pid; return pid;
} }

@ -118,7 +118,7 @@ DockContainer::~DockContainer()
while (m_map.count()) { while (m_map.count()) {
it = m_map.begin(); it = m_map.begin();
KDockWidget *w=it.key(); KDockWidget *w=it.key();
if (m_overlapButtons.contains(w)) { if (m_overlapButtons.tqcontains(w)) {
(static_cast<KDockWidgetHeader*>(w->getHeader()->tqqt_cast("KDockWidgetHeader")))->removeButton(m_overlapButtons[w]); (static_cast<KDockWidgetHeader*>(w->getHeader()->tqqt_cast("KDockWidgetHeader")))->removeButton(m_overlapButtons[w]);
m_overlapButtons.remove(w); m_overlapButtons.remove(w);
} }
@ -149,7 +149,7 @@ void DockContainer::init()
if ( parentDockWidget() && parentDockWidget()->parent() ) if ( parentDockWidget() && parentDockWidget()->parent() )
{ {
KDockSplitter *sp= static_cast<KDockSplitter*>(parentDockWidget()-> KDockSplitter *sp= static_cast<KDockSplitter*>(parentDockWidget()->
parent()->tqqt_cast("KDockSplitter")); tqparent()->tqqt_cast("KDockSplitter"));
if ( sp ) if ( sp )
sp->setSeparatorPosX( m_separatorPos ); sp->setSeparatorPosX( m_separatorPos );
} }
@ -164,7 +164,7 @@ void DockContainer::insertWidget (KDockWidget *dwdg, TQPixmap pixmap, const TQSt
{ {
KDockWidget* w = (KDockWidget*) dwdg; KDockWidget* w = (KDockWidget*) dwdg;
int tab; int tab;
bool alreadyThere=m_map.contains(w); bool alreadyThere=m_map.tqcontains(w);
if (alreadyThere) if (alreadyThere)
{ {
@ -234,7 +234,7 @@ void DockContainer::insertWidget (KDockWidget *dwdg, TQPixmap pixmap, const TQSt
bool DockContainer::eventFilter( TQObject *obj, TQEvent *event ) bool DockContainer::eventFilter( TQObject *obj, TQEvent *event )
{ {
if (obj==m_tb) { if (TQT_BASE_OBJECT(obj)==TQT_BASE_OBJECT(m_tb)) {
if ( (event->type()==TQEvent::Resize) && (m_ws->isHidden()) ) { if ( (event->type()==TQEvent::Resize) && (m_ws->isHidden()) ) {
TQSize size=((TQResizeEvent*)event)->size(); TQSize size=((TQResizeEvent*)event)->size();
if (m_vertical) if (m_vertical)
@ -263,7 +263,7 @@ bool DockContainer::eventFilter( TQObject *obj, TQEvent *event )
break; break;
} }
m_dockManager=w->dockManager(); m_dockManager=w->dockManager();
m_dragPanel=hdr->dragPanel(); m_dragPanel=TQT_TQOBJECT(hdr->dragPanel());
if (m_dragPanel) m_movingState=WaitingForMoveStart; if (m_dragPanel) m_movingState=WaitingForMoveStart;
delete m_startEvent; delete m_startEvent;
m_startEvent=new TQMouseEvent(* ((TQMouseEvent*)event)); m_startEvent=new TQMouseEvent(* ((TQMouseEvent*)event));
@ -281,7 +281,7 @@ bool DockContainer::eventFilter( TQObject *obj, TQEvent *event )
if (m_movingState==WaitingForMoveStart) { if (m_movingState==WaitingForMoveStart) {
TQPoint p( ((TQMouseEvent*)event)->pos() - m_startEvent->pos() ); TQPoint p( ((TQMouseEvent*)event)->pos() - m_startEvent->pos() );
if( p.manhattanLength() > KGlobalSettings::dndEventDelay()) { if( p.manhattanLength() > KGlobalSettings::dndEventDelay()) {
m_dockManager->eventFilter(m_dragPanel,m_startEvent); m_dockManager->eventFilter(m_dragPanel,TQT_TQEVENT(m_startEvent));
m_dockManager->eventFilter(m_dragPanel,event); m_dockManager->eventFilter(m_dragPanel,event);
m_movingState=Moving; m_movingState=Moving;
} }
@ -298,7 +298,7 @@ bool DockContainer::eventFilter( TQObject *obj, TQEvent *event )
} }
void DockContainer::showWidget(KDockWidget *w) { void DockContainer::showWidget(KDockWidget *w) {
if (!m_map.contains(w)) return; if (!m_map.tqcontains(w)) return;
kdDebug()<<"KMDI::DockContainer::<showWidget"<<endl; kdDebug()<<"KMDI::DockContainer::<showWidget"<<endl;
int id=m_map[w]; int id=m_map[w];
@ -343,7 +343,7 @@ void DockContainer::hideIfNeeded() {
void DockContainer::removeWidget(KDockWidget* dwdg) void DockContainer::removeWidget(KDockWidget* dwdg)
{ {
KDockWidget* w = (KDockWidget*) dwdg; KDockWidget* w = (KDockWidget*) dwdg;
if (!m_map.contains(w)) return; if (!m_map.tqcontains(w)) return;
int id=m_map[w]; int id=m_map[w];
if (m_tb->isTabRaised(id)) { if (m_tb->isTabRaised(id)) {
//why do we hide the tab if we're just going //why do we hide the tab if we're just going
@ -356,7 +356,7 @@ void DockContainer::removeWidget(KDockWidget* dwdg)
m_ws->removeWidget(w); m_ws->removeWidget(w);
m_map.remove(w); m_map.remove(w);
m_revMap.remove(id); m_revMap.remove(id);
if (m_overlapButtons.contains(w)) { if (m_overlapButtons.tqcontains(w)) {
(static_cast<KDockWidgetHeader*>(w->getHeader()->tqqt_cast("KDockWidgetHeader")))->removeButton(m_overlapButtons[w]); (static_cast<KDockWidgetHeader*>(w->getHeader()->tqqt_cast("KDockWidgetHeader")))->removeButton(m_overlapButtons[w]);
m_overlapButtons.remove(w); m_overlapButtons.remove(w);
} }
@ -372,7 +372,7 @@ void DockContainer::undockWidget(KDockWidget *dwdg)
{ {
KDockWidget* w = (KDockWidget*) dwdg; KDockWidget* w = (KDockWidget*) dwdg;
if (!m_map.contains(w)) if (!m_map.tqcontains(w))
return; return;
int id=m_map[w]; int id=m_map[w];
@ -423,7 +423,7 @@ void DockContainer::tabClicked(int t)
if ( parentDockWidget() && parentDockWidget()->parent() ) if ( parentDockWidget() && parentDockWidget()->parent() )
{ {
KDockSplitter *sp= static_cast<KDockSplitter*>(parentDockWidget()-> KDockSplitter *sp= static_cast<KDockSplitter*>(parentDockWidget()->
parent()->tqqt_cast("KDockSplitter")); tqparent()->tqqt_cast("KDockSplitter"));
if ( sp ) if ( sp )
m_separatorPos = sp->separatorPos(); m_separatorPos = sp->separatorPos();
} }
@ -466,8 +466,8 @@ void DockContainer::save(KConfig* cfg,const TQString& group_or_prefix)
{ {
// group name // group name
TQString grp=cfg->group(); TQString grp=cfg->group();
cfg->deleteGroup(group_or_prefix+TQString("::%1").arg(parent()->name())); cfg->deleteGroup(group_or_prefix+TQString("::%1").arg(tqparent()->name()));
cfg->setGroup(group_or_prefix+TQString("::%1").arg(parent()->name())); cfg->setGroup(group_or_prefix+TQString("::%1").arg(tqparent()->name()));
// save overlap mode // save overlap mode
cfg->writeEntry("overlapMode",isOverlapMode()); cfg->writeEntry("overlapMode",isOverlapMode());
@ -476,7 +476,7 @@ void DockContainer::save(KConfig* cfg,const TQString& group_or_prefix)
if ( parentDockWidget() && parentDockWidget()->parent() ) if ( parentDockWidget() && parentDockWidget()->parent() )
{ {
KDockSplitter *sp= static_cast<KDockSplitter*>(parentDockWidget()-> KDockSplitter *sp= static_cast<KDockSplitter*>(parentDockWidget()->
parent()->tqqt_cast("KDockSplitter")); tqparent()->tqqt_cast("KDockSplitter"));
if ( sp ) if ( sp )
cfg->writeEntry( "separatorPosition", m_separatorPos ); cfg->writeEntry( "separatorPosition", m_separatorPos );
} }
@ -509,7 +509,7 @@ void DockContainer::save(KConfig* cfg,const TQString& group_or_prefix)
void DockContainer::load(KConfig* cfg,const TQString& group_or_prefix) void DockContainer::load(KConfig* cfg,const TQString& group_or_prefix)
{ {
TQString grp=cfg->group(); TQString grp=cfg->group();
cfg->setGroup(group_or_prefix+TQString("::%1").arg(parent()->name())); cfg->setGroup(group_or_prefix+TQString("::%1").arg(tqparent()->name()));
if (cfg->readBoolEntry("overlapMode")) if (cfg->readBoolEntry("overlapMode"))
activateOverlapMode( m_vertical?m_tb->width():m_tb->height() ); activateOverlapMode( m_vertical?m_tb->width():m_tb->height() );
@ -631,7 +631,7 @@ void DockContainer::toggle() {
void DockContainer::prevToolView() { void DockContainer::prevToolView() {
TQPtrList<KMultiTabBarTab>* tabs=m_tb->tabs(); TQPtrList<KMultiTabBarTab>* tabs=m_tb->tabs();
int pos=tabs->findRef(m_tb->tab(oldtab)); int pos=tabs->tqfindRef(m_tb->tab(oldtab));
if (pos==-1) return; if (pos==-1) return;
pos--; pos--;
if (pos<0) pos=tabs->count()-1; if (pos<0) pos=tabs->count()-1;
@ -643,7 +643,7 @@ void DockContainer::prevToolView() {
void DockContainer::nextToolView() { void DockContainer::nextToolView() {
TQPtrList<KMultiTabBarTab>* tabs=m_tb->tabs(); TQPtrList<KMultiTabBarTab>* tabs=m_tb->tabs();
int pos=tabs->findRef(m_tb->tab(oldtab)); int pos=tabs->tqfindRef(m_tb->tab(oldtab));
if (pos==-1) return; if (pos==-1) return;
pos++; pos++;
if (pos>=(int)tabs->count()) pos=0; if (pos>=(int)tabs->count()) pos=0;

@ -88,9 +88,9 @@ GUIClient::GUIClient (KMDI::MainWindow* mdiMainFrm,const char* name)
m_gotoToolDockMenu->insert(new KAction(i18n("Switch Bottom Dock"),ALT+CTRL+SHIFT+Key_B,this,TQT_SIGNAL(toggleBottom()), m_gotoToolDockMenu->insert(new KAction(i18n("Switch Bottom Dock"),ALT+CTRL+SHIFT+Key_B,this,TQT_SIGNAL(toggleBottom()),
actionCollection(),"kmdi_activate_bottom")); actionCollection(),"kmdi_activate_bottom"));
m_gotoToolDockMenu->insert(new KActionSeparator(actionCollection(),"kmdi_goto_menu_separator")); m_gotoToolDockMenu->insert(new KActionSeparator(actionCollection(),"kmdi_goto_menu_separator"));
m_gotoToolDockMenu->insert(new KAction(i18n("Previous Tool View"),ALT+CTRL+Key_Left,m_mdiMainFrm,TQT_SLOT(prevToolViewInDock()), m_gotoToolDockMenu->insert(new KAction(i18n("Previous Tool View"),ALT+CTRL+Key_Left,TQT_TQOBJECT(m_mdiMainFrm),TQT_SLOT(prevToolViewInDock()),
actionCollection(),"kmdi_prev_toolview")); actionCollection(),"kmdi_prev_toolview"));
m_gotoToolDockMenu->insert(new KAction(i18n("Next Tool View"),ALT+CTRL+Key_Right,m_mdiMainFrm,TQT_SLOT(nextToolViewInDock()), m_gotoToolDockMenu->insert(new KAction(i18n("Next Tool View"),ALT+CTRL+Key_Right,TQT_TQOBJECT(m_mdiMainFrm),TQT_SLOT(nextToolViewInDock()),
actionCollection(),"kmdi_next_toolview")); actionCollection(),"kmdi_next_toolview"));
actionCollection()->readShortcutSettings( "Shortcuts", kapp->config() ); actionCollection()->readShortcutSettings( "Shortcuts", kapp->config() );
@ -149,7 +149,7 @@ void GUIClient::addToolView(KMDI::ToolViewAccessor* mtva)
/*TQString::null*/sc,dynamic_cast<KDockWidget*>(mtva->wrapperWidget()), /*TQString::null*/sc,dynamic_cast<KDockWidget*>(mtva->wrapperWidget()),
m_mdiMainFrm,actionCollection(), aname.latin1() ); m_mdiMainFrm,actionCollection(), aname.latin1() );
((ToggleToolViewAction*)a)->setCheckedState(i18n("Hide %1").arg(mtva->wrappedWidget()->caption())); ((ToggleToolViewAction*)a)->setCheckedState(TQString(i18n("Hide %1").arg(mtva->wrappedWidget()->caption())));
connect(a,TQT_SIGNAL(destroyed(TQObject*)),this,TQT_SLOT(actionDeleted(TQObject*))); connect(a,TQT_SIGNAL(destroyed(TQObject*)),this,TQT_SLOT(actionDeleted(TQObject*)));
@ -202,7 +202,7 @@ void ToggleToolViewAction::anDWChanged()
setChecked(true); setChecked(true);
else if (isChecked() && (m_dw->parentDockTabGroup() && else if (isChecked() && (m_dw->parentDockTabGroup() &&
((static_cast<KDockWidget*>(m_dw->parentDockTabGroup()-> ((static_cast<KDockWidget*>(m_dw->parentDockTabGroup()->
parent()->tqqt_cast("KDockWidget")))->mayBeShow()))) tqparent()->tqqt_cast("KDockWidget")))->mayBeShow())))
setChecked(false); setChecked(false);
} }

@ -280,7 +280,7 @@ KMDI::ToolViewAccessor *MainWindow::addToolWindow( TQWidget* pWnd, KDockWidget::
if (pos == KDockWidget::DockNone) { if (pos == KDockWidget::DockNone) {
mtva->d->widgetContainer->setEnableDocking(KDockWidget::DockNone); mtva->d->widgetContainer->setEnableDocking(KDockWidget::DockNone);
mtva->d->widgetContainer->reparent(this, Qt::WType_TopLevel | Qt::WType_Dialog, r.topLeft(), isVisible()); mtva->d->widgetContainer->reparent(this, (WFlags)(WType_TopLevel | WType_Dialog), r.topLeft(), isVisible());
} else { // add (and dock) the toolview as DockWidget view } else { // add (and dock) the toolview as DockWidget view
//const TQPixmap& wndIcon = pWnd->icon() ? *(pWnd->icon()) : TQPixmap(); //const TQPixmap& wndIcon = pWnd->icon() ? *(pWnd->icon()) : TQPixmap();
@ -302,7 +302,7 @@ void MainWindow::deleteToolWindow( TQWidget* pWnd)
if (!pWnd) if (!pWnd)
return; return;
if (m_toolViews->contains(pWnd)) { if (m_toolViews->tqcontains(pWnd)) {
deleteToolWindow((*m_toolViews)[pWnd]); deleteToolWindow((*m_toolViews)[pWnd]);
} }
} }

@ -89,7 +89,7 @@ bool TabWidget::eventFilter(TQObject *obj, TQEvent *e )
{ {
// if we lost a child we uninstall ourself as event filter for the lost // if we lost a child we uninstall ourself as event filter for the lost
// child and its children // child and its children
TQObject* pLostChild = ((TQChildEvent*)e)->child(); TQObject* pLostChild = TQT_TQOBJECT(((TQChildEvent*)e)->child());
if ((pLostChild != 0L) && (pLostChild->isWidgetType())) { if ((pLostChild != 0L) && (pLostChild->isWidgetType())) {
TQObjectList *list = pLostChild->queryList( "TQWidget" ); TQObjectList *list = pLostChild->queryList( "TQWidget" );
list->insert(0, pLostChild); // add the lost child to the list too, just to save code list->insert(0, pLostChild); // add the lost child to the list too, just to save code
@ -108,11 +108,11 @@ bool TabWidget::eventFilter(TQObject *obj, TQEvent *e )
// if we got a new child and we are attached to the MDI system we // if we got a new child and we are attached to the MDI system we
// install ourself as event filter for the new child and its children // install ourself as event filter for the new child and its children
// (as we did when we were added to the MDI system). // (as we did when we were added to the MDI system).
TQObject* pNewChild = ((TQChildEvent*)e)->child(); TQObject* pNewChild = TQT_TQOBJECT(((TQChildEvent*)e)->child());
if ((pNewChild != 0L) && (pNewChild->isWidgetType())) if ((pNewChild != 0L) && (pNewChild->isWidgetType()))
{ {
TQWidget* pNewWidget = (TQWidget*)pNewChild; TQWidget* pNewWidget = (TQWidget*)pNewChild;
if (pNewWidget->testWFlags(Qt::WType_Dialog | Qt::WShowModal)) if (pNewWidget->testWFlags((WFlags)(WType_Dialog | WShowModal)))
return false; return false;
TQObjectList *list = pNewWidget->queryList( "TQWidget" ); TQObjectList *list = pNewWidget->queryList( "TQWidget" );
list->insert(0, pNewChild); // add the new child to the list too, just to save code list->insert(0, pNewChild); // add the new child to the list too, just to save code
@ -135,7 +135,7 @@ void TabWidget::childDestroyed()
{ {
// if we lost a child we uninstall ourself as event filter for the lost // if we lost a child we uninstall ourself as event filter for the lost
// child and its children // child and its children
const TQObject* pLostChild = TQObject::sender(); const TQObject* pLostChild = TQT_TQOBJECT_CONST(sender());
if ((pLostChild != 0L) && (pLostChild->isWidgetType())) if ((pLostChild != 0L) && (pLostChild->isWidgetType()))
{ {
TQObjectList *list = ((TQObject*)(pLostChild))->queryList("TQWidget"); TQObjectList *list = ((TQObject*)(pLostChild))->queryList("TQWidget");
@ -253,18 +253,18 @@ void TabWidget::maybeShow()
void TabWidget::setCornerWidgetVisibility(bool visible) { void TabWidget::setCornerWidgetVisibility(bool visible) {
// there are two corner widgets: on TopLeft and on TopTight! // there are two corner widgets: on TopLeft and on TopTight!
if (cornerWidget(Qt::TopLeft) ) { if (cornerWidget(TQt::TopLeft) ) {
if (visible) if (visible)
cornerWidget(Qt::TopLeft)->show(); cornerWidget(TQt::TopLeft)->show();
else else
cornerWidget(Qt::TopLeft)->hide(); cornerWidget(TQt::TopLeft)->hide();
} }
if (cornerWidget(Qt::TopRight) ) { if (cornerWidget(TQt::TopRight) ) {
if (visible) if (visible)
cornerWidget(Qt::TopRight)->show(); cornerWidget(TQt::TopRight)->show();
else else
cornerWidget(Qt::TopRight)->hide(); cornerWidget(TQt::TopRight)->hide();
} }
} }

@ -158,7 +158,7 @@ void ToolViewAccessor::place(KDockWidget::DockPosition pos, TQWidget* pTargetWnd
if (!d->widgetContainer) return; if (!d->widgetContainer) return;
if (pos == KDockWidget::DockNone) { if (pos == KDockWidget::DockNone) {
d->widgetContainer->setEnableDocking(KDockWidget::DockNone); d->widgetContainer->setEnableDocking(KDockWidget::DockNone);
d->widgetContainer->reparent(mdiMainFrm, Qt::WType_TopLevel | Qt::WType_Dialog, TQPoint(0,0), mdiMainFrm->isVisible()); d->widgetContainer->reparent(mdiMainFrm, (WFlags)(WType_TopLevel | WType_Dialog), TQPoint(0,0), mdiMainFrm->isVisible());
} }
else { // add (and dock) the toolview as DockWidget view else { // add (and dock) the toolview as DockWidget view

@ -58,7 +58,7 @@ KMdiChildArea::KMdiChildArea( TQWidget *parent )
m_captionInactiveForeColor = KGlobalSettings::inactiveTextColor(); m_captionInactiveForeColor = KGlobalSettings::inactiveTextColor();
m_pZ = new TQPtrList<KMdiChildFrm>; m_pZ = new TQPtrList<KMdiChildFrm>;
m_pZ->setAutoDelete( true ); m_pZ->setAutoDelete( true );
setFocusPolicy( ClickFocus ); setFocusPolicy( TQ_ClickFocus );
m_defaultChildFrmSize = TQSize( 400, 300 ); m_defaultChildFrmSize = TQSize( 400, 300 );
} }
@ -75,11 +75,11 @@ void KMdiChildArea::manageChild( KMdiChildFrm* child, bool show, bool cascade )
KMdiChildFrm* top = topChild(); KMdiChildFrm* top = topChild();
//remove old references. There can be more than one so we remove them all //remove old references. There can be more than one so we remove them all
if ( m_pZ->findRef( child ) != -1 ) if ( m_pZ->tqfindRef( child ) != -1 )
{ {
//TQPtrList::find* moves current() to the found item //TQPtrList::find* moves current() to the found item
m_pZ->take(); m_pZ->take();
while ( m_pZ->findNextRef( child ) != -1 ) while ( m_pZ->tqfindNextRef( child ) != -1 )
m_pZ->take(); m_pZ->take();
} }
@ -112,7 +112,7 @@ void KMdiChildArea::destroyChild( KMdiChildFrm *child, bool focusTop )
bool wasMaximized = ( child->state() == KMdiChildFrm::Maximized ); bool wasMaximized = ( child->state() == KMdiChildFrm::Maximized );
// destroy the old one // destroy the old one
TQObject::disconnect( child ); disconnect( child );
child->blockSignals( true ); child->blockSignals( true );
m_pZ->setAutoDelete( false ); m_pZ->setAutoDelete( false );
m_pZ->removeRef( child ); m_pZ->removeRef( child );
@ -144,7 +144,7 @@ void KMdiChildArea::destroyChildButNotItsView( KMdiChildFrm* child, bool focusTo
bool wasMaximized = ( child->state() == KMdiChildFrm::Maximized ); bool wasMaximized = ( child->state() == KMdiChildFrm::Maximized );
// destroy the old one // destroy the old one
TQObject::disconnect( child ); disconnect( child );
child->unsetClient(); child->unsetClient();
m_pZ->setAutoDelete( false ); m_pZ->setAutoDelete( false );
m_pZ->removeRef( child ); m_pZ->removeRef( child );
@ -218,8 +218,12 @@ void KMdiChildArea::setTopChild( KMdiChildFrm* child, bool /* bSetFocus */ )
else else
child->raise(); child->raise();
#ifdef USE_QT4
child->m_pClient->setFocus();
#else // USE_QT4
TQFocusEvent::setReason( TQFocusEvent::Other ); TQFocusEvent::setReason( TQFocusEvent::Other );
child->m_pClient->setFocus(); child->m_pClient->setFocus();
#endif // USE_QT4
} }
} }
@ -249,7 +253,7 @@ void KMdiChildArea::resizeEvent( TQResizeEvent* e )
void KMdiChildArea::mousePressEvent( TQMouseEvent *e ) void KMdiChildArea::mousePressEvent( TQMouseEvent *e )
{ {
//Popup the window menu //Popup the window menu
if ( e->button() & RightButton ) if ( e->button() & Qt::RightButton )
emit popupWindowMenu( mapToGlobal( e->pos() ) ); emit popupWindowMenu( mapToGlobal( e->pos() ) );
} }
@ -319,7 +323,7 @@ TQPoint KMdiChildArea::getCascadePoint( int indexOfWindow )
void KMdiChildArea::childMinimized( KMdiChildFrm *minimizedChild, bool wasMaximized ) void KMdiChildArea::childMinimized( KMdiChildFrm *minimizedChild, bool wasMaximized )
{ {
//can't find the child in our list, so we don't care. //can't find the child in our list, so we don't care.
if ( m_pZ->findRef( minimizedChild ) == -1 ) if ( m_pZ->tqfindRef( minimizedChild ) == -1 )
{ {
kdDebug( 760 ) << k_funcinfo << "child was minimized but wasn't in our list!" << endl; kdDebug( 760 ) << k_funcinfo << "child was minimized but wasn't in our list!" << endl;
return; return;

@ -149,15 +149,15 @@ KMdiChildFrm::KMdiChildFrm( KMdiChildArea *parent )
redecorateButtons(); redecorateButtons();
m_pWinIcon->setFocusPolicy( NoFocus ); m_pWinIcon->setFocusPolicy( TQ_NoFocus );
m_pUnixIcon->setFocusPolicy( NoFocus ); m_pUnixIcon->setFocusPolicy( TQ_NoFocus );
m_pClose->setFocusPolicy( NoFocus ); m_pClose->setFocusPolicy( TQ_NoFocus );
m_pMinimize->setFocusPolicy( NoFocus ); m_pMinimize->setFocusPolicy( TQ_NoFocus );
m_pMaximize->setFocusPolicy( NoFocus ); m_pMaximize->setFocusPolicy( TQ_NoFocus );
m_pUndock->setFocusPolicy( NoFocus ); m_pUndock->setFocusPolicy( TQ_NoFocus );
setFrameStyle( TQFrame::WinPanel | TQFrame::Raised ); setFrameStyle( TQFrame::WinPanel | TQFrame::Raised );
setFocusPolicy( NoFocus ); setFocusPolicy( TQ_NoFocus );
setMouseTracking( true ); setMouseTracking( true );
@ -238,19 +238,19 @@ void KMdiChildFrm::setResizeCursor( int resizeCorner )
break; break;
case KMDI_RESIZE_LEFT: case KMDI_RESIZE_LEFT:
case KMDI_RESIZE_RIGHT: case KMDI_RESIZE_RIGHT:
TQApplication::setOverrideCursor( Qt::sizeHorCursor, true ); TQApplication::setOverrideCursor( tqsizeHorCursor, true );
break; break;
case KMDI_RESIZE_TOP: case KMDI_RESIZE_TOP:
case KMDI_RESIZE_BOTTOM: case KMDI_RESIZE_BOTTOM:
TQApplication::setOverrideCursor( Qt::sizeVerCursor, true ); TQApplication::setOverrideCursor( tqsizeVerCursor, true );
break; break;
case KMDI_RESIZE_TOPLEFT: case KMDI_RESIZE_TOPLEFT:
case KMDI_RESIZE_BOTTOMRIGHT: case KMDI_RESIZE_BOTTOMRIGHT:
TQApplication::setOverrideCursor( Qt::sizeFDiagCursor, true ); TQApplication::setOverrideCursor( tqsizeFDiagCursor, true );
break; break;
case KMDI_RESIZE_BOTTOMLEFT: case KMDI_RESIZE_BOTTOMLEFT:
case KMDI_RESIZE_TOPRIGHT: case KMDI_RESIZE_TOPRIGHT:
TQApplication::setOverrideCursor( Qt::sizeBDiagCursor, true ); TQApplication::setOverrideCursor( tqsizeBDiagCursor, true );
break; break;
} }
} }
@ -283,7 +283,7 @@ void KMdiChildFrm::mouseMoveEvent( TQMouseEvent *e )
if ( m_bResizing ) if ( m_bResizing )
{ {
if ( !( e->state() & RightButton ) && !( e->state() & MidButton ) ) if ( !( e->state() & Qt::RightButton ) && !( e->state() & Qt::MidButton ) )
{ {
// same as: if no button or left button pressed // same as: if no button or left button pressed
TQPoint p = tqparentWidget()->mapFromGlobal( e->globalPos() ); TQPoint p = tqparentWidget()->mapFromGlobal( e->globalPos() );
@ -534,9 +534,9 @@ void KMdiChildFrm::setState( MdiWindowState state, bool /*bAnimate*/ )
// restore client min / max size / layout behavior // restore client min / max size / layout behavior
m_pClient->setMinimumSize( m_oldClientMinSize.width(), m_oldClientMinSize.height() ); m_pClient->setMinimumSize( m_oldClientMinSize.width(), m_oldClientMinSize.height() );
m_pClient->setMaximumSize( m_oldClientMaxSize.width(), m_oldClientMaxSize.height() ); m_pClient->setMaximumSize( m_oldClientMaxSize.width(), m_oldClientMaxSize.height() );
if ( m_pClient->layout() != 0L ) if ( m_pClient->tqlayout() != 0L )
{ {
m_pClient->layout() ->setResizeMode( m_oldLayoutResizeMode ); m_pClient->tqlayout() ->setResizeMode( m_oldLayoutResizeMode );
} }
m_pMinimize->setPixmap( *m_pMinButtonPixmap ); m_pMinimize->setPixmap( *m_pMinButtonPixmap );
m_pMaximize->setPixmap( *m_pMaxButtonPixmap ); m_pMaximize->setPixmap( *m_pMaxButtonPixmap );
@ -558,9 +558,9 @@ void KMdiChildFrm::setState( MdiWindowState state, bool /*bAnimate*/ )
// restore client min / max size / layout behavior // restore client min / max size / layout behavior
m_pClient->setMinimumSize( m_oldClientMinSize.width(), m_oldClientMinSize.height() ); m_pClient->setMinimumSize( m_oldClientMinSize.width(), m_oldClientMinSize.height() );
m_pClient->setMaximumSize( m_oldClientMaxSize.width(), m_oldClientMaxSize.height() ); m_pClient->setMaximumSize( m_oldClientMaxSize.width(), m_oldClientMaxSize.height() );
if ( m_pClient->layout() != 0L ) if ( m_pClient->tqlayout() != 0L )
{ {
m_pClient->layout() ->setResizeMode( m_oldLayoutResizeMode ); m_pClient->tqlayout() ->setResizeMode( m_oldLayoutResizeMode );
} }
setMaximumSize( QWIDGETSIZE_MAX, QWIDGETSIZE_MAX ); setMaximumSize( QWIDGETSIZE_MAX, QWIDGETSIZE_MAX );
// reset to maximize-captionbar // reset to maximize-captionbar
@ -610,15 +610,15 @@ void KMdiChildFrm::setState( MdiWindowState state, bool /*bAnimate*/ )
// save client min / max size / layout behavior // save client min / max size / layout behavior
m_oldClientMinSize = m_pClient->tqminimumSize(); m_oldClientMinSize = m_pClient->tqminimumSize();
m_oldClientMaxSize = m_pClient->tqmaximumSize(); m_oldClientMaxSize = m_pClient->tqmaximumSize();
if ( m_pClient->layout() != 0L ) if ( m_pClient->tqlayout() != 0L )
{ {
m_oldLayoutResizeMode = m_pClient->layout() ->resizeMode(); m_oldLayoutResizeMode = m_pClient->tqlayout() ->tqresizeMode();
} }
m_pClient->setMinimumSize( 0, 0 ); m_pClient->setMinimumSize( 0, 0 );
m_pClient->setMaximumSize( 0, 0 ); m_pClient->setMaximumSize( 0, 0 );
if ( m_pClient->layout() != 0L ) if ( m_pClient->tqlayout() != 0L )
{ {
m_pClient->layout() ->setResizeMode( TQLayout::FreeResize ); m_pClient->tqlayout() ->setResizeMode( TQLayout::FreeResize );
} }
switchToMinimizeLayout(); switchToMinimizeLayout();
m_pManager->childMinimized( this, true ); m_pManager->childMinimized( this, true );
@ -629,16 +629,16 @@ void KMdiChildFrm::setState( MdiWindowState state, bool /*bAnimate*/ )
// save client min / max size / layout behavior // save client min / max size / layout behavior
m_oldClientMinSize = m_pClient->tqminimumSize(); m_oldClientMinSize = m_pClient->tqminimumSize();
m_oldClientMaxSize = m_pClient->tqmaximumSize(); m_oldClientMaxSize = m_pClient->tqmaximumSize();
if ( m_pClient->layout() != 0L ) if ( m_pClient->tqlayout() != 0L )
{ {
m_oldLayoutResizeMode = m_pClient->layout() ->resizeMode(); m_oldLayoutResizeMode = m_pClient->tqlayout() ->tqresizeMode();
} }
m_restoredRect = geometry(); m_restoredRect = geometry();
m_pClient->setMinimumSize( 0, 0 ); m_pClient->setMinimumSize( 0, 0 );
m_pClient->setMaximumSize( 0, 0 ); m_pClient->setMaximumSize( 0, 0 );
if ( m_pClient->layout() != 0L ) if ( m_pClient->tqlayout() != 0L )
{ {
m_pClient->layout() ->setResizeMode( TQLayout::FreeResize ); m_pClient->tqlayout() ->setResizeMode( TQLayout::FreeResize );
} }
switchToMinimizeLayout(); switchToMinimizeLayout();
m_pManager->childMinimized( this, false ); m_pManager->childMinimized( this, false );
@ -705,7 +705,7 @@ void KMdiChildFrm::setIcon( const TQPixmap& pxm )
if ( p.width() != 18 || p.height() != 18 ) if ( p.width() != 18 || p.height() != 18 )
{ {
TQImage img = p.convertToImage(); TQImage img = p.convertToImage();
p = img.smoothScale( 18, 18, TQImage::ScaleMin ); p = img.smoothScale( 18, 18, TQ_ScaleMin );
} }
const bool do_resize = m_pIconButtonPixmap->size() != p.size(); const bool do_resize = m_pIconButtonPixmap->size() != p.size();
*m_pIconButtonPixmap = p; *m_pIconButtonPixmap = p;
@ -750,7 +750,7 @@ void KMdiChildFrm::setClient( KMdiChildView *w, bool bAutomaticResize )
} }
// memorize the focuses in a dictionary because they will get lost during reparenting // memorize the focuses in a dictionary because they will get lost during reparenting
TQDict<FocusPolicy>* pFocPolDict = new TQDict<FocusPolicy>; TQDict<TQ_FocusPolicy>* pFocPolDict = new TQDict<TQ_FocusPolicy>;
pFocPolDict->setAutoDelete( true ); pFocPolDict->setAutoDelete( true );
TQObjectList *list = m_pClient->queryList( "TQWidget" ); TQObjectList *list = m_pClient->queryList( "TQWidget" );
TQObjectListIt it( *list ); // iterate over the buttons TQObjectListIt it( *list ); // iterate over the buttons
@ -768,7 +768,7 @@ void KMdiChildFrm::setClient( KMdiChildView *w, bool bAutomaticResize )
widg->setName( tmpStr.latin1() ); widg->setName( tmpStr.latin1() );
i++; i++;
} }
FocusPolicy* pFocPol = new FocusPolicy; TQ_FocusPolicy* pFocPol = new TQ_FocusPolicy;
*pFocPol = widg->focusPolicy(); *pFocPol = widg->focusPolicy();
pFocPolDict->insert( widg->name(), pFocPol ); pFocPolDict->insert( widg->name(), pFocPol );
} }
@ -817,7 +817,7 @@ void KMdiChildFrm::unsetClient( TQPoint positionOffset )
TQObject::disconnect( m_pClient, TQT_SIGNAL( mdiParentNowMaximized( bool ) ), m_pManager, TQT_SIGNAL( nowMaximized( bool ) ) ); TQObject::disconnect( m_pClient, TQT_SIGNAL( mdiParentNowMaximized( bool ) ), m_pManager, TQT_SIGNAL( nowMaximized( bool ) ) );
//reparent to desktop widget , no flags , point , show it //reparent to desktop widget , no flags , point , show it
TQDict<FocusPolicy>* pFocPolDict; TQDict<TQ_FocusPolicy>* pFocPolDict;
pFocPolDict = unlinkChildren(); pFocPolDict = unlinkChildren();
// get name of focused child widget // get name of focused child widget
@ -842,7 +842,7 @@ void KMdiChildFrm::unsetClient( TQPoint positionOffset )
{ // for each found object... { // for each found object...
TQWidget * widg = ( TQWidget* ) obj; TQWidget * widg = ( TQWidget* ) obj;
++it; ++it;
FocusPolicy* pFocPol = pFocPolDict->find( widg->name() ); // remember the focus policy from before the reparent TQ_FocusPolicy* pFocPol = pFocPolDict->tqfind( widg->name() ); // remember the focus policy from before the reparent
if ( pFocPol ) if ( pFocPol )
widg->setFocusPolicy( *pFocPol ); widg->setFocusPolicy( *pFocPol );
@ -851,7 +851,7 @@ void KMdiChildFrm::unsetClient( TQPoint positionOffset )
widg->setFocus(); widg->setFocus();
// get first and last focusable widget // get first and last focusable widget
if ( ( widg->focusPolicy() == TQWidget::StrongFocus ) || ( widg->focusPolicy() == TQWidget::TabFocus ) ) if ( ( widg->focusPolicy() == TQ_StrongFocus ) || ( widg->focusPolicy() == TQ_TabFocus ) )
{ {
if ( firstFocusableChildWidget == 0 ) if ( firstFocusableChildWidget == 0 )
firstFocusableChildWidget = widg; // first widget firstFocusableChildWidget = widg; // first widget
@ -860,7 +860,7 @@ void KMdiChildFrm::unsetClient( TQPoint positionOffset )
} }
else else
{ {
if ( widg->focusPolicy() == TQWidget::WheelFocus ) if ( widg->focusPolicy() == TQ_WheelFocus )
{ {
if ( firstFocusableChildWidget == 0 ) if ( firstFocusableChildWidget == 0 )
firstFocusableChildWidget = widg; // first widget firstFocusableChildWidget = widg; // first widget
@ -877,14 +877,14 @@ void KMdiChildFrm::unsetClient( TQPoint positionOffset )
m_pClient->setLastFocusableChildWidget( lastFocusableChildWidget ); m_pClient->setLastFocusableChildWidget( lastFocusableChildWidget );
// reset the focus policy of the view // reset the focus policy of the view
m_pClient->setFocusPolicy( TQWidget::ClickFocus ); m_pClient->setFocusPolicy( TQ_ClickFocus );
// lose information about the view (because it's undocked now) // lose information about the view (because it's undocked now)
m_pClient = 0; m_pClient = 0;
} }
//============== linkChildren =============// //============== linkChildren =============//
void KMdiChildFrm::linkChildren( TQDict<FocusPolicy>* pFocPolDict ) void KMdiChildFrm::linkChildren( TQDict<TQ_FocusPolicy>* pFocPolDict )
{ {
// reset the focus policies for all widgets in the view (take them from the dictionary) // reset the focus policies for all widgets in the view (take them from the dictionary)
TQObjectList* list = m_pClient->queryList( "TQWidget" ); TQObjectList* list = m_pClient->queryList( "TQWidget" );
@ -894,7 +894,7 @@ void KMdiChildFrm::linkChildren( TQDict<FocusPolicy>* pFocPolDict )
{ // for each found object... { // for each found object...
TQWidget* widg = ( TQWidget* ) obj; TQWidget* widg = ( TQWidget* ) obj;
++it; ++it;
FocusPolicy* pFocPol = pFocPolDict->find( widg->name() ); // remember the focus policy from before the reparent TQ_FocusPolicy* pFocPol = pFocPolDict->tqfind( widg->name() ); // remember the focus policy from before the reparent
if ( pFocPol != 0 ) if ( pFocPol != 0 )
widg->setFocusPolicy( *pFocPol ); widg->setFocusPolicy( *pFocPol );
@ -907,14 +907,14 @@ void KMdiChildFrm::linkChildren( TQDict<FocusPolicy>* pFocPolDict )
delete pFocPolDict; delete pFocPolDict;
// reset the focus policies for the rest // reset the focus policies for the rest
m_pWinIcon->setFocusPolicy( TQWidget::NoFocus ); m_pWinIcon->setFocusPolicy( TQ_NoFocus );
m_pUnixIcon->setFocusPolicy( TQWidget::NoFocus ); m_pUnixIcon->setFocusPolicy( TQ_NoFocus );
m_pClient->setFocusPolicy( TQWidget::ClickFocus ); m_pClient->setFocusPolicy( TQ_ClickFocus );
m_pCaption->setFocusPolicy( TQWidget::NoFocus ); m_pCaption->setFocusPolicy( TQ_NoFocus );
m_pUndock->setFocusPolicy( TQWidget::NoFocus ); m_pUndock->setFocusPolicy( TQ_NoFocus );
m_pMinimize->setFocusPolicy( TQWidget::NoFocus ); m_pMinimize->setFocusPolicy( TQ_NoFocus );
m_pMaximize->setFocusPolicy( TQWidget::NoFocus ); m_pMaximize->setFocusPolicy( TQ_NoFocus );
m_pClose->setFocusPolicy( TQWidget::NoFocus ); m_pClose->setFocusPolicy( TQ_NoFocus );
// install the event filter (catch mouse clicks) for the rest // install the event filter (catch mouse clicks) for the rest
m_pWinIcon->installEventFilter( this ); m_pWinIcon->installEventFilter( this );
@ -930,10 +930,10 @@ void KMdiChildFrm::linkChildren( TQDict<FocusPolicy>* pFocPolDict )
//============== unlinkChildren =============// //============== unlinkChildren =============//
TQDict<TQWidget::FocusPolicy>* KMdiChildFrm::unlinkChildren() TQDict<TQ_FocusPolicy>* KMdiChildFrm::unlinkChildren()
{ {
// memorize the focuses in a dictionary because they will get lost during reparenting // memorize the focuses in a dictionary because they will get lost during reparenting
TQDict<FocusPolicy>* pFocPolDict = new TQDict<FocusPolicy>; TQDict<TQ_FocusPolicy>* pFocPolDict = new TQDict<TQ_FocusPolicy>;
pFocPolDict->setAutoDelete( true ); pFocPolDict->setAutoDelete( true );
TQObjectList *list = m_pClient->queryList( "TQWidget" ); TQObjectList *list = m_pClient->queryList( "TQWidget" );
@ -953,7 +953,7 @@ TQDict<TQWidget::FocusPolicy>* KMdiChildFrm::unlinkChildren()
w->setName( tmpStr.latin1() ); w->setName( tmpStr.latin1() );
i++; i++;
} }
FocusPolicy* pFocPol = new FocusPolicy; TQ_FocusPolicy* pFocPol = new TQ_FocusPolicy;
*pFocPol = w->focusPolicy(); *pFocPol = w->focusPolicy();
// memorize focus policy // memorize focus policy
pFocPolDict->insert( w->name(), pFocPol ); pFocPolDict->insert( w->name(), pFocPol );
@ -1068,7 +1068,7 @@ void KMdiChildFrm::doResize( bool captionOnly )
static bool hasParent( TQObject* par, TQObject* o ) static bool hasParent( TQObject* par, TQObject* o )
{ {
while ( o && o != par ) while ( o && o != par )
o = o->parent(); o = o->tqparent();
return o == par; return o == par;
} }
@ -1085,8 +1085,8 @@ bool KMdiChildFrm::eventFilter( TQObject *obj, TQEvent *e )
TQObject* pObj = obj; TQObject* pObj = obj;
while ( ( pObj != 0L ) && !bIsChild ) while ( ( pObj != 0L ) && !bIsChild )
{ {
bIsChild = ( pObj == this ); bIsChild = ( TQT_BASE_OBJECT(pObj) == TQT_BASE_OBJECT(this) );
pObj = pObj->parent(); pObj = pObj->tqparent();
} }
// unset the resize cursor if the cursor moved from the frame into a inner widget // unset the resize cursor if the cursor moved from the frame into a inner widget
if ( bIsChild ) if ( bIsChild )
@ -1095,13 +1095,13 @@ bool KMdiChildFrm::eventFilter( TQObject *obj, TQEvent *e )
break; break;
case TQEvent::MouseButtonPress: case TQEvent::MouseButtonPress:
{ {
if ( !hasParent( m_pClient, obj ) ) if ( !hasParent( TQT_TQOBJECT(m_pClient), obj ) )
{ {
bool bIsSecondClick = false; bool bIsSecondClick = false;
if ( m_timeMeasure.elapsed() <= TQApplication::doubleClickInterval() ) if ( m_timeMeasure.elapsed() <= TQApplication::doubleClickInterval() )
bIsSecondClick = true; // of a possible double click bIsSecondClick = true; // of a possible double click
if ( !( ( ( obj == m_pWinIcon ) || ( obj == m_pUnixIcon ) ) && bIsSecondClick ) ) if ( !( ( ( TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(m_pWinIcon) ) || ( TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(m_pUnixIcon) ) ) && bIsSecondClick ) )
{ {
// in case we didn't click on the icon button // in case we didn't click on the icon button
TQFocusEvent focusEvent( TQFocusEvent::FocusIn ); TQFocusEvent focusEvent( TQFocusEvent::FocusIn );
@ -1112,16 +1112,16 @@ bool KMdiChildFrm::eventFilter( TQObject *obj, TQEvent *e )
m_pClient->activate(); m_pClient->activate();
} }
if ( ( obj->parent() != m_pCaption ) && ( obj != m_pCaption ) ) if ( ( TQT_BASE_OBJECT(obj->tqparent()) != TQT_BASE_OBJECT(m_pCaption) ) && ( TQT_BASE_OBJECT(obj) != TQT_BASE_OBJECT(m_pCaption) ) )
{ {
TQWidget* w = ( TQWidget* ) obj; TQWidget* w = ( TQWidget* ) obj;
if ( ( w->focusPolicy() == TQWidget::ClickFocus ) || ( w->focusPolicy() == TQWidget::StrongFocus ) ) if ( ( w->focusPolicy() == TQ_ClickFocus ) || ( w->focusPolicy() == TQ_StrongFocus ) )
{ {
w->setFocus(); w->setFocus();
} }
} }
} }
if ( ( obj == m_pWinIcon ) || ( obj == m_pUnixIcon ) ) if ( ( TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(m_pWinIcon) ) || ( TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(m_pUnixIcon) ) )
{ {
// in case we clicked on the icon button // in case we clicked on the icon button
if ( m_timeMeasure.elapsed() > TQApplication::doubleClickInterval() ) if ( m_timeMeasure.elapsed() > TQApplication::doubleClickInterval() )
@ -1154,7 +1154,7 @@ bool KMdiChildFrm::eventFilter( TQObject *obj, TQEvent *e )
{ {
// if we lost a child we uninstall ourself as event filter for the lost // if we lost a child we uninstall ourself as event filter for the lost
// child and its children // child and its children
TQObject* pLostChild = ( ( TQChildEvent* ) e )->child(); TQObject* pLostChild = TQT_TQOBJECT(( ( TQChildEvent* ) e )->child());
if ( ( pLostChild != 0L ) /*&& (pLostChild->inherits("QWidget"))*/ ) if ( ( pLostChild != 0L ) /*&& (pLostChild->inherits("QWidget"))*/ )
{ {
TQObjectList* list = pLostChild->queryList(); TQObjectList* list = pLostChild->queryList();
@ -1176,10 +1176,10 @@ bool KMdiChildFrm::eventFilter( TQObject *obj, TQEvent *e )
// if we got a new child we install ourself as event filter for the new // if we got a new child we install ourself as event filter for the new
// child and its children (as we did when we got our client). // child and its children (as we did when we got our client).
// XXX see linkChildren() and focus policy stuff // XXX see linkChildren() and focus policy stuff
TQObject* pNewChild = ( ( TQChildEvent* ) e ) ->child(); TQObject* pNewChild = TQT_TQOBJECT(( ( TQChildEvent* ) e ) ->child());
if ( ( pNewChild != 0L ) && ::tqqt_cast<TQWidget*>( pNewChild ) ) if ( ( pNewChild != 0L ) && ::tqqt_cast<TQWidget*>( pNewChild ) )
{ {
TQWidget * pNewWidget = static_cast<TQWidget*>( pNewChild ); TQWidget * pNewWidget = TQT_TQWIDGET( pNewChild );
TQObjectList *list = pNewWidget->queryList( "TQWidget" ); TQObjectList *list = pNewWidget->queryList( "TQWidget" );
list->insert( 0, pNewChild ); // add the new child to the list too, just to save code list->insert( 0, pNewChild ); // add the new child to the list too, just to save code
TQObjectListIt it( *list ); // iterate over all new child widgets TQObjectListIt it( *list ); // iterate over all new child widgets

@ -422,13 +422,13 @@ protected:
* Restore the focus policies for _all_ widgets in the view using the list given as parameter. * Restore the focus policies for _all_ widgets in the view using the list given as parameter.
* Install the event filter for all direct child widgets of this. (See KMdiChildFrm::eventFilter) * Install the event filter for all direct child widgets of this. (See KMdiChildFrm::eventFilter)
*/ */
void linkChildren( TQDict<FocusPolicy>* pFocPolDict ); void linkChildren( TQDict<TQ_FocusPolicy>* pFocPolDict );
/** /**
* Backups all focus policies of _all_ child widgets in the MDI childview since they get lost during a reparent. * Backups all focus policies of _all_ child widgets in the MDI childview since they get lost during a reparent.
* Remove all event filters for all direct child widgets of this. (See KMdiChildFrm::eventFilter) * Remove all event filters for all direct child widgets of this. (See KMdiChildFrm::eventFilter)
*/ */
TQDict<TQWidget::FocusPolicy>* unlinkChildren(); TQDict<TQ_FocusPolicy>* unlinkChildren();
/** /**
* Calculates the corner id for the resize cursor. The return value can be tested for: * Calculates the corner id for the resize cursor. The return value can be tested for:

@ -72,7 +72,7 @@ KMdiChildFrmCaption::KMdiChildFrmCaption( KMdiChildFrm *parent )
m_bActive = false; m_bActive = false;
m_pParent = parent; m_pParent = parent;
setBackgroundMode( NoBackground ); setBackgroundMode( NoBackground );
setFocusPolicy( NoFocus ); setFocusPolicy( TQ_NoFocus );
m_bChildInDrag = false; m_bChildInDrag = false;
} }
@ -85,17 +85,17 @@ KMdiChildFrmCaption::~KMdiChildFrmCaption()
void KMdiChildFrmCaption::mousePressEvent( TQMouseEvent *e ) void KMdiChildFrmCaption::mousePressEvent( TQMouseEvent *e )
{ {
if ( e->button() == LeftButton ) if ( e->button() == Qt::LeftButton )
{ {
setMouseTracking( false ); setMouseTracking( false );
if ( KMdiMainFrm::frameDecorOfAttachedViews() != KMdi::Win95Look ) if ( KMdiMainFrm::frameDecorOfAttachedViews() != KMdi::Win95Look )
{ {
TQApplication::setOverrideCursor( Qt::sizeAllCursor, true ); TQApplication::setOverrideCursor( tqsizeAllCursor, true );
} }
m_pParent->m_bDragging = true; m_pParent->m_bDragging = true;
m_offset = mapToParent( e->pos() ); m_offset = mapToParent( e->pos() );
} }
else if ( e->button() == RightButton ) else if ( e->button() == Qt::RightButton )
{ {
m_pParent->systemMenu()->popup( mapToGlobal( e->pos() ) ); m_pParent->systemMenu()->popup( mapToGlobal( e->pos() ) );
} }
@ -105,7 +105,7 @@ void KMdiChildFrmCaption::mousePressEvent( TQMouseEvent *e )
void KMdiChildFrmCaption::mouseReleaseEvent( TQMouseEvent *e ) void KMdiChildFrmCaption::mouseReleaseEvent( TQMouseEvent *e )
{ {
if ( e->button() == LeftButton ) if ( e->button() == Qt::LeftButton )
{ {
if ( KMdiMainFrm::frameDecorOfAttachedViews() != KMdi::Win95Look ) if ( KMdiMainFrm::frameDecorOfAttachedViews() != KMdi::Win95Look )
TQApplication::restoreOverrideCursor(); TQApplication::restoreOverrideCursor();
@ -313,7 +313,7 @@ void KMdiChildFrmCaption::slot_moveViaSystemMenu()
grabMouse(); grabMouse();
if ( KMdiMainFrm::frameDecorOfAttachedViews() != KMdi::Win95Look ) if ( KMdiMainFrm::frameDecorOfAttachedViews() != KMdi::Win95Look )
TQApplication::setOverrideCursor( Qt::sizeAllCursor, true ); TQApplication::setOverrideCursor( tqsizeAllCursor, true );
m_pParent->m_bDragging = true; m_pParent->m_bDragging = true;
m_offset = mapFromGlobal( TQCursor::pos() ); m_offset = mapFromGlobal( TQCursor::pos() );

@ -63,7 +63,7 @@ KMdiChildView::KMdiChildView( const TQString& caption, TQWidget* tqparentWidget,
m_szCaption = i18n( "Unnamed" ); m_szCaption = i18n( "Unnamed" );
m_sTabCaption = m_szCaption; m_sTabCaption = m_szCaption;
setFocusPolicy( ClickFocus ); setFocusPolicy( TQ_ClickFocus );
installEventFilter( this ); installEventFilter( this );
// store the current time // store the current time
@ -88,7 +88,7 @@ KMdiChildView::KMdiChildView( TQWidget* tqparentWidget, const char* name, WFlags
setGeometry( 0, 0, 0, 0 ); // reset setGeometry( 0, 0, 0, 0 ); // reset
m_szCaption = i18n( "Unnamed" ); m_szCaption = i18n( "Unnamed" );
m_sTabCaption = m_szCaption; m_sTabCaption = m_szCaption;
setFocusPolicy( ClickFocus ); setFocusPolicy( TQ_ClickFocus );
installEventFilter( this ); installEventFilter( this );
// store the current time // store the current time
@ -363,7 +363,7 @@ void KMdiChildView::youAreDetached()
if ( myIconPtr() ) if ( myIconPtr() )
setIcon( *( myIconPtr() ) ); setIcon( *( myIconPtr() ) );
setFocusPolicy( TQWidget::StrongFocus ); setFocusPolicy( TQ_StrongFocus );
emit isDetachedNow(); emit isDetachedNow();
} }
@ -493,7 +493,7 @@ void KMdiChildView::slot_childDestroyed()
// if we lost a child we uninstall ourself as event filter for the lost // if we lost a child we uninstall ourself as event filter for the lost
// child and its children // child and its children
const TQObject * pLostChild = TQObject::sender(); const TQObject * pLostChild = TQT_TQOBJECT_CONST(sender());
if ( pLostChild && ( pLostChild->isWidgetType() ) ) if ( pLostChild && ( pLostChild->isWidgetType() ) )
{ {
TQObjectList* list = ( ( TQObject* ) ( pLostChild ) ) ->queryList( "TQWidget" ); TQObjectList* list = ( ( TQObject* ) ( pLostChild ) ) ->queryList( "TQWidget" );
@ -527,8 +527,8 @@ bool KMdiChildView::eventFilter( TQObject *obj, TQEvent *e )
if ( ke->key() == Qt::Key_Tab ) if ( ke->key() == Qt::Key_Tab )
{ {
TQWidget* w = ( TQWidget* ) obj; TQWidget* w = ( TQWidget* ) obj;
FocusPolicy wfp = w->focusPolicy(); TQ_FocusPolicy wfp = w->focusPolicy();
if ( wfp == TQWidget::StrongFocus || wfp == TQWidget::TabFocus || w->focusPolicy() == TQWidget::WheelFocus ) if ( wfp == TQ_StrongFocus || wfp == TQ_TabFocus || w->focusPolicy() == TQ_WheelFocus )
{ {
if ( m_lastFocusableChildWidget != 0 ) if ( m_lastFocusableChildWidget != 0 )
{ {
@ -546,7 +546,7 @@ bool KMdiChildView::eventFilter( TQObject *obj, TQEvent *e )
if ( obj->isWidgetType() ) if ( obj->isWidgetType() )
{ {
TQObjectList * list = queryList( "TQWidget" ); TQObjectList * list = queryList( "TQWidget" );
if ( list->find( obj ) != -1 ) if ( list->tqfind( obj ) != -1 )
m_focusedChildWidget = ( TQWidget* ) obj; m_focusedChildWidget = ( TQWidget* ) obj;
delete list; // delete the list, not the objects delete list; // delete the list, not the objects
@ -566,7 +566,7 @@ bool KMdiChildView::eventFilter( TQObject *obj, TQEvent *e )
{ {
// if we lost a child we uninstall ourself as event filter for the lost // if we lost a child we uninstall ourself as event filter for the lost
// child and its children // child and its children
TQObject * pLostChild = ( ( TQChildEvent* ) e ) ->child(); TQObject * pLostChild = TQT_TQOBJECT(( ( TQChildEvent* ) e ) ->child());
if ( ( pLostChild != 0L ) && ( pLostChild->isWidgetType() ) ) if ( ( pLostChild != 0L ) && ( pLostChild->isWidgetType() ) )
{ {
TQObjectList * list = pLostChild->queryList( "TQWidget" ); TQObjectList * list = pLostChild->queryList( "TQWidget" );
@ -578,8 +578,8 @@ bool KMdiChildView::eventFilter( TQObject *obj, TQEvent *e )
TQWidget * widg = ( TQWidget* ) o; TQWidget * widg = ( TQWidget* ) o;
++it; ++it;
widg->removeEventFilter( this ); widg->removeEventFilter( this );
FocusPolicy wfp = widg->focusPolicy(); TQ_FocusPolicy wfp = widg->focusPolicy();
if ( wfp == TQWidget::StrongFocus || wfp == TQWidget::TabFocus || widg->focusPolicy() == TQWidget::WheelFocus ) if ( wfp == TQ_StrongFocus || wfp == TQ_TabFocus || widg->focusPolicy() == TQ_WheelFocus )
{ {
if ( m_firstFocusableChildWidget == widg ) if ( m_firstFocusableChildWidget == widg )
m_firstFocusableChildWidget = 0L; // reset first widget m_firstFocusableChildWidget = 0L; // reset first widget
@ -596,11 +596,11 @@ bool KMdiChildView::eventFilter( TQObject *obj, TQEvent *e )
// if we got a new child and we are attached to the MDI system we // if we got a new child and we are attached to the MDI system we
// install ourself as event filter for the new child and its children // install ourself as event filter for the new child and its children
// (as we did when we were added to the MDI system). // (as we did when we were added to the MDI system).
TQObject * pNewChild = ( ( TQChildEvent* ) e ) ->child(); TQObject * pNewChild = TQT_TQOBJECT(( ( TQChildEvent* ) e ) ->child());
if ( ( pNewChild != 0L ) && ( pNewChild->isWidgetType() ) ) if ( ( pNewChild != 0L ) && ( pNewChild->isWidgetType() ) )
{ {
TQWidget * pNewWidget = ( TQWidget* ) pNewChild; TQWidget * pNewWidget = ( TQWidget* ) pNewChild;
if ( pNewWidget->testWFlags( Qt::WType_Dialog | Qt::WShowModal ) ) if ( pNewWidget->testWFlags( (WFlags)(WType_Dialog | WShowModal) ) )
return false; return false;
TQObjectList *list = pNewWidget->queryList( "TQWidget" ); TQObjectList *list = pNewWidget->queryList( "TQWidget" );
list->insert( 0, pNewChild ); // add the new child to the list too, just to save code list->insert( 0, pNewChild ); // add the new child to the list too, just to save code
@ -612,8 +612,8 @@ bool KMdiChildView::eventFilter( TQObject *obj, TQEvent *e )
++it; ++it;
widg->installEventFilter( this ); widg->installEventFilter( this );
connect( widg, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slot_childDestroyed() ) ); connect( widg, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slot_childDestroyed() ) );
FocusPolicy wfp = widg->focusPolicy(); TQ_FocusPolicy wfp = widg->focusPolicy();
if ( wfp == TQWidget::StrongFocus || wfp == TQWidget::TabFocus || widg->focusPolicy() == TQWidget::WheelFocus ) if ( wfp == TQ_StrongFocus || wfp == TQ_TabFocus || widg->focusPolicy() == TQ_WheelFocus )
{ {
if ( m_firstFocusableChildWidget == 0 ) if ( m_firstFocusableChildWidget == 0 )
m_firstFocusableChildWidget = widg; // first widge m_firstFocusableChildWidget = widg; // first widge
@ -629,14 +629,14 @@ bool KMdiChildView::eventFilter( TQObject *obj, TQEvent *e )
if ( e->type() == TQEvent::IconChange ) if ( e->type() == TQEvent::IconChange )
{ {
// qDebug("KMDiChildView:: TQEvent:IconChange intercepted\n"); // qDebug("KMDiChildView:: TQEvent:IconChange intercepted\n");
if ( obj == this ) if ( TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(this) )
iconUpdated( this, icon() ? ( *icon() ) : TQPixmap() ); iconUpdated( this, icon() ? ( *icon() ) : TQPixmap() );
else if ( obj == m_trackChanges ) else if ( TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(m_trackChanges) )
setIcon( m_trackChanges->icon() ? ( *( m_trackChanges->icon() ) ) : TQPixmap() ); setIcon( m_trackChanges->icon() ? ( *( m_trackChanges->icon() ) ) : TQPixmap() );
} }
if ( e->type() == TQEvent::CaptionChange ) if ( e->type() == TQEvent::CaptionChange )
{ {
if ( obj == this ) if ( TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(this) )
captionUpdated( this, caption() ); captionUpdated( this, caption() );
} }
} }

@ -358,7 +358,7 @@ public:
*/ */
inline void updateTimeStamp() inline void updateTimeStamp()
{ {
m_time.setDate( TQDate::tqcurrentDate() ); m_time.setDate( TQDate::currentDate() );
m_time.setTime( TQTime::currentTime() ); m_time.setTime( TQTime::currentTime() );
} }

@ -138,7 +138,7 @@ KMdiDockContainer::~KMdiDockContainer()
{ {
it = m_map.begin(); it = m_map.begin();
KDockWidget *w = it.key(); KDockWidget *w = it.key();
if ( m_overlapButtons.contains( w ) ) if ( m_overlapButtons.tqcontains( w ) )
{ {
( static_cast<KDockWidgetHeader*>( w->getHeader()->tqqt_cast( "KDockWidgetHeader" ) ) )->removeButton( m_overlapButtons[w] ); ( static_cast<KDockWidgetHeader*>( w->getHeader()->tqqt_cast( "KDockWidgetHeader" ) ) )->removeButton( m_overlapButtons[w] );
m_overlapButtons.remove( w ); m_overlapButtons.remove( w );
@ -170,9 +170,9 @@ void KMdiDockContainer::init()
if (!overlap) deactivateOverlapMode(); if (!overlap) deactivateOverlapMode();
// try to restore splitter size // try to restore splitter size
if ( parentDockWidget() && parentDockWidget()->parent() ) if ( parentDockWidget() && parentDockWidget()->tqparent() )
{ {
KDockSplitter * sp = static_cast<KDockSplitter*>( parentDockWidget()->parent()->tqqt_cast( "KDockSplitter" ) ); KDockSplitter * sp = static_cast<KDockSplitter*>( parentDockWidget()->tqparent()->tqqt_cast( "KDockSplitter" ) );
if ( sp ) if ( sp )
sp->setSeparatorPosX( m_separatorPos ); sp->setSeparatorPosX( m_separatorPos );
} }
@ -188,7 +188,7 @@ void KMdiDockContainer::insertWidget ( KDockWidget *dwdg, TQPixmap pixmap, const
kdDebug( 760 ) << k_funcinfo << "Adding a dockwidget to the dock container" << endl; kdDebug( 760 ) << k_funcinfo << "Adding a dockwidget to the dock container" << endl;
KDockWidget* w = dwdg; KDockWidget* w = dwdg;
int tab; int tab;
bool alreadyThere = m_map.contains( w ); bool alreadyThere = m_map.tqcontains( w );
if ( alreadyThere ) if ( alreadyThere )
{ {
@ -280,7 +280,7 @@ bool KMdiDockContainer::eventFilter( TQObject *obj, TQEvent *event )
} }
m_dockManager = w->dockManager(); m_dockManager = w->dockManager();
m_dragPanel = hdr->dragPanel(); m_dragPanel = TQT_TQOBJECT(hdr->dragPanel());
if ( m_dragPanel ) if ( m_dragPanel )
m_movingState = WaitingForMoveStart; m_movingState = WaitingForMoveStart;
@ -303,7 +303,7 @@ bool KMdiDockContainer::eventFilter( TQObject *obj, TQEvent *event )
TQPoint p( ( ( TQMouseEvent* ) event )->pos() - m_startEvent->pos() ); TQPoint p( ( ( TQMouseEvent* ) event )->pos() - m_startEvent->pos() );
if ( p.manhattanLength() > KGlobalSettings::dndEventDelay() ) if ( p.manhattanLength() > KGlobalSettings::dndEventDelay() )
{ {
m_dockManager->eventFilter( m_dragPanel, m_startEvent ); m_dockManager->eventFilter( m_dragPanel, TQT_TQEVENT(m_startEvent) );
m_dockManager->eventFilter( m_dragPanel, event ); m_dockManager->eventFilter( m_dragPanel, event );
m_movingState = Moving; m_movingState = Moving;
} }
@ -322,7 +322,7 @@ bool KMdiDockContainer::eventFilter( TQObject *obj, TQEvent *event )
void KMdiDockContainer::showWidget( KDockWidget *w ) void KMdiDockContainer::showWidget( KDockWidget *w )
{ {
if ( !m_map.contains( w ) ) if ( !m_map.tqcontains( w ) )
return ; return ;
int id = m_map[ w ]; int id = m_map[ w ];
@ -369,7 +369,7 @@ void KMdiDockContainer::hideIfNeeded()
void KMdiDockContainer::removeWidget( KDockWidget* dwdg ) void KMdiDockContainer::removeWidget( KDockWidget* dwdg )
{ {
KDockWidget * w = dwdg; KDockWidget * w = dwdg;
if ( !m_map.contains( w ) ) if ( !m_map.tqcontains( w ) )
return; //we don't have this widget in our container return; //we don't have this widget in our container
kdDebug( 760 ) << k_funcinfo << endl; kdDebug( 760 ) << k_funcinfo << endl;
@ -385,7 +385,7 @@ void KMdiDockContainer::removeWidget( KDockWidget* dwdg )
m_ws->removeWidget( w ); m_ws->removeWidget( w );
m_map.remove( w ); m_map.remove( w );
m_revMap.remove( id ); m_revMap.remove( id );
if ( m_overlapButtons.contains( w ) ) if ( m_overlapButtons.tqcontains( w ) )
{ {
( static_cast<KDockWidgetHeader*>( w->getHeader() ->tqqt_cast( "KDockWidgetHeader" ) ) )->removeButton( m_overlapButtons[ w ] ); ( static_cast<KDockWidgetHeader*>( w->getHeader() ->tqqt_cast( "KDockWidgetHeader" ) ) )->removeButton( m_overlapButtons[ w ] );
m_overlapButtons.remove( w ); m_overlapButtons.remove( w );
@ -401,7 +401,7 @@ void KMdiDockContainer::undockWidget( KDockWidget *dwdg )
{ {
KDockWidget * w = dwdg; KDockWidget * w = dwdg;
if ( !m_map.contains( w ) ) if ( !m_map.tqcontains( w ) )
return ; return ;
int id = m_map[ w ]; int id = m_map[ w ];
@ -465,9 +465,9 @@ void KMdiDockContainer::tabClicked( int t )
{ {
kdDebug( 760 ) << k_funcinfo << "Tab " << t << " was just deactiviated" << endl; kdDebug( 760 ) << k_funcinfo << "Tab " << t << " was just deactiviated" << endl;
// try save splitter position // try save splitter position
if ( parentDockWidget() && parentDockWidget()->parent() ) if ( parentDockWidget() && parentDockWidget()->tqparent() )
{ {
KDockSplitter * sp = static_cast<KDockSplitter*>( parentDockWidget()->parent()->tqqt_cast( "KDockSplitter" ) ); KDockSplitter * sp = static_cast<KDockSplitter*>( parentDockWidget()->tqparent()->tqqt_cast( "KDockSplitter" ) );
if ( sp ) if ( sp )
m_separatorPos = sp->separatorPos(); m_separatorPos = sp->separatorPos();
} }
@ -517,7 +517,7 @@ void KMdiDockContainer::save( TQDomElement& dockEl )
TQDomDocument doc = dockEl.ownerDocument(); TQDomDocument doc = dockEl.ownerDocument();
TQDomElement el; TQDomElement el;
el = doc.createElement( "name" ); el = doc.createElement( "name" );
el.appendChild( doc.createTextNode( TQString( "%1" ).arg( parent() ->name() ) ) ); el.appendChild( doc.createTextNode( TQString( "%1" ).arg( tqparent() ->name() ) ) );
dockEl.appendChild( el ); dockEl.appendChild( el );
el = doc.createElement( "overlapMode" ); el = doc.createElement( "overlapMode" );
el.appendChild( doc.createTextNode( isOverlapMode() ? "true" : "false" ) ); el.appendChild( doc.createTextNode( isOverlapMode() ? "true" : "false" ) );
@ -627,8 +627,8 @@ void KMdiDockContainer::load( TQDomElement& dockEl )
void KMdiDockContainer::save( KConfig* cfg, const TQString& group_or_prefix ) void KMdiDockContainer::save( KConfig* cfg, const TQString& group_or_prefix )
{ {
TQString grp = cfg->group(); TQString grp = cfg->group();
cfg->deleteGroup( group_or_prefix + TQString( "::%1" ).arg( parent() ->name() ) ); cfg->deleteGroup( group_or_prefix + TQString( "::%1" ).arg( tqparent() ->name() ) );
cfg->setGroup( group_or_prefix + TQString( "::%1" ).arg( parent() ->name() ) ); cfg->setGroup( group_or_prefix + TQString( "::%1" ).arg( tqparent() ->name() ) );
if ( isOverlapMode() ) if ( isOverlapMode() )
cfg->writeEntry( "overlapMode", "true" ); cfg->writeEntry( "overlapMode", "true" );
@ -636,10 +636,10 @@ void KMdiDockContainer::save( KConfig* cfg, const TQString& group_or_prefix )
cfg->writeEntry( "overlapMode", "false" ); cfg->writeEntry( "overlapMode", "false" );
// try to save the splitter position // try to save the splitter position
if ( parentDockWidget() && parentDockWidget() ->parent() ) if ( parentDockWidget() && parentDockWidget() ->tqparent() )
{ {
KDockSplitter * sp = static_cast<KDockSplitter*>( parentDockWidget() -> KDockSplitter * sp = static_cast<KDockSplitter*>( parentDockWidget() ->
parent() ->tqqt_cast( "KDockSplitter" ) ); tqparent() ->tqqt_cast( "KDockSplitter" ) );
if ( sp ) if ( sp )
cfg->writeEntry( "separatorPosition", m_separatorPos ); cfg->writeEntry( "separatorPosition", m_separatorPos );
} }
@ -675,7 +675,7 @@ void KMdiDockContainer::save( KConfig* cfg, const TQString& group_or_prefix )
void KMdiDockContainer::load( KConfig* cfg, const TQString& group_or_prefix ) void KMdiDockContainer::load( KConfig* cfg, const TQString& group_or_prefix )
{ {
TQString grp = cfg->group(); TQString grp = cfg->group();
cfg->setGroup( group_or_prefix + TQString( "::%1" ).arg( parent() ->name() ) ); cfg->setGroup( group_or_prefix + TQString( "::%1" ).arg( tqparent() ->name() ) );
if ( cfg->readEntry( "overlapMode" ) != "false" ) if ( cfg->readEntry( "overlapMode" ) != "false" )
activateOverlapMode( m_horizontal?m_tb->height():m_tb->width() ); activateOverlapMode( m_horizontal?m_tb->height():m_tb->width() );
@ -818,7 +818,7 @@ void KMdiDockContainer::prevToolView()
{ {
kdDebug( 760 ) << k_funcinfo << endl; kdDebug( 760 ) << k_funcinfo << endl;
TQPtrList<KMultiTabBarTab>* tabs = m_tb->tabs(); TQPtrList<KMultiTabBarTab>* tabs = m_tb->tabs();
int pos = tabs->findRef( m_tb->tab( oldtab ) ); int pos = tabs->tqfindRef( m_tb->tab( oldtab ) );
if ( pos == -1 ) if ( pos == -1 )
return ; return ;
@ -839,7 +839,7 @@ void KMdiDockContainer::nextToolView()
{ {
kdDebug( 760 ) << k_funcinfo << endl; kdDebug( 760 ) << k_funcinfo << endl;
TQPtrList<KMultiTabBarTab>* tabs = m_tb->tabs(); TQPtrList<KMultiTabBarTab>* tabs = m_tb->tabs();
int pos = tabs->findRef( m_tb->tab( oldtab ) ); int pos = tabs->tqfindRef( m_tb->tab( oldtab ) );
if ( pos == -1 ) if ( pos == -1 )
return ; return ;

@ -31,7 +31,7 @@ void KMdiFocusList::addWidgetTree( TQWidget* w )
{ {
//this method should never be called twice on the same hierarchy //this method should never be called twice on the same hierarchy
m_list.insert( w, w->focusPolicy() ); m_list.insert( w, w->focusPolicy() );
w->setFocusPolicy( TQWidget::ClickFocus ); w->setFocusPolicy( TQ_ClickFocus );
kdDebug( 760 ) << "KMdiFocusList::addWidgetTree: adding toplevel" << endl; kdDebug( 760 ) << "KMdiFocusList::addWidgetTree: adding toplevel" << endl;
connect( w, TQT_SIGNAL( destroyed( TQObject * ) ), this, TQT_SLOT( objectHasBeenDestroyed( TQObject* ) ) ); connect( w, TQT_SIGNAL( destroyed( TQObject * ) ), this, TQT_SLOT( objectHasBeenDestroyed( TQObject* ) ) );
TQObjectList *l = w->queryList( "TQWidget" ); TQObjectList *l = w->queryList( "TQWidget" );
@ -41,7 +41,7 @@ void KMdiFocusList::addWidgetTree( TQWidget* w )
{ {
TQWidget * wid = ( TQWidget* ) obj; TQWidget * wid = ( TQWidget* ) obj;
m_list.insert( wid, wid->focusPolicy() ); m_list.insert( wid, wid->focusPolicy() );
wid->setFocusPolicy( TQWidget::ClickFocus ); wid->setFocusPolicy( TQ_ClickFocus );
kdDebug( 760 ) << "KMdiFocusList::addWidgetTree: adding widget" << endl; kdDebug( 760 ) << "KMdiFocusList::addWidgetTree: adding widget" << endl;
connect( wid, TQT_SIGNAL( destroyed( TQObject * ) ), this, TQT_SLOT( objectHasBeenDestroyed( TQObject* ) ) ); connect( wid, TQT_SIGNAL( destroyed( TQObject * ) ), this, TQT_SLOT( objectHasBeenDestroyed( TQObject* ) ) );
++it; ++it;
@ -51,7 +51,7 @@ void KMdiFocusList::addWidgetTree( TQWidget* w )
void KMdiFocusList::restore() void KMdiFocusList::restore()
{ {
for ( TQMap<TQWidget*, TQWidget::FocusPolicy>::const_iterator it = m_list.constBegin();it != m_list.constEnd();++it ) for ( TQMap<TQWidget*, TQ_FocusPolicy>::const_iterator it = m_list.constBegin();it != m_list.constEnd();++it )
{ {
it.key() ->setFocusPolicy( it.data() ); it.key() ->setFocusPolicy( it.data() );
} }

@ -34,7 +34,7 @@ public:
protected slots: protected slots:
void objectHasBeenDestroyed( TQObject* ); void objectHasBeenDestroyed( TQObject* );
private: private:
TQMap<TQWidget*, TQWidget::FocusPolicy> m_list; TQMap<TQWidget*, TQ_FocusPolicy> m_list;
}; };

@ -84,7 +84,7 @@ void ToggleToolViewAction::anDWChanged()
setChecked( true ); setChecked( true );
else if ( isChecked() && ( m_dw->parentDockTabGroup() && else if ( isChecked() && ( m_dw->parentDockTabGroup() &&
( ( static_cast<KDockWidget*>( m_dw->parentDockTabGroup() -> ( ( static_cast<KDockWidget*>( m_dw->parentDockTabGroup() ->
parent() ->tqqt_cast( "KDockWidget" ) ) ) ->mayBeShow() ) ) ) tqparent() ->tqqt_cast( "KDockWidget" ) ) ) ->mayBeShow() ) ) )
setChecked( false ); setChecked( false );
} }
@ -161,9 +161,9 @@ KMDIGUIClient::KMDIGUIClient( KMdiMainFrm* mdiMainFrm, bool showMDIModeAction, c
m_gotoToolDockMenu->insert( new KAction( i18n( "Switch Bottom Dock" ), ALT + CTRL + SHIFT + Key_B, this, TQT_SIGNAL( toggleBottom() ), m_gotoToolDockMenu->insert( new KAction( i18n( "Switch Bottom Dock" ), ALT + CTRL + SHIFT + Key_B, this, TQT_SIGNAL( toggleBottom() ),
actionCollection(), "kmdi_activate_bottom" ) ); actionCollection(), "kmdi_activate_bottom" ) );
m_gotoToolDockMenu->insert( new KActionSeparator( actionCollection(), "kmdi_goto_menu_separator" ) ); m_gotoToolDockMenu->insert( new KActionSeparator( actionCollection(), "kmdi_goto_menu_separator" ) );
m_gotoToolDockMenu->insert( new KAction( i18n( "Previous Tool View" ), ALT + CTRL + Key_Left, m_mdiMainFrm, TQT_SLOT( prevToolViewInDock() ), m_gotoToolDockMenu->insert( new KAction( i18n( "Previous Tool View" ), ALT + CTRL + Key_Left, TQT_TQOBJECT(m_mdiMainFrm), TQT_SLOT( prevToolViewInDock() ),
actionCollection(), "kmdi_prev_toolview" ) ); actionCollection(), "kmdi_prev_toolview" ) );
m_gotoToolDockMenu->insert( new KAction( i18n( "Next Tool View" ), ALT + CTRL + Key_Right, m_mdiMainFrm, TQT_SLOT( nextToolViewInDock() ), m_gotoToolDockMenu->insert( new KAction( i18n( "Next Tool View" ), ALT + CTRL + Key_Right, TQT_TQOBJECT(m_mdiMainFrm), TQT_SLOT( nextToolViewInDock() ),
actionCollection(), "kmdi_next_toolview" ) ); actionCollection(), "kmdi_next_toolview" ) );
actionCollection() ->readShortcutSettings( "Shortcuts", kapp->config() ); actionCollection() ->readShortcutSettings( "Shortcuts", kapp->config() );
@ -262,7 +262,7 @@ void KMDIGUIClient::addToolView( KMdiToolViewAccessor* mtva )
m_mdiMainFrm, actionCollection(), aname.latin1() ); m_mdiMainFrm, actionCollection(), aname.latin1() );
#if KDE_IS_VERSION(3,2,90) #if KDE_IS_VERSION(3,2,90)
( ( ToggleToolViewAction* ) a ) ->setCheckedState( i18n( "Hide %1" ).arg( mtva->wrappedWidget() ->caption() ) ); ( ( ToggleToolViewAction* ) a ) ->setCheckedState( TQString(i18n( "Hide %1" ).arg( mtva->wrappedWidget() ->caption() )) );
#endif #endif
connect( a, TQT_SIGNAL( destroyed( TQObject* ) ), this, TQT_SLOT( actionDeleted( TQObject* ) ) ); connect( a, TQT_SIGNAL( destroyed( TQObject* ) ), this, TQT_SLOT( actionDeleted( TQObject* ) ) );

@ -184,7 +184,7 @@ KMdiMainFrm::KMdiMainFrm( TQWidget* tqparentWidget, const char* name, KMdi::MdiM
m_pToolViews = new TQMap<TQWidget*, KMdiToolViewAccessor*>; m_pToolViews = new TQMap<TQWidget*, KMdiToolViewAccessor*>;
// This seems to be needed (re-check it after Qt2.0 comed out) // This seems to be needed (re-check it after Qt2.0 comed out)
setFocusPolicy( ClickFocus ); setFocusPolicy( TQ_ClickFocus );
// create the central widget // create the central widget
createMdiManager(); createMdiManager();
@ -218,7 +218,7 @@ KMdiMainFrm::KMdiMainFrm( TQWidget* tqparentWidget, const char* name, KMdi::MdiM
m_pPlacingMenu = new TQPopupMenu( this, "placing_menu" ); m_pPlacingMenu = new TQPopupMenu( this, "placing_menu" );
d->closeWindowAction = new KAction(i18n("&Close"), KStdAccel::close(), d->closeWindowAction = new KAction(i18n("&Close"), KStdAccel::close(),
this, TQT_SLOT(closeActiveView()), actionCollection(), "window_close"); TQT_TQOBJECT(this), TQT_SLOT(closeActiveView()), actionCollection(), "window_close");
// the MDI view taskbar // the MDI view taskbar
createTaskBar(); createTaskBar();
@ -553,7 +553,7 @@ KMdiToolViewAccessor *KMdiMainFrm::createToolWindow()
void KMdiMainFrm::deleteToolWindow( TQWidget* pWnd ) void KMdiMainFrm::deleteToolWindow( TQWidget* pWnd )
{ {
if ( m_pToolViews->contains( pWnd ) ) if ( m_pToolViews->tqcontains( pWnd ) )
deleteToolWindow( ( *m_pToolViews ) [ pWnd ] ); deleteToolWindow( ( *m_pToolViews ) [ pWnd ] );
} }
@ -590,7 +590,7 @@ KMdiToolViewAccessor *KMdiMainFrm::addToolWindow( TQWidget* pWnd, KDockWidget::D
if ( pos == KDockWidget::DockNone ) if ( pos == KDockWidget::DockNone )
{ {
mtva->d->widgetContainer->setEnableDocking( KDockWidget::DockNone ); mtva->d->widgetContainer->setEnableDocking( KDockWidget::DockNone );
mtva->d->widgetContainer->reparent( this, Qt::WType_TopLevel | Qt::WType_Dialog, r.topLeft(), true ); //pToolView->isVisible()); mtva->d->widgetContainer->reparent( this, (WFlags)(WType_TopLevel | WType_Dialog), r.topLeft(), true ); //pToolView->isVisible());
} }
else //add and dock the toolview as a dockwidget view else //add and dock the toolview as a dockwidget view
mtva->place( pos, pTargetWnd, percent ); mtva->place( pos, pTargetWnd, percent );
@ -959,13 +959,13 @@ bool KMdiMainFrm::windowExists( KMdiChildView *pWnd, ExistsAs as )
{ {
if ( ( as == ToolView ) || ( as == AnyView ) ) if ( ( as == ToolView ) || ( as == AnyView ) )
{ {
if ( m_pToolViews->contains( pWnd ) ) if ( m_pToolViews->tqcontains( pWnd ) )
return true; return true;
if ( as == ToolView ) if ( as == ToolView )
return false; return false;
} }
if ( m_pDocumentViews->findRef( pWnd ) != -1 ) if ( m_pDocumentViews->tqfindRef( pWnd ) != -1 )
return true; return true;
return false; return false;
@ -1211,9 +1211,9 @@ bool KMdiMainFrm::eventFilter( TQObject * /*obj*/, TQEvent *e )
* The WIN button in KDE is the meta button in Qt * The WIN button in KDE is the meta button in Qt
**/ **/
if ( state != ( ( TQKeyEvent * ) e ) ->stateAfter() && if ( state != ( ( TQKeyEvent * ) e ) ->stateAfter() &&
( ( modFlags & KKey::CTRL ) > 0 ) == ( ( state & Qt::ControlButton ) > 0 ) && ( ( modFlags & KKey::CTRL ) > 0 ) == ( ( state & TQt::ControlButton ) > 0 ) &&
( ( modFlags & KKey::ALT ) > 0 ) == ( ( state & Qt::AltButton ) > 0 ) && ( ( modFlags & KKey::ALT ) > 0 ) == ( ( state & TQt::AltButton ) > 0 ) &&
( ( modFlags & KKey::WIN ) > 0 ) == ( ( state & Qt::MetaButton ) > 0 ) ) ( ( modFlags & KKey::WIN ) > 0 ) == ( ( state & TQt::MetaButton ) > 0 ) )
{ {
activeWindow() ->updateTimeStamp(); activeWindow() ->updateTimeStamp();
setSwitching( false ); setSwitching( false );
@ -1291,7 +1291,7 @@ void KMdiMainFrm::findRootDockWidgets( TQPtrList<KDockWidget>* rootDockWidgetLis
KDockWidget* dockWindow = 0L; /* pDockW */ KDockWidget* dockWindow = 0L; /* pDockW */
KDockWidget* rootDockWindow = 0L; /* pRootDockWindow */ KDockWidget* rootDockWindow = 0L; /* pRootDockWindow */
KDockWidget* undockCandidate = 0L; /* pUndockCandidate */ KDockWidget* undockCandidate = 0L; /* pUndockCandidate */
TQWidget* pW = static_cast<TQWidget*>( ( *it ) ); TQWidget* pW = TQT_TQWIDGET( ( *it ) );
// find the oldest ancestor of the current dockwidget that can be undocked // find the oldest ancestor of the current dockwidget that can be undocked
while ( !pW->isTopLevel() ) while ( !pW->isTopLevel() )

@ -296,7 +296,7 @@ private:
// methods // methods
public: public:
KMdiMainFrm( TQWidget* tqparentWidget, const char* name = "", KMdi::MdiMode mdiMode = KMdi::ChildframeMode, WFlags flags = WType_TopLevel | WDestructiveClose ); KMdiMainFrm( TQWidget* tqparentWidget, const char* name = "", KMdi::MdiMode mdiMode = KMdi::ChildframeMode, WFlags flags = (WFlags)(WType_TopLevel | WDestructiveClose) );
virtual ~KMdiMainFrm(); virtual ~KMdiMainFrm();
/** /**

@ -26,6 +26,10 @@
// //
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
#ifdef None
#undef None
#endif
#include "kmditaskbar.h" #include "kmditaskbar.h"
#include "kmditaskbar.moc" #include "kmditaskbar.moc"
@ -63,7 +67,7 @@ KMdiTaskBarButton::KMdiTaskBarButton( KMdiTaskBar *pTaskBar, KMdiChildView *win_
m_pWindow = win_ptr; m_pWindow = win_ptr;
TQToolTip::add TQToolTip::add
( this, win_ptr->caption() ); ( this, win_ptr->caption() );
setFocusPolicy( NoFocus ); setFocusPolicy( TQ_NoFocus );
} }
KMdiTaskBarButton::~KMdiTaskBarButton() KMdiTaskBarButton::~KMdiTaskBarButton()
@ -73,10 +77,10 @@ void KMdiTaskBarButton::mousePressEvent( TQMouseEvent* e )
{ {
switch ( e->button() ) switch ( e->button() )
{ {
case TQMouseEvent::LeftButton: case Qt::LeftButton:
emit leftMouseButtonClicked( m_pWindow ); emit leftMouseButtonClicked( m_pWindow );
break; break;
case TQMouseEvent::RightButton: case Qt::RightButton:
emit rightMouseButtonClicked( m_pWindow ); emit rightMouseButtonClicked( m_pWindow );
break; break;
default: default:
@ -152,7 +156,7 @@ KMdiTaskBar::KMdiTaskBar( KMdiMainFrm *parent, TQMainWindow::ToolBarDock dock )
m_pButtonList->setAutoDelete( true ); m_pButtonList->setAutoDelete( true );
//QT30 setFontPropagation(TQWidget::SameFont); //QT30 setFontPropagation(TQWidget::SameFont);
setMinimumWidth( 1 ); setMinimumWidth( 1 );
setFocusPolicy( NoFocus ); setFocusPolicy( TQ_NoFocus );
parent->moveToolBar( this, dock ); //XXX obsolete! parent->moveToolBar( this, dock ); //XXX obsolete!
} }
@ -337,8 +341,8 @@ void KMdiTaskBar::layoutTaskBar( int taskBarWidth )
// if there's enough space, use actual width // if there's enough space, use actual width
int buttonCount = m_pButtonList->count(); int buttonCount = m_pButtonList->count();
int tbHandlePixel; int tbHandlePixel;
tbHandlePixel = style().tqpixelMetric( TQStyle::PM_DockWindowHandleExtent, this ); tbHandlePixel = tqstyle().tqpixelMetric( TQStyle::PM_DockWindowHandleExtent, this );
int buttonAreaWidth = taskBarWidth - tbHandlePixel - style().tqpixelMetric( TQStyle::PM_DefaultFrameWidth, this ) - 5; int buttonAreaWidth = taskBarWidth - tbHandlePixel - tqstyle().tqpixelMetric( TQStyle::PM_DefaultFrameWidth, this ) - 5;
if ( ( ( allButtonsWidthHint ) <= buttonAreaWidth ) || ( width() < tqparentWidget() ->width() ) ) if ( ( ( allButtonsWidthHint ) <= buttonAreaWidth ) || ( width() < tqparentWidget() ->width() ) )
{ {
for ( b = m_pButtonList->first();b;b = m_pButtonList->next() ) for ( b = m_pButtonList->first();b;b = m_pButtonList->next() )

@ -186,7 +186,7 @@ void KMdiToolViewAccessor::place( KDockWidget::DockPosition pos, TQWidget* pTarg
if ( pos == KDockWidget::DockNone ) if ( pos == KDockWidget::DockNone )
{ {
d->widgetContainer->setEnableDocking( KDockWidget::DockNone ); d->widgetContainer->setEnableDocking( KDockWidget::DockNone );
d->widgetContainer->reparent( mdiMainFrm, Qt::WType_TopLevel | Qt::WType_Dialog, TQPoint( 0, 0 ), true ); //pToolView->isVisible()); d->widgetContainer->reparent( mdiMainFrm, (WFlags)(WType_TopLevel | WType_Dialog), TQPoint( 0, 0 ), true ); //pToolView->isVisible());
} }
else else
{ // add (and dock) the toolview as DockWidget view { // add (and dock) the toolview as DockWidget view

@ -101,7 +101,7 @@ namespace KParts
{ {
KParts::Part *object = factory->createPart( tqparentWidget, widgetName, KParts::Part *object = factory->createPart( tqparentWidget, widgetName,
parent, name, parent, name,
T::staticMetaObject()->className(), T::tqstaticMetaObject()->className(),
args ); args );
T *result = dynamic_cast<T *>( object ); T *result = dynamic_cast<T *>( object );

@ -98,7 +98,7 @@ void KTimerDialog::setMainWidget( TQWidget *widget )
if ( widget->tqparentWidget() != mainWidget ) { if ( widget->tqparentWidget() != mainWidget ) {
widget->reparent( newWidget, 0, TQPoint(0,0) ); widget->reparent( newWidget, 0, TQPoint(0,0) );
} else { } else {
newWidget->insertChild( widget ); newWidget->insertChild( TQT_TQOBJECT(widget) );
} }
timerWidget->reparent( newWidget, 0, TQPoint(0, 0) ); timerWidget->reparent( newWidget, 0, TQPoint(0, 0) );

@ -65,16 +65,16 @@ public slots:
bool confirm(); bool confirm();
public: public:
QString changedMessage() const; TQString changedMessage() const;
bool changedFromOriginal() const; bool changedFromOriginal() const;
void proposeOriginal(); void proposeOriginal();
bool proposedChanged() const; bool proposedChanged() const;
static QString rotationName(int rotation, bool pastTense = false, bool capitalised = true); static TQString rotationName(int rotation, bool pastTense = false, bool capitalised = true);
QPixmap rotationIcon(int rotation) const; TQPixmap rotationIcon(int rotation) const;
QString currentRotationDescription() const; TQString currentRotationDescription() const;
int rotationIndexToDegree(int rotation) const; int rotationIndexToDegree(int rotation) const;
int rotationDegreeToIndex(int degree) const; int rotationDegreeToIndex(int degree) const;
@ -84,12 +84,12 @@ public:
*/ */
TQStringList refreshRates(int size) const; TQStringList refreshRates(int size) const;
QString refreshRateDirectDescription(int rate) const; TQString refreshRateDirectDescription(int rate) const;
QString refreshRateIndirectDescription(int size, int index) const; TQString refreshRateIndirectDescription(int size, int index) const;
QString refreshRateDescription(int size, int index) const; TQString refreshRateDescription(int size, int index) const;
int currentRefreshRate() const; int currentRefreshRate() const;
QString currentRefreshRateDescription() const; TQString currentRefreshRateDescription() const;
// Refresh rate hz <==> index conversion // Refresh rate hz <==> index conversion
int refreshRateHzToIndex(int size, int hz) const; int refreshRateHzToIndex(int size, int hz) const;

@ -65,7 +65,7 @@ Broker *Broker::openBroker( KSharedConfig *config )
preventDeletion = config; preventDeletion = config;
if ( s_brokers ) { if ( s_brokers ) {
Broker *broker = s_brokers->find( preventDeletion ); Broker *broker = s_brokers->tqfind( preventDeletion );
if ( broker ) if ( broker )
return broker; return broker;
} }

@ -260,7 +260,7 @@ ISpellChecker::checkWord( const TQString& utf8Word )
return retVal; return retVal;
} }
QStringList TQStringList
ISpellChecker::suggestWord(const TQString& utf8Word) ISpellChecker::suggestWord(const TQString& utf8Word)
{ {
ichar_t iWord[INPUTWORDLEN + MAXAFFIXLEN]; ichar_t iWord[INPUTWORDLEN + MAXAFFIXLEN];
@ -358,7 +358,7 @@ ISpellChecker::allDics()
return ispell_dict_map.keys(); return ispell_dict_map.keys();
} }
QString TQString
ISpellChecker::loadDictionary (const char * szdict) ISpellChecker::loadDictionary (const char * szdict)
{ {
std::vector<std::string> dict_names; std::vector<std::string> dict_names;

@ -94,7 +94,7 @@ void Settings::setDefaultClient( const TQString& client )
//Different from setDefaultLanguage because //Different from setDefaultLanguage because
//the number of clients can't be even close //the number of clients can't be even close
//as big as the number of languages //as big as the number of languages
if ( d->broker->clients().contains( client ) ) { if ( d->broker->clients().tqcontains( client ) ) {
d->defaultClient = client; d->defaultClient = client;
d->modified = true; d->modified = true;
d->broker->changed(); d->broker->changed();
@ -167,7 +167,7 @@ TQStringList Settings::currentIgnoreList() const
void Settings::addWordToIgnore( const TQString& word ) void Settings::addWordToIgnore( const TQString& word )
{ {
if ( !d->ignore.contains( word ) ) { if ( !d->ignore.tqcontains( word ) ) {
d->modified = true; d->modified = true;
d->ignore.insert( word, true ); d->ignore.insert( word, true );
} }
@ -175,7 +175,7 @@ void Settings::addWordToIgnore( const TQString& word )
bool Settings::ignore( const TQString& word ) bool Settings::ignore( const TQString& word )
{ {
return d->ignore.contains( word ); return d->ignore.tqcontains( word );
} }
void Settings::readIgnoreList() void Settings::readIgnoreList()

@ -2,7 +2,7 @@
<class>KSpell2ConfigUI</class> <class>KSpell2ConfigUI</class>
<comment>Licensed under GNU LGPL</comment> <comment>Licensed under GNU LGPL</comment>
<author>Zack Rusin &lt;zack@kde.org&gt;</author> <author>Zack Rusin &lt;zack@kde.org&gt;</author>
<widget class="QWidget"> <widget class="TQWidget">
<property name="name"> <property name="name">
<cstring>KSpell2ConfigUI</cstring> <cstring>KSpell2ConfigUI</cstring>
</property> </property>
@ -26,7 +26,7 @@
<string>This is the default language that the spell checker will use. The drop down box will list all of the dictionaries of your existing languages.</string> <string>This is the default language that the spell checker will use. The drop down box will list all of the dictionaries of your existing languages.</string>
</property> </property>
</widget> </widget>
<widget class="QGroupBox" row="1" column="0" rowspan="1" colspan="2"> <widget class="TQGroupBox" row="1" column="0" rowspan="1" colspan="2">
<property name="name"> <property name="name">
<cstring>groupBox1</cstring> <cstring>groupBox1</cstring>
</property> </property>
@ -37,7 +37,7 @@
<property name="name"> <property name="name">
<cstring>unnamed</cstring> <cstring>unnamed</cstring>
</property> </property>
<widget class="QCheckBox" row="0" column="0"> <widget class="TQCheckBox" row="0" column="0">
<property name="name"> <property name="name">
<cstring>m_bgSpellCB</cstring> <cstring>m_bgSpellCB</cstring>
</property> </property>
@ -48,7 +48,7 @@
<string>If checked, the "spell as you type" mode is active and all misspelled words are immediately highlighted.</string> <string>If checked, the "spell as you type" mode is active and all misspelled words are immediately highlighted.</string>
</property> </property>
</widget> </widget>
<widget class="QCheckBox" row="1" column="0"> <widget class="TQCheckBox" row="1" column="0">
<property name="name"> <property name="name">
<cstring>m_skipUpperCB</cstring> <cstring>m_skipUpperCB</cstring>
</property> </property>
@ -59,7 +59,7 @@
<string>If checked, words that consist of only uppercase letters are not spell checked. This is useful if you have a lot of acronyms, such as KDE for example.</string> <string>If checked, words that consist of only uppercase letters are not spell checked. This is useful if you have a lot of acronyms, such as KDE for example.</string>
</property> </property>
</widget> </widget>
<widget class="QCheckBox" row="2" column="0"> <widget class="TQCheckBox" row="2" column="0">
<property name="name"> <property name="name">
<cstring>m_skipRunTogetherCB</cstring> <cstring>m_skipRunTogetherCB</cstring>
</property> </property>
@ -72,7 +72,7 @@
</widget> </widget>
</grid> </grid>
</widget> </widget>
<widget class="QLabel" row="0" column="0"> <widget class="TQLabel" row="0" column="0">
<property name="name"> <property name="name">
<cstring>textLabel1</cstring> <cstring>textLabel1</cstring>
</property> </property>

@ -69,7 +69,7 @@ Dialog::Dialog( BackgroundChecker *checker,
initGui(); initGui();
initConnections(); initConnections();
setMainWidget( d->ui ); setMainWidget( TQT_TQWIDGET(d->ui) );
} }
Dialog::~Dialog() Dialog::~Dialog()
@ -79,27 +79,27 @@ Dialog::~Dialog()
void Dialog::initConnections() void Dialog::initConnections()
{ {
connect( d->ui->m_addBtn, TQT_SIGNAL(clicked()), connect( TQT_TQOBJECT(d->ui->m_addBtn), TQT_SIGNAL(clicked()),
TQT_SLOT(slotAddWord()) ); TQT_SLOT(slotAddWord()) );
connect( d->ui->m_replaceBtn, TQT_SIGNAL(clicked()), connect( TQT_TQOBJECT(d->ui->m_replaceBtn), TQT_SIGNAL(clicked()),
TQT_SLOT(slotReplaceWord()) ); TQT_SLOT(slotReplaceWord()) );
connect( d->ui->m_replaceAllBtn, TQT_SIGNAL(clicked()), connect( TQT_TQOBJECT(d->ui->m_replaceAllBtn), TQT_SIGNAL(clicked()),
TQT_SLOT(slotReplaceAll()) ); TQT_SLOT(slotReplaceAll()) );
connect( d->ui->m_skipBtn, TQT_SIGNAL(clicked()), connect( TQT_TQOBJECT(d->ui->m_skipBtn), TQT_SIGNAL(clicked()),
TQT_SLOT(slotSkip()) ); TQT_SLOT(slotSkip()) );
connect( d->ui->m_skipAllBtn, TQT_SIGNAL(clicked()), connect( TQT_TQOBJECT(d->ui->m_skipAllBtn), TQT_SIGNAL(clicked()),
TQT_SLOT(slotSkipAll()) ); TQT_SLOT(slotSkipAll()) );
connect( d->ui->m_suggestBtn, TQT_SIGNAL(clicked()), connect( TQT_TQOBJECT(d->ui->m_suggestBtn), TQT_SIGNAL(clicked()),
TQT_SLOT(slotSuggest()) ); TQT_SLOT(slotSuggest()) );
connect( d->ui->m_language, TQT_SIGNAL(activated(const TQString&)), connect( TQT_TQOBJECT(d->ui->m_language), TQT_SIGNAL(activated(const TQString&)),
TQT_SLOT(slotChangeLanguage(const TQString&)) ); TQT_SLOT(slotChangeLanguage(const TQString&)) );
connect( d->ui->m_suggestions, TQT_SIGNAL(selectionChanged(TQListViewItem*)), connect( TQT_TQOBJECT(d->ui->m_suggestions), TQT_SIGNAL(selectionChanged(TQListViewItem*)),
TQT_SLOT(slotSelectionChanged(TQListViewItem*)) ); TQT_SLOT(slotSelectionChanged(TQListViewItem*)) );
connect( d->checker, TQT_SIGNAL(misspelling(const TQString&, int)), connect( TQT_TQOBJECT(d->checker), TQT_SIGNAL(misspelling(const TQString&, int)),
TQT_SIGNAL(misspelling(const TQString&, int)) ); TQT_SIGNAL(misspelling(const TQString&, int)) );
connect( d->checker, TQT_SIGNAL(misspelling(const TQString&, int)), connect( TQT_TQOBJECT(d->checker), TQT_SIGNAL(misspelling(const TQString&, int)),
TQT_SLOT(slotMisspelling(const TQString&, int)) ); TQT_SLOT(slotMisspelling(const TQString&, int)) );
connect( d->checker, TQT_SIGNAL(done()), connect( TQT_TQOBJECT(d->checker), TQT_SIGNAL(done()),
TQT_SLOT(slotDone()) ); TQT_SLOT(slotDone()) );
connect( d->ui->m_suggestions, TQT_SIGNAL(doubleClicked(TQListViewItem*, const TQPoint&, int)), connect( d->ui->m_suggestions, TQT_SIGNAL(doubleClicked(TQListViewItem*, const TQPoint&, int)),
TQT_SLOT( slotReplaceWord() ) ); TQT_SLOT( slotReplaceWord() ) );
@ -261,7 +261,7 @@ void Dialog::slotMisspelling(const TQString& word, int start )
{ {
kdDebug()<<"Dialog misspelling!!"<<endl; kdDebug()<<"Dialog misspelling!!"<<endl;
d->currentWord = Word( word, start ); d->currentWord = Word( word, start );
if ( d->replaceAllMap.contains( word ) ) { if ( d->replaceAllMap.tqcontains( word ) ) {
d->ui->m_replacement->setText( d->replaceAllMap[ word ] ); d->ui->m_replacement->setText( d->replaceAllMap[ word ] );
slotReplaceWord(); slotReplaceWord();
} else { } else {

@ -1,6 +1,6 @@
<!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <!DOCTYPE UI><UI version="3.2" stdsetdef="1">
<class>KSpell2UI</class> <class>KSpell2UI</class>
<widget class="QWidget"> <widget class="TQWidget">
<property name="name"> <property name="name">
<cstring>KSpell2UI</cstring> <cstring>KSpell2UI</cstring>
</property> </property>
@ -30,7 +30,7 @@
<property name="name"> <property name="name">
<cstring>unnamed</cstring> <cstring>unnamed</cstring>
</property> </property>
<widget class="QLabel" row="1" column="0" rowspan="1" colspan="2"> <widget class="TQLabel" row="1" column="0" rowspan="1" colspan="2">
<property name="name"> <property name="name">
<cstring>textLabel2</cstring> <cstring>textLabel2</cstring>
</property> </property>
@ -44,7 +44,7 @@
&lt;/qt&gt;</string> &lt;/qt&gt;</string>
</property> </property>
</widget> </widget>
<widget class="QLabel" row="1" column="2"> <widget class="TQLabel" row="1" column="2">
<property name="name"> <property name="name">
<cstring>m_unknownWord</cstring> <cstring>m_unknownWord</cstring>
</property> </property>
@ -61,7 +61,7 @@
&lt;/qt&gt;</string> &lt;/qt&gt;</string>
</property> </property>
</widget> </widget>
<widget class="QLabel" row="4" column="0"> <widget class="TQLabel" row="4" column="0">
<property name="name"> <property name="name">
<cstring>textLabel5</cstring> <cstring>textLabel5</cstring>
</property> </property>
@ -77,7 +77,7 @@
&lt;/qt&gt;</string> &lt;/qt&gt;</string>
</property> </property>
</widget> </widget>
<widget class="QLabel" row="0" column="0" rowspan="1" colspan="6"> <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="6">
<property name="name"> <property name="name">
<cstring>m_contextLabel</cstring> <cstring>m_contextLabel</cstring>
</property> </property>
@ -99,7 +99,7 @@
&lt;/qt&gt;</string> &lt;/qt&gt;</string>
</property> </property>
</widget> </widget>
<widget class="QPushButton" row="1" column="4" rowspan="1" colspan="2"> <widget class="TQPushButton" row="1" column="4" rowspan="1" colspan="2">
<property name="name"> <property name="name">
<cstring>m_addBtn</cstring> <cstring>m_addBtn</cstring>
</property> </property>
@ -130,7 +130,7 @@ Click here if you consider that the unknown word is not misspelled and you want
</size> </size>
</property> </property>
</spacer> </spacer>
<widget class="QListView" row="3" column="0" rowspan="1" colspan="5"> <widget class="TQListView" row="3" column="0" rowspan="1" colspan="5">
<column> <column>
<property name="text"> <property name="text">
<string>Suggested Words</string> <string>Suggested Words</string>
@ -158,7 +158,7 @@ Click here if you consider that the unknown word is not misspelled and you want
&lt;/qt&gt;</string> &lt;/qt&gt;</string>
</property> </property>
</widget> </widget>
<widget class="QLabel" row="2" column="0" rowspan="1" colspan="2"> <widget class="TQLabel" row="2" column="0" rowspan="1" colspan="2">
<property name="name"> <property name="name">
<cstring>textLabel4</cstring> <cstring>textLabel4</cstring>
</property> </property>
@ -175,7 +175,7 @@ Click here if you consider that the unknown word is not misspelled and you want
&lt;/qt&gt;</string> &lt;/qt&gt;</string>
</property> </property>
</widget> </widget>
<widget class="QLineEdit" row="2" column="2" rowspan="1" colspan="3"> <widget class="TQLineEdit" row="2" column="2" rowspan="1" colspan="3">
<property name="name"> <property name="name">
<cstring>m_replacement</cstring> <cstring>m_replacement</cstring>
</property> </property>
@ -186,7 +186,7 @@ Click here if you consider that the unknown word is not misspelled and you want
&lt;/qt&gt;</string> &lt;/qt&gt;</string>
</property> </property>
</widget> </widget>
<widget class="QComboBox" row="4" column="1" rowspan="1" colspan="4"> <widget class="TQComboBox" row="4" column="1" rowspan="1" colspan="4">
<item> <item>
<property name="text"> <property name="text">
<string>English</string> <string>English</string>
@ -212,7 +212,7 @@ Click here if you consider that the unknown word is not misspelled and you want
<property name="name"> <property name="name">
<cstring>unnamed</cstring> <cstring>unnamed</cstring>
</property> </property>
<widget class="QPushButton"> <widget class="TQPushButton">
<property name="name"> <property name="name">
<cstring>m_suggestBtn</cstring> <cstring>m_suggestBtn</cstring>
</property> </property>
@ -220,7 +220,7 @@ Click here if you consider that the unknown word is not misspelled and you want
<string>S&amp;uggest</string> <string>S&amp;uggest</string>
</property> </property>
</widget> </widget>
<widget class="QPushButton"> <widget class="TQPushButton">
<property name="name"> <property name="name">
<cstring>m_replaceBtn</cstring> <cstring>m_replaceBtn</cstring>
</property> </property>
@ -233,7 +233,7 @@ Click here if you consider that the unknown word is not misspelled and you want
&lt;/qt&gt;</string> &lt;/qt&gt;</string>
</property> </property>
</widget> </widget>
<widget class="QPushButton"> <widget class="TQPushButton">
<property name="name"> <property name="name">
<cstring>m_replaceAllBtn</cstring> <cstring>m_replaceAllBtn</cstring>
</property> </property>
@ -246,7 +246,7 @@ Click here if you consider that the unknown word is not misspelled and you want
&lt;/qt&gt;</string> &lt;/qt&gt;</string>
</property> </property>
</widget> </widget>
<widget class="QPushButton"> <widget class="TQPushButton">
<property name="name"> <property name="name">
<cstring>m_skipBtn</cstring> <cstring>m_skipBtn</cstring>
</property> </property>
@ -260,7 +260,7 @@ Click here if you consider that the unknown word is not misspelled and you want
&lt;/qt&gt;</string> &lt;/qt&gt;</string>
</property> </property>
</widget> </widget>
<widget class="QPushButton"> <widget class="TQPushButton">
<property name="name"> <property name="name">
<cstring>m_skipAllBtn</cstring> <cstring>m_skipAllBtn</cstring>
</property> </property>
@ -274,7 +274,7 @@ Click here if you consider that the unknown word is not misspelled and you want
&lt;/qt&gt;</string> &lt;/qt&gt;</string>
</property> </property>
</widget> </widget>
<widget class="QPushButton"> <widget class="TQPushButton">
<property name="name"> <property name="name">
<cstring>m_autoCorrect</cstring> <cstring>m_autoCorrect</cstring>
</property> </property>

Loading…
Cancel
Save