diff options
Diffstat (limited to 'kexi/main')
51 files changed, 1898 insertions, 1875 deletions
diff --git a/kexi/main/kexifinddialog.cpp b/kexi/main/kexifinddialog.cpp index 58f693c06..d74749589 100644 --- a/kexi/main/kexifinddialog.cpp +++ b/kexi/main/kexifinddialog.cpp @@ -29,11 +29,11 @@ #include <kaction.h> #include <kiconloader.h> -#include <qcheckbox.h> -#include <qlabel.h> -#include <qguardedptr.h> -#include <qlayout.h> -#include <qaccel.h> +#include <tqcheckbox.h> +#include <tqlabel.h> +#include <tqguardedptr.h> +#include <tqlayout.h> +#include <tqaccel.h> //! @internal class KexiFindDialog::Private @@ -48,60 +48,60 @@ class KexiFindDialog::Private } //! Connects action \a action with appropriate signal \a member //! and optionally adds accel that will receive shortcut for \a action - //! at global scope of the dialog \a parent. - void setActionAndAccel(KAction *action, QWidget* parent, const char* member) + //! at global scope of the dialog \a tqparent. + void setActionAndAccel(KAction *action, TQWidget* tqparent, const char* member) { if (!action) return; - QObject::connect(parent, member, action, SLOT(activate())); + TQObject::connect(tqparent, member, action, TQT_SLOT(activate())); if (action->shortcut().isNull()) return; - QAccel *accel = new QAccel(parent); // we want to handle dialog-wide shortcut as well + TQAccel *accel = new TQAccel(tqparent); // we want to handle dialog-wide shortcut as well accels.append( accel ); accel->connectItem( - accel->insertItem( action->shortcut() ), parent, member ); + accel->insertItem( action->shortcut() ), tqparent, member ); } - QStringList lookInColumnNames; - QStringList lookInColumnCaptions; - QString objectName; //!< for caption - QGuardedPtr<KAction> findnextAction; - QGuardedPtr<KAction> findprevAction; - QGuardedPtr<KAction> replaceAction; - QGuardedPtr<KAction> replaceallAction; - QPtrList<QAccel> accels; + TQStringList lookInColumnNames; + TQStringList lookInColumnCaptions; + TQString objectName; //!< for caption + TQGuardedPtr<KAction> findnextAction; + TQGuardedPtr<KAction> findprevAction; + TQGuardedPtr<KAction> replaceAction; + TQGuardedPtr<KAction> replaceallAction; + TQPtrList<TQAccel> accels; bool replaceMode : 1; }; //------------------------------------------ -KexiFindDialog::KexiFindDialog( QWidget* parent ) - : KexiFindDialogBase(parent, "KexiFindDialog", false/*!modal*/, - Qt::WType_Dialog|Qt::WStyle_NormalBorder|Qt::WStyle_Title - |Qt::WStyle_SysMenu|Qt::WStyle_Customize|Qt::WStyle_Tool) +KexiFindDialog::KexiFindDialog( TQWidget* tqparent ) + : KexiFindDialogBase(tqparent, "KexiFindDialog", false/*!modal*/, + TQt::WType_Dialog|TQt::WStyle_NormalBorder|TQt::WStyle_Title + |TQt::WStyle_SysMenu|TQt::WStyle_Customize|TQt::WStyle_Tool) , d( new Private() ) { m_search->setCurrentItem((int)KexiSearchAndReplaceViewInterface::Options::SearchDown); - layout()->setMargin( KDialog::marginHint() ); - layout()->setSpacing( KDialog::spacingHint() ); + tqlayout()->setMargin( KDialog::marginHint() ); + tqlayout()->setSpacing( KDialog::spacingHint() ); KAction *a = KStdAction::findNext(0, 0, 0); m_btnFind->setText(a->text()); m_btnFind->setIconSet(a->iconSet()); delete a; m_btnClose->setText(KStdGuiItem::close().text()); m_btnClose->setIconSet(KStdGuiItem::close().iconSet()); - connect(m_btnFind, SIGNAL(clicked()), this, SIGNAL(findNext())); - connect(m_btnClose, SIGNAL(clicked()), this, SLOT(slotCloseClicked())); - connect(m_btnReplace, SIGNAL(clicked()), this, SIGNAL(replaceNext())); - connect(m_btnReplaceAll, SIGNAL(clicked()), this, SIGNAL(replaceAll())); + connect(m_btnFind, TQT_SIGNAL(clicked()), this, TQT_SIGNAL(findNext())); + connect(m_btnClose, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotCloseClicked())); + connect(m_btnReplace, TQT_SIGNAL(clicked()), this, TQT_SIGNAL(replaceNext())); + connect(m_btnReplaceAll, TQT_SIGNAL(clicked()), this, TQT_SIGNAL(replaceAll())); // clear message after the text is changed - connect(m_textToFind, SIGNAL(textChanged()), this, SIGNAL(updateMessage())); - connect(m_textToReplace, SIGNAL(textChanged()), this, SIGNAL(updateMessage())); + connect(m_textToFind, TQT_SIGNAL(textChanged()), this, TQT_SIGNAL(updateMessage())); + connect(m_textToReplace, TQT_SIGNAL(textChanged()), this, TQT_SIGNAL(updateMessage())); d->replaceMode = true; //to force updating by setReplaceMode() setReplaceMode(false); - setLookInColumnList(QStringList(), QStringList()); + setLookInColumnList(TQStringList(), TQStringList()); } KexiFindDialog::~KexiFindDialog() @@ -110,51 +110,51 @@ KexiFindDialog::~KexiFindDialog() } void KexiFindDialog::setActions( KAction *findnext, KAction *findprev, - KAction *replace, KAction *replaceall ) + KAction *tqreplace, KAction *replaceall ) { d->findnextAction = findnext; d->findprevAction = findprev; - d->replaceAction = replace; + d->replaceAction = tqreplace; d->replaceallAction = replaceall; d->accels.clear(); - d->setActionAndAccel(d->findnextAction, this, SIGNAL(findNext())); - d->setActionAndAccel(d->findprevAction, this, SIGNAL(findPrevious())); - d->setActionAndAccel(d->replaceAction, this, SIGNAL(replaceNext())); - d->setActionAndAccel(d->replaceallAction, this, SIGNAL(replaceAll())); + d->setActionAndAccel(d->findnextAction, this, TQT_SIGNAL(findNext())); + d->setActionAndAccel(d->findprevAction, this, TQT_SIGNAL(findPrevious())); + d->setActionAndAccel(d->replaceAction, this, TQT_SIGNAL(replaceNext())); + d->setActionAndAccel(d->replaceallAction, this, TQT_SIGNAL(replaceAll())); } -QStringList KexiFindDialog::lookInColumnNames() const +TQStringList KexiFindDialog::lookInColumnNames() const { return d->lookInColumnNames; } -QStringList KexiFindDialog::lookInColumnCaptions() const +TQStringList KexiFindDialog::lookInColumnCaptions() const { return d->lookInColumnCaptions; } -QString KexiFindDialog::currentLookInColumnName() const +TQString KexiFindDialog::currentLookInColumnName() const { int index = m_lookIn->currentItem(); if (index <= 0 || index >= (int)d->lookInColumnNames.count()) - return QString::null; + return TQString(); else if (index == 1) return "(field)"; return d->lookInColumnNames[index - 1/*"(All fields)"*/ - 1/*"(Current field)"*/]; } -QVariant KexiFindDialog::valueToFind() const +TQVariant KexiFindDialog::valueToFind() const { return m_textToFind->currentText(); } -QVariant KexiFindDialog::valueToReplaceWith() const +TQVariant KexiFindDialog::valueToReplaceWith() const { return m_textToReplace->currentText(); } -void KexiFindDialog::setLookInColumnList(const QStringList& columnNames, - const QStringList& columnCaptions) +void KexiFindDialog::setLookInColumnList(const TQStringList& columnNames, + const TQStringList& columnCaptions) { d->lookInColumnNames = columnNames; d->lookInColumnCaptions = columnCaptions; @@ -164,7 +164,7 @@ void KexiFindDialog::setLookInColumnList(const QStringList& columnNames, m_lookIn->insertStringList(d->lookInColumnCaptions); } -void KexiFindDialog::setCurrentLookInColumnName(const QString& columnName) +void KexiFindDialog::setCurrentLookInColumnName(const TQString& columnName) { int index; if (columnName.isEmpty()) @@ -172,10 +172,10 @@ void KexiFindDialog::setCurrentLookInColumnName(const QString& columnName) else if (columnName == "(field)") index = 1; else { - index = d->lookInColumnNames.findIndex( columnName ); + index = d->lookInColumnNames.tqfindIndex( columnName ); if (index == -1) { - kdWarning() << QString("KexiFindDialog::setCurrentLookInColumn(%1) column name not found on the list") - .arg(columnName) << endl; + kdWarning() << TQString("KexiFindDialog::setCurrentLookInColumn(%1) column name not found on the list") + .tqarg(columnName) << endl; return; } index = index + 1/*"(All fields)"*/ + 1/*"(Current field)"*/; @@ -207,20 +207,20 @@ void KexiFindDialog::setReplaceMode(bool set) updateGeometry(); } -void KexiFindDialog::setObjectNameForCaption(const QString& name) +void KexiFindDialog::setObjectNameForCaption(const TQString& name) { d->objectName = name; if (d->replaceMode) { if (name.isEmpty()) setCaption(i18n("Replace")); else - setCaption(i18n("Replace in \"%1\"").arg(name)); + setCaption(i18n("Replace in \"%1\"").tqarg(name)); } else { if (name.isEmpty()) setCaption(i18n("Find")); else - setCaption(i18n("Find in \"%1\"").arg(name)); + setCaption(i18n("Find in \"%1\"").tqarg(name)); } } @@ -230,10 +230,10 @@ void KexiFindDialog::setButtonsEnabled(bool enable) m_btnReplace->setEnabled(enable); m_btnReplaceAll->setEnabled(enable); if (!enable) - setObjectNameForCaption(QString::null); + setObjectNameForCaption(TQString()); } -void KexiFindDialog::setMessage(const QString& message) +void KexiFindDialog::setMessage(const TQString& message) { m_messageLabel->setText(message); } @@ -241,7 +241,7 @@ void KexiFindDialog::setMessage(const QString& message) void KexiFindDialog::updateMessage( bool found ) { if (found) - setMessage(QString::null); + setMessage(TQString()); else setMessage(i18n("The search item was not found")); } @@ -254,7 +254,7 @@ void KexiFindDialog::slotCloseClicked() void KexiFindDialog::show() { m_textToFind->setFocus(); - QDialog::show(); + TQDialog::show(); } KexiSearchAndReplaceViewInterface::Options KexiFindDialog::options() const diff --git a/kexi/main/kexifinddialog.h b/kexi/main/kexifinddialog.h index ea7777e06..9d0bf088c 100644 --- a/kexi/main/kexifinddialog.h +++ b/kexi/main/kexifinddialog.h @@ -34,14 +34,15 @@ class KAction; class KexiFindDialog : public KexiFindDialogBase { Q_OBJECT + TQ_OBJECT public: //! Creates a new find dialog. Replace mode is off by default. - KexiFindDialog(QWidget* parent); + KexiFindDialog(TQWidget* tqparent); virtual ~KexiFindDialog(); //! Sets actions that receive button clicks and shortcuts within the dialog. Should be called once. void setActions( KAction *findnext, KAction *findprev, - KAction *replace, KAction *replaceall ); + KAction *tqreplace, KAction *replaceall ); //! Shows the dialog as a modal dialog. virtual void show(); @@ -52,54 +53,54 @@ class KexiFindDialog : public KexiFindDialogBase /*! \return a list of column names for 'look in column' combo box. Neither "(All fields)" nor "(Current field)" items are prepended. */ - QStringList lookInColumnNames() const; + TQStringList lookInColumnNames() const; /*! \return a list of column captions (i.e. visible values) for 'look in column' combo box. Neither "(All fields)" nor "(Current field)" items are prepended. */ - QStringList lookInColumnCaptions() const; + TQStringList lookInColumnCaptions() const; /*! \return column name selected in "look in column" combo box. If "(All fields)" item is selected, empty string is returned. If "(Current field)" item is selected, "(field)" string is returned. */ - QString currentLookInColumnName() const; + TQString currentLookInColumnName() const; //! \return value that to be used for searching - QVariant valueToFind() const; + TQVariant valueToFind() const; //! \return value that to be used as a replacement - QVariant valueToReplaceWith() const; + TQVariant valueToReplaceWith() const; public slots: /*! Sets \a columnNames list and \a columnCaptions for 'look in column' combo box. \a columnCaptions are visible values, while \a columnNames are used for returning in currentLookInColumn(). "(All fields)" and "(Current field)" items are also prepended. */ - void setLookInColumnList(const QStringList& columnNames, - const QStringList& columnCaptions); + void setLookInColumnList(const TQStringList& columnNames, + const TQStringList& columnCaptions); /*! Selects \a columnName to be selected 'look in column'. By default "(All fields)" item is selected. To select this item, pass empty string as \a columnName. To select "(Current field)" item, "(field)" string should be passed as \a columnName. */ - void setCurrentLookInColumnName(const QString& columnName); + void setCurrentLookInColumnName(const TQString& columnName); /*! Sets or clears replace mode. - For replace mode 'prompt or replace' option is visible. */ + For replace mode 'prompt or tqreplace' option is visible. */ void setReplaceMode(bool set); /*! Sets object name for caption, so for example it will be set to i18n("Find \"Persons\"")). */ - void setObjectNameForCaption(const QString& name); + void setObjectNameForCaption(const TQString& name); - /*! Enables of disables the find/replace/replace all buttons. + /*! Enables of disables the tqfind/tqreplace/replace all buttons. This is used if for the current context the dialog could not be used. If \a enable is false, object name for caption is cleared using setObjectNameForCaption() too. */ void setButtonsEnabled(bool enable); /*! Sets message at the bottom to \a message. */ - void setMessage(const QString& message); + void setMessage(const TQString& message); /*! Updates message at the bottom; "The search item was not found" is set if \a found is true, else the message is cleared. */ diff --git a/kexi/main/kexifinddialogbase.ui b/kexi/main/kexifinddialogbase.ui index 3ba82bb50..5c7e66304 100644 --- a/kexi/main/kexifinddialogbase.ui +++ b/kexi/main/kexifinddialogbase.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>KexiFindDialogBase</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>KexiFindDialogBase</cstring> </property> @@ -19,7 +19,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -30,7 +30,7 @@ <cstring>m_textToFind</cstring> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>m_replaceLbl</cstring> </property> @@ -52,7 +52,7 @@ <enum>NoInsertion</enum> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>textLabel2_2</cstring> </property> @@ -63,7 +63,7 @@ <cstring>m_lookIn</cstring> </property> </widget> - <widget class="QCheckBox" row="5" column="2"> + <widget class="TQCheckBox" row="5" column="2"> <property name="name"> <cstring>m_wholeWords</cstring> </property> @@ -74,7 +74,7 @@ <string>&Whole words only</string> </property> </widget> - <widget class="QCheckBox" row="6" column="2"> + <widget class="TQCheckBox" row="6" column="2"> <property name="name"> <cstring>m_promptOnReplace</cstring> </property> @@ -82,15 +82,15 @@ <enum>WheelFocus</enum> </property> <property name="text"> - <string>Prompt on replace</string> + <string>Prompt on tqreplace</string> </property> <property name="checked"> <bool>true</bool> </property> </widget> - <widget class="QLayoutWidget" row="0" column="4" rowspan="7" colspan="1"> + <widget class="TQLayoutWidget" row="0" column="4" rowspan="7" colspan="1"> <property name="name"> - <cstring>layout_btn</cstring> + <cstring>tqlayout_btn</cstring> </property> <vbox> <property name="name"> @@ -150,7 +150,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>40</height> @@ -159,7 +159,7 @@ </spacer> </vbox> </widget> - <widget class="QLabel" row="4" column="0"> + <widget class="TQLabel" row="4" column="0"> <property name="name"> <cstring>textLabel2_2_3</cstring> </property> @@ -196,7 +196,7 @@ <enum>NoInsertion</enum> </property> </widget> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>textLabel2_2_2</cstring> </property> @@ -243,14 +243,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>2</height> </size> </property> </spacer> - <widget class="QCheckBox" row="4" column="2"> + <widget class="TQCheckBox" row="4" column="2"> <property name="name"> <cstring>m_caseSensitive</cstring> </property> @@ -261,7 +261,7 @@ <string>C&ase sensitive</string> </property> </widget> - <widget class="QLabel" row="8" column="0" rowspan="1" colspan="5"> + <widget class="TQLabel" row="8" column="0" rowspan="1" colspan="5"> <property name="name"> <cstring>m_messageLabel</cstring> </property> @@ -279,7 +279,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>70</width> <height>20</height> @@ -340,7 +340,7 @@ <tabstop>m_wholeWords</tabstop> <tabstop>m_promptOnReplace</tabstop> </tabstops> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kcombobox.h</includehint> <includehint>kpushbutton.h</includehint> diff --git a/kexi/main/keximainwindowimpl.cpp b/kexi/main/keximainwindowimpl.cpp index d5ce9939c..15491d5c8 100644 --- a/kexi/main/keximainwindowimpl.cpp +++ b/kexi/main/keximainwindowimpl.cpp @@ -22,19 +22,19 @@ #include <unistd.h> -#include <qapplication.h> -#include <qeventloop.h> -#include <qfile.h> -#include <qtimer.h> -#include <qobjectlist.h> -#include <qprocess.h> -#include <qtoolbutton.h> -#include <qtooltip.h> -#include <qmutex.h> -#include <qwaitcondition.h> -#include <qfiledialog.h> -#include <qdockwindow.h> -#include <qdockarea.h> +#include <tqapplication.h> +#include <tqeventloop.h> +#include <tqfile.h> +#include <tqtimer.h> +#include <tqobjectlist.h> +#include <tqprocess.h> +#include <tqtoolbutton.h> +#include <tqtooltip.h> +#include <tqmutex.h> +#include <tqwaitcondition.h> +#include <tqfiledialog.h> +#include <tqdockwindow.h> +#include <tqdockarea.h> #include <kapplication.h> #include <kcmdlineargs.h> @@ -101,7 +101,7 @@ #include "printing/kexisimpleprintingpagesetup.h" //Extreme verbose debug -#if defined(Q_WS_WIN) +#if defined(TQ_WS_WIN) # include <krecentdirs.h> # include <win32_utils.h> //# define KexiVDebug kdDebug() @@ -111,7 +111,7 @@ # define KexiVDebug if (0) kdDebug() #endif -//first fix the geometry +//first fix the tqgeometry //#define KEXI_NO_CTXT_HELP 1 #ifndef KEXI_NO_CTXT_HELP @@ -127,7 +127,7 @@ //! width changes will be removed in KMDI //#define PROPEDITOR_VISIBILITY_CHANGES -//temporary fix to manage layout +//temporary fix to manage tqlayout #include "ksplitter.h" #define KDOCKWIDGET_P 1 @@ -149,7 +149,7 @@ int KexiMainWindowImpl::create(int argc, char *argv[], KAboutData* aboutdata) Kexi::initCmdLineArgs( argc, argv, aboutdata ); bool GUIenabled = true; - QWidget *dummyWidget = 0; //needed to have icon for dialogs before KexiMainWindowImpl is created + TQWidget *dummyWidget = 0; //needed to have icon for dialogs before KexiMainWindowImpl is created //! @todo switch GUIenabled off when needed KApplication* app = new KApplication(true, GUIenabled); @@ -165,10 +165,10 @@ int KexiMainWindowImpl::create(int argc, char *argv[], KAboutData* aboutdata) #endif #ifdef KEXI_DEBUG_GUI - QWidget* debugWindow = 0; + TQWidget* debugWindow = 0; #endif if (GUIenabled) { - dummyWidget = new QWidget(); + dummyWidget = new TQWidget(); dummyWidget->setIcon( DesktopIcon( "kexi" ) ); app->setMainWidget(dummyWidget); #ifdef KEXI_DEBUG_GUI @@ -203,7 +203,7 @@ int KexiMainWindowImpl::create(int argc, char *argv[], KAboutData* aboutdata) app->setMainWidget(win); #ifdef KEXI_DEBUG_GUI //if (debugWindow) - //debugWindow->reparent(win, QPoint(1,1)); + //debugWindow->reparent(win, TQPoint(1,1)); #endif delete dummyWidget; @@ -242,11 +242,11 @@ KexiMainWindowImpl::KexiMainWindowImpl() d->config = kapp->config(); if ( !initialGeometrySet() ) { - int scnum = QApplication::desktop()->screenNumber(parentWidget()); - QRect desk = QApplication::desktop()->screenGeometry(scnum); + int scnum = TQApplication::desktop()->screenNumber(tqparentWidget()); + TQRect desk = TQApplication::desktop()->screenGeometry(scnum); d->config->setGroup("MainWindow"); - QSize s ( d->config->readNumEntry( QString::fromLatin1("Width %1").arg(desk.width()), 700 ), - d->config->readNumEntry( QString::fromLatin1("Height %1").arg(desk.height()), 480 ) ); + TQSize s ( d->config->readNumEntry( TQString::tqfromLatin1("Width %1").tqarg(desk.width()), 700 ), + d->config->readNumEntry( TQString::tqfromLatin1("Height %1").tqarg(desk.height()), 480 ) ); resize (kMin (s.width(), desk.width()), kMin(s.height(), desk.height())); } @@ -259,15 +259,15 @@ KexiMainWindowImpl::KexiMainWindowImpl() KGlobal::iconLoader()->addAppDir("koffice"); //get informed - connect(&Kexi::partManager(),SIGNAL(partLoaded(KexiPart::Part*)),this,SLOT(slotPartLoaded(KexiPart::Part*))); - connect( m_pMdi, SIGNAL(nowMaximized(bool)), this, SLOT(slotCaptionForCurrentMDIChild(bool)) ); - connect( m_pMdi, SIGNAL(noMaximizedChildFrmLeft(KMdiChildFrm*)), this, SLOT(slotNoMaximizedChildFrmLeft(KMdiChildFrm*))); -// connect( this, SIGNAL(lastChildFrmClosed()), this, SLOT(slotLastChildFrmClosed())); - connect( this, SIGNAL(lastChildViewClosed()), this, SLOT(slotLastChildViewClosed())); + connect(&Kexi::partManager(),TQT_SIGNAL(partLoaded(KexiPart::Part*)),this,TQT_SLOT(slotPartLoaded(KexiPart::Part*))); + connect( m_pMdi, TQT_SIGNAL(nowMaximized(bool)), TQT_TQOBJECT(this), TQT_SLOT(slotCaptionForCurrentMDIChild(bool)) ); + connect( m_pMdi, TQT_SIGNAL(noMaximizedChildFrmLeft(KMdiChildFrm*)), TQT_TQOBJECT(this), TQT_SLOT(slotNoMaximizedChildFrmLeft(KMdiChildFrm*))); +// connect( TQT_TQOBJECT(this), TQT_SIGNAL(lastChildFrmClosed()), TQT_TQOBJECT(this), TQT_SLOT(slotLastChildFrmClosed())); + connect( TQT_TQOBJECT(this), TQT_SIGNAL(lastChildViewClosed()), TQT_TQOBJECT(this), TQT_SLOT(slotLastChildViewClosed())); - connect( this, SIGNAL(childViewIsDetachedNow(QWidget*)), this, SLOT(slotChildViewIsDetachedNow(QWidget*))); - connect( this, SIGNAL(mdiModeHasBeenChangedTo(KMdi::MdiMode)), - this, SLOT(slotMdiModeHasBeenChangedTo(KMdi::MdiMode))); + connect( TQT_TQOBJECT(this), TQT_SIGNAL(childViewIsDetachedNow(TQWidget*)), TQT_TQOBJECT(this), TQT_SLOT(slotChildViewIsDetachedNow(TQWidget*))); + connect( TQT_TQOBJECT(this), TQT_SIGNAL(mdiModeHasBeenChangedTo(KMdi::MdiMode)), + TQT_TQOBJECT(this), TQT_SLOT(slotMdiModeHasBeenChangedTo(KMdi::MdiMode))); //if (!userMode()) { @@ -290,19 +290,19 @@ KexiMainWindowImpl::KexiMainWindowImpl() } {//store menu popups list - QObjectList *l = queryList( "QPopupMenu" ); - for (QObjectListIt it( *l ); it.current(); ++it ) { + TQObjectList *l = queryList( TQPOPUPMENU_OBJECT_NAME_STRING ); + for (TQObjectListIt it( *l ); it.current(); ++it ) { //kdDebug() << "name=" <<it.current()->name() << " cname="<<it.current()->className()<<endl; //KexiMainWindowImpl::eventFilter() will filter our popups: it.current()->installEventFilter(this); - d->popups.insert(it.current()->name(), static_cast<QPopupMenu*>(it.current())); + d->popups.insert(it.current()->name(), static_cast<TQPopupMenu*>(TQT_TQWIDGET(it.current()))); } delete l; d->createMenu = d->popups["create"]; #ifdef KEXI_NO_REPORTBUG_COMMAND //remove "bug report" action to avoid confusion for supported with commercial technical support - QPopupMenu *helpMenu = d->popups["help"]; + TQPopupMenu *helpMenu = d->popups["help"]; if (helpMenu) { //const int idx = helpMenu->indexOf( (int)KHelpMenu::menuReportBug ); helpMenu->removeItemAt(int(KHelpMenu::menuReportBug)-1); @@ -322,8 +322,8 @@ KexiMainWindowImpl::KexiMainWindowImpl() } if (!isFakingSDIApplication()/* && !userMode()*/) { -// QPopupMenu *menu = (QPopupMenu*) child( "window", "KPopupMenu" ); - QPopupMenu *menu = d->popups["window"]; +// TQPopupMenu *menu = (TQPopupMenu*) child( "window", "KPopupMenu" ); + TQPopupMenu *menu = d->popups["window"]; unsigned int count = menuBar()->count(); if (menu) setWindowMenu(menu); @@ -332,7 +332,7 @@ KexiMainWindowImpl::KexiMainWindowImpl() } if (userMode()) { //hide "insert" menu and disable "project_import", "edit_paste_special" menus - QPopupMenu *menu = d->popups["insert"]; + TQPopupMenu *menu = d->popups["insert"]; if (menu) { for (uint i=0; i < menuBar()->count(); i++) { if (menuBar()->text( menuBar()->idAt(i) ) == i18n("&Insert")) { @@ -348,8 +348,8 @@ KexiMainWindowImpl::KexiMainWindowImpl() m_pTaskBar->setCaption(i18n("Task Bar")); //js TODO: move this to KMDIlib // if (!userMode()) { - invalidateActions(); - d->timer.singleShot(0,this,SLOT(slotLastActions())); + tqinvalidateActions(); + d->timer.singleShot(0,this,TQT_SLOT(slotLastActions())); // } setTabWidgetVisibility(KMdi::AlwaysShowTabs); @@ -357,17 +357,17 @@ KexiMainWindowImpl::KexiMainWindowImpl() d->config->setGroup("MainWindow"); tabWidget()->setHoverCloseButton(d->config->readBoolEntry("HoverCloseButtonForTabs", false)); //create special close button as corner widget for IDEAl mode - QToolButton *closeButton = new QToolButton( tabWidget() ); + TQToolButton *closeButton = new TQToolButton( tabWidget() ); closeButton->setAutoRaise( true ); - closeButton->setPixmap( QPixmap( kde2_closebutton ) ); - closeButton->setPaletteBackgroundColor(closeButton->palette().active().background()); + closeButton->setPixmap( TQPixmap( kde2_closebutton ) ); + closeButton->setPaletteBackgroundColor(closeButton->tqpalette().active().background()); // closeButton->setIconSet(SmallIconSet("tab_remove")); - tabWidget()->setCornerWidget( closeButton, Qt::TopRight ); + tabWidget()->setCornerWidget( closeButton, TQt::TopRight ); closeButton->hide(); // hide until it's needed to avoid problems in "user mode" // when initially the main window is empty - QToolTip::add(closeButton, + TQToolTip::add(closeButton, i18n("Close the current tab page in Kexi tab interface", "Close the current tab")); - QObject::connect( closeButton, SIGNAL( clicked() ), this, SLOT( closeActiveView() ) ); + TQObject::connect( closeButton, TQT_SIGNAL( clicked() ), TQT_TQOBJECT(this), TQT_SLOT( closeActiveView() ) ); } #ifdef KEXI_ADD_CUSTOM_KEXIMAINWINDOWIMPL @@ -387,13 +387,13 @@ KexiProject *KexiMainWindowImpl::project() return d->prj; } -void KexiMainWindowImpl::setWindowMenu(QPopupMenu *menu) +void KexiMainWindowImpl::setWindowMenu(TQPopupMenu *menu) { delete m_pWindowMenu; m_pWindowMenu = menu; int count = menuBar()->count(); //try to move "window" menu just before "Settings" menu (count-3) - const QString txt = i18n("&Window"); + const TQString txt = i18n("&Window"); int i; for (i=0; i<count; i++) { //kdDebug() << menuBar()->text( menuBar()->idAt(i) ) << endl; @@ -406,7 +406,7 @@ void KexiMainWindowImpl::setWindowMenu(QPopupMenu *menu) menuBar()->insertItem(txt, m_pWindowMenu, id, count-3); } m_pWindowMenu->setCheckable(true); - QObject::connect( m_pWindowMenu, SIGNAL(aboutToShow()), this, SLOT(fillWindowMenu()) ); + TQObject::connect( m_pWindowMenu, TQT_SIGNAL(aboutToShow()), TQT_TQOBJECT(this), TQT_SLOT(fillWindowMenu()) ); } void KexiMainWindowImpl::fillWindowMenu() @@ -433,7 +433,7 @@ void KexiMainWindowImpl::fillWindowMenu() } //insert window_next, window_previous actions: -// const QString t = i18n("&Dock/Undock..."); +// const TQString t = i18n("&Dock/Undock..."); int i = m_pWindowMenu->count()-1; for (int index;; i--) { index = m_pWindowMenu->idAt(i); @@ -465,7 +465,7 @@ void KexiMainWindowImpl::switchToIDEAlMode(bool showMessage) else { KMessageBox::information(this, i18n("User interface mode will be switched to IDEAl at next %1 application startup.") - .arg(KEXI_APP_NAME)); + .tqarg(KEXI_APP_NAME)); //delayed d->mdiModeToSwitchAfterRestart = KMdi::IDEAlMode; } @@ -492,7 +492,7 @@ void KexiMainWindowImpl::switchToChildframeMode(bool showMessage) else { KMessageBox::information(this, i18n("User interface mode will be switched to Childframe at next %1 application startup.") - .arg(KEXI_APP_NAME)); + .tqarg(KEXI_APP_NAME)); //delayed d->mdiModeToSwitchAfterRestart = KMdi::ChildframeMode; } @@ -501,7 +501,7 @@ void KexiMainWindowImpl::switchToChildframeMode(bool showMessage) KexiMainWindow::switchToChildframeMode(); } -QPopupMenu* KexiMainWindowImpl::findPopupMenu(const char *popupName) +TQPopupMenu* KexiMainWindowImpl::findPopupMenu(const char *popupName) { return d->popups[popupName]; } @@ -520,78 +520,78 @@ void KexiMainWindowImpl::initActions() { // setupGUI(KMainWindow::Keys|KMainWindow::StatusBar|KMainWindow::Save|KMainWindow::Create); -// d->actionMapper = new QSignalMapper(this, "act_map"); -// connect(d->actionMapper, SIGNAL(mapped(const QString &)), this, SLOT(slotAction(const QString &))); +// d->actionMapper = new TQSignalMapper(this, "act_map"); +// connect(d->actionMapper, TQT_SIGNAL(mapped(const TQString &)), TQT_TQOBJECT(this), TQT_SLOT(slotAction(const TQString &))); // PROJECT MENU KAction *action = new KAction(i18n("&New..."), "filenew", KStdAccel::shortcut(KStdAccel::New), - this, SLOT(slotProjectNew()), actionCollection(), "project_new"); + TQT_TQOBJECT(this), TQT_SLOT(slotProjectNew()), actionCollection(), "project_new"); action->setToolTip(i18n("Create a new project")); action->setWhatsThis(i18n("Creates a new project. Currently opened project is not affected.")); - action = KStdAction::open( this, SLOT( slotProjectOpen() ), actionCollection(), "project_open" ); + action = KStdAction::open( TQT_TQOBJECT(this), TQT_SLOT( slotProjectOpen() ), actionCollection(), "project_open" ); action->setToolTip(i18n("Open an existing project")); action->setWhatsThis(i18n("Opens an existing project. Currently opened project is not affected.")); #ifdef HAVE_KNEWSTUFF action = new KAction(i18n("&Download Example Databases..."), "kget", KShortcut(0), - this, SLOT(slotGetNewStuff()), actionCollection(), "project_download_examples"); + TQT_TQOBJECT(this), TQT_SLOT(slotGetNewStuff()), actionCollection(), "project_download_examples"); action->setToolTip(i18n("Download example databases from the Internet")); action->setWhatsThis(i18n("Downloads example databases from the Internet.")); #endif -// d->action_open_recent = KStdAction::openRecent( this, SLOT(slotProjectOpenRecent(const KURL&)), actionCollection(), "project_open_recent" ); +// d->action_open_recent = KStdAction::openRecent( TQT_TQOBJECT(this), TQT_SLOT(slotProjectOpenRecent(const KURL&)), actionCollection(), "project_open_recent" ); //#ifdef KEXI_SHOW_UNIMPLEMENTED #ifndef KEXI_NO_UNFINISHED d->action_open_recent = new KActionMenu(i18n("Open Recent"), actionCollection(), "project_open_recent"); - connect(d->action_open_recent->popupMenu(),SIGNAL(activated(int)), - this,SLOT(slotProjectOpenRecent(int))); - connect(d->action_open_recent->popupMenu(), SIGNAL(aboutToShow()), - this,SLOT(slotProjectOpenRecentAboutToShow())); + connect(d->action_open_recent->popupMenu(),TQT_SIGNAL(activated(int)), + this,TQT_SLOT(slotProjectOpenRecent(int))); + connect(d->action_open_recent->popupMenu(), TQT_SIGNAL(aboutToShow()), + this,TQT_SLOT(slotProjectOpenRecentAboutToShow())); //moved down d->action_open_recent_projects_title_id = // d->action_open_recent->popupMenu()->insertTitle(i18n("Recently Opened Databases")); //moved down d->action_open_recent_connections_title_id = // d->action_open_recent->popupMenu()->insertTitle(i18n("Recently Connected Database Servers")); // d->action_open_recent->popupMenu()->insertSeparator(); // d->action_open_recent_more_id = d->action_open_recent->popupMenu() -// ->insertItem(i18n("&More Projects..."), this, SLOT(slotProjectOpenRecentMore()), 0, 1000); +// ->insertItem(i18n("&More Projects..."), TQT_TQOBJECT(this), TQT_SLOT(slotProjectOpenRecentMore()), 0, 1000); #else d->action_open_recent = d->dummy_action; #endif d->action_save = KStdAction::save( - this, SLOT( slotProjectSave() ), actionCollection(), "project_save" ); + TQT_TQOBJECT(this), TQT_SLOT( slotProjectSave() ), actionCollection(), "project_save" ); // d->action_save = new KAction(i18n("&Save"), "filesave", KStdAccel::shortcut(KStdAccel::Save), -// this, SLOT(slotProjectSave()), actionCollection(), "project_save"); +// TQT_TQOBJECT(this), TQT_SLOT(slotProjectSave()), actionCollection(), "project_save"); d->action_save->setToolTip(i18n("Save object changes")); d->action_save->setWhatsThis(i18n("Saves object changes from currently selected window.")); #ifdef KEXI_SHOW_UNIMPLEMENTED d->action_save_as = new KAction(i18n("Save &As..."), "filesaveas", 0, - this, SLOT(slotProjectSaveAs()), actionCollection(), "project_saveas"); + TQT_TQOBJECT(this), TQT_SLOT(slotProjectSaveAs()), actionCollection(), "project_saveas"); d->action_save_as->setToolTip(i18n("Save object as")); d->action_save_as->setWhatsThis( i18n("Saves object changes from currently selected window under a new name (within the same project).")); d->action_project_properties = new KAction(i18n("Project Properties"), "info", 0, - this, SLOT(slotProjectProperties()), actionCollection(), "project_properties"); + TQT_TQOBJECT(this), TQT_SLOT(slotProjectProperties()), actionCollection(), "project_properties"); #else d->action_save_as = d->dummy_action; d->action_project_properties = d->dummy_action; #endif d->action_close = new KAction(i18n("&Close Project"), "fileclose", 0, - this, SLOT(slotProjectClose()), actionCollection(), "project_close" ); + TQT_TQOBJECT(this), TQT_SLOT(slotProjectClose()), actionCollection(), "project_close" ); d->action_close->setToolTip(i18n("Close the current project")); d->action_close->setWhatsThis(i18n("Closes the current project.")); - KStdAction::quit( this, SLOT(slotProjectQuit()), actionCollection(), "quit"); + KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT(slotProjectQuit()), actionCollection(), "quit"); #ifdef KEXI_SHOW_UNIMPLEMENTED - d->action_project_relations = new KAction(i18n("&Relationships..."), "relation", Qt::CTRL + Qt::Key_R, - this, SLOT(slotProjectRelations()), actionCollection(), "project_relations"); + d->action_project_relations = new KAction(i18n("&Relationships..."), "relation", TQt::CTRL + TQt::Key_R, + TQT_TQOBJECT(this), TQT_SLOT(slotProjectRelations()), actionCollection(), "project_relations"); d->action_project_relations->setToolTip(i18n("Project relationships")); d->action_project_relations->setWhatsThis(i18n("Shows project relationships.")); @@ -600,13 +600,13 @@ void KexiMainWindowImpl::initActions() #endif d->action_tools_data_migration = new KAction( i18n("&Import Database..."), "database_import", 0, - this, SLOT(slotToolsProjectMigration()), actionCollection(), "tools_import_project"); + TQT_TQOBJECT(this), TQT_SLOT(slotToolsProjectMigration()), actionCollection(), "tools_import_project"); d->action_tools_data_migration->setToolTip(i18n("Import entire database as a Kexi project")); d->action_tools_data_migration->setWhatsThis(i18n("Imports entire database as a Kexi project.")); d->action_tools_compact_database = new KAction( i18n("&Compact Database..."), "", 0, - this, SLOT(slotToolsCompactDatabase()), actionCollection(), "tools_compact_database"); + TQT_TQOBJECT(this), TQT_SLOT(slotToolsCompactDatabase()), actionCollection(), "tools_compact_database"); d->action_tools_compact_database->setToolTip(i18n("Compact the current database project")); d->action_tools_compact_database->setWhatsThis( i18n("Compacts the current database project, so it will take less space and work faster.")); @@ -617,7 +617,7 @@ void KexiMainWindowImpl::initActions() d->action_project_import_data_table = new KAction( i18n("Import->Table Data From File...", "Table Data From &File..."), "table"/*! @todo: change to "file_import" or so*/, - 0, this, SLOT(slotProjectImportDataTable()), actionCollection(), + 0, TQT_TQOBJECT(this), TQT_SLOT(slotProjectImportDataTable()), actionCollection(), "project_import_data_table"); d->action_project_import_data_table->setToolTip(i18n("Import table data from a file")); d->action_project_import_data_table->setWhatsThis(i18n("Imports table data from a file.")); @@ -626,7 +626,7 @@ void KexiMainWindowImpl::initActions() d->action_project_export_data_table = new KAction(i18n("Export->Table or Query Data to File...", "Table or Query Data to &File..."), "table"/*! @todo: change to "file_export" or so*/, - 0, this, SLOT(slotProjectExportDataTable()), actionCollection(), + 0, TQT_TQOBJECT(this), TQT_SLOT(slotProjectExportDataTable()), actionCollection(), "project_export_data_table"); d->action_project_export_data_table->setToolTip( i18n("Export data from the active table or query data to a file")); @@ -634,17 +634,17 @@ void KexiMainWindowImpl::initActions() i18n("Exports data from the active table or query data to a file.")); //TODO new KAction(i18n("From File..."), "fileopen", 0, -//TODO this, SLOT(slotImportFile()), actionCollection(), "project_import_file"); +//TODO TQT_TQOBJECT(this), TQT_SLOT(slotImportFile()), actionCollection(), "project_import_file"); //TODO new KAction(i18n("From Server..."), "server", 0, -//TODO this, SLOT(slotImportServer()), actionCollection(), "project_import_server"); +//TODO TQT_TQOBJECT(this), TQT_SLOT(slotImportServer()), actionCollection(), "project_import_server"); - d->action_project_print = KStdAction::print(this, SLOT(slotProjectPrint()), + d->action_project_print = KStdAction::print(TQT_TQOBJECT(this), TQT_SLOT(slotProjectPrint()), actionCollection(), "project_print" ); d->action_project_print->setToolTip(i18n("Print data from the active table or query")); d->action_project_print->setWhatsThis(i18n("Prints data from the active table or query.")); d->action_project_print_preview = KStdAction::printPreview( - this, SLOT(slotProjectPrintPreview()), + TQT_TQOBJECT(this), TQT_SLOT(slotProjectPrintPreview()), actionCollection(), "project_print_preview" ); d->action_project_print_preview->setToolTip( i18n("Show print preview for the active table or query")); @@ -652,7 +652,7 @@ void KexiMainWindowImpl::initActions() i18n("Shows print preview for the active table or query.")); d->action_project_print_setup = new KAction(i18n("Page Set&up..."), - "", 0, this, SLOT(slotProjectPageSetup()), actionCollection(), + "", 0, TQT_TQOBJECT(this), TQT_SLOT(slotProjectPageSetup()), actionCollection(), "project_print_setup"); d->action_project_print_setup->setToolTip( i18n("Show page setup for printing the active table or query")); @@ -669,7 +669,7 @@ void KexiMainWindowImpl::initActions() else { d->action_edit_paste_special_data_table = new KAction(i18n("Paste Special->As Data &Table...", "As Data &Table..."), - "table", 0, this, SLOT(slotEditPasteSpecialDataTable()), + "table", 0, TQT_TQOBJECT(this), TQT_SLOT(slotEditPasteSpecialDataTable()), actionCollection(), "edit_paste_special_data_table"); d->action_edit_paste_special_data_table->setToolTip( i18n("Paste clipboard data as a table")); @@ -680,7 +680,7 @@ void KexiMainWindowImpl::initActions() d->action_edit_copy_special_data_table = new KAction(i18n("Copy Special->Table or Query Data...", "Table or Query as Data Table..."), - "table", 0, this, SLOT(slotEditCopySpecialDataTable()), + "table", 0, TQT_TQOBJECT(this), TQT_SLOT(slotEditCopySpecialDataTable()), actionCollection(), "edit_copy_special_data_table"); d->action_edit_copy_special_data_table->setToolTip( i18n("Copy selected table or query data to clipboard")); @@ -693,35 +693,35 @@ void KexiMainWindowImpl::initActions() d->action_edit_redo->setWhatsThis(i18n("Reverts the most recent undo action.")); #if 0 //old - d->action_edit_find = createSharedAction( KStdAction::Find, "edit_find"); + d->action_edit_tqfind = createSharedAction( KStdAction::Find, "edit_tqfind"); d->action_edit_findnext = createSharedAction( KStdAction::FindNext, "edit_findnext"); d->action_edit_findprev = createSharedAction( KStdAction::FindPrev, "edit_findprevious"); -//! @todo d->action_edit_paste = createSharedAction( KStdAction::Replace, "edit_replace"); +//! @todo d->action_edit_paste = createSharedAction( KStdAction::Replace, "edit_tqreplace"); #endif - d->action_edit_find = KStdAction::find( - this, SLOT(slotEditFind()), actionCollection(), "edit_find" ); -// d->action_edit_find = createSharedAction( KStdAction::Find, "edit_find"); + d->action_edit_tqfind = KStdAction::find( + TQT_TQOBJECT(this), TQT_SLOT(slotEditFind()), actionCollection(), "edit_tqfind" ); +// d->action_edit_tqfind = createSharedAction( KStdAction::Find, "edit_tqfind"); d->action_edit_findnext = KStdAction::findNext( - this, SLOT(slotEditFindNext()), actionCollection(), "edit_findnext"); + TQT_TQOBJECT(this), TQT_SLOT(slotEditFindNext()), actionCollection(), "edit_findnext"); d->action_edit_findprev = KStdAction::findPrev( - this, SLOT(slotEditFindPrevious()), actionCollection(), "edit_findprevious"); - d->action_edit_replace = 0; -//! @todo d->action_edit_replace = KStdAction::replace( -//! this, SLOT(slotEditReplace()), actionCollection(), "project_print_preview" ); + TQT_TQOBJECT(this), TQT_SLOT(slotEditFindPrevious()), actionCollection(), "edit_findprevious"); + d->action_edit_tqreplace = 0; +//! @todo d->action_edit_tqreplace = KStdAction::tqreplace( +//! TQT_TQOBJECT(this), TQT_SLOT(slotEditReplace()), actionCollection(), "project_print_preview" ); d->action_edit_replace_all = 0; //! @todo d->action_edit_replace_all = new KAction( i18n("Replace All"), "", 0, -//! this, SLOT(slotEditReplaceAll()), actionCollection(), "edit_replaceall"); +//! TQT_TQOBJECT(this), TQT_SLOT(slotEditReplaceAll()), actionCollection(), "edit_replaceall"); d->action_edit_select_all = createSharedAction( KStdAction::SelectAll, "edit_select_all"); d->action_edit_delete = createSharedAction(i18n("&Delete"), "editdelete", - 0/*Qt::Key_Delete*/, "edit_delete"); + 0/*TQt::Key_Delete*/, "edit_delete"); d->action_edit_delete->setToolTip(i18n("Delete selected object")); d->action_edit_delete->setWhatsThis(i18n("Deletes currently selected object.")); d->action_edit_delete_row = createSharedAction(i18n("Delete Row"), "delete_table_row", - Qt::CTRL+Qt::Key_Delete, "edit_delete_row"); + TQt::CTRL+TQt::Key_Delete, "edit_delete_row"); d->action_edit_delete_row->setToolTip(i18n("Delete currently selected row")); d->action_edit_delete_row->setWhatsThis(i18n("Deletes currently selected row.")); @@ -731,21 +731,21 @@ void KexiMainWindowImpl::initActions() d->action_edit_clear_table->setWhatsThis(i18n("Clears table contents.")); setActionVolatile( d->action_edit_clear_table, true ); - d->action_edit_edititem = createSharedAction(i18n("Edit Item"), 0, 0, /* CONFLICT in TV: Qt::Key_F2, */ + d->action_edit_edititem = createSharedAction(i18n("Edit Item"), 0, 0, /* CONFLICT in TV: TQt::Key_F2, */ "edit_edititem"); d->action_edit_edititem->setToolTip(i18n("Edit currently selected item")); d->action_edit_edititem->setWhatsThis(i18n("Edits currently selected item.")); d->action_edit_insert_empty_row = createSharedAction(i18n("&Insert Empty Row"), "insert_table_row", - Qt::SHIFT | Qt::CTRL | Qt::Key_Insert, "edit_insert_empty_row"); + TQt::SHIFT | TQt::CTRL | TQt::Key_Insert, "edit_insert_empty_row"); setActionVolatile( d->action_edit_insert_empty_row, true ); d->action_edit_insert_empty_row->setToolTip(i18n("Insert one empty row above")); d->action_edit_insert_empty_row->setWhatsThis(i18n("Inserts one empty row above currently selected table row.")); //VIEW MENU if (!userMode()) { - d->action_view_data_mode = new KRadioAction(i18n("&Data View"), "state_data", Qt::Key_F6, - this, SLOT(slotViewDataMode()), actionCollection(), "view_data_mode"); + d->action_view_data_mode = new KRadioAction(i18n("&Data View"), "state_data", TQt::Key_F6, + TQT_TQOBJECT(this), TQT_SLOT(slotViewDataMode()), actionCollection(), "view_data_mode"); d->actions_for_view_modes.insert( Kexi::DataViewMode, d->action_view_data_mode ); d->action_view_data_mode->setExclusiveGroup("view_mode"); d->action_view_data_mode->setToolTip(i18n("Switch to data view")); @@ -755,8 +755,8 @@ void KexiMainWindowImpl::initActions() d->action_view_data_mode = 0; if (!userMode()) { - d->action_view_design_mode = new KRadioAction(i18n("D&esign View"), "state_edit", Qt::Key_F7, - this, SLOT(slotViewDesignMode()), actionCollection(), "view_design_mode"); + d->action_view_design_mode = new KRadioAction(i18n("D&esign View"), "state_edit", TQt::Key_F7, + TQT_TQOBJECT(this), TQT_SLOT(slotViewDesignMode()), actionCollection(), "view_design_mode"); d->actions_for_view_modes.insert( Kexi::DesignViewMode, d->action_view_design_mode ); d->action_view_design_mode->setExclusiveGroup("view_mode"); d->action_view_design_mode->setToolTip(i18n("Switch to design view")); @@ -766,8 +766,8 @@ void KexiMainWindowImpl::initActions() d->action_view_design_mode = 0; if (!userMode()) { - d->action_view_text_mode = new KRadioAction(i18n("&Text View"), "state_sql", Qt::Key_F8, - this, SLOT(slotViewTextMode()), actionCollection(), "view_text_mode"); + d->action_view_text_mode = new KRadioAction(i18n("&Text View"), "state_sql", TQt::Key_F8, + TQT_TQOBJECT(this), TQT_SLOT(slotViewTextMode()), actionCollection(), "view_text_mode"); d->actions_for_view_modes.insert( Kexi::TextViewMode, d->action_view_text_mode ); d->action_view_text_mode->setExclusiveGroup("view_mode"); d->action_view_text_mode->setToolTip(i18n("Switch to text view")); @@ -777,22 +777,22 @@ void KexiMainWindowImpl::initActions() d->action_view_text_mode = 0; if (d->isProjectNavigatorVisible) { - d->action_view_nav = new KAction(i18n("Project Navigator"), "", Qt::ALT + Qt::Key_1, - this, SLOT(slotViewNavigator()), actionCollection(), "view_navigator"); + d->action_view_nav = new KAction(i18n("Project Navigator"), "", TQt::ALT + TQt::Key_1, + TQT_TQOBJECT(this), TQT_SLOT(slotViewNavigator()), actionCollection(), "view_navigator"); d->action_view_nav->setToolTip(i18n("Go to project navigator panel")); d->action_view_nav->setWhatsThis(i18n("Goes to project navigator panel.")); } else d->action_view_nav = 0; - d->action_view_mainarea = new KAction(i18n("Main Area"), "", Qt::ALT + Qt::Key_2, - this, SLOT(slotViewMainArea()), actionCollection(), "view_mainarea"); + d->action_view_mainarea = new KAction(i18n("Main Area"), "", TQt::ALT + TQt::Key_2, + TQT_TQOBJECT(this), TQT_SLOT(slotViewMainArea()), actionCollection(), "view_mainarea"); d->action_view_mainarea->setToolTip(i18n("Go to main area")); d->action_view_mainarea->setWhatsThis(i18n("Goes to main area.")); if (!userMode()) { - d->action_view_propeditor = new KAction(i18n("Property Editor"), "", Qt::ALT + Qt::Key_3, - this, SLOT(slotViewPropertyEditor()), actionCollection(), "view_propeditor"); + d->action_view_propeditor = new KAction(i18n("Property Editor"), "", TQt::ALT + TQt::Key_3, + TQT_TQOBJECT(this), TQT_SLOT(slotViewPropertyEditor()), actionCollection(), "view_propeditor"); d->action_view_propeditor->setToolTip(i18n("Go to property editor panel")); d->action_view_propeditor->setWhatsThis(i18n("Goes to property editor panel.")); } @@ -801,7 +801,7 @@ void KexiMainWindowImpl::initActions() //DATA MENU d->action_data_save_row = createSharedAction(i18n("&Save Row"), "button_ok", - Qt::SHIFT | Qt::Key_Return, "data_save_row"); + TQt::SHIFT | TQt::Key_Return, "data_save_row"); d->action_data_save_row->setToolTip(i18n("Save changes made to the current row")); d->action_data_save_row->setWhatsThis(i18n("Saves changes made to the current row.")); //temp. disable because of problems with volatile actions setActionVolatile( d->action_data_save_row, true ); @@ -849,7 +849,7 @@ void KexiMainWindowImpl::initActions() //TOOLS MENU //WINDOW MENU -#ifndef Q_WS_WIN +#ifndef TQ_WS_WIN //KMDI <= 3.5.1 has no shortcut here: KAction *closeWindowAction = actionCollection()->action("window_close"); if (closeWindowAction) @@ -858,32 +858,32 @@ void KexiMainWindowImpl::initActions() //additional 'Window' menu items d->action_window_next = new KAction( i18n("&Next Window"), "", -#ifdef Q_WS_WIN - Qt::CTRL+Qt::Key_Tab, +#ifdef TQ_WS_WIN + TQt::CTRL+TQt::Key_Tab, #else - Qt::ALT+Qt::Key_Right, + TQt::ALT+TQt::Key_Right, #endif - this, SLOT(activateNextWin()), actionCollection(), "window_next"); + TQT_TQOBJECT(this), TQT_SLOT(activateNextWin()), actionCollection(), "window_next"); d->action_window_next->setToolTip( i18n("Next window") ); d->action_window_next->setWhatsThis(i18n("Switches to the next window.")); d->action_window_previous = new KAction( i18n("&Previous Window"), "", -#ifdef Q_WS_WIN - Qt::CTRL+Qt::SHIFT+Qt::Key_Tab, +#ifdef TQ_WS_WIN + TQt::CTRL+TQt::SHIFT+TQt::Key_Tab, #else - Qt::ALT+Qt::Key_Left, + TQt::ALT+TQt::Key_Left, #endif - this, SLOT(activatePrevWin()), actionCollection(), "window_previous"); + TQT_TQOBJECT(this), TQT_SLOT(activatePrevWin()), actionCollection(), "window_previous"); d->action_window_previous->setToolTip( i18n("Previous window") ); d->action_window_previous->setWhatsThis(i18n("Switches to the previous window.")); //SETTINGS MENU setStandardToolBarMenuEnabled( true ); - action = KStdAction::keyBindings(this, SLOT( slotConfigureKeys() ), actionCollection() ); + action = KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT( slotConfigureKeys() ), actionCollection() ); action->setWhatsThis(i18n("Lets you configure shortcut keys.")); #ifdef KEXI_SHOW_UNIMPLEMENTED - action = KStdAction::configureToolbars( this, SLOT( slotConfigureToolbars() ), actionCollection() ); + action = KStdAction::configureToolbars( TQT_TQOBJECT(this), TQT_SLOT( slotConfigureToolbars() ), actionCollection() ); action->setWhatsThis(i18n("Lets you configure toolbars.")); d->action_show_other = new KActionMenu(i18n("Other"), @@ -891,7 +891,7 @@ void KexiMainWindowImpl::initActions() #endif #ifndef KEXI_NO_CTXT_HELP - d->action_show_helper = new KToggleAction(i18n("Show Context Help"), "", Qt::CTRL + Qt::Key_H, + d->action_show_helper = new KToggleAction(i18n("Show Context Help"), "", TQt::CTRL + TQt::Key_H, actionCollection(), "options_show_contexthelp"); #if KDE_IS_VERSION(3,2,90) d->action_show_helper->setCheckedState(i18n("Hide Context Help")); @@ -923,31 +923,31 @@ void KexiMainWindowImpl::initActions() #endif #ifdef KEXI_SHOW_UNIMPLEMENTED - d->action_configure = KStdAction::preferences(this, SLOT(slotShowSettings()), actionCollection()); + d->action_configure = KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(slotShowSettings()), actionCollection()); action->setWhatsThis(i18n("Lets you configure Kexi.")); #endif //HELP MENU #if 0//js: todo reenable later - KStdAction::tipOfDay( this, SLOT( slotTipOfTheDayAction() ), actionCollection() ) + KStdAction::tipOfDay( TQT_TQOBJECT(this), TQT_SLOT( slotTipOfTheDayAction() ), actionCollection() ) ->setWhatsThis(i18n("This shows useful tips on the use of this application.")); #endif #if 0 //we don't have a time for updating info text for each new version new KAction(i18n("Important Information"), "messagebox_info", 0, - this, SLOT(slotImportantInfo()), actionCollection(), "help_show_important_info"); + TQT_TQOBJECT(this), TQT_SLOT(slotImportantInfo()), actionCollection(), "help_show_important_info"); #endif //TODO: UNCOMMENT TO REMOVE MDI MODES SETTING m_pMdiModeMenu->hide(); #ifndef KEXI_NO_FEEDBACK_AGENT #ifdef FEEDBACK_CLASS new KAction(i18n("Give Feedback..."), "messagebox_info", 0, - this, SLOT(slotStartFeedbackAgent()), actionCollection(), "help_start_feedback_agent"); + TQT_TQOBJECT(this), TQT_SLOT(slotStartFeedbackAgent()), actionCollection(), "help_start_feedback_agent"); #endif #endif // KAction *actionSettings = new KAction(i18n("Configure Kexi..."), "configure", 0, // actionCollection(), "kexi_settings"); // actionSettings->setWhatsThis(i18n("Lets you configure Kexi.")); -// connect(actionSettings, SIGNAL(activated()), this, SLOT(slotShowSettings())); +// connect(actionSettings, TQT_SIGNAL(activated()), TQT_TQOBJECT(this), TQT_SLOT(slotShowSettings())); // -- add a few missing tooltips (usable especially in Form's "Assign action" dialog) if ((action = actionCollection()->action("window_close"))) @@ -1005,7 +1005,7 @@ void KexiMainWindowImpl::initActions() acat->addAction("edit_edititem", Kexi::PartItemActionCategory|Kexi::WindowActionCategory, KexiPart::TableObjectType, KexiPart::QueryObjectType); - acat->addAction("edit_find", Kexi::GlobalActionCategory|Kexi::WindowActionCategory, + acat->addAction("edit_tqfind", Kexi::GlobalActionCategory|Kexi::WindowActionCategory, KexiPart::TableObjectType, KexiPart::QueryObjectType, KexiPart::FormObjectType); acat->addAction("edit_findnext", Kexi::GlobalActionCategory|Kexi::WindowActionCategory, @@ -1014,7 +1014,7 @@ void KexiMainWindowImpl::initActions() acat->addAction("edit_findprevious", Kexi::GlobalActionCategory|Kexi::WindowActionCategory, KexiPart::TableObjectType, KexiPart::QueryObjectType, KexiPart::FormObjectType); - acat->addAction("edit_replace", Kexi::GlobalActionCategory|Kexi::WindowActionCategory, + acat->addAction("edit_tqreplace", Kexi::GlobalActionCategory|Kexi::WindowActionCategory, KexiPart::TableObjectType, KexiPart::QueryObjectType, KexiPart::FormObjectType); acat->addAction("edit_paste_special_data_table", Kexi::GlobalActionCategory); @@ -1112,13 +1112,13 @@ void KexiMainWindowImpl::initActions() acat->addAction("scriptpart_create", Kexi::NoActionCategory); } -void KexiMainWindowImpl::invalidateActions() +void KexiMainWindowImpl::tqinvalidateActions() { - invalidateProjectWideActions(); - invalidateSharedActions(); + tqinvalidateProjectWideActions(); + tqinvalidateSharedActions(); } -void KexiMainWindowImpl::invalidateSharedActions(QObject *o) +void KexiMainWindowImpl::tqinvalidateSharedActions(TQObject *o) { //TODO: enabling is more complex... /* d->action_edit_cut->setEnabled(true); @@ -1126,22 +1126,22 @@ void KexiMainWindowImpl::invalidateSharedActions(QObject *o) d->action_edit_paste->setEnabled(true);*/ if (!o) - o = focusWindow(); - KexiSharedActionHost::invalidateSharedActions(o); + o = TQT_TQOBJECT(focusWindow()); + KexiSharedActionHost::tqinvalidateSharedActions(o); } -void KexiMainWindowImpl::invalidateSharedActions() +void KexiMainWindowImpl::tqinvalidateSharedActions() { - invalidateSharedActions(0); + tqinvalidateSharedActions(0); } // unused, I think -void KexiMainWindowImpl::invalidateSharedActionsLater() +void KexiMainWindowImpl::tqinvalidateSharedActionsLater() { - QTimer::singleShot(1, this, SLOT(invalidateSharedActions())); + TQTimer::singleShot(1, TQT_TQOBJECT(this), TQT_SLOT(tqinvalidateSharedActions())); } -void KexiMainWindowImpl::invalidateProjectWideActions() +void KexiMainWindowImpl::tqinvalidateProjectWideActions() { // stateChanged("project_opened",d->prj ? StateNoReverse : StateReverse); @@ -1234,7 +1234,7 @@ void KexiMainWindowImpl::invalidateProjectWideActions() d->propEditorTabWidget->setEnabled(d->prj); } -void KexiMainWindowImpl::invalidateViewModeActions() +void KexiMainWindowImpl::tqinvalidateViewModeActions() { if (d->curDialog) { //update toggle action @@ -1276,12 +1276,12 @@ tristate KexiMainWindowImpl::startup() return true; } -static QString internalReason(KexiDB::Object *obj) +static TQString internalReason(KexiDB::Object *obj) { - const QString &s = obj->errorMsg(); + const TQString &s = obj->errorMsg(); if (s.isEmpty()) return s; - return QString("<br>(%1) ").arg(i18n("reason:")+" <i>"+s+"</i>"); + return TQString("<br>(%1) ").tqarg(i18n("reason:")+" <i>"+s+"</i>"); } tristate KexiMainWindowImpl::openProject(const KexiProjectData& projectData) @@ -1300,7 +1300,7 @@ tristate KexiMainWindowImpl::openProject(const KexiProjectData& projectData) //ask for password KexiDBPasswordDialog pwdDlg(this, *newProjectData->connectionData(), false /*!showDetailsButton*/); - if (QDialog::Accepted!=pwdDlg.exec()) { + if (TQDialog::Accepted!=pwdDlg.exec()) { delete d->prj; d->prj = 0; return cancelled; @@ -1319,7 +1319,7 @@ tristate KexiMainWindowImpl::openProject(const KexiProjectData& projectData) if (incompatibleWithKexi) { if (KMessageBox::Yes == KMessageBox::questionYesNo(this, i18n("<qt>Database project %1 does not appear to have been created using Kexi.<br><br>" - "Do you want to import it as a new Kexi project?</qt>").arg(projectData.infoString()), + "Do you want to import it as a new Kexi project?</qt>").tqarg(projectData.infoString()), 0, KGuiItem(i18n("Import Database", "&Import..."), "database_import"), KStdGuiItem::quit())) { @@ -1341,30 +1341,30 @@ tristate KexiMainWindowImpl::openProject(const KexiProjectData& projectData) initNavigator(); Kexi::recentProjects().addProjectData( newProjectData ); updateReadOnlyState(); - invalidateActions(); + tqinvalidateActions(); // d->disableErrorMessages = true; enableMessages( false ); - QTimer::singleShot(1, this, SLOT(slotAutoOpenObjectsLater())); + TQTimer::singleShot(1, TQT_TQOBJECT(this), TQT_SLOT(slotAutoOpenObjectsLater())); return true; } tristate KexiMainWindowImpl::createProjectFromTemplate(const KexiProjectData& projectData) { - QStringList mimetypes; + TQStringList mimetypes; mimetypes.append( KexiDB::Driver::defaultFileBasedDriverMimeType() ); - QString fname; - const QString startDir(":OpenExistingOrCreateNewProject"/*as in KexiNewProjectWizard*/); - const QString caption( i18n("Select New Project's Location") ); + TQString fname; + const TQString startDir(":OpenExistingOrCreateNewProject"/*as in KexiNewProjectWizard*/); + const TQString caption( i18n("Select New Project's Location") ); while (true) { -#ifdef Q_WS_WIN +#ifdef TQ_WS_WIN //! @todo remove - QString recentDir = KGlobalSettings::documentPath(); + TQString recentDir = KGlobalSettings::documentPath(); if (fname.isEmpty() && !projectData.constConnectionData()->dbFileName().isEmpty()) //propose filename from db template name fname = KFileDialog::getStartURL(startDir, recentDir).path() + '/' + projectData.constConnectionData()->dbFileName(); - fname = QFileDialog::getSaveFileName( + fname = TQFileDialog::getSaveFileName( KFileDialog::getStartURL(fname.isEmpty() ? startDir : fname, recentDir).path(), KexiUtils::fileDialogFilterStrings(mimetypes, false), this, "CreateProjectFromTemplate", caption); @@ -1385,7 +1385,7 @@ tristate KexiMainWindowImpl::createProjectFromTemplate(const KexiProjectData& pr } const bool specialDir = fname.isEmpty(); kdDebug() << fname << "............." << endl; - KFileDialog dlg( specialDir ? startDir : QString::null, + KFileDialog dlg( specialDir ? startDir : TQString(), mimetypes.join(" "), this, "filedialog", true); if ( !specialDir ) dlg.setSelection( fname ); // may also be a filename @@ -1410,7 +1410,7 @@ tristate KexiMainWindowImpl::createProjectFromTemplate(const KexiProjectData& pr return false; } - return openProject(fname, 0, QString::null, projectData.autoopenObjects/*copy*/); + return openProject(fname, 0, TQString(), projectData.autoopenObjects/*copy*/); } void KexiMainWindowImpl::updateReadOnlyState() @@ -1422,7 +1422,7 @@ void KexiMainWindowImpl::updateReadOnlyState() // update "insert ....." actions for every part KActionCollection *ac = actionCollection(); for (KexiPart::PartInfoListIterator it(*Kexi::partManager().partInfoList()); it.current(); ++it) { - KAction *a = ac->action( KexiPart::nameForCreateAction( *it.current() ) ); + KAction *a = ac->action( TQString(KexiPart::nameForCreateAction( *it.current() )) ); if (a) a->setEnabled(!readOnly); } @@ -1430,26 +1430,26 @@ void KexiMainWindowImpl::updateReadOnlyState() void KexiMainWindowImpl::slotAutoOpenObjectsLater() { - QString not_found_msg; + TQString not_found_msg; bool openingCancelled; //ok, now open "autoopen: objects if (d->prj) { - for (QValueList<KexiProjectData::ObjectInfo>::ConstIterator it = + for (TQValueList<KexiProjectData::ObjectInfo>::ConstIterator it = d->prj->data()->autoopenObjects.constBegin(); it != d->prj->data()->autoopenObjects.constEnd(); ++it ) { KexiProjectData::ObjectInfo info = *it; KexiPart::Info *i = Kexi::partManager().infoForMimeType( - QCString("kexi/")+info["type"].lower().latin1() ); + TQCString("kexi/")+info["type"].lower().latin1() ); if (!i) { not_found_msg += "<li>"; if (!info["name"].isEmpty()) - not_found_msg += (QString("\"") + info["name"] + "\" - "); + not_found_msg += (TQString("\"") + info["name"] + "\" - "); if (info["action"]=="new") not_found_msg += i18n("cannot create object - unknown object type \"%1\"") - .arg(info["type"]); + .tqarg(info["type"]); else - not_found_msg += i18n("unknown object type \"%1\"").arg(info["type"]); + not_found_msg += i18n("unknown object type \"%1\"").tqarg(info["type"]); not_found_msg += internalReason(&Kexi::partManager())+"<br></li>"; continue; } @@ -1457,7 +1457,7 @@ void KexiMainWindowImpl::slotAutoOpenObjectsLater() if (info["action"]=="new") { if (!newObject( i, openingCancelled) && !openingCancelled) { not_found_msg += "<li>"; - not_found_msg += (i18n("cannot create object of type \"%1\"").arg(info["type"])+ + not_found_msg += (i18n("cannot create object of type \"%1\"").tqarg(info["type"])+ internalReason(d->prj)+"<br></li>"); } else @@ -1468,7 +1468,7 @@ void KexiMainWindowImpl::slotAutoOpenObjectsLater() KexiPart::Item *item = d->prj->item(i, info["name"]); if (!item) { - QString taskName; + TQString taskName; if (info["action"]=="print-preview") taskName = i18n("making print preview for"); else if (info["action"]=="print") @@ -1478,7 +1478,7 @@ void KexiMainWindowImpl::slotAutoOpenObjectsLater() else taskName = i18n("opening"); - not_found_msg += (QString("<li>")+ taskName + " \"" + info["name"] + "\" - "); + not_found_msg += (TQString("<li>")+ taskName + " \"" + info["name"] + "\" - "); if ("table"==info["type"].lower()) not_found_msg += i18n("table not found"); else if ("query"==info["type"].lower()) @@ -1496,7 +1496,7 @@ void KexiMainWindowImpl::slotAutoOpenObjectsLater() if (info["action"]=="execute") { tristate res = executeItem(item); if (false == res) { - not_found_msg += ( QString("<li>\"")+ info["name"] + "\" - " + i18n("cannot execute object")+ + not_found_msg += ( TQString("<li>\"")+ info["name"] + "\" - " + i18n("cannot execute object")+ internalReason(d->prj)+"<br></li>" ); } continue; @@ -1504,7 +1504,7 @@ void KexiMainWindowImpl::slotAutoOpenObjectsLater() else if (info["action"]=="print") { tristate res = printItem(item); if (false == res) { - not_found_msg += ( QString("<li>\"")+ info["name"] + "\" - " + i18n("cannot print object")+ + not_found_msg += ( TQString("<li>\"")+ info["name"] + "\" - " + i18n("cannot print object")+ internalReason(d->prj)+"<br></li>" ); } continue; @@ -1512,7 +1512,7 @@ void KexiMainWindowImpl::slotAutoOpenObjectsLater() else if (info["action"]=="print-preview") { tristate res = printPreviewForItem(item); if (false == res) { - not_found_msg += ( QString("<li>\"")+ info["name"] + "\" - " + i18n("cannot make print preview of object")+ + not_found_msg += ( TQString("<li>\"")+ info["name"] + "\" - " + i18n("cannot make print preview of object")+ internalReason(d->prj)+"<br></li>" ); } continue; @@ -1528,11 +1528,11 @@ void KexiMainWindowImpl::slotAutoOpenObjectsLater() else continue; //sanity - QString openObjectMessage; + TQString openObjectMessage; if (!openObject(item, viewMode, openingCancelled, 0, &openObjectMessage) && (!openingCancelled || !openObjectMessage.isEmpty())) { - not_found_msg += (QString("<li>\"")+ info["name"] + "\" - "); + not_found_msg += (TQString("<li>\"")+ info["name"] + "\" - "); if (openObjectMessage.isEmpty()) not_found_msg += i18n("cannot open object"); else @@ -1551,13 +1551,13 @@ void KexiMainWindowImpl::slotAutoOpenObjectsLater() if (!not_found_msg.isEmpty()) showErrorMessage(i18n("You have requested selected objects to be automatically opened " "or processed on startup. Several objects cannot be opened or processed."), - QString("<ul>%1</ul>").arg(not_found_msg) ); + TQString("<ul>%1</ul>").tqarg(not_found_msg) ); d->updatePropEditorVisibility(d->curDialog ? d->curDialog->currentViewMode() : 0); #if defined(KDOCKWIDGET_P) if (d->propEditor) { - KDockWidget *dw = (KDockWidget *)d->propEditorTabWidget->parentWidget(); - KDockSplitter *ds = (KDockSplitter *)dw->parentWidget(); + KDockWidget *dw = (KDockWidget *)d->propEditorTabWidget->tqparentWidget(); + KDockSplitter *ds = (KDockSplitter *)dw->tqparentWidget(); if(ds) ds->setSeparatorPosInPercent(d->config->readNumEntry("RightDockPosition", 80/* % */)); } @@ -1579,8 +1579,8 @@ void KexiMainWindowImpl::slotAutoOpenObjectsLater() d->restoreNavigatorWidth(); #ifndef PROPEDITOR_VISIBILITY_CHANGES -// KDockWidget *dw = (KDockWidget *)d->nav->parentWidget(); -// KDockSplitter *ds = (KDockSplitter *)dw->parentWidget(); +// KDockWidget *dw = (KDockWidget *)d->nav->tqparentWidget(); +// KDockSplitter *ds = (KDockSplitter *)dw->tqparentWidget(); // const int pos = ds->separatorPos(); //if (!d->curDialog || d->curDialog->currentViewMode()==Kexi::DataViewMode) @@ -1591,7 +1591,7 @@ void KexiMainWindowImpl::slotAutoOpenObjectsLater() if (d->nav) { d->nav->updateGeometry(); } - qApp->processEvents(); + tqApp->processEvents(); emit projectOpened(); } @@ -1624,8 +1624,8 @@ tristate KexiMainWindowImpl::closeProject() #if defined(KDOCKWIDGET_P) //remember docks position - will be used on storeSettings() if (d->propEditor) { - KDockWidget *dw = (KDockWidget *)d->propEditorTabWidget->parentWidget(); - KDockSplitter *ds = (KDockSplitter *)dw->parentWidget(); + KDockWidget *dw = (KDockWidget *)d->propEditorTabWidget->tqparentWidget(); + KDockSplitter *ds = (KDockSplitter *)dw->tqparentWidget(); if (ds) d->propEditorDockSeparatorPos = ds->separatorPosInPercent(); } @@ -1635,14 +1635,14 @@ tristate KexiMainWindowImpl::closeProject() if (d->propEditor) { if (d->openedDialogsCount() == 0) makeWidgetDockVisible(d->propEditorTabWidget); - KDockWidget *dw = (KDockWidget *)d->propEditorTabWidget->parentWidget(); - KDockSplitter *ds = (KDockSplitter *)dw->parentWidget(); + KDockWidget *dw = (KDockWidget *)d->propEditorTabWidget->tqparentWidget(); + KDockSplitter *ds = (KDockSplitter *)dw->tqparentWidget(); if(ds) ds->setSeparatorPosInPercent(80); } - KDockWidget *dw = (KDockWidget *)d->nav->parentWidget(); - KDockSplitter *ds = (KDockSplitter *)dw->parentWidget(); + KDockWidget *dw = (KDockWidget *)d->nav->tqparentWidget(); + KDockSplitter *ds = (KDockSplitter *)dw->tqparentWidget(); int dwWidth = dw->width(); if (ds) { if (d->openedDialogsCount()!=0 && d->propEditorTabWidget && d->propEditorTabWidget->isVisible()) @@ -1691,7 +1691,7 @@ tristate KexiMainWindowImpl::closeProject() // Kexi::partManager().unloadAllParts(); updateReadOnlyState(); - invalidateActions(); + tqinvalidateActions(); // if (!userMode()) updateAppCaption(); @@ -1721,45 +1721,45 @@ void KexiMainWindowImpl::initNavigator() if(!d->nav) { d->nav = new KexiBrowser(this, this); - d->nav->installEventFilter(this); + d->nav->installEventFilter(TQT_TQOBJECT(this)); d->navToolWindow = addToolWindow(d->nav, KDockWidget::DockLeft, getMainDockWidget(), 20/*, lv, 35, "2"*/); // d->navToolWindow->hide(); - connect(d->nav,SIGNAL(openItem(KexiPart::Item*,int)),this,SLOT(openObject(KexiPart::Item*,int))); - connect(d->nav,SIGNAL(openOrActivateItem(KexiPart::Item*,int)), - this,SLOT(openObjectFromNavigator(KexiPart::Item*,int))); - connect(d->nav,SIGNAL(newItem( KexiPart::Info* )), - this,SLOT(newObject(KexiPart::Info*))); - connect(d->nav,SIGNAL(removeItem(KexiPart::Item*)), - this,SLOT(removeObject(KexiPart::Item*))); - connect(d->nav,SIGNAL(renameItem(KexiPart::Item*,const QString&, bool&)), - this,SLOT(renameObject(KexiPart::Item*,const QString&, bool&))); - connect(d->nav,SIGNAL(executeItem(KexiPart::Item*)), - this,SLOT(executeItem(KexiPart::Item*))); - connect(d->nav,SIGNAL(exportItemAsDataTable(KexiPart::Item*)), - this,SLOT(exportItemAsDataTable(KexiPart::Item*))); - connect(d->nav,SIGNAL(printItem( KexiPart::Item* )), - this,SLOT(printItem(KexiPart::Item*))); - connect(d->nav,SIGNAL(pageSetupForItem( KexiPart::Item*)), - this,SLOT(showPageSetupForItem(KexiPart::Item*))); + connect(d->nav,TQT_SIGNAL(openItem(KexiPart::Item*,int)),this,TQT_SLOT(openObject(KexiPart::Item*,int))); + connect(d->nav,TQT_SIGNAL(openOrActivateItem(KexiPart::Item*,int)), + this,TQT_SLOT(openObjectFromNavigator(KexiPart::Item*,int))); + connect(d->nav,TQT_SIGNAL(newItem( KexiPart::Info* )), + this,TQT_SLOT(newObject(KexiPart::Info*))); + connect(d->nav,TQT_SIGNAL(removeItem(KexiPart::Item*)), + this,TQT_SLOT(removeObject(KexiPart::Item*))); + connect(d->nav,TQT_SIGNAL(renameItem(KexiPart::Item*,const TQString&, bool&)), + this,TQT_SLOT(renameObject(KexiPart::Item*,const TQString&, bool&))); + connect(d->nav,TQT_SIGNAL(executeItem(KexiPart::Item*)), + this,TQT_SLOT(executeItem(KexiPart::Item*))); + connect(d->nav,TQT_SIGNAL(exportItemAsDataTable(KexiPart::Item*)), + this,TQT_SLOT(exportItemAsDataTable(KexiPart::Item*))); + connect(d->nav,TQT_SIGNAL(printItem( KexiPart::Item* )), + this,TQT_SLOT(printItem(KexiPart::Item*))); + connect(d->nav,TQT_SIGNAL(pageSetupForItem( KexiPart::Item*)), + this,TQT_SLOT(showPageSetupForItem(KexiPart::Item*))); if (d->prj) {//connect to the project - connect(d->prj, SIGNAL(itemRemoved(const KexiPart::Item&)), - d->nav, SLOT(slotRemoveItem(const KexiPart::Item&))); + connect(d->prj, TQT_SIGNAL(itemRemoved(const KexiPart::Item&)), + d->nav, TQT_SLOT(slotRemoveItem(const KexiPart::Item&))); } - connect(d->nav,SIGNAL(selectionChanged(KexiPart::Item*)), - this,SLOT(slotPartItemSelectedInNavigator(KexiPart::Item*))); + connect(d->nav,TQT_SIGNAL(selectionChanged(KexiPart::Item*)), + this,TQT_SLOT(slotPartItemSelectedInNavigator(KexiPart::Item*))); // d->restoreNavigatorWidth(); } if(d->prj->isConnected()) { - QString partManagerErrorMessages; - d->nav->setProject( d->prj, QString::null/*all mimetypes*/, &partManagerErrorMessages ); + TQString partManagerErrorMessages; + d->nav->setProject( d->prj, TQString()/*all mimetypes*/, &partManagerErrorMessages ); if (!partManagerErrorMessages.isEmpty()) { - showWarningContinueMessage(partManagerErrorMessages, QString::null, + showWarningContinueMessage(partManagerErrorMessages, TQString(), "dontShowWarningsRelatedToPluginsLoading"); } } - connect(d->prj, SIGNAL(newItemStored(KexiPart::Item&)), d->nav, SLOT(addItem(KexiPart::Item&))); + connect(d->prj, TQT_SIGNAL(newItemStored(KexiPart::Item&)), d->nav, TQT_SLOT(addItem(KexiPart::Item&))); d->nav->setFocus(); if (d->forceShowProjectNavigatorOnCreation) { @@ -1772,23 +1772,23 @@ void KexiMainWindowImpl::initNavigator() d->forceHideProjectNavigatorOnCreation = false; } - invalidateActions(); + tqinvalidateActions(); } void KexiMainWindowImpl::slotLastActions() { #if defined(KDOCKWIDGET_P) if (mdiMode()==KMdi::ChildframeMode || mdiMode()==KMdi::TabPageMode) { -// KDockWidget *dw = (KDockWidget *)d->propEditor->parentWidget(); - //KDockSplitter *ds = (KDockSplitter *)dw->parentWidget(); +// KDockWidget *dw = (KDockWidget *)d->propEditor->tqparentWidget(); + //KDockSplitter *ds = (KDockSplitter *)dw->tqparentWidget(); // Q_UNUSED(ds); //1 ds->resize(ds->width()*3, ds->height()); //1 ds->setSeparatorPos(30, true); //1 ds->setForcedFixedWidth( dw, 200 ); } #endif -#ifdef Q_WS_WIN - showMaximized();//js: workaround for not yet completed layout settings storage on win32 +#ifdef TQ_WS_WIN + showMaximized();//js: workaround for not yet completed tqlayout settings storage on win32 #endif } @@ -1807,15 +1807,15 @@ void KexiMainWindowImpl::initPropertyEditor() d->config->setGroup("PropertyEditor"); int size = d->config->readNumEntry("FontSize", -1); - QFont f( Kexi::smallFont() ); + TQFont f( Kexi::smallFont() ); if (size>0) f.setPixelSize( size ); d->propEditorTabWidget->setFont(f); if (mdiMode()==KMdi::ChildframeMode || mdiMode()==KMdi::TabPageMode) { - KDockWidget *dw = (KDockWidget *)d->propEditorTabWidget->parentWidget(); + KDockWidget *dw = (KDockWidget *)d->propEditorTabWidget->tqparentWidget(); #if defined(KDOCKWIDGET_P) - KDockSplitter *ds = (KDockSplitter *)dw->parentWidget(); + KDockSplitter *ds = (KDockSplitter *)dw->tqparentWidget(); // ds->setKeepSize(true); makeWidgetDockVisible(d->propEditorTabWidget); // ds->show(); @@ -1836,7 +1836,7 @@ void KexiMainWindowImpl::initPropertyEditor() //1 dw->setMinimumWidth(200); - // ds->setSeparatorPos(d->propEditor->sizeHint().width(), true); + // ds->setSeparatorPos(d->propEditor->tqsizeHint().width(), true); //heh, this is for IDEAl only, I suppose? //js if (m_rightContainer) { @@ -1858,13 +1858,13 @@ void KexiMainWindowImpl::slotPartLoaded(KexiPart::Part* p) { if (!p) return; - connect(p, SIGNAL(newObjectRequest(KexiPart::Info*)), - this, SLOT(newObject(KexiPart::Info*))); + connect(p, TQT_SIGNAL(newObjectRequest(KexiPart::Info*)), + TQT_TQOBJECT(this), TQT_SLOT(newObject(KexiPart::Info*))); p->createGUIClients(this); } //! internal -void KexiMainWindowImpl::slotCaptionForCurrentMDIChild(bool childrenMaximized) +void KexiMainWindowImpl::slotCaptionForCurrentMDIChild(bool tqchildrenMaximized) { //js todo: allow to set custom "static" app caption @@ -1877,18 +1877,18 @@ void KexiMainWindowImpl::slotCaptionForCurrentMDIChild(bool childrenMaximized) //current dialog isn't attached! - find top level child if (m_pMdi->topChild()) { view = m_pMdi->topChild()->m_pClient; - childrenMaximized = view->mdiParent()->state()==KMdiChildFrm::Maximized; + tqchildrenMaximized = view->mdiParent()->state()==KMdiChildFrm::Maximized; } else view = 0; } - if (childrenMaximized && view) { + if (tqchildrenMaximized && view) { setCaption( d->curDialog->caption() - + (d->appCaptionPrefix.isEmpty() ? QString::null : (QString::fromLatin1(" - ") + d->appCaptionPrefix)) ); + + (d->appCaptionPrefix.isEmpty() ? TQString() : (TQString::tqfromLatin1(" - ") + d->appCaptionPrefix)) ); } else { - setCaption( (d->appCaptionPrefix.isEmpty() ? QString::null : (d->appCaptionPrefix + QString::fromLatin1(" - "))) + setCaption( (d->appCaptionPrefix.isEmpty() ? TQString() : (d->appCaptionPrefix + TQString::tqfromLatin1(" - "))) + d->origAppCaption ); } } @@ -1954,13 +1954,13 @@ void KexiMainWindowImpl::slotLastChildViewClosed() //slotLastChildFrmClosed() // d->propEditorToolWindow->hide(); } -void KexiMainWindowImpl::slotChildViewIsDetachedNow(QWidget*) +void KexiMainWindowImpl::slotChildViewIsDetachedNow(TQWidget*) { slotCaptionForCurrentMDIChild(false); } /*void -KexiMainWindowImpl::closeEvent(QCloseEvent *ev) +KexiMainWindowImpl::closeEvent(TQCloseEvent *ev) { storeSettings(); @@ -2014,7 +2014,7 @@ KexiMainWindowImpl::restoreSettings() applyMainWindowSettings( d->config, "MainWindow" ); //small hack - set the default -- bottom -// d->config->setGroup(QString(name()) + " KMdiTaskBar Toolbar style"); +// d->config->setGroup(TQString(name()) + " KMdiTaskBar Toolbar style"); d->config->setGroup("MainWindow Toolbar KMdiTaskBar"); const bool tbe = d->config->readEntry("Position").isEmpty(); if (tbe || d->config->readEntry("Position")=="Bottom") { @@ -2070,14 +2070,14 @@ KexiMainWindowImpl::restoreSettings() if ( !initialGeometrySet() ) { // Default size // int restoredWidth, restoredHeight; - int scnum = QApplication::desktop()->screenNumber(parentWidget()); - QRect desk = QApplication::desktop()->screenGeometry(scnum); + int scnum = TQApplication::desktop()->screenNumber(tqparentWidget()); + TQRect desk = TQApplication::desktop()->screenGeometry(scnum); //#if KDE_IS_VERSION(3,1,90) // restoredWidth = KGlobalSettings::screenGeometry(scnum).width(); // restoredHeight = KGlobalSettings::screenGeometry(scnum).height(); //#else -// restoredWidth = QApplication::desktop()->width(); -// restoredHeight = QApplication::desktop()->height(); +// restoredWidth = TQApplication::desktop()->width(); +// restoredHeight = TQApplication::desktop()->height(); //#endif /* if (restoredWidth > 1100) {// very big desktop ? restoredWidth = 1000; @@ -2088,13 +2088,13 @@ KexiMainWindowImpl::restoreSettings() restoredHeight = 600; } else {// small (800x600, 640x480) desktop - restoredWidth = QMIN( restoredWidth, 600 ); - restoredHeight = QMIN( restoredHeight, 400 ); + restoredWidth = TQMIN( restoredWidth, 600 ); + restoredHeight = TQMIN( restoredHeight, 400 ); }*/ config->setGroup("MainWindow"); - QSize s ( config->readNumEntry( QString::fromLatin1("Width %1").arg(desk.width()), 700 ), - config->readNumEntry( QString::fromLatin1("Height %1").arg(desk.height()), 480 ) ); + TQSize s ( config->readNumEntry( TQString::tqfromLatin1("Width %1").tqarg(desk.width()), 700 ), + config->readNumEntry( TQString::tqfromLatin1("Height %1").tqarg(desk.height()), 480 ) ); resize (kMin (s.width(), desk.width()), kMin(s.height(), desk.height())); } #endif @@ -2134,25 +2134,25 @@ KexiMainWindowImpl::storeSettings() d->propEditorDockSeparatorPos = 80; if (d->nav && d->navDockSeparatorPos >= 0 && d->navDockSeparatorPos <= 100) { d->config->setGroup("MainWindow"); - //KDockWidget *dw = (KDockWidget *)d->nav->parentWidget(); + //KDockWidget *dw = (KDockWidget *)d->nav->tqparentWidget(); //int w = dw->width(); //int ww = width(); //int d1 = (100 * dw->width()) / width() + 1; - //KDockSplitter *ds = (KDockSplitter *)dw->parentWidget(); + //KDockSplitter *ds = (KDockSplitter *)dw->tqparentWidget(); //int d2 = ds->separatorPosInPercent(); if (d->wasAutoOpen && d->dialogExistedBeforeCloseProject) { -#ifdef Q_WS_WIN +#ifdef TQ_WS_WIN d->config->writeEntry("LeftDockPositionWithAutoOpen", d->navDockSeparatorPos); #endif // d->config->writeEntry("LeftDockPosition", dw->width()); // d->config->writeEntry("LeftDockPosition", d->nav->width()); } else { -#ifdef Q_WS_WIN +#ifdef TQ_WS_WIN if (d->dialogExistedBeforeCloseProject) d->config->writeEntry("LeftDockPosition", d->navDockSeparatorPos); else - d->config->writeEntry("LeftDockPosition", qRound(double(d->navDockSeparatorPos) / 0.77 + d->config->writeEntry("LeftDockPosition", tqRound(double(d->navDockSeparatorPos) / 0.77 / (double(d->propEditorDockSeparatorPos) / 80) )); #endif } @@ -2172,7 +2172,7 @@ KexiMainWindowImpl::restoreWindowConfiguration(KConfig *config) config->setGroup("MainWindow"); - QString dockGrp; + TQString dockGrp; if (kapp->isRestored()) dockGrp=config->group()+"-Docking"; @@ -2188,9 +2188,9 @@ KexiMainWindowImpl::storeWindowConfiguration(KConfig *config) { kdDebug()<<"preparing session saving"<<endl; config->setGroup("MainWindow"); - QString dockGrp; + TQString dockGrp; -#if KDE_IS_VERSION(3,1,9) && !defined(Q_WS_WIN) +#if KDE_IS_VERSION(3,1,9) && !defined(TQ_WS_WIN) if (kapp->sessionSaving()) dockGrp=config->group()+"-Docking"; else @@ -2224,12 +2224,12 @@ void KexiMainWindowImpl::registerChild(KexiDialogBase *dlg) { kdDebug() << "KexiMainWindowImpl::registerChild()" << endl; - connect(dlg, SIGNAL(activated(KMdiChildView *)), - this, SLOT(activeWindowChanged(KMdiChildView *))); - connect(dlg, SIGNAL(dirtyChanged(KexiDialogBase*)), - this, SLOT(slotDirtyFlagChanged(KexiDialogBase*))); + connect(dlg, TQT_SIGNAL(activated(KMdiChildView *)), + TQT_TQOBJECT(this), TQT_SLOT(activeWindowChanged(KMdiChildView *))); + connect(dlg, TQT_SIGNAL(dirtyChanged(KexiDialogBase*)), + TQT_TQOBJECT(this), TQT_SLOT(slotDirtyFlagChanged(KexiDialogBase*))); -// connect(dlg, SIGNAL(childWindowCloseRequest(KMdiChildView *)), this, SLOT(childClosed(KMdiChildView *))); +// connect(dlg, TQT_SIGNAL(childWindowCloseRequest(KMdiChildView *)), TQT_TQOBJECT(this), TQT_SLOT(childClosed(KMdiChildView *))); if(dlg->id() != -1) { d->insertDialog(dlg); } @@ -2323,7 +2323,7 @@ void KexiMainWindowImpl::updateCustomPropertyPanelTabs( curDialogPart->setupCustomPropertyPanelTabs(d->propEditorTabWidget, this); //restore current page number for this part - if (d->recentlySelectedPropertyPanelPages.contains( curDialogPart )) { + if (d->recentlySelectedPropertyPanelPages.tqcontains( curDialogPart )) { d->propEditorTabWidget->setCurrentPage( d->recentlySelectedPropertyPanelPages[ curDialogPart ] ); @@ -2440,7 +2440,7 @@ void KexiMainWindowImpl::activeWindowChanged(KMdiChildView *v) d->curDialog->selectedView()->propertySetSwitched(); if (dialogChanged) { -// invalidateSharedActions(); +// tqinvalidateSharedActions(); //update property editor's contents... // if ((KexiPropertyBuffer*)d->propBuffer!=d->curDialog->propertyBuffer()) { // propertyBufferSwitched();//d->curDialog); @@ -2457,8 +2457,8 @@ void KexiMainWindowImpl::activeWindowChanged(KMdiChildView *v) } // if (!d->curDialog.isNull()) // d->last_checked_mode = d->actions_for_view_modes[ d->curDialog->currentViewMode() ]; - invalidateViewModeActions(); - invalidateActions(); + tqinvalidateViewModeActions(); + tqinvalidateActions(); d->updateFindDialogContents(); if (dlg) dlg->setFocus(); @@ -2523,7 +2523,7 @@ void KexiMainWindowImpl::slotConfigureToolbars() { KEditToolbar edit(factory()); -// connect(&edit,SIGNAL(newToolbarConfig()),this,SLOT(slotNewToolbarConfig())); +// connect(&edit,TQT_SIGNAL(newToolbarConfig()),this,TQT_SLOT(slotNewToolbarConfig())); (void) edit.exec(); } @@ -2538,7 +2538,7 @@ KexiMainWindowImpl::slotProjectNew() //TODO use KexiStartupDialog(KexiStartupDialog::Templates...) bool cancel; - QString fileName; + TQString fileName; KexiProjectData *new_data = createBlankProjectData( cancel, false, /* do not confirm prj overwrites: user will be asked on process startup */ @@ -2547,8 +2547,8 @@ KexiMainWindowImpl::slotProjectNew() if (!new_data) return; - QStringList args; - args << qApp->applicationFilePath() << "-create-opendb"; + TQStringList args; + args << tqApp->applicationFilePath() << "-create-opendb"; if (new_data->connectionData()->fileName().isEmpty()) { //server based - pass .kexic file if (fileName.isEmpty()) @@ -2564,10 +2564,10 @@ KexiMainWindowImpl::slotProjectNew() //todo: pass new_data->caption() //start new instance //! @todo use KProcess? - QProcess proc(args, this, "process"); - proc.setCommunication((QProcess::Communication)0); -// proc.setWorkingDirectory( QFileInfo(new_data->connectionData()->fileName()).dir(true) ); - proc.setWorkingDirectory( QFileInfo(fileName).dir(true) ); + TQProcess proc(args, TQT_TQOBJECT(this), "process"); + proc.setCommunication((TQProcess::Communication)0); +// proc.setWorkingDirectory( TQFileInfo(new_data->connectionData()->fileName()).dir(true) ); + proc.setWorkingDirectory( TQFileInfo(fileName).dir(true) ); if (!proc.start()) { d->showStartProcessMsg(args); } @@ -2579,22 +2579,22 @@ KexiMainWindowImpl::createKexiProject(KexiProjectData* new_data) { d->prj = new KexiProject( new_data, this ); // d->prj = ::createKexiProject(new_data); -//provided by KexiMessageHandler connect(d->prj, SIGNAL(error(const QString&,KexiDB::Object*)), this, SLOT(showErrorMessage(const QString&,KexiDB::Object*))); -//provided by KexiMessageHandler connect(d->prj, SIGNAL(error(const QString&,const QString&)), this, SLOT(showErrorMessage(const QString&,const QString&))); - connect(d->prj, SIGNAL(itemRenamed(const KexiPart::Item&, const QCString&)), this, SLOT(slotObjectRenamed(const KexiPart::Item&, const QCString&))); +//provided by KexiMessageHandler connect(d->prj, TQT_SIGNAL(error(const TQString&,KexiDB::Object*)), TQT_TQOBJECT(this), TQT_SLOT(showErrorMessage(const TQString&,KexiDB::Object*))); +//provided by KexiMessageHandler connect(d->prj, TQT_SIGNAL(error(const TQString&,const TQString&)), TQT_TQOBJECT(this), TQT_SLOT(showErrorMessage(const TQString&,const TQString&))); + connect(d->prj, TQT_SIGNAL(itemRenamed(const KexiPart::Item&, const TQCString&)), TQT_TQOBJECT(this), TQT_SLOT(slotObjectRenamed(const KexiPart::Item&, const TQCString&))); if (d->nav) - connect(d->prj, SIGNAL(itemRemoved(const KexiPart::Item&)), d->nav, SLOT(slotRemoveItem(const KexiPart::Item&))); + connect(d->prj, TQT_SIGNAL(itemRemoved(const KexiPart::Item&)), d->nav, TQT_SLOT(slotRemoveItem(const KexiPart::Item&))); } KexiProjectData* KexiMainWindowImpl::createBlankProjectData(bool &cancelled, bool confirmOverwrites, - QString* shortcutFileName) + TQString* shortcutFileName) { cancelled = false; KexiNewProjectWizard wiz(Kexi::connset(), 0, "KexiNewProjectWizard", true); wiz.setConfirmOverwrites(confirmOverwrites); - if (wiz.exec() != QDialog::Accepted) { + if (wiz.exec() != TQDialog::Accepted) { cancelled=true; return 0; } @@ -2602,7 +2602,7 @@ KexiMainWindowImpl::createBlankProjectData(bool &cancelled, bool confirmOverwrit KexiProjectData *new_data; if (shortcutFileName) - *shortcutFileName = QString::null; + *shortcutFileName = TQString(); if (wiz.projectConnectionData()) { //server-based project KexiDB::ConnectionData *cdata = wiz.projectConnectionData(); @@ -2648,7 +2648,7 @@ KexiMainWindowImpl::createBlankProject() initNavigator(); Kexi::recentProjects().addProjectData( new_data ); - invalidateActions(); + tqinvalidateActions(); updateAppCaption(); return true; } @@ -2660,14 +2660,14 @@ KexiMainWindowImpl::slotProjectOpen() KexiStartupDialog::OpenExisting, 0, Kexi::connset(), Kexi::recentProjects(), this, "KexiOpenDialog"); - if (dlg.exec()!=QDialog::Accepted) + if (dlg.exec()!=TQDialog::Accepted) return; openProject(dlg.selectedFileName(), dlg.selectedExistingConnection()); } -tristate KexiMainWindowImpl::openProject(const QString& aFileName, - const QString& fileNameForConnectionData, const QString& dbName) +tristate KexiMainWindowImpl::openProject(const TQString& aFileName, + const TQString& fileNameForConnectionData, const TQString& dbName) { if (d->prj) return openProjectInExternalKexiInstance(aFileName, fileNameForConnectionData, dbName); @@ -2683,9 +2683,9 @@ tristate KexiMainWindowImpl::openProject(const QString& aFileName, return openProject(aFileName, cdata, dbName); } -tristate KexiMainWindowImpl::openProject(const QString& aFileName, - KexiDB::ConnectionData *cdata, const QString& dbName, - const QValueList<KexiProjectData::ObjectInfo>& autoopenObjects) +tristate KexiMainWindowImpl::openProject(const TQString& aFileName, + KexiDB::ConnectionData *cdata, const TQString& dbName, + const TQValueList<KexiProjectData::ObjectInfo>& autoopenObjects) { if (d->prj) { return openProjectInExternalKexiInstance(aFileName, cdata, dbName); @@ -2708,7 +2708,7 @@ tristate KexiMainWindowImpl::openProject(const QString& aFileName, } } else { -// QString selFile = dlg.selectedExistingFile(); +// TQString selFile = dlg.selectedExistingFile(); if (aFileName.isEmpty()) { kdWarning() << "KexiMainWindowImpl::openProject(): aFileName.isEmpty()" << endl; return false; @@ -2718,7 +2718,7 @@ tristate KexiMainWindowImpl::openProject(const QString& aFileName, KexiDB::ConnectionData cdata; cdata.setFileName( aFileName ); // cdata.driverName = KexiStartupHandler::detectDriverForFile( cdata.driverName, fileName, this ); - QString detectedDriverName; + TQString detectedDriverName; KexiStartupData::Import importActionData; const tristate res = KexiStartupHandler::detectActionForFile( importActionData, detectedDriverName, cdata.driverName, aFileName, this ); @@ -2746,10 +2746,10 @@ tristate KexiMainWindowImpl::openProject(const QString& aFileName, return res; } -tristate KexiMainWindowImpl::openProjectInExternalKexiInstance(const QString& aFileName, - KexiDB::ConnectionData *cdata, const QString& dbName) +tristate KexiMainWindowImpl::openProjectInExternalKexiInstance(const TQString& aFileName, + KexiDB::ConnectionData *cdata, const TQString& dbName) { - QString fileNameForConnectionData; + TQString fileNameForConnectionData; if (aFileName.isEmpty()) { //try .kexic file if (cdata) fileNameForConnectionData = Kexi::connset().fileNameForConnectionData(cdata); @@ -2757,12 +2757,12 @@ tristate KexiMainWindowImpl::openProjectInExternalKexiInstance(const QString& aF return openProjectInExternalKexiInstance(aFileName, fileNameForConnectionData, dbName); } -tristate KexiMainWindowImpl::openProjectInExternalKexiInstance(const QString& aFileName, - const QString& fileNameForConnectionData, const QString& dbName) +tristate KexiMainWindowImpl::openProjectInExternalKexiInstance(const TQString& aFileName, + const TQString& fileNameForConnectionData, const TQString& dbName) { - QString fileName(aFileName); - QStringList args; - args << qApp->applicationFilePath(); + TQString fileName(aFileName); + TQStringList args; + args << tqApp->applicationFilePath(); // open a file-based project or a server connection provided as a .kexic file // (we have no other simple way to provide the startup data to a new process) if (fileName.isEmpty()) { //try .kexic file @@ -2783,8 +2783,8 @@ tristate KexiMainWindowImpl::openProjectInExternalKexiInstance(const QString& aF } //! @todo use KRun args << fileName; - QProcess proc(args, this, "process"); - proc.setWorkingDirectory( QFileInfo(fileName).dir(true) ); + TQProcess proc(args, TQT_TQOBJECT(this), "process"); + proc.setWorkingDirectory( TQFileInfo(fileName).dir(true) ); const bool ok = proc.start(); if (!ok) { d->showStartProcessMsg(args); @@ -2873,7 +2873,7 @@ KexiMainWindowImpl::slotProjectSave() return; saveObject( d->curDialog ); updateAppCaption(); - invalidateActions(); + tqinvalidateActions(); } void @@ -2992,8 +2992,8 @@ void KexiMainWindowImpl::slotViewPropertyEditor() d->block_KMdiMainFrm_eventFilter=false; /*#if defined(KDOCKWIDGET_P) - KDockWidget *dw = (KDockWidget *)d->propEditor->parentWidget(); - KDockSplitter *ds = (KDockSplitter *)dw->parentWidget(); + KDockWidget *dw = (KDockWidget *)d->propEditor->tqparentWidget(); + KDockSplitter *ds = (KDockSplitter *)dw->tqparentWidget(); ds->setSeparatorPos(80,true);//d->config->readNumEntry("RightDockPosition", 80), true); #endif*/ } @@ -3006,10 +3006,10 @@ bool KexiMainWindowImpl::switchToViewMode(int viewMode) } if (!d->curDialog->supportsViewMode( viewMode )) { showErrorMessage(i18n("Selected view is not supported for \"%1\" object.") - .arg(d->curDialog->partItem()->name()), + .tqarg(d->curDialog->partItem()->name()), i18n("Selected view (%1) is not supported by this object type (%2).") - .arg(Kexi::nameForViewMode(viewMode)) - .arg(d->curDialog->part()->instanceCaption()) ); + .tqarg(Kexi::nameForViewMode(viewMode)) + .tqarg(d->curDialog->part()->instanceCaption()) ); d->toggleLastCheckedMode(); return false; } @@ -3019,7 +3019,7 @@ bool KexiMainWindowImpl::switchToViewMode(int viewMode) tristate res = d->curDialog->switchToViewMode( viewMode ); if (!res) { updateCustomPropertyPanelTabs(0, Kexi::NoViewMode); //revert - showErrorMessage(i18n("Switching to other view failed (%1).").arg(Kexi::nameForViewMode(viewMode)), + showErrorMessage(i18n("Switching to other view failed (%1).").tqarg(Kexi::nameForViewMode(viewMode)), d->curDialog); d->toggleLastCheckedMode(); return false; @@ -3038,8 +3038,8 @@ bool KexiMainWindowImpl::switchToViewMode(int viewMode) d->curDialogViewGUIClient=viewClient; //remember d->updatePropEditorVisibility(viewMode); - invalidateProjectWideActions(); - invalidateSharedActions(); + tqinvalidateProjectWideActions(); + tqinvalidateSharedActions(); d->updateFindDialogContents(); return true; } @@ -3060,7 +3060,7 @@ void KexiMainWindowImpl::slotViewTextMode() switchToViewMode(Kexi::TextViewMode); } -void KexiMainWindowImpl::closeWindow(KMdiChildView *pWnd, bool layoutTaskBar) +void KexiMainWindowImpl::closeWindow(KMdiChildView *pWnd, bool tqlayoutTaskBar) { if (d->insideCloseDialog && dynamic_cast<KexiDialogBase *>(pWnd)) { d->windowsToClose.append(dynamic_cast<KexiDialogBase *>(pWnd)); @@ -3075,12 +3075,12 @@ void KexiMainWindowImpl::closeWindow(KMdiChildView *pWnd, bool layoutTaskBar) } } */ - closeDialog(dynamic_cast<KexiDialogBase *>(pWnd), layoutTaskBar); + closeDialog(dynamic_cast<KexiDialogBase *>(pWnd), tqlayoutTaskBar); } tristate KexiMainWindowImpl::getNewObjectInfo( KexiPart::Item *partItem, KexiPart::Part *part, - bool& allowOverwriting, const QString& messageWhenAskingForName ) + bool& allowOverwriting, const TQString& messageWhenAskingForName ) { //data was never saved in the past -we need to create a new object at the backend KexiPart::Info *info = part->info(); @@ -3104,7 +3104,7 @@ tristate KexiMainWindowImpl::getNewObjectInfo( allowOverwriting = false; bool found; do { - if (d->nameDialog->exec()!=QDialog::Accepted) + if (d->nameDialog->exec()!=TQDialog::Accepted) return cancelled; //check if that name already exists KexiDB::SchemaData tmp_sdata; @@ -3118,11 +3118,11 @@ tristate KexiMainWindowImpl::getNewObjectInfo( if (allowOverwriting) { int res = KMessageBox::warningYesNoCancel(this, "<p>"+part->i18nMessage("Object \"%1\" already exists.", 0) - .arg(d->nameDialog->widget()->nameText()) + .tqarg(d->nameDialog->widget()->nameText()) +"</p><p>"+i18n("Do you want to replace it?")+"</p>", 0, KGuiItem(i18n("&Replace"), "button_yes"), KGuiItem(i18n("&Choose Other Name...")), - QString::null, KMessageBox::Notify|KMessageBox::Dangerous); + TQString(), KMessageBox::Notify|KMessageBox::Dangerous); if (res == KMessageBox::No) continue; else if (res == KMessageBox::Cancel) @@ -3135,11 +3135,11 @@ tristate KexiMainWindowImpl::getNewObjectInfo( else { KMessageBox::information(this, "<p>"+part->i18nMessage("Object \"%1\" already exists.", 0) - .arg(d->nameDialog->widget()->nameText()) + .tqarg(d->nameDialog->widget()->nameText()) +"</p><p>"+i18n("Please choose other name.")+"</p>"); // " For example: Table \"my_table\" already exists" , // "%1 \"%2\" already exists.\nPlease choose other name.") -// .arg(dlg->part()->instanceName()).arg(d->nameDialog->widget()->nameText())); +// .tqarg(dlg->part()->instanceName()).tqarg(d->nameDialog->widget()->nameText())); continue; } } @@ -3152,7 +3152,7 @@ tristate KexiMainWindowImpl::getNewObjectInfo( return true; } -tristate KexiMainWindowImpl::saveObject( KexiDialogBase *dlg, const QString& messageWhenAskingForName, +tristate KexiMainWindowImpl::saveObject( KexiDialogBase *dlg, const TQString& messageWhenAskingForName, bool dontAsk) { tristate res; @@ -3160,7 +3160,7 @@ tristate KexiMainWindowImpl::saveObject( KexiDialogBase *dlg, const QString& mes //data was saved in the past -just save again res = dlg->storeData(dontAsk); if (!res) - showErrorMessage(i18n("Saving \"%1\" object failed.").arg(dlg->partItem()->name()), + showErrorMessage(i18n("Saving \"%1\" object failed.").tqarg(dlg->partItem()->name()), d->curDialog); return res; } @@ -3177,7 +3177,7 @@ tristate KexiMainWindowImpl::saveObject( KexiDialogBase *dlg, const QString& mes if (~res) return cancelled; if (!res) { - showErrorMessage(i18n("Saving new \"%1\" object failed.").arg(dlg->partItem()->name()), + showErrorMessage(i18n("Saving new \"%1\" object failed.").tqarg(dlg->partItem()->name()), d->curDialog); return false; } @@ -3187,7 +3187,7 @@ tristate KexiMainWindowImpl::saveObject( KexiDialogBase *dlg, const QString& mes //item id changed to final one: update association in dialogs' dictionary // d->dialogs.take(oldItemID); d->updateDialogId(dlg, oldItemID); - invalidateProjectWideActions(); + tqinvalidateProjectWideActions(); return true; } @@ -3196,7 +3196,7 @@ tristate KexiMainWindowImpl::closeDialog(KexiDialogBase *dlg) return closeDialog(dlg, true); } -tristate KexiMainWindowImpl::closeDialog(KexiDialogBase *dlg, bool layoutTaskBar, bool doNotSaveChanges) +tristate KexiMainWindowImpl::closeDialog(KexiDialogBase *dlg, bool tqlayoutTaskBar, bool doNotSaveChanges) { if (!dlg) return true; @@ -3224,28 +3224,28 @@ tristate KexiMainWindowImpl::closeDialog(KexiDialogBase *dlg, bool layoutTaskBar saveChanges.setToolTip(i18n("Save changes")); saveChanges.setWhatsThis( i18n( "Pressing this button will save all recent changes made in \"%1\" object." ) - .arg(dlg->partItem()->name()) ); + .tqarg(dlg->partItem()->name()) ); KGuiItem discardChanges( KStdGuiItem::discard() ); discardChanges.setWhatsThis( i18n( "Pressing this button will discard all recent changes made in \"%1\" object." ) - .arg(dlg->partItem()->name()) ); + .tqarg(dlg->partItem()->name()) ); //dialog's data is dirty: //--adidional message, e.g. table designer will return // "Note: This table is already filled with data which will be removed." // if the dlg is in design view mode. - QString additionalMessage = dlg->part()->i18nMessage( + TQString additionalMessage = dlg->part()->i18nMessage( ":additional message before saving design", dlg); if (additionalMessage.startsWith(":")) - additionalMessage = QString::null; + additionalMessage = TQString(); if (!additionalMessage.isEmpty()) additionalMessage = "<p>"+additionalMessage+"</p>"; const int questionRes = KMessageBox::warningYesNoCancel( this, "<p>"+dlg->part()->i18nMessage("Design of object \"%1\" has been modified.", dlg) - .arg(dlg->partItem()->name())+"</p><p>"+i18n("Do you want to save changes?")+"</p>" + .tqarg(dlg->partItem()->name())+"</p><p>"+i18n("Do you want to save changes?")+"</p>" + additionalMessage /*may be empty*/, - QString::null, + TQString(), saveChanges, discardChanges); if (questionRes==KMessageBox::Cancel) { @@ -3259,7 +3259,7 @@ tristate KexiMainWindowImpl::closeDialog(KexiDialogBase *dlg, bool layoutTaskBar if (questionRes==KMessageBox::Yes) { //save it // if (!dlg->storeData()) - tristate res = saveObject( dlg, QString::null, true /*dontAsk*/ ); + tristate res = saveObject( dlg, TQString(), true /*dontAsk*/ ); if (!res || ~res) { //js:TODO show error info; (retry/ignore/cancel) #ifndef KEXI_NO_PENDING_DIALOGS @@ -3297,7 +3297,7 @@ tristate KexiMainWindowImpl::closeDialog(KexiDialogBase *dlg, bool layoutTaskBar d->removeDialog(dlg_id); //don't remove -KMDI will do that //also remove from 'print setup dialogs' cache, if needed int printedObjectID = 0; - if (d->pageSetupDialogItemID2dataItemID_map.contains(dlg_id)) + if (d->pageSetupDialogItemID2dataItemID_map.tqcontains(dlg_id)) printedObjectID = d->pageSetupDialogItemID2dataItemID_map[ dlg_id ]; d->pageSetupDialogs.take(printedObjectID); @@ -3338,7 +3338,7 @@ tristate KexiMainWindowImpl::closeDialog(KexiDialogBase *dlg, bool layoutTaskBar const bool isInMaximizedChildFrmMode = this->isInMaximizedChildFrmMode(); - KMdiMainFrm::closeWindow(dlg, layoutTaskBar); + KMdiMainFrm::closeWindow(dlg, tqlayoutTaskBar); //focus navigator if nothing else available if (d->openedDialogsCount()==0) { @@ -3348,7 +3348,7 @@ tristate KexiMainWindowImpl::closeDialog(KexiDialogBase *dlg, bool layoutTaskBar d->updatePropEditorVisibility(0); } - invalidateActions(); + tqinvalidateActions(); d->insideCloseDialog = false; if (!d->windowsToClose.isEmpty()) //continue 'close all' closeDialog(d->windowsToClose.take(0), true); @@ -3376,13 +3376,13 @@ void KexiMainWindowImpl::detachWindow(KMdiChildView *pWnd,bool bShow) void KexiMainWindowImpl::attachWindow(KMdiChildView *pWnd, bool /*bShow*/, bool bAutomaticResize) { -// if (bAutomaticResize || w->size().isEmpty() || (w->size() == QSize(1,1))) { +// if (bAutomaticResize || w->size().isEmpty() || (w->size() == TQSize(1,1))) { KMdiMainFrm::attachWindow(pWnd,true,bAutomaticResize); //for dialogs in normal state: decrease dialog's height if it exceeds area contents if (pWnd->mdiParent()->state() == KMdiChildFrm::Normal - && pWnd->geometry().bottom() > pWnd->mdiParent()->mdiAreaContentsRect().bottom()) + && pWnd->tqgeometry().bottom() > pWnd->mdiParent()->mdiAreaContentsRect().bottom()) { - QRect r = pWnd->geometry(); + TQRect r = pWnd->tqgeometry(); r.setBottom( pWnd->mdiParent()->mdiAreaContentsRect().bottom() - 5 ); pWnd->setGeometry( r ); } @@ -3392,157 +3392,157 @@ void KexiMainWindowImpl::attachWindow(KMdiChildView *pWnd, bool /*bShow*/, bool dynamic_cast<KexiDialogBase*>(pWnd)->sendAttachedStateToCurrentView(); } -QWidget* KexiMainWindowImpl::findWindow(QWidget *w) +TQWidget* KexiMainWindowImpl::findWindow(TQWidget *w) { - while (w && !acceptsSharedActions(w)) - w = w->parentWidget(); + while (w && !acceptsSharedActions(TQT_TQOBJECT(w))) + w = w->tqparentWidget(); return w; } -bool KexiMainWindowImpl::acceptsSharedActions(QObject *w) +bool KexiMainWindowImpl::acceptsSharedActions(TQObject *w) { return w->inherits("KexiDialogBase") || w->inherits("KexiViewBase"); } -bool KexiMainWindowImpl::eventFilter( QObject *obj, QEvent * e ) +bool KexiMainWindowImpl::eventFilter( TQObject *obj, TQEvent * e ) { //KexiVDebug << "eventFilter: " <<e->type() << " " <<obj->name()<<endl; - if (e->type()==QEvent::KeyPress) { - KexiVDebug << "KEY EVENT " << QString::number(static_cast<QKeyEvent*>(e)->key(), 16) << endl; + if (e->type()==TQEvent::KeyPress) { + KexiVDebug << "KEY EVENT " << TQString::number(TQT_TQKEYEVENT(e)->key(), 16) << endl; KexiVDebug << endl; } - if (e->type()==QEvent::AccelOverride) { - //KexiVDebug << "AccelOverride EVENT " << static_cast<QKeyEvent*>(e)->key() << " " << static_cast<QKeyEvent*>(e)->state() == ControlButton << endl; + if (e->type()==TQEvent::AccelOverride) { + //KexiVDebug << "AccelOverride EVENT " << TQT_TQKEYEVENT(e)->key() << " " << TQT_TQKEYEVENT(e)->state() == ControlButton << endl; //avoid sending CTRL+Tab key twice for tabbed/ideal mode, epecially for win32 - if (static_cast<QKeyEvent*>(e)->key()==Qt::Key_Tab && static_cast<QKeyEvent*>(e)->state() == ControlButton) { - if (d->action_window_next->shortcut().keyCodeQt()==Qt::Key_Tab+Qt::CTRL && d->action_window_next->shortcut().count()==1 + if (TQT_TQKEYEVENT(e)->key()==TQt::Key_Tab && TQT_TQKEYEVENT(e)->state() == ControlButton) { + if (d->action_window_next->shortcut().keyCodeQt()==TQt::Key_Tab+TQt::CTRL && d->action_window_next->shortcut().count()==1 && (mdiMode()==KMdi::TabPageMode || mdiMode()==KMdi::IDEAlMode)) { - static_cast<QKeyEvent*>(e)->accept(); + TQT_TQKEYEVENT(e)->accept(); } } } - if (e->type()==QEvent::Close) { + if (e->type()==TQEvent::Close) { KexiVDebug << "Close EVENT" << endl; } - if (e->type()==QEvent::Resize) { + if (e->type()==TQEvent::Resize) { KexiVDebug << "Resize EVENT" << endl; } - if (e->type()==QEvent::ShowMaximized) { + if (e->type()==TQEvent::ShowMaximized) { KexiVDebug << "ShowMaximized EVENT" << endl; } /* if (obj==d->propEditor) { - if (e->type()==QEvent::Resize) { + if (e->type()==TQEvent::Resize) { d->updatePropEditorDockWidthInfo(); } }*/ - QWidget *focus_w = 0; - if (obj->inherits("QPopupMenu")) { + TQWidget *focus_w = 0; + if (obj->inherits(TQPOPUPMENU_OBJECT_NAME_STRING)) { /* Fixes for popup menus behaviour: For hiding/showing: focus previously (d->focus_before_popup) focused window, if known, otherwise focus currently focused one. - And: just invalidate actions. + And: just tqinvalidate actions. */ - if (e->type()==QEvent::Hide || e->type()==QEvent::Show) { + if (e->type()==TQEvent::Hide || e->type()==TQEvent::Show) { KexiVDebug << e->type() << endl; focus_w = focusWindow(); if (!d->focus_before_popup.isNull()) { d->focus_before_popup->setFocus(); d->focus_before_popup=0; - invalidateSharedActions(); + tqinvalidateSharedActions(); } else { if (focus_w) { focus_w->setFocus(); - invalidateSharedActions(); + tqinvalidateSharedActions(); } } } return false; } - /*! On mouse click on the findow, make sure it's focused and actions are invalidated */ - if (e->type()==QEvent::MouseButtonPress) { - QWidget *w = findWindow(static_cast<QWidget*>(obj)); + /*! On mouse click on the findow, make sure it's focused and actions are tqinvalidated */ + if (e->type()==TQEvent::MouseButtonPress) { + TQWidget *w = findWindow(TQT_TQWIDGET(obj)); KexiVDebug << "MouseButtonPress EVENT " << (w ? w->name() : 0) << endl; if (w) { w->setFocus(); - invalidateSharedActions(d->curDialog); + tqinvalidateSharedActions(TQT_TQOBJECT(d->curDialog)); } } - QWidget *w = findWindow(static_cast<QWidget*>(obj)); - if (e->type()==QEvent::FocusIn) { + TQWidget *w = findWindow(TQT_TQWIDGET(obj)); + if (e->type()==TQEvent::FocusIn) { focus_w = focusWindow(); KexiVDebug << "Focus EVENT" << endl; KexiVDebug << (focus_w ? focus_w->name() : "" ) << endl; KexiVDebug << "eventFilter: " <<e->type() << " " <<obj->name() <<endl; #ifdef KEXI_STATUSBAR_DEBUG - QWidget *focus_widget = focus_w ? focus_w->focusWidget() : 0; - d->statusBar->setStatus(QString("FOCUS VIEW: %1 %2, FOCUS WIDGET: %3 %4") - .arg(focus_w ? focus_w->className() : "").arg(focus_w ? focus_w->name() : "") - .arg(focus_widget ? focus_widget->className() : "").arg(focus_widget ? focus_widget->name() : "") + TQWidget *focus_widget = focus_w ? focus_w->tqfocusWidget() : 0; + d->statusBar->settqStatus(TQString("FOCUS VIEW: %1 %2, FOCUS WIDGET: %3 %4") + .tqarg(focus_w ? focus_w->className() : "").tqarg(focus_w ? focus_w->name() : "") + .tqarg(focus_widget ? focus_widget->className() : "").tqarg(focus_widget ? focus_widget->name() : "") ); #endif } - else if (e->type()==QEvent::FocusOut) { + else if (e->type()==TQEvent::FocusOut) { focus_w = focusWindow(); KexiVDebug << "Focus OUT EVENT" << endl; KexiVDebug << (focus_w ? focus_w->name() : "" ) << endl; KexiVDebug << "eventFilter: " <<e->type() << " " <<obj->name() <<endl; #ifdef KEXI_STATUSBAR_DEBUG - QWidget *focus_widget = focus_w ? focus_w->focusWidget() : 0; - d->statusBar->setStatus(QString("FOCUS VIEW: %1 %2, FOCUS WIDGET: %3 %4") - .arg(focus_w ? focus_w->className() : "").arg(focus_w ? focus_w->name() : "") - .arg(focus_widget ? focus_widget->className() : "").arg(focus_widget ? focus_widget->name() : "") + TQWidget *focus_widget = focus_w ? focus_w->tqfocusWidget() : 0; + d->statusBar->settqStatus(TQString("FOCUS VIEW: %1 %2, FOCUS WIDGET: %3 %4") + .tqarg(focus_w ? focus_w->className() : "").tqarg(focus_w ? focus_w->name() : "") + .tqarg(focus_widget ? focus_widget->className() : "").tqarg(focus_widget ? focus_widget->name() : "") ); #endif } - if (e->type()==QEvent::WindowActivate) { + if (e->type()==TQEvent::WindowActivate) { KexiVDebug << "WindowActivate EVENT" << endl; KexiVDebug << "eventFilter: " <<e->type() << " " <<obj->name()<<endl; } #if 0 - if (e->type()==QEvent::FocusIn) { + if (e->type()==TQEvent::FocusIn) { if (focus_w) { // if (d->actionProxies[ w ]) // if (d->actionProxies[ focus_w ]) { if (actionProxyFor( focus_w )) { -// invalidateSharedActions(); +// tqinvalidateSharedActions(); } else { -/* QObject* o = focusWidget(); +/* TQObject* o = tqfocusWidget(); while (o && !o->inherits("KexiDialogBase") && !o->inherits("KexiDockBase")) - o = o->parent();*/ -//js invalidateSharedActions(focus_w); + o = o->tqparent();*/ +//js tqinvalidateSharedActions(focus_w); } } -// /*|| e->type()==QEvent::FocusOut*/) && /*(!obj->inherits("KexiDialogBase")) &&*/ d->actionProxies[ obj ]) { -// invalidateSharedActions(); +// /*|| e->type()==TQEvent::FocusOut*/) && /*(!obj->inherits("KexiDialogBase")) &&*/ d->actionProxies[ obj ]) { +// tqinvalidateSharedActions(); } - if (e->type()==QEvent::FocusOut && focus_w && focus_w==d->curDialog && actionProxyFor( obj )) { - invalidateSharedActions(d->curDialog); + if (e->type()==TQEvent::FocusOut && focus_w && focus_w==d->curDialog && actionProxyFor( obj )) { + tqinvalidateSharedActions(d->curDialog); } #endif - if (!d->focus_before_popup.isNull() && e->type()==QEvent::FocusOut && obj->inherits("KMenuBar")) { + if (!d->focus_before_popup.isNull() && e->type()==TQEvent::FocusOut && obj->inherits("KMenuBar")) { //d->nav->setFocus(); d->focus_before_popup->setFocus(); d->focus_before_popup=0; - invalidateSharedActions(d->curDialog); + tqinvalidateSharedActions(TQT_TQOBJECT(d->curDialog)); return true; } - //remember currently focued window invalidate act. - if (e->type()==QEvent::FocusOut) { - if (static_cast<QFocusEvent*>(e)->reason()==QFocusEvent::Popup) { - if (KexiUtils::hasParent(d->curDialog, focus_w)) { - invalidateSharedActions(d->curDialog); + //remember currently focued window tqinvalidate act. + if (e->type()==TQEvent::FocusOut) { + if (TQT_TQFOCUSEVENT(e)->reason()==TQFocusEvent::Popup) { + if (KexiUtils::hasParent(TQT_TQOBJECT(d->curDialog), TQT_TQOBJECT(focus_w))) { + tqinvalidateSharedActions(TQT_TQOBJECT(d->curDialog)); d->focus_before_popup=d->curDialog; } else { -//not needed??? invalidateSharedActions(focus_w); +//not needed??? tqinvalidateSharedActions(focus_w); d->focus_before_popup=focus_w; } } @@ -3551,25 +3551,25 @@ bool KexiMainWindowImpl::eventFilter( QObject *obj, QEvent * e ) //keep focus in main window: if (w && w==d->nav) { // kdDebug() << "NAV" << endl; - if (e->type()==QEvent::FocusIn) { + if (e->type()==TQEvent::FocusIn) { return true; - } else if (e->type()==QEvent::WindowActivate && w==d->focus_before_popup) { + } else if (e->type()==TQEvent::WindowActivate && w==d->focus_before_popup) { // d->nav->setFocus(); d->focus_before_popup=0; return true; - } else if (e->type()==QEvent::FocusOut) { - if (static_cast<QFocusEvent*>(e)->reason()==QFocusEvent::Tab) { + } else if (e->type()==TQEvent::FocusOut) { + if (TQT_TQFOCUSEVENT(e)->reason()==TQFocusEvent::Tab) { //activate current child: if (d->curDialog) { d->curDialog->activate(); return true; } } - else if (static_cast<QFocusEvent*>(e)->reason()==QFocusEvent::Popup) { + else if (TQT_TQFOCUSEVENT(e)->reason()==TQFocusEvent::Popup) { d->focus_before_popup=w; } - //invalidateSharedActions(); - } else if (e->type()==QEvent::Hide) { + //tqinvalidateSharedActions(); + } else if (e->type()==TQEvent::Hide) { setFocus(); return false; } @@ -3589,8 +3589,8 @@ bool KexiMainWindowImpl::openingAllowed(KexiPart::Item* item, int viewMode) } KexiDialogBase * -KexiMainWindowImpl::openObject(const QCString& mimeType, const QString& name, - int viewMode, bool &openingCancelled, QMap<QString,QString>* staticObjectArgs) +KexiMainWindowImpl::openObject(const TQCString& mimeType, const TQString& name, + int viewMode, bool &openingCancelled, TQMap<TQString,TQString>* staticObjectArgs) { KexiPart::Item *item = d->prj->itemForMimeType(mimeType,name); if (!item) @@ -3600,12 +3600,12 @@ KexiMainWindowImpl::openObject(const QCString& mimeType, const QString& name, KexiDialogBase * KexiMainWindowImpl::openObject(KexiPart::Item* item, int viewMode, bool &openingCancelled, - QMap<QString,QString>* staticObjectArgs, QString* errorMessage) + TQMap<TQString,TQString>* staticObjectArgs, TQString* errorMessage) { if (!openingAllowed(item, viewMode)) { if (errorMessage) *errorMessage = i18n("opening is not allowed in \"data view/design view/text view\" mode", - "opening is not allowed in \"%1\" mode").arg(Kexi::nameForViewMode(viewMode)); + "opening is not allowed in \"%1\" mode").tqarg(Kexi::nameForViewMode(viewMode)); openingCancelled = true; return 0; } @@ -3666,9 +3666,9 @@ KexiMainWindowImpl::openObject(KexiPart::Item* item, int viewMode, bool &opening d->curDialogViewGUIClient=viewClient; //remember } - invalidateViewModeActions(); + tqinvalidateViewModeActions(); if (viewMode!=dlg->currentViewMode()) - invalidateSharedActions(); + tqinvalidateSharedActions(); #ifndef KEXI_NO_PENDING_DIALOGS d->removePendingDialog( dlg->id() ); @@ -3711,7 +3711,7 @@ KexiMainWindowImpl::openObjectFromNavigator(KexiPart::Item* item, int viewMode, openingCancelled = false; if (dlg) { if (activateWindow(dlg)) {//item->identifier())) {//just activate - invalidateViewModeActions(); + tqinvalidateViewModeActions(); return dlg; } } @@ -3790,7 +3790,7 @@ tristate KexiMainWindowImpl::removeObject( KexiPart::Item *item, bool dontAsk ) "<p>"+i18n("Do you want to permanently delete:\n" "%1\n" "If you click \"Delete\", you will not be able to undo the deletion.") - .arg( "</p><p>"+part->instanceCaption()+" \""+ item->name() + "\"?</p>" ), + .tqarg( "</p><p>"+part->instanceCaption()+" \""+ item->name() + "\"?</p>" ), 0, KGuiItem(i18n("Delete"), "editdelete"), KStdGuiItem::no())) return cancelled; } @@ -3798,7 +3798,7 @@ tristate KexiMainWindowImpl::removeObject( KexiPart::Item *item, bool dontAsk ) //also close 'print setup' dialog for this item, if any tristate res; // int printedObjectID = 0; -// if (d->pageSetupDialogItemID2dataItemID_map.contains(item->identifier())) +// if (d->pageSetupDialogItemID2dataItemID_map.tqcontains(item->identifier())) // printedObjectID = d->pageSetupDialogItemID2dataItemID_map[ item->identifier() ]; KexiDialogBase * pageSetupDlg = d->pageSetupDialogs[ item->identifier() ]; const bool oldInsideCloseDialog = d->insideCloseDialog; @@ -3848,14 +3848,14 @@ tristate KexiMainWindowImpl::removeObject( KexiPart::Item *item, bool dontAsk ) return true; } -void KexiMainWindowImpl::renameObject( KexiPart::Item *item, const QString& _newName, bool &success ) +void KexiMainWindowImpl::renameObject( KexiPart::Item *item, const TQString& _newName, bool &success ) { if (userMode()) { success = false; return; } d->pendingDialogsExist(); - QString newName = _newName.stripWhiteSpace(); + TQString newName = _newName.stripWhiteSpace(); if (newName.isEmpty()) { showSorryMessage( i18n("Could not set empty name for this object.") ); success = false; @@ -3865,14 +3865,14 @@ void KexiMainWindowImpl::renameObject( KexiPart::Item *item, const QString& _new const bool res = d->prj->renameObject(this, *item, newName); enableMessages(true); if (!res) { - showErrorMessage( d->prj, i18n("Renaming object \"%1\" failed.").arg(newName) ); + showErrorMessage( d->prj, i18n("Renaming object \"%1\" failed.").tqarg(newName) ); success = false; return; } d->pendingDialogsExist(); } -void KexiMainWindowImpl::slotObjectRenamed(const KexiPart::Item &item, const QCString& /*oldName*/) +void KexiMainWindowImpl::slotObjectRenamed(const KexiPart::Item &item, const TQCString& /*oldName*/) { #ifndef KEXI_NO_PENDING_DIALOGS Private::PendingJobType pendingType; @@ -3903,10 +3903,10 @@ void KexiMainWindowImpl::acceptPropertySetEditing() } void KexiMainWindowImpl::propertySetSwitched(KexiDialogBase *dlg, bool force, - bool preservePrevSelection, const QCString& propertyToSelect) + bool preservePrevSelection, const TQCString& propertyToSelect) { kdDebug() << "KexiMainWindowImpl::propertySetSwitched() d->curDialog: " - << (d->curDialog ? d->curDialog->caption() : QString("NULL")) << " dlg: " << (dlg ? dlg->caption() : QString("NULL"))<< endl; + << (d->curDialog ? d->curDialog->caption() : TQString("NULL")) << " dlg: " << (dlg ? dlg->caption() : TQString("NULL"))<< endl; if ((KexiDialogBase*)d->curDialog!=dlg) { d->propBuffer = 0; //we'll need to move to another prop. set return; @@ -3932,7 +3932,7 @@ void KexiMainWindowImpl::slotDirtyFlagChanged(KexiDialogBase* dlg) if(!userMode()) d->nav->updateItemName( *item, dlg->dirty() ); - invalidateActions(); + tqinvalidateActions(); updateAppCaption(); } @@ -3964,8 +3964,8 @@ void KexiMainWindowImpl::slotStartFeedbackAgent() if ( wizard->exec() ) { KApplication::kApplication()->invokeMailer( "kexi-reports-dummy@kexi.org", - QString::null, QString::null, - about->appName() + QCString( " [feedback]" ), + TQString(), TQString(), + about->appName() + TQCString( " [feedback]" ), wizard->feedbackDocument().toString( 2 ).local8Bit() ); } @@ -3980,7 +3980,7 @@ void KexiMainWindowImpl::importantInfo(bool /*onStartup*/) if (onStartup && !d->showImportantInfoOnStartup) return; - QString key = QString("showImportantInfo %1").arg(KEXI_VERSION_STRING); + TQString key = TQString("showImportantInfo %1").tqarg(KEXI_VERSION_STRING); d->config->setGroup("Startup"); bool show = d->config->readBoolEntry(key,true); @@ -3989,30 +3989,30 @@ void KexiMainWindowImpl::importantInfo(bool /*onStartup*/) if (!d->config->hasKey("RunOnStart")) d->config->writeEntry("RunOnStart",true); - QString lang = KGlobal::locale()->language(); - QString fname = locate("data", QString("kexi/readme_")+lang); + TQString lang = KGlobal::locale()->language(); + TQString fname = locate("data", TQString("kexi/readme_")+lang); if (fname.isEmpty())//back to default fname = locate("data", "kexi/readme_en"); - KTipDialog tipDialog(new KTipDatabase(QString::null), 0); + KTipDialog tipDialog(new KTipDatabase(TQString()), 0); tipDialog.setCaption(i18n("Important Information")); - QObjectList *l = tipDialog.queryList( "KPushButton" );//hack: hide <- -> buttons + TQObjectList *l = tipDialog.queryList( "KPushButton" );//hack: hide <- -> buttons int i=0; - for (QObjectListIt it( *l ); it.current() && i<2; ++it, i++ ) + for (TQObjectListIt it( *l ); it.current() && i<2; ++it, i++ ) static_cast<KPushButton*>(it.current())->hide(); - QFile f(fname); + TQFile f(fname); if ( f.open( IO_ReadOnly ) ) { - QTextStream ts(&f); + TQTextStream ts(&f); ts.setCodec( KGlobal::locale()->codecForEncoding() ); - QTextBrowser *tb = KexiUtils::findFirstChild<KTextBrowser>(&tipDialog,"KTextBrowser"); + TQTextBrowser *tb = KexiUtils::findFirstChild<KTextBrowser>(&tipDialog,"KTextBrowser"); if (tb) { - tb->setText( QString("<qt>%1</qt>").arg(ts.read()) ); + tb->setText( TQString("<qt>%1</qt>").tqarg(ts.read()) ); } f.close(); } tipDialog.adjustSize(); - QRect desk = QApplication::desktop()->screenGeometry( QApplication::desktop()->screenNumber(this) ); - tipDialog.resize( QMAX(tipDialog.width(),desk.width()*3/5), QMAX(tipDialog.height(),desk.height()*3/5) ); + TQRect desk = TQApplication::desktop()->screenGeometry( TQApplication::desktop()->screenNumber(this) ); + tipDialog.resize( TQMAX(tipDialog.width(),desk.width()*3/5), TQMAX(tipDialog.height(),desk.height()*3/5) ); KDialog::centerOnScreen(&tipDialog); tipDialog.setModal ( true ); tipDialog.exec(); @@ -4061,8 +4061,8 @@ KexiMainWindowImpl::initUserMode(KexiProjectData *projectData) #if 0 //todo reenable; autoopen objects are handled elsewhere KexiDB::TableSchema *sch = d->prj->dbConnection()->tableSchema("kexi__final"); - QString err_msg = i18n("Could not start project \"%1\" in Final Mode.") - .arg(static_cast<KexiDB::SchemaData*>(projectData)->name()); + TQString err_msg = i18n("Could not start project \"%1\" in Final Mode.") + .tqarg(static_cast<KexiDB::SchemaData*>(projectData)->name()); if(!sch) { hide(); @@ -4078,8 +4078,8 @@ KexiMainWindowImpl::initUserMode(KexiProjectData *projectData) return false; } - QString startupPart; - QString startupItem; + TQString startupPart; + TQString startupItem; while(c->moveNext()) { kdDebug() << "KexiMainWinImpl::initFinalMode(): property: [" << c->value(1).toString() << "] " << c->value(2).toString() << endl; @@ -4117,7 +4117,7 @@ KexiMainWindowImpl::initUserMode(KexiProjectData *projectData) return false; } - QWidget::setCaption("MyApp");//TODO + TQWidget::setCaption("MyApp");//TODO #endif return true; } @@ -4138,8 +4138,8 @@ KexiMainWindowImpl::initUserActions() /* KexiUserAction *a1 = new KexiUserAction(this, actionCollection(), "user_dataview", "Change to dataview", "table"); Arguments args; - args.append(QVariant("kexi/table")); - args.append(QVariant("persons")); + args.append(TQVariant("kexi/table")); + args.append(TQVariant("persons")); a1->setMethod(KexiUserAction::OpenObject, args); */ #endif @@ -4147,7 +4147,7 @@ KexiMainWindowImpl::initUserActions() void KexiMainWindowImpl::slotToolsProjectMigration() { - showProjectMigrationWizard(QString::null, QString::null); + showProjectMigrationWizard(TQString(), TQString()); } void KexiMainWindowImpl::slotToolsCompactDatabase() @@ -4161,7 +4161,7 @@ void KexiMainWindowImpl::slotToolsCompactDatabase() KexiStartupDialog::OpenExisting, 0, Kexi::connset(), Kexi::recentProjects(), this, "KexiOpenDialog"); - if (dlg.exec()!=QDialog::Accepted) + if (dlg.exec()!=TQDialog::Accepted) return; if (dlg.selectedFileName().isEmpty()) { @@ -4184,7 +4184,7 @@ void KexiMainWindowImpl::slotToolsCompactDatabase() if (!drv || !(drv->features() & KexiDB::Driver::CompactingDatabaseSupported)) { KMessageBox::information(this, "<qt>"+ i18n("Compacting database file <nobr>\"%1\"</nobr> is not supported.") - .arg(QDir::convertSeparators(cdata.fileName()))); + .tqarg(TQDir::convertSeparators(cdata.fileName()))); return; } data = new KexiProjectData( cdata, cdata.fileName() ); @@ -4219,40 +4219,40 @@ void KexiMainWindowImpl::slotToolsCompactDatabase() } tristate KexiMainWindowImpl::showProjectMigrationWizard( - const QString& mimeType, const QString& databaseName, const KexiDB::ConnectionData *cdata) + const TQString& mimeType, const TQString& databaseName, const KexiDB::ConnectionData *cdata) { //pass arguments - QMap<QString,QString> args; + TQMap<TQString,TQString> args; args.insert("mimeType", mimeType); args.insert("databaseName", databaseName); if (cdata) { //pass ConnectionData serialized as a string... - QString str; + TQString str; KexiUtils::serializeMap( KexiDB::toMap( *cdata ), str ); args.insert("connectionData", str); } - QDialog *dlg = KexiInternalPart::createModalDialogInstance("migration", this, this, 0, &args); + TQDialog *dlg = KexiInternalPart::createModalDialogInstance("migration", this, this, 0, &args); if (!dlg) return false; //error msg has been shown by KexiInternalPart const int result = dlg->exec(); delete dlg; //raise(); - if (result!=QDialog::Accepted) + if (result!=TQDialog::Accepted) return cancelled; //open imported project in a new Kexi instance - QString destinationDatabaseName( args["destinationDatabaseName"] ); - QString fileName, destinationConnectionShortcut, dbName; + TQString destinationDatabaseName( args["destinationDatabaseName"] ); + TQString fileName, destinationConnectionShortcut, dbName; if (!destinationDatabaseName.isEmpty()) { - if (args.contains("destinationConnectionShortcut")) { + if (args.tqcontains("destinationConnectionShortcut")) { // server-based destinationConnectionShortcut = args["destinationConnectionShortcut"]; } else { // file-based fileName = destinationDatabaseName; - destinationDatabaseName = QString::null; + destinationDatabaseName = TQString(); } tristate res = openProject(fileName, destinationConnectionShortcut, destinationDatabaseName); @@ -4281,9 +4281,9 @@ void KexiMainWindowImpl::slotProjectImportDataTable() //! @todo allow data appending (it is not possible now) if (userMode()) return; - QMap<QString,QString> args; + TQMap<TQString,TQString> args; args.insert("sourceType", "file"); - QDialog *dlg = KexiInternalPart::createModalDialogInstance( + TQDialog *dlg = KexiInternalPart::createModalDialogInstance( "csv_importexport", "KexiCSVImportDialog", this, this, 0, &args); if (!dlg) return; //error msg has been shown by KexiInternalPart @@ -4292,7 +4292,7 @@ void KexiMainWindowImpl::slotProjectImportDataTable() } tristate KexiMainWindowImpl::executeCustomActionForObject(KexiPart::Item* item, - const QString& actionName) + const TQString& actionName) { if (actionName == "exportToCSV") return exportItemAsDataTable(item); @@ -4311,30 +4311,30 @@ tristate KexiMainWindowImpl::exportItemAsDataTable(KexiPart::Item* item) //! @todo: check if changes to this are saved, if not: ask for saving //! @todo: accept row changes... - QMap<QString,QString> args; + TQMap<TQString,TQString> args; args.insert("destinationType", "file"); - args.insert("itemId", QString::number(item->identifier())); - QDialog *dlg = KexiInternalPart::createModalDialogInstance( + args.insert("itemId", TQString::number(item->identifier())); + TQDialog *dlg = KexiInternalPart::createModalDialogInstance( "csv_importexport", "KexiCSVExportWizard", this, this, 0, &args); if (!dlg) return false; //error msg has been shown by KexiInternalPart int result = dlg->exec(); delete dlg; - return result == QDialog::Rejected ? cancelled : true; + return result == TQDialog::Rejected ? cancelled : true; } -bool KexiMainWindowImpl::printItem(KexiPart::Item* item, const QString& titleText) +bool KexiMainWindowImpl::printItem(KexiPart::Item* item, const TQString& titleText) { return printItem(item, KexiSimplePrintingSettings::load(), titleText); } tristate KexiMainWindowImpl::printItem(KexiPart::Item* item) { - return printItem(item, QString::null); + return printItem(item, TQString()); } bool KexiMainWindowImpl::printItem(KexiPart::Item* item, const KexiSimplePrintingSettings& settings, - const QString& titleText) + const TQString& titleText) { //! @todo: check if changes to this object's design are saved, if not: ask for saving //! @todo: accept row changes... @@ -4343,20 +4343,20 @@ bool KexiMainWindowImpl::printItem(KexiPart::Item* item, const KexiSimplePrintin return cmd.print(settings, titleText); } -bool KexiMainWindowImpl::printPreviewForItem(KexiPart::Item* item, const QString& titleText, bool reload) +bool KexiMainWindowImpl::printPreviewForItem(KexiPart::Item* item, const TQString& titleText, bool reload) { return printPreviewForItem(item, KexiSimplePrintingSettings::load(), titleText, reload); } tristate KexiMainWindowImpl::printPreviewForItem(KexiPart::Item* item) { - return printPreviewForItem(item, QString::null, + return printPreviewForItem(item, TQString(), //! @todo store cached row data? true/*reload*/); } bool KexiMainWindowImpl::printPreviewForItem(KexiPart::Item* item, - const KexiSimplePrintingSettings& settings, const QString& titleText, bool reload) + const KexiSimplePrintingSettings& settings, const TQString& titleText, bool reload) { //! @todo: check if changes to this object's design are saved, if not: ask for saving //! @todo: accept row changes... @@ -4392,8 +4392,8 @@ tristate KexiMainWindowImpl::printActionForItem(KexiPart::Item* item, PrintActio if (!activateWindow(printingDialog)) return false; if (action == PreviewItem || action == PrintItem) { - QTimer::singleShot(0,printingDialog->selectedView(), - (action == PreviewItem) ? SLOT(printPreview()) : SLOT(print())); + TQTimer::singleShot(0,printingDialog->selectedView(), + (action == PreviewItem) ? TQT_SLOT(printPreview()) : TQT_SLOT(print())); } return true; } @@ -4409,7 +4409,7 @@ tristate KexiMainWindowImpl::printActionForItem(KexiPart::Item* item, PrintActio if (dlg) { // accept row changes - QWidget *prevFocusWidget = focusWidget(); + TQWidget *prevFocusWidget = tqfocusWidget(); dlg->setFocus(); d->action_data_save_row->activate(); if (prevFocusWidget) @@ -4423,13 +4423,13 @@ tristate KexiMainWindowImpl::printActionForItem(KexiPart::Item* item, PrintActio saveChanges.setToolTip(i18n("Save changes")); saveChanges.setWhatsThis( i18n( "Pressing this button will save all recent changes made in \"%1\" object." ) - .arg(item->name()) ); + .tqarg(item->name()) ); KGuiItem doNotSave( KStdGuiItem::no() ); doNotSave.setWhatsThis( i18n( "Pressing this button will ignore all unsaved changes made in \"%1\" object." ) - .arg(dlg->partItem()->name()) ); + .tqarg(dlg->partItem()->name()) ); - QString question; + TQString question; if (action == PrintItem) question = i18n("Do you want to save changes before printing?"); else if (action == PreviewItem) @@ -4441,14 +4441,14 @@ tristate KexiMainWindowImpl::printActionForItem(KexiPart::Item* item, PrintActio const int questionRes = KMessageBox::warningYesNoCancel( this, "<p>"+dlg->part()->i18nMessage("Design of object \"%1\" has been modified.", dlg) - .arg(item->name()) + "</p><p>" + question + "</p>", - QString::null, + .tqarg(item->name()) + "</p><p>" + question + "</p>", + TQString(), saveChanges, doNotSave); if (KMessageBox::Cancel == questionRes) return cancelled; if (KMessageBox::Yes == questionRes) { - tristate savingRes = saveObject( dlg, QString::null, true /*dontAsk*/ ); + tristate savingRes = saveObject( dlg, TQString(), true /*dontAsk*/ ); if (true != savingRes) return savingRes; } @@ -4460,8 +4460,8 @@ tristate KexiMainWindowImpl::printActionForItem(KexiPart::Item* item, PrintActio KexiPart::Item* printingPartItem = d->prj->createPartItem( printingPart, item->name() //<-- this will look like "table1 : printing" on the window list ); - QMap<QString,QString> staticObjectArgs; - staticObjectArgs["identifier"] = QString::number(item->identifier()); + TQMap<TQString,TQString> staticObjectArgs; + staticObjectArgs["identifier"] = TQString::number(item->identifier()); if (action == PrintItem) staticObjectArgs["action"] = "print"; else if (action == PreviewItem) @@ -4496,16 +4496,16 @@ tristate KexiMainWindowImpl::copyItemToClipboardAsDataTable(KexiPart::Item* item if (!item) return false; - QMap<QString,QString> args; + TQMap<TQString,TQString> args; args.insert("destinationType", "clipboard"); - args.insert("itemId", QString::number(item->identifier())); - QDialog *dlg = KexiInternalPart::createModalDialogInstance( + args.insert("itemId", TQString::number(item->identifier())); + TQDialog *dlg = KexiInternalPart::createModalDialogInstance( "csv_importexport", "KexiCSVExportWizard", this, this, 0, &args); if (!dlg) return false; //error msg has been shown by KexiInternalPart const int result = dlg->exec(); delete dlg; - return result == QDialog::Rejected ? cancelled : true; + return result == TQDialog::Rejected ? cancelled : true; } void KexiMainWindowImpl::slotEditPasteSpecialDataTable() @@ -4513,9 +4513,9 @@ void KexiMainWindowImpl::slotEditPasteSpecialDataTable() //! @todo allow data appending (it is not possible now) if (userMode()) return; - QMap<QString,QString> args; + TQMap<TQString,TQString> args; args.insert("sourceType", "clipboard"); - QDialog *dlg = KexiInternalPart::createModalDialogInstance( + TQDialog *dlg = KexiInternalPart::createModalDialogInstance( "csv_importexport", "KexiCSVImportDialog", this, this, 0, &args); if (!dlg) return; //error msg has been shown by KexiInternalPart @@ -4542,7 +4542,7 @@ void KexiMainWindowImpl::slotEditFind(bool next) KexiSearchAndReplaceViewInterface* iface = d->currentViewSupportingSearchAndReplaceInterface(); if (!iface) return; - tristate res = iface->find( + tristate res = iface->tqfind( d->findDialog()->valueToFind(), d->findDialog()->options(), next); if (~res) return; @@ -4620,7 +4620,7 @@ void KexiMainWindowImpl::slotGetNewStuff() #endif } -void KexiMainWindowImpl::highlightObject(const QCString& mime, const QCString& name) +void KexiMainWindowImpl::highlightObject(const TQCString& mime, const TQCString& name) { slotViewNavigator(); if (!d->prj) diff --git a/kexi/main/keximainwindowimpl.h b/kexi/main/keximainwindowimpl.h index 935454394..a2d820e8c 100644 --- a/kexi/main/keximainwindowimpl.h +++ b/kexi/main/keximainwindowimpl.h @@ -45,6 +45,7 @@ namespace KexiPart { class KEXIMAIN_EXPORT KexiMainWindowImpl : public KexiMainWindow, public KexiGUIMessageHandler { Q_OBJECT + TQ_OBJECT public: /*! Creates an empty mainwindow. */ @@ -57,7 +58,7 @@ class KEXIMAIN_EXPORT KexiMainWindowImpl : public KexiMainWindow, public KexiGUI static int create(int argc, char *argv[], KAboutData* aboutdata = 0); //! \return KexiMainWindowImpl singleton (if it is instantiated) - static KexiMainWindowImpl* self() { return dynamic_cast<KexiMainWindowImpl*>(qApp->mainWidget()); } + static KexiMainWindowImpl* self() { return dynamic_cast<KexiMainWindowImpl*>(tqApp->mainWidget()); } //! Project data of currently opened project or NULL if no project here yet. virtual KexiProject *project(); @@ -84,10 +85,10 @@ class KEXIMAIN_EXPORT KexiMainWindowImpl : public KexiMainWindow, public KexiGUI as KexiPart::Part::supportedUserViewModes() for \a item. */ bool openingAllowed(KexiPart::Item* item, int viewMode); - virtual bool eventFilter( QObject *obj, QEvent * e ); + virtual bool eventFilter( TQObject *obj, TQEvent * e ); //! \return popup menu for \a popupName name. - virtual QPopupMenu* findPopupMenu(const char *popupName); + virtual TQPopupMenu* findPopupMenu(const char *popupName); /*! Implemented for KexiMainWindow. */ virtual KActionPtrList allActions() const; @@ -112,7 +113,7 @@ class KEXIMAIN_EXPORT KexiMainWindowImpl : public KexiMainWindow, public KexiGUI public slots: /*! Inherited from KMdiMainFrm: we need to do some tasks before child is closed. Just calls closeDialog(). Use closeDialog() if you need, not this one. */ - virtual void closeWindow(KMdiChildView *pWnd, bool layoutTaskBar = true); + virtual void closeWindow(KMdiChildView *pWnd, bool tqlayoutTaskBar = true); /*! Reimplemented for internal reasons. */ virtual void addWindow( KMdiChildView* pView, int flags = KMdi::StandardAdd ); @@ -124,7 +125,7 @@ class KEXIMAIN_EXPORT KexiMainWindowImpl : public KexiMainWindow, public KexiGUI messages asking for saving the will be skipped and the changes will be dropped. This should not be usually used, maybe except for test suites (see kexi/tests/altertable/ directory). */ - tristate closeDialog(KexiDialogBase *dlg, bool layoutTaskBar, bool doNotSaveChanges = false); + tristate closeDialog(KexiDialogBase *dlg, bool tqlayoutTaskBar, bool doNotSaveChanges = false); virtual void detachWindow(KMdiChildView *pWnd,bool bShow=true); virtual void attachWindow(KMdiChildView *pWnd,bool bShow=true,bool bAutomaticResize=false); @@ -137,12 +138,12 @@ class KEXIMAIN_EXPORT KexiMainWindowImpl : public KexiMainWindow, public KexiGUI \a errorMessage, if not 0, points to a string that can be set to error message if one encountered. */ virtual KexiDialogBase* openObject(KexiPart::Item *item, int viewMode, - bool &openingCancelled, QMap<QString,QString>* staticObjectArgs = 0, - QString* errorMessage = 0); + bool &openingCancelled, TQMap<TQString,TQString>* staticObjectArgs = 0, + TQString* errorMessage = 0); //! For convenience - virtual KexiDialogBase* openObject(const QCString& mime, const QString& name, - int viewMode, bool &openingCancelled, QMap<QString,QString>* staticObjectArgs = 0); + virtual KexiDialogBase* openObject(const TQCString& mime, const TQString& name, + int viewMode, bool &openingCancelled, TQMap<TQString,TQString>* staticObjectArgs = 0); /*! Closes the object for \a item. \return true on success (closing can be dealyed though), false on failure and cancelled @@ -151,14 +152,14 @@ class KEXIMAIN_EXPORT KexiMainWindowImpl : public KexiMainWindow, public KexiGUI /*! Implemented for KexiMainWindow */ virtual tristate saveObject( KexiDialogBase *dlg, - const QString& messageWhenAskingForName = QString::null, bool dontAsk = false ); + const TQString& messageWhenAskingForName = TQString(), bool dontAsk = false ); /*! Implemented for KexiMainWindow */ virtual tristate getNewObjectInfo( KexiPart::Item *partItem, KexiPart::Part *part, - bool& allowOverwriting, const QString& messageWhenAskingForName = QString::null ); + bool& allowOverwriting, const TQString& messageWhenAskingForName = TQString() ); /*! Implemented for KexiMainWindow */ - virtual void highlightObject(const QCString& mime, const QCString& name); + virtual void highlightObject(const TQCString& mime, const TQCString& name); /*! Opens project pointed by \a projectData. Application state (e.g. actions) is updated. @@ -176,9 +177,9 @@ class KEXIMAIN_EXPORT KexiMainWindowImpl : public KexiMainWindow, public KexiGUI * If connection shortcut has been found and \a dbName is not provided, 'kexi --skip-dialog file.kexic' is executed (or the connection is opened directly if there's no porject opened in the current Kexi main window. */ - tristate openProject(const QString& aFileName, KexiDB::ConnectionData *cdata, - const QString& dbName = QString::null, - const QValueList<KexiProjectData::ObjectInfo>& autoopenObjects = QValueList<KexiProjectData::ObjectInfo>()); + tristate openProject(const TQString& aFileName, KexiDB::ConnectionData *cdata, + const TQString& dbName = TQString(), + const TQValueList<KexiProjectData::ObjectInfo>& autoopenObjects = TQValueList<KexiProjectData::ObjectInfo>()); /*! Helper. Opens project pointed by \a aFileName. Like above but \a fileNameForConnectionData can be passed instead of @@ -186,8 +187,8 @@ class KEXIMAIN_EXPORT KexiMainWindowImpl : public KexiMainWindow, public KexiGUI \return false if \a fileNameForConnectionData is not empty but there is no such connection in Kexi::connset() for this filename. \a fileNameForConnectionData can be empty. */ - tristate openProject(const QString& aFileName, - const QString& fileNameForConnectionData, const QString& dbName = QString::null); + tristate openProject(const TQString& aFileName, + const TQString& fileNameForConnectionData, const TQString& dbName = TQString()); /*! Creates a new project usign template pointed by \a projectData. Application state (e.g. actions) is updated. @@ -215,7 +216,7 @@ class KEXIMAIN_EXPORT KexiMainWindowImpl : public KexiMainWindow, public KexiGUI /*! Executes custom action for the main window, usually provided by a plugin. Also used by KexiFormEventAction. */ - virtual tristate executeCustomActionForObject(KexiPart::Item* item, const QString& actionName); + virtual tristate executeCustomActionForObject(KexiPart::Item* item, const TQString& actionName); signals: //! Emitted after opening a project, even after slotAutoOpenObjectsLater(). @@ -239,7 +240,7 @@ class KEXIMAIN_EXPORT KexiMainWindowImpl : public KexiMainWindow, public KexiGUI void initPropertyEditor(); //! reimplementation of events -// virtual void closeEvent(QCloseEvent *); +// virtual void closeEvent(TQCloseEvent *); /*! Creates standard actions like new, open, save ... */ void initActions(); @@ -254,20 +255,20 @@ class KEXIMAIN_EXPORT KexiMainWindowImpl : public KexiMainWindow, public KexiGUI void storeSettings(); /*! Invalidates availability of all actions for current application state. */ - void invalidateActions(); + void tqinvalidateActions(); /*! Invalidates action availability for current application state. These actions are dependent on curently selected dialog. */ - virtual void invalidateSharedActions(QObject *o); + virtual void tqinvalidateSharedActions(TQObject *o); /*! Invalidates action availability for current application state. These actions only depend on project availability, not on curently selected dialog. */ - void invalidateProjectWideActions(); + void tqinvalidateProjectWideActions(); /*! Invalidates action availability for current application state. These actions only depend on curently selected dialog and currently selected view (KexiViewBase derived object) within this dialog. */ - void invalidateViewModeActions(); + void tqinvalidateViewModeActions(); /*! Shows dialog for creating new blank project, and creates one. Dialog is not shown if option for automatic creation @@ -283,21 +284,21 @@ class KEXIMAIN_EXPORT KexiMainWindowImpl : public KexiMainWindow, public KexiGUI \a shortcutFileName, if not 0, will be set to a shortcut filename (in case when server database project was selected). */ KexiProjectData* createBlankProjectData(bool &cancelled, bool confirmOverwrites = true, - QString *shortcutFileName = 0); + TQString *shortcutFileName = 0); - void setWindowMenu(QPopupMenu *menu); + void setWindowMenu(TQPopupMenu *menu); /*! \return focused kexi window (KexiDialogBase or KexiDockBase subclass) */ -// QWidget* focusWindow() const; +// TQWidget* focusWindow() const; /*! Reimplemented from KexiSharedActionHost: accepts only KexiDockBase and KexiDialogBase subclasses. */ - virtual bool acceptsSharedActions(QObject *w); + virtual bool acceptsSharedActions(TQObject *w); /*! Performs lookup like in KexiSharedActionHost::focusWindow() - but starting from \a w instead of a widget returned by QWidget::focusWidget(). + but starting from \a w instead of a widget returned by TQWidget::tqfocusWidget(). \return NULL if no widget matches acceptsSharedActions() or if \a w is NULL. */ - QWidget* findWindow(QWidget *w); + TQWidget* findWindow(TQWidget *w); /*! Updates application's caption - also shows project's name. */ void updateAppCaption(); @@ -325,12 +326,12 @@ class KEXIMAIN_EXPORT KexiMainWindowImpl : public KexiMainWindow, public KexiGUI KexiPart::Part *prevDialogPart, int prevViewMode, KexiPart::Part *curDialogPart, int curViewMode ); /*! Used in openProject when running another Kexi process is required. */ - tristate openProjectInExternalKexiInstance(const QString& aFileName, - KexiDB::ConnectionData *cdata, const QString& dbName); + tristate openProjectInExternalKexiInstance(const TQString& aFileName, + KexiDB::ConnectionData *cdata, const TQString& dbName); /*! Used in openProject when running another Kexi process is required. */ - tristate openProjectInExternalKexiInstance(const QString& aFileName, - const QString& fileNameForConnectionData, const QString& dbName); + tristate openProjectInExternalKexiInstance(const TQString& aFileName, + const TQString& fileNameForConnectionData, const TQString& dbName); protected slots: @@ -345,10 +346,10 @@ class KEXIMAIN_EXPORT KexiMainWindowImpl : public KexiMainWindow, public KexiGUI void slotPartLoaded(KexiPart::Part* p); - void slotCaptionForCurrentMDIChild(bool childrenMaximized); + void slotCaptionForCurrentMDIChild(bool tqchildrenMaximized); void slotNoMaximizedChildFrmLeft(KMdiChildFrm*); void slotLastChildViewClosed(); - void slotChildViewIsDetachedNow(QWidget*); + void slotChildViewIsDetachedNow(TQWidget*); //! internal - creates and initializes kexi project void createKexiProject(KexiProjectData* new_data); @@ -377,7 +378,7 @@ class KEXIMAIN_EXPORT KexiMainWindowImpl : public KexiMainWindow, public KexiGUI //! For convenience KexiDialogBase* openObject(KexiPart::Item *item, int viewMode, - QMap<QString,QString>* staticObjectArgs = 0) + TQMap<TQString,TQString>* staticObjectArgs = 0) { bool openingCancelled; return openObject(item, viewMode, openingCancelled, staticObjectArgs); @@ -391,17 +392,17 @@ class KEXIMAIN_EXPORT KexiMainWindowImpl : public KexiMainWindow, public KexiGUI /*! Renames object pointed by \a item to a new name \a _newName. Sets \a success to false on failure. Used as a slot connected to KexiBrowser::renameItem() signal. */ - void renameObject( KexiPart::Item *item, const QString& _newName, bool &succes ); + void renameObject( KexiPart::Item *item, const TQString& _newName, bool &succes ); /*! Reaction for object rename (signalled by KexiProject). If this item has opened dialog, it's caption is updated, and also optionally application's caption. */ - virtual void slotObjectRenamed(const KexiPart::Item &item, const QCString& oldName); + virtual void slotObjectRenamed(const KexiPart::Item &item, const TQCString& oldName); virtual void fillWindowMenu(); - void invalidateSharedActions(); - void invalidateSharedActionsLater(); + void tqinvalidateSharedActions(); + void tqinvalidateSharedActionsLater(); //! Updates the statusbar, navigator and "Insert->....." actions, dependent on read-only state. //! Only called on project opening and closing. @@ -466,7 +467,7 @@ class KEXIMAIN_EXPORT KexiMainWindowImpl : public KexiMainWindow, public KexiGUI virtual void acceptPropertySetEditing(); virtual void propertySetSwitched(KexiDialogBase *dlg, bool force=false, - bool preservePrevSelection = true, const QCString& propertyToSelect = QCString()); + bool preservePrevSelection = true, const TQCString& propertyToSelect = TQCString()); /*! Handles changes in 'dirty' flag for dialogs. */ void slotDirtyFlagChanged(KexiDialogBase*); @@ -484,7 +485,7 @@ class KEXIMAIN_EXPORT KexiMainWindowImpl : public KexiMainWindow, public KexiGUI If \a mimeType and \a databaseName are not empty, the wizard will only ask about parameters of destination project and skip pages related to source project. \a cdata connection data can be also provided to preselect server-based connections. */ - tristate showProjectMigrationWizard(const QString& mimeType, const QString& databaseName, + tristate showProjectMigrationWizard(const TQString& mimeType, const TQString& databaseName, const KexiDB::ConnectionData *cdata = 0); //! Receives "selectionChanged()" signal from navigator to update some actions. @@ -502,24 +503,24 @@ class KEXIMAIN_EXPORT KexiMainWindowImpl : public KexiMainWindow, public KexiGUI //! Shows "print" dialog for \a item. //! \return true on success. - bool printItem(KexiPart::Item* item, const QString& titleText); + bool printItem(KexiPart::Item* item, const TQString& titleText); //! Shows "print" dialog for \a item and \a settings. //! \return true on success. bool printItem(KexiPart::Item* item, const KexiSimplePrintingSettings& settings, - const QString& titleText = QString::null); + const TQString& titleText = TQString()); /*! Shows "print preview" dialog for \a item. The preview dialog is cached, so \a reload == true is sometimes needed if data or print settings have changed in the meantime. \return true on success. */ - bool printPreviewForItem(KexiPart::Item* item, const QString& titleText, + bool printPreviewForItem(KexiPart::Item* item, const TQString& titleText, bool reload); //! Shows "print preview" dialog. //! \return true on success. bool printPreviewForItem(KexiPart::Item* item, const KexiSimplePrintingSettings& settings, - const QString& titleText = QString::null, bool reload = false); + const TQString& titleText = TQString(), bool reload = false); /*! Implemented for KexiMainWindow. Helper for printItem() and printPreviewForItem(). Also used by KexiFormEventAction. diff --git a/kexi/main/keximainwindowimpl_p.h b/kexi/main/keximainwindowimpl_p.h index b48c7ca00..0abd513ad 100644 --- a/kexi/main/keximainwindowimpl_p.h +++ b/kexi/main/keximainwindowimpl_p.h @@ -23,7 +23,7 @@ #endif //! @internal safer dictionary -typedef QMap< int, QGuardedPtr<KexiDialogBase> > KexiDialogDict; +typedef TQMap< int, TQGuardedPtr<KexiDialogBase> > KexiDialogDict; //! @internal class KexiMainWindowImpl::Private @@ -73,7 +73,7 @@ public: wasAutoOpen = false; dialogExistedBeforeCloseProject = false; #ifndef KEXI_SHOW_UNIMPLEMENTED - dummy_action = new KActionMenu("", wnd); + dummy_action = new KActionMenu(TQString(""), TQT_TQOBJECT(wnd)); #endif maximizeFirstOpenedChildFrm = false; #ifdef HAVE_KNEWSTUFF @@ -104,8 +104,8 @@ public: KexiDialogBase *openedDialogFor( int identifier, PendingJobType &pendingType ) { -//todo(threads) QMutexLocker dialogsLocker( &dialogsMutex ); - QMap<int, PendingJobType>::ConstIterator it = pendingDialogs.find( identifier ); +//todo(threads) TQMutexLocker dialogsLocker( &dialogsMutex ); + TQMap<int, PendingJobType>::ConstIterator it = pendingDialogs.tqfind( identifier ); if (it==pendingDialogs.constEnd()) pendingType = NoJob; else @@ -124,14 +124,14 @@ public: KexiDialogBase *openedDialogFor( int identifier ) { -//todo(threads) QMutexLocker dialogsLocker( &dialogsMutex ); +//todo(threads) TQMutexLocker dialogsLocker( &dialogsMutex ); return (KexiDialogBase*)dialogs[ identifier ]; } #endif void insertDialog(KexiDialogBase *dlg) { -//todo(threads) QMutexLocker dialogsLocker( &dialogsMutex ); - dialogs.insert(dlg->id(), QGuardedPtr<KexiDialogBase>(dlg)); +//todo(threads) TQMutexLocker dialogsLocker( &dialogsMutex ); + dialogs.insert(dlg->id(), TQGuardedPtr<KexiDialogBase>(dlg)); #ifndef KEXI_NO_PENDING_DIALOGS pendingDialogs.remove(dlg->id()); #endif @@ -139,47 +139,47 @@ public: #ifndef KEXI_NO_PENDING_DIALOGS void addItemToPendingDialogs(const KexiPart::Item* item, PendingJobType jobType) { -//todo(threads) QMutexLocker dialogsLocker( &dialogsMutex ); - pendingDialogs.replace( item->identifier(), jobType ); +//todo(threads) TQMutexLocker dialogsLocker( &dialogsMutex ); + pendingDialogs.tqreplace( item->identifier(), jobType ); } bool pendingDialogsExist() { if (pendingDialogs.constBegin()!=pendingDialogs.constEnd()) kdDebug() << pendingDialogs.constBegin().key() << " " << (int)pendingDialogs.constBegin().data() << endl; -//todo(threads) QMutexLocker dialogsLocker( &dialogsMutex ); +//todo(threads) TQMutexLocker dialogsLocker( &dialogsMutex ); return !pendingDialogs.isEmpty(); } #endif void updateDialogId(KexiDialogBase *dlg, int oldItemID) { -//todo(threads) QMutexLocker dialogsLocker( &dialogsMutex ); +//todo(threads) TQMutexLocker dialogsLocker( &dialogsMutex ); dialogs.remove(oldItemID); #ifndef KEXI_NO_PENDING_DIALOGS pendingDialogs.remove(oldItemID); #endif - dialogs.insert(dlg->id(), QGuardedPtr<KexiDialogBase>(dlg)); + dialogs.insert(dlg->id(), TQGuardedPtr<KexiDialogBase>(dlg)); } void removeDialog(int identifier) { -//todo(threads) QMutexLocker dialogsLocker( &dialogsMutex ); +//todo(threads) TQMutexLocker dialogsLocker( &dialogsMutex ); dialogs.remove(identifier); } #ifndef KEXI_NO_PENDING_DIALOGS void removePendingDialog(int identifier) { -//todo(threads) QMutexLocker dialogsLocker( &dialogsMutex ); +//todo(threads) TQMutexLocker dialogsLocker( &dialogsMutex ); pendingDialogs.remove(identifier); } #endif uint openedDialogsCount() { -//todo(threads) QMutexLocker dialogsLocker( &dialogsMutex ); +//todo(threads) TQMutexLocker dialogsLocker( &dialogsMutex ); return dialogs.count(); } //! Used in KexiMainWindowImple::closeProject() void clearDialogs() { -//todo(threads) QMutexLocker dialogsLocker( &dialogsMutex ); +//todo(threads) TQMutexLocker dialogsLocker( &dialogsMutex ); dialogs.clear(); #ifndef KEXI_NO_PENDING_DIALOGS pendingDialogs.clear(); @@ -202,9 +202,9 @@ public: /* void updatePropEditorDockWidthInfo() { if (propEditor) { - KDockWidget *dw = (KDockWidget *)propEditor->parentWidget(); + KDockWidget *dw = (KDockWidget *)propEditor->tqparentWidget(); #if defined(KDOCKWIDGET_P) - KDockSplitter *ds = (KDockSplitter *)dw->parentWidget(); + KDockSplitter *ds = (KDockSplitter *)dw->tqparentWidget(); if (ds) { propEditorDockSeparatorPos = ds->separatorPosInPercent();*/ /* if (propEditorDockSeparatorPos<=0) { @@ -217,15 +217,15 @@ void updatePropEditorDockWidthInfo() { } }*/ - void showStartProcessMsg(const QStringList& args) + void showStartProcessMsg(const TQStringList& args) { - wnd->showErrorMessage(i18n("Could not start %1 application.").arg(KEXI_APP_NAME), - i18n("Command \"%1\" failed.").arg(args.join(" "))); + wnd->showErrorMessage(i18n("Could not start %1 application.").tqarg(KEXI_APP_NAME), + i18n("Command \"%1\" failed.").tqarg(args.join(" "))); } - void hideMenuItem(const QString& menuName, const QString& itemText, bool alsoSeparator) + void hideMenuItem(const TQString& menuName, const TQString& itemText, bool alsoSeparator) { - QPopupMenu *pm = popups[menuName.ascii()]; + TQPopupMenu *pm = popups[menuName.ascii()]; if (!pm) return; uint i=0; @@ -242,9 +242,9 @@ void updatePropEditorDockWidthInfo() { } } - void disableMenuItem(const QString& menuName, const QString& itemText) + void disableMenuItem(const TQString& menuName, const TQString& itemText) { - QPopupMenu *pm = popups[menuName.ascii()]; + TQPopupMenu *pm = popups[menuName.ascii()]; if (!pm) return; uint i=0; @@ -267,14 +267,14 @@ void updatePropEditorDockWidthInfo() { #endif } else { //propEditorToolWindow->show(); - QWidget *origFocusWidget = qApp->focusWidget(); + TQWidget *origFocusWidget = tqApp->tqfocusWidget(); wnd->makeWidgetDockVisible(propEditorTabWidget); if (origFocusWidget) origFocusWidget->setFocus(); /*moved #if defined(KDOCKWIDGET_P) - KDockWidget *dw = (KDockWidget *)propEditor->parentWidget(); - KDockSplitter *ds = (KDockSplitter *)dw->parentWidget(); + KDockWidget *dw = (KDockWidget *)propEditor->tqparentWidget(); + KDockSplitter *ds = (KDockSplitter *)dw->tqparentWidget(); ds->setSeparatorPosInPercent(config->readNumEntry("RightDockPosition", 80));//% #endif*/ } @@ -285,8 +285,8 @@ void updatePropEditorDockWidthInfo() { { #if defined(KDOCKWIDGET_P) if (wnd->mdiMode()==KMdi::ChildframeMode || wnd->mdiMode()==KMdi::TabPageMode) { - KDockWidget *dw = (KDockWidget *)nav->parentWidget(); - KDockSplitter *ds = (KDockSplitter *)dw->parentWidget(); + KDockWidget *dw = (KDockWidget *)nav->tqparentWidget(); + KDockSplitter *ds = (KDockSplitter *)dw->tqparentWidget(); // ds->setKeepSize(true); config->setGroup("MainWindow"); @@ -295,12 +295,12 @@ void updatePropEditorDockWidthInfo() { if (wasAutoOpen) //(dw2->isVisible()) // ds->setSeparatorPosInPercent( 100 * nav->width() / wnd->width() ); ds->setSeparatorPosInPercent( - QMAX(QMAX( config->readNumEntry("LeftDockPositionWithAutoOpen",20), + TQMAX(TQMAX( config->readNumEntry("LeftDockPositionWithAutoOpen",20), config->readNumEntry("LeftDockPosition",20)),20) ); else ds->setSeparatorPosInPercent( - QMAX(20, config->readNumEntry("LeftDockPosition", 20/* % */))); + TQMAX(20, config->readNumEntry("LeftDockPosition", 20/* % */))); // dw->resize( d->config->readNumEntry("LeftDockPosition", 115/* % */), dw->height() ); # else @@ -321,13 +321,13 @@ void updatePropEditorDockWidthInfo() { "KexiMainWindowImpl::Private::openedCustomObjectsForItem(): !item || !name" << endl; return 0; } - QString key( QString::number(item->identifier()) + name ); - return dynamic_cast<type*>( m_openedCustomObjectsForItem.find( key.latin1() ) ); + TQString key( TQString::number(item->identifier()) + name ); + return dynamic_cast<type*>( m_openedCustomObjectsForItem.tqfind( key.latin1() ) ); } - void addOpenedCustomObjectForItem(KexiPart::Item* item, QObject* object, const char* name) + void addOpenedCustomObjectForItem(KexiPart::Item* item, TQObject* object, const char* name) { - QString key = QString::number(item->identifier()) + name; + TQString key = TQString::number(item->identifier()) + name; m_openedCustomObjectsForItem.insert( key.latin1(), object ); } @@ -335,16 +335,16 @@ void updatePropEditorDockWidthInfo() { if (!m_findDialog) { m_findDialog = new KexiFindDialog(wnd); m_findDialog->setActions( action_edit_findnext, action_edit_findprev, - action_edit_replace, action_edit_replace_all ); -/* connect(m_findDialog, SIGNAL(findNext()), action_edit_findnext, SLOT(activate())); - connect(m_findDialog, SIGNAL(find()), wnd, SLOT(slotEditFindNext())); - connect(m_findDialog, SIGNAL(replace()), wnd, SLOT(slotEditReplaceNext())); - connect(m_findDialog, SIGNAL(replaceAll()), wnd, SLOT(slotEditReplaceAll()));*/ + action_edit_tqreplace, action_edit_replace_all ); +/* connect(m_findDialog, TQT_SIGNAL(findNext()), action_edit_findnext, TQT_SLOT(activate())); + connect(m_findDialog, TQT_SIGNAL(tqfind()), wnd, TQT_SLOT(slotEditFindNext())); + connect(m_findDialog, TQT_SIGNAL(tqreplace()), wnd, TQT_SLOT(slotEditReplaceNext())); + connect(m_findDialog, TQT_SIGNAL(replaceAll()), wnd, TQT_SLOT(slotEditReplaceAll()));*/ } return m_findDialog; } - /*! Updates the find/replace dialog depending on the active view. + /*! Updates the tqfind/replace dialog depending on the active view. Nothing is performed if the dialog is not instantiated yet or is invisible. */ void updateFindDialogContents(bool createIfDoesNotExist = false) { if (!createIfDoesNotExist && (!m_findDialog || !m_findDialog->isVisible())) @@ -353,34 +353,34 @@ void updatePropEditorDockWidthInfo() { if (!iface) { if (m_findDialog) { m_findDialog->setButtonsEnabled(false); - m_findDialog->setLookInColumnList(QStringList(), QStringList()); + m_findDialog->setLookInColumnList(TQStringList(), TQStringList()); } return; } //! @todo use ->caption() here, depending on global settings related to displaying captions findDialog()->setObjectNameForCaption(curDialog->partItem()->name()); - QStringList columnNames; - QStringList columnCaptions; - QString currentColumnName; // for 'look in' + TQStringList columnNames; + TQStringList columnCaptions; + TQString currentColumnName; // for 'look in' if (!iface->setupFindAndReplace(columnNames, columnCaptions, currentColumnName)) { m_findDialog->setButtonsEnabled(false); - m_findDialog->setLookInColumnList(QStringList(), QStringList()); + m_findDialog->setLookInColumnList(TQStringList(), TQStringList()); return; } m_findDialog->setButtonsEnabled(true); /* //update "look in" list KexiTableViewColumn::List columns( dataAwareObject()->data()->columns ); - QStringList columnNames; - QStringList columnCaptions; + TQStringList columnNames; + TQStringList columnCaptions; for (KexiTableViewColumn::ListIterator it(columns); it.current(); ++it) { if (!it.current()->visible()) continue; columnNames.append( it.current()->field()->name() ); columnCaptions.append( it.current()->captionAliasOrName() ); }*/ - const QString prevColumnName( m_findDialog->currentLookInColumnName()); + const TQString prevColumnName( m_findDialog->currentLookInColumnName()); m_findDialog->setLookInColumnList(columnNames, columnCaptions); m_findDialog->setCurrentLookInColumnName( prevColumnName ); } @@ -421,25 +421,25 @@ void updatePropEditorDockWidthInfo() { KTabWidget *propEditorTabWidget; //! poits to kexi part which has been previously used to setup proppanel's tabs using //! KexiPart::setupCustomPropertyPanelTabs(), in updateCustomPropertyPanelTabs(). - QGuardedPtr<KexiPart::Part> partForPreviouslySetupPropertyPanelTabs; - QMap<KexiPart::Part*, int> recentlySelectedPropertyPanelPages; - QGuardedPtr<KexiPropertyEditorView> propEditor; - QGuardedPtr<KoProperty::Set> propBuffer; + TQGuardedPtr<KexiPart::Part> partForPreviouslySetupPropertyPanelTabs; + TQMap<KexiPart::Part*, int> recentlySelectedPropertyPanelPages; + TQGuardedPtr<KexiPropertyEditorView> propEditor; + TQGuardedPtr<KoProperty::Set> propBuffer; KXMLGUIClient *curDialogGUIClient, *curDialogViewGUIClient, *closedDialogGUIClient, *closedDialogViewGUIClient; - QGuardedPtr<KexiDialogBase> curDialog; + TQGuardedPtr<KexiDialogBase> curDialog; KexiNameDialog *nameDialog; - QTimer timer; //helper timer -// QSignalMapper *actionMapper; + TQTimer timer; //helper timer +// TQSignalMapper *actionMapper; - QAsciiDict<QPopupMenu> popups; //list of menu popups - QPopupMenu *createMenu; + TQAsciiDict<TQPopupMenu> popups; //list of menu popups + TQPopupMenu *createMenu; - QString origAppCaption; //<! original application's caption (without project name) - QString appCaptionPrefix; //<! application's caption prefix - prj name (if opened), else: null + TQString origAppCaption; //<! original application's caption (without project name) + TQString appCaptionPrefix; //<! application's caption prefix - prj name (if opened), else: null #ifndef KEXI_SHOW_UNIMPLEMENTED KActionMenu *dummy_action; @@ -461,8 +461,8 @@ void updatePropEditorDockWidthInfo() { //! edit menu KAction *action_edit_delete, *action_edit_delete_row, *action_edit_cut, *action_edit_copy, *action_edit_paste, - *action_edit_find, *action_edit_findnext, *action_edit_findprev, - *action_edit_replace, *action_edit_replace_all, + *action_edit_tqfind, *action_edit_findnext, *action_edit_findprev, + *action_edit_tqreplace, *action_edit_replace_all, *action_edit_select_all, *action_edit_undo, *action_edit_redo, *action_edit_insert_empty_row, @@ -473,7 +473,7 @@ void updatePropEditorDockWidthInfo() { //! view menu KAction *action_view_nav, *action_view_propeditor, *action_view_mainarea; KRadioAction *action_view_data_mode, *action_view_design_mode, *action_view_text_mode; - QIntDict<KRadioAction> actions_for_view_modes; + TQIntDict<KRadioAction> actions_for_view_modes; // KRadioAction *last_checked_mode; #ifndef KEXI_NO_CTXT_HELP KToggleAction *action_show_helper; @@ -500,7 +500,7 @@ void updatePropEditorDockWidthInfo() { KMdiToolViewAccessor* navToolWindow; KMdiToolViewAccessor* propEditorToolWindow; - QGuardedPtr<QWidget> focus_before_popup; + TQGuardedPtr<TQWidget> focus_before_popup; // KexiRelationPart *relationPart; int privateIDCounter; //!< counter: ID for private "document" like Relations window @@ -530,7 +530,7 @@ void updatePropEditorDockWidthInfo() { actionToExecuteWhenPendingJobsAreFinished = NoAction; switch (a) { case QuitAction: - qApp->quit(); + tqApp->quit(); break; case CloseProjectAction: wnd->closeProject(); @@ -541,15 +541,15 @@ void updatePropEditorDockWidthInfo() { #endif //! Used for delayed dialogs closing for 'close all' - QPtrList<KexiDialogBase> windowsToClose; + TQPtrList<KexiDialogBase> windowsToClose; //! Opened page setup dialogs, used by printOrPrintPreviewForItem(). - QIntDict<KexiDialogBase> pageSetupDialogs; + TQIntDict<KexiDialogBase> pageSetupDialogs; /*! A map from Kexi dialog to "print setup" part item's ID of the data item used by closeDialog() to find an ID of the data item, so the entry can be removed from pageSetupDialogs dictionary. */ - QMap<int, int> pageSetupDialogItemID2dataItemID_map; + TQMap<int, int> pageSetupDialogItemID2dataItemID_map; //! Used in several places to show info dialog at startup (only once per session) //! before displaying other stuff @@ -579,7 +579,7 @@ void updatePropEditorDockWidthInfo() { #endif //! Used by openedCustomObjectsForItem() and addOpenedCustomObjectForItem() - QAsciiDict<QObject> m_openedCustomObjectsForItem; + TQAsciiDict<TQObject> m_openedCustomObjectsForItem; int propEditorDockSeparatorPos, navDockSeparatorPos; // int navDockSeparatorPosWithAutoOpen; @@ -592,8 +592,8 @@ void updatePropEditorDockWidthInfo() { //! @todo move to KexiProject KexiDialogDict dialogs; #ifndef KEXI_NO_PROCESS_EVENTS - QMap<int, PendingJobType> pendingDialogs; //!< part item identifiers for dialogs whoose opening has been started - //todo(threads) QMutex dialogsMutex; //!< used for locking dialogs and pendingDialogs dicts + TQMap<int, PendingJobType> pendingDialogs; //!< part item identifiers for dialogs whoose opening has been started + //todo(threads) TQMutex dialogsMutex; //!< used for locking dialogs and pendingDialogs dicts #endif KexiFindDialog *m_findDialog; }; diff --git a/kexi/main/kexinamedialog.cpp b/kexi/main/kexinamedialog.cpp index 85f7f04af..c9b78f364 100644 --- a/kexi/main/kexinamedialog.cpp +++ b/kexi/main/kexinamedialog.cpp @@ -19,26 +19,26 @@ #include "kexinamedialog.h" -KexiNameDialog::KexiNameDialog(const QString& message, - QWidget * parent, const char * name) - : KDialogBase(KDialogBase::Plain, QString::null, +KexiNameDialog::KexiNameDialog(const TQString& message, + TQWidget * tqparent, const char * name) + : KDialogBase(KDialogBase::Plain, TQString(), KDialogBase::Ok|KDialogBase::Cancel|KDialogBase::Help, KDialogBase::Ok, - parent, name) + tqparent, name) { -// QHBox ( QWidget * parent = 0, const char * name = 0, WFlags f = 0 ) +// TQHBox ( TQWidget * tqparent = 0, const char * name = 0, WFlags f = 0 ) m_widget= new KexiNameWidget(message, plainPage(), "KexiNameWidget"); init(); } -KexiNameDialog::KexiNameDialog(const QString& message, - const QString& nameLabel, const QString& nameText, - const QString& captionLabel, const QString& captionText, - QWidget * parent, const char * name) - : KDialogBase(KDialogBase::Plain, QString::null, +KexiNameDialog::KexiNameDialog(const TQString& message, + const TQString& nameLabel, const TQString& nameText, + const TQString& captionLabel, const TQString& captionText, + TQWidget * tqparent, const char * name) + : KDialogBase(KDialogBase::Plain, TQString(), KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok, - parent, name) + tqparent, name) { m_widget= new KexiNameWidget(message, nameLabel, nameText, captionLabel, captionText, plainPage(), "KexiNameWidget"); @@ -51,31 +51,31 @@ KexiNameDialog::~KexiNameDialog() void KexiNameDialog::init() { - QGridLayout *lyr = new QGridLayout(plainPage(), 2, 3); - m_icon = new QLabel( plainPage(), "icon" ); - m_icon->setAlignment( int( AlignTop | AlignLeft ) ); - m_icon->setSizePolicy(QSizePolicy(QSizePolicy::Fixed, QSizePolicy::Preferred,1,0)); + TQGridLayout *lyr = new TQGridLayout(plainPage(), 2, 3); + m_icon = new TQLabel( plainPage(), "icon" ); + m_icon->tqsetAlignment( int( AlignTop | AlignLeft ) ); + m_icon->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Preferred,1,0)); m_icon->setFixedWidth(50); lyr->addWidget(m_icon,0,0); - m_widget->setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred,1,0)); + m_widget->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Preferred,1,0)); lyr->addWidget(m_widget,0,1); - lyr->addItem(new QSpacerItem( 25, 10, QSizePolicy::Expanding, QSizePolicy::Minimum ), 0, 2); - lyr->addItem(new QSpacerItem( 5, 10, QSizePolicy::Minimum, QSizePolicy::Expanding ), 1, 1); + lyr->addItem(new TQSpacerItem( 25, 10, TQSizePolicy::Expanding, TQSizePolicy::Minimum ), 0, 2); + lyr->addItem(new TQSpacerItem( 5, 10, TQSizePolicy::Minimum, TQSizePolicy::Expanding ), 1, 1); // m_widget->captionLineEdit()->selectAll(); // m_widget->captionLineEdit()->setFocus(); - connect(m_widget,SIGNAL(messageChanged()),this, SLOT(updateSize())); + connect(m_widget,TQT_SIGNAL(messageChanged()),this, TQT_SLOT(updateSize())); updateSize(); enableButtonOK( true ); slotTextChanged(); - connect(m_widget, SIGNAL(textChanged()), this, SLOT(slotTextChanged())); + connect(m_widget, TQT_SIGNAL(textChanged()), this, TQT_SLOT(slotTextChanged())); } void KexiNameDialog::updateSize() { -// resize( QSize(400, 140 + (m_widget->lbl_message->isVisible()?m_widget->lbl_message->height():0) ) - resize( QSize(400, 140 + (!m_widget->lbl_message->text().isEmpty()?m_widget->lbl_message->height():0) ) - .expandedTo(minimumSizeHint()) ); +// resize( TQSize(400, 140 + (m_widget->lbl_message->isVisible()?m_widget->lbl_message->height():0) ) + resize( TQSize(400, 140 + (!m_widget->lbl_message->text().isEmpty()?m_widget->lbl_message->height():0) ) + .expandedTo(tqminimumSizeHint()) ); // updateGeometry(); } @@ -95,7 +95,7 @@ void KexiNameDialog::accept() KDialogBase::accept(); } -void KexiNameDialog::setDialogIcon(const QPixmap& icon) +void KexiNameDialog::setDialogIcon(const TQPixmap& icon) { m_icon->setPixmap(icon); } diff --git a/kexi/main/kexinamedialog.h b/kexi/main/kexinamedialog.h index 27707c0d7..c4453c0d3 100644 --- a/kexi/main/kexinamedialog.h +++ b/kexi/main/kexinamedialog.h @@ -27,15 +27,16 @@ class KEXIMAIN_EXPORT KexiNameDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - KexiNameDialog(const QString& message, - QWidget * parent = 0, const char * name = 0); + KexiNameDialog(const TQString& message, + TQWidget * tqparent = 0, const char * name = 0); - KexiNameDialog(const QString& message, - const QString& nameLabel, const QString& nameText, - const QString& captionLabel, const QString& captionText, - QWidget * parent = 0, const char * name = 0); + KexiNameDialog(const TQString& message, + const TQString& nameLabel, const TQString& nameText, + const TQString& captionLabel, const TQString& captionText, + TQWidget * tqparent = 0, const char * name = 0); virtual ~KexiNameDialog(); @@ -44,7 +45,7 @@ class KEXIMAIN_EXPORT KexiNameDialog : public KDialogBase virtual void show(); public slots: - virtual void setDialogIcon(const QPixmap& icon); + virtual void setDialogIcon(const TQPixmap& icon); protected slots: void slotTextChanged(); @@ -54,7 +55,7 @@ class KEXIMAIN_EXPORT KexiNameDialog : public KDialogBase protected: void init(); - QLabel *m_icon; + TQLabel *m_icon; KexiNameWidget* m_widget; }; diff --git a/kexi/main/kexinamewidget.cpp b/kexi/main/kexinamewidget.cpp index 39cb084a2..db061d936 100644 --- a/kexi/main/kexinamewidget.cpp +++ b/kexi/main/kexinamewidget.cpp @@ -19,8 +19,8 @@ #include "kexinamewidget.h" -#include <qlabel.h> -#include <qlayout.h> +#include <tqlabel.h> +#include <tqlayout.h> #include <klineedit.h> #include <kmessagebox.h> @@ -32,19 +32,19 @@ using namespace KexiUtils; -KexiNameWidget::KexiNameWidget( const QString& message, - QWidget* parent, const char* name, WFlags fl ) - : QWidget(parent, name, fl) +KexiNameWidget::KexiNameWidget( const TQString& message, + TQWidget* tqparent, const char* name, WFlags fl ) + : TQWidget(tqparent, name, fl) { - init(message, QString::null, QString::null, QString::null, QString::null); + init(message, TQString(), TQString(), TQString(), TQString()); } -KexiNameWidget::KexiNameWidget(const QString& message, - const QString& nameLabel, const QString& nameText, - const QString& captionLabel, const QString& captionText, - QWidget * parent, const char * name, WFlags fl) +KexiNameWidget::KexiNameWidget(const TQString& message, + const TQString& nameLabel, const TQString& nameText, + const TQString& captionLabel, const TQString& captionText, + TQWidget * tqparent, const char * name, WFlags fl) { - Q_UNUSED( parent ); + Q_UNUSED( tqparent ); Q_UNUSED( name ); Q_UNUSED( fl ); @@ -52,9 +52,9 @@ KexiNameWidget::KexiNameWidget(const QString& message, } void KexiNameWidget::init( - const QString& message, - const QString& nameLabel, const QString& nameText, - const QString& captionLabel, const QString& captionText) + const TQString& message, + const TQString& nameLabel, const TQString& nameText, + const TQString& captionLabel, const TQString& captionText) { Q_UNUSED( captionText ); @@ -62,53 +62,53 @@ void KexiNameWidget::init( m_le_name_autofill = true; m_caption_required = false; - lyr = new QGridLayout( this, 1, 1, 0, 6, "lyr"); + lyr = new TQGridLayout( this, 1, 1, 0, 6, "lyr"); - lbl_message = new QLabel( this, "message" ); + lbl_message = new TQLabel( this, "message" ); setMessageText( message ); - lbl_message->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed); - lbl_message->setAlignment( QLabel::AlignTop | QLabel::WordBreak ); + lbl_message->tqsetSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed); + lbl_message->tqsetAlignment( TQLabel::AlignTop | TQLabel::WordBreak ); lyr->addMultiCellWidget( lbl_message, 0, 0, 0, 1 ); - lbl_caption = new QLabel( captionLabel.isEmpty() ? i18n( "Caption:" ) : captionLabel, + lbl_caption = new TQLabel( captionLabel.isEmpty() ? i18n( "Caption:" ) : captionLabel, this, "lbl_caption" ); lyr->addWidget( lbl_caption, 1, 0 ); - lbl_name = new QLabel( nameLabel.isEmpty() ? tr( "Name:" ) : nameLabel, + lbl_name = new TQLabel( nameLabel.isEmpty() ? tqtr( "Name:" ) : nameLabel, this, "lbl_name" ); lyr->addWidget( lbl_name, 2, 0 ); le_caption = new KLineEdit( nameText, this, "le_caption" ); - le_caption->setSizePolicy(QSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed, 1, 0)); + le_caption->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed, 1, 0)); lyr->addWidget( le_caption, 1, 1 ); le_name = new KLineEdit( nameText, this, "le_name" ); - le_name->setSizePolicy(QSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed,1,0)); + le_name->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed,1,0)); Validator *idValidator = new IdentifierValidator(0, "id_val"); - le_name->setValidator( m_validator = new MultiValidator(idValidator, this, "val") ); + le_name->setValidator( m_validator = new MultiValidator(idValidator, TQT_TQOBJECT(this), "val") ); lyr->addWidget( le_name, 2, 1 ); setFocusProxy(le_caption); - resize( QSize(342, 123).expandedTo(minimumSizeHint()) ); + resize( TQSize(342, 123).expandedTo(tqminimumSizeHint()) ); m_nameWarning = i18n("Please enter the name."); m_captionWarning = i18n("Please enter the caption."); - connect(le_caption, SIGNAL(textChanged(const QString&)), - this,SLOT(slotCaptionTxtChanged(const QString&))); - connect(le_name, SIGNAL(textChanged(const QString&)), - this,SLOT(slotNameTxtChanged(const QString&))); - connect(le_caption, SIGNAL(returnPressed()), - this,SIGNAL(returnPressed())); - connect(le_name, SIGNAL(returnPressed()), - this,SIGNAL(returnPressed())); + connect(le_caption, TQT_SIGNAL(textChanged(const TQString&)), + this,TQT_SLOT(slotCaptionTxtChanged(const TQString&))); + connect(le_name, TQT_SIGNAL(textChanged(const TQString&)), + this,TQT_SLOT(slotNameTxtChanged(const TQString&))); + connect(le_caption, TQT_SIGNAL(returnPressed()), + this,TQT_SIGNAL(returnPressed())); + connect(le_name, TQT_SIGNAL(returnPressed()), + this,TQT_SIGNAL(returnPressed())); } KexiNameWidget::~KexiNameWidget() { } -void KexiNameWidget::slotCaptionTxtChanged(const QString &capt) +void KexiNameWidget::slotCaptionTxtChanged(const TQString &capt) { emit textChanged(); if (le_name->text().isEmpty()) @@ -120,7 +120,7 @@ void KexiNameWidget::slotCaptionTxtChanged(const QString &capt) } } -void KexiNameWidget::slotNameTxtChanged(const QString &) +void KexiNameWidget::slotNameTxtChanged(const TQString &) { emit textChanged(); if (m_le_name_txtchanged_disable) @@ -145,19 +145,19 @@ void KexiNameWidget::setNameRequired( bool set ) bool KexiNameWidget::isNameRequired() const { return !m_validator->acceptsEmptyValue(); } -void KexiNameWidget::setCaptionText(const QString& capt) +void KexiNameWidget::setCaptionText(const TQString& capt) { le_caption->setText(capt); m_le_name_autofill = true; } -void KexiNameWidget::setNameText(const QString& name) +void KexiNameWidget::setNameText(const TQString& name) { le_name->setText(name); m_le_name_autofill = true; } -void KexiNameWidget::setMessageText(const QString& msg) +void KexiNameWidget::setMessageText(const TQString& msg) { if (msg.stripWhiteSpace().isEmpty()) { lbl_message->setText(""); @@ -169,12 +169,12 @@ void KexiNameWidget::setMessageText(const QString& msg) messageChanged(); } -QString KexiNameWidget::captionText() const +TQString KexiNameWidget::captionText() const { return le_caption->text(); } -QString KexiNameWidget::nameText() const +TQString KexiNameWidget::nameText() const { return le_name->text().lower(); } @@ -191,7 +191,7 @@ bool KexiNameWidget::checkValidity() le_caption->setFocus(); return false; } - QString dummy, message, details; + TQString dummy, message, details; if (m_validator->check(dummy, le_name->text(), message, details) ==Validator::Error) { KMessageBox::detailedSorry(0, message, details); @@ -211,9 +211,9 @@ void KexiNameWidget::addNameSubvalidator( Validator* validator, bool owned ) m_validator->addSubvalidator( validator, owned ); } -/*bool KexiNameWidget::eventFilter( QObject *obj, QEvent *ev ) +/*bool KexiNameWidget::eventFilter( TQObject *obj, TQEvent *ev ) { - if (ev->type()==QEvent::FocusOut && !acceptsEmptyValue()) { + if (ev->type()==TQEvent::FocusOut && !acceptsEmptyValue()) { if (obj==le_name) { if (le_name->text().isEmpty()) { KMessageBox::information(0, m_nameWarning); diff --git a/kexi/main/kexinamewidget.h b/kexi/main/kexinamewidget.h index 07962b6c6..1ab1d1068 100644 --- a/kexi/main/kexinamewidget.h +++ b/kexi/main/kexinamewidget.h @@ -20,8 +20,8 @@ #ifndef KEXINAMEWIDGET_H #define KEXINAMEWIDGET_H -#include <qlabel.h> -#include <qlayout.h> +#include <tqlabel.h> +#include <tqlayout.h> #include <klineedit.h> namespace KexiUtils { @@ -29,49 +29,50 @@ class Validator; class MultiValidator; } -class KEXIMAIN_EXPORT KexiNameWidget : public QWidget +class KEXIMAIN_EXPORT KexiNameWidget : public TQWidget { Q_OBJECT + TQ_OBJECT public: - KexiNameWidget(const QString& message, - QWidget * parent = 0, const char * name = 0, WFlags fl = 0); + KexiNameWidget(const TQString& message, + TQWidget * tqparent = 0, const char * name = 0, WFlags fl = 0); - KexiNameWidget(const QString& message, - const QString& nameLabel, const QString& nameText, - const QString& captionLabel, const QString& captionText, - QWidget * parent = 0, const char * name = 0, WFlags fl = 0); + KexiNameWidget(const TQString& message, + const TQString& nameLabel, const TQString& nameText, + const TQString& captionLabel, const TQString& captionText, + TQWidget * tqparent = 0, const char * name = 0, WFlags fl = 0); virtual ~KexiNameWidget(); - QLabel* captionLabel() const { return lbl_caption; } - QLabel* nameLabel() const { return lbl_name; } + TQLabel* captionLabel() const { return lbl_caption; } + TQLabel* nameLabel() const { return lbl_name; } KLineEdit* captionLineEdit() const { return le_caption; } KLineEdit* nameLineEdit() const { return le_name; } - QString messageText() const { return lbl_message->text(); } + TQString messageText() const { return lbl_message->text(); } - void setMessageText(const QString& msg); + void setMessageText(const TQString& msg); //! \return entered caption text - QString captionText() const; + TQString captionText() const; - void setCaptionText(const QString& capt); + void setCaptionText(const TQString& capt); //! \return entered name text, always in lower case - QString nameText() const; + TQString nameText() const; - void setNameText(const QString& name); + void setNameText(const TQString& name); /*! Sets i18n'ed warning message displayed when user leaves 'name' field without filling it (if acceptsEmptyValue() is false). By default the message is equal "Please enter the name.". */ - void setWarningForName( const QString& txt ) { m_nameWarning = txt; } + void setWarningForName( const TQString& txt ) { m_nameWarning = txt; } /*! Sets i18n'ed warning message displayed when user leaves 'name' field without filling it (if acceptsEmptyValue() is false). By default the message is equal "Please enter the caption." */ - void setWarningForCaption( const QString& txt ) { m_captionWarning = txt; } + void setWarningForCaption( const TQString& txt ) { m_captionWarning = txt; } /*! \return true if name or caption is empty. */ bool empty() const; @@ -113,24 +114,24 @@ class KEXIMAIN_EXPORT KexiNameWidget : public QWidget void messageChanged(); protected slots: - void slotNameTxtChanged(const QString&); - void slotCaptionTxtChanged(const QString&); -// bool eventFilter( QObject *obj, QEvent *ev ); + void slotNameTxtChanged(const TQString&); + void slotCaptionTxtChanged(const TQString&); +// bool eventFilter( TQObject *obj, TQEvent *ev ); protected: void init( - const QString& message, - const QString& nameLabel, const QString& nameText, - const QString& captionLabel, const QString& captionText); + const TQString& message, + const TQString& nameLabel, const TQString& nameText, + const TQString& captionLabel, const TQString& captionText); - QLabel* lbl_message; - QLabel* lbl_caption; - QLabel* lbl_name; + TQLabel* lbl_message; + TQLabel* lbl_caption; + TQLabel* lbl_name; KLineEdit* le_caption; KLineEdit* le_name; - QGridLayout* lyr; + TQGridLayout* lyr; KexiUtils::MultiValidator *m_validator; - QString m_nameWarning, m_captionWarning; + TQString m_nameWarning, m_captionWarning; bool m_le_name_txtchanged_disable : 1; bool m_le_name_autofill : 1; diff --git a/kexi/main/kexinewstuff.cpp b/kexi/main/kexinewstuff.cpp index adc0fc833..23058e059 100644 --- a/kexi/main/kexinewstuff.cpp +++ b/kexi/main/kexinewstuff.cpp @@ -21,7 +21,7 @@ #include <kdebug.h> #include <ktar.h> -#include <qdir.h> +#include <tqdir.h> #include <kaction.h> #include <kapplication.h> #include <kfiledialog.h> @@ -30,18 +30,18 @@ #include "kexinewstuff.h" -KexiNewStuff::KexiNewStuff(QWidget *parent) +KexiNewStuff::KexiNewStuff(TQWidget *tqparent) : KNewStuff( "kexi/template" #if KDE_IS_VERSION(3,3,0) , "http://download.kde.org/khotnewstuff/kexi-providers.xml" #endif - , parent) + , tqparent) { // Prevent GHNS to deny downloading a second time. If GHNS // fails to download something, it still marks the thing as // successfully downloaded and therefore we arn't able to // download it again :-/ - KGlobal::config()->deleteGroup("KNewStuffStatus"); + KGlobal::config()->deleteGroup("KNewStufftqStatus"); } KexiNewStuff::~KexiNewStuff() @@ -49,21 +49,21 @@ KexiNewStuff::~KexiNewStuff() } bool -KexiNewStuff::install(const QString &fileName) +KexiNewStuff::install(const TQString &fileName) { kdDebug() << "KexiNewStuff::install(): " << fileName << endl; KTar archive( fileName ); if ( !archive.open( IO_ReadOnly ) ) { - kdDebug() << QString("KexiNewStuff::install: Failed to open archivefile \"%1\"").arg(fileName) << endl; + kdDebug() << TQString("KexiNewStuff::install: Failed to open archivefile \"%1\"").tqarg(fileName) << endl; return false; } const KArchiveDirectory *archiveDir = archive.directory(); - const QString destDir = KFileDialog::getExistingDirectory( - ":DownloadExampleDatabases", parentWidget(), + const TQString destDir = KFileDialog::getExistingDirectory( + ":DownloadExampleDatabases", tqparentWidget(), i18n("Choose Directory Where to Install Example Database")); if (destDir.isEmpty()) { - kdDebug() << QString("KexiNewStuff::install: Destination-directory is empty.") << endl; + kdDebug() << TQString("KexiNewStuff::install: Destination-directory is empty.") << endl; return false; } archiveDir->copyTo(destDir); @@ -73,7 +73,7 @@ KexiNewStuff::install(const QString &fileName) } bool -KexiNewStuff::createUploadFile(const QString &) +KexiNewStuff::createUploadFile(const TQString &) { return true; } diff --git a/kexi/main/kexinewstuff.h b/kexi/main/kexinewstuff.h index 0af25276f..0247e7067 100644 --- a/kexi/main/kexinewstuff.h +++ b/kexi/main/kexinewstuff.h @@ -27,11 +27,11 @@ class KexiNewStuff : public KNewStuff { public: - KexiNewStuff(QWidget *parent); + KexiNewStuff(TQWidget *tqparent); virtual ~KexiNewStuff(); - virtual bool install( const QString &fileName ); - virtual bool createUploadFile( const QString &fileName ); + virtual bool install( const TQString &fileName ); + virtual bool createUploadFile( const TQString &fileName ); //KNS::Engine* customEngine() { return KNewStuff::engine(); } }; diff --git a/kexi/main/kexistatusbar.cpp b/kexi/main/kexistatusbar.cpp index c05f0eeb3..2d51cad54 100644 --- a/kexi/main/kexistatusbar.cpp +++ b/kexi/main/kexistatusbar.cpp @@ -22,11 +22,11 @@ #include "kexistatusbar.h" -#include <qlayout.h> -#include <qlineedit.h> -#include <qpainter.h> -#include <qtimer.h> -#include <qfontmetrics.h> +#include <tqlayout.h> +#include <tqlineedit.h> +#include <tqpainter.h> +#include <tqtimer.h> +#include <tqfontmetrics.h> #include <kdebug.h> #include <kglobalsettings.h> @@ -38,8 +38,8 @@ #include <ktexteditor/viewstatusmsginterface.h> #endif -KexiStatusBar::KexiStatusBar(QWidget *parent, const char *name) - : KStatusBar(parent, name) +KexiStatusBar::KexiStatusBar(TQWidget *tqparent, const char *name) + : KStatusBar(tqparent, name) #if KexiStatusBar_KTEXTEDITOR_USED , m_cursorIface(0) #endif @@ -54,8 +54,8 @@ KexiStatusBar::KexiStatusBar(QWidget *parent, const char *name) setReadOnlyFlag(false); // @todo -// connect(PartController::getInstance(), SIGNAL(activePartChanged(KParts::Part*)), -// this, SLOT(activePartChanged(KParts::Part*))); +// connect(PartController::getInstance(), TQT_SIGNAL(activePartChanged(KParts::Part*)), +// this, TQT_SLOT(activePartChanged(KParts::Part*))); /// @todo remove parts from the map on PartRemoved() ? } @@ -77,8 +77,8 @@ void KexiStatusBar::activePartChanged(KParts::Part *part) // @todo if (part && part->widget()) { if ((m_viewmsgIface = dynamic_cast<KTextEditor::ViewStatusMsgInterface*>(part->widget()))) { - connect( part->widget(), SIGNAL( viewStatusMsg( const QString & ) ), - this, SLOT( setStatus( const QString & ) ) ); + connect( part->widget(), TQT_SIGNAL( viewStatusMsg( const TQString & ) ), + this, TQT_SLOT( settqStatus( const TQString & ) ) ); # if KDE_VERSION < KDE_MAKE_VERSION(3,1,90) changeItem(m_map[ m_activePart ], m_msgID); @@ -86,7 +86,7 @@ void KexiStatusBar::activePartChanged(KParts::Part *part) # endif } else if ((m_cursorIface = dynamic_cast<KTextEditor::ViewCursorInterface*>(part->widget()))) { - connect(part->widget(), SIGNAL(cursorPositionChanged()), this, SLOT(cursorPositionChanged())); + connect(part->widget(), TQT_SIGNAL(cursorPositionChanged()), this, TQT_SLOT(cursorPositionChanged())); cursorPositionChanged(); } else { @@ -110,9 +110,9 @@ void KexiStatusBar::cursorPositionChanged() #endif } -void KexiStatusBar::setStatus(const QString &str) +void KexiStatusBar::settqStatus(const TQString &str) { - kdDebug() << "KexiStatusBar::setStatus(" << str << ")" << endl; + kdDebug() << "KexiStatusBar::settqStatus(" << str << ")" << endl; // m_status->setText(str); changeItem(str, m_msgID); @@ -125,21 +125,21 @@ void KexiStatusBar::setStatus(const QString &str) void KexiStatusBar::setCursorPosition(int line, int col) { -// m_status->setText(i18n(" Line: %1 Col: %2 ").arg(line+1).arg(col)); - changeItem(i18n(" Line: %1 Col: %2 ").arg(line+1).arg(col), m_msgID); +// m_status->setText(i18n(" Line: %1 Col: %2 ").tqarg(line+1).tqarg(col)); + changeItem(i18n(" Line: %1 Col: %2 ").tqarg(line+1).tqarg(col), m_msgID); } -/*void KexiStatusBar::addWidget ( QWidget *widget, int stretch, bool permanent) +/*void KexiStatusBar::addWidget ( TQWidget *widget, int stretch, bool permanent) { KStatusBar::addWidget(widget,stretch,permanent); - if(widget->sizeHint().height() + 4 > height()) - setFixedHeight(widget->sizeHint().height() + 4); + if(widget->tqsizeHint().height() + 4 > height()) + setFixedHeight(widget->tqsizeHint().height() + 4); }*/ void KexiStatusBar::setReadOnlyFlag(bool readOnly) { - changeItem(readOnly ? i18n("Read only") : QString::null, m_readOnlyID); + changeItem(readOnly ? i18n("Read only") : TQString(), m_readOnlyID); } #include "kexistatusbar.moc" diff --git a/kexi/main/kexistatusbar.h b/kexi/main/kexistatusbar.h index eec249325..0cd5f6c6c 100644 --- a/kexi/main/kexistatusbar.h +++ b/kexi/main/kexistatusbar.h @@ -28,9 +28,9 @@ #include <kdeversion.h> #include <kstatusbar.h> -#include <qmap.h> +#include <tqmap.h> -class QLabel; +class TQLabel; #if KexiStatusBar_KTEXTEDITOR_USED namespace KTextEditor { class ViewStatusMsgInterface; } @@ -41,13 +41,14 @@ namespace KParts { class Part; } class KexiStatusBar : public KStatusBar { Q_OBJECT + TQ_OBJECT public: - KexiStatusBar( QWidget *parent=0, const char *name=0 ); + KexiStatusBar( TQWidget *tqparent=0, const char *name=0 ); virtual ~KexiStatusBar(); -// virtual void addWidget( QWidget *widget, int stretch = 0, bool permanent = false); +// virtual void addWidget( TQWidget *widget, int stretch = 0, bool permanent = false); public slots: - virtual void setStatus(const QString &str); + virtual void settqStatus(const TQString &str); virtual void setReadOnlyFlag(bool readOnly); protected slots: @@ -57,7 +58,7 @@ class KexiStatusBar : public KStatusBar protected: int m_msgID, m_readOnlyID; -// QLabel *m_status, *m_readOnlyStatus; +// TQLabel *m_status, *m_readOnlytqStatus; #if KexiStatusBar_KTEXTEDITOR_USED KTextEditor::ViewCursorInterface * m_cursorIface; @@ -68,7 +69,7 @@ class KexiStatusBar : public KStatusBar // still hoping for a fix for KDE-3.1 #if defined(KDE_MAKE_VERSION) # if KDE_VERSION < KDE_MAKE_VERSION(3,1,90) - QMap<KParts::Part*, QString> m_map; + TQMap<KParts::Part*, TQString> m_map; # endif #endif }; diff --git a/kexi/main/ksplitter.h b/kexi/main/ksplitter.h index db72ec880..9bf359b17 100644 --- a/kexi/main/ksplitter.h +++ b/kexi/main/ksplitter.h @@ -18,14 +18,14 @@ */ /* - IMPORTANT Note: This file compiles also in Qt-only mode by using the NO_KDE2 precompiler definition + IMPORTANT Note: This file compiles also in TQt-only mode by using the NO_KDE2 precompiler definition */ #ifndef KDOCKWIDGET_PRIVATE_H #define KDOCKWIDGET_PRIVATE_H -#include <qwidget.h> -#include <qpushbutton.h> +#include <tqwidget.h> +#include <tqpushbutton.h> #include <kdeversion.h> @@ -33,29 +33,30 @@ #include <netwm_def.h> #endif -class QFrame; +class TQFrame; class KDockContainer; class KDockWidget; /** - * Like QSplitter but specially designed for dockwidgets stuff. + * Like TQSplitter but specially designed for dockwidgets stuff. * @internal * * @author Max Judin. */ -class KDockSplitter : public QWidget +class KDockSplitter : public TQWidget { //Q_OBJECT + TQ_OBJECT public: /** * Constructor. - * @param parent parent widget + * @param tqparent tqparent widget * @param name name - * @param orient orientation. Either @p Vertical or @p Horizontal + * @param orient orientation. Either @pQt::Vertical or @pQt::Horizontal * @param pos procentual position of the splitter. Must be int [0...100]. */ - KDockSplitter(QWidget *parent= 0, const char *name= 0, Orientation orient= Vertical, int pos= 50); + KDockSplitter(TQWidget *tqparent= 0, const char *name= 0, Qt::Orientation orient=Qt::Vertical, int pos= 50); virtual ~KDockSplitter(){}; /** @@ -66,7 +67,7 @@ public: * @param c0 the widget on top/left * @param c1 the widget on borrom/right */ - void activate(QWidget *c0, QWidget *c1 = 0L); + void activate(TQWidget *c0, TQWidget *c1 = 0L); /** * Disables the splitter. */ @@ -129,22 +130,22 @@ public: * The eventfilter installed on the @p divider processes * all splitter resizing events. */ - virtual bool eventFilter(QObject *, QEvent *); - virtual bool event( QEvent * ); + virtual bool eventFilter(TQObject *, TQEvent *); + virtual bool event( TQEvent * ); /** * @return the top/left child widget. */ - QWidget* getFirst() const { return child0; } + TQWidget* getFirst() const { return child0; } /** * @return the bottom/right child widget. */ - QWidget* getLast() const { return child1; } + TQWidget* getLast() const { return child1; } /** * If @p w is child0, return child1, otherwise child0. * @return the other child widget */ - QWidget* getAnother( QWidget* w ) const; + TQWidget* getAnother( TQWidget* w ) const; void updateName(); /** @@ -168,9 +169,9 @@ public: void restoreFromForcedFixedSize(KDockWidget *dw); /** - * The orientation is either @p Horizontal or @p Vertical. + * The orientation is either @pQt::Horizontal or @pQt::Vertical. */ - Orientation orientation(){return m_orientation;} + Qt::Orientation orientation(){return m_orientation;} protected: friend class KDockContainer; @@ -187,7 +188,7 @@ protected: * @param child the overlapping child * @return the (new) splitter position. */ - int checkValueOverlapped(int position, QWidget* child) const; + int checkValueOverlapped(int position, TQWidget* child) const; /** * The resize event resizes @p child0, @p child1 and the @p divider. @@ -203,7 +204,7 @@ protected: * @param ev the resize Event. If @p ev=0L the user changed * the mode (for example from overlap to nonoverlap mode). */ - virtual void resizeEvent(QResizeEvent *ev); + virtual void resizeEvent(TQResizeEvent *ev); /* protected slots: @@ -221,8 +222,8 @@ private: * so no need to make pointer checks. * child[01]->getWidget() may be KDockContainer. */ - QWidget *child0, *child1; - Orientation m_orientation; + TQWidget *child0, *child1; + Qt::Orientation m_orientation; /** * If initialised is true, the divider!=0L. If false, the divider==0L! */ @@ -231,10 +232,10 @@ private: * The splitter controller which is between child0 and child1. * Its size is 4 pixel. */ - QFrame* divider; + TQFrame* divider; /** * @p xpos and @p savedXPos represent the current divider position. - * If the orientation is Horizontal @p xpos actually is "ypos". So + * If the orientation isQt::Horizontal @p xpos actually is "ypos". So * do not get confused only because of the 'x'. * * xpos and savedXPos are internally high resolution. So *not* 0..100% diff --git a/kexi/main/printing/kexisimpleprintingengine.cpp b/kexi/main/printing/kexisimpleprintingengine.cpp index e021c912d..34b8af211 100644 --- a/kexi/main/printing/kexisimpleprintingengine.cpp +++ b/kexi/main/printing/kexisimpleprintingengine.cpp @@ -29,13 +29,13 @@ #include <kurllabel.h> #include <kdebug.h> -#include <qlabel.h> -#include <qlayout.h> -#include <qpainter.h> -#include <qcheckbox.h> -#include <qwhatsthis.h> -#include <qpaintdevicemetrics.h> -#include <qimage.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqpainter.h> +#include <tqcheckbox.h> +#include <tqwhatsthis.h> +#include <tqpaintdevicemetrics.h> +#include <tqimage.h> #include <kexiutils/tristate.h> #include <kexidb/connection.h> @@ -51,7 +51,7 @@ KexiSimplePrintingSettings::KexiSimplePrintingSettings() addDateAndTime = true; addTableBorders = false; pageTitleFont = kapp->font(); - pageTitleFont.setPointSizeFloat( (double)QFontInfo(pageTitleFont).pointSize()*1.5 ); + pageTitleFont.setPointSizeFloat( (double)TQFontInfo(pageTitleFont).pointSize()*1.5 ); pageTitleFont.setBold(true); } @@ -71,7 +71,7 @@ KexiSimplePrintingSettings KexiSimplePrintingSettings::load() if (config->hasKey("pageFormat")) settings.pageLayout.format = KoPageFormat::formatFromString( config->readEntry("pageFormat" ) ); - if (config->readEntry("pageOrientation", "portrait").lower()=="landscape") + if (config->readEntry("pageQt::Orientation", "portrait").lower()=="landscape") settings.pageLayout.orientation = PG_LANDSCAPE; else settings.pageLayout.orientation = PG_PORTRAIT; @@ -99,7 +99,7 @@ void KexiSimplePrintingSettings::save() config->setGroup("Simple Printing"); config->writeEntry( "pageTitleFont", pageTitleFont ); config->writeEntry( "pageFormat", KoPageFormat::formatString( pageLayout.format ) ); - config->writeEntry("pageOrientation", + config->writeEntry("pageQt::Orientation", pageLayout.orientation == PG_PORTRAIT ? "portrait" : "landscape"); config->writeEntry("pageWidth", pageLayout.ptWidth); config->writeEntry("pageHeight", pageLayout.ptHeight); @@ -116,8 +116,8 @@ void KexiSimplePrintingSettings::save() //------------------------ KexiSimplePrintingEngine::KexiSimplePrintingEngine( - const KexiSimplePrintingSettings& settings, QObject* parent) - : QObject(parent, "KexiSimplePrintingEngine") + const KexiSimplePrintingSettings& settings, TQObject* tqparent) + : TQObject(tqparent, "KexiSimplePrintingEngine") , m_settings(&settings) , m_pdm(0) { @@ -134,9 +134,9 @@ KexiSimplePrintingEngine::~KexiSimplePrintingEngine() } bool KexiSimplePrintingEngine::init(KexiDB::Connection& conn, - KexiDB::TableOrQuerySchema& tableOrQuery, const QString& titleText, QString& errorMessage) + KexiDB::TableOrQuerySchema& tableOrQuery, const TQString& titleText, TQString& errorMessage) { - errorMessage = QString::null; + errorMessage = TQString(); done(); m_headerText = titleText; //tableOrQuery.captionOrName(); @@ -199,7 +199,7 @@ void KexiSimplePrintingEngine::clear() m_paintInitialized = false; } -void KexiSimplePrintingEngine::paintPage(int pageNumber, QPainter& painter, bool paint) +void KexiSimplePrintingEngine::paintPage(int pageNumber, TQPainter& painter, bool paint) { uint offset = 0; if (pageNumber < (int)m_dataOffsets.count()) { @@ -208,19 +208,19 @@ void KexiSimplePrintingEngine::paintPage(int pageNumber, QPainter& painter, bool double y = 0.0; - const bool printing = painter.device()->devType() == QInternal::Printer; + const bool printing = painter.device()->devType() == TQInternal::Printer; m_SCALE = printing ? 1 : 20; double w, h; - m_pdm = QPaintDeviceMetrics( painter.device() ); + m_pdm = TQPaintDeviceMetrics( painter.device() ); - if (dynamic_cast<QWidget*>(painter.device())) { - w = dynamic_cast<QWidget*>(painter.device())->width() * m_SCALE; - h = dynamic_cast<QWidget*>(painter.device())->height() * m_SCALE; + if (dynamic_cast<TQWidget*>(painter.device())) { + w = dynamic_cast<TQWidget*>(painter.device())->width() * m_SCALE; + h = dynamic_cast<TQWidget*>(painter.device())->height() * m_SCALE; } - else if (dynamic_cast<QPixmap*>(painter.device())) { - w = dynamic_cast<QPixmap*>(painter.device())->width() * m_SCALE; - h = dynamic_cast<QPixmap*>(painter.device())->height() * m_SCALE; + else if (dynamic_cast<TQPixmap*>(painter.device())) { + w = dynamic_cast<TQPixmap*>(painter.device())->width() * m_SCALE; + h = dynamic_cast<TQPixmap*>(painter.device())->height() * m_SCALE; } else {//KPrinter... w = m_pdm.widthMM(); @@ -237,7 +237,7 @@ void KexiSimplePrintingEngine::paintPage(int pageNumber, QPainter& painter, bool m_dpiY = m_pdm.logicalDpiY(); m_dpiX = m_pdm.logicalDpiX(); -#ifdef Q_WS_WIN //fix for 120dpi +#ifdef TQ_WS_WIN //fix for 120dpi if (!printing) { m_dpiY = 96; m_dpiX = 96; @@ -260,12 +260,12 @@ void KexiSimplePrintingEngine::paintPage(int pageNumber, QPainter& painter, bool m_fy = heightMM / (pdHeightMM);// * screenF); //screen only - // painter.fillRect(QRect(0,0,w,h), QBrush(white)); + // painter.fillRect(TQRect(0,0,w,h), TQBrush(white)); m_pageWidth = uint( m_fx*double(m_pdm.width()) * m_SCALE - m_leftMargin - m_rightMargin ); m_pageHeight = uint( m_fy*double(m_pdm.height()) * m_SCALE - m_topMargin - m_bottomMargin ); m_headerFont = m_settings->pageTitleFont; if(!printing) { - int pixelSize = int( POINT_TO_INCH((double)QFontInfo(m_headerFont).pointSize())*m_dpiX ) * m_SCALE; + int pixelSize = int( POINT_TO_INCH((double)TQFontInfo(m_headerFont).pointSize())*m_dpiX ) * m_SCALE; m_headerFont.setPixelSize(pixelSize); } @@ -278,7 +278,7 @@ void KexiSimplePrintingEngine::paintPage(int pageNumber, QPainter& painter, bool } painter.setFont(m_mainFont); - m_dateTimeText = KGlobal::locale()->formatDateTime(QDateTime::currentDateTime(), + m_dateTimeText = KGlobal::locale()->formatDateTime(TQDateTime::tqcurrentDateTime(), true, false); m_dateTimeWidth = painter.fontMetrics().width(m_dateTimeText+" "); m_mainLineSpacing = painter.fontMetrics().lineSpacing(); @@ -287,10 +287,10 @@ void KexiSimplePrintingEngine::paintPage(int pageNumber, QPainter& painter, bool m_headerTextRect = painter.fontMetrics().boundingRect( (int)m_leftMargin, (int)m_topMargin, m_pageWidth - m_dateTimeWidth, - m_pageHeight, Qt::AlignAuto|Qt::WordBreak, m_headerText); + m_pageHeight, TQt::AlignAuto|TQt::WordBreak, m_headerText); m_headerTextRect.setRight(m_headerTextRect.right()+10); m_headerTextRect.setWidth( - QMIN(int(m_pageWidth - m_dateTimeWidth), m_headerTextRect.width())); + TQMIN(int(m_pageWidth - m_dateTimeWidth), m_headerTextRect.width())); //--compute max width of field names m_maxFieldNameWidth = 0; @@ -315,24 +315,24 @@ void KexiSimplePrintingEngine::paintPage(int pageNumber, QPainter& painter, bool //paint header painter.setFont(m_headerFont); if (paint) { - painter.drawText(m_headerTextRect, Qt::AlignAuto|Qt::WordBreak, m_headerText); + painter.drawText(m_headerTextRect, TQt::AlignAuto|TQt::WordBreak, m_headerText); } painter.setFont(m_mainFont); if (paint) { painter.drawText((int)m_leftMargin + m_pageWidth - m_dateTimeWidth, (int)m_topMargin, m_dateTimeWidth, - m_headerTextRect.height(), Qt::AlignRight, m_dateTimeText); + m_headerTextRect.height(), TQt::AlignRight, m_dateTimeText); //footer - QString pageNumString; + TQString pageNumString; if (m_pagesCount>0) pageNumString = i18n("Page (number) of (total)", "Page %1 of %2") - .arg(pageNumber+1).arg(m_pagesCount); + .tqarg(pageNumber+1).tqarg(m_pagesCount); else - pageNumString = i18n("Page %1").arg(pageNumber+1); + pageNumString = i18n("Page %1").tqarg(pageNumber+1); painter.drawText((int)m_leftMargin, (int)m_topMargin + m_pageHeight - m_mainLineSpacing, m_pageWidth, m_mainLineSpacing, - Qt::AlignRight | Qt::AlignBottom, pageNumString); + TQt::AlignRight | TQt::AlignBottom, pageNumString); painter.drawLine((int)m_leftMargin, (int)m_topMargin + m_pageHeight - m_mainLineSpacing*3/2, (int)m_leftMargin + m_pageWidth, @@ -387,16 +387,16 @@ void KexiSimplePrintingEngine::paintPage(int pageNumber, QPainter& painter, bool m_eof = offset == rows; } -void KexiSimplePrintingEngine::paintRecord(QPainter& painter, KexiTableItem *item, +void KexiSimplePrintingEngine::paintRecord(TQPainter& painter, KexiTableItem *item, int cellMargin, double &y, uint paintedRows, bool paint, bool printing) { if (paintedRows>0 && !m_settings->addTableBorders) {//separator if (paint) { - painter.setPen(Qt::darkGray); + painter.setPen(TQt::darkGray); painter.drawLine( int(m_leftMargin), int( y-(double)m_mainLineSpacing ), int(m_leftMargin)+m_pageWidth-1, int(y-(double)m_mainLineSpacing)); - painter.setPen(Qt::black); + painter.setPen(TQt::black); } } @@ -405,10 +405,10 @@ void KexiSimplePrintingEngine::paintRecord(QPainter& painter, KexiTableItem *ite if (paint) { painter.drawText( (int)m_leftMargin+cellMargin, (int)y, m_maxFieldNameWidth-cellMargin*2, m_mainLineSpacing, - Qt::AlignTop, m_fieldsExpanded[i]->captionOrAliasOrName() + TQt::AlignTop, m_fieldsExpanded[i]->captionOrAliasOrName() + (m_settings->addTableBorders ? "" : ":")); } - QString text; + TQString text; //! @todo optimize like in KexiCSVExport::exportData() //get real column and real index to get the visible value KexiDB::QueryColumnInfo* ci; @@ -420,9 +420,9 @@ void KexiSimplePrintingEngine::paintRecord(QPainter& painter, KexiTableItem *ite indexForVisibleLookupValue = i; } - QVariant v(item->at( indexForVisibleLookupValue )); + TQVariant v(item->at( indexForVisibleLookupValue )); KexiDB::Field::Type ftype = ci->field->type(); - QRect rect( (int)m_leftMargin + m_maxFieldNameWidth + cellMargin, (int)y, + TQRect rect( (int)m_leftMargin + m_maxFieldNameWidth + cellMargin, (int)y, m_pageWidth - m_maxFieldNameWidth - cellMargin*2, m_pageHeight - (int)y); if (v.isNull() || !v.isValid()) { @@ -430,19 +430,19 @@ void KexiSimplePrintingEngine::paintRecord(QPainter& painter, KexiTableItem *ite } //! todo inherit format else if (ftype==KexiDB::Field::DateTime) { - QDateTime dt(v.toDateTime()); + TQDateTime dt(v.toDateTime()); if (dt.isValid()) text = KGlobal::locale()->formatDateTime(dt); } //! todo inherit format else if (ftype==KexiDB::Field::Date) { - QDate date(v.toDate()); + TQDate date(v.toDate()); if (date.isValid()) text = KGlobal::locale()->formatDate(date, true/*short*/); } //! todo inherit format else if (ftype==KexiDB::Field::Time) { - QTime time(v.toTime()); + TQTime time(v.toTime()); if (time.isValid()) text = KGlobal::locale()->formatTime(time); } @@ -453,9 +453,9 @@ void KexiSimplePrintingEngine::paintRecord(QPainter& painter, KexiTableItem *ite text = v.toBool() ? i18n("Boolean Yes (true)","Yes") : i18n("Boolean No (false)", "No"); else if (ftype==KexiDB::Field::BLOB) { - const QByteArray ba( v.toByteArray() ); + const TQByteArray ba( v.toByteArray() ); if (!ba.isEmpty()) { - QPixmap pixmap(ba); + TQPixmap pixmap(ba); #define MAX_PIXMAP_HEIGHT (m_mainLineSpacing * 5) double pixmapHeight = MAX_PIXMAP_HEIGHT; double pixmapWidth = double(MAX_PIXMAP_HEIGHT) * pixmap.width() / (double)pixmap.height(); @@ -467,21 +467,21 @@ void KexiSimplePrintingEngine::paintRecord(QPainter& painter, KexiTableItem *ite if (paint && !pixmap.isNull()) { if (printing) { painter.drawPixmap( - QRect(rect.x(), rect.y()+m_mainLineSpacing/4, + TQRect(rect.x(), rect.y()+m_mainLineSpacing/4, int(pixmapWidth), int(pixmapHeight)), pixmap ); } else {// we're just previewing the pixmap, so let's resize it and cache // so redrawing will be faster painter.save(); painter.setWindow( // set 1:1 scale to avoid unnecessary image scaling - QRect(painter.window().topLeft(), + TQRect(painter.window().topLeft(), painter.window().size() / (int)m_SCALE ) ); painter.drawImage( int(rect.x() / m_SCALE), int( (rect.y()+m_mainLineSpacing/4) / m_SCALE), pixmap.convertToImage().smoothScale( int(pixmapWidth / m_SCALE), int(pixmapHeight / m_SCALE), - QImage::ScaleMin )); + TQ_ScaleMin )); painter.restore(); // back to m_SCALE:1 scale } } @@ -491,9 +491,9 @@ void KexiSimplePrintingEngine::paintRecord(QPainter& painter, KexiTableItem *ite text = v.toString(); if (ftype!=KexiDB::Field::BLOB || v.isNull() || !v.isValid()) - rect = QRect( painter.fontMetrics().boundingRect( + rect = TQRect( painter.fontMetrics().boundingRect( rect.x(), rect.y(), rect.width(), rect.height(), - Qt::AlignAuto|Qt::WordBreak, text) ); + TQt::AlignAuto|TQt::WordBreak, text) ); if (!text.isEmpty() && paint) { // kdDebug() << "print engine: painter.drawText: " // << rect.x() <<" "<< rect.y() <<" "<< m_pageWidth - m_maxFieldNameWidth - cellMargin*2 @@ -502,11 +502,11 @@ void KexiSimplePrintingEngine::paintRecord(QPainter& painter, KexiTableItem *ite // rect.x(), rect.y(), rect.width(), rect.height(), rect.x(), rect.y(), m_pageWidth - m_maxFieldNameWidth - cellMargin*2, int(m_topMargin + m_pageHeight - (int)y), - Qt::AlignTop|Qt::WordBreak, text); + TQt::AlignTop|TQt::WordBreak, text); } if (m_settings->addTableBorders) { if (paint) { - painter.setPen(Qt::darkGray); + painter.setPen(TQt::darkGray); painter.drawLine( (int)m_leftMargin, rect.top(), (int)m_leftMargin+m_pageWidth-1, rect.top()); painter.drawLine( @@ -517,17 +517,17 @@ void KexiSimplePrintingEngine::paintRecord(QPainter& painter, KexiTableItem *ite painter.drawLine( (int)m_leftMargin+m_maxFieldNameWidth, rect.top(), (int)m_leftMargin+m_maxFieldNameWidth, rect.bottom()); - painter.setPen(Qt::black); + painter.setPen(TQt::black); } } y += (double)rect.height(); } if (m_settings->addTableBorders) { if (paint) { - painter.setPen(Qt::darkGray); + painter.setPen(TQt::darkGray); painter.drawLine( (int)m_leftMargin, (int)y, (int)m_leftMargin+m_pageWidth-1, (int)y); - painter.setPen(Qt::black); + painter.setPen(TQt::black); } } //record spacing @@ -536,7 +536,7 @@ void KexiSimplePrintingEngine::paintRecord(QPainter& painter, KexiTableItem *ite // y -= m_mainLineSpacing; //a bit less } -void KexiSimplePrintingEngine::calculatePagesCount(QPainter& painter) +void KexiSimplePrintingEngine::calculatePagesCount(TQPainter& painter) { if (m_eof || !m_data) { m_pagesCount = 0; @@ -550,7 +550,7 @@ void KexiSimplePrintingEngine::calculatePagesCount(QPainter& painter) m_pagesCount = pageNumber; } -void KexiSimplePrintingEngine::setTitleText(const QString& titleText) +void KexiSimplePrintingEngine::setTitleText(const TQString& titleText) { m_headerText = titleText; } diff --git a/kexi/main/printing/kexisimpleprintingengine.h b/kexi/main/printing/kexisimpleprintingengine.h index 551ed2480..f3a5371de 100644 --- a/kexi/main/printing/kexisimpleprintingengine.h +++ b/kexi/main/printing/kexisimpleprintingengine.h @@ -30,9 +30,9 @@ class KexiSimplePrintingSettings; #include <widget/tableview/kexitableviewdata.h> #include <KoPageLayoutDia.h> -#include <qpaintdevicemetrics.h> -#include <qfontmetrics.h> -#include <qfont.h> +#include <tqpaintdevicemetrics.h> +#include <tqfontmetrics.h> +#include <tqfont.h> //! @short Settings data for simple printing engine. class KexiSimplePrintingSettings @@ -46,30 +46,31 @@ class KexiSimplePrintingSettings KoPageLayout pageLayout; KoUnit::Unit unit; - QFont pageTitleFont; + TQFont pageTitleFont; bool addPageNumbers : 1; bool addDateAndTime : 1; bool addTableBorders : 1; }; -/*! @short An engine painting data on pages using QPainter. +/*! @short An engine painting data on pages using TQPainter. The engine allows for random access to any page. */ -class KexiSimplePrintingEngine : public QObject +class KexiSimplePrintingEngine : public TQObject { Q_OBJECT + TQ_OBJECT public: - KexiSimplePrintingEngine( const KexiSimplePrintingSettings& settings, QObject* parent ); + KexiSimplePrintingEngine( const KexiSimplePrintingSettings& settings, TQObject* tqparent ); ~KexiSimplePrintingEngine(); bool init(KexiDB::Connection& conn, KexiDB::TableOrQuerySchema& tableOrQuery, - const QString& titleText, QString& errorMessage); + const TQString& titleText, TQString& errorMessage); - void setTitleText(const QString& titleText); + void setTitleText(const TQString& titleText); //! Calculates pafe count that can be later obtained using pagesCount(). //! Page count can depend on \a painter (printer/screen) and on printing settings. - void calculatePagesCount(QPainter& painter); + void calculatePagesCount(TQPainter& painter); bool done(); void clear(); @@ -89,29 +90,29 @@ class KexiSimplePrintingEngine : public QObject /*! Paints a page number \a pageNumber (counted from 0) on \a painter. If \a paint is false, drawings are only computed but not painted, so this can be used for calculating page number before printing or previewing. */ - void paintPage(int pageNumber, QPainter& painter, bool paint = true); + void paintPage(int pageNumber, TQPainter& painter, bool paint = true); protected: - void paintRecord(QPainter& painter, KexiTableItem *item, + void paintRecord(TQPainter& painter, KexiTableItem *item, int cellMargin, double &y, uint paintedRows, bool paint, bool printing); const KexiSimplePrintingSettings* m_settings; -// QPainter* m_painter; - QFont m_mainFont, m_headerFont; - QPaintDeviceMetrics m_pdm; +// TQPainter* m_painter; + TQFont m_mainFont, m_headerFont; + TQPaintDeviceMetrics m_pdm; double m_dpiX, m_dpiY; uint m_pageWidth, m_pageHeight; uint m_SCALE; - //QFontMetrics m_headerFM, m_mainFM; + //TQFontMetrics m_headerFM, m_mainFM; KexiDB::Cursor *m_cursor; KexiTableViewData *m_data; // KexiTableViewData::Iterator *m_dataIterator; - QPtrList<uint> m_dataOffsets; - QString m_headerText; - QString m_dateTimeText; + TQPtrList<uint> m_dataOffsets; + TQString m_headerText; + TQString m_dateTimeText; uint m_dateTimeWidth; - QRect m_headerTextRect; + TQRect m_headerTextRect; int m_maxFieldNameWidth; int m_mainLineSpacing; int m_footerHeight; diff --git a/kexi/main/printing/kexisimpleprintingpagesetup.cpp b/kexi/main/printing/kexisimpleprintingpagesetup.cpp index 5d20f36e1..f528cb234 100644 --- a/kexi/main/printing/kexisimpleprintingpagesetup.cpp +++ b/kexi/main/printing/kexisimpleprintingpagesetup.cpp @@ -36,27 +36,27 @@ #include <kpushbutton.h> #include <kdeversion.h> -#include <qlabel.h> -#include <qtimer.h> -#include <qlayout.h> -#include <qpainter.h> -#include <qcheckbox.h> -#include <qwhatsthis.h> -#include <qtooltip.h> +#include <tqlabel.h> +#include <tqtimer.h> +#include <tqlayout.h> +#include <tqpainter.h> +#include <tqcheckbox.h> +#include <tqwhatsthis.h> +#include <tqtooltip.h> #include <kexiutils/tristate.h> KexiSimplePrintingCommand::KexiSimplePrintingCommand( - KexiMainWindow* mainWin, int objectId, QObject* parent) - : QObject(parent, "KexiSimplePrintCommand") + KexiMainWindow* mainWin, int objectId, TQObject* tqparent) + : TQObject(tqparent, "KexiSimplePrintCommand") , m_previewEngine(0) , m_mainWin(mainWin) , m_objectId(objectId) , m_previewWindow(0) , m_printPreviewNeedsReloading(false) { - connect(this, SIGNAL(showPageSetupRequested(KexiPart::Item*)), - m_mainWin, SLOT(showPageSetupForItem(KexiPart::Item*))); + connect(this, TQT_SIGNAL(showPageSetupRequested(KexiPart::Item*)), + m_mainWin, TQT_SLOT(showPageSetupForItem(KexiPart::Item*))); } KexiSimplePrintingCommand::~KexiSimplePrintingCommand() @@ -68,13 +68,13 @@ KexiSimplePrintingCommand::~KexiSimplePrintingCommand() bool KexiSimplePrintingCommand::print(const KexiSimplePrintingSettings& settings, - const QString& aTitleText) + const TQString& aTitleText) { m_settings = settings; return print(aTitleText); } -bool KexiSimplePrintingCommand::print(const QString& aTitleText) +bool KexiSimplePrintingCommand::print(const TQString& aTitleText) { KexiDB::Connection *conn = m_mainWin->project()->dbConnection(); KexiDB::TableOrQuerySchema tableOrQuery(conn, m_objectId); @@ -82,12 +82,12 @@ bool KexiSimplePrintingCommand::print(const QString& aTitleText) //! @todo item not found return false; } - QString titleText(aTitleText.stripWhiteSpace()); + TQString titleText(aTitleText.stripWhiteSpace()); if (titleText.isEmpty()) titleText = tableOrQuery.captionOrName(); KexiSimplePrintingEngine engine(m_settings, this); - QString errorMessage; + TQString errorMessage; if (!engine.init(*conn, tableOrQuery, titleText, errorMessage)) { if (!errorMessage.isEmpty()) KMessageBox::sorry(m_mainWin, errorMessage, i18n("Printing")); @@ -95,12 +95,12 @@ bool KexiSimplePrintingCommand::print(const QString& aTitleText) } //setup printing -#ifdef Q_WS_WIN - QPrinter printer(QPrinter::HighResolution); +#ifdef TQ_WS_WIN + TQPrinter printer(TQPrinter::HighResolution); printer.setOrientation( m_settings.pageLayout.orientation == PG_PORTRAIT - ? QPrinter::Portrait : QPrinter::Landscape ); + ? TQPrinter::Portrait : TQPrinter::Landscape ); printer.setPageSize( - (QPrinter::PageSize)KoPageFormat::printerPageSize( m_settings.pageLayout.format ) ); + (TQPrinter::PageSize)KoPageFormat::printerPageSize( m_settings.pageLayout.format ) ); // "chicken-egg" problem: // we cannot use real from/to values in setMinMax() and setFromTo() @@ -115,7 +115,7 @@ bool KexiSimplePrintingCommand::print(const QString& aTitleText) #endif printer.setFullPage(true); - QString docName( titleText ); + TQString docName( titleText ); printer.setDocName( docName ); printer.setCreator(KEXI_APP_NAME); if ( !printer.setup( m_mainWin ) ) { @@ -125,7 +125,7 @@ bool KexiSimplePrintingCommand::print(const QString& aTitleText) // now we have final settings //! @todo get printer.pageOrder() (for reversed order requires improved engine) - QPainter painter; + TQPainter painter; if (!painter.begin(&printer)) { //! @todo msg @@ -134,11 +134,11 @@ bool KexiSimplePrintingCommand::print(const QString& aTitleText) engine.calculatePagesCount(painter); uint loops, loopsPerPage; - QValueList<int> pagesToPrint; + TQValueList<int> pagesToPrint; int fromPage = 0; -#ifdef Q_WS_WIN +#ifdef TQ_WS_WIN int toPage = 0; - if (QPrinter::PageRange == printer.printRange()) { + if (TQPrinter::PageRange == printer.printRange()) { fromPage = printer.fromPage(); toPage = printer.toPage(); } @@ -160,7 +160,7 @@ bool KexiSimplePrintingCommand::print(const QString& aTitleText) loops = 1; loopsPerPage = printer.collateCopies() ? 1 : printer.numCopies(); #else - // on !win32 print QPrinter::numCopies() times (the OS does not perform buffering) + // on !win32 print TQPrinter::numCopies() times (the OS does not perform buffering) pagesToPrint = printer.pageList(); kdDebug() << pagesToPrint << endl; if (pagesToPrint.isEmpty()) { @@ -190,7 +190,7 @@ bool KexiSimplePrintingCommand::print(const QString& aTitleText) for (uint copy = 0;copy < loops; copy++) { kdDebug() << "copy " << (copy+1) << " of " << loops << endl; uint pageNumber = fromPage; - QValueList<int>::ConstIterator pagesIt = pagesToPrint.constBegin(); + TQValueList<int>::ConstIterator pagesIt = pagesToPrint.constBegin(); for(;(int)pageNumber == fromPage || !engine.eof(); ++pageNumber) { kdDebug() << "printing..." << endl; if (pagesIt == pagesToPrint.constEnd()) //no more pages to print @@ -227,7 +227,7 @@ bool KexiSimplePrintingCommand::print(const QString& aTitleText) } bool KexiSimplePrintingCommand::showPrintPreview(const KexiSimplePrintingSettings& settings, - const QString& aTitleText, bool reload) + const TQString& aTitleText, bool reload) { m_settings = settings; if (!m_previewEngine) @@ -237,7 +237,7 @@ bool KexiSimplePrintingCommand::showPrintPreview(const KexiSimplePrintingSetting m_printPreviewNeedsReloading = true; bool backToPage0 = true; - QString titleText(aTitleText.stripWhiteSpace()); + TQString titleText(aTitleText.stripWhiteSpace()); KexiDB::Connection *conn = m_mainWin->project()->dbConnection(); KexiDB::TableOrQuerySchema tableOrQuery(conn, m_objectId); if (!tableOrQuery.table() && !tableOrQuery.query()) { @@ -247,7 +247,7 @@ bool KexiSimplePrintingCommand::showPrintPreview(const KexiSimplePrintingSetting if (titleText.isEmpty()) titleText = tableOrQuery.captionOrName(); if (!m_previewWindow || m_printPreviewNeedsReloading) { - QString errorMessage; + TQString errorMessage; if (!m_previewEngine->init( *conn, tableOrQuery, titleText, errorMessage)) { if (!errorMessage.isEmpty()) @@ -259,10 +259,10 @@ bool KexiSimplePrintingCommand::showPrintPreview(const KexiSimplePrintingSetting backToPage0 = false; m_previewWindow = new KexiSimplePrintPreviewWindow( *m_previewEngine, tableOrQuery.captionOrName(), 0, - Qt::WStyle_Customize|Qt::WStyle_NormalBorder|Qt::WStyle_Title| - Qt::WStyle_SysMenu|Qt::WStyle_MinMax|Qt::WStyle_ContextHelp); - connect(m_previewWindow, SIGNAL(printRequested()), this, SLOT(print())); - connect(m_previewWindow, SIGNAL(pageSetupRequested()), this, SLOT(slotShowPageSetupRequested())); + TQt::WStyle_Customize|TQt::WStyle_NormalBorder|TQt::WStyle_Title| + TQt::WStyle_SysMenu|TQt::WStyle_MinMax|TQt::WStyle_ContextHelp); + connect(m_previewWindow, TQT_SIGNAL(printRequested()), this, TQT_SLOT(print())); + connect(m_previewWindow, TQT_SIGNAL(pageSetupRequested()), this, TQT_SLOT(slotShowPageSetupRequested())); m_previewWindow->show(); KDialog::centerOnScreen(m_previewWindow); m_printPreviewNeedsReloading = false; @@ -297,9 +297,9 @@ void KexiSimplePrintingCommand::slotShowPageSetupRequested() //---------------------------------------------------------- -KexiSimplePrintingPageSetup::KexiSimplePrintingPageSetup( KexiMainWindow *mainWin, QWidget *parent, - QMap<QString,QString>* args ) - : KexiViewBase( mainWin, parent, "KexiSimplePrintingPageSetup" ) +KexiSimplePrintingPageSetup::KexiSimplePrintingPageSetup( KexiMainWindow *mainWin, TQWidget *tqparent, + TQMap<TQString,TQString>* args ) + : KexiViewBase( mainWin, tqparent, "KexiSimplePrintingPageSetup" ) , m_settings( KexiSimplePrintingSettings::load() ) // , m_command(0) { @@ -327,7 +327,7 @@ KexiSimplePrintingPageSetup::KexiSimplePrintingPageSetup( KexiMainWindow *mainWi m_unit = KLocale::Metric == KGlobal::locale()->measureSystem() ? KoUnit::U_CM : KoUnit::U_INCH; // GUI - QVBoxLayout *lyr = new QVBoxLayout(this); + TQVBoxLayout *lyr = new TQVBoxLayout(this); m_contents = new KexiSimplePrintingPageSetupBase(this, "KexiSimplePrintingPageSetupBase"); lyr->addWidget(m_contents); @@ -337,17 +337,17 @@ KexiSimplePrintingPageSetup::KexiSimplePrintingPageSetup( KexiMainWindow *mainWi m_contents->printButton->setIconSet( KStdGuiItem::print().iconSet(KIcon::Small) ); m_contents->printButton->setText( KStdGuiItem::print().text() ); - connect(m_contents->printButton, SIGNAL(clicked()), this, SLOT(print())); + connect(m_contents->printButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(print())); m_contents->printPreviewButton->setIconSet( SmallIconSet("filequickprint") ); m_contents->printPreviewButton->setText( i18n("Print Previe&w...") ); - connect(m_contents->printPreviewButton, SIGNAL(clicked()), this, SLOT(printPreview())); + connect(m_contents->printPreviewButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(printPreview())); m_contents->iconLabel->setFixedWidth(32+6); m_contents->iconLabel->setPixmap( DesktopIcon("document", 32) ); - QWhatsThis::add(m_contents->headerTitleFontButton, i18n("Changes font for title text.")); - connect(m_contents->headerTitleFontButton, SIGNAL(clicked()), - this, SLOT(slotChangeTitleFont())); + TQWhatsThis::add(m_contents->headerTitleFontButton, i18n("Changes font for title text.")); + connect(m_contents->headerTitleFontButton, TQT_SIGNAL(clicked()), + this, TQT_SLOT(slotChangeTitleFont())); if (m_item) { m_origCaptionLabelText = m_contents->captionLabel->text(); @@ -356,29 +356,29 @@ KexiSimplePrintingPageSetup::KexiSimplePrintingPageSetup( KexiMainWindow *mainWi m_contents->openDataLink->setText( i18n("Open This Query") ); m_origCaptionLabelText = i18n("<h2>Page setup for printing \"%1\" query data</h2>"); } - m_contents->captionLabel->setText( m_origCaptionLabelText.arg(m_item->name()) ); + m_contents->captionLabel->setText( m_origCaptionLabelText.tqarg(m_item->name()) ); } - connect(m_contents->headerTitleLineEdit,SIGNAL(textChanged(const QString&)), - this, SLOT(slotTitleTextChanged(const QString&))); + connect(m_contents->headerTitleLineEdit,TQT_SIGNAL(textChanged(const TQString&)), + this, TQT_SLOT(slotTitleTextChanged(const TQString&))); m_contents->headerTitleLineEdit->setFont( m_settings.pageTitleFont ); - QWhatsThis::add(m_contents->openDataLink, + TQWhatsThis::add(m_contents->openDataLink, i18n("Shows data for table or query associated with this page setup.")); - QToolTip::add(m_contents->openDataLink, + TQToolTip::add(m_contents->openDataLink, i18n("Shows data for table or query associated with this page setup.")); - connect(m_contents->openDataLink, SIGNAL(leftClickedURL()), this, SLOT(slotOpenData())); + connect(m_contents->openDataLink, TQT_SIGNAL(leftClickedURL()), this, TQT_SLOT(slotOpenData())); - QWhatsThis::add(m_contents->saveSetupLink, i18n("Saves settings for this setup as default.")); - connect(m_contents->saveSetupLink, SIGNAL(leftClickedURL()), this, SLOT(slotSaveSetup())); -#if !KDE_IS_VERSION(3,5,1) && !defined(Q_WS_WIN) + TQWhatsThis::add(m_contents->saveSetupLink, i18n("Saves settings for this setup as default.")); + connect(m_contents->saveSetupLink, TQT_SIGNAL(leftClickedURL()), this, TQT_SLOT(slotSaveSetup())); +#if !KDE_IS_VERSION(3,5,1) && !defined(TQ_WS_WIN) //a fix for problems with focusable KUrlLabel on KDElibs<=3.5.0 m_contents->openDataLink->setFocusPolicy(NoFocus); m_contents->saveSetupLink->setFocusPolicy(NoFocus); #endif - QWhatsThis::add(m_contents->addDateTimeCheckbox, i18n("Adds date and time to the header.")); - QWhatsThis::add(m_contents->addPageNumbersCheckbox, i18n("Adds page numbers to the footer.")); - QWhatsThis::add(m_contents->addTableBordersCheckbox, i18n("Adds table borders.")); + TQWhatsThis::add(m_contents->addDateTimeCheckbox, i18n("Adds date and time to the header.")); + TQWhatsThis::add(m_contents->addPageNumbersCheckbox, i18n("Adds page numbers to the footer.")); + TQWhatsThis::add(m_contents->addTableBordersCheckbox, i18n("Adds table borders.")); #ifdef KEXI_NO_UNFINISHED m_contents->addDateTimeCheckbox->hide(); @@ -386,17 +386,17 @@ KexiSimplePrintingPageSetup::KexiSimplePrintingPageSetup( KexiMainWindow *mainWi #endif updatePageLayoutAndUnitInfo(); - QWhatsThis::add(m_contents->changePageSizeAndMarginsButton, + TQWhatsThis::add(m_contents->changePageSizeAndMarginsButton, i18n("Changes page size and margins.")); - connect(m_contents->changePageSizeAndMarginsButton, SIGNAL(clicked()), - this, SLOT(slotChangePageSizeAndMargins())); + connect(m_contents->changePageSizeAndMarginsButton, TQT_SIGNAL(clicked()), + this, TQT_SLOT(slotChangePageSizeAndMargins())); - connect(m_contents->addPageNumbersCheckbox, SIGNAL(toggled(bool)), - this, SLOT(slotAddPageNumbersCheckboxToggled(bool))); - connect(m_contents->addDateTimeCheckbox, SIGNAL(toggled(bool)), - this, SLOT(slotAddDateTimeCheckboxToggled(bool))); - connect(m_contents->addTableBordersCheckbox, SIGNAL(toggled(bool)), - this, SLOT(slotAddTableBordersCheckboxToggled(bool))); + connect(m_contents->addPageNumbersCheckbox, TQT_SIGNAL(toggled(bool)), + this, TQT_SLOT(slotAddPageNumbersCheckboxToggled(bool))); + connect(m_contents->addDateTimeCheckbox, TQT_SIGNAL(toggled(bool)), + this, TQT_SLOT(slotAddDateTimeCheckboxToggled(bool))); + connect(m_contents->addTableBordersCheckbox, TQT_SIGNAL(toggled(bool)), + this, TQT_SLOT(slotAddTableBordersCheckboxToggled(bool))); if (!ok) { // no data! @@ -414,17 +414,17 @@ KexiSimplePrintingPageSetup::KexiSimplePrintingPageSetup( KexiMainWindow *mainWi m_printPreviewNeedsReloading = false; /* if (printPreview) - QTimer::singleShot(50, this, SLOT(printPreview())); + TQTimer::singleShot(50, this, TQT_SLOT(printPreview())); else if (print) - QTimer::singleShot(50, this, SLOT(print()));*/ - connect(this, SIGNAL(printItemRequested(KexiPart::Item*,const KexiSimplePrintingSettings&, - const QString&)), - m_mainWin, SLOT(printItem(KexiPart::Item*,const KexiSimplePrintingSettings&, - const QString&))); - connect(this, SIGNAL(printPreviewForItemRequested(KexiPart::Item*, - const KexiSimplePrintingSettings&,const QString&,bool)), - m_mainWin, SLOT(printPreviewForItem(KexiPart::Item*, - const KexiSimplePrintingSettings&,const QString&,bool))); + TQTimer::singleShot(50, this, TQT_SLOT(print()));*/ + connect(this, TQT_SIGNAL(printItemRequested(KexiPart::Item*,const KexiSimplePrintingSettings&, + const TQString&)), + m_mainWin, TQT_SLOT(printItem(KexiPart::Item*,const KexiSimplePrintingSettings&, + const TQString&))); + connect(this, TQT_SIGNAL(printPreviewForItemRequested(KexiPart::Item*, + const KexiSimplePrintingSettings&,const TQString&,bool)), + m_mainWin, TQT_SLOT(printPreviewForItem(KexiPart::Item*, + const KexiSimplePrintingSettings&,const TQString&,bool))); } KexiSimplePrintingPageSetup::~KexiSimplePrintingPageSetup() @@ -439,15 +439,15 @@ void KexiSimplePrintingPageSetup::slotSaveSetup() void KexiSimplePrintingPageSetup::updatePageLayoutAndUnitInfo() { - QString s; + TQString s; if (m_settings.pageLayout.format == PG_CUSTOM) { - s += QString(" (%1 %2 x %3 %4)") - .arg(m_settings.pageLayout.ptWidth).arg(KoUnit::unitName(m_unit)) - .arg(m_settings.pageLayout.ptHeight).arg(KoUnit::unitName(m_unit)); + s += TQString(" (%1 %2 x %3 %4)") + .tqarg(m_settings.pageLayout.ptWidth).tqarg(KoUnit::unitName(m_unit)) + .tqarg(m_settings.pageLayout.ptHeight).tqarg(KoUnit::unitName(m_unit)); } else s += KoPageFormat::name(m_settings.pageLayout.format); - s += QString(", ") + s += TQString(", ") + (m_settings.pageLayout.orientation == PG_PORTRAIT ? i18n("Portrait") : i18n("Landscape")) + ", " + i18n("margins:") + " " + KoUnit::toUserStringValue(m_settings.pageLayout.ptLeft, m_unit) @@ -488,7 +488,7 @@ void KexiSimplePrintingPageSetup::slotOpenData() m_mainWin->openObject(m_item, Kexi::DataViewMode, openingCancelled); } -void KexiSimplePrintingPageSetup::slotTitleTextChanged(const QString&) +void KexiSimplePrintingPageSetup::slotTitleTextChanged(const TQString&) { if (m_contents->headerTitleLineEdit->isModified()) { m_printPreviewNeedsReloading = true; @@ -501,7 +501,7 @@ void KexiSimplePrintingPageSetup::slotTitleTextChanged(const QString&) void KexiSimplePrintingPageSetup::slotChangeTitleFont() { - if (QDialog::Accepted != KFontDialog::getFont(m_settings.pageTitleFont, false, this)) + if (TQDialog::Accepted != KFontDialog::getFont(m_settings.pageTitleFont, false, this)) return; m_contents->headerTitleLineEdit->setFont( m_settings.pageTitleFont ); setDirty(true); @@ -511,7 +511,7 @@ void KexiSimplePrintingPageSetup::slotChangePageSizeAndMargins() { KoHeadFoot headfoot; //dummy - if (int(QDialog::Accepted) != KoPageLayoutDia::pageLayout( + if (int(TQDialog::Accepted) != KoPageLayoutDia::pageLayout( m_settings.pageLayout, headfoot, FORMAT_AND_BORDERS | DISABLE_UNIT, m_unit, this )) return; diff --git a/kexi/main/printing/kexisimpleprintingpagesetup.h b/kexi/main/printing/kexisimpleprintingpagesetup.h index e4e99bd51..b2fbc6686 100644 --- a/kexi/main/printing/kexisimpleprintingpagesetup.h +++ b/kexi/main/printing/kexisimpleprintingpagesetup.h @@ -35,21 +35,22 @@ class KexiSimplePrintPreviewWindow; - a single printing engine per part item regardless of a way how user started (using 'File->Print' command or 'Print' button of the 'Page Setup' dialog) */ -class KexiSimplePrintingCommand : public QObject +class KexiSimplePrintingCommand : public TQObject { Q_OBJECT + TQ_OBJECT public: KexiSimplePrintingCommand(KexiMainWindow* mainWin, int objectId, - QObject* parent = 0); + TQObject* tqparent = 0); ~KexiSimplePrintingCommand(); public slots: bool print(const KexiSimplePrintingSettings& settings, - const QString& aTitleText = QString::null); - bool print(const QString& aTitleText = QString::null); + const TQString& aTitleText = TQString()); + bool print(const TQString& aTitleText = TQString()); bool showPrintPreview(const KexiSimplePrintingSettings& settings, - const QString& aTitleText = QString::null, bool reload = false); + const TQString& aTitleText = TQString(), bool reload = false); // void setPrintPreviewNeedsReloading(); signals: @@ -72,9 +73,10 @@ class KexiSimplePrintingCommand : public QObject class KexiSimplePrintingPageSetup : public KexiViewBase { Q_OBJECT + TQ_OBJECT public: - KexiSimplePrintingPageSetup( KexiMainWindow *mainWin, QWidget *parent, QMap<QString,QString>* args ); + KexiSimplePrintingPageSetup( KexiMainWindow *mainWin, TQWidget *tqparent, TQMap<TQString,TQString>* args ); ~KexiSimplePrintingPageSetup(); public slots: @@ -83,9 +85,9 @@ class KexiSimplePrintingPageSetup : public KexiViewBase signals: void printItemRequested(KexiPart::Item* item, - const KexiSimplePrintingSettings& settings, const QString& titleText); + const KexiSimplePrintingSettings& settings, const TQString& titleText); void printPreviewForItemRequested(KexiPart::Item* item, - const KexiSimplePrintingSettings& settings, const QString& titleText, bool reload); + const KexiSimplePrintingSettings& settings, const TQString& titleText, bool reload); protected slots: void slotOpenData(); @@ -95,7 +97,7 @@ class KexiSimplePrintingPageSetup : public KexiViewBase void slotAddPageNumbersCheckboxToggled(bool set); void slotAddDateTimeCheckboxToggled(bool set); void slotAddTableBordersCheckboxToggled(bool set); - void slotTitleTextChanged(const QString&); + void slotTitleTextChanged(const TQString&); protected: void setupPrintingCommand(); @@ -109,7 +111,7 @@ class KexiSimplePrintingPageSetup : public KexiViewBase KoPageLayoutSize *m_pageLayoutWidget; KexiPart::Item *m_item; // KexiSimplePrintingCommand *m_command; - QString m_origCaptionLabelText; + TQString m_origCaptionLabelText; bool m_printPreviewNeedsReloading : 1; }; diff --git a/kexi/main/printing/kexisimpleprintingpagesetupbase.ui b/kexi/main/printing/kexisimpleprintingpagesetupbase.ui index 13c29ab0d..798ae0e55 100644 --- a/kexi/main/printing/kexisimpleprintingpagesetupbase.ui +++ b/kexi/main/printing/kexisimpleprintingpagesetupbase.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>KexiSimplePrintingPageSetupBase</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>KexiSimplePrintingPageSetupBase</cstring> </property> @@ -22,15 +22,15 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget" row="0" column="0" rowspan="1" colspan="6"> + <widget class="TQLayoutWidget" row="0" column="0" rowspan="1" colspan="6"> <property name="name"> - <cstring>layout15</cstring> + <cstring>tqlayout15</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>iconLabel</cstring> </property> @@ -45,11 +45,11 @@ <property name="text"> <string></string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter</set> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>captionLabel</cstring> </property> @@ -91,7 +91,7 @@ <string>Set Font...</string> </property> </widget> - <widget class="QLabel" row="4" column="0" rowspan="1" colspan="5"> + <widget class="TQLabel" row="4" column="0" rowspan="1" colspan="5"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -106,16 +106,16 @@ <property name="text"> <string>Page title:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignBottom</set> </property> <property name="buddy" stdset="0"> <cstring>headerTitleLineEdit</cstring> </property> </widget> - <widget class="QLayoutWidget" row="2" column="0" rowspan="1" colspan="6"> + <widget class="TQLayoutWidget" row="2" column="0" rowspan="1" colspan="6"> <property name="name"> - <cstring>layout19</cstring> + <cstring>tqlayout19</cstring> </property> <hbox> <property name="name"> @@ -158,7 +158,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>230</width> <height>20</height> @@ -167,7 +167,7 @@ </spacer> </hbox> </widget> - <widget class="QCheckBox" row="8" column="0" rowspan="1" colspan="2"> + <widget class="TQCheckBox" row="8" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>addPageNumbersCheckbox</cstring> </property> @@ -183,7 +183,7 @@ <string>Add page numbers</string> </property> </widget> - <widget class="QGroupBox" row="7" column="0" rowspan="1" colspan="5"> + <widget class="TQGroupBox" row="7" column="0" rowspan="1" colspan="5"> <property name="name"> <cstring>groupBox1</cstring> </property> @@ -194,7 +194,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>pageSizeAndMarginsLabel</cstring> </property> @@ -220,9 +220,9 @@ <string>Change...</string> </property> </widget> - <widget class="QLayoutWidget" row="12" column="0" rowspan="1" colspan="6"> + <widget class="TQLayoutWidget" row="12" column="0" rowspan="1" colspan="6"> <property name="name"> - <cstring>layout4</cstring> + <cstring>tqlayout4</cstring> </property> <grid> <property name="name"> @@ -238,7 +238,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>80</width> <height>6</height> @@ -291,7 +291,7 @@ <string></string> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel6</cstring> </property> @@ -301,7 +301,7 @@ </widget> </grid> </widget> - <widget class="QCheckBox" row="9" column="0" rowspan="1" colspan="2"> + <widget class="TQCheckBox" row="9" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>addDateTimeCheckbox</cstring> </property> @@ -317,7 +317,7 @@ <string>Add date and time</string> </property> </widget> - <widget class="QCheckBox" row="10" column="0" rowspan="1" colspan="2"> + <widget class="TQCheckBox" row="10" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>addTableBordersCheckbox</cstring> </property> @@ -343,7 +343,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>16</height> @@ -360,7 +360,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>4</height> @@ -377,7 +377,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>4</height> @@ -394,7 +394,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>4</height> @@ -411,7 +411,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>4</height> @@ -434,7 +434,7 @@ <tabstop>openDataLink</tabstop> <tabstop>saveSetupLink</tabstop> </tabstops> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klineedit.h</includehint> <includehint>kpushbutton.h</includehint> diff --git a/kexi/main/printing/kexisimpleprintingpart.cpp b/kexi/main/printing/kexisimpleprintingpart.cpp index 765f6db26..ca751003e 100644 --- a/kexi/main/printing/kexisimpleprintingpart.cpp +++ b/kexi/main/printing/kexisimpleprintingpart.cpp @@ -48,12 +48,12 @@ KexiSimplePrintingPart::~KexiSimplePrintingPart() { } -KexiViewBase* KexiSimplePrintingPart::createView(QWidget *parent, KexiDialogBase* dialog, - KexiPart::Item &item, int viewMode, QMap<QString,QString>* args) +KexiViewBase* KexiSimplePrintingPart::createView(TQWidget *tqparent, KexiDialogBase* dialog, + KexiPart::Item &item, int viewMode, TQMap<TQString,TQString>* args) { Q_UNUSED( item ); if (viewMode == Kexi::DesignViewMode) { - KexiSimplePrintingPageSetup *w = new KexiSimplePrintingPageSetup( dialog->mainWin(), parent, args ); + KexiSimplePrintingPageSetup *w = new KexiSimplePrintingPageSetup( dialog->mainWin(), tqparent, args ); return w; } diff --git a/kexi/main/printing/kexisimpleprintingpart.h b/kexi/main/printing/kexisimpleprintingpart.h index 1d2df3be2..6e44ff4c3 100644 --- a/kexi/main/printing/kexisimpleprintingpart.h +++ b/kexi/main/printing/kexisimpleprintingpart.h @@ -37,14 +37,15 @@ class KexiProject; class KexiSimplePrintingPart : public KexiPart::StaticPart { Q_OBJECT + TQ_OBJECT public: KexiSimplePrintingPart(); virtual ~KexiSimplePrintingPart(); protected: - virtual KexiViewBase* createView(QWidget *parent, KexiDialogBase* dialog, - KexiPart::Item &item, int viewMode, QMap<QString,QString>* staticObjectArgs); + virtual KexiViewBase* createView(TQWidget *tqparent, KexiDialogBase* dialog, + KexiPart::Item &item, int viewMode, TQMap<TQString,TQString>* staticObjectArgs); }; #endif diff --git a/kexi/main/printing/kexisimpleprintpreviewwindow.cpp b/kexi/main/printing/kexisimpleprintpreviewwindow.cpp index 4ba487d9a..960a23b2f 100644 --- a/kexi/main/printing/kexisimpleprintpreviewwindow.cpp +++ b/kexi/main/printing/kexisimpleprintpreviewwindow.cpp @@ -22,10 +22,10 @@ #include "kexisimpleprintpreviewwindow_p.h" #include <kexi_version.h> -#include <qlayout.h> -#include <qaccel.h> -#include <qtimer.h> -#include <qlabel.h> +#include <tqlayout.h> +#include <tqaccel.h> +#include <tqtimer.h> +#include <tqlabel.h> #include <kdialogbase.h> #include <ktoolbarbutton.h> @@ -36,8 +36,8 @@ #include <kapplication.h> KexiSimplePrintPreviewView::KexiSimplePrintPreviewView( - QWidget *parent, KexiSimplePrintPreviewWindow *window) - : QWidget(parent, "KexiSimplePrintPreviewView", WStaticContents)//|WNoAutoErase) + TQWidget *tqparent, KexiSimplePrintPreviewWindow *window) + : TQWidget(tqparent, "KexiSimplePrintPreviewView", WStaticContents)//|WNoAutoErase) , m_window(window) { enablePainting = false; @@ -45,16 +45,16 @@ KexiSimplePrintPreviewView::KexiSimplePrintPreviewView( // resizeContents(200, 400); } -void KexiSimplePrintPreviewView::paintEvent( QPaintEvent *pe ) +void KexiSimplePrintPreviewView::paintEvent( TQPaintEvent *pe ) { Q_UNUSED(pe); if (!enablePainting) return; - QPixmap pm(size()); //dbl buffered - QPainter p; - p.begin(&pm, this); + TQPixmap pm(size()); //dbl buffered + TQPainter p; + p.tqbegin(TQT_TQPAINTDEVICE(&pm), this); //! @todo only for screen! - p.fillRect(QRect(QPoint(0,0),pm.size()), QBrush(white));//pe->rect(), QBrush(white)); + p.fillRect(TQRect(TQPoint(0,0),pm.size()), TQBrush(white));//pe->rect(), TQBrush(white)); if (m_window->currentPage()>=0) m_window->m_engine.paintPage(m_window->currentPage(), p); // emit m_window->paintingPageRequested(m_window->currentPage(), p); @@ -68,7 +68,7 @@ void KexiSimplePrintPreviewView::paintEvent( QPaintEvent *pe ) KexiSimplePrintPreviewScrollView::KexiSimplePrintPreviewScrollView( KexiSimplePrintPreviewWindow *window) - : QScrollView(window, "scrollview", WStaticContents|WNoAutoErase) + : TQScrollView(window, "scrollview", WStaticContents|WNoAutoErase) , m_window(window) { // this->settings = settings; @@ -84,9 +84,9 @@ KexiSimplePrintPreviewScrollView::KexiSimplePrintPreviewScrollView( addChild(widget); } -void KexiSimplePrintPreviewScrollView::resizeEvent( QResizeEvent *re ) +void KexiSimplePrintPreviewScrollView::resizeEvent( TQResizeEvent *re ) { - QScrollView::resizeEvent(re); + TQScrollView::resizeEvent(re); // kdDebug() << re->size().width() << " " << re->size().height() << endl; // kdDebug() << contentsWidth() << " " << contentsHeight() << endl; // kdDebug() << widget->width() << " " << widget->height() << endl; @@ -95,13 +95,13 @@ void KexiSimplePrintPreviewScrollView::resizeEvent( QResizeEvent *re ) || re->size().height() > (widget->height()+2*KexiSimplePrintPreviewScrollView_MARGIN)) { resizeContents( - QMAX(re->size().width(), widget->width()+2*KexiSimplePrintPreviewScrollView_MARGIN), - QMAX(re->size().height(), widget->height()+2*KexiSimplePrintPreviewScrollView_MARGIN)); + TQMAX(re->size().width(), widget->width()+2*KexiSimplePrintPreviewScrollView_MARGIN), + TQMAX(re->size().height(), widget->height()+2*KexiSimplePrintPreviewScrollView_MARGIN)); int vscrbarWidth = verticalScrollBar()->isVisible() ? verticalScrollBar()->width() : 0; int newContentsWidth - = QMAX(re->size().width(), widget->width()+2*KexiSimplePrintPreviewScrollView_MARGIN); + = TQMAX(re->size().width(), widget->width()+2*KexiSimplePrintPreviewScrollView_MARGIN); int newContentsHeight - = QMAX(re->size().height(), widget->height()+2*KexiSimplePrintPreviewScrollView_MARGIN); + = TQMAX(re->size().height(), widget->height()+2*KexiSimplePrintPreviewScrollView_MARGIN); moveChild(widget, (newContentsWidth - vscrbarWidth - widget->width())/2, (newContentsHeight - widget->height())/2); resizeContents( newContentsWidth, newContentsHeight ); @@ -120,10 +120,10 @@ void KexiSimplePrintPreviewScrollView::setFullWidth() // int constantWidth = m_window->width()- KexiSimplePrintPreviewScrollView_MARGIN*6; double constantWidth = width()- KexiSimplePrintPreviewScrollView_MARGIN*6; double heightForWidth = constantWidth * heightMM / widthMM; -// heightForWidth = QMIN(kapp->desktop()->height()*4/5, heightForWidth); +// heightForWidth = TQMIN(kapp->desktop()->height()*4/5, heightForWidth); kdDebug() << "1: " << heightForWidth << endl; #if 0 //todo we can use this if we want to fix the height to width of the page - heightForWidth = QMIN(height(), heightForWidth); + heightForWidth = TQMIN(height(), heightForWidth); kdDebug() << "2: " << heightForWidth << endl; #endif constantWidth = heightForWidth * widthMM / heightMM; @@ -133,9 +133,9 @@ void KexiSimplePrintPreviewScrollView::setFullWidth() moveChild(widget, (contentsWidth()-widget->width())/2, (contentsHeight()-widget->height())/2); viewport()->setUpdatesEnabled(true); - resize(size()+QSize(1,1)); //to update pos. + resize(size()+TQSize(1,1)); //to update pos. widget->enablePainting = true; - widget->repaint(); + widget->tqrepaint(); } void KexiSimplePrintPreviewScrollView::setContentsPos(int x, int y) @@ -143,65 +143,65 @@ void KexiSimplePrintPreviewScrollView::setContentsPos(int x, int y) // kdDebug() << "############" << x << " " << y << " " << contentsX()<< " " <<contentsY() << endl; if (x<0 || y<0) //to avoid endless loop on Linux return; - QScrollView::setContentsPos(x,y); + TQScrollView::setContentsPos(x,y); } //------------------ KexiSimplePrintPreviewWindow::KexiSimplePrintPreviewWindow( - KexiSimplePrintingEngine &engine, const QString& previewName, - QWidget *parent, WFlags f) - : QWidget(parent, "KexiSimplePrintPreviewWindow", f) + KexiSimplePrintingEngine &engine, const TQString& previewName, + TQWidget *tqparent, WFlags f) + : TQWidget(tqparent, "KexiSimplePrintPreviewWindow", f) , m_engine(engine) , m_settings(*m_engine.settings()) , m_pageNumber(-1) , m_pagesCount(-1) { - setCaption(i18n("%1 - Print Preview - %2").arg(previewName).arg(KEXI_APP_NAME)); + setCaption(i18n("%1 - Print Preview - %2").tqarg(previewName).tqarg(KEXI_APP_NAME)); setIcon(DesktopIcon("filequickprint")); - QVBoxLayout *lyr = new QVBoxLayout(this, 6); + TQVBoxLayout *lyr = new TQVBoxLayout(this, 6); int id; m_toolbar = new KToolBar(0, this); m_toolbar->setLineWidth(0); - m_toolbar->setFrameStyle(QFrame::NoFrame); + m_toolbar->setFrameStyle(TQFrame::NoFrame); m_toolbar->setIconText(KToolBar::IconTextRight); lyr->addWidget(m_toolbar); id = m_toolbar->insertWidget( -1, 0, new KPushButton(KStdGuiItem::print(), m_toolbar) ); - m_toolbar->addConnection(id, SIGNAL(clicked()), this, SLOT(slotPrintClicked())); - static_cast<KPushButton*>(m_toolbar->getWidget(id))->setAccel(Qt::CTRL|Qt::Key_P); + m_toolbar->addConnection(id, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(slotPrintClicked())); + static_cast<KPushButton*>(m_toolbar->getWidget(id))->setAccel(TQt::CTRL|TQt::Key_P); m_toolbar->insertSeparator(); id = m_toolbar->insertWidget(-1, 0, new KPushButton(i18n("Page Set&up..."), m_toolbar)); - m_toolbar->addConnection(id, SIGNAL(clicked()), this, SLOT(slotPageSetup())); + m_toolbar->addConnection(id, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(slotPageSetup())); m_toolbar->insertSeparator(); #ifndef KEXI_NO_UNFINISHED //! @todo unfinished id = m_toolbar->insertWidget( -1, 0, new KPushButton(BarIconSet("viewmag+"), i18n("Zoom In"), m_toolbar)); - m_toolbar->addConnection(id, SIGNAL(clicked()), this, SLOT(slotZoomInClicked())); + m_toolbar->addConnection(id, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(slotZoomInClicked())); m_toolbar->insertSeparator(); id = m_toolbar->insertWidget( -1, 0, new KPushButton(BarIconSet("viewmag-"), i18n("Zoom Out"), m_toolbar)); - m_toolbar->addConnection(id, SIGNAL(clicked()), this, SLOT(slotZoomOutClicked())); + m_toolbar->addConnection(id, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(slotZoomOutClicked())); m_toolbar->insertSeparator(); #endif id = m_toolbar->insertWidget(-1, 0, new KPushButton(KStdGuiItem::close(), m_toolbar)); - m_toolbar->addConnection(id, SIGNAL(clicked()), this, SLOT(close())); + m_toolbar->addConnection(id, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(close())); m_toolbar->alignItemRight(id); m_scrollView = new KexiSimplePrintPreviewScrollView(this); m_scrollView->setUpdatesEnabled(false); m_view = m_scrollView->widget; - m_scrollView->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum); + m_scrollView->tqsetSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum); lyr->addWidget(m_scrollView); - QWidget* navToolbarWidget = new QWidget(this); //widget used to center the navigator toolbar - navToolbarWidget->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed); - QHBoxLayout *navToolbarLyr = new QHBoxLayout(navToolbarWidget); + TQWidget* navToolbarWidget = new TQWidget(this); //widget used to center the navigator toolbar + navToolbarWidget->tqsetSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed); + TQHBoxLayout *navToolbarLyr = new TQHBoxLayout(navToolbarWidget); lyr->addWidget(navToolbarWidget); m_navToolbar = new KToolBar(0, navToolbarWidget); @@ -210,33 +210,33 @@ KexiSimplePrintPreviewWindow::KexiSimplePrintPreviewWindow( navToolbarLyr->addStretch(1); // m_navToolbar->setFullWidth(true); m_navToolbar->setLineWidth(0); - m_navToolbar->setFrameStyle(QFrame::NoFrame); + m_navToolbar->setFrameStyle(TQFrame::NoFrame); m_navToolbar->setIconText(KToolBar::IconTextRight); m_idFirst = m_navToolbar->insertWidget( -1, 0, new KPushButton(BarIconSet("start"), i18n("First Page"), m_navToolbar)); - m_navToolbar->addConnection(m_idFirst, SIGNAL(clicked()), this, SLOT(slotFirstClicked())); + m_navToolbar->addConnection(m_idFirst, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(slotFirstClicked())); m_navToolbar->insertSeparator(); m_idPrevious = m_navToolbar->insertWidget( -1, 0, new KPushButton(BarIconSet("previous"), i18n("Previous Page"), m_navToolbar)); - m_navToolbar->addConnection(m_idPrevious, SIGNAL(clicked()), this, SLOT(slotPreviousClicked())); + m_navToolbar->addConnection(m_idPrevious, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(slotPreviousClicked())); m_navToolbar->insertSeparator(); - m_idPageNumberLabel = m_navToolbar->insertWidget( -1, 0, new QLabel(m_navToolbar)); + m_idPageNumberLabel = m_navToolbar->insertWidget( -1, 0, new TQLabel(m_navToolbar)); m_navToolbar->insertSeparator(); m_idNext = m_navToolbar->insertWidget( -1, 0, new KPushButton(BarIconSet("next"), i18n("Next Page"), m_navToolbar)); - m_navToolbar->addConnection(m_idNext, SIGNAL(clicked()), this, SLOT(slotNextClicked())); + m_navToolbar->addConnection(m_idNext, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(slotNextClicked())); m_navToolbar->insertSeparator(); m_idLast = m_navToolbar->insertWidget( -1, 0, new KPushButton(BarIconSet("finish"), i18n("Last Page"), m_navToolbar)); - m_navToolbar->addConnection(m_idLast, SIGNAL(clicked()), this, SLOT(slotLastClicked())); + m_navToolbar->addConnection(m_idLast, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(slotLastClicked())); m_navToolbar->insertSeparator(); resize(width(), kapp->desktop()->height()*4/5); //! @todo progress bar... - QTimer::singleShot(50, this, SLOT(initLater())); + TQTimer::singleShot(50, TQT_TQOBJECT(this), TQT_SLOT(initLater())); } void KexiSimplePrintPreviewWindow::initLater() @@ -308,14 +308,14 @@ void KexiSimplePrintPreviewWindow::goToPage(int pageNumber) m_pageNumber = pageNumber; m_pagesCount = m_engine.pagesCount(); - m_view->repaint(); //this will automatically paint a new page + m_view->tqrepaint(); //this will automatically paint a new page m_navToolbar->setItemEnabled(m_idNext, pageNumber < ((int)m_engine.pagesCount()-1)); m_navToolbar->setItemEnabled(m_idLast, pageNumber < ((int)m_engine.pagesCount()-1)); m_navToolbar->setItemEnabled(m_idPrevious, pageNumber > 0); m_navToolbar->setItemEnabled(m_idFirst, pageNumber > 0); - static_cast<QLabel*>(m_navToolbar->getWidget(m_idPageNumberLabel))->setText( - i18n("Page (number) of (total)", "Page %1 of %2").arg(m_pageNumber+1).arg(m_engine.pagesCount())); + static_cast<TQLabel*>(m_navToolbar->getWidget(m_idPageNumberLabel))->setText( + i18n("Page (number) of (total)", "Page %1 of %2").tqarg(m_pageNumber+1).tqarg(m_engine.pagesCount())); } void KexiSimplePrintPreviewWindow::setFullWidth() @@ -325,29 +325,29 @@ void KexiSimplePrintPreviewWindow::setFullWidth() void KexiSimplePrintPreviewWindow::updatePagesCount() { - QPixmap pm(m_view->size()); //dbl buffered - QPainter p(m_view); + TQPixmap pm(m_view->size()); //dbl buffered + TQPainter p(m_view); //p.begin(&pm, this); ////! @todo only for screen! -// p.fillRect(pe->rect(), QBrush(white)); +// p.fillRect(pe->rect(), TQBrush(white)); m_engine.calculatePagesCount(p); p.end(); } -bool KexiSimplePrintPreviewWindow::event( QEvent * e ) +bool KexiSimplePrintPreviewWindow::event( TQEvent * e ) { - QEvent::Type t = e->type(); - if (t==QEvent::KeyPress) { - QKeyEvent *ke = static_cast<QKeyEvent*>(e); + TQEvent::Type t = e->type(); + if (t==TQEvent::KeyPress) { + TQKeyEvent *ke = TQT_TQKEYEVENT(e); const int k = ke->key(); bool ok = true; - if (k==Qt::Key_Equal || k==Qt::Key_Plus) + if (k==TQt::Key_Equal || k==TQt::Key_Plus) slotZoomInClicked(); - else if (k==Qt::Key_Minus) + else if (k==TQt::Key_Minus) slotZoomOutClicked(); - else if (k==Qt::Key_Home) + else if (k==TQt::Key_Home) slotFirstClicked(); - else if (k==Qt::Key_End) + else if (k==TQt::Key_End) slotLastClicked(); else ok = false; @@ -357,13 +357,13 @@ bool KexiSimplePrintPreviewWindow::event( QEvent * e ) return true; } } - else if (t==QEvent::AccelOverride) { - QKeyEvent *ke = static_cast<QKeyEvent*>(e); + else if (t==TQEvent::AccelOverride) { + TQKeyEvent *ke = TQT_TQKEYEVENT(e); const int k = ke->key(); bool ok = true; - if (k==Qt::Key_PageUp) + if (k==TQt::Key_PageUp) slotPreviousClicked(); - else if (k==Qt::Key_PageDown) + else if (k==TQt::Key_PageDown) slotNextClicked(); else ok = false; @@ -373,7 +373,7 @@ bool KexiSimplePrintPreviewWindow::event( QEvent * e ) return true; } } - return QWidget::event(e); + return TQWidget::event(e); } diff --git a/kexi/main/printing/kexisimpleprintpreviewwindow.h b/kexi/main/printing/kexisimpleprintpreviewwindow.h index c91fa2f26..d3119339d 100644 --- a/kexi/main/printing/kexisimpleprintpreviewwindow.h +++ b/kexi/main/printing/kexisimpleprintpreviewwindow.h @@ -20,8 +20,8 @@ #ifndef KEXISIMPLEPRINTPREVIEWWINDOW_H #define KEXISIMPLEPRINTPREVIEWWINDOW_H -#include <qpainter.h> -#include <qscrollview.h> +#include <tqpainter.h> +#include <tqscrollview.h> #include <ktoolbar.h> #include <KoPageLayoutDia.h> @@ -31,13 +31,14 @@ class KexiSimplePrintingSettings; class KexiSimplePrintingEngine; //! @short A window for displaying print preview for simple printing. -class KexiSimplePrintPreviewWindow : public QWidget +class KexiSimplePrintPreviewWindow : public TQWidget { Q_OBJECT + TQ_OBJECT public: KexiSimplePrintPreviewWindow(KexiSimplePrintingEngine &engine, - const QString& previewName, QWidget *parent, WFlags f = 0); + const TQString& previewName, TQWidget *tqparent, WFlags f = 0); ~KexiSimplePrintPreviewWindow(); int currentPage() const { return m_pageNumber; } @@ -66,7 +67,7 @@ class KexiSimplePrintPreviewWindow : public QWidget void initLater(); protected: - virtual bool event( QEvent * e ); + virtual bool event( TQEvent * e ); KexiSimplePrintingEngine &m_engine; const KexiSimplePrintingSettings& m_settings; diff --git a/kexi/main/printing/kexisimpleprintpreviewwindow_p.h b/kexi/main/printing/kexisimpleprintpreviewwindow_p.h index e7a3804d5..2c72e8a16 100644 --- a/kexi/main/printing/kexisimpleprintpreviewwindow_p.h +++ b/kexi/main/printing/kexisimpleprintpreviewwindow_p.h @@ -22,21 +22,22 @@ #include <kexisimpleprintpreviewwindow.h> -class KexiSimplePrintPreviewView : public QWidget +class KexiSimplePrintPreviewView : public TQWidget { public: - KexiSimplePrintPreviewView(QWidget *parent, KexiSimplePrintPreviewWindow *window); + KexiSimplePrintPreviewView(TQWidget *tqparent, KexiSimplePrintPreviewWindow *window); - virtual void paintEvent( QPaintEvent *pe ); + virtual void paintEvent( TQPaintEvent *pe ); bool enablePainting; protected: KexiSimplePrintPreviewWindow *m_window; }; -class KexiSimplePrintPreviewScrollView : public QScrollView +class KexiSimplePrintPreviewScrollView : public TQScrollView { Q_OBJECT + TQ_OBJECT public: KexiSimplePrintPreviewScrollView(KexiSimplePrintPreviewWindow *window); @@ -48,7 +49,7 @@ class KexiSimplePrintPreviewScrollView : public QScrollView void setContentsPos(int x, int y); protected: - virtual void resizeEvent( QResizeEvent *re ); + virtual void resizeEvent( TQResizeEvent *re ); KexiSimplePrintPreviewWindow *m_window; }; diff --git a/kexi/main/startup/KexiConnSelector.cpp b/kexi/main/startup/KexiConnSelector.cpp index 454f1e085..a6c4d1609 100644 --- a/kexi/main/startup/KexiConnSelector.cpp +++ b/kexi/main/startup/KexiConnSelector.cpp @@ -40,19 +40,19 @@ #include <ktoolbarbutton.h> #include <kactionclasses.h> -#include <qlabel.h> -#include <qpushbutton.h> -#include <qlayout.h> -#include <qcheckbox.h> -#include <qtooltip.h> -#include <qtextedit.h> -#include <qgroupbox.h> -#include <qwidgetstack.h> -#include <qbuttongroup.h> +#include <tqlabel.h> +#include <tqpushbutton.h> +#include <tqlayout.h> +#include <tqcheckbox.h> +#include <tqtooltip.h> +#include <tqtextedit.h> +#include <tqgroupbox.h> +#include <tqwidgetstack.h> +#include <tqbuttongroup.h> ConnectionDataLVItem::ConnectionDataLVItem(KexiDB::ConnectionData *data, - const KexiDB::Driver::Info& info, QListView *list) - : QListViewItem(list) + const KexiDB::Driver::Info& info, TQListView *list) + : TQListViewItem(list) , m_data(data) { update(info); @@ -65,13 +65,13 @@ ConnectionDataLVItem::~ConnectionDataLVItem() void ConnectionDataLVItem::update(const KexiDB::Driver::Info& info) { setText(0, m_data->caption+" "); - const QString &sfile = i18n("File"); - QString drvname = info.caption.isEmpty() ? m_data->driverName : info.caption; + const TQString &sfile = i18n("File"); + TQString drvname = info.caption.isEmpty() ? m_data->driverName : info.caption; if (info.fileBased) setText(1, sfile + " ("+drvname+") " ); else setText(1, drvname+" " ); - setText(2, (info.fileBased ? (QString("<")+sfile.lower()+">") : m_data->serverInfoString(true))+" " ); + setText(2, (info.fileBased ? (TQString("<")+sfile.lower()+">") : m_data->serverInfoString(true))+" " ); } /*================================================================*/ @@ -87,11 +87,11 @@ public: { } - QWidget* openExistingWidget; + TQWidget* openExistingWidget; KexiPrjTypeSelector* prjTypeSelector; - QString startDirOrVariable; - QWidgetStack *stack; - QGuardedPtr<KexiDBConnectionSet> conn_set; + TQString startDirOrVariable; + TQWidgetStack *stack; + TQGuardedPtr<KexiDBConnectionSet> conn_set; KexiDB::DriverManager manager; bool conn_sel_shown;//! helper bool file_sel_shown; @@ -101,34 +101,34 @@ public: /*================================================================*/ KexiConnSelectorWidget::KexiConnSelectorWidget( KexiDBConnectionSet& conn_set, - const QString& startDirOrVariable, QWidget* parent, const char* name ) - : QWidget( parent, name ) + const TQString& startDirOrVariable, TQWidget* tqparent, const char* name ) + : TQWidget( tqparent, name ) ,d(new KexiConnSelectorWidgetPrivate()) { d->conn_set = &conn_set; d->startDirOrVariable = startDirOrVariable; - QString none, iconname = KMimeType::mimeType( KexiDB::Driver::defaultFileBasedDriverMimeType() )->icon(none,0); - const QPixmap &icon = KGlobal::iconLoader()->loadIcon( iconname, KIcon::Desktop ); + TQString none, iconname = KMimeType::mimeType( KexiDB::Driver::defaultFileBasedDriverMimeType() )->icon(none,0); + const TQPixmap &icon = KGlobal::iconLoader()->loadIcon( iconname, KIcon::Desktop ); setIcon( icon ); - QVBoxLayout* globalLyr = new QVBoxLayout( this ); + TQVBoxLayout* globalLyr = new TQVBoxLayout( this ); //create header with radio buttons - d->openExistingWidget = new QWidget(this, "openExistingWidget"); - QVBoxLayout* openExistingWidgetLyr = new QVBoxLayout( d->openExistingWidget ); -// QLabel* lbl = new QLabel(i18n("<b>Select existing Kexi project to open:</b>"), openExistingWidget); + d->openExistingWidget = new TQWidget(this, "openExistingWidget"); + TQVBoxLayout* openExistingWidgetLyr = new TQVBoxLayout( d->openExistingWidget ); +// TQLabel* lbl = new TQLabel(i18n("<b>Select existing Kexi project to open:</b>"), openExistingWidget); // openExistingWidgetLyr->addWidget( lbl ); d->prjTypeSelector = new KexiPrjTypeSelector( d->openExistingWidget ); - connect(d->prjTypeSelector->buttonGroup,SIGNAL(clicked(int)),this,SLOT(slotPrjTypeSelected(int))); + connect(d->prjTypeSelector->buttonGroup,TQT_SIGNAL(clicked(int)),this,TQT_SLOT(slotPrjTypeSelected(int))); openExistingWidgetLyr->addWidget( d->prjTypeSelector ); openExistingWidgetLyr->addSpacing( KDialogBase::spacingHint() ); - QFrame* line = new QFrame( d->openExistingWidget, "line" ); - line->setFrameShape( QFrame::HLine ); - line->setFrameShadow( QFrame::Sunken ); + TQFrame* line = new TQFrame( d->openExistingWidget, "line" ); + line->setFrameShape( TQFrame::HLine ); + line->setFrameShadow( TQFrame::Sunken ); openExistingWidgetLyr->addWidget( line ); globalLyr->addWidget(d->openExistingWidget); - d->stack = new QWidgetStack(this, "stack"); + d->stack = new TQWidgetStack(this, "stack"); globalLyr->addWidget(d->stack); // m_file = new KexiOpenExistingFile( this, "KexiOpenExistingFile"); @@ -136,28 +136,28 @@ KexiConnSelectorWidget::KexiConnSelectorWidget( KexiDBConnectionSet& conn_set, m_fileDlg = 0; // addWidget(m_file); -// connect(m_file->btn_advanced,SIGNAL(clicked()),this,SLOT(showAdvancedConn())); +// connect(m_file->btn_advanced,TQT_SIGNAL(clicked()),this,TQT_SLOT(showAdvancedConn())); m_remote = new KexiConnSelectorBase(d->stack, "conn_sel"); m_remote->icon->setPixmap( DesktopIcon("network") ); m_remote->icon->setFixedSize( m_remote->icon->pixmap()->size() ); // m_remote->btn_back->setIconSet( SmallIconSet("1uparrow") ); - connect(m_remote->btn_add, SIGNAL(clicked()), this, SLOT(slotRemoteAddBtnClicked())); - connect(m_remote->btn_edit, SIGNAL(clicked()), this, SLOT(slotRemoteEditBtnClicked())); - connect(m_remote->btn_remove, SIGNAL(clicked()), this, SLOT(slotRemoteRemoveBtnClicked())); - QToolTip::add(m_remote->btn_add, i18n("Add a new database connection")); - QToolTip::add(m_remote->btn_edit, i18n("Edit selected database connection")); - QToolTip::add(m_remote->btn_remove, i18n("Remove selected database connections")); + connect(m_remote->btn_add, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotRemoteAddBtnClicked())); + connect(m_remote->btn_edit, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotRemoteEditBtnClicked())); + connect(m_remote->btn_remove, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotRemoteRemoveBtnClicked())); + TQToolTip::add(m_remote->btn_add, i18n("Add a new database connection")); + TQToolTip::add(m_remote->btn_edit, i18n("Edit selected database connection")); + TQToolTip::add(m_remote->btn_remove, i18n("Remove selected database connections")); d->stack->addWidget(m_remote); - if (m_remote->layout()) - m_remote->layout()->setMargin(0); -// connect(m_remote->btn_back,SIGNAL(clicked()),this,SLOT(showSimpleConn())); - connect(m_remote->list,SIGNAL(doubleClicked(QListViewItem*)), - this,SLOT(slotConnectionItemExecuted(QListViewItem*))); - connect(m_remote->list,SIGNAL(returnPressed(QListViewItem*)), - this,SLOT(slotConnectionItemExecuted(QListViewItem*))); - connect(m_remote->list,SIGNAL(selectionChanged()), - this,SLOT(slotConnectionSelectionChanged())); + if (m_remote->tqlayout()) + m_remote->tqlayout()->setMargin(0); +// connect(m_remote->btn_back,TQT_SIGNAL(clicked()),this,TQT_SLOT(showSimpleConn())); + connect(m_remote->list,TQT_SIGNAL(doubleClicked(TQListViewItem*)), + this,TQT_SLOT(slotConnectionItemExecuted(TQListViewItem*))); + connect(m_remote->list,TQT_SIGNAL(returnPressed(TQListViewItem*)), + this,TQT_SLOT(slotConnectionItemExecuted(TQListViewItem*))); + connect(m_remote->list,TQT_SIGNAL(selectionChanged()), + this,TQT_SLOT(slotConnectionSelectionChanged())); } KexiConnSelectorWidget::~KexiConnSelectorWidget() @@ -167,7 +167,7 @@ KexiConnSelectorWidget::~KexiConnSelectorWidget() /*void KexiConnSelectorWidget::disconnectShowSimpleConnButton() { - m_remote->btn_back->disconnect(this,SLOT(showSimpleConn())); + m_remote->btn_back->disconnect(this,TQT_SLOT(showSimpleConn())); }*/ void KexiConnSelectorWidget::showAdvancedConn() @@ -197,8 +197,8 @@ void KexiConnSelectorWidget::slotPrjTypeSelected(int id) if (m_remote->list->firstChild()) { m_remote->list->setSelected(m_remote->list->firstChild(),true); } - m_remote->descriptionEdit->setPaletteBackgroundColor(palette().active().background()); - m_remote->descGroupBox->layout()->setMargin(2); + m_remote->descriptionEdit->setPaletteBackgroundColor(tqpalette().active().background()); + m_remote->descGroupBox->tqlayout()->setMargin(2); m_remote->list->setFocus(); slotConnectionSelectionChanged(); } @@ -222,15 +222,15 @@ void KexiConnSelectorWidget::showSimpleConn() m_fileDlg = new KexiStartupFileDialog( d->startDirOrVariable, KexiStartupFileDialog::Opening, d->stack, "openExistingFileDlg"); m_fileDlg->setConfirmOverwrites( d->confirmOverwrites ); -// static_cast<QVBoxLayout*>(m_file->layout())->insertWidget( 2, m_fileDlg ); +// static_cast<TQVBoxLayout*>(m_file->tqlayout())->insertWidget( 2, m_fileDlg ); d->stack->addWidget(m_fileDlg); - for (QWidget *w = parentWidget(true);w;w=w->parentWidget(true)) { + for (TQWidget *w = tqparentWidget(true);w;w=w->tqparentWidget(true)) { if (w->isDialog()) { -//#ifndef Q_WS_WIN - connect(m_fileDlg,SIGNAL(rejected()),static_cast<QDialog*>(w),SLOT(reject())); +//#ifndef TQ_WS_WIN + connect(m_fileDlg,TQT_SIGNAL(rejected()),static_cast<TQDialog*>(w),TQT_SLOT(reject())); //#endif -// connect(m_fileDlg,SIGNAL(cancelled()),static_cast<QDialog*>(w),SLOT(reject())); +// connect(m_fileDlg,TQT_SIGNAL(cancelled()),static_cast<TQDialog*>(w),TQT_SLOT(reject())); break; } } @@ -248,7 +248,7 @@ int KexiConnSelectorWidget::selectedConnectionType() const if (selectedConnectionType()!=KexiConnSelectorWidget::ServerBased) return 0; ConnectionDataLVItem *item = 0; // = static_cast<ConnectionDataLVItem*>(m_remote->list->selectedItem()); - for (QListViewItemIterator it(m_remote->list); it.current(); ++it) { + for (TQListViewItemIterator it(m_remote->list); it.current(); ++it) { if (it.current()->isSelected()) { if (item) return 0; //multiple @@ -266,21 +266,21 @@ KexiDB::ConnectionData* KexiConnSelectorWidget::selectedConnectionData() const return item->data(); } -QString KexiConnSelectorWidget::selectedFileName() +TQString KexiConnSelectorWidget::selectedFileName() { if (selectedConnectionType()!=KexiConnSelectorWidget::FileBased) - return QString::null; + return TQString(); return m_fileDlg->currentFileName(); } -void KexiConnSelectorWidget::setSelectedFileName(const QString& fileName) +void KexiConnSelectorWidget::setSelectedFileName(const TQString& fileName) { if (selectedConnectionType()!=KexiConnSelectorWidget::FileBased) return; return m_fileDlg->setSelection(fileName); } -void KexiConnSelectorWidget::slotConnectionItemExecuted(QListViewItem *item) +void KexiConnSelectorWidget::slotConnectionItemExecuted(TQListViewItem *item) { emit connectionItemExecuted(static_cast<ConnectionDataLVItem*>(item)); } @@ -291,7 +291,7 @@ void KexiConnSelectorWidget::slotConnectionSelectionChanged() //update buttons availability /* ConnectionDataLVItem *singleItem = 0; bool multi = false; - for (QListViewItemIterator it(m_remote->list); it.current(); ++it) { + for (TQListViewItemIterator it(m_remote->list); it.current(); ++it) { if (it.current()->isSelected()) { if (singleItem) { singleItem = 0; @@ -304,18 +304,18 @@ void KexiConnSelectorWidget::slotConnectionSelectionChanged() }*/ m_remote->btn_edit->setEnabled(item); m_remote->btn_remove->setEnabled(item); - m_remote->descriptionEdit->setText(item ? item->data()->description : QString::null); + m_remote->descriptionEdit->setText(item ? item->data()->description : TQString()); emit connectionItemHighlighted(item); } -QListView* KexiConnSelectorWidget::connectionsList() const +TQListView* KexiConnSelectorWidget::connectionsList() const { return m_remote->list; } void KexiConnSelectorWidget::setFocus() { - QWidget::setFocus(); + TQWidget::setFocus(); if (d->stack->visibleWidget()==m_fileDlg) m_fileDlg->setFocus(); //m_fileDlg->locationWidget()->setFocus(); else @@ -348,20 +348,20 @@ bool KexiConnSelectorWidget::confirmOverwrites() const return d->confirmOverwrites; } -/*static QString msgUnfinished() { +/*static TQString msgUnfinished() { return i18n("To define or change a connection, use command line options or click on .kexis file. " - "You can find example .kexis file at <a href=\"%1\">here</a>.").arg("") //temporary, please do not change for 0.8! + "You can find example .kexis file at <a href=\"%1\">here</a>.").tqarg("") //temporary, please do not change for 0.8! + "\nhttp://www.kexi-project.org/resources/testdb.kexis"; */ -// .arg("http://websvn.kde.org/*checkout*/branches/kexi/0.9/koffice/kexi/tests/startup/testdb.kexis"); +// .tqarg("http://websvn.kde.org/*checkout*/branches/kexi/0.9/koffice/kexi/tests/startup/testdb.kexis"); //} void KexiConnSelectorWidget::slotRemoteAddBtnClicked() { KexiDB::ConnectionData data; - KexiDBConnectionDialog dlg(data, QString::null, + KexiDBConnectionDialog dlg(data, TQString(), KGuiItem(i18n("&Add"), "button_ok", i18n("Add database connection")) ); dlg.setCaption(i18n("Add New Database Connection")); - if (QDialog::Accepted!=dlg.exec()) + if (TQDialog::Accepted!=dlg.exec()) return; //store this conn. data @@ -383,10 +383,10 @@ void KexiConnSelectorWidget::slotRemoteEditBtnClicked() ConnectionDataLVItem* item = static_cast<ConnectionDataLVItem*>(m_remote->list->selectedItem()); if (!item) return; - KexiDBConnectionDialog dlg(*item->data(), QString::null, + KexiDBConnectionDialog dlg(*item->data(), TQString(), KGuiItem(i18n("&Save"), "filesave", i18n("Save changes made to this database connection")) ); dlg.setCaption(i18n("Edit Database Connection")); - if (QDialog::Accepted!=dlg.exec()) + if (TQDialog::Accepted!=dlg.exec()) return; KexiDB::ConnectionData *newData = new KexiDB::ConnectionData( *dlg.currentProjectData().connectionData() ); @@ -407,11 +407,11 @@ void KexiConnSelectorWidget::slotRemoteRemoveBtnClicked() return; if (KMessageBox::Continue!=KMessageBox::warningContinueCancel(0, i18n("Do you want to remove database connection \"%1\" from the list of available connections?") - .arg(item->data()->serverInfoString(true)), QString::null, KStdGuiItem::del(), QString::null, + .tqarg(item->data()->serverInfoString(true)), TQString(), KStdGuiItem::del(), TQString(), KMessageBox::Notify|KMessageBox::Dangerous)) return; - QListViewItem* nextItem = item->itemBelow(); + TQListViewItem* nextItem = item->itemBelow(); if (!nextItem) nextItem = item->itemAbove(); if (!d->conn_set->removeConnectionData(item->data())) @@ -426,7 +426,7 @@ void KexiConnSelectorWidget::slotRemoteRemoveBtnClicked() void KexiConnSelectorWidget::hideConnectonIcon() { m_remote->icon->setFixedWidth(0); - m_remote->icon->setPixmap(QPixmap()); + m_remote->icon->setPixmap(TQPixmap()); } #include "KexiConnSelector.moc" diff --git a/kexi/main/startup/KexiConnSelector.h b/kexi/main/startup/KexiConnSelector.h index a52dd8ae3..2f4a9fe96 100644 --- a/kexi/main/startup/KexiConnSelector.h +++ b/kexi/main/startup/KexiConnSelector.h @@ -27,16 +27,16 @@ #include <kdialogbase.h> #include <klistview.h> -#include <qguardedptr.h> +#include <tqguardedptr.h> class KexiConnSelectorBase; //! helper class -class ConnectionDataLVItem : public QListViewItem +class ConnectionDataLVItem : public TQListViewItem { public: ConnectionDataLVItem(KexiDB::ConnectionData *data, - const KexiDB::Driver::Info& info, QListView *list); + const KexiDB::Driver::Info& info, TQListView *list); ~ConnectionDataLVItem(); void update(const KexiDB::Driver::Info& info); @@ -52,9 +52,10 @@ class KexiConnSelectorWidgetPrivate; /*! Widget that allows to select a database connection (without choosing database itself) */ -class KEXIMAIN_EXPORT KexiConnSelectorWidget : public QWidget +class KEXIMAIN_EXPORT KexiConnSelectorWidget : public TQWidget { Q_OBJECT + TQ_OBJECT public: enum ConnType { FileBased=1, ServerBased=2 }; @@ -65,8 +66,8 @@ class KEXIMAIN_EXPORT KexiConnSelectorWidget : public QWidget (it can also contain a configuration variable name with ":" prefix as described in KRecentDirs documentation). */ KexiConnSelectorWidget( KexiDBConnectionSet& conn_set, - const QString& startDirOrVariable, - QWidget* parent = 0, const char* name = 0 ); + const TQString& startDirOrVariable, + TQWidget* tqparent = 0, const char* name = 0 ); virtual ~KexiConnSelectorWidget(); @@ -86,16 +87,16 @@ class KEXIMAIN_EXPORT KexiConnSelectorWidget : public QWidget has been selected. @see selectedConnectionType() */ - QString selectedFileName(); + TQString selectedFileName(); /*! Sets selected filename to \a fileName. Only works when selectedConnectionType()==FileBased. */ - void setSelectedFileName(const QString& fileName); + void setSelectedFileName(const TQString& fileName); // //! Usable when we want to do other things for "back" button // void disconnectShowSimpleConnButton(); - QListView* connectionsList() const; + TQListView* connectionsList() const; KexiConnSelectorBase *m_remote; // KexiOpenExistingFile *m_file; @@ -125,7 +126,7 @@ class KEXIMAIN_EXPORT KexiConnSelectorWidget : public QWidget void hideConnectonIcon(); protected slots: - void slotConnectionItemExecuted(QListViewItem *item); + void slotConnectionItemExecuted(TQListViewItem *item); void slotRemoteAddBtnClicked(); void slotRemoteEditBtnClicked(); void slotRemoteRemoveBtnClicked(); diff --git a/kexi/main/startup/KexiConnSelectorBase.ui b/kexi/main/startup/KexiConnSelectorBase.ui index dde800f37..908404c06 100644 --- a/kexi/main/startup/KexiConnSelectorBase.ui +++ b/kexi/main/startup/KexiConnSelectorBase.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>KexiConnSelectorBase</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>KexiConnSelectorBase</cstring> </property> @@ -27,7 +27,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QListView" row="1" column="0" rowspan="1" colspan="6"> + <widget class="TQListView" row="1" column="0" rowspan="1" colspan="6"> <column> <property name="text"> <string>Name</string> @@ -72,7 +72,7 @@ <verstretch>1</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>0</width> <height>60</height> @@ -91,7 +91,7 @@ <enum>LastColumn</enum> </property> </widget> - <widget class="QPushButton" row="2" column="4"> + <widget class="TQPushButton" row="2" column="4"> <property name="name"> <cstring>btn_edit</cstring> </property> @@ -107,7 +107,7 @@ <string>&Edit...</string> </property> </widget> - <widget class="QPushButton" row="2" column="3"> + <widget class="TQPushButton" row="2" column="3"> <property name="name"> <cstring>btn_add</cstring> </property> @@ -123,7 +123,7 @@ <string>&Add...</string> </property> </widget> - <widget class="QPushButton" row="2" column="5"> + <widget class="TQPushButton" row="2" column="5"> <property name="name"> <cstring>btn_remove</cstring> </property> @@ -149,7 +149,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>16</width> <height>20</height> @@ -166,18 +166,18 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>41</height> </size> </property> </spacer> - <widget class="QGroupBox" row="2" column="0" rowspan="2" colspan="2"> + <widget class="TQGroupBox" row="2" column="0" rowspan="2" colspan="2"> <property name="name"> <cstring>descGroupBox</cstring> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32767</width> <height>80</height> @@ -193,7 +193,7 @@ <property name="margin"> <number>2</number> </property> - <widget class="QTextEdit"> + <widget class="TQTextEdit"> <property name="name"> <cstring>descriptionEdit</cstring> </property> @@ -205,7 +205,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32767</width> <height>50</height> @@ -229,7 +229,7 @@ </widget> </vbox> </widget> - <widget class="QLabel" row="0" column="1" rowspan="1" colspan="5"> + <widget class="TQLabel" row="0" column="1" rowspan="1" colspan="5"> <property name="name"> <cstring>label</cstring> </property> @@ -246,14 +246,14 @@ <p>You will see existing Kexi projects available for the selected connection. Here you may also add, edit or remove connections from the list. </string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignTop</set> </property> <property name="buddy" stdset="0"> <cstring>list</cstring> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>icon</cstring> </property> @@ -268,7 +268,7 @@ <property name="text"> <string></string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignTop</set> </property> </widget> @@ -281,5 +281,5 @@ <tabstop>btn_remove</tabstop> <tabstop>descriptionEdit</tabstop> </tabstops> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kexi/main/startup/KexiDBTitlePage.cpp b/kexi/main/startup/KexiDBTitlePage.cpp index 3b0487938..4d686039b 100644 --- a/kexi/main/startup/KexiDBTitlePage.cpp +++ b/kexi/main/startup/KexiDBTitlePage.cpp @@ -19,10 +19,10 @@ #include "KexiDBTitlePage.h" -#include <qlabel.h> +#include <tqlabel.h> -KexiDBTitlePage::KexiDBTitlePage( const QString& labelText, QWidget* parent, const char* name ) - : KexiDBTitlePageBase( parent, name ) +KexiDBTitlePage::KexiDBTitlePage( const TQString& labelText, TQWidget* tqparent, const char* name ) + : KexiDBTitlePageBase( tqparent, name ) { if (!labelText.isEmpty()) label->setText(labelText); diff --git a/kexi/main/startup/KexiDBTitlePage.h b/kexi/main/startup/KexiDBTitlePage.h index 983419462..15030c7bc 100644 --- a/kexi/main/startup/KexiDBTitlePage.h +++ b/kexi/main/startup/KexiDBTitlePage.h @@ -22,15 +22,16 @@ #include "KexiDBTitlePageBase.h" -//! @short A helper widget used to displaying a line edit with a label and layout +//! @short A helper widget used to displaying a line edit with a label and tqlayout class KEXIMAIN_EXPORT KexiDBTitlePage : public KexiDBTitlePageBase { Q_OBJECT + TQ_OBJECT public: //! Constructs title page. \a labelText can be provided to change default //! "Project caption:" label. - KexiDBTitlePage( const QString& labelText, QWidget* parent = 0, const char* name = 0 ); + KexiDBTitlePage( const TQString& labelText, TQWidget* tqparent = 0, const char* name = 0 ); ~KexiDBTitlePage(); protected slots: diff --git a/kexi/main/startup/KexiDBTitlePageBase.ui b/kexi/main/startup/KexiDBTitlePageBase.ui index 991bc73f4..1770a6dd5 100644 --- a/kexi/main/startup/KexiDBTitlePageBase.ui +++ b/kexi/main/startup/KexiDBTitlePageBase.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>KexiDBTitlePageBase</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>KexiDBTitlePageBase</cstring> </property> @@ -19,7 +19,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>label</cstring> </property> @@ -40,7 +40,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>111</height> @@ -57,7 +57,7 @@ <property name="sizeType"> <enum>Minimum</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>40</width> <height>20</height> @@ -76,7 +76,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>100</width> <height>0</height> @@ -87,7 +87,7 @@ </widget> <customwidgets> </customwidgets> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klineedit.h</includehint> </includehints> diff --git a/kexi/main/startup/KexiNewPrjTypeSelector.ui b/kexi/main/startup/KexiNewPrjTypeSelector.ui index 30adfb063..162263079 100644 --- a/kexi/main/startup/KexiNewPrjTypeSelector.ui +++ b/kexi/main/startup/KexiNewPrjTypeSelector.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>KexiNewPrjTypeSelector</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>KexiNewPrjTypeSelector</cstring> </property> @@ -29,7 +29,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>16</height> @@ -58,7 +58,7 @@ <enum>LastColumn</enum> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>lbl</cstring> </property> @@ -74,7 +74,7 @@ <string>Kexi will create a new database project. Select a storage method which will be used to store the new project. </string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignTop</set> </property> </widget> @@ -87,7 +87,7 @@ <functions> <function access="private" specifier="non virtual">init()</function> </functions> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klistview.h</includehint> </includehints> diff --git a/kexi/main/startup/KexiNewProjectWizard.cpp b/kexi/main/startup/KexiNewProjectWizard.cpp index 15102864e..9e897e8fb 100644 --- a/kexi/main/startup/KexiNewProjectWizard.cpp +++ b/kexi/main/startup/KexiNewProjectWizard.cpp @@ -43,12 +43,12 @@ #include <kmessagebox.h> #include <klineedit.h> -#include <qobjectlist.h> -#include <qlabel.h> -#include <qpushbutton.h> -#include <qlayout.h> -#include <qcheckbox.h> -#include <qheader.h> +#include <tqobjectlist.h> +#include <tqlabel.h> +#include <tqpushbutton.h> +#include <tqlayout.h> +#include <tqcheckbox.h> +#include <tqheader.h> //! @internal class KexiNewProjectWizardPrivate @@ -69,12 +69,12 @@ class KexiNewProjectWizardPrivate } // KListView *lv_types; KListViewItem *lvi_file, *lvi_server; - QString chk_file_txt, chk_server_txt; //!< helper + TQString chk_file_txt, chk_server_txt; //!< helper - QString server_db_name_dblist_lbl_txt; //!< helper + TQString server_db_name_dblist_lbl_txt; //!< helper //for displaying db list of the selected conn. - QGuardedPtr<KexiDB::ConnectionData> conndata_to_show; + TQGuardedPtr<KexiDB::ConnectionData> conndata_to_show; KexiProjectSet *project_set_to_show; KexiGUIMessageHandler* msgHandler; @@ -84,8 +84,8 @@ class KexiNewProjectWizardPrivate }; KexiNewProjectWizard::KexiNewProjectWizard(KexiDBConnectionSet& conn_set, - QWidget *parent, const char *name, bool modal, WFlags f) -: KWizard(parent, name, modal, f) + TQWidget *tqparent, const char *name, bool modal, WFlags f) +: KWizard(tqparent, name, modal, f) , d(new KexiNewProjectWizardPrivate() ) { d->msgHandler = new KexiGUIMessageHandler(this); @@ -96,15 +96,15 @@ KexiNewProjectWizard::KexiNewProjectWizard(KexiDBConnectionSet& conn_set, //page: type selector m_prjtype_sel = new KexiNewPrjTypeSelector(this, "KexiNewPrjTypeSelector"); // lv_types = new KListView(m_prjtype_sel, "types listview"); -// m_prjtype_sel->lv_types->setSizePolicy(QSizePolicy(QSizePolicy::Preferred, QSizePolicy::Minimum, 0, 2)); +// m_prjtype_sel->lv_types->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Minimum, 0, 2)); #if KDE_IS_VERSION(3,3,9) m_prjtype_sel->lv_types->setShadeSortColumn(false); #endif m_prjtype_sel->lv_types->header()->hide(); m_prjtype_sel->lv_types->setSorting(-1); - m_prjtype_sel->lv_types->setAlternateBackground(QColor()); //disable altering + m_prjtype_sel->lv_types->setAlternateBackground(TQColor()); //disable altering m_prjtype_sel->lv_types->setItemMargin( KDialogBase::marginHint() ); - QString none; + TQString none; d->lvi_file = new KListViewItem( m_prjtype_sel->lv_types, i18n("New Project Stored in File") ); d->lvi_file->setPixmap(0, KGlobal::iconLoader()->loadIcon( KMimeType::mimeType( @@ -118,31 +118,31 @@ KexiNewProjectWizard::KexiNewProjectWizard(KexiDBConnectionSet& conn_set, d->lvi_server->setMultiLinesEnabled( true ); // m_prjtype_sel->lv_types->resize(d->m_prjtype_sel->lv_types->width(), d->lvi_file->height()*3); m_prjtype_sel->lv_types->setFocus(); -// QString txt_dns = i18n("Don't show me this question again."); +// TQString txt_dns = i18n("Don't show me this question again."); // d->chk_file_txt = m_prjtype_sel->chk_always->text() +"\n"+txt_dns; // d->chk_server_txt = i18n("Always &use database server for creating new projects.") // +"\n"+txt_dns; - connect(m_prjtype_sel->lv_types,SIGNAL(executed(QListViewItem*)),this,SLOT(slotLvTypesExecuted(QListViewItem*))); - connect(m_prjtype_sel->lv_types,SIGNAL(returnPressed(QListViewItem*)),this,SLOT(slotLvTypesExecuted(QListViewItem*))); - connect(m_prjtype_sel->lv_types,SIGNAL(selectionChanged( QListViewItem*)),this,SLOT(slotLvTypesSelected(QListViewItem*))); + connect(m_prjtype_sel->lv_types,TQT_SIGNAL(executed(TQListViewItem*)),this,TQT_SLOT(slotLvTypesExecuted(TQListViewItem*))); + connect(m_prjtype_sel->lv_types,TQT_SIGNAL(returnPressed(TQListViewItem*)),this,TQT_SLOT(slotLvTypesExecuted(TQListViewItem*))); + connect(m_prjtype_sel->lv_types,TQT_SIGNAL(selectionChanged( TQListViewItem*)),this,TQT_SLOT(slotLvTypesSelected(TQListViewItem*))); -// static_cast<QVBoxLayout*>(m_prjtype_sel->layout())->insertWidget(1,d->m_prjtype_sel->lv_types); -// static_cast<QVBoxLayout*>(m_prjtype_sel->layout())->insertStretch(3,1); +// static_cast<TQVBoxLayout*>(m_prjtype_sel->tqlayout())->insertWidget(1,d->m_prjtype_sel->lv_types); +// static_cast<TQVBoxLayout*>(m_prjtype_sel->tqlayout())->insertStretch(3,1); // updateGeometry(); addPage(m_prjtype_sel, i18n("Select Storage Method")); -// d->m_prjtype_sel->lv_types->setMinimumHeight(QMAX(d->lvi_file->height(),d->lvi_server->height())+25); +// d->m_prjtype_sel->lv_types->setMinimumHeight(TQMAX(d->lvi_file->height(),d->lvi_server->height())+25); //page: db title - m_db_title = new KexiDBTitlePage(QString::null, this, "KexiDBTitlePage"); + m_db_title = new KexiDBTitlePage(TQString(), this, "KexiDBTitlePage"); addPage(m_db_title, i18n("Select Project's Caption")); //page: connection selector - m_conn_sel_widget = new QWidget(this); - QVBoxLayout* conn_sel_lyr = new QVBoxLayout(m_conn_sel_widget); - QLabel *conn_sel_label = new QLabel(i18n("Enter a new Kexi project's file name:"), m_conn_sel_widget); - conn_sel_label->setAlignment(Qt::AlignAuto|Qt::AlignTop|Qt::WordBreak); + m_conn_sel_widget = new TQWidget(this); + TQVBoxLayout* conn_sel_lyr = new TQVBoxLayout(m_conn_sel_widget); + TQLabel *conn_sel_label = new TQLabel(i18n("Enter a new Kexi project's file name:"), m_conn_sel_widget); + conn_sel_label->tqsetAlignment(TQt::AlignAuto|TQt::AlignTop|TQt::WordBreak); conn_sel_lyr->addWidget( conn_sel_label ); conn_sel_lyr->addSpacing(KDialogBase::spacingHint()); @@ -167,32 +167,32 @@ KexiNewProjectWizard::KexiNewProjectWizard(KexiDBConnectionSet& conn_set, m_conn_sel->m_fileDlg->setMode( KexiStartupFileDialog::SavingFileBasedDB ); // m_conn_sel->m_fileDlg->setMode( KFile::LocalOnly | KFile::File ); // m_conn_sel->m_fileDlg->setOperationMode( KFileDialog::Saving ); -////js connect(m_conn_sel->m_fileDlg,SIGNAL(rejected()),this,SLOT(reject())); -// connect(m_conn_sel->m_fileDlg,SIGNAL(fileHighlighted(const QString&)),this,SLOT(slotFileHighlighted(const QString&))); - connect(m_conn_sel->m_fileDlg,SIGNAL(accepted()),this,SLOT(accept())); +////js connect(m_conn_sel->m_fileDlg,TQT_SIGNAL(rejected()),this,TQT_SLOT(reject())); +// connect(m_conn_sel->m_fileDlg,TQT_SIGNAL(fileHighlighted(const TQString&)),this,TQT_SLOT(slotFileHighlighted(const TQString&))); + connect(m_conn_sel->m_fileDlg,TQT_SIGNAL(accepted()),this,TQT_SLOT(accept())); m_conn_sel->showAdvancedConn(); - connect(m_conn_sel,SIGNAL(connectionItemExecuted(ConnectionDataLVItem*)), - this,SLOT(next())); + connect(m_conn_sel,TQT_SIGNAL(connectionItemExecuted(ConnectionDataLVItem*)), + this,TQT_SLOT(next())); addPage(m_conn_sel_widget, i18n("Select Project's Location")); //page: server db name m_server_db_name = new KexiServerDBNamePage(this, "KexiServerDBNamePage"); d->server_db_name_dblist_lbl_txt = i18n("Existing project databases on <b>%1</b> database server:"); - connect(m_server_db_name->le_caption, SIGNAL(textChanged(const QString&)), - this,SLOT(slotServerDBCaptionTxtChanged(const QString&))); - connect(m_server_db_name->le_dbname, SIGNAL(textChanged(const QString&)), - this,SLOT(slotServerDBNameTxtChanged(const QString&))); - connect(m_server_db_name->le_caption, SIGNAL(returnPressed()), - this,SLOT(accept())); - connect(m_server_db_name->le_dbname, SIGNAL(returnPressed()), - this,SLOT(accept())); + connect(m_server_db_name->le_caption, TQT_SIGNAL(textChanged(const TQString&)), + this,TQT_SLOT(slotServerDBCaptionTxtChanged(const TQString&))); + connect(m_server_db_name->le_dbname, TQT_SIGNAL(textChanged(const TQString&)), + this,TQT_SLOT(slotServerDBNameTxtChanged(const TQString&))); + connect(m_server_db_name->le_caption, TQT_SIGNAL(returnPressed()), + this,TQT_SLOT(accept())); + connect(m_server_db_name->le_dbname, TQT_SIGNAL(returnPressed()), + this,TQT_SLOT(accept())); m_server_db_name->le_caption->setText(i18n("New database")); - m_server_db_name->le_dbname->setValidator(new KexiUtils::IdentifierValidator(this, "id_val")); + m_server_db_name->le_dbname->setValidator(new KexiUtils::IdentifierValidator(TQT_TQOBJECT(this), "id_val")); m_project_selector = new KexiProjectSelectorWidget( m_server_db_name->frm_dblist, "KexiProjectSelectorWidget", 0, false, false ); GLUE_WIDGET(m_project_selector, m_server_db_name->frm_dblist); - m_project_selector->setFocusPolicy(NoFocus); + m_project_selector->setFocusPolicy(TQ_NoFocus); m_project_selector->setSelectable(false); addPage(m_server_db_name, i18n("Select Project's Caption & Database Name")); @@ -217,12 +217,12 @@ void KexiNewProjectWizard::show() KWizard::show(); } -void KexiNewProjectWizard::slotLvTypesExecuted(QListViewItem *) +void KexiNewProjectWizard::slotLvTypesExecuted(TQListViewItem *) { next(); } -void KexiNewProjectWizard::slotLvTypesSelected(QListViewItem *item) +void KexiNewProjectWizard::slotLvTypesSelected(TQListViewItem *item) { /* if (item==d->lvi_file) { m_prjtype_sel->chk_always->setText(d->chk_file_txt); @@ -234,7 +234,7 @@ void KexiNewProjectWizard::slotLvTypesSelected(QListViewItem *item) setAppropriate( m_server_db_name, item==d->lvi_server ); } -void KexiNewProjectWizard::showPage(QWidget *page) +void KexiNewProjectWizard::showPage(TQWidget *page) { if (page==m_prjtype_sel) {//p 1 m_prjtype_sel->lv_types->setFocus(); @@ -247,7 +247,7 @@ void KexiNewProjectWizard::showPage(QWidget *page) } else if (page==m_conn_sel_widget) {//p 3 if (m_prjtype_sel->lv_types->currentItem()==d->lvi_file) { m_conn_sel->showSimpleConn(); - QString fn = KexiUtils::string2FileName( m_db_title->le_caption->text() ); + TQString fn = KexiUtils::string2FileName( m_db_title->le_caption->text() ); if (!fn.endsWith(".kexi")) fn += ".kexi"; m_conn_sel->m_fileDlg->setLocationText(fn); @@ -301,7 +301,7 @@ void KexiNewProjectWizard::next() return; } m_project_selector->label->setText( - d->server_db_name_dblist_lbl_txt.arg(m_conn_sel->selectedConnectionData()->serverInfoString(false)) ); + d->server_db_name_dblist_lbl_txt.tqarg(m_conn_sel->selectedConnectionData()->serverInfoString(false)) ); m_server_db_name->le_caption->setFocus(); } @@ -313,9 +313,9 @@ void KexiNewProjectWizard::accept() { if (m_prjtype_sel->lv_types->currentItem()==d->lvi_file) {//FILE: //check if new db file name is ok - kdDebug() << "********** sender() " << sender()->className() << endl; + kdDebug() << "********** TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender())) " << TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->className() << endl; if (sender()==finishButton()) { /*(only if signal does not come from filedialog)*/ - kdDebug() << "********** sender()==finishButton() ********" << endl; + kdDebug() << "********** TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))==finishButton() ********" << endl; // if (!m_conn_sel->m_fileDlg->checkURL()) { if (!m_conn_sel->m_fileDlg->checkFileName()) { return; @@ -329,7 +329,7 @@ void KexiNewProjectWizard::accept() m_server_db_name->le_caption->setFocus(); return; } - QString dbname = m_server_db_name->le_dbname->text().stripWhiteSpace(); + TQString dbname = m_server_db_name->le_dbname->text().stripWhiteSpace(); if (dbname.isEmpty()) { KMessageBox::information(this, i18n("Enter project's database name.")); m_server_db_name->le_dbname->setText(""); @@ -342,8 +342,8 @@ void KexiNewProjectWizard::accept() if (KMessageBox::Continue!=KMessageBox::warningContinueCancel( this, "<qt>" +i18n("<b>A project with database name \"%1\" already exists</b>" "<p>Do you want to delete it and create a new one?") - .arg( m_server_db_name->le_dbname->text() ), QString::null, KStdGuiItem::del(), - QString::null, KMessageBox::Notify|KMessageBox::Dangerous )) + .tqarg( m_server_db_name->le_dbname->text() ), TQString(), KStdGuiItem::del(), + TQString(), KMessageBox::Notify|KMessageBox::Dangerous )) { m_server_db_name->le_dbname->setFocus(); return; @@ -369,14 +369,14 @@ void KexiNewProjectWizard::done(int r) KWizard::done(r); } -QString KexiNewProjectWizard::projectDBName() const +TQString KexiNewProjectWizard::projectDBName() const { if (m_prjtype_sel->lv_types->currentItem()==d->lvi_server) return m_server_db_name->le_dbname->text(); return m_conn_sel->selectedFileName(); } -QString KexiNewProjectWizard::projectCaption() const +TQString KexiNewProjectWizard::projectCaption() const { if (m_prjtype_sel->lv_types->currentItem()==d->lvi_server) { return m_server_db_name->le_caption->text(); @@ -391,19 +391,19 @@ KexiDB::ConnectionData* KexiNewProjectWizard::projectConnectionData() const return m_conn_sel->selectedConnectionData(); } -void KexiNewProjectWizard::slotServerDBCaptionTxtChanged(const QString &capt) +void KexiNewProjectWizard::slotServerDBCaptionTxtChanged(const TQString &capt) { if (m_server_db_name->le_dbname->text().isEmpty()) d->le_dbname_autofill=true; if (d->le_dbname_autofill) { d->le_dbname_txtchanged_disable = true; - QString captionAsId = KexiUtils::string2Identifier(capt); + TQString captionAsId = KexiUtils::string2Identifier(capt); m_server_db_name->le_dbname->setText(captionAsId); d->le_dbname_txtchanged_disable = false; } } -void KexiNewProjectWizard::slotServerDBNameTxtChanged(const QString &) +void KexiNewProjectWizard::slotServerDBNameTxtChanged(const TQString &) { if (d->le_dbname_txtchanged_disable) return; diff --git a/kexi/main/startup/KexiNewProjectWizard.h b/kexi/main/startup/KexiNewProjectWizard.h index 9f9eaa626..18dab2570 100644 --- a/kexi/main/startup/KexiNewProjectWizard.h +++ b/kexi/main/startup/KexiNewProjectWizard.h @@ -25,7 +25,7 @@ #include <kwizard.h> -class QListViewItem; +class TQListViewItem; class KexiNewPrjTypeSelector; class KexiConnSelectorWidget; @@ -37,17 +37,18 @@ class KexiProjectSelectorWidget; class KEXIMAIN_EXPORT KexiNewProjectWizard : public KWizard { Q_OBJECT + TQ_OBJECT public: - KexiNewProjectWizard(KexiDBConnectionSet& conn_set, QWidget *parent=0, + KexiNewProjectWizard(KexiDBConnectionSet& conn_set, TQWidget *tqparent=0, const char *name=0, bool modal=false, WFlags f=0); ~KexiNewProjectWizard(); /*! \return name for a new project's database if server-based project type was selected. Returns file name if file-based project was selected. */ - QString projectDBName() const; + TQString projectDBName() const; /*! \return name for a new project. Used for both file- and serever- based projects. */ - QString projectCaption() const; + TQString projectCaption() const; /*! \return data of selected connection for new project, if server-based project type was selected. @@ -63,17 +64,17 @@ class KEXIMAIN_EXPORT KexiNewProjectWizard : public KWizard void setConfirmOverwrites(bool set); protected slots: - void slotLvTypesSelected(QListViewItem *); - void slotLvTypesExecuted(QListViewItem *); - void slotServerDBCaptionTxtChanged(const QString &capt); - void slotServerDBNameTxtChanged(const QString &n); + void slotLvTypesSelected(TQListViewItem *); + void slotLvTypesExecuted(TQListViewItem *); + void slotServerDBCaptionTxtChanged(const TQString &capt); + void slotServerDBNameTxtChanged(const TQString &n); virtual void done(int r); virtual void next(); virtual void accept(); protected: - virtual void showPage(QWidget *page); + virtual void showPage(TQWidget *page); KexiNewPrjTypeSelector *m_prjtype_sel; KexiDBTitlePage *m_db_title; @@ -81,7 +82,7 @@ class KEXIMAIN_EXPORT KexiNewProjectWizard : public KWizard KexiProjectSelectorWidget* m_project_selector; KexiConnSelectorWidget *m_conn_sel; - QWidget *m_conn_sel_widget; + TQWidget *m_conn_sel_widget; KexiNewProjectWizardPrivate *d; }; diff --git a/kexi/main/startup/KexiOpenExistingFile.ui b/kexi/main/startup/KexiOpenExistingFile.ui index ae4c05a9d..101be957f 100644 --- a/kexi/main/startup/KexiOpenExistingFile.ui +++ b/kexi/main/startup/KexiOpenExistingFile.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.1" stdsetdef="1"> <class>KexiOpenExistingFile</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>KexiOpenExistingFile</cstring> </property> @@ -19,7 +19,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>lbl</cstring> </property> @@ -35,15 +35,15 @@ <string><b>Select existing Kexi project file to open:</b> </string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignTop</set> </property> </widget> - <widget class="QFrame"> + <widget class="TQFrame"> <property name="name"> <cstring>line</cstring> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32767</width> <height>8</height> @@ -56,32 +56,32 @@ <enum>Sunken</enum> </property> </widget> - <widget class="QFrame"> + <widget class="TQFrame"> <property name="name"> <cstring>spacer</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>0</width> <height>6</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32767</width> <height>6</height> </size> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout2</cstring> + <cstring>tqlayout2</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>btn_advanced</cstring> </property> @@ -97,7 +97,7 @@ <string>&Advanced </string> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>label</cstring> </property> @@ -112,7 +112,7 @@ <property name="text"> <string>Click "Advanced" button if you want to find an existing project on a server rather than a file.</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignTop</set> </property> </widget> @@ -123,5 +123,5 @@ <tabstops> <tabstop>btn_advanced</tabstop> </tabstops> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kexi/main/startup/KexiProjectSelector.cpp b/kexi/main/startup/KexiProjectSelector.cpp index c28ab6d5c..55aa930f6 100644 --- a/kexi/main/startup/KexiProjectSelector.cpp +++ b/kexi/main/startup/KexiProjectSelector.cpp @@ -29,10 +29,10 @@ #include <klocale.h> #include <kdebug.h> -#include <qlabel.h> -#include <qpushbutton.h> -#include <qlayout.h> -#include <qlistview.h> +#include <tqlabel.h> +#include <tqpushbutton.h> +#include <tqlayout.h> +#include <tqlistview.h> #include <assert.h> @@ -44,7 +44,7 @@ public: { selectable = true; } - QPixmap fileicon, dbicon; + TQPixmap fileicon, dbicon; bool showProjectNameColumn : 1; bool showConnectionColumns : 1; bool selectable : 1; @@ -53,12 +53,12 @@ public: /*================================================================*/ //! helper class -class ProjectDataLVItem : public QListViewItem +class ProjectDataLVItem : public TQListViewItem { public: ProjectDataLVItem(KexiProjectData *d, const KexiDB::Driver::Info& info, KexiProjectSelectorWidget *selector ) - : QListViewItem(selector->list) + : TQListViewItem(selector->list) , data(d) { int colnum = 0; @@ -69,14 +69,14 @@ public: setText(colnum++, data->databaseName()+" "); if (selector->d->showConnectionColumns) { - QString drvname = info.caption.isEmpty() ? cdata->driverName : info.caption; + TQString drvname = info.caption.isEmpty() ? cdata->driverName : info.caption; if (info.fileBased) { setText(colnum++, i18n("File") + " ("+drvname+") " ); } else { setText(colnum++, drvname+" " ); } - QString conn; + TQString conn; if (!cdata->caption.isEmpty()) conn = cdata->caption + ": "; conn += cdata->serverInfoString(); @@ -91,24 +91,24 @@ public: /*================================================================*/ /*! - * Constructs a KexiProjectSelector which is a child of 'parent', with the + * Constructs a KexiProjectSelector which is a child of 'tqparent', with the * name 'name' and widget flags set to 'f' */ KexiProjectSelectorWidget::KexiProjectSelectorWidget( - QWidget* parent, const char* name, + TQWidget* tqparent, const char* name, KexiProjectSet* prj_set, bool showProjectNameColumn, bool showConnectionColumns ) - : KexiProjectSelectorBase( parent, name ) + : KexiProjectSelectorBase( tqparent, name ) ,m_prj_set(prj_set) ,d(new KexiProjectSelectorWidgetPrivate()) { d->showProjectNameColumn = showProjectNameColumn; d->showConnectionColumns = showConnectionColumns; - QString none, iconname = KMimeType::mimeType( KexiDB::Driver::defaultFileBasedDriverMimeType() )->icon(none,0); + TQString none, iconname = KMimeType::mimeType( KexiDB::Driver::defaultFileBasedDriverMimeType() )->icon(none,0); d->fileicon = KGlobal::iconLoader()->loadIcon( iconname, KIcon::Desktop ); setIcon( d->fileicon ); d->dbicon = SmallIcon("database"); -// list->setHScrollBarMode( QScrollView::AlwaysOn ); +// list->setHScrollBarMode( TQScrollView::AlwaysOn ); if (!d->showConnectionColumns) { list->removeColumn(2); @@ -121,9 +121,9 @@ KexiProjectSelectorWidget::KexiProjectSelectorWidget( //show projects setProjectSet( m_prj_set ); - connect(list,SIGNAL(doubleClicked(QListViewItem*)),this,SLOT(slotItemExecuted(QListViewItem*))); - connect(list,SIGNAL(returnPressed(QListViewItem*)),this,SLOT(slotItemExecuted(QListViewItem*))); - connect(list,SIGNAL(selectionChanged()),this,SLOT(slotItemSelected())); + connect(list,TQT_SIGNAL(doubleClicked(TQListViewItem*)),this,TQT_SLOT(slotItemExecuted(TQListViewItem*))); + connect(list,TQT_SIGNAL(returnPressed(TQListViewItem*)),this,TQT_SLOT(slotItemExecuted(TQListViewItem*))); + connect(list,TQT_SIGNAL(selectionChanged()),this,TQT_SLOT(slotItemSelected())); } /*! @@ -142,7 +142,7 @@ KexiProjectData* KexiProjectSelectorWidget::selectedProjectData() const return 0; } -void KexiProjectSelectorWidget::slotItemExecuted(QListViewItem *item) +void KexiProjectSelectorWidget::slotItemExecuted(TQListViewItem *item) { if (!d->selectable) return; @@ -204,7 +204,7 @@ void KexiProjectSelectorWidget::setSelectable(bool set) return; d->selectable = set; //update items' state - QListViewItemIterator it( list ); + TQListViewItemIterator it( list ); while ( it.current() ) { it.current()->setSelectable( d->selectable ); } @@ -217,19 +217,19 @@ bool KexiProjectSelectorWidget::isSelectable() const /*================================================================*/ -KexiProjectSelectorDialog::KexiProjectSelectorDialog( QWidget *parent, const char *name, +KexiProjectSelectorDialog::KexiProjectSelectorDialog( TQWidget *tqparent, const char *name, KexiProjectSet* prj_set, bool showProjectNameColumn, bool showConnectionColumns) : KDialogBase( Plain, i18n("Open Recent Project"), #ifndef KEXI_NO_UNFINISHED //! @todo re-add Help when doc is available Help | #endif - Ok | Cancel, Ok, parent, name ) + Ok | Cancel, Ok, tqparent, name ) { init(prj_set, showProjectNameColumn, showConnectionColumns); } -KexiProjectSelectorDialog::KexiProjectSelectorDialog( QWidget *parent, const char *name, +KexiProjectSelectorDialog::KexiProjectSelectorDialog( TQWidget *tqparent, const char *name, KexiDB::ConnectionData* cdata, bool showProjectNameColumn, bool showConnectionColumns) : KDialogBase( @@ -238,7 +238,7 @@ KexiProjectSelectorDialog::KexiProjectSelectorDialog( QWidget *parent, const cha //! @todo re-add Help when doc is available Help | #endif - Ok | Cancel, Ok, parent, name, true/*modal*/, false/*sep*/ ) + Ok | Cancel, Ok, tqparent, name, true/*modal*/, false/*sep*/ ) { setButtonGuiItem(Ok, KGuiItem(i18n("&Open"), "fileopen", i18n("Open Database Connection"))); assert(cdata); @@ -248,7 +248,7 @@ KexiProjectSelectorDialog::KexiProjectSelectorDialog( QWidget *parent, const cha init(prj_set, showProjectNameColumn, showConnectionColumns); m_sel->label->setText( i18n("Select a project on <b>%1</b> database server to open:") - .arg(cdata->serverInfoString(false)) ); + .tqarg(cdata->serverInfoString(false)) ); } KexiProjectSelectorDialog::~KexiProjectSelectorDialog() @@ -260,17 +260,17 @@ void KexiProjectSelectorDialog::init(KexiProjectSet* prj_set, bool showProjectNa { setSizeGripEnabled(true); - QVBoxLayout *lyr = new QVBoxLayout(plainPage(), 0, KDialogBase::spacingHint(), "lyr"); + TQVBoxLayout *lyr = new TQVBoxLayout(plainPage(), 0, KDialogBase::spacingHint(), "lyr"); m_sel = new KexiProjectSelectorWidget(plainPage(), "sel", prj_set, showProjectNameColumn, showConnectionColumns); lyr->addWidget(m_sel); setIcon(*m_sel->icon()); m_sel->setFocus(); - connect(m_sel,SIGNAL(projectExecuted(KexiProjectData*)), - this,SLOT(slotProjectExecuted(KexiProjectData*))); - connect(m_sel,SIGNAL(selectionChanged(KexiProjectData*)), - this,SLOT(slotProjectSelectionChanged(KexiProjectData*))); + connect(m_sel,TQT_SIGNAL(projectExecuted(KexiProjectData*)), + this,TQT_SLOT(slotProjectExecuted(KexiProjectData*))); + connect(m_sel,TQT_SIGNAL(selectionChanged(KexiProjectData*)), + this,TQT_SLOT(slotProjectSelectionChanged(KexiProjectData*))); } KexiProjectData* KexiProjectSelectorDialog::selectedProjectData() const diff --git a/kexi/main/startup/KexiProjectSelector.h b/kexi/main/startup/KexiProjectSelector.h index 3151be3b2..91c137124 100644 --- a/kexi/main/startup/KexiProjectSelector.h +++ b/kexi/main/startup/KexiProjectSelector.h @@ -24,7 +24,7 @@ #include "kexiprojectset.h" #include <kdialogbase.h> -#include <qwidgetstack.h> +#include <tqwidgetstack.h> class KexiNewFileDBWidget; class KexiProjectSelectorWidgetPrivate; @@ -34,6 +34,7 @@ class KexiProjectSelectorWidgetPrivate; class KEXIMAIN_EXPORT KexiProjectSelectorWidget : public KexiProjectSelectorBase { Q_OBJECT + TQ_OBJECT public: // enum ConnType { FileBased=1, ServerBased=2 }; @@ -44,7 +45,7 @@ public: information about database driver and connection columns are added. \a prj_set may be NULL - you can assign a set later with setProjectSet(). */ - KexiProjectSelectorWidget( QWidget* parent = 0, const char* name = 0, + KexiProjectSelectorWidget( TQWidget* tqparent = 0, const char* name = 0, KexiProjectSet* prj_set = 0, bool showProjectNameColumn = true, bool showConnectionColumns = true ); @@ -77,7 +78,7 @@ signals: void selectionChanged(KexiProjectData*); protected slots: - void slotItemExecuted(QListViewItem*); + void slotItemExecuted(TQListViewItem*); void slotItemSelected(); virtual void languageChange() { KexiProjectSelectorBase::languageChange(); } @@ -93,11 +94,12 @@ protected: class KexiProjectSelectorDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: /*! Constructor 1, used for displaying recent projects list Label "there are recently opened projects" is displayed automatically */ - KexiProjectSelectorDialog( QWidget *parent, const char *name, + KexiProjectSelectorDialog( TQWidget *tqparent, const char *name, KexiProjectSet* prj_set, bool showProjectNameColumn = true, bool showConnectionColumns = true); @@ -105,7 +107,7 @@ public: Label "Select one of these existing projects on server" is displayed automatically You should test if project set was properly loaded using projectSet()->error(). */ - KexiProjectSelectorDialog( QWidget *parent, const char *name, + KexiProjectSelectorDialog( TQWidget *tqparent, const char *name, KexiDB::ConnectionData* cdata, bool showProjectNameColumn = true, bool showConnectionColumns = true); diff --git a/kexi/main/startup/KexiProjectSelectorBase.ui b/kexi/main/startup/KexiProjectSelectorBase.ui index 4d51751bd..aa36a55a1 100644 --- a/kexi/main/startup/KexiProjectSelectorBase.ui +++ b/kexi/main/startup/KexiProjectSelectorBase.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>KexiProjectSelectorBase</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>KexiProjectSelectorBase</cstring> </property> @@ -27,7 +27,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>label</cstring> </property> @@ -43,11 +43,11 @@ <string><b>There are Kexi projects you have recently opened.</b> Select one you wish to open: </string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignTop</set> </property> </widget> - <widget class="QListView"> + <widget class="TQListView"> <column> <property name="text"> <string>Project Name</string> @@ -103,7 +103,7 @@ <verstretch>1</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>0</width> <height>60</height> @@ -124,5 +124,5 @@ <tabstops> <tabstop>list</tabstop> </tabstops> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kexi/main/startup/KexiServerDBNamePage.ui b/kexi/main/startup/KexiServerDBNamePage.ui index 3ea61dc37..0d20fe3ec 100644 --- a/kexi/main/startup/KexiServerDBNamePage.ui +++ b/kexi/main/startup/KexiServerDBNamePage.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.1" stdsetdef="1"> <class>KexiServerDBNamePage</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>KexiServerDBNamePage</cstring> </property> @@ -16,7 +16,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -24,7 +24,7 @@ <string>Project caption: </string> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel1_2</cstring> </property> @@ -32,7 +32,7 @@ <string>Project's database name: </string> </property> </widget> - <widget class="QLineEdit" row="0" column="1"> + <widget class="TQLineEdit" row="0" column="1"> <property name="name"> <cstring>le_caption</cstring> </property> @@ -44,18 +44,18 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>100</width> <height>0</height> </size> </property> </widget> - <widget class="QLineEdit" row="1" column="1"> + <widget class="TQLineEdit" row="1" column="1"> <property name="name"> <cstring>le_dbname</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>100</width> <height>0</height> @@ -72,7 +72,7 @@ <property name="sizeType"> <enum>MinimumExpanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>70</width> <height>20</height> @@ -89,14 +89,14 @@ <property name="sizeType"> <enum>Preferred</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>70</width> <height>20</height> </size> </property> </spacer> - <widget class="QFrame" row="4" column="0" rowspan="1" colspan="3"> + <widget class="TQFrame" row="4" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>frm_dblist</cstring> </property> @@ -128,7 +128,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>12</height> @@ -137,5 +137,5 @@ </spacer> </grid> </widget> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kexi/main/startup/KexiStartup.cpp b/kexi/main/startup/KexiStartup.cpp index 19ae8d28a..54d977e4c 100644 --- a/kexi/main/startup/KexiStartup.cpp +++ b/kexi/main/startup/KexiStartup.cpp @@ -18,7 +18,7 @@ */ #include "KexiStartup.h" -#ifdef Q_WS_WIN +#ifdef TQ_WS_WIN # include "KexiStartup_p_win.h" #else # include "KexiStartup_p.h" @@ -52,9 +52,9 @@ #include <unistd.h> -#include <qcstring.h> -#include <qapplication.h> -#include <qlayout.h> +#include <tqcstring.h> +#include <tqapplication.h> +#include <tqlayout.h> namespace Kexi { static KStaticDeleter<KexiStartupHandler> Kexi_startupHandlerDeleter; @@ -92,13 +92,13 @@ class KexiStartupHandlerPrivate KexiDBShortcutFile *shortcutFile; KexiDBConnShortcutFile *connShortcutFile; KexiDBConnectionDialog *connDialog; - QString shortcutFileGroupKey; + TQString shortcutFileGroupKey; KexiStartupDialog *startupDialog; }; //--------------------------------- -static bool stripQuotes(const QString &item, QString &name) +static bool stripQuotes(const TQString &item, TQString &name) { if (item.left(1)=="\"" && item.right(1)=="\"") { name = item.mid(1, item.length()-2); @@ -111,7 +111,7 @@ static bool stripQuotes(const QString &item, QString &name) void updateProgressBar(KProgressDialog *pd, char *buffer, int buflen) { char *p = buffer; - QCString line(80); + TQCString line(80); for (int i=0; i<buflen; i++, p++) { if ((i==0 || buffer[i-1]=='\n') && buffer[i]=='%') { bool ok; @@ -120,13 +120,13 @@ void updateProgressBar(KProgressDialog *pd, char *buffer, int buflen) ++i; line=""; for (;i<buflen && *p>='0' && *p<='9'; j++, i++, p++) - line+=QChar(*p); + line+=TQChar(*p).latin1(); --i; --p; int percent = line.toInt(&ok); if (ok && percent>=0 && percent<=100 && pd->progressBar()->progress()<percent) { // kdDebug() << percent << endl; pd->progressBar()->setProgress(percent); - qApp->processEvents(100); + tqApp->tqprocessEvents(100); } } } @@ -134,36 +134,36 @@ void updateProgressBar(KProgressDialog *pd, char *buffer, int buflen) //--------------------------------- -KexiDBPasswordDialog::KexiDBPasswordDialog(QWidget *parent, KexiDB::ConnectionData& cdata, bool showDetailsButton) +KexiDBPasswordDialog::KexiDBPasswordDialog(TQWidget *tqparent, KexiDB::ConnectionData& cdata, bool showDetailsButton) : KPasswordDialog( KPasswordDialog::Password, false/*keep*/, - showDetailsButton ? (int)KDialogBase::User1 : 0, parent ) + showDetailsButton ? (int)KDialogBase::User1 : 0, tqparent ) , m_cdata(&cdata) , m_showConnectionDetailsRequested(false) { - QString msg = "<H2>" + i18n("Opening database") + "</H2><p>" + TQString msg = "<H2>" + i18n("Opening database") + "</H2><p>" + i18n("Please enter the password.") + "</p>"; /* msg += cdata.userName.isEmpty() ? "<p>"+i18n("Please enter the password.") - : "<p>"+i18n("Please enter the password for user.").arg("<b>"+cdata.userName+"</b>");*/ + : "<p>"+i18n("Please enter the password for user.").tqarg("<b>"+cdata.userName+"</b>");*/ - QString srv = cdata.serverInfoString(false); + TQString srv = cdata.serverInfoString(false); if (srv.isEmpty() || srv.lower()=="localhost") srv = i18n("local database server"); - msg += ("</p><p>"+i18n("Database server: %1").arg(QString("<nobr>")+srv+"</nobr>")+"</p>"); + msg += ("</p><p>"+i18n("Database server: %1").tqarg(TQString("<nobr>")+srv+"</nobr>")+"</p>"); - QString usr; + TQString usr; if (cdata.userName.isEmpty()) usr = i18n("unspecified user", "(unspecified)"); else usr = cdata.userName; - msg += ("<p>"+i18n("Username: %1").arg(usr)+"</p>"); + msg += ("<p>"+i18n("Username: %1").tqarg(usr)+"</p>"); setPrompt( msg ); if (showDetailsButton) { - connect( this, SIGNAL(user1Clicked()), - this, SLOT(slotShowConnectionDetails()) ); + connect( this, TQT_SIGNAL(user1Clicked()), + this, TQT_SLOT(slotShowConnectionDetails()) ); setButtonText(KDialogBase::User1, i18n("&Details")+ " >>"); } setButtonOK(KGuiItem(i18n("&Open"), "fileopen")); @@ -175,10 +175,10 @@ KexiDBPasswordDialog::~KexiDBPasswordDialog() void KexiDBPasswordDialog::done(int r) { - if (r == QDialog::Accepted) { - m_cdata->password = QString::fromLatin1(password()); + if (r == TQDialog::Accepted) { + m_cdata->password = TQString::tqfromLatin1(password()); } -// if (d->showConnectionDetailsExecuted || ret == QDialog::Accepted) { +// if (d->showConnectionDetailsExecuted || ret == TQDialog::Accepted) { /* } else { m_action = Exit; return true; @@ -195,7 +195,7 @@ void KexiDBPasswordDialog::slotShowConnectionDetails() //--------------------------------- KexiStartupHandler::KexiStartupHandler() - : QObject(0,"KexiStartupHandler") + : TQObject(0,"KexiStartupHandler") , KexiStartupData() , d( new KexiStartupHandlerPrivate() ) { @@ -206,13 +206,13 @@ KexiStartupHandler::~KexiStartupHandler() delete d; } -bool KexiStartupHandler::getAutoopenObjects(KCmdLineArgs *args, const QCString &action_name) +bool KexiStartupHandler::getAutoopenObjects(KCmdLineArgs *args, const TQCString &action_name) { QCStringList list = args->getOptionList(action_name); QCStringList::ConstIterator it; bool atLeastOneFound = false; for ( it = list.constBegin(); it!=list.constEnd(); ++it) { - QString type_name, obj_name, item=*it; + TQString type_name, obj_name, item=*it; int idx; bool name_required = true; if (action_name=="new") { @@ -221,7 +221,7 @@ bool KexiStartupHandler::getAutoopenObjects(KCmdLineArgs *args, const QCString & name_required = false; } else {//open, design, text... - QString defaultType; + TQString defaultType; if (action_name=="execute") defaultType = "macro"; else @@ -231,7 +231,7 @@ bool KexiStartupHandler::getAutoopenObjects(KCmdLineArgs *args, const QCString & if (stripQuotes(item, obj_name)) { type_name = defaultType; } - else if ((idx = item.find(':'))!=-1) { + else if ((idx = item.tqfind(':'))!=-1) { //option with type name specified: type_name = item.left(idx).lower(); obj_name = item.mid(idx+1); @@ -274,7 +274,7 @@ tristate KexiStartupHandler::init(int /*argc*/, char ** /*argv*/) KexiDB::ConnectionData cdata; - const QString connectionShortcutFileName( args->getOption("connection") ); + const TQString connectionShortcutFileName( args->getOption("connection") ); if (!connectionShortcutFileName.isEmpty()) { KexiDBConnShortcutFile connectionShortcut( connectionShortcutFileName ); if (!connectionShortcut.loadConnectionData(cdata)) { @@ -283,7 +283,7 @@ tristate KexiStartupHandler::init(int /*argc*/, char ** /*argv*/) KMessageBox::sorry( 0, "<qt>" +i18n("Could not read connection information from connection shortcut " "file <nobr>\"%1\"</nobr>.<br><br>Check whether the file has valid contents.") - .arg(QDir::convertSeparators(connectionShortcut.fileName()))); + .tqarg(TQDir::convertSeparators(connectionShortcut.fileName()))); return false; } } @@ -291,11 +291,11 @@ tristate KexiStartupHandler::init(int /*argc*/, char ** /*argv*/) if (!args->getOption("dbdriver").isEmpty()) cdata.driverName = args->getOption("dbdriver"); - QString fileType( args->getOption("type").lower() ); + TQString fileType( args->getOption("type").lower() ); if (args->count()>0 && (!fileType.isEmpty() && fileType!="project" && fileType!="shortcut" && fileType!="connection")) { KMessageBox::sorry( 0, i18n("You have specified invalid argument (\"%1\") for \"type\" command-line option.") - .arg(fileType)); + .tqarg(fileType)); return false; } @@ -330,7 +330,7 @@ tristate KexiStartupHandler::init(int /*argc*/, char ** /*argv*/) if (qstrcmp("--password",argv[i])==0 || qstrcmp("-password",argv[i])==0) { - QCString pwd(argv[i+1]); + TQCString pwd(argv[i+1]); if (!pwd.isEmpty()) { pwd.fill(' '); pwd[0]='x'; @@ -341,7 +341,7 @@ tristate KexiStartupHandler::init(int /*argc*/, char ** /*argv*/) } */ - const QString portStr = args->getOption("port"); + const TQString portStr = args->getOption("port"); if (!portStr.isEmpty()) { bool ok; const int p = portStr.toInt(&ok); @@ -364,7 +364,7 @@ tristate KexiStartupHandler::init(int /*argc*/, char ** /*argv*/) const bool dropDB = args->isSet("dropdb"); const bool openExisting = !createDB && !dropDB; const bool readOnly = args->isSet("readonly"); - const QString couldnotMsg = QString::fromLatin1("\n") + const TQString couldnotMsg = TQString::tqfromLatin1("\n") +i18n("Could not start Kexi application this way."); if (createDB && dropDB) { @@ -388,13 +388,13 @@ tristate KexiStartupHandler::init(int /*argc*/, char ** /*argv*/) if (cdata.password.isEmpty()) { delete d->passwordDialog; d->passwordDialog = new KexiDBPasswordDialog(0, cdata, true); -// connect( d->passwordDialog, SIGNAL(user1Clicked()), -// this, SLOT(slotShowConnectionDetails()) ); +// connect( d->passwordDialog, TQT_SIGNAL(user1Clicked()), +// this, TQT_SLOT(slotShowConnectionDetails()) ); const int ret = d->passwordDialog->exec(); - if (d->passwordDialog->showConnectionDetailsRequested() || ret == QDialog::Accepted) { -// if ( ret == QDialog::Accepted ) { - // if (QDialog::Accepted == KPasswordDialog::getPassword(pwd, msg)) { -//moved cdata.password = QString(pwd); + if (d->passwordDialog->showConnectionDetailsRequested() || ret == TQDialog::Accepted) { +// if ( ret == TQDialog::Accepted ) { + // if (TQDialog::Accepted == KPasswordDialog::getPassword(pwd, msg)) { +//moved cdata.password = TQString(pwd); // } } else { m_action = Exit; @@ -416,17 +416,17 @@ tristate KexiStartupHandler::init(int /*argc*/, char ** /*argv*/) //database filenames, shortcut filenames or db names on a server if (args->count()>=1) { - QString prjName; - QString fileName; + TQString prjName; + TQString fileName; if (fileDriverSelected) { - fileName = QFile::decodeName(args->arg(0)); + fileName = TQFile::decodeName(args->arg(0)); } else { - prjName = QString::fromLocal8Bit(args->arg(0)); + prjName = TQString::fromLocal8Bit(args->arg(0)); } if (fileDriverSelected) { - QFileInfo finfo(fileName); + TQFileInfo finfo(fileName); prjName = finfo.fileName(); //filename only, to avoid messy names like when Kexi is started with "../../db" arg cdata.setFileName( finfo.absFilePath() ); projectFileExists = finfo.exists(); @@ -434,7 +434,7 @@ tristate KexiStartupHandler::init(int /*argc*/, char ** /*argv*/) if (dropDB && !projectFileExists) { KMessageBox::sorry(0, i18n("Could not remove project.\nThe file \"%1\" does not exist.") - .arg(QDir::convertSeparators(cdata.dbFileName()))); + .tqarg(TQDir::convertSeparators(cdata.dbFileName()))); return 0; } } @@ -457,7 +457,7 @@ tristate KexiStartupHandler::init(int /*argc*/, char ** /*argv*/) if (dropDB) detectOptions |= DontConvert; - QString detectedDriverName; + TQString detectedDriverName; const tristate res = detectActionForFile( m_importActionData, detectedDriverName, cdata.driverName, cdata.fileName(), 0, detectOptions ); if (true != res) @@ -476,7 +476,7 @@ tristate KexiStartupHandler::init(int /*argc*/, char ** /*argv*/) m_projectData = new KexiProjectData(); if (!d->shortcutFile->loadProjectData(*m_projectData, &d->shortcutFileGroupKey)) { KMessageBox::sorry(0, i18n("Could not open shortcut file\n\"%1\".") - .arg(QDir::convertSeparators(cdata.fileName()))); + .tqarg(TQDir::convertSeparators(cdata.fileName()))); delete m_projectData; m_projectData = 0; delete d->shortcutFile; @@ -485,10 +485,10 @@ tristate KexiStartupHandler::init(int /*argc*/, char ** /*argv*/) } d->connDialog = new KexiDBConnectionDialog( *m_projectData, d->shortcutFile->fileName()); - connect(d->connDialog, SIGNAL(saveChanges()), - this, SLOT(slotSaveShortcutFileChanges())); + connect(d->connDialog, TQT_SIGNAL(saveChanges()), + this, TQT_SLOT(slotSaveShortcutFileChanges())); int res = d->connDialog->exec(); - if (res == QDialog::Accepted) { + if (res == TQDialog::Accepted) { //get (possibly changed) prj data *m_projectData = d->connDialog->currentProjectData(); } @@ -498,7 +498,7 @@ tristate KexiStartupHandler::init(int /*argc*/, char ** /*argv*/) delete d->shortcutFile; d->shortcutFile = 0; - if (res == QDialog::Rejected) { + if (res == TQDialog::Rejected) { delete m_projectData; m_projectData = 0; return cancelled; @@ -509,7 +509,7 @@ tristate KexiStartupHandler::init(int /*argc*/, char ** /*argv*/) d->connShortcutFile = new KexiDBConnShortcutFile(cdata.fileName()); if (!d->connShortcutFile->loadConnectionData(cdata, &d->shortcutFileGroupKey)) { KMessageBox::sorry(0, i18n("Could not open connection data file\n\"%1\".") - .arg(QDir::convertSeparators(cdata.fileName()))); + .tqarg(TQDir::convertSeparators(cdata.fileName()))); delete d->connShortcutFile; d->connShortcutFile = 0; return false; @@ -522,11 +522,11 @@ tristate KexiStartupHandler::init(int /*argc*/, char ** /*argv*/) if (!d->connDialog) { d->connDialog = new KexiDBConnectionDialog( cdata, d->connShortcutFile->fileName()); - connect(d->connDialog, SIGNAL(saveChanges()), - this, SLOT(slotSaveShortcutFileChanges())); + connect(d->connDialog, TQT_SIGNAL(saveChanges()), + this, TQT_SLOT(slotSaveShortcutFileChanges())); } const int res = d->connDialog->exec(); - if (res == QDialog::Accepted) { + if (res == TQDialog::Accepted) { //get (possibly changed) prj data cdata = *d->connDialog->currentProjectData().constConnectionData(); } @@ -565,11 +565,11 @@ tristate KexiStartupHandler::init(int /*argc*/, char ** /*argv*/) //let's show connection details, user asked for that in the "password dialog" if (d->passwordDialog && d->passwordDialog->showConnectionDetailsRequested()) { d->connDialog = new KexiDBConnectionDialog(*m_projectData); -// connect(d->connDialog->tabWidget->mainWidget, SIGNAL(saveChanges()), -// this, SLOT(slotSaveShortcutFileChanges())); +// connect(d->connDialog->tabWidget->mainWidget, TQT_SIGNAL(saveChanges()), +// this, TQT_SLOT(slotSaveShortcutFileChanges())); int res = d->connDialog->exec(); - if (res == QDialog::Accepted) { + if (res == TQDialog::Accepted) { //get (possibly changed) prj data *m_projectData = d->connDialog->currentProjectData(); } @@ -577,7 +577,7 @@ tristate KexiStartupHandler::init(int /*argc*/, char ** /*argv*/) delete d->connDialog; d->connDialog = 0; - if (res == QDialog::Rejected) { + if (res == TQDialog::Rejected) { delete m_projectData; m_projectData = 0; return cancelled; @@ -612,7 +612,7 @@ tristate KexiStartupHandler::init(int /*argc*/, char ** /*argv*/) if (!alsoOpenDB) { if (ok) { KMessageBox::information( 0, i18n("Project \"%1\" created successfully.") - .arg( QDir::convertSeparators(projectData()->databaseName()) )); + .tqarg( TQDir::convertSeparators(projectData()->databaseName()) )); } return ok; } @@ -622,7 +622,7 @@ tristate KexiStartupHandler::init(int /*argc*/, char ** /*argv*/) tristate res = KexiProject::dropProject(projectData(), &gui, false/*ask*/); if (res==true) KMessageBox::information( 0, i18n("Project \"%1\" dropped successfully.") - .arg( QDir::convertSeparators(projectData()->databaseName()) )); + .tqarg( TQDir::convertSeparators(projectData()->databaseName()) )); return res!=false; } @@ -646,7 +646,7 @@ tristate KexiStartupHandler::init(int /*argc*/, char ** /*argv*/) KexiStartupDialog::Everything, KexiStartupDialog::CheckBoxDoNotShowAgain, Kexi::connset(), Kexi::recentProjects(), 0, "KexiStartupDialog"); } - if (d->startupDialog->exec()!=QDialog::Accepted) + if (d->startupDialog->exec()!=TQDialog::Accepted) return true; const int r = d->startupDialog->result(); @@ -659,9 +659,9 @@ tristate KexiStartupHandler::init(int /*argc*/, char ** /*argv*/) return true; } else if (r == KexiStartupDialog::CreateFromTemplateResult) { - const QString selFile( d->startupDialog->selectedFileName() ); + const TQString selFile( d->startupDialog->selectedFileName() ); cdata.setFileName( selFile ); - QString detectedDriverName; + TQString detectedDriverName; const tristate res = detectActionForFile( m_importActionData, detectedDriverName, cdata.driverName, selFile ); if (true != res) @@ -676,12 +676,12 @@ tristate KexiStartupHandler::init(int /*argc*/, char ** /*argv*/) } else if (r == KexiStartupDialog::OpenExistingResult) { // kdDebug() << "Existing project --------" << endl; - const QString selFile( d->startupDialog->selectedFileName() ); + const TQString selFile( d->startupDialog->selectedFileName() ); if (!selFile.isEmpty()) { //file-based project // kdDebug() << "Project File: " << selFile << endl; cdata.setFileName( selFile ); - QString detectedDriverName; + TQString detectedDriverName; const tristate res = detectActionForFile( m_importActionData, detectedDriverName, cdata.driverName, selFile ); if (true != res) @@ -738,25 +738,25 @@ tristate KexiStartupHandler::init(int /*argc*/, char ** /*argv*/) } tristate KexiStartupHandler::detectActionForFile( - KexiStartupData::Import& detectedImportAction, QString& detectedDriverName, - const QString& _suggestedDriverName, const QString &dbFileName, QWidget *parent, int options ) + KexiStartupData::Import& detectedImportAction, TQString& detectedDriverName, + const TQString& _suggestedDriverName, const TQString &dbFileName, TQWidget *tqparent, int options ) { detectedImportAction = KexiStartupData::Import(); //clear - QString suggestedDriverName(_suggestedDriverName); //safe - detectedDriverName = QString::null; - QFileInfo finfo(dbFileName); + TQString suggestedDriverName(_suggestedDriverName); //safe + detectedDriverName = TQString(); + TQFileInfo finfo(dbFileName); if (dbFileName.isEmpty() || !finfo.isReadable()) { if (!(options & SkipMessages)) - KMessageBox::sorry(parent, i18n("<p>Could not open project.</p>") + KMessageBox::sorry(tqparent, i18n("<p>Could not open project.</p>") +i18n("<p>The file <nobr>\"%1\"</nobr> does not exist or is not readable.</p>") - .arg(QDir::convertSeparators(dbFileName)) + .tqarg(TQDir::convertSeparators(dbFileName)) +i18n("Check the file's permissions and whether it is already opened " "and locked by another application.")); return false; } KMimeType::Ptr ptr; - QString mimename; + TQString mimename; const bool thisIsShortcut = (options & ThisIsAShortcutToAProjectFile) || (options & ThisIsAShortcutToAConnectionData); @@ -775,13 +775,13 @@ tristate KexiStartupHandler::detectActionForFile( } if (mimename.isEmpty() || mimename=="application/octet-stream") { // perhaps the file is locked - QFile f(dbFileName); + TQFile f(dbFileName); if (!f.open(IO_ReadOnly)) { // BTW: similar error msg is provided in SQLiteConnection::drv_useDatabase() if (!(options & SkipMessages)) - KMessageBox::sorry(parent, i18n("<p>Could not open project.</p>") + KMessageBox::sorry(tqparent, i18n("<p>Could not open project.</p>") +i18n("<p>The file <nobr>\"%1\"</nobr> is not readable.</p>") - .arg(QDir::convertSeparators(dbFileName)) + .tqarg(TQDir::convertSeparators(dbFileName)) +i18n("Check the file's permissions and whether it is already opened " "and locked by another application.")); return false; @@ -802,9 +802,9 @@ tristate KexiStartupHandler::detectActionForFile( if (ptr.data()) { if (mimename=="application/x-msaccess") { if ((options & SkipMessages) || KMessageBox::Yes != KMessageBox::questionYesNo( - parent, i18n("\"%1\" is an external file of type:\n\"%2\".\n" + tqparent, i18n("\"%1\" is an external file of type:\n\"%2\".\n" "Do you want to import the file as a Kexi project?") - .arg(QDir::convertSeparators(dbFileName)).arg(ptr.data()->comment()), + .tqarg(TQDir::convertSeparators(dbFileName)).tqarg(ptr.data()->comment()), i18n("Open External File"), KGuiItem(i18n("Import...")), KStdGuiItem::cancel() ) ) { return cancelled; @@ -820,18 +820,18 @@ tristate KexiStartupHandler::detectActionForFile( } // "application/x-kexiproject-sqlite", etc.: - QString tmpDriverName = Kexi::driverManager().lookupByMime(mimename).latin1(); + TQString tmpDriverName = Kexi::driverManager().lookupByMime(mimename).latin1(); //@todo What about trying to reuse KOFFICE FILTER CHAINS here? bool useDetectedDriver = suggestedDriverName.isEmpty() || suggestedDriverName.lower()==detectedDriverName.lower(); if (!useDetectedDriver) { int res = KMessageBox::Yes; if (!(options & SkipMessages)) - res = KMessageBox::warningYesNoCancel(parent, i18n( + res = KMessageBox::warningYesNoCancel(tqparent, i18n( "The project file \"%1\" is recognized as compatible with \"%2\" database driver, " "while you have asked for \"%3\" database driver to be used.\n" "Do you want to use \"%4\" database driver?") - .arg(QDir::convertSeparators(dbFileName)) - .arg(tmpDriverName).arg(suggestedDriverName).arg(tmpDriverName)); + .tqarg(TQDir::convertSeparators(dbFileName)) + .tqarg(tmpDriverName).tqarg(suggestedDriverName).tqarg(tmpDriverName)); if (KMessageBox::Yes == res) useDetectedDriver = true; else if (KMessageBox::Cancel == res) @@ -845,13 +845,13 @@ tristate KexiStartupHandler::detectActionForFile( } // kdDebug() << "KexiStartupHandler::detectActionForFile(): driver name: " << detectedDriverName << endl; //hardcoded for convenience: - const QString newFileFormat = "SQLite3"; + const TQString newFileFormat = "SQLite3"; if (!(options & DontConvert || options & SkipMessages) && detectedDriverName.lower()=="sqlite2" && detectedDriverName.lower()!=suggestedDriverName.lower() - && KMessageBox::Yes == KMessageBox::questionYesNo(parent, i18n( + && KMessageBox::Yes == KMessageBox::questionYesNo(tqparent, i18n( "Previous version of database file format (\"%1\") is detected in the \"%2\" " "project file.\nDo you want to convert the project to a new \"%3\" format (recommended)?") - .arg(detectedDriverName).arg(QDir::convertSeparators(dbFileName)).arg(newFileFormat)) ) + .tqarg(detectedDriverName).tqarg(TQDir::convertSeparators(dbFileName)).tqarg(newFileFormat)) ) { // SQLite2ToSQLite3Migration *migr = new SQLite2ToSQLite3Migration migr( finfo.absFilePath() ); @@ -859,10 +859,10 @@ tristate KexiStartupHandler::detectActionForFile( // kdDebug() << "--- migr.run() END ---" <<endl; if (!res) { //TODO msg - KMessageBox::sorry(parent, i18n( + KMessageBox::sorry(tqparent, i18n( "Failed to convert project file \"%1\" to a new \"%2\" format.\n" "The file format remains unchanged.") - .arg(QDir::convertSeparators(dbFileName)).arg(newFileFormat) ); + .tqarg(TQDir::convertSeparators(dbFileName)).tqarg(newFileFormat) ); //continue... } if (res==true) @@ -870,21 +870,21 @@ tristate KexiStartupHandler::detectActionForFile( } // action.driverName = detectedDriverName; if (detectedDriverName.isEmpty()) { - QString possibleProblemsInfoMsg( Kexi::driverManager().possibleProblemsInfoMsg() ); + TQString possibleProblemsInfoMsg( Kexi::driverManager().possibleProblemsInfoMsg() ); if (!possibleProblemsInfoMsg.isEmpty()) { - possibleProblemsInfoMsg.prepend(QString::fromLatin1("<p>")+i18n("Possible problems:")); - possibleProblemsInfoMsg += QString::fromLatin1("</p>"); + possibleProblemsInfoMsg.prepend(TQString::tqfromLatin1("<p>")+i18n("Possible problems:")); + possibleProblemsInfoMsg += TQString::tqfromLatin1("</p>"); } if (!(options & SkipMessages)) - KMessageBox::detailedSorry(parent, + KMessageBox::detailedSorry(tqparent, i18n( "The file \"%1\" is not recognized as being supported by Kexi.") - .arg(QDir::convertSeparators(dbFileName)), - QString::fromLatin1("<p>") + .tqarg(TQDir::convertSeparators(dbFileName)), + TQString::tqfromLatin1("<p>") +i18n("Database driver for this file type not found.\nDetected MIME type: %1") - .arg(mimename) + .tqarg(mimename) +(ptr.data()->comment().isEmpty() - ? QString::fromLatin1(".") : QString::fromLatin1(" (%1).").arg(ptr.data()->comment())) - +QString::fromLatin1("</p>") + ? TQString::tqfromLatin1(".") : TQString::tqfromLatin1(" (%1).").tqarg(ptr.data()->comment())) + +TQString::tqfromLatin1("</p>") +possibleProblemsInfoMsg); return false; } @@ -892,9 +892,9 @@ tristate KexiStartupHandler::detectActionForFile( } KexiProjectData* -KexiStartupHandler::selectProject(KexiDB::ConnectionData *cdata, bool& cancelled, QWidget *parent) +KexiStartupHandler::selectProject(KexiDB::ConnectionData *cdata, bool& cancelled, TQWidget *tqparent) { - clearStatus(); + cleartqStatus(); cancelled = false; if (!cdata) return 0; @@ -902,7 +902,7 @@ KexiStartupHandler::selectProject(KexiDB::ConnectionData *cdata, bool& cancelled if (!d->passwordDialog) d->passwordDialog = new KexiDBPasswordDialog(0, *cdata, false); const int ret = d->passwordDialog->exec(); - if (d->passwordDialog->showConnectionDetailsRequested() || ret == QDialog::Accepted) { + if (d->passwordDialog->showConnectionDetailsRequested() || ret == TQDialog::Accepted) { } else { cancelled = true; @@ -911,22 +911,22 @@ KexiStartupHandler::selectProject(KexiDB::ConnectionData *cdata, bool& cancelled } KexiProjectData* projectData = 0; //dialog for selecting a project - KexiProjectSelectorDialog prjdlg( parent, "prjdlg", cdata, true, false ); + KexiProjectSelectorDialog prjdlg( tqparent, "prjdlg", cdata, true, false ); if (!prjdlg.projectSet() || prjdlg.projectSet()->error()) { KexiGUIMessageHandler msgh; if (prjdlg.projectSet()) msgh.showErrorMessage(prjdlg.projectSet(), i18n("Could not load list of available projects for <b>%1</b> database server.") - .arg(cdata->serverInfoString(true))); + .tqarg(cdata->serverInfoString(true))); else msgh.showErrorMessage( i18n("Could not load list of available projects for <b>%1</b> database server.") - .arg(cdata->serverInfoString(true))); -// setStatus(i18n("Could not load list of available projects for database server \"%1\"") -// .arg(cdata->serverInfoString(true)), prjdlg.projectSet()->errorMsg()); + .tqarg(cdata->serverInfoString(true))); +// settqStatus(i18n("Could not load list of available projects for database server \"%1\"") +// .tqarg(cdata->serverInfoString(true)), prjdlg.projectSet()->errorMsg()); return 0; } - if (prjdlg.exec()!=QDialog::Accepted) { + if (prjdlg.exec()!=TQDialog::Accepted) { cancelled = true; return 0; } @@ -952,7 +952,7 @@ void KexiStartupHandler::slotSaveShortcutFileChanges() if (!ok) { KMessageBox::sorry(0, i18n("Failed saving connection data to\n\"%1\" file.") - .arg(QDir::convertSeparators(d->shortcutFile->fileName()))); + .tqarg(TQDir::convertSeparators(d->shortcutFile->fileName()))); } } diff --git a/kexi/main/startup/KexiStartup.h b/kexi/main/startup/KexiStartup.h index 294ad7dd0..22c554403 100644 --- a/kexi/main/startup/KexiStartup.h +++ b/kexi/main/startup/KexiStartup.h @@ -20,8 +20,8 @@ #ifndef KEXI_STARTUPHANDLER_H #define KEXI_STARTUPHANDLER_H -#include <qstring.h> -#include <qwidget.h> +#include <tqstring.h> +#include <tqwidget.h> #include <kpassdlg.h> #include <core/kexistartupdata.h> @@ -40,8 +40,9 @@ namespace KexiDB { class KEXIMAIN_EXPORT KexiDBPasswordDialog : public KPasswordDialog { Q_OBJECT + TQ_OBJECT public: - KexiDBPasswordDialog(QWidget *parent, KexiDB::ConnectionData& cdata, bool showDetailsButton = false); + KexiDBPasswordDialog(TQWidget *tqparent, KexiDB::ConnectionData& cdata, bool showDetailsButton = false); virtual ~KexiDBPasswordDialog(); bool showConnectionDetailsRequested() const { return m_showConnectionDetailsRequested; } @@ -58,9 +59,10 @@ class KEXIMAIN_EXPORT KexiDBPasswordDialog : public KPasswordDialog /*! Handles startup actions for Kexi application. */ class KEXIMAIN_EXPORT KexiStartupHandler - : public QObject, public KexiStartupData, public Kexi::ObjectStatus + : public TQObject, public KexiStartupData, public Kexi::ObjecttqStatus { Q_OBJECT + TQ_OBJECT public: KexiStartupHandler(); @@ -71,12 +73,12 @@ class KEXIMAIN_EXPORT KexiStartupHandler #if 0 /*! Used for opening existing projects. Detects project file type by mime type and returns project data, if it can be detected, - otherwise - NULL. \a parent is passed as parent for potential error message boxes. + otherwise - NULL. \a tqparent is passed as tqparent for potential error message boxes. Also uses \a cdata connection data for server-based projects. cdata.driverName is adjusted, if a file-based project has been detected. */ static KexiProjectData* detectProjectData( - KexiDB::ConnectionData& cdata, const QString &dbname, QWidget *parent); + KexiDB::ConnectionData& cdata, const TQString &dbname, TQWidget *tqparent); #endif /*! Options for detectDriverForFile() */ @@ -101,27 +103,27 @@ class KEXIMAIN_EXPORT KexiStartupHandler - "shortcut" if the file looks like a shortcut to a project/connection file - "connection" if the file looks like a connection data file. - \a parent is passed as a parent for potential error message boxes. + \a tqparent is passed as a tqparent for potential error message boxes. \a driverName is a preferred driver name. \a options should be a combination of DetectDriverForFileOptions enum values. */ static tristate detectActionForFile( - KexiStartupData::Import& detectedImportAction, QString& detectedDriverName, - const QString& _suggestedDriverName, - const QString &dbFileName, QWidget *parent = 0, int options = 0 ); + KexiStartupData::Import& detectedImportAction, TQString& detectedDriverName, + const TQString& _suggestedDriverName, + const TQString &dbFileName, TQWidget *tqparent = 0, int options = 0 ); /*! Allows user to select a project with KexiProjectSelectorDialog. \return selected project's data Returns NULL and sets cancelled to true if the dialog was cancelled. Returns NULL and sets cancelled to false if there was an error. */ - KexiProjectData* selectProject(KexiDB::ConnectionData *cdata, bool& cancelled, QWidget *parent = 0); + KexiProjectData* selectProject(KexiDB::ConnectionData *cdata, bool& cancelled, TQWidget *tqparent = 0); protected slots: void slotSaveShortcutFileChanges(); // void slotShowConnectionDetails(); protected: - bool getAutoopenObjects(KCmdLineArgs *args, const QCString &action_name); + bool getAutoopenObjects(KCmdLineArgs *args, const TQCString &action_name); KexiStartupHandlerPrivate *d; }; diff --git a/kexi/main/startup/KexiStartupDialog.cpp b/kexi/main/startup/KexiStartupDialog.cpp index 3b524492d..40ced9b1e 100644 --- a/kexi/main/startup/KexiStartupDialog.cpp +++ b/kexi/main/startup/KexiStartupDialog.cpp @@ -25,16 +25,16 @@ #include "KexiConnSelector.h" #include "KexiConnSelectorBase.h" -#include <qlayout.h> -#include <qtabwidget.h> -#include <qcombobox.h> -#include <qcheckbox.h> -#include <qpoint.h> -#include <qobjectlist.h> -#include <qvgroupbox.h> -#include <qapplication.h> -#include <qtooltip.h> -#include <qwidgetstack.h> +#include <tqlayout.h> +#include <tqtabwidget.h> +#include <tqcombobox.h> +#include <tqcheckbox.h> +#include <tqpoint.h> +#include <tqobjectlist.h> +#include <tqvgroupbox.h> +#include <tqapplication.h> +#include <tqtooltip.h> +#include <tqwidgetstack.h> #include <klocale.h> #include <kdeversion.h> @@ -67,7 +67,7 @@ public: , pageOpenRecentID(-1) { result = 0; - QString none, iconname; + TQString none, iconname; iconname = KMimeType::mimeType( KexiDB::Driver::defaultFileBasedDriverMimeType() )->icon(none,0); kexi_sqlite_icon = KGlobal::iconLoader()->loadIcon( iconname, KIcon::Desktop ); iconname = KMimeType::mimeType("application/x-kexiproject-shortcut")->icon(none,0); @@ -83,35 +83,35 @@ public: int dialogType, dialogOptions; - QFrame *pageTemplates, *pageOpenExisting, *pageOpenRecent; + TQFrame *pageTemplates, *pageOpenExisting, *pageOpenRecent; int pageTemplatesID; int pageOpenExistingID, pageOpenRecentID; int templatesSectionID_blank, templatesSectionID_import; #ifdef DB_TEMPLATES int templatesSectionID_templates; //, templatesSectionID_custom2; #endif - QCheckBox *chkDoNotShow; + TQCheckBox *chkDoNotShow; //widgets for template tab: KJanusWidget* templatesWidget; - QObject *templatesWidget_IconListBox;//helper + TQObject *templatesWidget_IconListBox;//helper - QWidgetStack *viewBlankTempl; + TQWidgetStack *viewBlankTempl; KexiStartupDialogTemplatesPage *viewTemplates; //TemplatesPage *viewBusinessTempl; int result; - QPixmap kexi_sqlite_icon, kexi_shortcut_icon; + TQPixmap kexi_sqlite_icon, kexi_shortcut_icon; // //! Key string of selected database template. \sa selectedTemplateKey() -// QString selectedTemplateKey; +// TQString selectedTemplateKey; //! used for "open existing" KexiDBConnectionSet *connSet; KexiStartupFileDialog *openExistingFileDlg; //! embedded file dialog KexiConnSelectorWidget *openExistingConnWidget; - QString existingFileToOpen; //! helper for returning a file name to open + TQString existingFileToOpen; //! helper for returning a file name to open KexiDB::ConnectionData* selectedExistingConnection; //! helper for returning selected connection //! used for "open recent" @@ -129,7 +129,7 @@ bool dlgSinglePage(int type) || (type==KexiStartupDialog::OpenRecent); } -QString captionForDialogType(int type) +TQString captionForDialogType(int type) { if (type==KexiStartupDialog::Templates) return i18n("Create Project"); @@ -142,21 +142,21 @@ QString captionForDialogType(int type) } /*================================================================*/ -/*KexiStartupDialog::KexiStartupDialog(QWidget *parent, const char *name, KInstance* global, - const QCString &format, const QString &nativePattern, - const QString &nativeName, const DialogType &dialogType, - const QCString& templateType) : - KDialogBase(parent, name, true, i18n("Open Document"), KDialogBase::Ok | KDialogBase::Cancel, +/*KexiStartupDialog::KexiStartupDialog(TQWidget *tqparent, const char *name, KInstance* global, + const TQCString &format, const TQString &nativePattern, + const TQString &nativeName, const DialogType &dialogType, + const TQCString& templateType) : + KDialogBase(tqparent, name, true, i18n("Open Document"), KDialogBase::Ok | KDialogBase::Cancel, KDialogBase::Ok) { */ KexiStartupDialog::KexiStartupDialog( int dialogType, int dialogOptions, KexiDBConnectionSet& connSet, KexiProjectSet& recentProjects, - QWidget *parent, const char *name ) + TQWidget *tqparent, const char *name ) : KDialogBase( dlgSinglePage(dialogType) ? Plain : Tabbed ,captionForDialogType(dialogType) - ,Help | Ok | Cancel, Ok, parent, name ) + ,Help | Ok | Cancel, Ok, tqparent, name ) , d(new KexiStartupDialogPrivate()) { d->recentProjects = &recentProjects; @@ -194,7 +194,7 @@ KexiStartupDialog::KexiStartupDialog( #endif if (!d->singlePage) { - connect(this, SIGNAL(aboutToShowPage(QWidget*)), this, SLOT(slotPageShown(QWidget*))); + connect(this, TQT_SIGNAL(aboutToShowPage(TQWidget*)), this, TQT_SLOT(slotPageShown(TQWidget*))); d->templatesWidget->setFocus(); } showPage(0); @@ -215,8 +215,8 @@ bool KexiStartupDialog::shouldBeShown() void KexiStartupDialog::show() { //just some cleanup -// d->selectedTemplateKey=QString::null; - d->existingFileToOpen=QString::null; +// d->selectedTemplateKey=TQString(); + d->existingFileToOpen=TQString(); d->result=-1; KDialog::centerOnScreen(this); @@ -236,7 +236,7 @@ void KexiStartupDialog::done(int r) // kdDebug() << "KexiStartupDialog::done(" << r << ")" << endl; // updateSelectedTemplateKeyInfo(); - if (r==QDialog::Rejected) { + if (r==TQDialog::Rejected) { d->result = CancelResult; } else { const int idx = activePageIndex(); @@ -260,7 +260,7 @@ void KexiStartupDialog::done(int r) // d->existingFileToOpen = d->openExistingFileDlg->currentURL().path(); d->selectedExistingConnection = 0; } else { - d->existingFileToOpen = QString::null; + d->existingFileToOpen = TQString(); d->selectedExistingConnection = d->openExistingConnWidget->selectedConnectionData(); } @@ -294,7 +294,7 @@ void KexiStartupDialog::reject() void KexiStartupDialog::setupPageTemplates() { d->pageTemplates = addPage( i18n("&Create Project") ); - QVBoxLayout *lyr = new QVBoxLayout( d->pageTemplates, 0, KDialogBase::spacingHint() ); + TQVBoxLayout *lyr = new TQVBoxLayout( d->pageTemplates, 0, KDialogBase::spacingHint() ); d->templatesWidget = new KJanusWidget( d->pageTemplates, "templatesWidget", KJanusWidget::IconList); @@ -304,27 +304,27 @@ void KexiStartupDialog::setupPageTemplates() d->templatesWidget_IconListBox->installEventFilter(this); } lyr->addWidget(d->templatesWidget); - connect(d->templatesWidget, SIGNAL(aboutToShowPage(QWidget*)), this, SLOT(slotPageShown(QWidget*))); + connect(d->templatesWidget, TQT_SIGNAL(aboutToShowPage(TQWidget*)), this, TQT_SLOT(slotPageShown(TQWidget*))); if (d->dialogOptions & CheckBoxDoNotShowAgain) { - d->chkDoNotShow = new QCheckBox(i18n("Don't show me this dialog again"), d->pageTemplates, "chkDoNotShow"); + d->chkDoNotShow = new TQCheckBox(i18n("Don't show me this dialog again"), d->pageTemplates, "chkDoNotShow"); lyr->addWidget(d->chkDoNotShow); } //template groups: - QFrame *templPageFrame; - QVBoxLayout *tmplyr; + TQFrame *templPageFrame; + TQVBoxLayout *tmplyr; int itemID = 0; //used just to set up templatesSectionID_* //- page "blank db" d->templatesSectionID_blank = itemID++; - QString clickMsg( "\n\n" + i18n("Click \"OK\" button to proceed.") ); + TQString clickMsg( "\n\n" + i18n("Click \"OK\" button to proceed.") ); templPageFrame = d->templatesWidget->addPage( i18n("Blank Database"), i18n("New Blank Database Project"), DesktopIcon("empty") ); - tmplyr = new QVBoxLayout(templPageFrame, 0, KDialogBase::spacingHint()); - QLabel *lbl_blank = new QLabel( + tmplyr = new TQVBoxLayout(templPageFrame, 0, KDialogBase::spacingHint()); + TQLabel *lbl_blank = new TQLabel( i18n("Kexi will create a new blank database project.")+clickMsg, templPageFrame ); - lbl_blank->setAlignment(Qt::AlignAuto|Qt::AlignTop|Qt::WordBreak); + lbl_blank->tqsetAlignment(TQt::AlignAuto|TQt::AlignTop|TQt::WordBreak); lbl_blank->setMargin(0); tmplyr->addWidget( lbl_blank ); tmplyr->addStretch(1); @@ -332,37 +332,37 @@ void KexiStartupDialog::setupPageTemplates() #ifdef DB_TEMPLATES //- page "templates" d->templatesSectionID_templates = itemID++; - QString none; - QString kexi_sqlite_icon_name + TQString none; + TQString kexi_sqlite_icon_name = KMimeType::mimeType( KexiDB::Driver::defaultFileBasedDriverMimeType() )->icon(none,0); templPageFrame = d->templatesWidget->addPage ( i18n("Keep this text narrow: split to multiple rows if needed", "Create From\nTemplate"), i18n("New Database Project From Template"), DesktopIcon(kexi_sqlite_icon_name) ); - tmplyr = new QVBoxLayout(templPageFrame, 0, KDialogBase::spacingHint()); - QLabel *lbl_templ = new QLabel( + tmplyr = new TQVBoxLayout(templPageFrame, 0, KDialogBase::spacingHint()); + TQLabel *lbl_templ = new TQLabel( i18n("Kexi will create a new database project using selected template.\n" "Select template and click \"OK\" button to proceed."), templPageFrame ); - lbl_templ->setAlignment(Qt::AlignAuto|Qt::AlignTop|Qt::WordBreak); + lbl_templ->tqsetAlignment(TQt::AlignAuto|TQt::AlignTop|TQt::WordBreak); lbl_templ->setMargin(0); tmplyr->addWidget( lbl_templ ); d->viewTemplates = new KexiStartupDialogTemplatesPage( templPageFrame ); tmplyr->addWidget( d->viewTemplates ); - connect(d->viewTemplates,SIGNAL(selected(const QString&)), - this,SLOT(templateSelected(const QString&))); -/* connect(d->viewTemplates->templates,SIGNAL(returnPressed(QIconViewItem*)), - this,SLOT(templateItemExecuted(QIconViewItem*))); - connect(d->viewTemplates->templates,SIGNAL(currentChanged(QIconViewItem*)), - this,SLOT(templateItemSelected(QIconViewItem*)));*/ + connect(d->viewTemplates,TQT_SIGNAL(selected(const TQString&)), + this,TQT_SLOT(templateSelected(const TQString&))); +/* connect(d->viewTemplates->templates,TQT_SIGNAL(returnPressed(TQIconViewItem*)), + this,TQT_SLOT(templateItemExecuted(TQIconViewItem*))); + connect(d->viewTemplates->templates,TQT_SIGNAL(currentChanged(TQIconViewItem*)), + this,TQT_SLOT(templateItemSelected(TQIconViewItem*)));*/ /*later templPageFrame = d->templatesWidget->addPage ( i18n("Personal Databases"), i18n("New Personal Database Project Templates"), DesktopIcon("folder_home") ); - tmplyr = new QVBoxLayout(templPageFrame, 0, KDialogBase::spacingHint()); - d->viewPersonalTempl = new TemplatesPage( Vertical, templPageFrame, "personal_page" ); + tmplyr = new TQVBoxLayout(templPageFrame, 0, KDialogBase::spacingHint()); + d->viewPersonalTempl = new TemplatesPage(Qt::Vertical, templPageFrame, "personal_page" ); tmplyr->addWidget( d->viewPersonalTempl ); - connect(d->viewPersonalTempl->templates,SIGNAL(doubleClicked(QIconViewItem*)),this,SLOT(templateItemExecuted(QIconViewItem*))); - connect(d->viewPersonalTempl->templates,SIGNAL(returnPressed(QIconViewItem*)),this,SLOT(templateItemExecuted(QIconViewItem*))); - connect(d->viewPersonalTempl->templates,SIGNAL(currentChanged(QIconViewItem*)),this,SLOT(templateItemSelected(QIconViewItem*))); + connect(d->viewPersonalTempl->templates,TQT_SIGNAL(doubleClicked(TQIconViewItem*)),this,TQT_SLOT(templateItemExecuted(TQIconViewItem*))); + connect(d->viewPersonalTempl->templates,TQT_SIGNAL(returnPressed(TQIconViewItem*)),this,TQT_SLOT(templateItemExecuted(TQIconViewItem*))); + connect(d->viewPersonalTempl->templates,TQT_SIGNAL(currentChanged(TQIconViewItem*)),this,TQT_SLOT(templateItemSelected(TQIconViewItem*))); */ //- page "business db" @@ -371,12 +371,12 @@ void KexiStartupDialog::setupPageTemplates() templPageFrame = d->templatesWidget->addPage ( i18n("Business Databases"), i18n("New Business Database Project Templates"), DesktopIcon( "business_user" )); - tmplyr = new QVBoxLayout(templPageFrame, 0, KDialogBase::spacingHint()); - d->viewBusinessTempl = new TemplatesPage( Vertical, templPageFrame, "business_page" ); + tmplyr = new TQVBoxLayout(templPageFrame, 0, KDialogBase::spacingHint()); + d->viewBusinessTempl = new TemplatesPage(Qt::Vertical, templPageFrame, "business_page" ); tmplyr->addWidget( d->viewBusinessTempl ); - connect(d->viewBusinessTempl->templates,SIGNAL(doubleClicked(QIconViewItem*)),this,SLOT(templateItemExecuted(QIconViewItem*))); - connect(d->viewBusinessTempl->templates,SIGNAL(returnPressed(QIconViewItem*)),this,SLOT(templateItemExecuted(QIconViewItem*))); - connect(d->viewBusinessTempl->templates,SIGNAL(currentChanged(QIconViewItem*)),this,SLOT(templateItemSelected(QIconViewItem*))); + connect(d->viewBusinessTempl->templates,TQT_SIGNAL(doubleClicked(TQIconViewItem*)),this,TQT_SLOT(templateItemExecuted(TQIconViewItem*))); + connect(d->viewBusinessTempl->templates,TQT_SIGNAL(returnPressed(TQIconViewItem*)),this,TQT_SLOT(templateItemExecuted(TQIconViewItem*))); + connect(d->viewBusinessTempl->templates,TQT_SIGNAL(currentChanged(TQIconViewItem*)),this,TQT_SLOT(templateItemSelected(TQIconViewItem*))); */ #endif //DB_TEMPLATES @@ -385,17 +385,17 @@ void KexiStartupDialog::setupPageTemplates() templPageFrame = d->templatesWidget->addPage( i18n("Import Existing\nDatabase"), i18n("Import Existing Database as New Database Project"), DesktopIcon("database_import") ); - tmplyr = new QVBoxLayout(templPageFrame, 0, KDialogBase::spacingHint()); - QLabel *lbl_import = new QLabel( + tmplyr = new TQVBoxLayout(templPageFrame, 0, KDialogBase::spacingHint()); + TQLabel *lbl_import = new TQLabel( i18n("Kexi will import the structure and data of an existing database as a new database project.") +clickMsg, templPageFrame ); - lbl_import->setAlignment(Qt::AlignAuto|Qt::AlignTop|Qt::WordBreak); + lbl_import->tqsetAlignment(TQt::AlignAuto|TQt::AlignTop|TQt::WordBreak); lbl_import->setMargin(0); tmplyr->addWidget( lbl_import ); tmplyr->addStretch(1); } -void KexiStartupDialog::slotPageShown(QWidget *page) +void KexiStartupDialog::slotPageShown(TQWidget *page) { int idx = d->templatesWidget->pageIndex(page); // KIconView *templ = 0; @@ -436,12 +436,12 @@ void KexiStartupDialog::slotPageShown(QWidget *page) } #if 0 -void KexiStartupDialog::templateItemSelected(QIconViewItem *) +void KexiStartupDialog::templateItemSelected(TQIconViewItem *) { updateDialogOKButton(d->pageTemplates); } -void KexiStartupDialog::templateItemExecuted(QIconViewItem *item) +void KexiStartupDialog::templateItemExecuted(TQIconViewItem *item) { if (!item) return; @@ -454,10 +454,10 @@ void KexiStartupDialog::templateItemExecuted(QIconViewItem *item) void KexiStartupDialog::updateSelectedTemplateKeyInfo() { if (activePageIndex()!=d->pageTemplatesID) {//not a 'new db' tab is selected - d->selectedTemplateKey=QString::null; + d->selectedTemplateKey=TQString(); return; } - QIconViewItem *item; + TQIconViewItem *item; if (d->templatesWidget->activePageIndex()==d->templatesSectionID_blank) { d->selectedTemplateKey = "blank"; } @@ -468,25 +468,25 @@ void KexiStartupDialog::updateSelectedTemplateKeyInfo() else if (d->templatesWidget->activePageIndex()==d->templatesSectionID_templates) { item = d->viewTemplates->templates->currentItem(); if (!item) { - d->selectedTemplateKey=QString::null; + d->selectedTemplateKey=TQString(); return; } - d->selectedTemplateKey=QString("personal/")+static_cast<TemplateItem*>(item)->key; + d->selectedTemplateKey=TQString("personal/")+static_cast<TemplateItem*>(item)->key; } /*later? else if (d->templatesWidget->activePageIndex()==d->templatesSectionID_custom2) { item = d->viewBusinessTempl->templates->currentItem(); if (!item) { - d->selectedTemplateKey=QString::null; + d->selectedTemplateKey=TQString(); return; } - d->selectedTemplateKey=QString("business/")+static_cast<TemplateItem*>(item)->key; + d->selectedTemplateKey=TQString("business/")+static_cast<TemplateItem*>(item)->key; }*/ #endif } #endif // 0 -void KexiStartupDialog::tabShown(QWidget *w) +void KexiStartupDialog::tabShown(TQWidget *w) { // kdDebug() << "KexiStartupDialog::tabShown " << (long)w << " "<< long(d->pageTemplates)<<endl; @@ -497,7 +497,7 @@ void KexiStartupDialog::tabShown(QWidget *w) } } -void KexiStartupDialog::updateDialogOKButton(QWidget *w) +void KexiStartupDialog::updateDialogOKButton(TQWidget *w) { if (!w) { int idx = activePageIndex(); @@ -534,7 +534,7 @@ void KexiStartupDialog::updateDialogOKButton(QWidget *w) enableButton(Ok,enable); } -/*QString KexiStartupDialog::selectedTemplateKey() const +/*TQString KexiStartupDialog::selectedTemplateKey() const { return d->selectedTemplateKey; }*/ @@ -545,7 +545,7 @@ void KexiStartupDialog::setupPageOpenExisting() d->pageOpenExisting = plainPage(); else d->pageOpenExisting = addPage( i18n("Open &Existing Project") ); - QVBoxLayout *lyr = new QVBoxLayout( d->pageOpenExisting, 0, KDialogBase::spacingHint() ); + TQVBoxLayout *lyr = new TQVBoxLayout( d->pageOpenExisting, 0, KDialogBase::spacingHint() ); d->openExistingConnWidget = new KexiConnSelectorWidget(*d->connSet, ":OpenExistingOrCreateNewProject", @@ -559,11 +559,11 @@ void KexiStartupDialog::setupPageOpenExisting() d->openExistingConnWidget->showAdvancedConn(); } d->openExistingFileDlg = d->openExistingConnWidget->m_fileDlg; - connect(d->openExistingFileDlg,SIGNAL(accepted()),this,SLOT(accept())); - connect(d->openExistingConnWidget,SIGNAL(connectionItemExecuted(ConnectionDataLVItem*)), - this,SLOT(connectionItemForOpenExistingExecuted(ConnectionDataLVItem*))); - connect(d->openExistingConnWidget,SIGNAL(connectionItemHighlighted(ConnectionDataLVItem*)), - this,SLOT(connectionItemForOpenExistingHighlighted(ConnectionDataLVItem*))); + connect(d->openExistingFileDlg,TQT_SIGNAL(accepted()),this,TQT_SLOT(accept())); + connect(d->openExistingConnWidget,TQT_SIGNAL(connectionItemExecuted(ConnectionDataLVItem*)), + this,TQT_SLOT(connectionItemForOpenExistingExecuted(ConnectionDataLVItem*))); + connect(d->openExistingConnWidget,TQT_SIGNAL(connectionItemHighlighted(ConnectionDataLVItem*)), + this,TQT_SLOT(connectionItemForOpenExistingHighlighted(ConnectionDataLVItem*))); } void KexiStartupDialog::connectionItemForOpenExistingExecuted(ConnectionDataLVItem *item) @@ -602,14 +602,14 @@ void KexiStartupDialog::showAdvancedConnForOpenExisting() d->openExistingConnWidget->showAdvancedConn(); } -QString KexiStartupDialog::selectedFileName() const +TQString KexiStartupDialog::selectedFileName() const { if (d->result == OpenExistingResult) return d->existingFileToOpen; else if (d->result == CreateFromTemplateResult && d->viewTemplates) return d->viewTemplates->selectedFileName(); else - return QString::null; + return TQString(); } KexiDB::ConnectionData* KexiStartupDialog::selectedExistingConnection() const @@ -617,7 +617,7 @@ KexiDB::ConnectionData* KexiStartupDialog::selectedExistingConnection() const return d->selectedExistingConnection; } -void KexiStartupDialog::existingFileSelected(const QString &f) +void KexiStartupDialog::existingFileSelected(const TQString &f) { if (f.isEmpty()) return; @@ -629,11 +629,11 @@ void KexiStartupDialog::setupPageOpenRecent() { #ifdef KEXI_STARTUP_SHOW_RECENT d->pageOpenRecent = addPage( i18n("Open &Recent Project") ); - QVBoxLayout *lyr = new QVBoxLayout( d->pageOpenRecent, 0, KDialogBase::spacingHint() ); + TQVBoxLayout *lyr = new TQVBoxLayout( d->pageOpenRecent, 0, KDialogBase::spacingHint() ); lyr->addWidget( d->prj_selector = new KexiProjectSelectorWidget( d->pageOpenRecent, "prj_selector", d->recentProjects ) ); - connect(d->prj_selector,SIGNAL(projectExecuted(KexiProjectData*)), - this,SLOT(recentProjectItemExecuted(KexiProjectData*))); + connect(d->prj_selector,TQT_SIGNAL(projectExecuted(KexiProjectData*)), + this,TQT_SLOT(recentProjectItemExecuted(KexiProjectData*))); #endif } @@ -654,12 +654,12 @@ void KexiStartupDialog::recentProjectItemExecuted(KexiProjectData *data) } //! used for accepting templates dialog with just return key press -bool KexiStartupDialog::eventFilter( QObject *o, QEvent *e ) +bool KexiStartupDialog::eventFilter( TQObject *o, TQEvent *e ) { if (o==d->templatesWidget_IconListBox && d->templatesWidget_IconListBox) { - if (e->type()==QEvent::KeyPress - && (static_cast<QKeyEvent*>(e)->key()==Key_Enter || static_cast<QKeyEvent*>(e)->key()==Key_Return) - || e->type()==QEvent::MouseButtonDblClick) + if (e->type()==TQEvent::KeyPress + && (TQT_TQKEYEVENT(e)->key()==Key_Enter || TQT_TQKEYEVENT(e)->key()==Key_Return) + || e->type()==TQEvent::MouseButtonDblClick) { const int t_id = d->templatesWidget->activePageIndex(); if (t_id==d->templatesSectionID_blank || t_id==d->templatesSectionID_import) { @@ -682,16 +682,16 @@ int KexiStartupDialog::activePageIndex() const return 0; //there is always "plain page" #0 selected } -void KexiStartupDialog::templateSelected(const QString& fileName) +void KexiStartupDialog::templateSelected(const TQString& fileName) { if (!fileName.isEmpty()) accept(); } -QValueList<KexiProjectData::ObjectInfo> KexiStartupDialog::autoopenObjects() const +TQValueList<KexiProjectData::ObjectInfo> KexiStartupDialog::autoopenObjects() const { if (d->result != CreateFromTemplateResult || !d->viewTemplates) - QValueList<KexiProjectData::ObjectInfo>(); + TQValueList<KexiProjectData::ObjectInfo>(); return d->viewTemplates->autoopenObjectsForSelectedTemplate(); } diff --git a/kexi/main/startup/KexiStartupDialog.h b/kexi/main/startup/KexiStartupDialog.h index 41f6064b9..0f994ff32 100644 --- a/kexi/main/startup/KexiStartupDialog.h +++ b/kexi/main/startup/KexiStartupDialog.h @@ -26,8 +26,8 @@ #include <kfileiconview.h> #include <kfiledialog.h> -#include <qlabel.h> -#include <qsplitter.h> +#include <tqlabel.h> +#include <tqsplitter.h> #include <kexidb/connectiondata.h> #include <core/kexiprojectdata.h> @@ -46,6 +46,7 @@ class ConnectionDataLVItem; class KEXIMAIN_EXPORT KexiStartupDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: /*! The Dialog returns one of these values depending @@ -88,7 +89,7 @@ public: @param recentProjects a set of recent projects' info, used for "Open recent" tab @param connSet conenction set used to present available conenctions in "Open Existing" tab. Pass an empty object is this tab is not used. - @param parent parent widget, if any. + @param tqparent tqparent widget, if any. @param name name of this object. */ KexiStartupDialog( @@ -96,7 +97,7 @@ public: int dialogOptions, KexiDBConnectionSet& connSet, KexiProjectSet& recentProjects, - QWidget *parent = 0, const char *name = 0 ); + TQWidget *tqparent = 0, const char *name = 0 ); ~KexiStartupDialog(); /*! \return true if startup dialog should be shown (info is taken from kexi config) @@ -118,11 +119,11 @@ public: (if result() == CreateFromTemplateResult). Returns empty string if no such selection has been made or other tab was selected. */ - QString selectedFileName() const; + TQString selectedFileName() const; /*! \return "autoopen" objects defined for selected template. Only makes sense if template was used. */ - QValueList<KexiProjectData::ObjectInfo> autoopenObjects() const; + TQValueList<KexiProjectData::ObjectInfo> autoopenObjects() const; /*! \return a pointer to selected Kexi connection data. (if "Open Existing" tab was selected and this connection data was clicked). @@ -141,32 +142,32 @@ protected slots: virtual void slotOk(); //! slot activated when one of page in templates window is shown - void slotPageShown(QWidget *page); + void slotPageShown(TQWidget *page); /* //! Any icon view item has been executed (dblclicked) - void templateItemExecuted(QIconViewItem *item); + void templateItemExecuted(TQIconViewItem *item); //! Any icon view item has been selected - void templateItemSelected(QIconViewItem *item);*/ + void templateItemSelected(TQIconViewItem *item);*/ //! Any tab has been selected - void tabShown(QWidget *w); + void tabShown(TQWidget *w); - void templateSelected(const QString& fileName); + void templateSelected(const TQString& fileName); //! helper void recentProjectItemExecuted(KexiProjectData *data); - void existingFileSelected(const QString &f); + void existingFileSelected(const TQString &f); void showSimpleConnForOpenExisting(); void showAdvancedConnForOpenExisting(); void connectionItemForOpenExistingExecuted(ConnectionDataLVItem *item); void connectionItemForOpenExistingHighlighted(ConnectionDataLVItem *item); protected: - virtual bool eventFilter( QObject *o, QEvent *e ); + virtual bool eventFilter( TQObject *o, TQEvent *e ); //! helper: updates a state of dialog's OK button - void updateDialogOKButton(QWidget *w); + void updateDialogOKButton(TQWidget *w); //! internal reimplementation int activePageIndex() const; diff --git a/kexi/main/startup/KexiStartupDialogTemplatesPage.cpp b/kexi/main/startup/KexiStartupDialogTemplatesPage.cpp index 3a64fbace..52fe08707 100644 --- a/kexi/main/startup/KexiStartupDialogTemplatesPage.cpp +++ b/kexi/main/startup/KexiStartupDialogTemplatesPage.cpp @@ -26,7 +26,7 @@ #include "KexiConnSelector.h" #include "KexiConnSelectorBase.h" -#include <qheader.h> +#include <tqheader.h> #include <kdebug.h> #include <kiconloader.h> @@ -36,14 +36,14 @@ #define KEXI_STARTUP_SHOW_RECENT #endif -/*QPixmap createIcon() +/*TQPixmap createIcon() { }*/ -/*QString createText(const QString& name, const QString& description) +/*TQString createText(const TQString& name, const TQString& description) { - QString txt = "<H2>" + name + "</H2>"; + TQString txt = "<H2>" + name + "</H2>"; if (description.isEmpty()) return name + description }*/ @@ -52,10 +52,10 @@ class TemplateItem : public KListViewItem { public: - TemplateItem(QListView* parent, const QString& aFilename, - const QString& name, const QString& description, const QPixmap& icon, - const QValueList<KexiProjectData::ObjectInfo>& aAutoopenObjects) - : KListViewItem(parent, name + "\n" + description) + TemplateItem(TQListView* tqparent, const TQString& aFilename, + const TQString& name, const TQString& description, const TQPixmap& icon, + const TQValueList<KexiProjectData::ObjectInfo>& aAutoopenObjects) + : KListViewItem(tqparent, name + "\n" + description) , autoopenObjects(aAutoopenObjects) , filename(aFilename) { @@ -63,22 +63,22 @@ class TemplateItem : public KListViewItem } ~TemplateItem() {} - QValueList<KexiProjectData::ObjectInfo> autoopenObjects; - QString filename; + TQValueList<KexiProjectData::ObjectInfo> autoopenObjects; + TQString filename; }; //----------------------- -KexiStartupDialogTemplatesPage::KexiStartupDialogTemplatesPage( QWidget * parent ) - : KListView(parent, "KexiStartupDialogTemplatesPage") +KexiStartupDialogTemplatesPage::KexiStartupDialogTemplatesPage( TQWidget * tqparent ) + : KListView(tqparent, "KexiStartupDialogTemplatesPage") , m_popuplated(false) { - addColumn(QString::null); + addColumn(TQString()); header()->hide(); setColumnWidthMode(0, Maximum); setResizeMode(LastColumn); setItemMargin(6); - connect(this,SIGNAL(executed(QListViewItem*)), this, SLOT(slotExecuted(QListViewItem*))); + connect(this,TQT_SIGNAL(executed(TQListViewItem*)), this, TQT_SLOT(slotExecuted(TQListViewItem*))); } KexiStartupDialogTemplatesPage::~KexiStartupDialogTemplatesPage() @@ -91,7 +91,7 @@ void KexiStartupDialogTemplatesPage::populate() return; m_popuplated = true; KexiTemplateInfo::List list = KexiTemplateLoader::loadListInfo(); - foreach( QValueList<KexiTemplateInfo>::ConstIterator, it, list ) { + foreach( TQValueList<KexiTemplateInfo>::ConstIterator, it, list ) { new TemplateItem(this, (*it).filename, (*it).name, (*it).description, (*it).icon, (*it).autoopenObjects); } @@ -104,12 +104,12 @@ void KexiStartupDialogTemplatesPage::populate() // info = new KTextBrowser(this,"info"); // setResizeMode(templates,KeepSize); // setResizeMode(info,KeepSize); -// connect(templates,SIGNAL(selectionChanged(QIconViewItem*)),this,SLOT(itemClicked(QIconViewItem*))); +// connect(templates,TQT_SIGNAL(selectionChanged(TQIconViewItem*)),this,TQT_SLOT(itemClicked(TQIconViewItem*))); } /* -void TemplatesPage::addItem(const QString& key, const QString& name, - const QString& description, const QPixmap& icon) +void TemplatesPage::addItem(const TQString& key, const TQString& name, + const TQString& description, const TQPixmap& icon) { TemplateItem *item = new TemplateItem(templates, name, icon); item->key=key; @@ -117,35 +117,35 @@ void TemplatesPage::addItem(const QString& key, const QString& name, item->description=description; } -void TemplatesPage::itemClicked(QIconViewItem *item) { +void TemplatesPage::itemClicked(TQIconViewItem *item) { if (!item) { info->setText(""); return; } - QString t = QString("<h2>%1</h2><p>%2</p>") - .arg(static_cast<TemplateItem*>(item)->name) - .arg(static_cast<TemplateItem*>(item)->description); + TQString t = TQString("<h2>%1</h2><p>%2</p>") + .tqarg(static_cast<TemplateItem*>(item)->name) + .tqarg(static_cast<TemplateItem*>(item)->description); #ifndef DB_TEMPLATES - t += QString("<p>") + i18n("We are sorry, templates are not yet available.") +"</p>"; + t += TQString("<p>") + i18n("We are sorry, templates are not yet available.") +"</p>"; #endif info->setText( t ); }*/ -QString KexiStartupDialogTemplatesPage::selectedFileName() const +TQString KexiStartupDialogTemplatesPage::selectedFileName() const { TemplateItem* templateItem = static_cast<TemplateItem*>(selectedItem()); - return templateItem ? templateItem->filename : QString::null; + return templateItem ? templateItem->filename : TQString(); } -QValueList<KexiProjectData::ObjectInfo> +TQValueList<KexiProjectData::ObjectInfo> KexiStartupDialogTemplatesPage::autoopenObjectsForSelectedTemplate() const { TemplateItem* templateItem = static_cast<TemplateItem*>(selectedItem()); - return templateItem ? templateItem->autoopenObjects : QValueList<KexiProjectData::ObjectInfo>(); + return templateItem ? templateItem->autoopenObjects : TQValueList<KexiProjectData::ObjectInfo>(); } -void KexiStartupDialogTemplatesPage::slotExecuted(QListViewItem* item) +void KexiStartupDialogTemplatesPage::slotExecuted(TQListViewItem* item) { TemplateItem* templateItem = static_cast<TemplateItem*>(item); if (!templateItem) diff --git a/kexi/main/startup/KexiStartupDialogTemplatesPage.h b/kexi/main/startup/KexiStartupDialogTemplatesPage.h index 8613065f6..2cf50b7bf 100644 --- a/kexi/main/startup/KexiStartupDialogTemplatesPage.h +++ b/kexi/main/startup/KexiStartupDialogTemplatesPage.h @@ -27,26 +27,27 @@ class KEXIMAIN_EXPORT KexiStartupDialogTemplatesPage : public KListView { Q_OBJECT + TQ_OBJECT public: - KexiStartupDialogTemplatesPage( QWidget * parent = 0 ); + KexiStartupDialogTemplatesPage( TQWidget * tqparent = 0 ); ~KexiStartupDialogTemplatesPage(); -// void addItem(const QString& key, const QString& name, -// const QString& description, const QPixmap& icon); +// void addItem(const TQString& key, const TQString& name, +// const TQString& description, const TQPixmap& icon); - QString selectedFileName() const; + TQString selectedFileName() const; - QValueList<KexiProjectData::ObjectInfo> autoopenObjectsForSelectedTemplate() const; + TQValueList<KexiProjectData::ObjectInfo> autoopenObjectsForSelectedTemplate() const; void populate(); signals: - void selected(const QString& filename); + void selected(const TQString& filename); protected slots: - void slotExecuted(QListViewItem* item); + void slotExecuted(TQListViewItem* item); -// void itemClicked(QIconViewItem *item); +// void itemClicked(TQIconViewItem *item); private: bool m_popuplated : 1; diff --git a/kexi/main/startup/KexiStartupFileDialog.cpp b/kexi/main/startup/KexiStartupFileDialog.cpp index d28699250..c19a96c0b 100644 --- a/kexi/main/startup/KexiStartupFileDialog.cpp +++ b/kexi/main/startup/KexiStartupFileDialog.cpp @@ -23,10 +23,10 @@ #include <core/kexi.h> #include <kexiutils/utils.h> -#include <qlayout.h> -#include <qobjectlist.h> -#include <qpushbutton.h> -#include <qapplication.h> +#include <tqlayout.h> +#include <tqobjectlist.h> +#include <tqpushbutton.h> +#include <tqapplication.h> #include <kmessagebox.h> #include <klocale.h> @@ -36,46 +36,46 @@ #include <kurlcombobox.h> KexiStartupFileDialog::KexiStartupFileDialog( - const QString& startDirOrVariable, int mode, - QWidget *parent, const char *name) - : KexiStartupFileDialogBase(startDirOrVariable, "", parent, name, 0) + const TQString& startDirOrVariable, int mode, + TQWidget *tqparent, const char *name) + : KexiStartupFileDialogBase(startDirOrVariable, "", tqparent, name, 0) , m_confirmOverwrites(true) , m_filtersUpdated(false) { - setSizePolicy(QSizePolicy::Minimum,QSizePolicy::Minimum); + tqsetSizePolicy(TQSizePolicy::Minimum,TQSizePolicy::Minimum); setMode( mode ); - QPoint point( 0, 0 ); - reparent( parentWidget(), point ); + TQPoint point( 0, 0 ); + reparent( tqparentWidget(), point ); - if (layout()) - layout()->setMargin(0); + if (tqlayout()) + tqlayout()->setMargin(0); setMinimumHeight(100); setSizeGripEnabled ( false ); //dirty hack to customize filedialog view: { - QObjectList *l = queryList( "QPushButton" ); - QObjectListIt it( *l ); - QObject *obj; + TQObjectList *l = queryList( TQPUSHBUTTON_OBJECT_NAME_STRING ); + TQObjectListIt it( *l ); + TQObject *obj; while ( (obj = it.current()) != 0 ) { ++it; - static_cast<QPushButton*>(obj)->hide(); + static_cast<TQPushButton*>(TQT_TQWIDGET(obj))->hide(); } delete l; } { - QObjectList *l = queryList("QWidget"); - QObjectListIt it( *l ); - QObject *obj; + TQObjectList *l = queryList(TQWIDGET_OBJECT_NAME_STRING); + TQObjectListIt it( *l ); + TQObject *obj; while ( (obj = it.current()) != 0 ) { ++it; - static_cast<QWidget*>(obj)->installEventFilter(this); + TQT_TQWIDGET(obj)->installEventFilter(this); } delete l; } -#ifdef Q_WS_WIN +#ifdef TQ_WS_WIN if (startDirOrVariable.startsWith(":")) m_lastVisitedPathsVariable = startDirOrVariable; //store for later use #else @@ -86,7 +86,7 @@ KexiStartupFileDialog::KexiStartupFileDialog( KexiStartupFileDialog::~KexiStartupFileDialog() { -#ifdef Q_WS_WIN +#ifdef TQ_WS_WIN saveLastVisitedPath(currentFileName()); #endif } @@ -98,24 +98,24 @@ void KexiStartupFileDialog::setMode(int mode) m_filtersUpdated = false; } -QStringList KexiStartupFileDialog::additionalFilters() const +TQStringList KexiStartupFileDialog::additionalFilters() const { return m_additionalMimeTypes; } -void KexiStartupFileDialog::setAdditionalFilters(const QStringList &mimeTypes) +void KexiStartupFileDialog::setAdditionalFilters(const TQStringList &mimeTypes) { //delayed m_additionalMimeTypes = mimeTypes; m_filtersUpdated = false; } -QStringList KexiStartupFileDialog::excludedFilters() const +TQStringList KexiStartupFileDialog::excludedFilters() const { return m_excludedMimeTypes; } -void KexiStartupFileDialog::setExcludedFilters(const QStringList &mimeTypes) +void KexiStartupFileDialog::setExcludedFilters(const TQStringList &mimeTypes) { //delayed m_excludedMimeTypes = mimeTypes; @@ -128,35 +128,35 @@ void KexiStartupFileDialog::updateFilters() return; m_filtersUpdated = true; - m_lastFileName = QString::null; + m_lastFileName = TQString(); // m_lastUrl = KURL(); clearFilter(); - QString filter; + TQString filter; KMimeType::Ptr mime; - QStringList allfilters; + TQStringList allfilters; const bool normalOpeningMode = m_mode & Opening && !(m_mode & Custom); const bool normalSavingMode = m_mode & SavingFileBasedDB && !(m_mode & Custom); if (normalOpeningMode || normalSavingMode) { mime = KMimeType::mimeType( KexiDB::Driver::defaultFileBasedDriverMimeType() ); - if (mime && m_excludedMimeTypes.find(mime->name())==m_excludedMimeTypes.end()) { + if (mime && m_excludedMimeTypes.tqfind(mime->name())==m_excludedMimeTypes.end()) { filter += KexiUtils::fileDialogFilterString(mime); allfilters += mime->patterns(); } } if (normalOpeningMode || m_mode & SavingServerBasedDB) { mime = KMimeType::mimeType("application/x-kexiproject-shortcut"); - if (mime && m_excludedMimeTypes.find(mime->name())==m_excludedMimeTypes.end()) { + if (mime && m_excludedMimeTypes.tqfind(mime->name())==m_excludedMimeTypes.end()) { filter += KexiUtils::fileDialogFilterString(mime); allfilters += mime->patterns(); } } if (normalOpeningMode || m_mode & SavingServerBasedDB) { mime = KMimeType::mimeType("application/x-kexi-connectiondata"); - if (mime && m_excludedMimeTypes.find(mime->name())==m_excludedMimeTypes.end()) { + if (mime && m_excludedMimeTypes.tqfind(mime->name())==m_excludedMimeTypes.end()) { filter += KexiUtils::fileDialogFilterString(mime); allfilters += mime->patterns(); } @@ -165,37 +165,37 @@ void KexiStartupFileDialog::updateFilters() //! @todo hardcoded for MSA: if (normalOpeningMode) { mime = KMimeType::mimeType("application/x-msaccess"); - if (mime && m_excludedMimeTypes.find(mime->name())==m_excludedMimeTypes.end()) { + if (mime && m_excludedMimeTypes.tqfind(mime->name())==m_excludedMimeTypes.end()) { filter += KexiUtils::fileDialogFilterString(mime); allfilters += mime->patterns(); } } - foreach (QStringList::ConstIterator, it, m_additionalMimeTypes) { + foreach (TQStringList::ConstIterator, it, m_additionalMimeTypes) { if (*it == "all/allfiles") continue; - if (m_excludedMimeTypes.find(*it)!=m_excludedMimeTypes.end()) + if (m_excludedMimeTypes.tqfind(*it)!=m_excludedMimeTypes.end()) continue; filter += KexiUtils::fileDialogFilterString(*it); mime = KMimeType::mimeType(*it); allfilters += mime->patterns(); } - if (m_excludedMimeTypes.find("all/allfiles")==m_excludedMimeTypes.end()) + if (m_excludedMimeTypes.tqfind("all/allfiles")==m_excludedMimeTypes.end()) filter += KexiUtils::fileDialogFilterString("all/allfiles"); // mime = KMimeType::mimeType("all/allfiles"); // if (mime) { -// filter += QString(mime->patterns().isEmpty() ? "*" : mime->patterns().join(" ")) +// filter += TQString(mime->patterns().isEmpty() ? "*" : mime->patterns().join(" ")) // + "|" + mime->comment()+ " (*)\n"; // } //remove duplicates made because upper- and lower-case extenstions are used: - QStringList allfiltersUnique; - QDict<char> uniqueDict(499, false); - foreach (QStringList::ConstIterator, it, allfilters) { + TQStringList allfiltersUnique; + TQDict<char> uniqueDict(499, false); + foreach (TQStringList::ConstIterator, it, allfilters) { // kdDebug() << *it << endl; uniqueDict.insert(*it, (char*)1); } - foreach_dict (QDictIterator<char>, it, uniqueDict) { + foreach_dict (TQDictIterator<char>, it, uniqueDict) { allfiltersUnique += it.currentKey(); } allfiltersUnique.sort(); @@ -226,22 +226,22 @@ void KexiStartupFileDialog::show() } //KURL KexiStartupFileDialog::currentURL() -QString KexiStartupFileDialog::currentFileName() +TQString KexiStartupFileDialog::currentFileName() { - setResult( QDialog::Accepted ); // selectedURL tests for it + setResult( TQDialog::Accepted ); // selectedURL tests for it -#ifdef Q_WS_WIN -// QString path = selectedFile(); +#ifdef TQ_WS_WIN +// TQString path = selectedFile(); //js @todo // kdDebug() << "selectedFile() == " << path << " '" << url().fileName() << "' " << m_lineEdit->text() << endl; - QString path = dir()->absPath(); + TQString path = dir()->absPath(); if (!path.endsWith("/") && !path.endsWith("\\")) path.append("/"); path += m_lineEdit->text(); -// QString path = QFileInfo(selectedFile()).dirPath(true) + "/" + m_lineEdit->text(); +// TQString path = TQFileInfo(selectedFile()).dirPath(true) + "/" + m_lineEdit->text(); #else -// QString path = locationEdit->currentText().stripWhiteSpace(); //url.path().stripWhiteSpace(); that does not work, if the full path is not in the location edit !!!!! - QString path=KexiStartupFileDialogBase::selectedURL().path(); +// TQString path = locationEdit->currentText().stripWhiteSpace(); //url.path().stripWhiteSpace(); that does not work, if the full path is not in the location edit !!!!! + TQString path=KexiStartupFileDialogBase::selectedURL().path(); kdDebug() << "prev selectedURL() == " << path <<endl; kdDebug() << "locationEdit == " << locationEdit->currentText().stripWhiteSpace() <<endl; //make sure user-entered path is acceped: @@ -254,22 +254,22 @@ QString KexiStartupFileDialog::currentFileName() if (!currentFilter().isEmpty()) { if (m_mode & SavingFileBasedDB) { - QStringList filters = QStringList::split(" ", currentFilter()); //.first().stripWhiteSpace(); + TQStringList filters = TQStringList::split(" ", currentFilter()); //.first().stripWhiteSpace(); kdDebug()<< " filter == " << filters << endl; - QString ext = QFileInfo(path).extension(false); + TQString ext = TQFileInfo(path).extension(false); bool hasExtension = false; - for (QStringList::ConstIterator filterIt = filters.constBegin(); + for (TQStringList::ConstIterator filterIt = filters.constBegin(); filterIt != filters.constEnd() && !hasExtension; ++filterIt) { - QString f( (*filterIt).stripWhiteSpace() ); + TQString f( (*filterIt).stripWhiteSpace() ); hasExtension = !f.mid(2).isEmpty() && ext==f.mid(2); } if (!hasExtension) { //no extension: add one - QString defaultExtension( m_defaultExtension ); + TQString defaultExtension( m_defaultExtension ); if (defaultExtension.isEmpty()) defaultExtension = filters.first().stripWhiteSpace().mid(2); //first one - path+=(QString(".")+defaultExtension); + path+=(TQString(".")+defaultExtension); kdDebug() << "KexiStartupFileDialog::checkURL(): append extension, " << path << endl; setSelection( path ); } @@ -284,8 +284,8 @@ QString KexiStartupFileDialog::currentFileName() bool KexiStartupFileDialog::checkFileName() { // KURL url = currentURL(); -// QString path = url.path().stripWhiteSpace(); - QString path = currentFileName().stripWhiteSpace(); +// TQString path = url.path().stripWhiteSpace(); + TQString path = currentFileName().stripWhiteSpace(); // if (url.fileName().stripWhiteSpace().isEmpty()) { if (path.isEmpty()) { @@ -296,11 +296,11 @@ bool KexiStartupFileDialog::checkFileName() kdDebug() << "KexiStartupFileDialog::checkURL() path: " << path << endl; // kdDebug() << "KexiStartupFileDialog::checkURL() fname: " << url.fileName() << endl; //todo if ( url.isLocalFile() ) { - QFileInfo fi(path); + TQFileInfo fi(path); if (mode() & KFile::ExistingOnly) { if ( !fi.exists() ) { KMessageBox::error( this, "<qt>"+i18n( "The file \"%1\" does not exist." ) - .arg( QDir::convertSeparators(path) ) ); + .tqarg( TQDir::convertSeparators(path) ) ); return false; } else if (mode() & KFile::File) { @@ -310,7 +310,7 @@ bool KexiStartupFileDialog::checkFileName() } else if (!fi.isReadable()) { KMessageBox::error( this, "<qt>"+i18n( "The file \"%1\" is not readable." ) - .arg( QDir::convertSeparators(path) ) ); + .tqarg( TQDir::convertSeparators(path) ) ); return false; } } @@ -323,13 +323,13 @@ bool KexiStartupFileDialog::checkFileName() } //static -bool KexiStartupFileDialog::askForOverwriting(const QString& filePath, QWidget *parent) +bool KexiStartupFileDialog::askForOverwriting(const TQString& filePath, TQWidget *tqparent) { - QFileInfo fi(filePath); + TQFileInfo fi(filePath); if (!fi.exists()) return true; - const int res = KMessageBox::warningYesNo( parent, i18n( "The file \"%1\" already exists.\n" - "Do you want to overwrite it?").arg( QDir::convertSeparators(filePath) ), QString::null, + const int res = KMessageBox::warningYesNo( tqparent, i18n( "The file \"%1\" already exists.\n" + "Do you want to overwrite it?").tqarg( TQDir::convertSeparators(filePath) ), TQString(), i18n("Overwrite"), KStdGuiItem::no() ); if (res == KMessageBox::Yes) return true; @@ -339,17 +339,17 @@ bool KexiStartupFileDialog::askForOverwriting(const QString& filePath, QWidget * void KexiStartupFileDialog::accept() { // locationEdit->setFocus(); -// QKeyEvent ev(QEvent::KeyPress, Qt::Key_Enter, '\n', 0); -// QApplication::sendEvent(locationEdit, &ev); -// QApplication::postEvent(locationEdit, &ev); +// TQKeyEvent ev(TQEvent::KeyPress, TQt::Key_Enter, '\n', 0); +// TQApplication::sendEvent(locationEdit, &ev); +// TQApplication::postEvent(locationEdit, &ev); // kdDebug() << "KexiStartupFileDialog::accept() m_lastUrl == " << m_lastUrl.path() << endl; // if (m_lastUrl.path()==currentURL().path()) {//(js) to prevent more multiple kjob signals (I do not know why this is) if (m_lastFileName==currentFileName()) {//(js) to prevent more multiple kjob signals (I do not know why this is) // m_lastUrl=KURL(); - m_lastFileName=QString::null; + m_lastFileName=TQString(); kdDebug() << "m_lastFileName==currentFileName()" << endl; -#ifdef Q_WS_WIN +#ifdef TQ_WS_WIN return; #endif } @@ -365,7 +365,7 @@ void KexiStartupFileDialog::accept() // m_lastUrl = currentURL(); m_lastFileName = currentFileName(); -#ifdef Q_WS_WIN +#ifdef TQ_WS_WIN saveLastVisitedPath(m_lastFileName); #endif } @@ -376,7 +376,7 @@ void KexiStartupFileDialog::reject() emit rejected(); } -/*#ifndef Q_WS_WIN +/*#ifndef TQ_WS_WIN KURLComboBox *KexiStartupFileDialog::locationWidget() const { return locationEdit; @@ -384,9 +384,9 @@ KURLComboBox *KexiStartupFileDialog::locationWidget() const #endif */ -void KexiStartupFileDialog::setLocationText(const QString& fn) +void KexiStartupFileDialog::setLocationText(const TQString& fn) { -#ifdef Q_WS_WIN +#ifdef TQ_WS_WIN //js @todo setSelection(fn); #else @@ -399,19 +399,19 @@ void KexiStartupFileDialog::setLocationText(const QString& fn) void KexiStartupFileDialog::setFocus() { -#ifdef Q_WS_WIN +#ifdef TQ_WS_WIN m_lineEdit->setFocus(); #else locationEdit->setFocus(); #endif } -bool KexiStartupFileDialog::eventFilter ( QObject * watched, QEvent * e ) +bool KexiStartupFileDialog::eventFilter ( TQObject * watched, TQEvent * e ) { //filter-out ESC key - if (e->type()==QEvent::KeyPress && static_cast<QKeyEvent*>(e)->key()==Qt::Key_Escape - && static_cast<QKeyEvent*>(e)->state()==Qt::NoButton) { - static_cast<QKeyEvent*>(e)->accept(); + if (e->type()==TQEvent::KeyPress && TQT_TQKEYEVENT(e)->key()==TQt::Key_Escape + && TQT_TQKEYEVENT(e)->state()==Qt::NoButton) { + TQT_TQKEYEVENT(e)->accept(); emit rejected(); return true; } diff --git a/kexi/main/startup/KexiStartupFileDialog.h b/kexi/main/startup/KexiStartupFileDialog.h index 87ebf7f4d..12fc3ef40 100644 --- a/kexi/main/startup/KexiStartupFileDialog.h +++ b/kexi/main/startup/KexiStartupFileDialog.h @@ -22,7 +22,7 @@ #include <kfiledialog.h> -#ifdef Q_WS_WIN +#ifdef TQ_WS_WIN # include "KexiStartupFileDialogBase_win.h" #else typedef KFileDialog KexiStartupFileDialogBase; @@ -33,6 +33,7 @@ class KEXIMAIN_EXPORT KexiStartupFileDialog : public KexiStartupFileDialogBase { Q_OBJECT + TQ_OBJECT public: /*! Dialog mode: @@ -49,43 +50,43 @@ public: }; KexiStartupFileDialog( - const QString& startDirOrVariable, int mode, QWidget *parent=0, const char *name=0); + const TQString& startDirOrVariable, int mode, TQWidget *tqparent=0, const char *name=0); virtual ~KexiStartupFileDialog(); /*! Helper. Displays "The file %1 already exists. Do you want to overwrite it?" yes/no message box. - \a parent is used as a parent of the KMessageBox. + \a tqparent is used as a tqparent of the KMessageBox. \return true if \a filePath file does not exists or user has agreed on overwriting, false in user do not want to overwrite. */ - static bool askForOverwriting(const QString& filePath, QWidget *parent = 0); + static bool askForOverwriting(const TQString& filePath, TQWidget *tqparent = 0); void setMode(int mode); - QStringList additionalFilters() const; + TQStringList additionalFilters() const; //! Sets additional filters list, e.g. "text/x-csv" - void setAdditionalFilters(const QStringList &mimeTypes); + void setAdditionalFilters(const TQStringList &mimeTypes); - QStringList excludedFilters() const; + TQStringList excludedFilters() const; //! Excludes filters list - void setExcludedFilters(const QStringList &mimeTypes); + void setExcludedFilters(const TQStringList &mimeTypes); // KURL currentURL(); - QString currentFileName(); + TQString currentFileName(); -//#ifndef Q_WS_WIN +//#ifndef TQ_WS_WIN // KURLComboBox *locationWidget() const; //#endif //! just sets locationWidget()->setCurrentText(fn) //! (and something similar on win32) - void setLocationText(const QString& fn); + void setLocationText(const TQString& fn); //! Sets default extension which will be added after accepting //! if user didn't provided one. This method is usable when there is //! more than one filter so there is no rule what extension should be selected //! (by default first one is selected). - void setDefaultExtension(const QString& ext) { m_defaultExtension = ext; } + void setDefaultExtension(const TQString& ext) { m_defaultExtension = ext; } /*! \return true if the current URL meets requies constraints (i.e. exists or doesn't exist); @@ -97,7 +98,7 @@ public: This is true by default. */ void setConfirmOverwrites(bool set) { m_confirmOverwrites = set; } - virtual bool eventFilter ( QObject * watched, QEvent * e ); + virtual bool eventFilter ( TQObject * watched, TQEvent * e ); public slots: virtual void show(); @@ -120,10 +121,10 @@ private: void updateFilters(); // KURL m_lastUrl; - QString m_lastFileName; + TQString m_lastFileName; int m_mode; - QStringList m_additionalMimeTypes, m_excludedMimeTypes; - QString m_defaultExtension; + TQStringList m_additionalMimeTypes, m_excludedMimeTypes; + TQString m_defaultExtension; bool m_confirmOverwrites : 1; bool m_filtersUpdated : 1; }; diff --git a/kexi/main/startup/KexiStartupFileDialogBase_win.h b/kexi/main/startup/KexiStartupFileDialogBase_win.h index 7d7f56e03..00742c690 100644 --- a/kexi/main/startup/KexiStartupFileDialogBase_win.h +++ b/kexi/main/startup/KexiStartupFileDialogBase_win.h @@ -20,47 +20,47 @@ #ifndef _KexiStartupFileDialogBase_win_h_ #define _KexiStartupFileDialogBase_win_h_ -#include <qfiledialog.h> -#include <qpushbutton.h> +#include <tqfiledialog.h> +#include <tqpushbutton.h> class KexiStartupFileDialogBasePrivate; -/*! Wrapper for win32-like file dialog. QFileDialog is used for this. - Temporary moved from QKW KFileDialog implementation. +/*! Wrapper for win32-like file dialog. TQFileDialog is used for this. + Temporary moved from TQKW KFileDialog implementation. TODO: move to KDElibs/win32 KFileDialog wrapper */ -class KexiStartupFileDialogBase : public QFileDialog +class KexiStartupFileDialogBase : public TQFileDialog { public: - KexiStartupFileDialogBase(const QString & dirName, const QString & filter = QString::null, - QWidget * parent = 0, const char * name = 0, bool modal = false ); + KexiStartupFileDialogBase(const TQString & dirName, const TQString & filter = TQString(), + TQWidget * tqparent = 0, const char * name = 0, bool modal = false ); ~KexiStartupFileDialogBase(); - QPushButton * okButton() const { return m_okBtn; } + TQPushButton * okButton() const { return m_okBtn; } void clearFilter(); - void setFilter(const QString& filter); + void setFilter(const TQString& filter); void setOperationMode( KFileDialog::OperationMode mode ); void setMode( KFile::Mode m ); void setMode( unsigned int m ); - QString currentFilter() const; - void setMimeFilter( const QStringList& mimeTypes, const QString& defaultType = QString::null ); + TQString currentFilter() const; + void setMimeFilter( const TQStringList& mimeTypes, const TQString& defaultType = TQString() ); KFile::Mode mode() const; protected: - void init(const QString& startDir, const QString& filter, QWidget* widget); + void init(const TQString& startDir, const TQString& filter, TQWidget* widget); void updateAutoSelectExtension() {}; - //! Helper added because QFileDialog on win32 doesn't support ":" prefixes + //! Helper added because TQFileDialog on win32 doesn't support ":" prefixes //! for recent dir's storage. - QString realStartDir(const QString& startDir); + TQString realStartDir(const TQString& startDir); - void saveLastVisitedPath(const QString& path); + void saveLastVisitedPath(const TQString& path); - QPushButton* m_okBtn; - QLineEdit* m_lineEdit; - QString m_lastVisitedPathsVariable; //!< Used by win32; @see realStartDir() + TQPushButton* m_okBtn; + TQLineEdit* m_lineEdit; + TQString m_lastVisitedPathsVariable; //!< Used by win32; @see realStartDir() KexiStartupFileDialogBasePrivate* d; }; diff --git a/kexi/main/startup/KexiStartupFileDialog_win.cpp b/kexi/main/startup/KexiStartupFileDialog_win.cpp index aa06fb9a1..a51cd0c4e 100644 --- a/kexi/main/startup/KexiStartupFileDialog_win.cpp +++ b/kexi/main/startup/KexiStartupFileDialog_win.cpp @@ -18,7 +18,7 @@ */ /*! - Temporary moved from QKW KFileDialog implementation. + Temporary moved from TQKW KFileDialog implementation. TODO: move to KDElibs/win32 KFileDialog wrapper */ @@ -29,8 +29,8 @@ #include <kdebug.h> #include <krecentdirs.h> -#include <qobjectlist.h> -#include <qlineedit.h> +#include <tqobjectlist.h> +#include <tqlineedit.h> #include <win/win32_utils.h> @@ -41,31 +41,31 @@ class KexiStartupFileDialogBasePrivate KexiStartupFileDialogBasePrivate() {} KFile::Mode mode; - QString kde_filters; - QStringList mimetypes; + TQString kde_filters; + TQStringList mimetypes; }; KexiStartupFileDialogBase::KexiStartupFileDialogBase( - const QString & dirName, const QString & filter, - QWidget * parent, const char * name, bool modal ) - : QFileDialog( realStartDir(dirName), filter, parent, name, modal ) + const TQString & dirName, const TQString & filter, + TQWidget * tqparent, const char * name, bool modal ) + : TQFileDialog( realStartDir(dirName), filter, tqparent, name, modal ) , d(new KexiStartupFileDialogBasePrivate()) { -// QString _dirName = dirName; - QString _dirName = dirPath(); +// TQString _dirName = dirName; + TQString _dirName = dirPath(); //make default 'My Documents' folder //TODO: store changes in the app's config file? if (_dirName.isEmpty()) _dirName = KGlobalSettings::documentPath(); - init(_dirName, filter, parent); + init(_dirName, filter, tqparent); - //find "OK" button - QObjectList *l = queryList( "QPushButton", "OK", false ); - m_okBtn = dynamic_cast<QPushButton*>(l->first()); + //tqfind "OK" button + TQObjectList *l = queryList( TQPUSHBUTTON_OBJECT_NAME_STRING, "OK", false ); + m_okBtn = dynamic_cast<TQPushButton*>(l->first()); delete l; - l = queryList( "QLineEdit", "name/filter editor", false ); - m_lineEdit = dynamic_cast<QLineEdit*>(l->first()); + l = queryList( TQLINEEDIT_OBJECT_NAME_STRING, "name/filter editor", false ); + m_lineEdit = dynamic_cast<TQLineEdit*>(l->first()); delete l; adjustSize(); @@ -75,7 +75,7 @@ KexiStartupFileDialogBase::~KexiStartupFileDialogBase() { } -void KexiStartupFileDialogBase::init(const QString& startDir, const QString& filter, QWidget* widget) +void KexiStartupFileDialogBase::init(const TQString& startDir, const TQString& filter, TQWidget* widget) { //TODO initStatic(); //TODO d = new KFileDialogPrivate(); @@ -85,16 +85,16 @@ void KexiStartupFileDialogBase::init(const QString& startDir, const QString& fil //TODO d->operationMode = Opening; setMode(KFile::File | KFile::ExistingOnly); //(js) default: open action setIcon( KGlobal::iconLoader()->loadIcon("fileopen", KIcon::Desktop) ); - setDir(QDir(startDir)); + setDir(TQDir(startDir)); //TODO d->hasDefaultFilter = false; //TODO d->hasView = false; -//(js) d->mainWidget = new QWidget( this, "KFileDialog::mainWidget"); +//(js) d->mainWidget = new TQWidget( this, "KFileDialog::mainWidget"); //(js) setMainWidget( d->mainWidget ); //(js) d->okButton = new KPushButton( KStdGuiItem::ok(), d->mainWidget ); //(js) d->okButton->setDefault( true ); //(js) d->cancelButton = new KPushButton(KStdGuiItem::cancel(), d->mainWidget); -//(js) connect( d->okButton, SIGNAL( clicked() ), SLOT( slotOk() )); -//(js) connect( d->cancelButton, SIGNAL( clicked() ), SLOT( slotCancel() )); +//(js) connect( d->okButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotOk() )); +//(js) connect( d->cancelButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotCancel() )); //(js) d->customWidget = widget; //(js) d->autoSelectExtCheckBox = 0; // delayed loading //TODO d->autoSelectExtChecked = false; @@ -105,42 +105,42 @@ void KexiStartupFileDialogBase::init(const QString& startDir, const QString& fil //TODO true ); //TODO d->completionLock = false; -//TODO QtMsgHandler oldHandler = qInstallMsgHandler( silenceQToolBar ); +//TODO TQtMsgHandler oldHandler = tqInstallMsgHandler( silenceTQToolBar ); //TODO toolbar = 0; //(js) //(js) toolbar = new KToolBar( d->mainWidget, "KFileDialog::toolbar", true); //(js) toolbar->setFlat(true); -//TODO qInstallMsgHandler( oldHandler ); +//TODO tqInstallMsgHandler( oldHandler ); //(js) d->pathCombo = new KURLComboBox( KURLComboBox::Directories, true, //(js) toolbar, "path combo" ); -//(js) QToolTip::add( d->pathCombo, i18n("Often used directories") ); -//(js) QWhatsThis::add( d->pathCombo, "<qt>" + i18n("Commonly used locations are listed here. " +//(js) TQToolTip::add( d->pathCombo, i18n("Often used directories") ); +//(js) TQWhatsThis::add( d->pathCombo, "<qt>" + i18n("Commonly used locations are listed here. " //(js) "This includes standard locations, such as your home directory, as well as " //(js) "locations that have been visited recently.") + autocompletionWhatsThisText); /* KURL u; - u.setPath( QDir::rootDirPath() ); - QString text = i18n("Root Directory: %1").arg( u.path() ); + u.setPath( TQDir::rootDirPath() ); + TQString text = i18n("Root Directory: %1").tqarg( u.path() ); d->pathCombo->addDefaultURL( u, KMimeType::pixmapForURL( u, 0, KIcon::Small ), text ); - u.setPath( QDir::homeDirPath() ); - text = i18n("Home Directory: %1").arg( u.path( +1 ) ); + u.setPath( TQDir::homeDirPath() ); + text = i18n("Home Directory: %1").tqarg( u.path( +1 ) ); d->pathCombo->addDefaultURL( u, KMimeType::pixmapForURL( u, 0, KIcon::Small ), text ); KURL docPath; docPath.setPath( KGlobalSettings::documentPath() ); if ( u.path(+1) != docPath.path(+1) ) { - text = i18n("Documents: %1").arg( docPath.path( +1 ) ); + text = i18n("Documents: %1").tqarg( docPath.path( +1 ) ); d->pathCombo->addDefaultURL( u, KMimeType::pixmapForURL( u, 0, KIcon::Small ), text ); } u.setPath( KGlobalSettings::desktopPath() ); - text = i18n("Desktop: %1").arg( u.path( +1 ) ); + text = i18n("Desktop: %1").tqarg( u.path( +1 ) ); d->pathCombo->addDefaultURL( u, KMimeType::pixmapForURL( u, 0, KIcon::Small ), text ); @@ -153,10 +153,10 @@ void KexiStartupFileDialogBase::init(const QString& startDir, const QString& fil // If local, check it exists. If not, go up until it exists. if ( d->url.isLocalFile() ) { - if ( !QFile::exists( d->url.path() ) ) + if ( !TQFile::exists( d->url.path() ) ) { d->url = d->url.upURL(); - QDir dir( d->url.path() ); + TQDir dir( d->url.path() ); while ( !dir.exists() ) { d->url = d->url.upURL(); @@ -167,14 +167,14 @@ void KexiStartupFileDialogBase::init(const QString& startDir, const QString& fil ops = new KDirOperator(d->url, d->mainWidget, "KFileDialog::ops"); ops->setOnlyDoubleClickSelectsFiles( true ); - connect(ops, SIGNAL(urlEntered(const KURL&)), - SLOT(urlEntered(const KURL&))); - connect(ops, SIGNAL(fileHighlighted(const KFileItem *)), - SLOT(fileHighlighted(const KFileItem *))); - connect(ops, SIGNAL(fileSelected(const KFileItem *)), - SLOT(fileSelected(const KFileItem *))); - connect(ops, SIGNAL(finishedLoading()), - SLOT(slotLoadingFinished())); + connect(ops, TQT_SIGNAL(urlEntered(const KURL&)), + TQT_SLOT(urlEntered(const KURL&))); + connect(ops, TQT_SIGNAL(fileHighlighted(const KFileItem *)), + TQT_SLOT(fileHighlighted(const KFileItem *))); + connect(ops, TQT_SIGNAL(fileSelected(const KFileItem *)), + TQT_SLOT(fileSelected(const KFileItem *))); + connect(ops, TQT_SIGNAL(finishedLoading()), + TQT_SLOT(slotLoadingFinished())); ops->setupMenu(KDirOperator::SortActions | KDirOperator::FileActions | @@ -183,9 +183,9 @@ void KexiStartupFileDialogBase::init(const QString& startDir, const QString& fil // plug nav items into the toolbar coll->action( "up" )->plug( toolbar ); - coll->action( "up" )->setWhatsThis(i18n("<qt>Click this button to enter the parent directory.<p>" + coll->action( "up" )->setWhatsThis(i18n("<qt>Click this button to enter the tqparent directory.<p>" "For instance, if the current location is file:/home/%1 clicking this " - "button will take you to file:/home.</qt>").arg(getlogin())); + "button will take you to file:/home.</qt>").tqarg(getlogin())); coll->action( "back" )->plug( toolbar ); coll->action( "back" )->setWhatsThis(i18n("Click this button to move backwards one step in the browsing history.")); coll->action( "forward" )->plug( toolbar ); @@ -197,24 +197,24 @@ void KexiStartupFileDialogBase::init(const QString& startDir, const QString& fil coll->action( "mkdir" )->setWhatsThis(i18n("Click this button to create a new directory.")); d->bookmarkHandler = new KFileBookmarkHandler( this ); - toolbar->insertButton(QString::fromLatin1("bookmark"), + toolbar->insertButton(TQString::tqfromLatin1("bookmark"), (int)HOTLIST_BUTTON, true, i18n("Bookmarks")); toolbar->getButton(HOTLIST_BUTTON)->setPopup( d->bookmarkHandler->menu(), true); - QWhatsThis::add(toolbar->getButton(HOTLIST_BUTTON), + TQWhatsThis::add(toolbar->getButton(HOTLIST_BUTTON), i18n("<qt>This button allows you to bookmark specific locations. " "Click on this button to open the bookmark menu where you may add, " "edit or select a bookmark.<p>" "These bookmarks are specific to the file dialog, but otherwise operate " "like bookmarks elsewhere in KDE.</qt>")); - connect( d->bookmarkHandler, SIGNAL( openURL( const QString& )), - SLOT( enterURL( const QString& ))); + connect( d->bookmarkHandler, TQT_SIGNAL( openURL( const TQString& )), + TQT_SLOT( enterURL( const TQString& ))); KToggleAction *showSidebarAction = new KToggleAction(i18n("Show Quick Access Navigation Panel"), Key_F9, coll,"toggleSpeedbar"); - connect( showSidebarAction, SIGNAL( toggled( bool ) ), - SLOT( toggleSpeedbar( bool )) ); + connect( showSidebarAction, TQT_SIGNAL( toggled( bool ) ), + TQT_SLOT( toggleSpeedbar( bool )) ); KActionMenu *menu = new KActionMenu( i18n("Configure"), "configure", this, "extra menu" ); menu->setWhatsThis(i18n("<qt>This is the configuration menu for the file dialog. " @@ -241,15 +241,15 @@ void KexiStartupFileDialogBase::init(const QString& startDir, const QString& fil menu->insert( coll->action( "separate dirs" )); menu->setDelayed( false ); - connect( menu->popupMenu(), SIGNAL( aboutToShow() ), - ops, SLOT( updateSelectionDependentActions() )); + connect( menu->popupMenu(), TQT_SIGNAL( aboutToShow() ), + ops, TQT_SLOT( updateSelectionDependentActions() )); menu->plug( toolbar ); */ /* * ugly little hack to have a 5 pixel space between the buttons * and the combo box */ -/* QWidget *spacerWidget = new QWidget(toolbar); +/* TQWidget *spacerWidget = new TQWidget(toolbar); //(js) spacerWidget->setMinimumWidth(spacingHint()); //(js) spacerWidget->setMaximumWidth(spacingHint()); d->m_pathComboIndex = toolbar->insertWidget(-1, -1, spacerWidget); @@ -264,21 +264,21 @@ void KexiStartupFileDialogBase::init(const QString& startDir, const QString& fil d->pathCombo->setCompletionObject( ops->dirCompletionObject(), false ); - connect( d->pathCombo, SIGNAL( urlActivated( const KURL& )), - this, SLOT( enterURL( const KURL& ) )); - connect( d->pathCombo, SIGNAL( returnPressed( const QString& )), - this, SLOT( enterURL( const QString& ) )); - connect( d->pathCombo, SIGNAL(textChanged( const QString& )), - SLOT( pathComboChanged( const QString& ) )); - connect( d->pathCombo, SIGNAL( completion( const QString& )), - SLOT( dirCompletion( const QString& ))); - connect( d->pathCombo, SIGNAL( textRotation(KCompletionBase::KeyBindingType) ), - d->pathCombo, SLOT( rotateText(KCompletionBase::KeyBindingType) )); + connect( d->pathCombo, TQT_SIGNAL( urlActivated( const KURL& )), + this, TQT_SLOT( enterURL( const KURL& ) )); + connect( d->pathCombo, TQT_SIGNAL( returnPressed( const TQString& )), + this, TQT_SLOT( enterURL( const TQString& ) )); + connect( d->pathCombo, TQT_SIGNAL(textChanged( const TQString& )), + TQT_SLOT( pathComboChanged( const TQString& ) )); + connect( d->pathCombo, TQT_SIGNAL( completion( const TQString& )), + TQT_SLOT( dirCompletion( const TQString& ))); + connect( d->pathCombo, TQT_SIGNAL( textRotation(KCompletionBase::KeyBindingType) ), + d->pathCombo, TQT_SLOT( rotateText(KCompletionBase::KeyBindingType) )); - QString whatsThisText; + TQString whatsThisText; // the Location label/edit - d->locationLabel = new QLabel(i18n("&Location:"), d->mainWidget); + d->locationLabel = new TQLabel(i18n("&Location:"), d->mainWidget); locationEdit = new KURLComboBox(KURLComboBox::Files, true, d->mainWidget, "LocationEdit"); updateLocationWhatsThis (); @@ -293,14 +293,14 @@ void KexiStartupFileDialogBase::init(const QString& startDir, const QString& fil // locationEdit->setAutoDeleteCompletionObject( true ); locationEdit->setCompletionObject( ops->completionObject(), false ); - connect( locationEdit, SIGNAL( returnPressed() ), - this, SLOT( slotOk())); - connect(locationEdit, SIGNAL( activated( const QString& )), - this, SLOT( locationActivated( const QString& ) )); - connect( locationEdit, SIGNAL( completion( const QString& )), - SLOT( fileCompletion( const QString& ))); - connect( locationEdit, SIGNAL( textRotation(KCompletionBase::KeyBindingType) ), - locationEdit, SLOT( rotateText(KCompletionBase::KeyBindingType) )); + connect( locationEdit, TQT_SIGNAL( returnPressed() ), + this, TQT_SLOT( slotOk())); + connect(locationEdit, TQT_SIGNAL( activated( const TQString& )), + this, TQT_SLOT( locationActivated( const TQString& ) )); + connect( locationEdit, TQT_SIGNAL( completion( const TQString& )), + TQT_SLOT( fileCompletion( const TQString& ))); + connect( locationEdit, TQT_SIGNAL( textRotation(KCompletionBase::KeyBindingType) ), + locationEdit, TQT_SLOT( rotateText(KCompletionBase::KeyBindingType) )); // the Filter label/edit whatsThisText = i18n("<qt>This is the filter to apply to the file list. " @@ -309,19 +309,19 @@ void KexiStartupFileDialogBase::init(const QString& startDir, const QString& fil "drop down menu, or you may enter a custom filter " "directly into the text area.<p>" "Wildcards such as * and ? are allowed.</qt>"); - d->filterLabel = new QLabel(i18n("&Filter:"), d->mainWidget); - QWhatsThis::add(d->filterLabel, whatsThisText); + d->filterLabel = new TQLabel(i18n("&Filter:"), d->mainWidget); + TQWhatsThis::add(d->filterLabel, whatsThisText); filterWidget = new KFileFilterCombo(d->mainWidget, "KFileDialog::filterwidget"); - QWhatsThis::add(filterWidget, whatsThisText); + TQWhatsThis::add(filterWidget, whatsThisText); setFilter(filter); d->filterLabel->setBuddy(filterWidget); - connect(filterWidget, SIGNAL(filterChanged()), SLOT(slotFilterChanged())); + connect(filterWidget, TQT_SIGNAL(filterChanged()), TQT_SLOT(slotFilterChanged())); // the Automatically Select Extension checkbox // (the text, visibility etc. is set in updateAutoSelectExtension(), which is called by readConfig()) - d->autoSelectExtCheckBox = new QCheckBox (d->mainWidget); - connect(d->autoSelectExtCheckBox, SIGNAL(clicked()), SLOT(slotAutoSelectExtClicked())); + d->autoSelectExtCheckBox = new TQCheckBox (d->mainWidget); + connect(d->autoSelectExtCheckBox, TQT_SIGNAL(clicked()), TQT_SLOT(slotAutoSelectExtClicked())); initGUI(); // activate GM @@ -342,7 +342,7 @@ void KexiStartupFileDialogBase::init(const QString& startDir, const QString& fil void KexiStartupFileDialogBase::clearFilter() { d->kde_filters = "";//(js) - QFileDialog::setFilter(""); //(js); + TQFileDialog::setFilter(""); //(js); //todo d->mimetypes.clear(); //todo d->hasDefaultFilter = false; @@ -356,15 +356,15 @@ KFile::Mode KexiStartupFileDialogBase::mode() const void KexiStartupFileDialogBase::setMode( KFile::Mode m ) { - //(js) translate mode for QFileDialog + //(js) translate mode for TQFileDialog d->mode = m; - QFileDialog::Mode qm = (QFileDialog::Mode)0; - if (m & KFile::File) qm = Mode(qm | QFileDialog::AnyFile); - else if (m & KFile::Directory) qm = Mode(qm | QFileDialog::DirectoryOnly); - if (m & KFile::Files) qm = Mode(qm | QFileDialog::ExistingFiles); - if (m & KFile::ExistingOnly) qm = Mode(qm | QFileDialog::ExistingFile); + TQFileDialog::Mode qm = (TQFileDialog::Mode)0; + if (m & KFile::File) qm = Mode(qm | TQFileDialog::AnyFile); + else if (m & KFile::Directory) qm = Mode(qm | TQFileDialog::DirectoryOnly); + if (m & KFile::Files) qm = Mode(qm | TQFileDialog::ExistingFiles); + if (m & KFile::ExistingOnly) qm = Mode(qm | TQFileDialog::ExistingFile); - QFileDialog::setMode( qm ); + TQFileDialog::setMode( qm ); /*(js) ops->setMode(m); if ( ops->dirOnlyMode() ) { //(js) filterWidget->setDefaultFilter( i18n("*|All Directories") ); @@ -395,35 +395,35 @@ void KexiStartupFileDialogBase::setOperationMode( KFileDialog::OperationMode mod updateAutoSelectExtension (); } -QString KexiStartupFileDialogBase::currentFilter() const +TQString KexiStartupFileDialogBase::currentFilter() const { //(js)filterWidget->currentFilter(); - //we need to convert Qt filter format to KDE format - //Qt format: "some text (*.first *.second)" or "All (*)" + //we need to convert TQt filter format to KDE format + //TQt format: "some text (*.first *.second)" or "All (*)" //KDE format: "*.first *.second" or "*" - QString f = selectedFilter(); - if (f.find('(')!=-1) - f = f.mid(f.find('(')+1); - if (f.mid(f.find(')')!=-1)) - f = f.left(f.find(')')); + TQString f = selectedFilter(); + if (f.tqfind('(')!=-1) + f = f.mid(f.tqfind('(')+1); + if (f.mid(f.tqfind(')')!=-1)) + f = f.left(f.tqfind(')')); return f; } -void KexiStartupFileDialogBase::setFilter(const QString& filter) +void KexiStartupFileDialogBase::setFilter(const TQString& filter) { d->kde_filters = filter; - int pos = d->kde_filters.find('/'); + int pos = d->kde_filters.tqfind('/'); // Check for an un-escaped '/', if found // interpret as a MIME filter. if (pos > 0 && filter[pos - 1] != '\\') { - QStringList filters = QStringList::split( " ", d->kde_filters ); + TQStringList filters = TQStringList::split( " ", d->kde_filters ); setMimeFilter( filters ); return; } - QFileDialog::setFilters( convertKFileDialogFilterToQFileDialogFilter(filter) ); + TQFileDialog::setFilters( convertKFileDialogFilterToTQFileDialogFilter(filter) ); //</js> //(js) ops->clearFilter(); //(js) filterWidget->setFilter(copy); @@ -434,14 +434,14 @@ void KexiStartupFileDialogBase::setFilter(const QString& filter) updateAutoSelectExtension (); } -void KexiStartupFileDialogBase::setMimeFilter( const QStringList& mimeTypes, - const QString& defaultType ) +void KexiStartupFileDialogBase::setMimeFilter( const TQStringList& mimeTypes, + const TQString& defaultType ) { d->mimetypes = mimeTypes; //(js) filterWidget->setMimeFilter( mimeTypes, defaultType ); -//(js) QStringList types = QStringList::split(" ", filterWidget->currentFilter()); -//(js) types.append( QString::fromLatin1( "inode/directory" )); +//(js) TQStringList types = TQStringList::split(" ", filterWidget->currentFilter()); +//(js) types.append( TQString::tqfromLatin1( "inode/directory" )); //(js) ops->clearFilter(); //(js) ops->setMimeFilter( types ); //(js) d->hasDefaultFilter = !defaultType.isEmpty(); @@ -451,25 +451,25 @@ void KexiStartupFileDialogBase::setMimeFilter( const QStringList& mimeTypes, //TODO updateAutoSelectExtension (); } -QString KexiStartupFileDialogBase::realStartDir(const QString& startDir) +TQString KexiStartupFileDialogBase::realStartDir(const TQString& startDir) { if (!startDir.startsWith(":")) return startDir; - QString recentDir; //dummy - QString path( KFileDialog::getStartURL(startDir, recentDir).path() ); + TQString recentDir; //dummy + TQString path( KFileDialog::getStartURL(startDir, recentDir).path() ); if (path.isEmpty()) - return QString::null; - QFileInfo fi(path); + return TQString(); + TQFileInfo fi(path); return fi.isDir() ? fi.absFilePath() : fi.dir(true).absPath(); } -void KexiStartupFileDialogBase::saveLastVisitedPath(const QString& path) +void KexiStartupFileDialogBase::saveLastVisitedPath(const TQString& path) { if (!m_lastVisitedPathsVariable.isEmpty()) { //save last visited dir path -// QString dir = QDir(path).absPath(); - QFileInfo fi(path); - QString dir( fi.isDir() ? fi.absFilePath() : fi.dir(true).absPath() ); +// TQString dir = TQDir(path).absPath(); + TQFileInfo fi(path); + TQString dir( fi.isDir() ? fi.absFilePath() : fi.dir(true).absPath() ); if (!dir.isEmpty()) KRecentDirs::add(m_lastVisitedPathsVariable, dir); } diff --git a/kexi/main/startup/KexiStartup_p.cpp b/kexi/main/startup/KexiStartup_p.cpp index df7cddc66..e8139e181 100644 --- a/kexi/main/startup/KexiStartup_p.cpp +++ b/kexi/main/startup/KexiStartup_p.cpp @@ -25,11 +25,11 @@ #include <kdebug.h> #include <klocale.h> -#include <qfileinfo.h> -#include <qdir.h> -#include <qapplication.h> +#include <tqfileinfo.h> +#include <tqdir.h> +#include <tqapplication.h> -SQLite2ToSQLite3Migration::SQLite2ToSQLite3Migration(const QString& filePath) +SQLite2ToSQLite3Migration::SQLite2ToSQLite3Migration(const TQString& filePath) : m_filePath(filePath) { m_process = 0; @@ -50,33 +50,33 @@ tristate SQLite2ToSQLite3Migration::run() if (m_run) return false; m_run = true; - const QString ksqlite2to3_app = KStandardDirs::findExe( "ksqlite2to3" ); + const TQString ksqlite2to3_app = KStandardDirs::findExe( "ksqlite2to3" ); if (ksqlite2to3_app.isEmpty()) return false; - QFileInfo fi(m_filePath); + TQFileInfo fi(m_filePath); if (fi.isSymLink()) { m_filePath = fi.readLink(); - fi = QFileInfo(m_filePath); + fi = TQFileInfo(m_filePath); } //remember permissions of m_filePath - m_restoreStat = (0==stat(QFile::encodeName(m_filePath), &m_st)); + m_restoreStat = (0==stat(TQFile::encodeName(m_filePath), &m_st)); m_process = new KProcess(this, "process"); *m_process << ksqlite2to3_app << m_filePath; m_process->setWorkingDirectory( fi.dir(true).absPath() ); - connect( m_process, SIGNAL(receivedStderr(KProcess*,char*,int)), - this, SLOT(receivedStderr(KProcess*,char*,int))); - connect( m_process, SIGNAL(processExited(KProcess*)), this, SLOT(processExited(KProcess*)) ); + connect( m_process, TQT_SIGNAL(receivedStderr(KProcess*,char*,int)), + this, TQT_SLOT(receivedStderr(KProcess*,char*,int))); + connect( m_process, TQT_SIGNAL(processExited(KProcess*)), this, TQT_SLOT(processExited(KProcess*)) ); if (!m_process->start(KProcess::NotifyOnExit, KProcess::Stderr)) return false; - m_dlg = new KProgressDialog(0, 0, QString::null, + m_dlg = new KProgressDialog(0, 0, TQString(), i18n("Saving \"%1\" project file to a new \"%2\" database format...") - .arg(QDir::convertSeparators(QFileInfo(m_filePath).fileName())).arg("SQLite3") + .tqarg(TQDir::convertSeparators(TQFileInfo(m_filePath).fileName())).tqarg("SQLite3") ); m_dlg->setModal(true); - connect(m_dlg, SIGNAL(cancelClicked()), this, SLOT(cancelClicked())); + connect(m_dlg, TQT_SIGNAL(cancelClicked()), this, TQT_SLOT(cancelClicked())); m_dlg->setMinimumDuration(1000); m_dlg->setAutoClose(true); m_dlg->progressBar()->setTotalSteps(100); @@ -107,8 +107,8 @@ void SQLite2ToSQLite3Migration::processExited(KProcess* process) if (result == true) { if (m_restoreStat) { //restore permissions for m_filePath - chmod(QFile::encodeName(m_filePath), m_st.st_mode); - chown(QFile::encodeName(m_filePath), m_st.st_uid, m_st.st_gid); + chmod(TQFile::encodeName(m_filePath), m_st.st_mode); + chown(TQFile::encodeName(m_filePath), m_st.st_uid, m_st.st_gid); } } } diff --git a/kexi/main/startup/KexiStartup_p.h b/kexi/main/startup/KexiStartup_p.h index 1e60d7023..1e9e5d271 100644 --- a/kexi/main/startup/KexiStartup_p.h +++ b/kexi/main/startup/KexiStartup_p.h @@ -20,8 +20,8 @@ #ifndef KEXI_STARTUPHANDLER_P_H #define KEXI_STARTUPHANDLER_P_H -#include <qobject.h> -#include <qstring.h> +#include <tqobject.h> +#include <tqstring.h> #include <sys/stat.h> @@ -30,11 +30,12 @@ class KProcess; class KProgressDialog; -class SQLite2ToSQLite3Migration : public QObject +class SQLite2ToSQLite3Migration : public TQObject { Q_OBJECT + TQ_OBJECT public: - SQLite2ToSQLite3Migration(const QString& filePath); + SQLite2ToSQLite3Migration(const TQString& filePath); ~SQLite2ToSQLite3Migration(); tristate run(); @@ -45,7 +46,7 @@ class SQLite2ToSQLite3Migration : public QObject void cancelClicked(); protected: - QString m_filePath; + TQString m_filePath; KProcess *m_process; KProgressDialog* m_dlg; |