summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--kbarcode/barcodedialog.cpp2
-rw-r--r--kbarcode/batchprinter.cpp2
-rw-r--r--kbarcode/batchwizard.cpp2
-rw-r--r--kbarcode/configdialog.cpp4
-rw-r--r--kbarcode/databasebrowser.cpp6
-rw-r--r--kbarcode/definition.cpp4
-rw-r--r--kbarcode/dsmainwindow.cpp10
-rw-r--r--kbarcode/kbarcodesettings.cpp4
-rw-r--r--kbarcode/labeleditor.cpp12
-rw-r--r--kbarcode/previewdialog.cpp4
-rw-r--r--kbarcode/printersettings.cpp6
-rw-r--r--kbarcode/sqltables.cpp8
12 files changed, 32 insertions, 32 deletions
diff --git a/kbarcode/barcodedialog.cpp b/kbarcode/barcodedialog.cpp
index df57d6c..2d1b284 100644
--- a/kbarcode/barcodedialog.cpp
+++ b/kbarcode/barcodedialog.cpp
@@ -208,7 +208,7 @@ void BarCodeDialog::copy()
DocumentItemDrag* drag = new DocumentItemDrag();
drag->setDocumentItem( &list );
- kapp->clipboard()->setData( drag, TQClipboard::Clipboard );
+ tdeApp->clipboard()->setData( drag, TQClipboard::Clipboard );
}
#include "barcodedialog.moc"
diff --git a/kbarcode/batchprinter.cpp b/kbarcode/batchprinter.cpp
index 076af62..50998a8 100644
--- a/kbarcode/batchprinter.cpp
+++ b/kbarcode/batchprinter.cpp
@@ -510,7 +510,7 @@ TQProgressDialog* BatchPrinter::createProgressDialog( const TQString & caption )
bool BatchPrinter::checkProgressDialog( TQProgressDialog* progress )
{
- kapp->processEvents( 0 );
+ tdeApp->processEvents( 0 );
progress->setProgress( progress->progress() + 1 );
if( progress->wasCancelled() ) {
delete progress;
diff --git a/kbarcode/batchwizard.cpp b/kbarcode/batchwizard.cpp
index 13c41fc..6fa944d 100644
--- a/kbarcode/batchwizard.cpp
+++ b/kbarcode/batchwizard.cpp
@@ -903,7 +903,7 @@ void BatchWizard::loadData( const TQString & data )
}
// new config entry!!!
- TDEConfig* config = kapp->config();
+ TDEConfig* config = tdeApp->config();
config->setGroup("FileFormat");
int pos[3] = { config->readNumEntry("Data0", 0 ),
config->readNumEntry("Data1", 1 ),
diff --git a/kbarcode/configdialog.cpp b/kbarcode/configdialog.cpp
index 51b0d0a..4fdc7a7 100644
--- a/kbarcode/configdialog.cpp
+++ b/kbarcode/configdialog.cpp
@@ -174,7 +174,7 @@ void ConfigDialog::setupTab3()
TQSpacerItem* spacer = new TQSpacerItem( 0, 0, TQSizePolicy::Expanding, TQSizePolicy::Minimum );
grid->addItem( spacer, 5, 0 );
- TDEConfig* config = kapp->config();
+ TDEConfig* config = tdeApp->config();
config->setGroup("FileFormat");
combo1->setCurrentItem( config->readNumEntry("Data0", 0 ) );
combo2->setCurrentItem( config->readNumEntry("Data1", 1 ) );
@@ -301,7 +301,7 @@ void ConfigDialog::setupTab5()
void ConfigDialog::accept()
{
- TDEConfig* config = kapp->config();
+ TDEConfig* config = tdeApp->config();
config->setGroup("FileFormat");
config->writeEntry("Data0", combo1->currentItem() );
config->writeEntry("Data1", combo2->currentItem() );
diff --git a/kbarcode/databasebrowser.cpp b/kbarcode/databasebrowser.cpp
index 649c348..99fdd39 100644
--- a/kbarcode/databasebrowser.cpp
+++ b/kbarcode/databasebrowser.cpp
@@ -163,7 +163,7 @@ void DatabaseBrowser::cut()
{
TQString text = table->value( table->currentRow(), table->currentColumn() ).toString();
if( !text.isEmpty() ) {
- kapp->clipboard()->setText( text );
+ tdeApp->clipboard()->setText( text );
TQSqlRecord* buffer = table->sqlCursor()->primeUpdate();
if( buffer ) {
@@ -179,12 +179,12 @@ void DatabaseBrowser::copy()
{
TQString text = table->value( table->currentRow(), table->currentColumn() ).toString();
if( !text.isEmpty() )
- kapp->clipboard()->setText( text );
+ tdeApp->clipboard()->setText( text );
}
void DatabaseBrowser::paste()
{
- TQString text = kapp->clipboard()->text();
+ TQString text = tdeApp->clipboard()->text();
if( !text.isEmpty() ) {
TQSqlRecord* buffer = table->sqlCursor()->primeUpdate();
if( buffer ) {
diff --git a/kbarcode/definition.cpp b/kbarcode/definition.cpp
index ec34b12..711b5ba 100644
--- a/kbarcode/definition.cpp
+++ b/kbarcode/definition.cpp
@@ -298,7 +298,7 @@ bool Definition::openFile()
TQString f = locateLocal( "data", "kbarcode/labeldefinitions.sql" );
if( !TQFile::exists( f ) ) {
- TDEConfig* config = kapp->config();
+ TDEConfig* config = tdeApp->config();
config->setGroup( "Definitions" );
// copy file to new location
@@ -552,7 +552,7 @@ bool Definition::showFileError()
TQString f = KFileDialog::getOpenFileName( TQString(), TQString(), 0 );
if( !f.isEmpty() && TQFile::exists( f ) ) {
- TDEConfig* config = kapp->config();
+ TDEConfig* config = tdeApp->config();
config->setGroup( "Definitions" );
config->writeEntry( "defpath", f );
config->sync();
diff --git a/kbarcode/dsmainwindow.cpp b/kbarcode/dsmainwindow.cpp
index ae826fa..3edfcfb 100644
--- a/kbarcode/dsmainwindow.cpp
+++ b/kbarcode/dsmainwindow.cpp
@@ -50,7 +50,7 @@ DSMainWindow::DSMainWindow(TQWidget *parent, const char *name, WFlags f)
loadConfig();
setAutoSaveSettings( TQString("Window") + name, true );
- connect( kapp, TQ_SIGNAL( aboutToQuit() ), this, TQ_SLOT( saveConfig() ) );
+ connect( tdeApp, TQ_SIGNAL( aboutToQuit() ), this, TQ_SLOT( saveConfig() ) );
if( first && startwizard ) {
wizard();
@@ -65,7 +65,7 @@ DSMainWindow::~DSMainWindow()
void DSMainWindow::setupActions()
{
- TDEAction* quitAct = KStdAction::quit(kapp, TQ_SLOT(quit()), actionCollection());
+ TDEAction* quitAct = KStdAction::quit(tdeApp, TQ_SLOT(quit()), actionCollection());
TDEAction* closeAct = KStdAction::close( this, TQ_SLOT( close() ), actionCollection(), "close" );
TDEAction* configureAct = KStdAction::preferences( KBarcodeSettings::getInstance(), TQ_SLOT(configure()), actionCollection() );
TDEAction* wizardAct = new TDEAction( i18n("&Start Configuration Wizard..."), BarIcon("wizard"), 0, this,
@@ -124,7 +124,7 @@ void DSMainWindow::setupActions()
void DSMainWindow::loadConfig()
{
- TDEConfig* config = kapp->config();
+ TDEConfig* config = tdeApp->config();
config->setGroup("Wizard");
first = config->readBoolEntry("firststart2", true );
@@ -143,7 +143,7 @@ void DSMainWindow::loadConfig()
void DSMainWindow::saveConfig()
{
- TDEConfig* config = kapp->config();
+ TDEConfig* config = tdeApp->config();
config->setGroup("Wizard");
config->writeEntry("firststart2", false );
@@ -195,7 +195,7 @@ void DSMainWindow::startInfo()
{
TQString info = locate("appdata", "barcodes.html");
if( !info.isEmpty() )
- kapp->invokeBrowser( info );
+ tdeApp->invokeBrowser( info );
}
bool DSMainWindow::newTables()
diff --git a/kbarcode/kbarcodesettings.cpp b/kbarcode/kbarcodesettings.cpp
index 39ad516..6ffbcc9 100644
--- a/kbarcode/kbarcodesettings.cpp
+++ b/kbarcode/kbarcodesettings.cpp
@@ -56,7 +56,7 @@ KBarcodeSettings::~KBarcodeSettings()
void KBarcodeSettings::saveConfig()
{
- TDEConfig* config = kapp->config();
+ TDEConfig* config = tdeApp->config();
config->setGroup("LabelEditor");
config->writeEntry("grid", gridsize );
@@ -67,7 +67,7 @@ void KBarcodeSettings::saveConfig()
void KBarcodeSettings::loadConfig()
{
- TDEConfig* config = kapp->config();
+ TDEConfig* config = tdeApp->config();
TQColor tmpc( TQt::lightGray );
config->setGroup("LabelEditor");
diff --git a/kbarcode/labeleditor.cpp b/kbarcode/labeleditor.cpp
index c7c3133..56b7651 100644
--- a/kbarcode/labeleditor.cpp
+++ b/kbarcode/labeleditor.cpp
@@ -163,7 +163,7 @@ LabelEditor::LabelEditor( TQWidget *parent, TQString _filename, const char *name
connect( cv, TQ_SIGNAL( showContextMenu(TQPoint) ), this, TQ_SLOT( showContextMenu(TQPoint) ) );
connect( cv, TQ_SIGNAL( movedSomething() ), this, TQ_SLOT( setEdited() ) );
connect( KBarcodeSettings::getInstance(), TQ_SIGNAL( updateGrid( int ) ), cv, TQ_SLOT( updateGUI() ) );
- connect( kapp, TQ_SIGNAL( aboutToQuit() ), this, TQ_SLOT( saveConfig() ) );
+ connect( tdeApp, TQ_SIGNAL( aboutToQuit() ), this, TQ_SLOT( saveConfig() ) );
connect( history, TQ_SIGNAL( commandExecuted() ), cv, TQ_SLOT( updateGUI() ) );
connect( history, TQ_SIGNAL( commandExecuted() ), this, TQ_SLOT( setEdited() ) );
@@ -181,7 +181,7 @@ LabelEditor::~LabelEditor()
void LabelEditor::loadConfig()
{
- TDEConfig* config = kapp->config();
+ TDEConfig* config = tdeApp->config();
recentAct->loadEntries( config, "RecentFiles" );
gridAct->setChecked( config->readBoolEntry("gridenabled", false ) );
@@ -190,7 +190,7 @@ void LabelEditor::loadConfig()
void LabelEditor::saveConfig()
{
- TDEConfig* config = kapp->config();
+ TDEConfig* config = tdeApp->config();
recentAct->saveEntries( config, "RecentFiles" );
@@ -204,7 +204,7 @@ void LabelEditor::saveConfig()
void LabelEditor::createCommandHistory()
{
- TDEConfig* config = kapp->config();
+ TDEConfig* config = tdeApp->config();
if( undoAct && redoAct )
{
@@ -439,7 +439,7 @@ void LabelEditor::setupActions()
{
TDEAction* newAct = KStdAction::openNew( this, TQ_SLOT(startEditor()), actionCollection() );
TDEAction* loadAct = KStdAction::open( this, TQ_SLOT(startLoadEditor()), actionCollection() );
- TDEAction* quitAct = KStdAction::quit(kapp, TQ_SLOT(quit()), actionCollection());
+ TDEAction* quitAct = KStdAction::quit(tdeApp, TQ_SLOT(quit()), actionCollection());
TDEAction* closeAct = KStdAction::close( this, TQ_SLOT( close() ), actionCollection(), "close" );
closeLabelAct = new TDEAction( i18n("Close &Label" ), 0, 0, this, TQ_SLOT( closeLabel() ), actionCollection() );
@@ -975,7 +975,7 @@ void LabelEditor::copy()
DocumentItemDrag* drag = new DocumentItemDrag();
drag->setDocumentItem( &items );
- kapp->clipboard()->setData( drag, TQClipboard::Clipboard );
+ tdeApp->clipboard()->setData( drag, TQClipboard::Clipboard );
}
void LabelEditor::paste()
diff --git a/kbarcode/previewdialog.cpp b/kbarcode/previewdialog.cpp
index fe4bb24..0c68457 100644
--- a/kbarcode/previewdialog.cpp
+++ b/kbarcode/previewdialog.cpp
@@ -139,7 +139,7 @@ PreviewDialog::PreviewDialog( TQIODevice* device, Definition* d, TQString filena
connect( customerName, TQ_SIGNAL( activated(int) ), this, TQ_SLOT( customerNameChanged(int) ) );
connect( customerId, TQ_SIGNAL( activated(int) ), this, TQ_SLOT( customerIdChanged(int) ) );
- TDEConfig* config = kapp->config();
+ TDEConfig* config = tdeApp->config();
config->setGroup( "PreviewDialog" );
resize( config->readNumEntry( "width", width() ), config->readNumEntry( "height", height() ) );
@@ -149,7 +149,7 @@ PreviewDialog::PreviewDialog( TQIODevice* device, Definition* d, TQString filena
PreviewDialog::~PreviewDialog()
{
- TDEConfig* config = kapp->config();
+ TDEConfig* config = tdeApp->config();
config->setGroup( "PreviewDialog" );
config->writeEntry( "width", width() );
config->writeEntry( "height", height() );
diff --git a/kbarcode/printersettings.cpp b/kbarcode/printersettings.cpp
index cf0de20..2cca43c 100644
--- a/kbarcode/printersettings.cpp
+++ b/kbarcode/printersettings.cpp
@@ -76,7 +76,7 @@ PrinterSettings::PrinterSettings()
lpdata = new labelprinterdata;
loadConfig();
- connect( kapp, TQ_SIGNAL( aboutToQuit() ), this, TQ_SLOT( saveConfig() ) );
+ connect( tdeApp, TQ_SIGNAL( aboutToQuit() ), this, TQ_SLOT( saveConfig() ) );
}
PrinterSettings::~PrinterSettings()
@@ -93,7 +93,7 @@ PrinterSettings* PrinterSettings::getInstance()
void PrinterSettings::loadConfig()
{
- TDEConfig* config = kapp->config();
+ TDEConfig* config = tdeApp->config();
config->setGroup("Printer");
lpdata->articleEvent1 = (enum linebreak)config->readNumEntry("articleEvent1", NO_BREAK );
@@ -128,7 +128,7 @@ void PrinterSettings::loadConfig()
void PrinterSettings::saveConfig()
{
- TDEConfig* config = kapp->config();
+ TDEConfig* config = tdeApp->config();
config->setGroup("Printer");
config->writeEntry("articleEvent1", lpdata->articleEvent1 );
diff --git a/kbarcode/sqltables.cpp b/kbarcode/sqltables.cpp
index d5dc9a5..62f7e24 100644
--- a/kbarcode/sqltables.cpp
+++ b/kbarcode/sqltables.cpp
@@ -89,7 +89,7 @@ SqlTables::SqlTables( TQObject* parent )
connected = false;
loadConfig();
- connect( kapp, TQ_SIGNAL( aboutToQuit() ), this, TQ_SLOT( saveConfig() ) );
+ connect( tdeApp, TQ_SIGNAL( aboutToQuit() ), this, TQ_SLOT( saveConfig() ) );
}
SqlTables::~SqlTables()
@@ -289,7 +289,7 @@ void SqlTables::importLabelDef()
TQString f = locateLocal( "data", "kbarcode/labeldefinitions.sql" );
if( !TQFile::exists( f ) ) {
- TDEConfig* config = kapp->config();
+ TDEConfig* config = tdeApp->config();
config->setGroup( "Definitions" );
f = config->readEntry( "defpath", locate( "data", "kbarcode/labeldefinitions.sql" ) );
}
@@ -348,7 +348,7 @@ void SqlTables::exec( TQSqlQuery* query, const TQString & text )
void SqlTables::loadConfig()
{
- TDEConfig* config = kapp->config();
+ TDEConfig* config = tdeApp->config();
config->setGroup("SQL");
sqldata.username = config->readEntry("username", "root");
@@ -361,7 +361,7 @@ void SqlTables::loadConfig()
void SqlTables::saveConfig()
{
- TDEConfig* config = kapp->config();
+ TDEConfig* config = tdeApp->config();
config->setGroup("SQL");
config->writeEntry("username", sqldata.username );