summaryrefslogtreecommitdiffstats
path: root/kexi/widget
diff options
context:
space:
mode:
Diffstat (limited to 'kexi/widget')
-rw-r--r--kexi/widget/kexibrowser.cpp2
-rw-r--r--kexi/widget/kexicharencodingcombobox.cpp14
-rw-r--r--kexi/widget/kexidatasourcecombobox.cpp2
-rw-r--r--kexi/widget/kexidswelcome.cpp2
-rw-r--r--kexi/widget/kexifieldcombobox.cpp2
-rw-r--r--kexi/widget/kexiprjtypeselector.cpp2
-rw-r--r--kexi/widget/kexismalltoolbutton.cpp2
-rw-r--r--kexi/widget/relations/kexirelationview.cpp2
-rw-r--r--kexi/widget/relations/kexirelationviewtable.cpp16
-rw-r--r--kexi/widget/tableview/kexiblobtableedit.cpp2
-rw-r--r--kexi/widget/tableview/kexiblobtableedit.h4
-rw-r--r--kexi/widget/tableview/kexiinputtableedit.cpp2
-rw-r--r--kexi/widget/tableview/kexitableview.cpp6
-rw-r--r--kexi/widget/tableview/kexitableview.h2
-rw-r--r--kexi/widget/tableview/kexitextformatter.cpp2
-rw-r--r--kexi/widget/utils/kexidatetimeformatter.cpp6
16 files changed, 34 insertions, 34 deletions
diff --git a/kexi/widget/kexibrowser.cpp b/kexi/widget/kexibrowser.cpp
index af893ddf..c81b967f 100644
--- a/kexi/widget/kexibrowser.cpp
+++ b/kexi/widget/kexibrowser.cpp
@@ -733,7 +733,7 @@ void KexiBrowser::updateItemName( KexiPart::Item& item, bool dirty )
void KexiBrowser::slotSettingsChanged(int)
{
- m_singleClick = KGlobalSettings::singleClick();
+ m_singleClick = TDEGlobalSettings::singleClick();
}
void KexiBrowser::selectItem(KexiPart::Item& item)
diff --git a/kexi/widget/kexicharencodingcombobox.cpp b/kexi/widget/kexicharencodingcombobox.cpp
index 84038dcd..ad368e69 100644
--- a/kexi/widget/kexicharencodingcombobox.cpp
+++ b/kexi/widget/kexicharencodingcombobox.cpp
@@ -31,21 +31,21 @@ KexiCharacterEncodingComboBox::KexiCharacterEncodingComboBox(
: KComboBox( parent, "KexiCharacterEncodingComboBox" )
, m_defaultEncodingAdded(false)
{
- TQString defaultEncoding(TQString::fromLatin1(KGlobal::locale()->encoding()));
+ TQString defaultEncoding(TQString::fromLatin1(TDEGlobal::locale()->encoding()));
TQString defaultEncodingDescriptiveName;
TQString _selectedEncoding = selectedEncoding;
if (_selectedEncoding.isEmpty())
- _selectedEncoding = TQString::fromLatin1(KGlobal::locale()->encoding());
+ _selectedEncoding = TQString::fromLatin1(TDEGlobal::locale()->encoding());
- TQStringList descEncodings(KGlobal::charsets()->descriptiveEncodingNames());
+ TQStringList descEncodings(TDEGlobal::charsets()->descriptiveEncodingNames());
TQStringList::ConstIterator it = descEncodings.constBegin();
for (uint id = 0; it!=descEncodings.constEnd(); ++it)
{
bool found = false;
- TQString name( KGlobal::charsets()->encodingForName( *it ) );
- TQTextCodec *codecForEnc = KGlobal::charsets()->codecForName(name, found);
+ TQString name( TDEGlobal::charsets()->encodingForName( *it ) );
+ TQTextCodec *codecForEnc = TDEGlobal::charsets()->codecForName(name, found);
if (found) {
insertItem(*it);
if (codecForEnc->name() == defaultEncoding || name == defaultEncoding) {
@@ -84,10 +84,10 @@ KexiCharacterEncodingComboBox::~KexiCharacterEncodingComboBox()
TQString KexiCharacterEncodingComboBox::selectedEncoding() const
{
if (defaultEncodingSelected()) {
- return TQString::fromLatin1(KGlobal::locale()->encoding());
+ return TQString::fromLatin1(TDEGlobal::locale()->encoding());
}
else {
- return KGlobal::charsets()->encodingForName( currentText() );
+ return TDEGlobal::charsets()->encodingForName( currentText() );
}
}
diff --git a/kexi/widget/kexidatasourcecombobox.cpp b/kexi/widget/kexidatasourcecombobox.cpp
index 5dab927b..725a560b 100644
--- a/kexi/widget/kexidatasourcecombobox.cpp
+++ b/kexi/widget/kexidatasourcecombobox.cpp
@@ -74,7 +74,7 @@ KexiDataSourceComboBox::KexiDataSourceComboBox(TQWidget *parent, const char *nam
, d(new Private())
{
setInsertionPolicy(NoInsertion);
- setCompletionMode(KGlobalSettings::CompletionPopupAuto);
+ setCompletionMode(TDEGlobalSettings::CompletionPopupAuto);
setSizeLimit( 16 );
connect(this, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotActivated(int)));
connect(this, TQT_SIGNAL(returnPressed(const TQString &)), this, TQT_SLOT(slotReturnPressed(const TQString &)));
diff --git a/kexi/widget/kexidswelcome.cpp b/kexi/widget/kexidswelcome.cpp
index cd4be1b2..e1184553 100644
--- a/kexi/widget/kexidswelcome.cpp
+++ b/kexi/widget/kexidswelcome.cpp
@@ -58,7 +58,7 @@ void
KexiDSWelcome::setUseWizard(bool use)
{
#if KDE_IS_VERSION(3,1,9) && !defined(TQ_WS_WIN)
- bool useIcons = KGlobalSettings::showIconsOnPushButtons();
+ bool useIcons = TDEGlobalSettings::showIconsOnPushButtons();
#else
bool useIcons = true;
#endif
diff --git a/kexi/widget/kexifieldcombobox.cpp b/kexi/widget/kexifieldcombobox.cpp
index d41d93a2..c490111e 100644
--- a/kexi/widget/kexifieldcombobox.cpp
+++ b/kexi/widget/kexifieldcombobox.cpp
@@ -75,7 +75,7 @@ KexiFieldComboBox::KexiFieldComboBox(TQWidget *parent, const char *name)
, d(new Private())
{
setInsertionPolicy(NoInsertion);
- setCompletionMode(KGlobalSettings::CompletionPopupAuto);
+ setCompletionMode(TDEGlobalSettings::CompletionPopupAuto);
setSizeLimit( 16 );
connect(this, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotActivated(int)));
connect(this, TQT_SIGNAL(returnPressed(const TQString &)), this, TQT_SLOT(slotReturnPressed(const TQString &)));
diff --git a/kexi/widget/kexiprjtypeselector.cpp b/kexi/widget/kexiprjtypeselector.cpp
index 2717e0e9..aea9b22f 100644
--- a/kexi/widget/kexiprjtypeselector.cpp
+++ b/kexi/widget/kexiprjtypeselector.cpp
@@ -28,7 +28,7 @@ KexiPrjTypeSelector::KexiPrjTypeSelector( TQWidget* parent )
{
TQString none;
icon_file->setPixmap(
- KGlobal::iconLoader()->loadIcon( KMimeType::mimeType(
+ TDEGlobal::iconLoader()->loadIcon( KMimeType::mimeType(
KexiDB::Driver::defaultFileBasedDriverMimeType() )->icon(none,0), KIcon::Desktop, 48
)
);
diff --git a/kexi/widget/kexismalltoolbutton.cpp b/kexi/widget/kexismalltoolbutton.cpp
index ab703923..82b6489e 100644
--- a/kexi/widget/kexismalltoolbutton.cpp
+++ b/kexi/widget/kexismalltoolbutton.cpp
@@ -72,7 +72,7 @@ void KexiSmallToolButton::init()
{
setPaletteBackgroundColor(palette().active().background());
setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Preferred);
- TQFont f(KGlobalSettings::toolBarFont());
+ TQFont f(TDEGlobalSettings::toolBarFont());
f.setPixelSize(Kexi::smallFont().pixelSize());
setFont(f);
setAutoRaise(true);
diff --git a/kexi/widget/relations/kexirelationview.cpp b/kexi/widget/relations/kexirelationview.cpp
index 378d2580..a3ce7632 100644
--- a/kexi/widget/relations/kexirelationview.cpp
+++ b/kexi/widget/relations/kexirelationview.cpp
@@ -430,7 +430,7 @@ KexiRelationView::keyPressEvent(TQKeyEvent *ev)
{
kdDebug() << "KexiRelationView::keyPressEvent()" << endl;
- if (ev->key()==KGlobalSettings::contextMenuKey()) {
+ if (ev->key()==TDEGlobalSettings::contextMenuKey()) {
if (m_selectedConnection) {
emit connectionContextMenuRequest(
mapToGlobal(m_selectedConnection->connectionRect().center()) );
diff --git a/kexi/widget/relations/kexirelationviewtable.cpp b/kexi/widget/relations/kexirelationviewtable.cpp
index ce94a809..426edf71 100644
--- a/kexi/widget/relations/kexirelationviewtable.cpp
+++ b/kexi/widget/relations/kexirelationviewtable.cpp
@@ -135,8 +135,8 @@ void KexiRelationViewTableContainer::setFocus()
m_tableHeader->setFocus();
m_tableView->setFocus();
/* TQPalette p = tqApp->palette();
- p.setColor( TQPalette::Active, TQColorGroup::Highlight, KGlobalSettings::highlightColor() );
- p.setColor( TQPalette::Active, TQColorGroup::HighlightedText, KGlobalSettings::highlightedTextColor() );
+ p.setColor( TQPalette::Active, TQColorGroup::Highlight, TDEGlobalSettings::highlightColor() );
+ p.setColor( TQPalette::Active, TQColorGroup::HighlightedText, TDEGlobalSettings::highlightedTextColor() );
m_tableView->setPalette(p);*/
raise();
@@ -156,8 +156,8 @@ void KexiRelationViewTableContainer::unsetFocus()
// m_tableView->unsetPalette();
/* TQPalette p = m_tableView->palette();
-// p.setColor( TQPalette::Active, TQColorGroup::Highlight, KGlobalSettings::highlightColor() );
-// p.setColor( TQPalette::Active, TQColorGroup::HighlightedText, KGlobalSettings::highlightedTextColor() );
+// p.setColor( TQPalette::Active, TQColorGroup::Highlight, TDEGlobalSettings::highlightColor() );
+// p.setColor( TQPalette::Active, TQColorGroup::HighlightedText, TDEGlobalSettings::highlightedTextColor() );
p.setColor( TQPalette::Active, TQColorGroup::Highlight, p.color(TQPalette::Active, TQColorGroup::Background ) );
// p.setColor( TQPalette::Active, TQColorGroup::Highlight, gray );
p.setColor( TQPalette::Active, TQColorGroup::HighlightedText, p.color(TQPalette::Active, TQColorGroup::Foreground ) );
@@ -180,10 +180,10 @@ KexiRelationViewTableContainerHeader::KexiRelationViewTableContainerHeader(
:TQLabel(text,parent),m_dragging(false)
{
setMargin(1);
- m_activeBG = KGlobalSettings::activeTitleColor();
- m_activeFG = KGlobalSettings::activeTextColor();
- m_inactiveBG = KGlobalSettings::inactiveTitleColor();
- m_inactiveFG = KGlobalSettings::inactiveTextColor();
+ m_activeBG = TDEGlobalSettings::activeTitleColor();
+ m_activeFG = TDEGlobalSettings::activeTextColor();
+ m_inactiveBG = TDEGlobalSettings::inactiveTitleColor();
+ m_inactiveFG = TDEGlobalSettings::inactiveTextColor();
installEventFilter(this);
}
diff --git a/kexi/widget/tableview/kexiblobtableedit.cpp b/kexi/widget/tableview/kexiblobtableedit.cpp
index 1218a978..3502e15d 100644
--- a/kexi/widget/tableview/kexiblobtableedit.cpp
+++ b/kexi/widget/tableview/kexiblobtableedit.cpp
@@ -571,7 +571,7 @@ void KexiKIconTableEdit::setupContents( TQPainter *p, bool /*focused*/, const TQ
TQPixmap *pix = 0;
if (!key.isEmpty() && !(pix = d->pixmapCache[ key ])) {
//cache pixmap
- TQPixmap pm = KGlobal::iconLoader()->loadIcon( key, KIcon::Small,
+ TQPixmap pm = TDEGlobal::iconLoader()->loadIcon( key, KIcon::Small,
0, KIcon::DefaultState, 0L, true/*canReturnNull*/ );
if (!pm.isNull()) {
pix = new TQPixmap(pm);
diff --git a/kexi/widget/tableview/kexiblobtableedit.h b/kexi/widget/tableview/kexiblobtableedit.h
index a3b1c0f2..4d17b3b9 100644
--- a/kexi/widget/tableview/kexiblobtableedit.h
+++ b/kexi/widget/tableview/kexiblobtableedit.h
@@ -30,7 +30,7 @@
#include "kexicelleditorfactory.h"
class KTempFile;
-class KProcess;
+class TDEProcess;
class TQTextEdit;
class KexiBlobTableEdit : public KexiTableEdit
@@ -113,7 +113,7 @@ class KexiBlobTableEdit : public KexiTableEdit
class Private;
Private *d;
//todo KTempFile* m_tempFile;
-//todo KProcess* m_proc;
+//todo TDEProcess* m_proc;
//todo TQTextEdit *m_content;
};
diff --git a/kexi/widget/tableview/kexiinputtableedit.cpp b/kexi/widget/tableview/kexiinputtableedit.cpp
index 36b662f9..4f043117 100644
--- a/kexi/widget/tableview/kexiinputtableedit.cpp
+++ b/kexi/widget/tableview/kexiinputtableedit.cpp
@@ -83,7 +83,7 @@ void KexiInputTableEdit::init()
m_textFormatter.setField( field() );
//init settings
- m_decsym = KGlobal::locale()->decimalSymbol();
+ m_decsym = TDEGlobal::locale()->decimalSymbol();
if (m_decsym.isEmpty())
m_decsym=".";//default
diff --git a/kexi/widget/tableview/kexitableview.cpp b/kexi/widget/tableview/kexitableview.cpp
index fa474bfc..4303e551 100644
--- a/kexi/widget/tableview/kexitableview.cpp
+++ b/kexi/widget/tableview/kexitableview.cpp
@@ -60,7 +60,7 @@
#include <kexidb/cursor.h>
KexiTableView::Appearance::Appearance(TQWidget *widget)
- : alternateBackgroundColor( KGlobalSettings::alternateBackgroundColor() )
+ : alternateBackgroundColor( TDEGlobalSettings::alternateBackgroundColor() )
{
//set defaults
if (tqApp) {
@@ -207,7 +207,7 @@ KexiTableView::KexiTableView(KexiTableViewData* data, TQWidget* parent, const ch
// d->baseColor = colorGroup().base();
// d->textColor = colorGroup().text();
-// d->altColor = KGlobalSettings::alternateBackgroundColor();
+// d->altColor = TDEGlobalSettings::alternateBackgroundColor();
// d->grayColor = TQColor(200,200,200);
d->diagonalGrayPattern = TQBrush(d->appearance.borderColor, TQt::BDiagPattern);
@@ -2594,7 +2594,7 @@ KexiTableItem *KexiTableView::highlightedItem() const
void KexiTableView::slotSettingsChanged(int category)
{
if (category==TDEApplication::SETTINGS_SHORTCUTS) {
- d->contextMenuKey = KGlobalSettings::contextMenuKey();
+ d->contextMenuKey = TDEGlobalSettings::contextMenuKey();
}
}
diff --git a/kexi/widget/tableview/kexitableview.h b/kexi/widget/tableview/kexitableview.h
index f1692610..f4364eb8 100644
--- a/kexi/widget/tableview/kexitableview.h
+++ b/kexi/widget/tableview/kexitableview.h
@@ -94,7 +94,7 @@ public:
current active palette */
TQColor emptyAreaColor;
- /*! alternate background color, default is KGlobalSettings::alternateBackgroundColor() */
+ /*! alternate background color, default is TDEGlobalSettings::alternateBackgroundColor() */
TQColor alternateBackgroundColor;
/*! true if background altering should be enabled, true by default */
diff --git a/kexi/widget/tableview/kexitextformatter.cpp b/kexi/widget/tableview/kexitextformatter.cpp
index 6045620a..9829f347 100644
--- a/kexi/widget/tableview/kexitextformatter.cpp
+++ b/kexi/widget/tableview/kexitextformatter.cpp
@@ -168,7 +168,7 @@ TQVariant KexiTextFormatter::textToValue(const TQString& text) const
case KexiDB::Field::Double: {
// replace custom decimal symbol with '.' as required by to{Float|Double}()
TQString fixedText( text );
- fixedText.replace(KGlobal::locale()->decimalSymbol(), ".");
+ fixedText.replace(TDEGlobal::locale()->decimalSymbol(), ".");
if (t == KexiDB::Field::Double)
return fixedText.toDouble();
return fixedText.toFloat();
diff --git a/kexi/widget/utils/kexidatetimeformatter.cpp b/kexi/widget/utils/kexidatetimeformatter.cpp
index 298eda48..c6fe3460 100644
--- a/kexi/widget/utils/kexidatetimeformatter.cpp
+++ b/kexi/widget/utils/kexidatetimeformatter.cpp
@@ -32,7 +32,7 @@ KexiDateFormatter::KexiDateFormatter()
{
// use "short date" format system settings
//! @todo allow to override the format using column property and/or global app settings
- TQString df( KGlobal::locale()->dateFormatShort() );
+ TQString df( TDEGlobal::locale()->dateFormatShort() );
if (df.length()>2)
m_separator = df.mid(2,1);
else
@@ -171,7 +171,7 @@ KexiTimeFormatter::KexiTimeFormatter()
: m_hmsRegExp( new TQRegExp("(\\d*):(\\d*):(\\d*).*( am| pm){,1}", false/*!CS*/) )
, m_hmRegExp( new TQRegExp("(\\d*):(\\d*).*( am| pm){,1}", false/*!CS*/) )
{
- TQString tf( KGlobal::locale()->timeFormat() );
+ TQString tf( TDEGlobal::locale()->timeFormat() );
//m_hourpos, m_minpos, m_secpos; are result of tf.find()
TQString hourVariable, minVariable, secVariable;
@@ -309,7 +309,7 @@ TQString KexiTimeFormatter::timeToString( const TQTime& time ) const
if (m_secpos>=0)
s.replace( "%S", TQString::fromLatin1(time.second()<10 ? "0" : "") + TQString::number(time.second()) );
if (m_ampmpos>=0)
- s.replace( "%p", KGlobal::locale()->translate( time.hour()>=12 ? "pm" : "am") );
+ s.replace( "%p", TDEGlobal::locale()->translate( time.hour()>=12 ? "pm" : "am") );
return s;
}