diff options
Diffstat (limited to 'kxkb')
| -rw-r--r-- | kxkb/extension.cpp | 6 | ||||
| -rw-r--r-- | kxkb/kcmlayout.cpp | 62 | ||||
| -rw-r--r-- | kxkb/kcmlayoutwidget.ui | 96 | ||||
| -rw-r--r-- | kxkb/kcmmiscwidget.ui | 24 | ||||
| -rw-r--r-- | kxkb/kxkb.cpp | 6 | ||||
| -rw-r--r-- | kxkb/kxkbbindings.cpp | 4 | ||||
| -rw-r--r-- | kxkb/kxkbconfig.cpp | 18 | ||||
| -rw-r--r-- | kxkb/kxkbtraywindow.h | 2 | ||||
| -rw-r--r-- | kxkb/pixmap.cpp | 6 | ||||
| -rw-r--r-- | kxkb/rules.cpp | 14 | ||||
| -rw-r--r-- | kxkb/x11helper.cpp | 42 |
11 files changed, 140 insertions, 140 deletions
diff --git a/kxkb/extension.cpp b/kxkb/extension.cpp index 3817a8c4c..09ab7abc0 100644 --- a/kxkb/extension.cpp +++ b/kxkb/extension.cpp @@ -125,7 +125,7 @@ bool XKBExtension::setLayout(const TQString& model, const TQString layoutKey = getLayoutKey(layout, variant); bool res; - if( fileCache.contains(layoutKey) ) { + if( fileCache.tqcontains(layoutKey) ) { res = setCompiledLayout( layoutKey ); kdDebug() << "setCompiledLayout " << layoutKey << ": " << res << endl; @@ -224,7 +224,7 @@ bool XKBExtension::compileCurrentLayout(const TQString &layoutKey) const TQString fileName = getPrecompiledLayoutFilename(layoutKey); kdDebug() << "compiling layout " << this << " cache size: " << fileCache.count() << endl; - if( fileCache.contains(layoutKey) ) { + if( fileCache.tqcontains(layoutKey) ) { kdDebug() << "trashing old compiled layout for " << fileName << endl; if( fileCache[ layoutKey ] != NULL ) fclose( fileCache[ layoutKey ] ); // recompiling - trash the old file @@ -263,7 +263,7 @@ bool XKBExtension::setCompiledLayout(const TQString &layoutKey) { FILE *input = NULL; - if( fileCache.contains(layoutKey) ) { + if( fileCache.tqcontains(layoutKey) ) { input = fileCache[ layoutKey ]; } diff --git a/kxkb/kcmlayout.cpp b/kxkb/kcmlayout.cpp index 7af7ae691..e4a86243d 100644 --- a/kxkb/kcmlayout.cpp +++ b/kxkb/kcmlayout.cpp @@ -48,7 +48,7 @@ enum { static const TQString DEFAULT_VARIANT_NAME("<default>"); -class OptionListItem : public QCheckListItem +class OptionListItem : public TQCheckListItem { public: @@ -101,39 +101,39 @@ LayoutConfig::LayoutConfig(TQWidget *parent, const char *name) TQVBoxLayout *main = new TQVBoxLayout(this, 0, KDialog::spacingHint()); widget = new LayoutConfigWidget(this, "widget"); - main->addWidget(widget); + main->addWidget(TQT_TQWIDGET(widget)); - connect( widget->chkEnable, TQT_SIGNAL( toggled( bool )), this, TQT_SLOT(changed())); - connect( widget->chkShowSingle, TQT_SIGNAL( toggled( bool )), this, TQT_SLOT(changed())); - connect( widget->chkShowFlag, TQT_SIGNAL( toggled( bool )), this, TQT_SLOT(changed())); - connect( widget->comboModel, TQT_SIGNAL(activated(int)), this, TQT_SLOT(changed())); + connect( TQT_TQOBJECT(widget->chkEnable), TQT_SIGNAL( toggled( bool )), TQT_TQOBJECT(this), TQT_SLOT(changed())); + connect( TQT_TQOBJECT(widget->chkShowSingle), TQT_SIGNAL( toggled( bool )), TQT_TQOBJECT(this), TQT_SLOT(changed())); + connect( TQT_TQOBJECT(widget->chkShowFlag), TQT_SIGNAL( toggled( bool )), TQT_TQOBJECT(this), TQT_SLOT(changed())); + connect( TQT_TQOBJECT(widget->comboModel), TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(changed())); - connect( widget->listLayoutsSrc, TQT_SIGNAL(doubleClicked(TQListViewItem*,const TQPoint&, int)), - this, TQT_SLOT(add())); - connect( widget->btnAdd, TQT_SIGNAL(clicked()), this, TQT_SLOT(add())); - connect( widget->btnRemove, TQT_SIGNAL(clicked()), this, TQT_SLOT(remove())); + connect( TQT_TQOBJECT(widget->listLayoutsSrc), TQT_SIGNAL(doubleClicked(TQListViewItem*,const TQPoint&, int)), + TQT_TQOBJECT(this), TQT_SLOT(add())); + connect( TQT_TQOBJECT(widget->btnAdd), TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(add())); + connect( TQT_TQOBJECT(widget->btnRemove), TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(remove())); - connect( widget->comboVariant, TQT_SIGNAL(activated(int)), this, TQT_SLOT(changed())); - connect( widget->comboVariant, TQT_SIGNAL(activated(int)), this, TQT_SLOT(variantChanged())); - connect( widget->listLayoutsDst, TQT_SIGNAL(selectionChanged(TQListViewItem *)), - this, TQT_SLOT(layoutSelChanged(TQListViewItem *))); + connect( TQT_TQOBJECT(widget->comboVariant), TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(changed())); + connect( TQT_TQOBJECT(widget->comboVariant), TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(variantChanged())); + connect( TQT_TQOBJECT(widget->listLayoutsDst), TQT_SIGNAL(selectionChanged(TQListViewItem *)), + TQT_TQOBJECT(this), TQT_SLOT(layoutSelChanged(TQListViewItem *))); - connect( widget->editDisplayName, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(displayNameChanged(const TQString&))); + connect( widget->editDisplayName, TQT_SIGNAL(textChanged(const TQString&)), TQT_TQOBJECT(this), TQT_SLOT(displayNameChanged(const TQString&))); - connect( widget->chkLatin, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed())); - connect( widget->chkLatin, TQT_SIGNAL(clicked()), this, TQT_SLOT(latinChanged())); + connect( widget->chkLatin, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(changed())); + connect( widget->chkLatin, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(latinChanged())); widget->btnUp->setIconSet(SmallIconSet("1uparrow")); - connect( widget->btnUp, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed())); - connect( widget->btnUp, TQT_SIGNAL(clicked()), this, TQT_SLOT(moveUp())); + connect( widget->btnUp, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(changed())); + connect( widget->btnUp, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(moveUp())); widget->btnDown->setIconSet(SmallIconSet("1downarrow")); - connect( widget->btnDown, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed())); - connect( widget->btnDown, TQT_SIGNAL(clicked()), this, TQT_SLOT(moveDown())); + connect( widget->btnDown, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(changed())); + connect( widget->btnDown, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(moveDown())); connect( widget->grpSwitching, TQT_SIGNAL( clicked( int ) ), TQT_SLOT(changed())); - connect( widget->chkEnableSticky, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(changed())); - connect( widget->spinStickyDepth, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(changed())); + connect( widget->chkEnableSticky, TQT_SIGNAL(toggled(bool)), TQT_TQOBJECT(this), TQT_SLOT(changed())); + connect( widget->spinStickyDepth, TQT_SIGNAL(valueChanged(int)), TQT_TQOBJECT(this), TQT_SLOT(changed())); widget->listLayoutsSrc->setColumnText(LAYOUT_COLUMN_FLAG, ""); widget->listLayoutsDst->setColumnText(LAYOUT_COLUMN_FLAG, ""); @@ -245,7 +245,7 @@ void LayoutConfig::initUI() { for (TQStringList::ConstIterator it = options.begin(); it != options.end(); ++it) { TQString option = *it; - TQString optionKey = option.mid(0, option.find(':')); + TQString optionKey = option.mid(0, option.tqfind(':')); TQString optionName = m_rules->options()[option]; OptionListItem *item = m_optionGroups[i18n(optionKey.latin1())]; @@ -444,7 +444,7 @@ void LayoutConfig::displayNameChanged(const TQString& newDisplayName) return; const LayoutUnit layoutUnitKey = getLayoutUnitKey( selLayout ); - LayoutUnit& layoutUnit = *m_kxkbConfig.m_layouts.find(layoutUnitKey); + LayoutUnit& layoutUnit = *m_kxkbConfig.m_layouts.tqfind(layoutUnitKey); TQString oldName = selLayout->text(LAYOUT_COLUMN_DISPLAY_NAME); @@ -557,7 +557,7 @@ TQWidget* LayoutConfig::makeOptionsTab() OptionListItem *parent; for (; it.current(); ++it) { - if (!it.currentKey().contains(':')) + if (!it.currentKey().tqcontains(':')) { if( it.currentKey() == "ctrl" || it.currentKey() == "caps" || it.currentKey() == "altwin" ) { @@ -580,7 +580,7 @@ TQWidget* LayoutConfig::makeOptionsTab() for( ; it.current(); ++it) { TQString key = it.currentKey(); - int pos = key.find(':'); + int pos = key.tqfind(':'); if (pos >= 0) { OptionListItem *parent = m_optionGroups[key.left(pos)]; @@ -589,7 +589,7 @@ TQWidget* LayoutConfig::makeOptionsTab() if (parent != NULL) { // workaroung for mistake in rules file for xkb options in XFree 4.2.0 TQString text(it.current()); - text = text.replace( "Cap$", "Caps." ); + text = text.tqreplace( "Cap$", "Caps." ); if( parent->type() == TQCheckListItem::RadioButtonController ) new OptionListItem(parent, i18n(text.utf8()), TQCheckListItem::RadioButton, key); @@ -639,7 +639,7 @@ void LayoutConfig::updateLayoutCommand() setxkbmap += ",us"; /* LayoutUnit layoutUnitKey = getLayoutUnitKey(sel); - layoutDisplayName = m_kxkbConfig.getLayoutDisplayName( *m_kxkbConfig.m_layouts.find(layoutUnitKey) );*/ + layoutDisplayName = m_kxkbConfig.getLayoutDisplayName( *m_kxkbConfig.m_layouts.tqfind(layoutUnitKey) );*/ layoutDisplayName = sel->text(LAYOUT_COLUMN_DISPLAY_NAME); if( layoutDisplayName.isEmpty() ) { int count = 0; @@ -724,9 +724,9 @@ TQString LayoutConfig::createOptionString() { TQString option(it.currentKey()); - if (option.contains(':')) { + if (option.tqcontains(':')) { - TQString optionKey = option.mid(0, option.find(':')); + TQString optionKey = option.mid(0, option.tqfind(':')); OptionListItem *item = m_optionGroups[optionKey]; if( !item ) { diff --git a/kxkb/kcmlayoutwidget.ui b/kxkb/kcmlayoutwidget.ui index 82c866009..bc1225bfb 100644 --- a/kxkb/kcmlayoutwidget.ui +++ b/kxkb/kcmlayoutwidget.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>LayoutConfigWidget</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>LayoutConfigWidget</cstring> </property> @@ -20,7 +20,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>600</width> <height>510</height> @@ -30,17 +30,17 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QTabWidget" row="0" column="0"> + <widget class="TQTabWidget" row="0" column="0"> <property name="name"> <cstring>tabWidget</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>600</width> <height>500</height> </size> </property> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tabLayout</cstring> </property> @@ -51,7 +51,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox" row="0" column="0"> + <widget class="TQCheckBox" row="0" column="0"> <property name="name"> <cstring>chkEnable</cstring> </property> @@ -62,7 +62,7 @@ <bool>true</bool> </property> </widget> - <widget class="QGroupBox" row="1" column="0"> + <widget class="TQGroupBox" row="1" column="0"> <property name="name"> <cstring>grpLayouts</cstring> </property> @@ -76,7 +76,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="2" column="0" rowspan="1" colspan="2"> + <widget class="TQLabel" row="2" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>textLabel1_4</cstring> </property> @@ -84,7 +84,7 @@ <string>Available layouts:</string> </property> </widget> - <widget class="QLabel" row="2" column="2" rowspan="1" colspan="3"> + <widget class="TQLabel" row="2" column="2" rowspan="1" colspan="3"> <property name="name"> <cstring>textLabel1_4_2</cstring> </property> @@ -92,7 +92,7 @@ <string>Active layouts:</string> </property> </widget> - <widget class="QLabel" row="0" column="2" rowspan="1" colspan="3"> + <widget class="TQLabel" row="0" column="2" rowspan="1" colspan="3"> <property name="name"> <cstring>textLabel1_2</cstring> </property> @@ -103,7 +103,7 @@ <cstring>comboModel</cstring> </property> </widget> - <widget class="QComboBox" row="1" column="2" rowspan="1" colspan="3"> + <widget class="TQComboBox" row="1" column="2" rowspan="1" colspan="3"> <property name="name"> <cstring>comboModel</cstring> </property> @@ -120,7 +120,7 @@ </string> </property> </widget> - <widget class="QListView" row="3" column="2" rowspan="1" colspan="3"> + <widget class="TQListView" row="3" column="2" rowspan="1" colspan="3"> <column> <property name="text"> <string>1</string> @@ -197,7 +197,7 @@ <string>If more than one layout is present in this list, the KDE panel will offer a docked flag. By clicking on this flag you can easily switch between layouts. The first layout will be default one.</string> </property> </widget> - <widget class="QLayoutWidget" row="4" column="2" rowspan="1" colspan="3"> + <widget class="TQLayoutWidget" row="4" column="2" rowspan="1" colspan="3"> <property name="name"> <cstring>layout10</cstring> </property> @@ -205,7 +205,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>btnAdd</cstring> </property> @@ -213,7 +213,7 @@ <string>Add >></string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>btnRemove</cstring> </property> @@ -221,7 +221,7 @@ <string><< Remove</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>btnUp</cstring> </property> @@ -237,7 +237,7 @@ <string></string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>btnDown</cstring> </property> @@ -255,7 +255,7 @@ </widget> </hbox> </widget> - <widget class="QLabel" row="8" column="0"> + <widget class="TQLabel" row="8" column="0"> <property name="name"> <cstring>textLabel1_3</cstring> </property> @@ -266,7 +266,7 @@ <cstring>editCmdLine</cstring> </property> </widget> - <widget class="QListView" row="3" column="0" rowspan="5" colspan="2"> + <widget class="TQListView" row="3" column="0" rowspan="5" colspan="2"> <column> <property name="text"> <string></string> @@ -303,7 +303,7 @@ <property name="name"> <cstring>listLayoutsSrc</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>260</width> <height>0</height> @@ -316,7 +316,7 @@ <string>This is the list of available keyboard layouts in your system. You can add layout to the active list by selecting it and pressing "Add" button.</string> </property> </widget> - <widget class="QLineEdit" row="8" column="1" rowspan="1" colspan="4"> + <widget class="TQLineEdit" row="8" column="1" rowspan="1" colspan="4"> <property name="name"> <cstring>editCmdLine</cstring> </property> @@ -327,7 +327,7 @@ <string>This is the command which is executed when switching to the selected layout. It may help you if you want to debug layout switching, or if you want to switch layouts without the help of KDE.</string> </property> </widget> - <widget class="QCheckBox" row="7" column="2" rowspan="1" colspan="3"> + <widget class="TQCheckBox" row="7" column="2" rowspan="1" colspan="3"> <property name="name"> <cstring>chkLatin</cstring> </property> @@ -341,7 +341,7 @@ <string>If after you switch to this layout some keyboard shortcuts based on latin keys do not work try to enable this option.</string> </property> </widget> - <widget class="QLabel" row="6" column="2"> + <widget class="TQLabel" row="6" column="2"> <property name="name"> <cstring>textLabel1_6</cstring> </property> @@ -352,7 +352,7 @@ <cstring>editDisplayName</cstring> </property> </widget> - <widget class="QLineEdit" row="6" column="3"> + <widget class="TQLineEdit" row="6" column="3"> <property name="name"> <cstring>editDisplayName</cstring> </property> @@ -363,7 +363,7 @@ <number>3</number> </property> </widget> - <widget class="QLabel" row="5" column="2"> + <widget class="TQLabel" row="5" column="2"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -374,7 +374,7 @@ <cstring>comboVariant</cstring> </property> </widget> - <widget class="QComboBox" row="5" column="3"> + <widget class="TQComboBox" row="5" column="3"> <property name="name"> <cstring>comboVariant</cstring> </property> @@ -393,7 +393,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>210</width> <height>20</height> @@ -410,7 +410,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>210</width> <height>20</height> @@ -421,7 +421,7 @@ </widget> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -442,14 +442,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>40</height> </size> </property> </spacer> - <widget class="QFrame" row="0" column="0"> + <widget class="TQFrame" row="0" column="0"> <property name="name"> <cstring>optionsFrame</cstring> </property> @@ -466,7 +466,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QButtonGroup" row="2" column="0"> + <widget class="TQButtonGroup" row="2" column="0"> <property name="name"> <cstring>grpSwitching</cstring> </property> @@ -483,7 +483,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>radioButton1</cstring> </property> @@ -494,7 +494,7 @@ <bool>true</bool> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>radioButton1_3</cstring> </property> @@ -502,7 +502,7 @@ <string>Application</string> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>radioButton1_2</cstring> </property> @@ -512,7 +512,7 @@ </widget> </vbox> </widget> - <widget class="QCheckBox" row="1" column="0" rowspan="1" colspan="2"> + <widget class="TQCheckBox" row="1" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>chkShowFlag</cstring> </property> @@ -526,7 +526,7 @@ <string>Shows country flag on background of layout name in tray icon</string> </property> </widget> - <widget class="QGroupBox" row="2" column="1"> + <widget class="TQGroupBox" row="2" column="1"> <property name="name"> <cstring>grpBoxStickySwitching</cstring> </property> @@ -537,7 +537,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox" row="0" column="0" rowspan="1" colspan="2"> + <widget class="TQCheckBox" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>chkEnableSticky</cstring> </property> @@ -548,7 +548,7 @@ <string>If you have more than two layouts and turn this option on, switching with the keyboard shortcut or clicking on the kxkb indicator will only cycle through the last few layouts. You can specify the number of layouts to rotate below. You can still access all layouts by right-clicking on the kxkb indicator.</string> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel1_5</cstring> </property> @@ -562,7 +562,7 @@ <cstring>spinBox1</cstring> </property> </widget> - <widget class="QSpinBox" row="1" column="1"> + <widget class="TQSpinBox" row="1" column="1"> <property name="name"> <cstring>spinStickyDepth</cstring> </property> @@ -578,7 +578,7 @@ </widget> </grid> </widget> - <widget class="QCheckBox" row="0" column="0" rowspan="1" colspan="2"> + <widget class="TQCheckBox" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>chkShowSingle</cstring> </property> @@ -590,7 +590,7 @@ </widget> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tabOptions</cstring> </property> @@ -601,7 +601,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>chkEnableOptions</cstring> </property> @@ -612,7 +612,7 @@ <bool>true</bool> </property> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox3_2</cstring> </property> @@ -626,7 +626,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox" row="0" column="0" rowspan="1" colspan="2"> + <widget class="TQCheckBox" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>checkResetOld</cstring> </property> @@ -634,7 +634,7 @@ <string>&Reset old options</string> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>textLabel1_3_2</cstring> </property> @@ -642,7 +642,7 @@ <string>Command:</string> </property> </widget> - <widget class="QLineEdit" row="2" column="1"> + <widget class="TQLineEdit" row="2" column="1"> <property name="name"> <cstring>editCmdLineOpt</cstring> </property> @@ -650,7 +650,7 @@ <bool>true</bool> </property> </widget> - <widget class="QListView" row="1" column="0" rowspan="1" colspan="2"> + <widget class="TQListView" row="1" column="0" rowspan="1" colspan="2"> <column> <property name="text"> <string>Options</string> diff --git a/kxkb/kcmmiscwidget.ui b/kxkb/kcmmiscwidget.ui index 479188293..9fff22b4c 100644 --- a/kxkb/kcmmiscwidget.ui +++ b/kxkb/kcmmiscwidget.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.1" stdsetdef="1"> <class>KeyboardConfigWidget</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>KeyboardConfigWidget</cstring> </property> @@ -19,7 +19,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QButtonGroup" row="1" column="0" rowspan="1" colspan="2"> + <widget class="TQButtonGroup" row="1" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>numlockGroup</cstring> </property> @@ -39,7 +39,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QRadioButton" row="1" column="0"> + <widget class="TQRadioButton" row="1" column="0"> <property name="name"> <cstring>RadioButton1_2</cstring> </property> @@ -50,7 +50,7 @@ <number>1</number> </property> </widget> - <widget class="QRadioButton" row="2" column="0"> + <widget class="TQRadioButton" row="2" column="0"> <property name="name"> <cstring>RadioButton1_3</cstring> </property> @@ -61,7 +61,7 @@ <number>2</number> </property> </widget> - <widget class="QRadioButton" row="0" column="0"> + <widget class="TQRadioButton" row="0" column="0"> <property name="name"> <cstring>RadioButton1</cstring> </property> @@ -74,7 +74,7 @@ </widget> </grid> </widget> - <widget class="QGroupBox" row="0" column="0" rowspan="1" colspan="2"> + <widget class="TQGroupBox" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>groupBox1</cstring> </property> @@ -85,7 +85,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>lblDelay</cstring> </property> @@ -104,7 +104,7 @@ <cstring>delay</cstring> </property> </widget> - <widget class="QSlider" row="1" column="1"> + <widget class="TQSlider" row="1" column="1"> <property name="name"> <cstring>delaySlider</cstring> </property> @@ -156,7 +156,7 @@ <string>If supported, this option allows you to set the delay after which a pressed key will start generating keycodes. The 'Repeat rate' option controls the frequency of these keycodes.</string> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>lblRate</cstring> </property> @@ -175,7 +175,7 @@ <cstring>rate</cstring> </property> </widget> - <widget class="QSlider" row="2" column="1" rowspan="1" colspan="1"> + <widget class="TQSlider" row="2" column="1" rowspan="1" colspan="1"> <property name="name"> <cstring>rateSlider</cstring> </property> @@ -230,7 +230,7 @@ <string>If supported, this option allows you to set the rate at which keycodes are generated while a key is pressed.</string> </property> </widget> - <widget class="QCheckBox" row="0" column="0" rowspan="1" colspan="2"> + <widget class="TQCheckBox" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>repeatBox</cstring> </property> @@ -266,7 +266,7 @@ <string>If supported, this option allows you to hear audible clicks from your computer's speakers when you press the keys on your keyboard. This might be useful if your keyboard does not have mechanical keys, or if the sound that the keys make is very soft.<p>You can change the loudness of the key click feedback by dragging the slider button or by clicking the up/down arrows on the spin box. Setting the volume to 0% turns off the key click.</string> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>TextLabel1</cstring> </property> diff --git a/kxkb/kxkb.cpp b/kxkb/kxkb.cpp index 43e9f8046..06b64e59a 100644 --- a/kxkb/kxkb.cpp +++ b/kxkb/kxkb.cpp @@ -73,7 +73,7 @@ KXKBApp::KXKBApp(bool allowStyles, bool GUIenabled) } // keep in sync with kcmlayout.cpp - keys = new KGlobalAccel(this); + keys = new KGlobalAccel(TQT_TQOBJECT(this)); #include "kxkbbindings.cpp" keys->updateConnections(); @@ -217,8 +217,8 @@ void KXKBApp::layoutApply() bool KXKBApp::setLayout(const TQString& layoutPair) { const LayoutUnit layoutUnitKey(layoutPair); - if( kxkbConfig.m_layouts.contains(layoutUnitKey) ) { - return setLayout( *kxkbConfig.m_layouts.find(layoutUnitKey) ); + if( kxkbConfig.m_layouts.tqcontains(layoutUnitKey) ) { + return setLayout( *kxkbConfig.m_layouts.tqfind(layoutUnitKey) ); } return false; } diff --git a/kxkb/kxkbbindings.cpp b/kxkb/kxkbbindings.cpp index 3a6137ee1..9d8ebddf5 100644 --- a/kxkb/kxkbbindings.cpp +++ b/kxkb/kxkbbindings.cpp @@ -1,9 +1,9 @@ #ifndef NOSLOTS # define DEF( name, key3, key4, fnSlot ) \ - keys->insert( name, i18n(name), TQString::null, key3, key4, this, TQT_SLOT(fnSlot) ) + keys->insert( name, i18n(name), TQString(), key3, key4, this, TQT_SLOT(fnSlot) ) #else # define DEF( name, key3, key4, fnSlot ) \ - keys->insert( name, i18n(name), TQString::null, key3, key4 ) + keys->insert( name, i18n(name), TQString(), key3, key4 ) #endif keys->insert( "Program:kxkb", i18n("Keyboard") ); diff --git a/kxkb/kxkbconfig.cpp b/kxkb/kxkbconfig.cpp index 0e62fbc21..e357abcb7 100644 --- a/kxkb/kxkbconfig.cpp +++ b/kxkb/kxkbconfig.cpp @@ -78,7 +78,7 @@ bool KxkbConfig::load(int loadMode) m_layouts.clear(); for(TQStringList::ConstIterator it = layoutList.begin(); it != layoutList.end() ; ++it) { m_layouts.append( LayoutUnit(*it) ); - kdDebug() << " layout " << LayoutUnit(*it).toPair() << " in list: " << m_layouts.contains( LayoutUnit(*it) ) << endl; + kdDebug() << " layout " << LayoutUnit(*it).toPair() << " in list: " << m_layouts.tqcontains( LayoutUnit(*it) ) << endl; } kdDebug() << "Found " << m_layouts.count() << " layouts, default is " << getDefaultLayout().toPair() << endl; @@ -88,8 +88,8 @@ bool KxkbConfig::load(int loadMode) TQStringList displayNamePair = TQStringList::split(':', *it ); if( displayNamePair.count() == 2 ) { LayoutUnit layoutUnit( displayNamePair[0] ); - if( m_layouts.contains( layoutUnit ) ) { - m_layouts[m_layouts.findIndex(layoutUnit)].displayName = displayNamePair[1].left(3); + if( m_layouts.tqcontains( layoutUnit ) ) { + m_layouts[m_layouts.tqfindIndex(layoutUnit)].displayName = displayNamePair[1].left(3); } } } @@ -102,8 +102,8 @@ bool KxkbConfig::load(int loadMode) TQStringList includePair = TQStringList::split(':', *it ); if( includePair.count() == 2 ) { LayoutUnit layoutUnit( includePair[0] ); - if( m_layouts.contains( layoutUnit ) ) { - m_layouts[m_layouts.findIndex(layoutUnit)].includeGroup = includePair[1]; + if( m_layouts.tqcontains( layoutUnit ) ) { + m_layouts[m_layouts.tqfindIndex(layoutUnit)].includeGroup = includePair[1]; kdDebug() << "Got inc group: " << includePair[0] << ": " << includePair[1] << endl; } } @@ -115,10 +115,10 @@ bool KxkbConfig::load(int loadMode) for(TQStringList::ConstIterator it = includeList.begin(); it != includeList.end() ; ++it) { TQString layoutName = LayoutUnit::parseLayout( *it ); LayoutUnit layoutUnit( layoutName, "" ); - kdDebug() << "old layout for inc: " << layoutUnit.toPair() << " included " << m_layouts.contains( layoutUnit ) << endl; - if( m_layouts.contains( layoutUnit ) ) { + kdDebug() << "old layout for inc: " << layoutUnit.toPair() << " included " << m_layouts.tqcontains( layoutUnit ) << endl; + if( m_layouts.tqcontains( layoutUnit ) ) { TQString variantName = LayoutUnit::parseVariant(*it); - m_layouts[m_layouts.findIndex(layoutUnit)].includeGroup = variantName; + m_layouts[m_layouts.tqfindIndex(layoutUnit)].includeGroup = variantName; kdDebug() << "Got inc group: " << layoutUnit.toPair() << ": " << variantName << endl; } } @@ -276,7 +276,7 @@ TQString KxkbConfig::getDefaultDisplayName(const TQString& code_) displayName = code_; } else { - int sepPos = code_.find(TQRegExp("[-_]")); + int sepPos = code_.tqfind(TQRegExp("[-_]")); TQString leftCode = code_.mid(0, sepPos); TQString rightCode; if( sepPos != -1 ) diff --git a/kxkb/kxkbtraywindow.h b/kxkb/kxkbtraywindow.h index 089a7906b..38e42db5d 100644 --- a/kxkb/kxkbtraywindow.h +++ b/kxkb/kxkbtraywindow.h @@ -78,7 +78,7 @@ class KxkbSystemTray : public KSystemTray void mouseReleaseEvent(TQMouseEvent *ev) { - if (ev->button() == TQMouseEvent::LeftButton) + if (ev->button() == Qt::LeftButton) emit toggled(); KSystemTray::mouseReleaseEvent(ev); } diff --git a/kxkb/pixmap.cpp b/kxkb/pixmap.cpp index 0ca1500e3..ea685715b 100644 --- a/kxkb/pixmap.cpp +++ b/kxkb/pixmap.cpp @@ -83,7 +83,7 @@ LayoutIcon::findPixmap(const TQString& code_, bool showFlag, const TQString& dis if( pm->height() < FLAG_MAX_HEIGHT ) { TQPixmap* pix = new TQPixmap(FLAG_MAX_WIDTH, FLAG_MAX_HEIGHT); pix->fill( Qt::lightGray ); -// pix->fill( TQColor(qRgba(127,127,127,255)) ); +// pix->fill( TQColor(tqRgba(127,127,127,255)) ); // TQBitmap mask; // mask.fill(1); // pix->setMask(mask); @@ -183,7 +183,7 @@ TQString LayoutIcon::getCountryFromLayoutName(const TQString& layoutName) || layoutName == "tel" || layoutName == "tml" || layoutName == "ben" ) // some Indian languages flag = "in"; else { - int sepPos = layoutName.find(TQRegExp("[-_]")); + int sepPos = layoutName.tqfind(TQRegExp("[-_]")); TQString leftCode = layoutName.mid(0, sepPos); TQString rightCode; if( sepPos != -1 ) @@ -211,7 +211,7 @@ void LayoutIcon::dimPixmap(TQPixmap& pm) for(int x=0; x<image.width(); x++) { QRgb rgb = image.pixel(x,y); - QRgb dimRgb(qRgb(qRed(rgb)*3/4, qGreen(rgb)*3/4, qBlue(rgb)*3/4)); + QRgb dimRgb(tqRgb(tqRed(rgb)*3/4, tqGreen(rgb)*3/4, tqBlue(rgb)*3/4)); image.setPixel(x, y, dimRgb); } pm.convertFromImage(image); diff --git a/kxkb/rules.cpp b/kxkb/rules.cpp index dbf5b823d..2abe3f154 100644 --- a/kxkb/rules.cpp +++ b/kxkb/rules.cpp @@ -74,7 +74,7 @@ void XkbRules::loadRules(TQString file, bool layoutsOnly) // }; // // for(int i=0; fixedLayouts[i].layout != 0; i++ ) { -// if( m_layouts.find(fixedLayouts[i].locale) == 0 ) +// if( m_layouts.tqfind(fixedLayouts[i].locale) == 0 ) // m_layouts.insert(fixedLayouts[i].locale, fixedLayouts[i].layout); // } // } @@ -82,8 +82,8 @@ void XkbRules::loadRules(TQString file, bool layoutsOnly) bool XkbRules::isSingleGroup(const TQString& layout) { return X11Helper::areSingleGroupsSupported() - && !m_oldLayouts.contains(layout) - && !m_nonLatinLayouts.contains(layout); + && !m_oldLayouts.tqcontains(layout) + && !m_nonLatinLayouts.tqcontains(layout); } @@ -131,22 +131,22 @@ XkbRules::getDefaultGroup(const TQString& layout, const TQString& includeGroup) return 0; } - TQMap<TQString, unsigned int>::iterator it = m_initialGroups.find(layout); + TQMap<TQString, unsigned int>::iterator it = m_initialGroups.tqfind(layout); return it == m_initialGroups.end() ? 0 : it.data(); } -QStringList +TQStringList XkbRules::getAvailableVariants(const TQString& layout) { - if( layout.isEmpty() || !layouts().find(layout) ) + if( layout.isEmpty() || !layouts().tqfind(layout) ) return TQStringList(); TQStringList* result1 = m_varLists[layout]; if( result1 ) return *result1; - bool oldLayouts = m_oldLayouts.contains(layout); + bool oldLayouts = m_oldLayouts.tqcontains(layout); TQStringList* result = X11Helper::getVariants(layout, X11_DIR, oldLayouts); m_varLists.insert(layout, result); diff --git a/kxkb/x11helper.cpp b/kxkb/x11helper.cpp index e8f13f6aa..cae856720 100644 --- a/kxkb/x11helper.cpp +++ b/kxkb/x11helper.cpp @@ -59,7 +59,7 @@ static const TQRegExp NON_CLEAN_LAYOUT_REGEXP("[^a-z]"); bool X11Helper::m_layoutsClean = true; -const QString +const TQString X11Helper::findX11Dir() { for(int ii=0; ii<X11_DIR_COUNT; ii++) { @@ -78,7 +78,7 @@ X11Helper::findX11Dir() return NULL; } -const QString +const TQString X11Helper::findXkbRulesFile(TQString x11Dir, Display *dpy) { TQString rulesFile; @@ -120,10 +120,10 @@ X11Helper::loadRules(const TQString& file, bool layoutsOnly) for (int i = 0; i < xkbRules->layouts.num_desc; ++i) { TQString layoutName(xkbRules->layouts.desc[i].name); - rulesInfo->layouts.replace( layoutName, qstrdup( xkbRules->layouts.desc[i].desc ) ); + rulesInfo->layouts.tqreplace( layoutName, qstrdup( xkbRules->layouts.desc[i].desc ) ); if( m_layoutsClean == true - && layoutName.find( NON_CLEAN_LAYOUT_REGEXP ) != -1 + && layoutName.tqfind( NON_CLEAN_LAYOUT_REGEXP ) != -1 && layoutName.endsWith("/jp") == false ) { kdDebug() << "Layouts are not clean (Xorg < 6.9.0 or XFree86)" << endl; m_layoutsClean = false; @@ -136,33 +136,33 @@ X11Helper::loadRules(const TQString& file, bool layoutsOnly) } for (int i = 0; i < xkbRules->models.num_desc; ++i) - rulesInfo->models.replace(xkbRules->models.desc[i].name, qstrdup( xkbRules->models.desc[i].desc ) ); + rulesInfo->models.tqreplace(xkbRules->models.desc[i].name, qstrdup( xkbRules->models.desc[i].desc ) ); for (int i = 0; i < xkbRules->options.num_desc; ++i) - rulesInfo->options.replace(xkbRules->options.desc[i].name, qstrdup( xkbRules->options.desc[i].desc ) ); + rulesInfo->options.tqreplace(xkbRules->options.desc[i].name, qstrdup( xkbRules->options.desc[i].desc ) ); XkbRF_Free(xkbRules, true); // workaround for empty 'compose' options group description - if( rulesInfo->options.find("compose:menu") && !rulesInfo->options.find("compose") ) { - rulesInfo->options.replace("compose", "Compose Key Position"); + if( rulesInfo->options.tqfind("compose:menu") && !rulesInfo->options.tqfind("compose") ) { + rulesInfo->options.tqreplace("compose", "Compose Key Position"); } for(TQDictIterator<char> it(rulesInfo->options) ; it.current() != NULL; ++it ) { TQString option(it.currentKey()); - int columnPos = option.find(":"); + int columnPos = option.tqfind(":"); if( columnPos != -1 ) { TQString group = option.mid(0, columnPos); - if( rulesInfo->options.find(group) == NULL ) { - rulesInfo->options.replace(group, group.latin1()); + if( rulesInfo->options.tqfind(group) == NULL ) { + rulesInfo->options.tqreplace(group, group.latin1()); kdDebug() << "Added missing option group: " << group << endl; } } } // // workaround for empty misc options group description in XFree86 4.4.0 -// if( rulesInfo->options.find("numpad:microsoft") && !rulesInfo->options.find("misc") ) { -// rulesInfo->options.replace("misc", "Miscellaneous compatibility options" ); +// if( rulesInfo->options.tqfind("numpad:microsoft") && !rulesInfo->options.tqfind("misc") ) { +// rulesInfo->options.tqreplace("misc", "Miscellaneous compatibility options" ); // } return rulesInfo; @@ -187,10 +187,10 @@ X11Helper::loadOldLayouts(const TQString& rulesFile) while (!ts.eof()) { line = ts.readLine().simplifyWhiteSpace(); - if( line.find(oldLayoutsTag) == 0 ) { + if( line.tqfind(oldLayoutsTag) == 0 ) { line = line.mid(strlen(oldLayoutsTag)); - line = line.mid(line.find('=')+1).simplifyWhiteSpace(); + line = line.mid(line.tqfind('=')+1).simplifyWhiteSpace(); while( !ts.eof() && line.endsWith("\\") ) line = line.left(line.length()-1) + ts.readLine(); line = line.simplifyWhiteSpace(); @@ -202,10 +202,10 @@ X11Helper::loadOldLayouts(const TQString& rulesFile) } else - if( line.find(nonLatinLayoutsTag) == 0 ) { + if( line.tqfind(nonLatinLayoutsTag) == 0 ) { line = line.mid(strlen(nonLatinLayoutsTag)+1).simplifyWhiteSpace(); - line = line.mid(line.find('=')+1).simplifyWhiteSpace(); + line = line.mid(line.tqfind('=')+1).simplifyWhiteSpace(); while( !ts.eof() && line.endsWith("\\") ) line = line.left(line.length()-1) + ts.readLine(); line = line.simplifyWhiteSpace(); @@ -262,15 +262,15 @@ X11Helper::getVariants(const TQString& layout, const TQString& x11Dir, bool oldL if (line[0] == '#' || line.left(2) == "//" || line.isEmpty()) continue; - int pos = line.find("xkb_symbols"); + int pos = line.tqfind("xkb_symbols"); if (pos < 0) continue; - if( prev_line.find("hidden") >=0 ) + if( prev_line.tqfind("hidden") >=0 ) continue; - pos = line.find('"', pos) + 1; - int pos2 = line.find('"', pos); + pos = line.tqfind('"', pos) + 1; + int pos2 = line.tqfind('"', pos); if( pos < 0 || pos2 < 0 ) continue; |