TDE
/
kbarcode
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/kbarcode
0
0
Fork 0
Code Issues Releases Wiki Activity

Rename KApplication to TDEApplication to avoid conflicts with KDE4

Browse Source
pull/1/head
Timothy Pearson 12 years ago
parent 3a5959381a
commit 9c2d3ea2c5
14 changed files with 44 additions and 44 deletions
Show Stats Download Patch File Download Diff File

26
acinclude.m4
Unescape Escape View File

@ -1979,20 +1979,20 @@ cat > conftest.$ac_ext <<EOF
#include <kapp.h>
int main() {
printf("kde_htmldir=\\"%s\\"\n", KApplication::kde_htmldir().data());
printf("kde_appsdir=\\"%s\\"\n", KApplication::kde_appsdir().data());
printf("kde_icondir=\\"%s\\"\n", KApplication::kde_icondir().data());
printf("kde_sounddir=\\"%s\\"\n", KApplication::kde_sounddir().data());
printf("kde_datadir=\\"%s\\"\n", KApplication::kde_datadir().data());
printf("kde_locale=\\"%s\\"\n", KApplication::kde_localedir().data());
printf("kde_cgidir=\\"%s\\"\n", KApplication::kde_cgidir().data());
printf("kde_confdir=\\"%s\\"\n", KApplication::kde_configdir().data());
printf("kde_mimedir=\\"%s\\"\n", KApplication::kde_mimedir().data());
printf("kde_toolbardir=\\"%s\\"\n", KApplication::kde_toolbardir().data());
printf("kde_htmldir=\\"%s\\"\n", TDEApplication::kde_htmldir().data());
printf("kde_appsdir=\\"%s\\"\n", TDEApplication::kde_appsdir().data());
printf("kde_icondir=\\"%s\\"\n", TDEApplication::kde_icondir().data());
printf("kde_sounddir=\\"%s\\"\n", TDEApplication::kde_sounddir().data());
printf("kde_datadir=\\"%s\\"\n", TDEApplication::kde_datadir().data());
printf("kde_locale=\\"%s\\"\n", TDEApplication::kde_localedir().data());
printf("kde_cgidir=\\"%s\\"\n", TDEApplication::kde_cgidir().data());
printf("kde_confdir=\\"%s\\"\n", TDEApplication::kde_configdir().data());
printf("kde_mimedir=\\"%s\\"\n", TDEApplication::kde_mimedir().data());
printf("kde_toolbardir=\\"%s\\"\n", TDEApplication::kde_toolbardir().data());
printf("kde_wallpaperdir=\\"%s\\"\n",
KApplication::kde_wallpaperdir().data());
printf("kde_bindir=\\"%s\\"\n", KApplication::kde_bindir().data());
printf("kde_partsdir=\\"%s\\"\n", KApplication::kde_partsdir().data());
TDEApplication::kde_wallpaperdir().data());
printf("kde_bindir=\\"%s\\"\n", TDEApplication::kde_bindir().data());
printf("kde_partsdir=\\"%s\\"\n", TDEApplication::kde_partsdir().data());
printf("kde_servicesdir=\\"/tmp/dummy\\"\n");
printf("kde_servicetypesdir=\\"/tmp/dummy\\"\n");
printf("kde_moduledir=\\"/tmp/dummy\\"\n");

6
kbarcode/barcodedialog.cpp
Unescape Escape View File

@ -50,7 +50,7 @@ BarCodeDialog::BarCodeDialog( TQWidget* parent, const char* name )
Layout6 = new TQVBoxLayout( 0, 0, 6, "Layout2");
widget = new BarcodeWidget( this, "widget" );
m_token = new TokenProvider( TQT_TQPAINTDEVICE(KApplication::desktop()) );
m_token = new TokenProvider( TQT_TQPAINTDEVICE(TDEApplication::desktop()) );
widget->setTokenProvider( m_token );
buttonGenerate = new KPushButton( this, "buttonGenerate" );
@ -120,7 +120,7 @@ void BarCodeDialog::generate()
Barkode d;
widget->getData( d );
d.setTokenProvider( m_token );
d.update( TQT_TQPAINTDEVICE(KApplication::desktop()) );
d.update( TQT_TQPAINTDEVICE(TDEApplication::desktop()) );
barcode->setPixmap( d.pixmap() );
@ -149,7 +149,7 @@ void BarCodeDialog::save()
bc.setTokenProvider( m_token );
bc.update( TQT_TQPAINTDEVICE(KApplication::desktop()) );
bc.update( TQT_TQPAINTDEVICE(TDEApplication::desktop()) );
if(!bc.pixmap().save( path, extension, 0 ))
KMessageBox::error( this, i18n("An error occurred during saving the image") );

6
kbarcode/batchwizard.cpp
Unescape Escape View File

@ -614,9 +614,9 @@ void BatchWizard::printNow( const TQString & printer, bool bUserInteraction )
if( !checkKeepOpen->isChecked() )
KWizard::accept();
KApplication::setOverrideCursor( TQCursor( TQt::ArrowCursor ), true );
TDEApplication::setOverrideCursor( TQCursor( TQt::ArrowCursor ), true );
setupBatchPrinter( batch, batchType );
KApplication::restoreOverrideCursor();
TDEApplication::restoreOverrideCursor();
delete prn;
delete batch;
@ -873,7 +873,7 @@ void BatchWizard::loadFromFile()
void BatchWizard::loadFromClipboard()
{
TQClipboard *cb = KApplication::clipboard();
TQClipboard *cb = TDEApplication::clipboard();
loadData( cb->text() );
}

4
kbarcode/commands.cpp
Unescape Escape View File

@ -41,8 +41,8 @@ TQPoint getFreePos( TQCanvas* c )
return TQPoint( canvas->rect().x(), canvas->rect().y() );
// TODO: fix for positions on label
int x = KApplication::random() % canvas->rect().width() - 20;
int y = KApplication::random() % canvas->rect().height() - 20;
int x = TDEApplication::random() % canvas->rect().width() - 20;
int y = TDEApplication::random() % canvas->rect().height() - 20;
if( x > 0 && y > 0 )
return TQPoint( canvas->rect().x() + x, canvas->rect().y() + y );

10
kbarcode/confwizard.cpp
Unescape Escape View File

@ -177,14 +177,14 @@ void ConfWizard::testSettings( bool b )
void ConfWizard::create()
{
KApplication::setOverrideCursor( TQt::WaitCursor );
TDEApplication::setOverrideCursor( TQt::WaitCursor );
if(!SqlTables::getInstance()->newTables( sqlwidget->username(), sqlwidget->password(), sqlwidget->hostname(), sqlwidget->database(), sqlwidget->driver() ) )
{
KApplication::restoreOverrideCursor();
TDEApplication::restoreOverrideCursor();
return;
}
else
KApplication::restoreOverrideCursor();
TDEApplication::restoreOverrideCursor();
TQSqlDatabase* db = TQSqlDatabase::addDatabase( sqlwidget->driver() );
db->setDatabaseName( sqlwidget->database() );
@ -197,11 +197,11 @@ void ConfWizard::create()
db->lastError().databaseText() + "</qt>" );
if( db->open() ) {
KApplication::setOverrideCursor( TQt::WaitCursor );
TDEApplication::setOverrideCursor( TQt::WaitCursor );
SqlTables::getInstance()->importData(
locate("appdata", "labeldefinitions.sql"), db );
buttonExample->setEnabled( true );
KApplication::restoreOverrideCursor();
TDEApplication::restoreOverrideCursor();
}
db->close();

4
kbarcode/csvimportdlg.cpp
Unescape Escape View File

@ -357,7 +357,7 @@ void CSVImportDlg::accept()
KApplication::setOverrideCursor( TQCursor( TQt::WaitCursor) );
TDEApplication::setOverrideCursor( TQCursor( TQt::WaitCursor) );
while( !file.isEof() )
{
list = file.readNextLine();
@ -378,7 +378,7 @@ void CSVImportDlg::accept()
//KMessageBox::error( this, i18n("Could not import the following line:") + line );
}
KApplication::restoreOverrideCursor();
TDEApplication::restoreOverrideCursor();
KMessageBox::information( this, i18n("Data was imported successfully.") );
KDialogBase::accept();
}

2
kbarcode/documentitem.cpp
Unescape Escape View File

@ -37,7 +37,7 @@ void DocumentItem::init()
{
m_canvasitem = NULL;
m_token = NULL;
m_device = TQT_TQPAINTDEVICE(KApplication::desktop());
m_device = TQT_TQPAINTDEVICE(TDEApplication::desktop());
m_z = 0;
m_border = true;

2
kbarcode/labeleditor.cpp
Unescape Escape View File

@ -131,7 +131,7 @@ LabelEditor::LabelEditor( TQWidget *parent, TQString _filename, const char *name
description = TQString();
d = new Definition();
m_token = new TokenProvider( TQT_TQPAINTDEVICE(KApplication::desktop()) );
m_token = new TokenProvider( TQT_TQPAINTDEVICE(TDEApplication::desktop()) );
statusBar()->insertItem( "", STATUS_ID_TEMPLATE, 0, true );
statusBar()->insertItem( "", STATUS_ID_SIZE, 0, true );

10
kbarcode/labelutils.cpp
Unescape Escape View File

@ -44,7 +44,7 @@ LabelUtils::~LabelUtils()
double LabelUtils::pixelToMm( double pixel, const TQPaintDevice* device, int mode )
{
TQPaintDeviceMetrics pdm( device ? device : TQT_TQPAINTDEVICE(KApplication::desktop()) );
TQPaintDeviceMetrics pdm( device ? device : TQT_TQPAINTDEVICE(TDEApplication::desktop()) );
if( mode == DpiX )
return (pixel * CONVERSION_FACTOR) / (double)pdm.logicalDpiX();
else
@ -59,7 +59,7 @@ double LabelUtils::mmToPixel( double mm, const TQPaintDevice* device, int mode )
// We don't get valid metrics from the printer - and we want a better resolution
// anyway (it's the PS driver that takes care of the printer resolution).
TQPaintDeviceMetrics pdm( device ? device : TQT_TQPAINTDEVICE(KApplication::desktop()) );
TQPaintDeviceMetrics pdm( device ? device : TQT_TQPAINTDEVICE(TDEApplication::desktop()) );
// tqDebug("DpiX=%i", pdm.logicalDpiX());
// tqDebug("DpiY=%i", pdm.logicalDpiY());
@ -100,7 +100,7 @@ const TQString LabelUtils::getModeFromCaption( const TQString & cap )
TQSize LabelUtils::stringSize( const TQString & t )
{
TQSimpleRichText srt( t, KApplication::font() );
TQSimpleRichText srt( t, TDEApplication::font() );
TQSize s;
s.setWidth( srt.widthUsed() );
s.setHeight( srt.height() );
@ -111,7 +111,7 @@ TQSize LabelUtils::stringSize( const TQString & t )
void LabelUtils::renderString( TQPainter* painter, const TQString & t, const TQRect & rect, double scalex, double scaley )
{
// DSRichText cannot calculate the width on its own
TQSimpleRichText srt( t, KApplication::font() );
TQSimpleRichText srt( t, TDEApplication::font() );
int width = (rect.width() > 0) ? rect.width() : srt.widthUsed();
int height = (rect.height() > 0) ? rect.height() : srt.height();
@ -126,7 +126,7 @@ void LabelUtils::renderString( TQPainter* painter, const TQString & t, const TQR
TQPixmap* LabelUtils::drawString( const TQString & t, int w, int h, double rot )
{
TQSimpleRichText srt( t, KApplication::font() );
TQSimpleRichText srt( t, TDEApplication::font() );
int width = (w > 0) ? w : srt.widthUsed();
int height = (h > 0) ? h : srt.height();

2
kbarcode/main.cpp
Unescape Escape View File

@ -105,7 +105,7 @@ int main(int argc, char *argv[])
TDECmdLineArgs::init( argc, argv, &aboutData );
TDECmdLineArgs::addCmdLineOptions( options );
KApplication a;
TDEApplication a;
// setup standard dirs
setupDirs();

4
kbarcode/mybarcode.cpp
Unescape Escape View File

@ -79,7 +79,7 @@ BarCode::~BarCode()
const TQPixmap BarCode::pixmap()
{
if( p.isNull() )
createBarcode( &p, KApplication::desktop() );
createBarcode( &p, TDEApplication::desktop() );
if( p.isNull() ) {
KMessageBox::error( 0, "<qt>" + i18n("Barcode not valid!") + "<br>" + barcode.value + "</qt>" );
@ -185,7 +185,7 @@ void BarCode::createBarcode( TQPixmap* target, TQPaintDevice* device )
// we have to scale to the correct resolution.
// we scale already here and not at the end,
// so that the addMargin function does not get a scaled margin.
TQPaintDeviceMetrics pdm( KApplication::desktop() );
TQPaintDeviceMetrics pdm( TDEApplication::desktop() );
int screenresx = pdm.logicalDpiX();
int screenresy = pdm.logicalDpiY();

2
kbarcode/pixmapbarcode.cpp
Unescape Escape View File

@ -325,7 +325,7 @@ void PixmapBarcode::createBarcode( TQPixmap* target, const TQPaintDevice* device
// we have to scale to the correct resolution.
// we scale already here and not at the end,
// so that the addMargin function does not get a scaled margin.
TQPaintDeviceMetrics pdm( KApplication::desktop() );
TQPaintDeviceMetrics pdm( TDEApplication::desktop() );
int screenresx = pdm.logicalDpiX();
int screenresy = pdm.logicalDpiY();

2
kbarcode/previewdialog.cpp
Unescape Escape View File

@ -187,7 +187,7 @@ void PreviewDialog::updatechanges()
TQPainter painter( &pix );
Label* l = new Label( def, file, m_filename, TQT_TQPAINTDEVICE(KApplication::desktop()),
Label* l = new Label( def, file, m_filename, TQT_TQPAINTDEVICE(TDEApplication::desktop()),
customerId->currentText(), articleId->text(), groupName->text() );
l->setIndex( spinIndex->value() - 1 );
l->setSerial( serialStart->text(), serialInc->value() );

8
kbarcode/xmlutils.cpp
Unescape Escape View File

@ -297,10 +297,10 @@ void XMLUtils::writeXMLRect( TQDomElement* tag, TQRect r, TQPoint ptOrigin ) con
tag->setAttribute( "height", r.height() );
LabelUtils l;
tag->setAttribute( "x_mm", l.pixelToMm( r.x(), KApplication::desktop(), LabelUtils::DpiX ) );
tag->setAttribute( "y_mm", l.pixelToMm( r.y(), KApplication::desktop(), LabelUtils::DpiY ) );
tag->setAttribute( "width_mm", l.pixelToMm( r.width(), KApplication::desktop(), LabelUtils::DpiX ) );
tag->setAttribute( "height_mm", l.pixelToMm( r.height(), KApplication::desktop(), LabelUtils::DpiY ) );
tag->setAttribute( "x_mm", l.pixelToMm( r.x(), TDEApplication::desktop(), LabelUtils::DpiX ) );
tag->setAttribute( "y_mm", l.pixelToMm( r.y(), TDEApplication::desktop(), LabelUtils::DpiY ) );
tag->setAttribute( "width_mm", l.pixelToMm( r.width(), TDEApplication::desktop(), LabelUtils::DpiX ) );
tag->setAttribute( "height_mm", l.pixelToMm( r.height(), TDEApplication::desktop(), LabelUtils::DpiY ) );
}*/
TQRect XMLUtils::readXMLRect( TQDomElement* tag )

Write Preview
Loading…
Cancel
Save